diff options
Diffstat (limited to 'libraries/Util.class.php')
| -rw-r--r-- | libraries/Util.class.php | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/libraries/Util.class.php b/libraries/Util.class.php index cad6a4e6fd..1ef0e4f2ed 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -368,10 +368,10 @@ class PMA_Util $pmaString = $GLOBALS['PMA_String']; foreach ($quotes as $quote) { - if ($pmaString->substr($quoted_string, 0, 1) === $quote - && $pmaString->substr($quoted_string, -1, 1) === $quote + if (/*overload*/mb_substr($quoted_string, 0, 1) === $quote + && /*overload*/mb_substr($quoted_string, -1, 1) === $quote ) { - $unquoted_string = $pmaString->substr($quoted_string, 1, -1); + $unquoted_string = /*overload*/mb_substr($quoted_string, 1, -1); // replace escaped quotes $unquoted_string = str_replace( $quote . $quote, @@ -406,9 +406,9 @@ class PMA_Util $pmaString = $GLOBALS['PMA_String']; if ($truncate - && $pmaString->strlen($sql_query) > $cfg['MaxCharactersInDisplayedSQL'] + && /*overload*/mb_strlen($sql_query) > $cfg['MaxCharactersInDisplayedSQL'] ) { - $sql_query = $pmaString->substr( + $sql_query = /*overload*/mb_substr( $sql_query, 0, $cfg['MaxCharactersInDisplayedSQL'] @@ -449,8 +449,8 @@ class PMA_Util public static function getMySQLDocuURL($link, $anchor = '') { // Fixup for newly used names: - $link = str_replace('_', '-', $GLOBALS['PMA_String']->strtolower($link)); - $anchor = str_replace('_', '-', $GLOBALS['PMA_String']->strtolower($anchor)); + $link = str_replace('_', '-', /*overload*/mb_strtolower($link)); + $anchor = str_replace('_', '-', /*overload*/mb_strtolower($anchor)); if (empty($link)) { $link = 'index'; @@ -641,7 +641,7 @@ class PMA_Util // if the config password is wrong, or the MySQL server does not // respond, do not show the query that would reveal the // username/password - if (! empty($the_query) && ! $pmaString->strstr($the_query, 'connect')) { + if (! empty($the_query) && ! /*overload*/mb_strstr($the_query, 'connect')) { // --- Added to solve bug #641765 if (function_exists('PMA_SQP_isError') && PMA_SQP_isError()) { $error_msg .= PMA_SQP_getErrorString() . "\n"; @@ -650,7 +650,7 @@ class PMA_Util // --- // modified to show the help on sql errors $error_msg .= '<p><strong>' . __('SQL query:') . '</strong>' . "\n"; - if ($pmaString->strstr($pmaString->strtolower($formatted_sql), 'select') + if (/*overload*/mb_strstr(/*overload*/mb_strtolower($formatted_sql), 'select') ) { // please show me help to the error on select $error_msg .= self::showMySQLDocu('SELECT'); @@ -660,12 +660,12 @@ class PMA_Util 'sql_query' => $the_query, 'show_query' => 1, ); - if ($pmaString->strlen($table)) { + if (/*overload*/mb_strlen($table)) { $_url_params['db'] = $db; $_url_params['table'] = $table; $doedit_goto = '<a href="tbl_sql.php' . PMA_URL_getCommon($_url_params) . '">'; - } elseif ($pmaString->strlen($db)) { + } elseif (/*overload*/mb_strlen($db)) { $_url_params['db'] = $db; $doedit_goto = '<a href="db_sql.php' . PMA_URL_getCommon($_url_params) . '">'; @@ -737,7 +737,7 @@ class PMA_Util exit; } if (! empty($back_url)) { - if ($pmaString->strstr($back_url, '?')) { + if (/*overload*/mb_strstr($back_url, '?')) { $back_url .= '&no_history=true'; } else { $back_url .= '?no_history=true'; @@ -817,7 +817,7 @@ class PMA_Util // in $group we save the reference to the place in $table_groups // where to store the table info if ($GLOBALS['cfg']['NavigationTreeEnableGrouping'] - && $sep && $GLOBALS['PMA_String']->strstr($table_name, $sep) + && $sep && /*overload*/mb_strstr($table_name, $sep) ) { $parts = explode($sep, $table_name); @@ -906,14 +906,14 @@ class PMA_Util if (! $do_it) { global $PMA_SQPdata_forbidden_word; - $eltNameUpper = $pmaString->strtoupper($a_name); + $eltNameUpper = /*overload*/mb_strtoupper($a_name); if (!in_array($eltNameUpper, $PMA_SQPdata_forbidden_word)) { return $a_name; } } // '0' is also empty for php :-( - if ($pmaString->strlen($a_name) && $a_name !== '*') { + if (/*overload*/mb_strlen($a_name) && $a_name !== '*') { return '`' . str_replace('`', '``', $a_name) . '`'; } else { return $a_name; @@ -956,7 +956,7 @@ class PMA_Util if (! $do_it) { global $PMA_SQPdata_forbidden_word; - $eltNameUpper = $pmaString->strtoupper($a_name); + $eltNameUpper = /*overload*/mb_strtoupper($a_name); if (!in_array($eltNameUpper, $PMA_SQPdata_forbidden_word)) { return $a_name; } @@ -973,7 +973,7 @@ class PMA_Util } // '0' is also empty for php :-( - if ($pmaString->strlen($a_name) && $a_name !== '*') { + if (/*overload*/mb_strlen($a_name) && $a_name !== '*') { return $quote . $a_name . $quote; } else { return $a_name; @@ -1081,14 +1081,14 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - if ($pmaString->strlen($query_base) > $cfg['MaxCharactersInDisplayedSQL'] + if (/*overload*/mb_strlen($query_base) > $cfg['MaxCharactersInDisplayedSQL'] ) { // when the query is large (for example an INSERT of binary // data), the parser chokes; so avoid parsing the query $query_too_big = true; $shortened_query_base = nl2br( htmlspecialchars( - $pmaString->substr( + /*overload*/mb_substr( $sql_query, 0, $cfg['MaxCharactersInDisplayedSQL'] @@ -1162,9 +1162,9 @@ class PMA_Util if (! isset($GLOBALS['db'])) { $GLOBALS['db'] = ''; } - if ($pmaString->strlen($GLOBALS['db'])) { + if (/*overload*/mb_strlen($GLOBALS['db'])) { $url_params['db'] = $GLOBALS['db']; - if ($pmaString->strlen($GLOBALS['table'])) { + if (/*overload*/mb_strlen($GLOBALS['table'])) { $url_params['table'] = $GLOBALS['table']; $edit_link = 'tbl_sql.php'; } else { @@ -1187,7 +1187,7 @@ class PMA_Util } elseif (preg_match( '@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i', $sql_query )) { - $explain_params['sql_query'] = $pmaString->substr($sql_query, 8); + $explain_params['sql_query'] = /*overload*/mb_substr($sql_query, 8); $_message = __('Skip Explain SQL'); } if (isset($explain_params['sql_query']) && isset($_message)) { @@ -1554,13 +1554,13 @@ class PMA_Util $pmaString = $GLOBALS['PMA_String']; if (preg_match('/^[0-9]+GB$/', $formatted_size)) { - $return_value = $pmaString->substr($formatted_size, 0, -2) + $return_value = /*overload*/mb_substr($formatted_size, 0, -2) * self::pow(1024, 3); } elseif (preg_match('/^[0-9]+MB$/', $formatted_size)) { - $return_value = $pmaString->substr($formatted_size, 0, -2) + $return_value = /*overload*/mb_substr($formatted_size, 0, -2) * self::pow(1024, 2); } elseif (preg_match('/^[0-9]+K$/', $formatted_size)) { - $return_value = $pmaString->substr($formatted_size, 0, -1) + $return_value = /*overload*/mb_substr($formatted_size, 0, -1) * self::pow(1024, 1); } return $return_value; @@ -1802,7 +1802,7 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - $url_length = $pmaString->strlen($url); + $url_length = /*overload*/mb_strlen($url); // with this we should be able to catch case of image upload // into a (MEDIUM) BLOB; not worth generating even a form for these if ($url_length > $GLOBALS['cfg']['LinkLengthLimit'] * 100) { @@ -1825,7 +1825,7 @@ class PMA_Util $tag_params_strings = array(); foreach ($tag_params as $par_name => $par_value) { // htmlspecialchars() only on non javascript - $par_value = $pmaString->substr($par_name, 0, 2) == 'on' + $par_value = /*overload*/mb_substr($par_name, 0, 2) == 'on' ? $par_value : htmlspecialchars($par_value); $tag_params_strings[] = $par_name . '="' . $par_value . '"'; @@ -1852,7 +1852,7 @@ class PMA_Util $query_parts = self::splitURLQuery($url); foreach ($query_parts as $query_pair) { list($eachvar, $eachval) = explode('=', $query_pair); - if ($pmaString->strlen($eachval) > $suhosin_get_MaxValueLength) { + if (/*overload*/mb_strlen($eachval) > $suhosin_get_MaxValueLength) { $in_suhosin_limits = false; break; } @@ -1995,7 +1995,7 @@ class PMA_Util $format_string = ''; $charbuff = false; - for ($i = 0, $str_len = $GLOBALS['PMA_String']->strlen($string); + for ($i = 0, $str_len = /*overload*/mb_strlen($string); $i < $str_len; $i++ ) { @@ -2111,7 +2111,7 @@ class PMA_Util $meta = $fields_meta[$i]; // do not use a column alias in a condition - if (! isset($meta->orgname) || ! $pmaString->strlen($meta->orgname)) { + if (! isset($meta->orgname) || ! /*overload*/mb_strlen($meta->orgname)) { $meta->orgname = $meta->name; if (isset($GLOBALS['analyzed_sql'][0]['select_expr']) @@ -2179,7 +2179,7 @@ class PMA_Util // hexify only if this is a true not empty BLOB or a BINARY // do not waste memory building a too big condition - if ($pmaString->strlen($row[$i]) < 1000) { + if (/*overload*/mb_strlen($row[$i]) < 1000) { // use a CAST if possible, to avoid problems // if the field contains wildcard characters % or _ $con_val = '= CAST(0x' . bin2hex($row[$i]) . ' AS BINARY)'; @@ -2187,7 +2187,7 @@ class PMA_Util // when this blob is the only field present // try settling with length comparison $condition = ' CHAR_LENGTH(' . $con_key . ') '; - $con_val = ' = ' . $pmaString->strlen($row[$i]); + $con_val = ' = ' . /*overload*/mb_strlen($row[$i]); } else { // this blob won't be part of the final condition $con_val = null; @@ -2196,7 +2196,7 @@ class PMA_Util && ! empty($row[$i]) ) { // do not build a too big condition - if ($pmaString->strlen($row[$i]) < 5000) { + if (/*overload*/mb_strlen($row[$i]) < 5000) { $condition .= '=0x' . bin2hex($row[$i]) . ' AND'; } else { $condition = ''; @@ -2558,7 +2558,7 @@ class PMA_Util public static function userDir($dir) { // add trailing slash - if ($GLOBALS['PMA_String']->substr($dir, -1) != '/') { + if (/*overload*/mb_substr($dir, -1) != '/') { $dir .= '/'; } @@ -2577,8 +2577,8 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - if (! $pmaString->strlen($database)) { - if (! $pmaString->strlen($GLOBALS['db'])) { + if (! /*overload*/mb_strlen($database)) { + if (! /*overload*/mb_strlen($GLOBALS['db'])) { return ''; } $database = $GLOBALS['db']; @@ -2975,24 +2975,24 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - $first_bracket_pos = $pmaString->strpos($columnspec, '('); + $first_bracket_pos = /*overload*/mb_strpos($columnspec, '('); if ($first_bracket_pos) { $spec_in_brackets = chop( - $pmaString->substr( + /*overload*/mb_substr( $columnspec, $first_bracket_pos + 1, - ($pmaString->strrpos($columnspec, ')') - $first_bracket_pos - 1) + (/*overload*/mb_strrpos($columnspec, ')') - $first_bracket_pos - 1) ) ); // convert to lowercase just to be sure - $type = $pmaString->strtolower( - chop($pmaString->substr($columnspec, 0, $first_bracket_pos)) + $type = /*overload*/mb_strtolower( + chop(/*overload*/mb_substr($columnspec, 0, $first_bracket_pos)) ); } else { // Split trailing attributes such as unsigned, // binary, zerofill and get data type name $type_parts = explode(' ', $columnspec); - $type = $pmaString->strtolower($type_parts[0]); + $type = /*overload*/mb_strtolower($type_parts[0]); $spec_in_brackets = ''; } @@ -3008,7 +3008,7 @@ class PMA_Util $enum_set_values = array(); /* Create printable type name */ - $printtype = $pmaString->strtolower($columnspec); + $printtype = /*overload*/mb_strtolower($columnspec); // Strip the "BINARY" attribute, except if we find "BINARY(" because // this would be a BINARY or VARBINARY column type; @@ -3056,9 +3056,9 @@ class PMA_Util // for the case ENUM('–','“') $displayed_type = htmlspecialchars($printtype); - if ($pmaString->strlen($printtype) > $GLOBALS['cfg']['LimitChars']) { + if (/*overload*/mb_strlen($printtype) > $GLOBALS['cfg']['LimitChars']) { $displayed_type = '<abbr title="' . $printtype . '">'; - $displayed_type .= $GLOBALS['PMA_String']->substr( + $displayed_type .= /*overload*/mb_substr( $printtype, 0, $GLOBALS['cfg']['LimitChars'] ); $displayed_type .= '</abbr>'; @@ -3087,7 +3087,7 @@ class PMA_Util */ public static function isForeignKeySupported($engine) { - $engine = $GLOBALS['PMA_String']->strtoupper($engine); + $engine = /*overload*/mb_strtoupper($engine); if (($engine == 'INNODB') || ($engine == 'PBXT')) { return true; } elseif ($engine == 'NDBCLUSTER' || $engine == 'NDB') { @@ -3158,7 +3158,7 @@ class PMA_Util */ public static function duplicateFirstNewline($string) { - $first_occurence = $GLOBALS['PMA_String']->strpos($string, "\r\n"); + $first_occurence = /*overload*/mb_strpos($string, "\r\n"); if ($first_occurence === 0) { $string = "\n" . $string; } @@ -3273,12 +3273,12 @@ class PMA_Util $pmaString = $GLOBALS['PMA_String']; /* Backward compatibility in 3.5.x */ - if ($pmaString->strpos($string, '@FIELDS@') !== false) { + if (/*overload*/mb_strpos($string, '@FIELDS@') !== false) { $string = strtr($string, array('@FIELDS@' => '@COLUMNS@')); } /* Fetch columns list if required */ - if ($pmaString->strpos($string, '@COLUMNS@') !== false) { + if (/*overload*/mb_strpos($string, '@COLUMNS@') !== false) { $columns_list = $GLOBALS['dbi']->getColumns( $GLOBALS['db'], $GLOBALS['table'] ); @@ -3538,7 +3538,7 @@ class PMA_Util if ($upper_case) { for ($i = 0, $nb = count($gis_data_types); $i < $nb; $i++) { $gis_data_types[$i] - = $GLOBALS['PMA_String']->strtoupper($gis_data_types[$i]); + = /*overload*/mb_strtoupper($gis_data_types[$i]); } } return $gis_data_types; @@ -3595,7 +3595,7 @@ class PMA_Util $funcs['IsEmpty'] = array('params' => 1, 'type' => 'int'); $funcs['IsSimple'] = array('params' => 1, 'type' => 'int'); - $geom_type = trim($GLOBALS['PMA_String']->strtolower($geom_type)); + $geom_type = trim(/*overload*/mb_strtolower($geom_type)); if ($display && $geom_type != 'geometry' && $geom_type != 'multipoint') { $funcs[] = array('display' => '--------'); } @@ -3930,12 +3930,12 @@ class PMA_Util return $server_type; } - if ($pmaString->stripos(PMA_MYSQL_STR_VERSION, 'mariadb') !== false) { + if (/*overload*/mb_stripos(PMA_MYSQL_STR_VERSION, 'mariadb') !== false) { $server_type = 'MariaDB'; return $server_type; } - if ($pmaString->stripos(PMA_MYSQL_VERSION_COMMENT, 'percona') !== false) { + if (/*overload*/mb_stripos(PMA_MYSQL_VERSION_COMMENT, 'percona') !== false) { $server_type = 'Percona Server'; return $server_type; } @@ -4002,12 +4002,12 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - for ($i=0, $length = $pmaString->strlen($values_string); + for ($i=0, $length = /*overload*/mb_strlen($values_string); $i < $length; $i++ ) { $curr = $values_string[$i]; - $next = ($i == $pmaString->strlen($values_string)-1) + $next = ($i == /*overload*/mb_strlen($values_string)-1) ? '' : $values_string[$i+1]; @@ -4031,7 +4031,7 @@ class PMA_Util } - if ($pmaString->strlen($buffer) > 0) { + if (/*overload*/mb_strlen($buffer) > 0) { // The leftovers in the buffer are the last value (if any) $values[] = $buffer; } @@ -4060,8 +4060,8 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - if ($pmaString->strstr($table['Comment'], '; InnoDB free') === false) { - if (!$pmaString->strstr($table['Comment'], 'InnoDB free') === false) { + if (/*overload*/mb_strstr($table['Comment'], '; InnoDB free') === false) { + if (!/*overload*/mb_strstr($table['Comment'], 'InnoDB free') === false) { // here we have just InnoDB generated part $table['Comment'] = ''; } @@ -4209,12 +4209,12 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - if ($pmaString->strlen($GLOBALS['cfg']['ProxyUrl'])) { + if (/*overload*/mb_strlen($GLOBALS['cfg']['ProxyUrl'])) { $context['http'] = array( 'proxy' => $GLOBALS['cfg']['ProxyUrl'], 'request_fulluri' => true ); - if ($pmaString->strlen($GLOBALS['cfg']['ProxyUser'])) { + if (/*overload*/mb_strlen($GLOBALS['cfg']['ProxyUser'])) { $auth = base64_encode( $GLOBALS['cfg']['ProxyUser'] . ':' . $GLOBALS['cfg']['ProxyPass'] ); @@ -4238,9 +4238,9 @@ class PMA_Util /** @var PMA_String $pmaString */ $pmaString = $GLOBALS['PMA_String']; - if ($pmaString->strlen($GLOBALS['cfg']['ProxyUrl'])) { + if (/*overload*/mb_strlen($GLOBALS['cfg']['ProxyUrl'])) { curl_setopt($curl_handle, CURLOPT_PROXY, $GLOBALS['cfg']['ProxyUrl']); - if ($pmaString->strlen($GLOBALS['cfg']['ProxyUser'])) { + if (/*overload*/mb_strlen($GLOBALS['cfg']['ProxyUser'])) { curl_setopt( $curl_handle, CURLOPT_PROXYUSERPWD, @@ -4318,8 +4318,8 @@ class PMA_Util $data = json_decode($response); if (is_object($data) - && $pmaString->strlen($data->version) - && $pmaString->strlen($data->date) + && /*overload*/mb_strlen($data->version) + && /*overload*/mb_strlen($data->date) && $save ) { if (! isset($_SESSION) && ! defined('TESTSUITE')) { @@ -4420,12 +4420,12 @@ class PMA_Util return $value; } - if (!$pmaString->strpos($value, '.')) { + if (!/*overload*/mb_strpos($value, '.')) { return $value . '.000000'; } $value .= '000000'; - return $pmaString->substr($value, 0, $pmaString->strpos($value, '.') + 7); + return /*overload*/mb_substr($value, 0, /*overload*/mb_strpos($value, '.') + 7); } /** @@ -4443,14 +4443,14 @@ class PMA_Util $pmaString = new PMA_StringNative(); $test = fread($file, 4); - $len = $pmaString->strlen($test); + $len = /*overload*/mb_strlen($test); fclose($file); - if ($len >= 2 && $test[0] == $pmaString->chr(31) - && $test[1] == $pmaString->chr(139) + if ($len >= 2 && $test[0] == /*overload*/mb_chr(31) + && $test[1] == /*overload*/mb_chr(139) ) { return 'application/gzip'; } - if ($len >= 3 && $pmaString->substr($test, 0, 3) == 'BZh') { + if ($len >= 3 && /*overload*/mb_substr($test, 0, 3) == 'BZh') { return 'application/bzip2'; } if ($len >= 4 && $test == "PK\003\004") { |