Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libraries/DisplayResults.class.php
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/DisplayResults.class.php')
-rw-r--r--libraries/DisplayResults.class.php141
1 files changed, 53 insertions, 88 deletions
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 78a318205e..6411ea11b3 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -389,8 +389,6 @@ class PMA_DisplayResults
// 2. Display mode is not "false for all elements" -> updates the
// display mode
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
if ($the_disp_mode != 'nnnn000000') {
if (isset($printview) && ($printview == '1')) {
@@ -439,9 +437,9 @@ class PMA_DisplayResults
$bIsProcessList = isset($which[1]);
if ($bIsProcessList) {
- $str = ' ' . $pmaString->strtoupper($which[1]);
+ $str = ' ' . strtoupper($which[1]);
$bIsProcessList = $bIsProcessList
- && $pmaString->strpos($str, 'PROCESSLIST') > 0;
+ && strpos($str, 'PROCESSLIST') > 0;
}
if ($bIsProcessList) {
@@ -511,7 +509,7 @@ class PMA_DisplayResults
$the_total = $unlim_num_rows;
} elseif ((($do_display['nav_bar'] == '1')
|| ($do_display['sort_lnk'] == '1'))
- && ($pmaString->strlen($db) && !empty($table))
+ && (/*overload*/mb_strlen($db) && !empty($table))
) {
$the_total = PMA_Table::countRecords($db, $table);
}
@@ -1852,7 +1850,7 @@ class PMA_DisplayResults
// FROM `PMA_relation` AS `1` , `PMA_relation` AS `2`
$sort_tbl = (isset($fields_meta->table)
- && $GLOBALS['PMA_String']->strlen($fields_meta->table))
+ && /*overload*/mb_strlen($fields_meta->table))
? PMA_Util::backquote(
$fields_meta->table
) . '.'
@@ -1957,8 +1955,6 @@ class PMA_DisplayResults
}
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
$sort_expression_nodirection = array_filter($sort_expression_nodirection);
foreach ($sort_expression_nodirection as $index=>$expression) {
// check if this is the first clause,
@@ -1968,7 +1964,7 @@ class PMA_DisplayResults
$sort_tbl_new = $sort_tbl;
// Test to detect if the column name is a standard name
// Standard name has the table name prefixed to the column name
- if ($pmaString->strpos($name_to_use_in_sort, '.') !== false) {
+ if (/*overload*/mb_strpos($name_to_use_in_sort, '.') !== false) {
$matches = explode('.', $name_to_use_in_sort);
// Matches[0] has the table name
// Matches[1] has the column name
@@ -1986,7 +1982,7 @@ class PMA_DisplayResults
// order by clause to the column name
$query_head = $is_first_clause ? "\nORDER BY " : "";
// Again a check to see if the given column is a aggregate column
- if ($pmaString->strpos($name_to_use_in_sort, '(') !== false) {
+ if (/*overload*/mb_strpos($name_to_use_in_sort, '(') !== false) {
$sort_order .= $query_head . $name_to_use_in_sort . ' ' ;
} else {
$sort_order .= $query_head . $sort_tbl_new . "."
@@ -2000,7 +1996,7 @@ class PMA_DisplayResults
$sort_order = preg_replace("/\.\./", ".", $sort_order);
// Incase this is the current column save $single_sort_order
if ($current_name == $name_to_use_in_sort) {
- if ($pmaString->strpos($current_name, '(') !== false) {
+ if (/*overload*/mb_strpos($current_name, '(') !== false) {
$single_sort_order = "\n" . 'ORDER BY ' . $current_name . ' ';
} else {
$single_sort_order = "\n" . 'ORDER BY ' . $sort_tbl
@@ -2015,8 +2011,7 @@ class PMA_DisplayResults
$column_index, $index
);
} else {
- $single_sort_order .= $pmaString
- ->strtoupper($sort_direction[$index]);
+ $single_sort_order .= strtoupper($sort_direction[$index]);
}
}
if ($current_name == $name_to_use_in_sort && $is_in_sort) {
@@ -2026,7 +2021,7 @@ class PMA_DisplayResults
);
$order_img .= " <small>" . ($index + 1) . "</small>";
} else {
- $sort_order .= $pmaString->strtoupper($sort_direction[$index]);
+ $sort_order .= strtoupper($sort_direction[$index]);
}
// Separate columns by a comma
$sort_order .= ", ";
@@ -2035,10 +2030,10 @@ class PMA_DisplayResults
}
// remove the comma from the last column name in the newly
// constructed clause
- $sort_order = $pmaString->substr(
+ $sort_order = /*overload*/mb_substr(
$sort_order,
0,
- $pmaString->strlen($sort_order)-2
+ /*overload*/mb_strlen($sort_order)-2
);
if (empty($order_img)) {
$order_img = '';
@@ -2067,10 +2062,8 @@ class PMA_DisplayResults
$index_in_expression = 0;
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
foreach ($sort_expression_nodirection as $index => $clause) {
- if ($pmaString->strpos($clause, '.') !== false) {
+ if (/*overload*/mb_strpos($clause, '.') !== false) {
$fragments = explode('.', $clause);
$clause2 = $fragments[0] . "." . str_replace('`', '', $fragments[1]);
} else {
@@ -2094,8 +2087,8 @@ class PMA_DisplayResults
// SELECT p.*, FROM_UNIXTIME(p.temps) FROM mytable AS p
// (and try clicking on each column's header twice)
if (! empty($sort_tbl)
- && $pmaString->strpos($sort_expression_nodirection[$index_in_expression], $sort_tbl) === false
- && $pmaString->strpos($sort_expression_nodirection[$index_in_expression], '(') === false
+ && /*overload*/mb_strpos($sort_expression_nodirection[$index_in_expression], $sort_tbl) === false
+ && /*overload*/mb_strpos($sort_expression_nodirection[$index_in_expression], '(') === false
) {
$new_sort_expression_nodirection = $sort_tbl
. $sort_expression_nodirection[$index_in_expression];
@@ -2140,10 +2133,7 @@ class PMA_DisplayResults
private function _getSortingUrlParams(
$sort_direction, $sort_order, $column_index, $index
) {
- $sort_direction_upper = $GLOBALS['PMA_String']->strtoupper(
- trim($sort_direction[$index])
- );
- if ($sort_direction_upper == self::DESCENDING_SORT_DIR) {
+ if (strtoupper(trim($sort_direction[$index])) == self::DESCENDING_SORT_DIR) {
$sort_order .= ' ASC';
$order_img = ' ' . PMA_Util::getImage(
's_desc.png', __('Descending'),
@@ -2188,15 +2178,12 @@ class PMA_DisplayResults
$order_img, $col_index, $direction,
$fields_meta, $order_url, $multi_order_url
) {
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
-
$order_link_params = array();
if (isset($order_img) && ($order_img != '')) {
- if ($pmaString->strstr($order_img, 'asc')) {
+ if (/*overload*/mb_strstr($order_img, 'asc')) {
$order_link_params['onmouseover'] = "$('.soimg$col_index').toggle()";
$order_link_params['onmouseout'] = "$('.soimg$col_index').toggle()";
- } elseif ($pmaString->strstr($order_img, 'desc')) {
+ } elseif (/*overload*/mb_strstr($order_img, 'desc')) {
$order_link_params['onmouseover'] = "$('.soimg$col_index').toggle()";
$order_link_params['onmouseout'] = "$('.soimg$col_index').toggle()";
}
@@ -2566,15 +2553,13 @@ class PMA_DisplayResults
'binary' => 'hex',
);
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
foreach ($matches as $key => $value) {
- if ($pmaString->strpos($meta->flags, $key) !== false) {
+ if (/*overload*/mb_strpos($meta->flags, $key) !== false) {
$classes[] = $value;
}
}
- if ($pmaString->strpos($meta->type, 'bit') !== false) {
+ if (/*overload*/mb_strpos($meta->type, 'bit') !== false) {
$classes[] = 'bit';
}
@@ -2844,8 +2829,6 @@ class PMA_DisplayResults
$row_info = $this->_getRowInfoForSpecialLinks($row, $col_order);
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
for ($currentColumn = 0;
$currentColumn < $this->__get('fields_cnt');
++$currentColumn) {
@@ -2962,9 +2945,9 @@ class PMA_DisplayResults
// Check whether the field needs to display with syntax highlighting
- $dbLower = $pmaString->strtolower($this->__get('db'));
- $tblLower = $pmaString->strtolower($this->__get('table'));
- $nameLower = $pmaString->strtolower($meta->name);
+ $dbLower = /*overload*/mb_strtolower($this->__get('db'));
+ $tblLower = /*overload*/mb_strtolower($this->__get('table'));
+ $nameLower = /*overload*/mb_strtolower($meta->name);
if (! empty($this->transformation_info[$dbLower][$tblLower][$nameLower])
&& (trim($row[$i]) != '')
) {
@@ -2980,11 +2963,12 @@ class PMA_DisplayResults
: ''
);
+ $dbLower = /*overload*/mb_strtolower($this->__get('db'));
$meta->mimetype = str_replace(
'_', '/',
$this->transformation_info[$dbLower]
- [$pmaString->strtolower($this->__get('table'))]
- [$pmaString->strtolower($meta->name)][2]
+ [/*overload*/mb_strtolower($this->__get('table'))]
+ [/*overload*/mb_strtolower($meta->name)][2]
);
}
@@ -2997,7 +2981,7 @@ class PMA_DisplayResults
) {
$linking_url = $this->_getSpecialLinkUrl(
- $row[$i], $row_info, $pmaString->strtolower($meta->name)
+ $row[$i], $row_info, /*overload*/mb_strtolower($meta->name)
);
include_once
"libraries/plugins/transformations/Text_Plain_Link.class.php";
@@ -3198,12 +3182,10 @@ class PMA_DisplayResults
private function _getSpecialLinkUrl($column_value, $row_info, $field_name)
{
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
$linking_url_params = array();
$link_relations = $GLOBALS['special_schema_links']
- [$pmaString->strtolower($this->__get('db'))]
- [$pmaString->strtolower($this->__get('table'))]
+ [/*overload*/mb_strtolower($this->__get('db'))]
+ [/*overload*/mb_strtolower($this->__get('table'))]
[$field_name];
if (! is_array($link_relations['link_param'])) {
@@ -3233,7 +3215,7 @@ class PMA_DisplayResults
}
$linking_url_params[$new_param['param_info']]
- = $row_info[$pmaString->strtolower($new_param['column_name'])];
+ = $row_info[/*overload*/mb_strtolower($new_param['column_name'])];
// Special case 1 - when executing routines, according
// to the type of the routine, url param changes
@@ -3241,7 +3223,7 @@ class PMA_DisplayResults
continue;
}
- $lowerRoutineType = $pmaString->strtolower($row_info['routine_type']);
+ $lowerRoutineType = strtolower($row_info['routine_type']);
if ($lowerRoutineType == self::ROUTINE_PROCEDURE
|| $lowerRoutineType == self::ROUTINE_FUNCTION
) {
@@ -3271,7 +3253,7 @@ class PMA_DisplayResults
for ($n = 0; $n < $this->__get('fields_cnt'); ++$n) {
$m = $col_order ? $col_order[$n] : $n;
- $row_info[$GLOBALS['PMA_String']->strtolower($fields_meta[$m]->name)]
+ $row_info[/*overload*/mb_strtolower($fields_meta[$m]->name)]
= $row[$m];
}
@@ -3298,7 +3280,7 @@ class PMA_DisplayResults
&& isset($analyzed_sql[0])
&& isset($analyzed_sql[0]['querytype'])
&& ($analyzed_sql[0]['querytype'] == self::QUERY_TYPE_SELECT)
- && ($GLOBALS['PMA_String']->strlen($this->__get('sql_query')) > 200)
+ && (/*overload*/mb_strlen($this->__get('sql_query')) > 200)
) {
$url_sql_query = 'SELECT ';
@@ -3696,7 +3678,7 @@ class PMA_DisplayResults
*/
private function _getClassForDateTimeRelatedFields($type)
{
- if (($GLOBALS['PMA_String']->substr($type, 0, 9) == self::TIMESTAMP_FIELD)
+ if ((substr($type, 0, 9) == self::TIMESTAMP_FIELD)
|| ($type == self::DATETIME_FIELD)
) {
$field_type_class = 'datetimefield';
@@ -3798,9 +3780,6 @@ class PMA_DisplayResults
$transformation_plugin, $default_function, $transform_options,
$analyzed_sql
) {
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
-
if (! isset($column) || is_null($column)) {
$cell = $this->_buildNullDisplay($class, $condition_field, $meta);
return $cell;
@@ -3814,7 +3793,7 @@ class PMA_DisplayResults
// Display as [GEOMETRY - (size)]
if ($_SESSION['tmpval']['geoOption'] == self::GEOMETRY_DISP_GEOM) {
$geometry_text = $this->_handleNonPrintableContents(
- $pmaString->strtoupper(self::GEOMETRY_FIELD),
+ strtoupper(self::GEOMETRY_FIELD),
(isset($column) ? $column : ''), $transformation_plugin,
$transform_options, $default_function, $meta
);
@@ -3847,7 +3826,7 @@ class PMA_DisplayResults
if ($_SESSION['tmpval']['display_binary']) {
$where_comparison = ' = ' . $column;
- $wkbval = $pmaString->substr(bin2hex($column), 8);
+ $wkbval = substr(bin2hex($column), 8);
$is_field_truncated = $this->_getPartialText($wkbval);
$cell = $this->_getRowData(
@@ -3911,14 +3890,11 @@ class PMA_DisplayResults
$transformation_plugin, $default_function, $transform_options,
$is_field_truncated, $analyzed_sql, &$dt_result, $col_index
) {
- /** @var PMA_String $pmaStr */
- $pmaStr = $GLOBALS['PMA_String'];
-
$is_analyse = $this->__get('is_analyse');
$field_flags = $GLOBALS['dbi']->fieldFlags($dt_result, $col_index);
$bIsText = gettype($transformation_plugin) === 'object'
- && $pmaStr->strpos($transformation_plugin->getMIMEtype(), 'Text')
+ && strpos($transformation_plugin->getMIMEtype(), 'Text')
=== false;
// disable inline grid editing
@@ -3949,7 +3925,7 @@ class PMA_DisplayResults
// Cut all fields to $GLOBALS['cfg']['LimitChars']
// (unless it's a link-type transformation or binary)
if (!(gettype($transformation_plugin) === "object"
- && $pmaStr->strpos($transformation_plugin->getName(), 'Link') !== false)
+ && strpos($transformation_plugin->getName(), 'Link') !== false)
&& !stristr($field_flags, self::BINARY_FIELD)
) {
$is_field_truncated = $this->_getPartialText($column);
@@ -3991,11 +3967,11 @@ class PMA_DisplayResults
}
$formatted = true;
- } elseif ((($pmaStr->substr($meta->type, 0, 9) == self::TIMESTAMP_FIELD)
+ } elseif (((substr($meta->type, 0, 9) == self::TIMESTAMP_FIELD)
|| ($meta->type == self::DATETIME_FIELD)
|| ($meta->type == self::TIME_FIELD)
|| ($meta->type == self::TIME_FIELD))
- && ($pmaStr->strpos($column, ".") !== false) // micro seconds delimeter
+ && (/*overload*/mb_strpos($column, ".") !== false) // micro seconds delimeter
) {
$column = PMA_Util::addMicroseconds($column);
}
@@ -4563,11 +4539,8 @@ class PMA_DisplayResults
);
}
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
-
// 2.3 Prepare the navigation bars
- if (!$pmaString->strlen($this->__get('table'))) {
+ if (!/*overload*/mb_strlen($this->__get('table'))) {
if (isset($analyzed_sql[0]['query_type'])
&& ($analyzed_sql[0]['query_type'] == self::QUERY_TYPE_SELECT)
@@ -4615,7 +4588,7 @@ class PMA_DisplayResults
}
- if ($pmaString->strlen($this->__get('table'))) {
+ if (/*overload*/mb_strlen($this->__get('table'))) {
// This method set the values for $map array
$this->_setParamForLinkForeignKeyRelatedTables($map);
} // end if
@@ -4791,9 +4764,7 @@ class PMA_DisplayResults
return null;
}
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
- if ($pmaString->strpos($sort_expression_nodirection, '.') === false) {
+ if (/*overload*/mb_strpos($sort_expression_nodirection, '.') === false) {
$sort_table = $this->__get('table');
$sort_column = $sort_expression_nodirection;
} else {
@@ -4844,8 +4815,8 @@ class PMA_DisplayResults
$column_for_first_row = $row[$sorted_column_index];
}
- $column_for_first_row = $pmaString->strtoupper(
- $pmaString->substr(
+ $column_for_first_row = /*overload*/mb_strtoupper(
+ /*overload*/mb_substr(
$column_for_first_row, 0, $GLOBALS['cfg']['LimitChars']
)
);
@@ -4870,8 +4841,8 @@ class PMA_DisplayResults
$column_for_last_row = $row[$sorted_column_index];
}
- $column_for_last_row = $pmaString->strtoupper(
- $pmaString->substr(
+ $column_for_last_row = /*overload*/mb_strtoupper(
+ /*overload*/mb_substr(
$column_for_last_row, 0, $GLOBALS['cfg']['LimitChars']
)
);
@@ -5492,11 +5463,9 @@ class PMA_DisplayResults
$is_truncated = false;
$result = '[' . $category;
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
if (isset($content)) {
- $size = $pmaString->strlen($content);
+ $size = /*overload*/mb_strlen($content);
$display_size = PMA_Util::formatByteDown($size, 3, 1);
$result .= ' - ' . $display_size[0] . ' ' . $display_size[1];
@@ -5511,10 +5480,8 @@ class PMA_DisplayResults
// if we want to use a text transformation on a BLOB column
if (gettype($transformation_plugin) === "object") {
- $posMimeOctetstream = $pmaString
- ->strpos($transformation_plugin->getMIMESubtype(), 'Octetstream');
- $posMimeText = $pmaString
- ->strpos($transformation_plugin->getMIMEtype(), 'Text');
+ $posMimeOctetstream = strpos($transformation_plugin->getMIMESubtype(), 'Octetstream');
+ $posMimeText = strpos($transformation_plugin->getMIMEtype(), 'Text');
if ($posMimeOctetstream
|| $posMimeText !== false
) {
@@ -5607,8 +5574,6 @@ class PMA_DisplayResults
)
. '">';
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
if (isset($analyzed_sql[0]['select_expr'])
&& is_array($analyzed_sql[0]['select_expr'])
) {
@@ -5620,7 +5585,7 @@ class PMA_DisplayResults
$alias = $analyzed_sql[0]['select_expr']
[$select_expr_position]['alias'];
- if (!isset($alias) || !$pmaString->strlen($alias)) {
+ if (!isset($alias) || !/*overload*/mb_strlen($alias)) {
continue;
} // end if
@@ -5640,7 +5605,7 @@ class PMA_DisplayResults
// Field to display from the foreign table?
if (isset($map[$meta->name][2])
- && $pmaString->strlen($map[$meta->name][2])
+ && /*overload*/mb_strlen($map[$meta->name][2])
) {
$dispsql = 'SELECT '
@@ -6056,10 +6021,10 @@ class PMA_DisplayResults
*/
private function _getPartialText(&$str)
{
- if ($GLOBALS['PMA_String']->strlen($str) > $GLOBALS['cfg']['LimitChars']
+ if (/*overload*/mb_strlen($str) > $GLOBALS['cfg']['LimitChars']
&& $_SESSION['tmpval']['pftext'] === self::DISPLAY_PARTIAL_TEXT
) {
- $str = $GLOBALS['PMA_String']->substr(
+ $str = /*overload*/mb_substr(
$str, 0, $GLOBALS['cfg']['LimitChars']
) . '...';
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 17:01:33 +0300