Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moving the mb_* functions to bootstrap.php

  • Loading branch information...
commit 3ee267d7ef5416912ce9b4982c5b2bd115a59a99 1 parent 1763f46
@ADmad ADmad authored
Showing with 257 additions and 255 deletions.
  1. +0 −255 lib/Cake/I18n/Multibyte.php
  2. +257 −0 lib/Cake/bootstrap.php
View
255 lib/Cake/I18n/Multibyte.php
@@ -18,261 +18,6 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-if (!function_exists('mb_stripos')) {
-
-/**
- * Find position of first occurrence of a case-insensitive string.
- *
- * @param string $haystack The string from which to get the position of the first occurrence of $needle.
- * @param string $needle The string to find in $haystack.
- * @param integer $offset The position in $haystack to start searching.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false
- * if $needle is not found.
- */
- function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) {
- return Multibyte::stripos($haystack, $needle, $offset);
- }
-
-}
-
-if (!function_exists('mb_stristr')) {
-
-/**
- * Finds first occurrence of a string within another, case insensitive.
- *
- * @param string $haystack The string from which to get the first occurrence of $needle.
- * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
- * If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- * If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
- * Default value is false.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or false if $needle is not found.
- */
- function mb_stristr($haystack, $needle, $part = false, $encoding = null) {
- return Multibyte::stristr($haystack, $needle, $part);
- }
-
-}
-
-if (!function_exists('mb_strlen')) {
-
-/**
- * Get string length.
- *
- * @param string $string The string being checked for length.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer The number of characters in string $string having character encoding encoding.
- * A multi-byte character is counted as 1.
- */
- function mb_strlen($string, $encoding = null) {
- return Multibyte::strlen($string);
- }
-
-}
-
-if (!function_exists('mb_strpos')) {
-
-/**
- * Find position of first occurrence of a string.
- *
- * @param string $haystack The string being checked.
- * @param string $needle The position counted from the beginning of haystack.
- * @param integer $offset The search offset. If it is not specified, 0 is used.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
- * If $needle is not found, it returns false.
- */
- function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) {
- return Multibyte::strpos($haystack, $needle, $offset);
- }
-
-}
-
-if (!function_exists('mb_strrchr')) {
-
-/**
- * Finds the last occurrence of a character in a string within another.
- *
- * @param string $haystack The string from which to get the last occurrence of $needle.
- * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
- * If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- * If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
- * Default value is false.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
- */
- function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
- return Multibyte::strrchr($haystack, $needle, $part);
- }
-
-}
-
-if (!function_exists('mb_strrichr')) {
-
-/**
- * Finds the last occurrence of a character in a string within another, case insensitive.
- *
- * @param string $haystack The string from which to get the last occurrence of $needle.
- * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
- * If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- * If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
- * Default value is false.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
- */
- function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
- return Multibyte::strrichr($haystack, $needle, $part);
- }
-
-}
-
-if (!function_exists('mb_strripos')) {
-
-/**
- * Finds position of last occurrence of a string within another, case insensitive
- *
- * @param string $haystack The string from which to get the position of the last occurrence of $needle.
- * @param string $needle The string to find in $haystack.
- * @param integer $offset The position in $haystack to start searching.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
- * or false if $needle is not found.
- */
- function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) {
- return Multibyte::strripos($haystack, $needle, $offset);
- }
-
-}
-
-if (!function_exists('mb_strrpos')) {
-
-/**
- * Find position of last occurrence of a string in a string.
- *
- * @param string $haystack The string being checked, for the last occurrence of $needle.
- * @param string $needle The string to find in $haystack.
- * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
- * Negative values will stop searching at an arbitrary point prior to the end of the string.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
- * If $needle is not found, it returns false.
- */
- function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) {
- return Multibyte::strrpos($haystack, $needle, $offset);
- }
-
-}
-
-if (!function_exists('mb_strstr')) {
-
-/**
- * Finds first occurrence of a string within another
- *
- * @param string $haystack The string from which to get the first occurrence of $needle.
- * @param string $needle The string to find in $haystack
- * @param boolean $part Determines which portion of $haystack this function returns.
- * If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- * If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
- * Default value is FALSE.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or true if $needle is not found.
- */
- function mb_strstr($haystack, $needle, $part = false, $encoding = null) {
- return Multibyte::strstr($haystack, $needle, $part);
- }
-
-}
-
-if (!function_exists('mb_strtolower')) {
-
-/**
- * Make a string lowercase
- *
- * @param string $string The string being lowercased.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string with all alphabetic characters converted to lowercase.
- */
- function mb_strtolower($string, $encoding = null) {
- return Multibyte::strtolower($string);
- }
-
-}
-
-if (!function_exists('mb_strtoupper')) {
-
-/**
- * Make a string uppercase
- *
- * @param string $string The string being uppercased.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string with all alphabetic characters converted to uppercase.
- */
- function mb_strtoupper($string, $encoding = null) {
- return Multibyte::strtoupper($string);
- }
-
-}
-
-if (!function_exists('mb_substr_count')) {
-
-/**
- * Count the number of substring occurrences
- *
- * @param string $haystack The string being checked.
- * @param string $needle The string being found.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer The number of times the $needle substring occurs in the $haystack string.
- */
- function mb_substr_count($haystack, $needle, $encoding = null) {
- return Multibyte::substrCount($haystack, $needle);
- }
-
-}
-
-if (!function_exists('mb_substr')) {
-
-/**
- * Get part of string
- *
- * @param string $string The string being checked.
- * @param integer $start The first position used in $string.
- * @param integer $length The maximum length of the returned string.
- * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string The portion of $string specified by the $string and $length parameters.
- */
- function mb_substr($string, $start, $length = null, $encoding = null) {
- return Multibyte::substr($string, $start, $length);
- }
-
-}
-
-if (!function_exists('mb_encode_mimeheader')) {
-
-/**
- * Encode string for MIME header
- *
- * @param string $str The string being encoded
- * @param string $charset specifies the name of the character set in which str is represented in.
- * The default value is determined by the current NLS setting (mbstring.language).
- * @param string $transfer_encoding specifies the scheme of MIME encoding.
- * It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
- * @param string $linefeed specifies the EOL (end-of-line) marker with which
- * mb_encode_mimeheader() performs line-folding
- * (a » RFC term, the act of breaking a line longer than a certain length into multiple lines.
- * The length is currently hard-coded to 74 characters). Falls back to "\r\n" (CRLF) if not given.
- * @param integer $indent [definition unknown and appears to have no affect]
- * @return string A converted version of the string represented in ASCII.
- */
- function mb_encode_mimeheader($str, $charset = 'UTF-8', $transferEncoding = 'B', $linefeed = "\r\n", $indent = 1) {
- return Multibyte::mimeEncode($str, $charset, $linefeed);
- }
-
-}
-
/**
* Multibyte handling methods.
*
View
257 lib/Cake/bootstrap.php
@@ -157,6 +157,7 @@
App::uses('CakePlugin', 'Core');
App::uses('Cache', 'Cache');
App::uses('Object', 'Core');
+App::uses('Multibyte', 'I18n');
App::$bootstrapping = true;
Configure::bootstrap(isset($boot) ? $boot : true);
@@ -167,3 +168,259 @@
mb_internal_encoding($encoding);
}
}
+
+if (!function_exists('mb_stripos')) {
+
+/**
+ * Find position of first occurrence of a case-insensitive string.
+ *
+ * @param string $haystack The string from which to get the position of the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset The position in $haystack to start searching.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false
+ * if $needle is not found.
+ */
+ function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) {
+ return Multibyte::stripos($haystack, $needle, $offset);
+ }
+
+}
+
+if (!function_exists('mb_stristr')) {
+
+/**
+ * Finds first occurrence of a string within another, case insensitive.
+ *
+ * @param string $haystack The string from which to get the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ * If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ * If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
+ * Default value is false.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack, or false if $needle is not found.
+ */
+ function mb_stristr($haystack, $needle, $part = false, $encoding = null) {
+ return Multibyte::stristr($haystack, $needle, $part);
+ }
+
+}
+
+if (!function_exists('mb_strlen')) {
+
+/**
+ * Get string length.
+ *
+ * @param string $string The string being checked for length.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer The number of characters in string $string having character encoding encoding.
+ * A multi-byte character is counted as 1.
+ */
+ function mb_strlen($string, $encoding = null) {
+ return Multibyte::strlen($string);
+ }
+
+}
+
+if (!function_exists('mb_strpos')) {
+
+/**
+ * Find position of first occurrence of a string.
+ *
+ * @param string $haystack The string being checked.
+ * @param string $needle The position counted from the beginning of haystack.
+ * @param integer $offset The search offset. If it is not specified, 0 is used.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
+ * If $needle is not found, it returns false.
+ */
+ function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) {
+ return Multibyte::strpos($haystack, $needle, $offset);
+ }
+
+}
+
+if (!function_exists('mb_strrchr')) {
+
+/**
+ * Finds the last occurrence of a character in a string within another.
+ *
+ * @param string $haystack The string from which to get the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ * If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ * If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
+ * Default value is false.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ */
+ function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
+ return Multibyte::strrchr($haystack, $needle, $part);
+ }
+
+}
+
+if (!function_exists('mb_strrichr')) {
+
+/**
+ * Finds the last occurrence of a character in a string within another, case insensitive.
+ *
+ * @param string $haystack The string from which to get the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ * If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ * If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
+ * Default value is false.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ */
+ function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
+ return Multibyte::strrichr($haystack, $needle, $part);
+ }
+
+}
+
+if (!function_exists('mb_strripos')) {
+
+/**
+ * Finds position of last occurrence of a string within another, case insensitive
+ *
+ * @param string $haystack The string from which to get the position of the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset The position in $haystack to start searching.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
+ * or false if $needle is not found.
+ */
+ function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) {
+ return Multibyte::strripos($haystack, $needle, $offset);
+ }
+
+}
+
+if (!function_exists('mb_strrpos')) {
+
+/**
+ * Find position of last occurrence of a string in a string.
+ *
+ * @param string $haystack The string being checked, for the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
+ * Negative values will stop searching at an arbitrary point prior to the end of the string.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
+ * If $needle is not found, it returns false.
+ */
+ function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) {
+ return Multibyte::strrpos($haystack, $needle, $offset);
+ }
+
+}
+
+if (!function_exists('mb_strstr')) {
+
+/**
+ * Finds first occurrence of a string within another
+ *
+ * @param string $haystack The string from which to get the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ * If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ * If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
+ * Default value is FALSE.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ */
+ function mb_strstr($haystack, $needle, $part = false, $encoding = null) {
+ return Multibyte::strstr($haystack, $needle, $part);
+ }
+
+}
+
+if (!function_exists('mb_strtolower')) {
+
+/**
+ * Make a string lowercase
+ *
+ * @param string $string The string being lowercased.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string with all alphabetic characters converted to lowercase.
+ */
+ function mb_strtolower($string, $encoding = null) {
+ return Multibyte::strtolower($string);
+ }
+
+}
+
+if (!function_exists('mb_strtoupper')) {
+
+/**
+ * Make a string uppercase
+ *
+ * @param string $string The string being uppercased.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string with all alphabetic characters converted to uppercase.
+ */
+ function mb_strtoupper($string, $encoding = null) {
+ return Multibyte::strtoupper($string);
+ }
+
+}
+
+if (!function_exists('mb_substr_count')) {
+
+/**
+ * Count the number of substring occurrences
+ *
+ * @param string $haystack The string being checked.
+ * @param string $needle The string being found.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer The number of times the $needle substring occurs in the $haystack string.
+ */
+ function mb_substr_count($haystack, $needle, $encoding = null) {
+ return Multibyte::substrCount($haystack, $needle);
+ }
+
+}
+
+if (!function_exists('mb_substr')) {
+
+/**
+ * Get part of string
+ *
+ * @param string $string The string being checked.
+ * @param integer $start The first position used in $string.
+ * @param integer $length The maximum length of the returned string.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string The portion of $string specified by the $string and $length parameters.
+ */
+ function mb_substr($string, $start, $length = null, $encoding = null) {
+ return Multibyte::substr($string, $start, $length);
+ }
+
+}
+
+if (!function_exists('mb_encode_mimeheader')) {
+
+/**
+ * Encode string for MIME header
+ *
+ * @param string $str The string being encoded
+ * @param string $charset specifies the name of the character set in which str is represented in.
+ * The default value is determined by the current NLS setting (mbstring.language).
+ * @param string $transfer_encoding specifies the scheme of MIME encoding.
+ * It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
+ * @param string $linefeed specifies the EOL (end-of-line) marker with which
+ * mb_encode_mimeheader() performs line-folding
+ * (a » RFC term, the act of breaking a line longer than a certain length into multiple lines.
+ * The length is currently hard-coded to 74 characters). Falls back to "\r\n" (CRLF) if not given.
+ * @param integer $indent [definition unknown and appears to have no affect]
+ * @return string A converted version of the string represented in ASCII.
+ */
+ function mb_encode_mimeheader($str, $charset = 'UTF-8', $transferEncoding = 'B', $linefeed = "\r\n", $indent = 1) {
+ return Multibyte::mimeEncode($str, $charset, $linefeed);
+ }
+
+}
+
Please sign in to comment.
Something went wrong with that request. Please try again.