gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make PHPCS happy.

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2015-11-08 15:58:48 +01:00
parent ea806f645d
commit f9d582bd09
38 changed files with 638 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db_create.php
View File

@ -48,7 +48,8 @@ if (! $result) {
$GLOBALS['table'] = '';
/**
* If in an Ajax request, just display the message with {@link PMA\libraries\Response}
* If in an Ajax request, just display the message with
* {@link PMA\libraries\Response}
*/
if ($GLOBALS['is_ajax_request'] == true) {
$response = PMA\libraries\Response::getInstance();

6
db_designer.php
View File

@ -148,7 +148,11 @@ $response->addHTML(
)
);
$response->addHTML(
PMA_getDesignerPageMenu(isset($_REQUEST['query']), $selected_page, $classes_side_menu)
PMA_getDesignerPageMenu(
isset($_REQUEST['query']),
$selected_page,
$classes_side_menu
)
);

9
db_operations.php
View File

@ -305,10 +305,11 @@ $response->addHTML('</div>');
if ($cfgRelation['pdfwork'] && $num_tables > 0) {
// We only show this if we find something in the new pdf_pages table
$test_query = '
SELECT *
FROM ' . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['pdf_pages']) . '
WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($GLOBALS['db']) . '\'';
SELECT *
FROM ' . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['pdf_pages']) . '
WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($GLOBALS['db'])
. '\'';
$test_rs = PMA_queryAsControlUser(
$test_query,
false,

4
db_qbe.php
View File

@ -132,7 +132,9 @@ list(
) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
if ($message_to_display) {
PMA\libraries\Message::error(__('You have to choose at least one column to display!'))
PMA\libraries\Message::error(
__('You have to choose at least one column to display!')
)
->display();
}
unset($message_to_display);

8
db_structure.php
View File

@ -30,7 +30,8 @@ list(
$container = libraries\di\Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\DatabaseStructureController');
$container->alias(
'DatabaseStructureController', 'PMA\libraries\controllers\DatabaseStructureController'
'DatabaseStructureController',
'PMA\libraries\controllers\DatabaseStructureController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -48,5 +49,8 @@ $dependency_definitions = array(
);
/** @var DatabaseStructureController $controller */
$controller = $container->get('DatabaseStructureController', $dependency_definitions);
$controller = $container->get(
'DatabaseStructureController',
$dependency_definitions
);
$controller->indexAction();

15
db_tracking.php
View File

@ -112,16 +112,19 @@ $cfgRelation = PMA_getRelationsParam();
// Prepare statement to get HEAD version
$all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
PMA\libraries\Util::backquote($cfgRelation['db']) . '.' .
PMA\libraries\Util::backquote($cfgRelation['tracking']) .
' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($_REQUEST['db']) . '\' ' .
' GROUP BY table_name' .
' ORDER BY table_name ASC';
PMA\libraries\Util::backquote($cfgRelation['db']) . '.' .
PMA\libraries\Util::backquote($cfgRelation['tracking']) .
' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($_REQUEST['db']) .
'\' ' .
' GROUP BY table_name' .
' ORDER BY table_name ASC';
$all_tables_result = PMA_queryAsControlUser($all_tables_query);
// If a HEAD version exists
if (is_object($all_tables_result) && $GLOBALS['dbi']->numRows($all_tables_result) > 0) {
if (is_object($all_tables_result)
&& $GLOBALS['dbi']->numRows($all_tables_result) > 0
) {
PMA_displayTrackedTables(
$GLOBALS['db'], $all_tables_result, $url_query, $pmaThemeImage,
$text_dir, $cfgRelation

70
js/messages.php
View File

@ -887,21 +887,67 @@ PMA_printJsValueForFormValidation('remote', __('Please fix this field'));
PMA_printJsValueForFormValidation('email', __('Please enter a valid email address'));
PMA_printJsValueForFormValidation('url', __('Please enter a valid URL'));
PMA_printJsValueForFormValidation('date', __('Please enter a valid date'));
PMA_printJsValueForFormValidation('dateISO', __('Please enter a valid date ( ISO )'));
PMA_printJsValueForFormValidation(
'dateISO',
__('Please enter a valid date ( ISO )')
);
PMA_printJsValueForFormValidation('number', __('Please enter a valid number'));
PMA_printJsValueForFormValidation('creditcard', __('Please enter a valid credit card number'));
PMA_printJsValueForFormValidation(
'creditcard',
__('Please enter a valid credit card number')
);
PMA_printJsValueForFormValidation('digits', __('Please enter only digits'));
PMA_printJsValueForFormValidation('equalTo', __('Please enter the same value again'));
PMA_printJsValueForFormValidation('maxlength', __('Please enter no more than {0} characters'), true);
PMA_printJsValueForFormValidation('minlength', __('Please enter at least {0} characters'), true);
PMA_printJsValueForFormValidation('rangelength', __('Please enter a value between {0} and {1} characters long'), true);
PMA_printJsValueForFormValidation('range', __('Please enter a value between {0} and {1}'), true);
PMA_printJsValueForFormValidation('max', __('Please enter a value less than or equal to {0}'), true);
PMA_printJsValueForFormValidation('min', __('Please enter a value greater than or equal to {0}'), true);
PMA_printJsValueForFormValidation(
'equalTo',
__('Please enter the same value again')
);
PMA_printJsValueForFormValidation(
'maxlength',
__('Please enter no more than {0} characters'),
true
);
PMA_printJsValueForFormValidation(
'minlength',
__('Please enter at least {0} characters'),
true
);
PMA_printJsValueForFormValidation(
'rangelength',
__('Please enter a value between {0} and {1} characters long'),
true
);
PMA_printJsValueForFormValidation(
'range',
__('Please enter a value between {0} and {1}'),
true
);
PMA_printJsValueForFormValidation(
'max',
__('Please enter a value less than or equal to {0}'),
true
);
PMA_printJsValueForFormValidation(
'min',
__('Please enter a value greater than or equal to {0}'),
true
);
/* customed functions */
PMA_printJsValueForFormValidation('validationFunctionForDateTime', __('Please enter a valid date or time'), true);
PMA_printJsValueForFormValidation('validationFunctionForHex', __('Please enter a valid HEX input'), true);
PMA_printJsValueForFormValidation('validationFunctionForFuns', __('Error'), true, false);
PMA_printJsValueForFormValidation(
'validationFunctionForDateTime',
__('Please enter a valid date or time'),
true
);
PMA_printJsValueForFormValidation(
'validationFunctionForHex',
__('Please enter a valid HEX input'),
true
);
PMA_printJsValueForFormValidation(
'validationFunctionForFuns',
__('Error'),
true,
false
);
echo "\n});";
echo "\n} /* if ($.validator) */";
?>

22
libraries/DatabaseInterface.php
View File

@ -125,9 +125,10 @@ class DatabaseInterface
while (count($keys) > 1) {
$key = array_shift($keys);
// If the key doesn't exist at this depth, we will just create an empty array
// to hold the next value, allowing us to create the arrays to hold final
// values at the correct depth. Then we'll keep digging into the array.
// If the key doesn't exist at this depth, we will just create an empty
// array to hold the next value, allowing us to create the arrays to hold
// final values at the correct depth. Then we'll keep digging into the
// array.
if (!isset($loc[$key]) || !is_array($loc[$key])) {
$loc[$key] = array();
}
@ -497,7 +498,10 @@ class DatabaseInterface
// added BINARY in the WHERE clause to force a case sensitive
// comparison (if we are looking for the db Aa we don't want
// to find the db aa)
$this_databases = array_map('PMA\libraries\Util::sqlAddSlashes', $databases);
$this_databases = array_map(
'PMA\libraries\Util::sqlAddSlashes',
$databases
);
$sql = $this->_getSqlForTablesFull($this_databases, $sql_where_table);
@ -522,7 +526,8 @@ class DatabaseInterface
}
$tables[$one_database_name] = $one_database_tables;
}
} else if ($sort_by == 'Data_length') { // Size = Data_length + Index_length
} elseif ($sort_by == 'Data_length') {
// Size = Data_length + Index_length
foreach ($tables as $one_database_name => $one_database_tables) {
uasort(
$one_database_tables,
@ -625,7 +630,8 @@ class DatabaseInterface
if ($sort_by == 'Data_length') {
foreach ($each_tables as $table_name => $table_data) {
${$sort_by}[$table_name] = strtolower(
$table_data['Data_length'] + $table_data['Index_length']
$table_data['Data_length']
+ $table_data['Index_length']
);
}
} else {
@ -2191,7 +2197,9 @@ class DatabaseInterface
if (strpos($error_message, 'errno: 13') !== false) {
$error .= ' - ' . $error_message;
$error .= '<br />'
. __('Please check privileges of directory containing database.');
. __(
'Please check privileges of directory containing database.'
);
} else {
/* InnoDB constraints, see
* http://dev.mysql.com/doc/refman/5.0/en/

86
libraries/DisplayResults.php
View File

@ -825,7 +825,8 @@ class DisplayResults
$html_sql_query = htmlspecialchars($this->__get('sql_query'));
// Navigation bar
$table_navigation_html .= '<table class="navigation nospacing nopadding print_ignore">'
$table_navigation_html
.= '<table class="navigation nospacing nopadding print_ignore">'
. '<tr>'
. '<td class="navigation_separator"></td>';
@ -1185,7 +1186,9 @@ class DisplayResults
// ($GLOBALS['cfg']['ShowBrowseComments']).
$comments_map = $this->_getTableCommentsArray($analyzed_sql_results);
list($col_order, $col_visib) = $this->_getColumnParams($analyzed_sql_results);
list($col_order, $col_visib) = $this->_getColumnParams(
$analyzed_sql_results
);
// optimize: avoid calling a method on each iteration
$number_of_columns = $this->__get('fields_cnt');
@ -1415,7 +1418,8 @@ class DisplayResults
$drop_down_html = '';
$drop_down_html .= '<form action="sql.php" method="post" class="print_ignore">' . "\n"
$drop_down_html .= '<form action="sql.php" method="post" class="print_ignore">'
. "\n"
. PMA_URL_getHiddenInputs(
$this->__get('db'), $this->__get('table')
)
@ -1536,8 +1540,8 @@ class DisplayResults
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
$button_html .= '<th class="column_action print_ignore" ' . $colspan . '>'
. $full_or_partial_text_link . '</th>';
$button_html .= '<th class="column_action print_ignore" ' . $colspan
. '>' . $full_or_partial_text_link . '</th>';
} elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
|| ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
@ -2475,7 +2479,8 @@ class DisplayResults
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
$right_column_html .= "\n" . '<td class="print_ignore" ' . $colspan . '></td>';
$right_column_html .= "\n" . '<td class="print_ignore" ' . $colspan
. '></td>';
}
$this->__set('display_params', $display_params);
@ -2632,12 +2637,12 @@ class DisplayResults
return implode(' ', $classes);
} // end of the '_addClass()' function
/**
* Prepare the body of the results table
*
* @param integer &$dt_result the link id associated to the query which results have to be displayed
* which results have to be displayed
* @param integer &$dt_result the link id associated to the query
* which results have to be displayed which
* results have to be displayed
* @param array &$displayParts which elements to display
* @param array $map the list of relations
* @param array $analyzed_sql_results analyzed sql results
@ -2645,7 +2650,7 @@ class DisplayResults
*
* @return string $table_body_html html content
*
* @global array $row current row data
* @global array $row current row data
*
* @access private
*
@ -2701,7 +2706,9 @@ class DisplayResults
}
// prepare to get the column order, if available
list($col_order, $col_visib) = $this->_getColumnParams($analyzed_sql_results);
list($col_order, $col_visib) = $this->_getColumnParams(
$analyzed_sql_results
);
// Correction University of Virginia 19991216 in the while below
// Previous code assumed that all tables have keys, specifically that
@ -2932,22 +2939,27 @@ class DisplayResults
$this->__set('mime_map', $mimeMap);
}
/**
* Get the values for one data row
*
* @param integer &$dt_result the link id associated to the query which results have to be displayed
* which results have to be displayed
* @param array $row current row data
* @param integer $row_no the index of current row
* @param array $col_order the column order false when a property not found
* false when a property not found
* @param array $map the list of relations
* @param string $grid_edit_class the class for all editable columns
* @param boolean $col_visib column is visible(false) array column isn't visible(string array)
* array column isn't visible(string array)
* @param string $url_sql_query the analyzed sql query
* @param array $analyzed_sql_results analyzed sql results
* @param integer &$dt_result the link id associated to
* the query which results
* have to be displayed which
* results have to be
* displayed
* @param array $row current row data
* @param integer $row_no the index of current row
* @param array $col_order the column order false when
* a property not found false
* when a property not found
* @param array $map the list of relations
* @param string $grid_edit_class the class for all editable
* columns
* @param boolean|array|string $col_visib column is visible(false);
* column isn't visible(string
* array)
* @param string $url_sql_query the analyzed sql query
* @param array $analyzed_sql_results analyzed sql results
*
* @return string $row_values_html html content
*
@ -4786,8 +4798,8 @@ class DisplayResults
/**
* Prepare multi field edit/delete links
*
* @param integer &$dt_result the link id associated to the query which results have to be displayed
* which results have to be displayed
* @param integer &$dt_result the link id associated to the query which
* results have to be displayed
* @param array $analyzed_sql_results analyzed sql results
* @param string $del_link the display element - 'del_link'
*
@ -5019,8 +5031,8 @@ class DisplayResults
$results_operations_html = '';
$fields_meta = $this->__get('fields_meta'); // To safe use in foreach
$header_shown = false;
$header = '<fieldset class="print_ignore" ><legend>' . __('Query results operations')
. '</legend>';
$header = '<fieldset class="print_ignore" ><legend>'
. __('Query results operations') . '</legend>';
$_url_params = array(
'db' => $this->__get('db'),
@ -5264,7 +5276,9 @@ class DisplayResults
// in PHP < 5.5, empty() only checks variables
$tmpdb = $this->__get('db');
if ((count($url_params) > 0) && (! empty($tmpdb) && ! empty($meta->orgtable))) {
if (count($url_params) > 0
&& (!empty($tmpdb) && !empty($meta->orgtable))
) {
$result = '<a href="tbl_get_field.php'
. PMA_URL_getCommon($url_params)
. '" class="disableAjax">'
@ -5551,10 +5565,11 @@ class DisplayResults
$ret = '';
if (! empty($edit_url)) {
$ret .= '<td class="' . $class . ' center print_ignore" ' . ' ><span class="nowrap">'
. Util::linkOrButton(
$edit_url, $edit_str, array(), false
);
$ret .= '<td class="' . $class . ' center print_ignore" '
. ' ><span class="nowrap">'
. Util::linkOrButton(
$edit_url, $edit_str, array(), false
);
/*
* Where clause for selecting this row uniquely is provided as
* a hidden input. Used by jQuery scripts for handling grid editing
@ -5646,7 +5661,10 @@ class DisplayResults
$ajax = Response::getInstance()->isAjax() ? ' ajax' : '';
$ret .= 'center print_ignore" ' . ' >'
. Util::linkOrButton(
$del_url, $del_str, array('class' => 'delete_row requireConfirm' . $ajax), false
$del_url,
$del_str,
array('class' => 'delete_row requireConfirm' . $ajax),
false
)
. '<div class="hide">' . $js_conf . '</div>'
. '</td>';

4
libraries/OutputBuffering.php
View File

@ -87,7 +87,9 @@ class OutputBuffering
if (! defined('TESTSUITE')) {
header('X-ob_mode: ' . $this->_mode);
}
register_shutdown_function(array('PMA\libraries\OutputBuffering', 'stop'));
register_shutdown_function(
array('PMA\libraries\OutputBuffering', 'stop')
);
$this->_on = true;
}
}

3
libraries/Scripts.php
View File

@ -93,7 +93,8 @@ class Scripts
. $separator . Header::getVersionParameter();
$static_scripts .= sprintf(
'<script data-cfasync="false" type="text/javascript" src="%s"></script>',
'<script data-cfasync="false" type="text/javascript" src="%s">' .
'</script>',
htmlspecialchars($url)
);
}

6
libraries/Table.php
View File

@ -2153,7 +2153,11 @@ class Table
$tmp_error_drop = false;
if ($drop) {
$drop_query = 'ALTER TABLE ' . Util::backquote($table)
. ' DROP FOREIGN KEY ' . Util::backquote($existrel_foreign[$master_field_md5]['constraint']) . ';';
. ' DROP FOREIGN KEY '
. Util::backquote(
$existrel_foreign[$master_field_md5]['constraint']
)
. ';';
if (! isset($_REQUEST['preview_sql'])) {
$display_query .= $drop_query . "\n";

12
libraries/Util.php
View File

@ -3432,7 +3432,8 @@ class Util
* Get the script name corresponding to a plain English config word
* in order to append in links on navigation and main panel
*
* @param string $target a valid value for $cfg['NavigationTreeDefaultTabTable'],
* @param string $target a valid value for
* $cfg['NavigationTreeDefaultTabTable'],
* $cfg['NavigationTreeDefaultTabTable2'],
* $cfg['DefaultTabTable'], $cfg['DefaultTabDatabase'] or
* $cfg['DefaultTabServer']
@ -4806,7 +4807,8 @@ class Util
if (! empty($_REQUEST['tbl_group'])) {
// only tables for selected group
$tbl_group = $_REQUEST['tbl_group'];
// include the table with the exact name of the group if such exists
// include the table with the exact name of the group if such
// exists
$groupTable = $GLOBALS['dbi']->getTablesFull(
$db, $tbl_group, false, null, $limit_offset,
$limit_count, $sort, $sort_order, $tbl_type
@ -4821,9 +4823,9 @@ class Util
$tables = $GLOBALS['dbi']->getTables($db);
$total_num_tables = count($tables);
if (isset($sub_part) && $sub_part == '_export') {
// (don't fetch only a subset if we are coming from db_export.php,
// because I think it's too risky to display only a subset of the
// table names when exporting a db)
// (don't fetch only a subset if we are coming from
// db_export.php, because I think it's too risky to display only
// a subset of the table names when exporting a db)
/**
*
* @todo Page selector for table names?

2
libraries/VersionInformation.php
View File

@ -203,7 +203,7 @@ class VersionInformation
$mysqlVersions = $release->mysql_versions;
$mysqlConditions = explode(",", $mysqlVersions);
foreach ($mysqlConditions as $mysqlCondition) {
if (! $this->evaluateVersionCondition('MySQL', $mysqlCondition)) {
if (!$this->evaluateVersionCondition('MySQL', $mysqlCondition)) {
continue 2;
}
}

18
libraries/db_designer.lib.php
View File

@ -326,7 +326,8 @@ function PMA_getDatabaseTables(
*/
function PMA_getNewRelationPanel()
{
return PMA\libraries\Template::get('database/designer/new_relation_panel')->render();
return PMA\libraries\Template::get('database/designer/new_relation_panel')
->render();
}
/**
@ -336,7 +337,8 @@ function PMA_getNewRelationPanel()
*/
function PMA_getDeleteRelationPanel()
{
return PMA\libraries\Template::get('database/designer/delete_relation_panel')->render();
return PMA\libraries\Template::get('database/designer/delete_relation_panel')
->render();
}
/**
@ -356,7 +358,8 @@ function PMA_getOptionsPanel()
*/
function PMA_getRenameToPanel()
{
return PMA\libraries\Template::get('database/designer/rename_to_panel')->render();
return PMA\libraries\Template::get('database/designer/rename_to_panel')
->render();
}
/**
@ -366,7 +369,8 @@ function PMA_getRenameToPanel()
*/
function PMA_getHavingQueryPanel()
{
return PMA\libraries\Template::get('database/designer/having_query_panel')->render();
return PMA\libraries\Template::get('database/designer/having_query_panel')
->render();
}
/**
@ -376,7 +380,8 @@ function PMA_getHavingQueryPanel()
*/
function PMA_getAggregateQueryPanel()
{
return PMA\libraries\Template::get('database/designer/aggregate_query_panel')->render();
return PMA\libraries\Template::get('database/designer/aggregate_query_panel')
->render();
}
/**
@ -386,7 +391,8 @@ function PMA_getAggregateQueryPanel()
*/
function PMA_getWhereQueryPanel()
{
return PMA\libraries\Template::get('database/designer/where_query_panel')->render();
return PMA\libraries\Template::get('database/designer/where_query_panel')
->render();
}
/**

6
libraries/import.lib.php
View File

@ -1088,8 +1088,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
$size = 10;
}
$tempSQLStr .= PMA\libraries\Util::backquote($tables[$i][COL_NAMES][$j]) . " "
. $type_array[$analyses[$i][TYPES][$j]];
$tempSQLStr .= PMA\libraries\Util::backquote(
$tables[$i][COL_NAMES][$j]
) . " "
. $type_array[$analyses[$i][TYPES][$j]];
if ($analyses[$i][TYPES][$j] != GEOMETRY) {
$tempSQLStr .= "(" . $size . ")";
}

5
libraries/index.lib.php
View File

@ -26,7 +26,10 @@ function PMA_getHtmlForDisplayIndexes()
$html_output .= PMA\libraries\Util::getDivForSliderEffect(
'indexes', __('Indexes')
);
$html_output .= PMA\libraries\Index::getHtmlForIndexes($GLOBALS['table'], $GLOBALS['db']);
$html_output .= PMA\libraries\Index::getHtmlForIndexes(
$GLOBALS['table'],
$GLOBALS['db']
);
$html_output .= '<fieldset class="tblFooters print_ignore" style="text-align: '
. 'left;"><form action="tbl_indexes.php" method="post">';
$html_output .= PMA_URL_getHiddenInputs(

32
libraries/insert_edit.lib.php
View File

@ -412,7 +412,10 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
. ' ' . $onChangeClause
. ' tabindex="' . ($tabindex + $tabindex_for_function) . '"'
. ' id="field_' . $idindex . '_1">';
$html_output .= PMA\libraries\Util::getFunctionsForField($column, $insert_mode) . "\n";
$html_output .= PMA\libraries\Util::getFunctionsForField(
$column,
$insert_mode
) . "\n";
$html_output .= '</select>' . "\n";
$html_output .= '</td>' . "\n";
@ -762,7 +765,9 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
$the_class = 'char';
$textAreaRows = $GLOBALS['cfg']['CharTextareaRows'];
$textareaCols = $GLOBALS['cfg']['CharTextareaCols'];
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec($column['Type']);
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
$column['Type']
);
$maxlength = $extracted_columnspec['spec_in_brackets'];
} elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
&& /*overload*/mb_strstr($column['pma_type'], 'longtext')
@ -1132,7 +1137,9 @@ function PMA_getHTMLinput(
}
$input_min_max = false;
if (in_array($column['True_Type'], $GLOBALS['PMA_Types']->getIntegerTypes())) {
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec($column['Type']);
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
$column['Type']
);
$is_unsigned = $extracted_columnspec['unsigned'];
$min_max_values = $GLOBALS['PMA_Types']->getIntegerRange(
$column['True_Type'], ! $is_unsigned
@ -1714,7 +1721,9 @@ function PMA_getSpecialCharsAndBackupFieldForInsertingMode(
$trueType = $column['True_Type'];
if ($trueType == 'bit') {
$special_chars = PMA\libraries\Util::convertBitDefaultValue($column['Default']);
$special_chars = PMA\libraries\Util::convertBitDefaultValue(
$column['Default']
);
} elseif (substr($trueType, 0, 9) == 'timestamp'
|| $trueType == 'datetime'
|| $trueType == 'time'
@ -1726,7 +1735,9 @@ function PMA_getSpecialCharsAndBackupFieldForInsertingMode(
$special_chars = htmlspecialchars($column['Default']);
}
$backup_field = '';
$special_chars_encoded = PMA\libraries\Util::duplicateFirstNewline($special_chars);
$special_chars_encoded = PMA\libraries\Util::duplicateFirstNewline(
$special_chars
);
return array(
$real_null_value, $data, $special_chars,
$backup_field, $special_chars_encoded
@ -2183,7 +2194,7 @@ function PMA_getCurrentValueAsAnArrayForMultipleEdit( $multi_edit_funcs,
|| $multi_edit_funcs[$key] == "ENCRYPT"))
) {
return $multi_edit_funcs[$key] . '(' . $current_value . ",'"
. PMA\libraries\Util::sqlAddSlashes($multi_edit_salt[$key]) . "')";
. PMA\libraries\Util::sqlAddSlashes($multi_edit_salt[$key]) . "')";
} else {
return $multi_edit_funcs[$key] . '(' . $current_value . ')';
}
@ -2323,7 +2334,8 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
$current_value = implode(
',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]
);
$current_value = "'" . PMA\libraries\Util::sqlAddSlashes($current_value) . "'";
$current_value = "'"
. PMA\libraries\Util::sqlAddSlashes($current_value) . "'";
} else {
$current_value = "''";
}
@ -2346,11 +2358,13 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
$current_value = '0x' . $current_value;
} elseif ($type == 'bit') {
$current_value = preg_replace('/[^01]/', '0', $current_value);
$current_value = "b'" . PMA\libraries\Util::sqlAddSlashes($current_value) . "'";
$current_value = "b'" . PMA\libraries\Util::sqlAddSlashes($current_value)
. "'";
} elseif (! ($type == 'datetime' || $type == 'timestamp')
|| $current_value != 'CURRENT_TIMESTAMP'
) {
$current_value = "'" . PMA\libraries\Util::sqlAddSlashes($current_value) . "'";
$current_value = "'" . PMA\libraries\Util::sqlAddSlashes($current_value)
. "'";
}
// Was the Null checkbox checked for this field?

4
libraries/js_escape.lib.php
View File

@ -33,7 +33,9 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true)
$a_string = str_replace('#', '\\#', $a_string);
}
return (($add_backquotes) ? PMA\libraries\Util::backquote($a_string) : $a_string);
return $add_backquotes
? PMA\libraries\Util::backquote($a_string)
: $a_string;
} // end of the 'PMA_jsFormat()' function
/**

4
libraries/mult_submits.inc.php
View File

@ -90,7 +90,9 @@ if (! empty($submit_mult)
include 'db_export.php';
exit;
case 'show_create':
$show_create = PMA\libraries\Template::get('database/structure/show_create')
$show_create = PMA\libraries\Template::get(
'database/structure/show_create'
)
->render(
array(
'db' => $GLOBALS['db'],

15
libraries/mult_submits.lib.php
View File

@ -180,7 +180,8 @@ function PMA_buildOrExecuteQueryForMulti(
case 'primary_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table) . (empty($primary)
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
. (empty($primary)
? ''
: ' DROP PRIMARY KEY,') . ' ADD PRIMARY KEY( '
: ', ')
@ -190,7 +191,8 @@ function PMA_buildOrExecuteQueryForMulti(
case 'index_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table) . ' ADD INDEX( '
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
. ' ADD INDEX( '
: ', ')
. PMA\libraries\Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
@ -198,7 +200,8 @@ function PMA_buildOrExecuteQueryForMulti(
case 'unique_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table) . ' ADD UNIQUE( '
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
. ' ADD UNIQUE( '
: ', ')
. PMA\libraries\Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
@ -206,7 +209,8 @@ function PMA_buildOrExecuteQueryForMulti(
case 'spatial_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table) . ' ADD SPATIAL( '
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
. ' ADD SPATIAL( '
: ', ')
. PMA\libraries\Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');
@ -214,7 +218,8 @@ function PMA_buildOrExecuteQueryForMulti(
case 'fulltext_fld':
$sql_query .= (empty($sql_query)
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table) . ' ADD FULLTEXT( '
? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
. ' ADD FULLTEXT( '
: ', ')
. PMA\libraries\Util::backquote($selected[$i])
. (($i == $selected_cnt-1) ? ');' : '');

33
libraries/pmd_common.php
View File

@ -316,16 +316,16 @@ function PMA_deletePage($pg)
}
$query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
. " WHERE " . PMA\libraries\Util::backquote('pdf_page_number') . " = " . $pg;
. "." . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
. " WHERE " . PMA\libraries\Util::backquote('pdf_page_number') . " = " . $pg;
$success = PMA_queryAsControlUser(
$query, true, PMA\libraries\DatabaseInterface::QUERY_STORE
);
if ($success) {
$query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
. " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . $pg;
. "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
. " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . $pg;
$success = PMA_queryAsControlUser(
$query, true, PMA\libraries\DatabaseInterface::QUERY_STORE
);
@ -445,12 +445,21 @@ function PMA_saveTablePositions($pg)
return false;
}
$query = "DELETE FROM " . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
. "." . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['table_coords'])
. " WHERE `db_name` = '" . PMA\libraries\Util::sqlAddSlashes($_REQUEST['db']) . "'"
. " AND `pdf_page_number` = '" . PMA\libraries\Util::sqlAddSlashes($pg) . "'";
$query = "DELETE FROM "
. PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
. "." . PMA\libraries\Util::backquote(
$GLOBALS['cfgRelation']['table_coords']
)
. " WHERE `db_name` = '" . PMA\libraries\Util::sqlAddSlashes($_REQUEST['db'])
. "'"
. " AND `pdf_page_number` = '" . PMA\libraries\Util::sqlAddSlashes($pg)
. "'";
$res = PMA_queryAsControlUser($query, true, PMA\libraries\DatabaseInterface::QUERY_STORE);
$res = PMA_queryAsControlUser(
$query,
true,
PMA\libraries\DatabaseInterface::QUERY_STORE
);
if (!$res) {
return (boolean)$res;
@ -742,7 +751,8 @@ function PMA_saveDesignerSetting($index, $value)
$orig_data[$index] = $value;
$orig_data = json_encode($orig_data);
$save_query = "UPDATE " . PMA\libraries\Util::backquote($cfgDesigner['db'])
$save_query = "UPDATE "
. PMA\libraries\Util::backquote($cfgDesigner['db'])
. "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
. " SET settings_data = '" . $orig_data . "'"
. " WHERE username = '"
@ -752,7 +762,8 @@ function PMA_saveDesignerSetting($index, $value)
} else {
$save_data = array($index => $value);
$query = "INSERT INTO " . PMA\libraries\Util::backquote($cfgDesigner['db'])
$query = "INSERT INTO "
. PMA\libraries\Util::backquote($cfgDesigner['db'])
. "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
. " (username, settings_data)"
. " VALUES('" . $cfgDesigner['user'] . "',"

149
libraries/relation.lib.php
View File

@ -192,7 +192,10 @@ function PMA_getRelationsParamDiagnostic($cfgRelation)
'Please see the documentation on how to'
. ' update your column_info table. '
);
$retval .= PMA\libraries\Util::showDocu('config', 'cfg_Servers_column_info');
$retval .= PMA\libraries\Util::showDocu(
'config',
'cfg_Servers_column_info'
);
$retval .= '</td></tr>';
}
$retval .= PMA_getDiagMessageForParameter(
@ -654,7 +657,9 @@ function PMA_tryUpgradeTransformations()
);
$query = 'SHOW COLUMNS FROM '
. PMA\libraries\Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
. '.' . PMA\libraries\Util::backquote($GLOBALS['cfg']['Server']['column_info'])
. '.' . PMA\libraries\Util::backquote(
$GLOBALS['cfg']['Server']['column_info']
)
. ' WHERE Field IN (\'' . implode('\', \'', $new_cols) . '\')';
$result = PMA_queryAsControlUser(
$query, false, PMA\libraries\DatabaseInterface::QUERY_STORE
@ -680,7 +685,9 @@ function PMA_tryUpgradeTransformations()
// to with set in config.inc.php
$query = str_replace(
'`pma__column_info`',
PMA\libraries\Util::backquote($GLOBALS['cfg']['Server']['column_info']),
PMA\libraries\Util::backquote(
$GLOBALS['cfg']['Server']['column_info']
),
$query
);
$GLOBALS['dbi']->tryMultiQuery($query, $GLOBALS['controllink']);
@ -719,14 +726,15 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
if ($cfgRelation['relwork'] && ($source == 'both' || $source == 'internal')) {
$rel_query = '
SELECT `master_field`,
`foreign_db`,
`foreign_table`,
`foreign_field`
FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
SELECT `master_field`,
`foreign_db`,
`foreign_table`,
`foreign_field`
FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['relation']) . '
WHERE `master_db` = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'
AND `master_table` = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\' ';
WHERE `master_db` = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'
AND `master_table` = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\' ';
if (/*overload*/mb_strlen($column)) {
$rel_query .= ' AND `master_field` = '
. '\'' . PMA\libraries\Util::sqlAddSlashes($column) . '\'';
@ -801,11 +809,12 @@ function PMA_getDisplayField($db, $table)
*/
if ($cfgRelation['displaywork']) {
$disp_query = '
SELECT `display_field`
FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
SELECT `display_field`
FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_info']) . '
WHERE `db_name` = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'
AND `table_name` = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'';
WHERE `db_name` = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'
AND `table_name` = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'';
$row = $GLOBALS['dbi']->fetchSingleRow(
$disp_query, 'ASSOC', $GLOBALS['controllink']
@ -882,10 +891,11 @@ function PMA_getDbComment($db)
if ($cfgRelation['commwork']) {
// pmadb internal db comment
$com_qry = "
SELECT `comment`
FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['column_info']) . "
WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($db) . "'
SELECT `comment`
FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['column_info'])
. "
WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($db) . "'
AND table_name = ''
AND column_name = '(db_comment)'";
$com_rs = PMA_queryAsControlUser(
@ -917,10 +927,11 @@ function PMA_getDbComments()
if ($cfgRelation['commwork']) {
// pmadb internal db comment
$com_qry = "
SELECT `db_name`, `comment`
FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['column_info']) . "
WHERE `column_name` = '(db_comment)'";
SELECT `db_name`, `comment`
FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['column_info'])
. "
WHERE `column_name` = '(db_comment)'";
$com_rs = PMA_queryAsControlUser(
$com_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE
);
@ -970,7 +981,8 @@ function PMA_setDbComment($db, $comment = '')
$upd_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
. PMA\libraries\Util::backquote($cfgRelation['column_info'])
. ' WHERE `db_name` = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'
. ' WHERE `db_name` = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\'
AND `table_name` = \'\'
AND `column_name` = \'(db_comment)\'';
}
@ -1113,12 +1125,12 @@ function PMA_purgeHistory($username)
}
$search_query = '
SELECT `timevalue`
FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
SELECT `timevalue`
FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['history']) . '
WHERE `username` = \'' . PMA\libraries\Util::sqlAddSlashes($username) . '\'
ORDER BY `timevalue` DESC
LIMIT ' . $GLOBALS['cfg']['QueryHistoryMax'] . ', 1';
WHERE `username` = \'' . PMA\libraries\Util::sqlAddSlashes($username) . '\'
ORDER BY `timevalue` DESC
LIMIT ' . $GLOBALS['cfg']['QueryHistoryMax'] . ', 1';
if ($max_time = $GLOBALS['dbi']->fetchValue(
$search_query, 0, 0, $GLOBALS['controllink']
@ -1127,7 +1139,8 @@ function PMA_purgeHistory($username)
'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
. PMA\libraries\Util::backquote($cfgRelation['history']) . '
WHERE `username` = \'' . PMA\libraries\Util::sqlAddSlashes($username) . '\'
WHERE `username` = \'' . PMA\libraries\Util::sqlAddSlashes($username)
. '\'
AND `timevalue` <= \'' . $max_time . '\''
);
}
@ -1344,13 +1357,19 @@ function PMA_getForeignData(
. '.' . PMA\libraries\Util::backquote($foreign_table);
$f_query_filter = empty($foreign_filter) ? '' : ' WHERE '
. PMA\libraries\Util::backquote($foreign_field)
. ' LIKE "%' . PMA\libraries\Util::sqlAddSlashes($foreign_filter, true) . '%"'
. ' LIKE "%' . PMA\libraries\Util::sqlAddSlashes(
$foreign_filter,
true
) . '%"'
. (
($foreign_display == false)
($foreign_display == false)
? ''
: ' OR ' . PMA\libraries\Util::backquote($foreign_display)
. ' LIKE "%' . PMA\libraries\Util::sqlAddSlashes($foreign_filter, true)
. '%"'
. ' LIKE "%' . PMA\libraries\Util::sqlAddSlashes(
$foreign_filter,
true
)
. '%"'
);
$f_query_order = ($foreign_display == false) ? '' :' ORDER BY '
. PMA\libraries\Util::backquote($foreign_table) . '.'
@ -1424,10 +1443,15 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
$table_query = 'UPDATE '
. PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
. PMA\libraries\Util::backquote($cfgRelation['table_info'])
. ' SET display_field = \'' . PMA\libraries\Util::sqlAddSlashes($new_name) . '\''
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND display_field = \'' . PMA\libraries\Util::sqlAddSlashes($field) . '\'';
. ' SET display_field = \'' . PMA\libraries\Util::sqlAddSlashes(
$new_name
) . '\''
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND display_field = \'' . PMA\libraries\Util::sqlAddSlashes($field)
. '\'';
PMA_queryAsControlUser($table_query);
}
@ -1435,19 +1459,29 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
$table_query = 'UPDATE '
. PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
. PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' SET master_field = \'' . PMA\libraries\Util::sqlAddSlashes($new_name) . '\''
. ' WHERE master_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND master_table = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND master_field = \'' . PMA\libraries\Util::sqlAddSlashes($field) . '\'';
. ' SET master_field = \'' . PMA\libraries\Util::sqlAddSlashes(
$new_name
) . '\''
. ' WHERE master_db = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\''
. ' AND master_table = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND master_field = \'' . PMA\libraries\Util::sqlAddSlashes($field)
. '\'';
PMA_queryAsControlUser($table_query);
$table_query = 'UPDATE '
. PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
. PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' SET foreign_field = \'' . PMA\libraries\Util::sqlAddSlashes($new_name) . '\''
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND foreign_table = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND foreign_field = \'' . PMA\libraries\Util::sqlAddSlashes($field) . '\'';
. ' SET foreign_field = \'' . PMA\libraries\Util::sqlAddSlashes(
$new_name
) . '\''
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\''
. ' AND foreign_table = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND foreign_field = \'' . PMA\libraries\Util::sqlAddSlashes($field)
. '\'';
PMA_queryAsControlUser($table_query);
} // end if relwork
@ -1476,12 +1510,15 @@ function PMA_REL_renameSingleTable($table,
. PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
. PMA\libraries\Util::backquote($GLOBALS['cfgRelation'][$table])
. ' SET '
. $db_field . ' = \'' . PMA\libraries\Util::sqlAddSlashes($target_db) . '\', '
. $table_field . ' = \'' . PMA\libraries\Util::sqlAddSlashes($target_table) . '\''
. $db_field . ' = \'' . PMA\libraries\Util::sqlAddSlashes($target_db)
. '\', '
. $table_field . ' = \'' . PMA\libraries\Util::sqlAddSlashes($target_table)
. '\''
. ' WHERE '
. $db_field . ' = \'' . PMA\libraries\Util::sqlAddSlashes($source_db) . '\''
. ' AND '
. $table_field . ' = \'' . PMA\libraries\Util::sqlAddSlashes($source_table) . '\'';
. $table_field . ' = \'' . PMA\libraries\Util::sqlAddSlashes($source_table)
. '\'';
PMA_queryAsControlUser($query);
}
@ -1581,11 +1618,17 @@ function PMA_REL_renameTable($source_db, $target_db, $source_table, $target_tabl
// update data for hidden table
$query = "UPDATE "
. PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
. PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['navigationhiding'])
. " SET db_name = '" . PMA\libraries\Util::sqlAddSlashes($target_db) . "',"
. " item_name = '" . PMA\libraries\Util::sqlAddSlashes($target_table) . "'"
. " WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($source_db) . "'"
. " AND item_name = '" . PMA\libraries\Util::sqlAddSlashes($source_table) . "'"
. PMA\libraries\Util::backquote(
$GLOBALS['cfgRelation']['navigationhiding']
)
. " SET db_name = '" . PMA\libraries\Util::sqlAddSlashes($target_db)
. "',"
. " item_name = '" . PMA\libraries\Util::sqlAddSlashes($target_table)
. "'"
. " WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($source_db)
. "'"
. " AND item_name = '" . PMA\libraries\Util::sqlAddSlashes($source_table)
. "'"
. " AND item_type = 'table'";
PMA_queryAsControlUser($query);
}

192
libraries/relation_cleanup.lib.php
View File

@ -23,36 +23,50 @@ function PMA_relationsCleanupColumn($db, $table, $column)
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['commwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND column_name = \'' . PMA\libraries\Util::sqlAddSlashes($column) . '\'';
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND column_name = \'' . PMA\libraries\Util::sqlAddSlashes($column)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['displaywork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND display_field = \'' . PMA\libraries\Util::sqlAddSlashes($column) . '\'';
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND display_field = \'' . PMA\libraries\Util::sqlAddSlashes($column)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['relwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' WHERE master_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND master_table = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND master_field = \'' . PMA\libraries\Util::sqlAddSlashes($column) . '\'';
. ' WHERE master_db = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\''
. ' AND master_table = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND master_field = \'' . PMA\libraries\Util::sqlAddSlashes($column)
. '\'';
PMA_queryAsControlUser($remove_query);
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND foreign_table = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND foreign_field = \'' . PMA\libraries\Util::sqlAddSlashes($column) . '\'';
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\''
. ' AND foreign_table = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND foreign_field = \'' . PMA\libraries\Util::sqlAddSlashes($column)
. '\'';
PMA_queryAsControlUser($remove_query);
}
}
@ -70,57 +84,74 @@ function PMA_relationsCleanupTable($db, $table)
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['commwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'';
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['displaywork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'';
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['pdfwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'';
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['relwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' WHERE master_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND master_table = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'';
. ' WHERE master_db = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\''
. ' AND master_table = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'';
PMA_queryAsControlUser($remove_query);
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND foreign_table = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'';
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\''
. ' AND foreign_table = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['uiprefswork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'';
. ' AND table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['navwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\''
. ' AND (table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' OR (item_name = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\''
. ' AND (table_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' OR (item_name = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\''
. ' AND item_type = \'table\'))';
PMA_queryAsControlUser($remove_query);
}
@ -138,73 +169,86 @@ function PMA_relationsCleanupDatabase($db)
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['commwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['bookmarkwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['bookmark'])
. ' WHERE dbase = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['displaywork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['pdfwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['relwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' WHERE master_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
. ' WHERE master_db = \''
. PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
. ' WHERE foreign_db = \'' . PMA\libraries\Util::sqlAddSlashes($db)
. '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['uiprefswork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['navwork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['savedsearcheswork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['savedsearches'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['centralcolumnswork']) {
$remove_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['central_columns'])
. ' WHERE db_name = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
@ -223,72 +267,92 @@ function PMA_relationsCleanupUser($username)
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['bookmarkwork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['bookmark'])
. " WHERE `user` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `user` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['historywork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['history'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['recentwork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['recent'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['favoritework']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['favorite'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['uiprefswork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['userconfigwork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['userconfig'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['menuswork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['users'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['navwork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['savedsearcheswork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['savedsearches'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['designersettingswork']) {
$remove_query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
$remove_query = "DELETE FROM "
. PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['designer_settings'])
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username) . "'";
. " WHERE `username` = '" . PMA\libraries\Util::sqlAddSlashes($username)
. "'";
PMA_queryAsControlUser($remove_query);
}
}

3
libraries/replication.inc.php
View File

@ -27,7 +27,8 @@ if (! empty($_REQUEST['master_connection'])) {
);
if ($server_slave_multi_replication) {
$GLOBALS['dbi']->query(
"SET @@default_master_connection = '" . PMA\libraries\Util::sqlAddSlashes(
"SET @@default_master_connection = '"
. PMA\libraries\Util::sqlAddSlashes(
$_REQUEST['master_connection']
) . "'"
);

4
libraries/server_engines.lib.php
View File

@ -96,7 +96,9 @@ function PMA_getHtmlForSpecifiedServerEngines()
$html .= '<h2>' . "\n"
. PMA\libraries\Util::getImage('b_engine.png')
. ' ' . htmlspecialchars($engine_plugin->getTitle()) . "\n"
. ' ' . PMA\libraries\Util::showMySQLDocu($engine_plugin->getMysqlHelpPage())
. ' ' . PMA\libraries\Util::showMySQLDocu(
$engine_plugin->getMysqlHelpPage()
)
. "\n" . '</h2>' . "\n\n";
$html .= '<p>' . "\n"
. ' <em>' . "\n"

25
libraries/server_privileges.lib.php
View File

@ -3341,22 +3341,28 @@ function PMA_getHtmlForAllTableSpecificRights(
$onePrivilege['grant'] = $row['Grant_priv'] == 'Y';
$onePrivilege['tablePrivs'] = ! empty($row['Table_priv'])
|| ! empty($row['Column_priv']);
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
$paramDbName = $row['Db'];
} elseif ($type == 'table') {
$name = $row['Table_name'];
$onePrivilege['grant'] = in_array('Grant', explode(',', $row['Table_priv']));
$onePrivilege['grant'] = in_array(
'Grant',
explode(',', $row['Table_priv'])
);
$onePrivilege['columnPrivs'] = ! empty($row['Column_priv']);
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
$paramDbName = $dbname;
$paramTableName = $row['Table_name'];
} else { // routine
$name = $row['Routine_name'];
$onePrivilege['grant'] = in_array('Grant', explode(',', $row['Proc_priv']));
$onePrivilege['grant'] = in_array(
'Grant',
explode(',', $row['Proc_priv'])
);
$privs = array(
'Alter_routine_priv' => 'N',
@ -3370,7 +3376,10 @@ function PMA_getHtmlForAllTableSpecificRights(
$privs[$priv . '_priv'] = 'Y';
}
}
$onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($privs, true));
$onePrivilege['privileges'] = join(
',',
PMA_extractPrivInfo($privs, true)
);
$paramDbName = $dbname;
$paramRoutineName = $row['Routine_name'];
@ -4866,7 +4875,11 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
&& ! $user_does_not_exists
) {
//change login information
$html_output .= PMA_getHtmlForChangePassword('edit_other', $username, $hostname);
$html_output .= PMA_getHtmlForChangePassword(
'edit_other',
$username,
$hostname
);
$html_output .= PMA_getChangeLoginInformationHtmlForm($username, $hostname);
}
$html_output .= '</div>';

3
libraries/server_status_monitor.lib.php
View File

@ -280,7 +280,8 @@ function PMA_getHtmlForSettingsDialog()
$retval .= PMA\libraries\Util::getImage('b_chart.png') . __('Add chart');
$retval .= '</a>';
$retval .= '<a href="#rearrangeCharts">';
$retval .= PMA\libraries\Util::getImage('b_tblops.png') . __('Enable charts dragging');
$retval .= PMA\libraries\Util::getImage('b_tblops.png')
. __('Enable charts dragging');
$retval .= '</a>';
$retval .= '<div class="clearfloat paddingtop"></div>';
$retval .= '<div class="floatleft">';

4
libraries/server_status_queries.lib.php
View File

@ -125,7 +125,9 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
$retval .= '">';
$retval .= '<th class="name">' . htmlspecialchars($name) . '</th>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(PMA\libraries\Util::formatNumber($value, 5, 0, true));
$retval .= htmlspecialchars(
PMA\libraries\Util::formatNumber($value, 5, 0, true)
);
$retval .= '</td>';
$retval .= '<td class="value">';
$retval .= htmlspecialchars(

8
libraries/server_status_variables.lib.php
View File

@ -256,7 +256,9 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
}
}
if (substr($name, -1) === '%') {
$retval .= htmlspecialchars(PMA\libraries\Util::formatNumber($value, 0, 2)) . ' %';
$retval .= htmlspecialchars(
PMA\libraries\Util::formatNumber($value, 0, 2)
) . ' %';
} elseif (strpos($name, 'Uptime') !== false) {
$retval .= htmlspecialchars(
PMA\libraries\Util::timespanFormat($value)
@ -269,7 +271,9 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
. htmlspecialchars(PMA\libraries\Util::formatNumber($value, 3, 1))
. '</abbr>';
} elseif (is_numeric($value)) {
$retval .= htmlspecialchars(PMA\libraries\Util::formatNumber($value, 3, 1));
$retval .= htmlspecialchars(
PMA\libraries\Util::formatNumber($value, 3, 1)
);
} else {
$retval .= htmlspecialchars($value);
}

18
libraries/server_user_groups.lib.php
View File

@ -27,7 +27,8 @@ function PMA_getHtmlForListingUsersofAGroup($userGroup)
$usersTable = PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['users']);
$sql_query = "SELECT `username` FROM " . $usersTable
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup) . "'";
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup)
. "'";
$result = PMA_queryAsControlUser($sql_query, false);
if ($result) {
if ($GLOBALS['dbi']->numRows($result) == 0) {
@ -107,7 +108,8 @@ function PMA_getHtmlForUserGroupsTable()
)
)
. '">'
. PMA\libraries\Util::getIcon('b_usrlist.png', __('View users')) . '</a>';
. PMA\libraries\Util::getIcon('b_usrlist.png', __('View users'))
. '</a>';
$html_output .= '&nbsp;&nbsp;';
$html_output .= '<a class="" href="server_user_groups.php'
. PMA_URL_getCommon(
@ -188,10 +190,12 @@ function PMA_deleteUserGroup($userGroup)
$groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
$sql_query = "DELETE FROM " . $userTable
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup) . "'";
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup)
. "'";
PMA_queryAsControlUser($sql_query, true);
$sql_query = "DELETE FROM " . $groupTable
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup) . "'";
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup)
. "'";
PMA_queryAsControlUser($sql_query, true);
}
@ -248,7 +252,8 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
$groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
. "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
$sql_query = "SELECT * FROM " . $groupTable
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup) . "'";
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup)
. "'";
$result = PMA_queryAsControlUser($sql_query, false);
if ($result) {
while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
@ -334,7 +339,8 @@ function PMA_editUserGroup($userGroup, $new = false)
if (! $new) {
$sql_query = "DELETE FROM " . $groupTable
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup) . "';";
. " WHERE `usergroup`='" . PMA\libraries\Util::sqlAddSlashes($userGroup)
. "';";
PMA_queryAsControlUser($sql_query, true);
}

47
libraries/sql.lib.php
View File

@ -58,7 +58,11 @@ function PMA_handleSortOrder(
}
// Remove the name of the table from the retrieved field name.
$sortCol = str_replace(PMA\libraries\Util::backquote($table) . '.', '', $sortCol);
$sortCol = str_replace(
PMA\libraries\Util::backquote($table) . '.',
'',
$sortCol
);
// Create the new query.
$full_sql_query = SqlParser\Utils\Query::replaceClause(
@ -449,7 +453,11 @@ function PMA_getValuesForColumn($db, $table, $column)
$field_info_query = $GLOBALS['dbi']->getColumnsSql($db, $table, $column);
$field_info_result = $GLOBALS['dbi']->fetchResult(
$field_info_query, null, null, null, PMA\libraries\DatabaseInterface::QUERY_STORE
$field_info_query,
null,
null,
null,
PMA\libraries\DatabaseInterface::QUERY_STORE
);
$values = PMA\libraries\Util::parseEnumSetValues($field_info_result[0]['Type']);
@ -535,10 +543,12 @@ function PMA_getHtmlForBookmark($displayParts, $cfgBookmark, $sql_query, $db,
$html .= '</legend>';
$html .= '<div class="formelement">';
$html .= '<label>' . __('Label:');
$html .= '<input type="text" name="bkm_fields[bkm_label]" value="" /></label>';
$html .= '<input type="text" name="bkm_fields[bkm_label]" value="" />' .
'</label>';
$html .= '</div>';
$html .= '<div class="formelement">';
$html .= '<label><input type="checkbox" name="bkm_all_users" value="true" />';
$html .= '<label>' .
'<input type="checkbox" name="bkm_all_users" value="true" />';
$html .= __('Let every user access this bookmark') . '</label>';
$html .= '</div>';
$html .= '<div class="clearfloat"></div>';
@ -881,9 +891,9 @@ function PMA_getDefaultSqlQueryForBrowse($db, $table)
if ($primaryKey != null) {
$defaultOrderByClause = ' ORDER BY '
. PMA\libraries\Util::backquote($table) . '.'
. PMA\libraries\Util::backquote($primaryKey) . ' '
. $GLOBALS['cfg']['TablePrimaryKeyOrder'];
. PMA\libraries\Util::backquote($table) . '.'
. PMA\libraries\Util::backquote($primaryKey) . ' '
. $GLOBALS['cfg']['TablePrimaryKeyOrder'];
}
}
@ -1163,7 +1173,9 @@ function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofil
$num_rows = 0;
$unlim_num_rows = 0;
} else { // If we don't ask to see the php code
if (isset($_SESSION['profiling']) && PMA\libraries\Util::profilingSupported()) {
if (isset($_SESSION['profiling'])
&& PMA\libraries\Util::profilingSupported()
) {
$GLOBALS['dbi']->query('SET PROFILING=1;');
}
@ -1197,7 +1209,9 @@ function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofil
);
// Grabs the profiling results
if (isset($_SESSION['profiling']) && PMA\libraries\Util::profilingSupported()) {
if (isset($_SESSION['profiling'])
&& PMA\libraries\Util::profilingSupported()
) {
$profiling_results = $GLOBALS['dbi']->fetchResult('SHOW PROFILE;');
}
@ -1221,7 +1235,10 @@ function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofil
&& /*overload*/mb_strlen($table)
) {
// to refresh the list of indexes (Ajax mode)
$extra_data['indexes_list'] = PMA\libraries\Index::getHtmlForIndexes($table, $db);
$extra_data['indexes_list'] = PMA\libraries\Index::getHtmlForIndexes(
$table,
$db
);
}
}
@ -1641,7 +1658,10 @@ function PMA_getMessageIfMissingColumnIndex($table, $db, $editable, $has_unique)
. ' Grid edit, checkbox, Edit, Copy and Delete features'
. ' are not available. %s'
),
PMA\libraries\Util::showDocu('config', 'cfg_RowActionLinksWithoutUnique')
PMA\libraries\Util::showDocu(
'config',
'cfg_RowActionLinksWithoutUnique'
)
)
);
} elseif (! empty($table) && ! $has_unique) {
@ -1652,7 +1672,10 @@ function PMA_getMessageIfMissingColumnIndex($table, $db, $editable, $has_unique)
. ' Grid edit, Edit, Copy and Delete features may result in'
. ' undesired behavior. %s'
),
PMA\libraries\Util::showDocu('config', 'cfg_RowActionLinksWithoutUnique')
PMA\libraries\Util::showDocu(
'config',
'cfg_RowActionLinksWithoutUnique'
)
)
);
} else {

3
libraries/sql_query_form.lib.php
View File

@ -268,7 +268,8 @@ function PMA_getHtmlForSqlQueryFormInsert(
. 'multiple="multiple" ondblclick="insertValueQuery()">';
foreach ($columns_list as $field) {
$html .= '<option value="'
. PMA\libraries\Util::backquote(htmlspecialchars($field['Field'])) . '"';
. PMA\libraries\Util::backquote(htmlspecialchars($field['Field']))
. '"';
if (isset($field['Field'])
&& /*overload*/mb_strlen($field['Field'])
&& isset($field['Comment'])

33
libraries/tbl_columns_definition_form.inc.php
View File

@ -19,7 +19,9 @@ if (!defined('PHPMYADMIN')) {
*/
require_once 'libraries/util.lib.php';
PMA\libraries\Util::checkParameters(array('server', 'db', 'table', 'action', 'num_fields'));
PMA\libraries\Util::checkParameters(
array('server', 'db', 'table', 'action', 'num_fields')
);
global $db, $table;
@ -114,7 +116,9 @@ if (isset($field_fulltext) && is_array($field_fulltext)) {
$submit_fulltext[$fulltext_indexkey] = $fulltext_indexkey;
}
}
if (isset($_REQUEST['submit_num_fields']) || isset($_REQUEST['submit_partition_change'])) {
if (isset($_REQUEST['submit_num_fields'])
|| isset($_REQUEST['submit_partition_change'])
) {
//if adding new fields, set regenerate to keep the original values
$regenerate = 1;
}
@ -265,7 +269,9 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
}
if (isset($columnMeta['Type'])) {
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec($columnMeta['Type']);
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
$columnMeta['Type']
);
if ($extracted_columnspec['type'] == 'bit') {
$columnMeta['Default']
= PMA\libraries\Util::convertBitDefaultValue($columnMeta['Default']);
@ -394,16 +400,17 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
);
} // end for
$html = PMA\libraries\Template::get('columns_definitions/column_definitions_form')->render(
array(
'is_backup' => $is_backup,
'fields_meta' => isset($fields_meta) ? $fields_meta : null,
'mimework' => $cfgRelation['mimework'],
'action' => $action,
'form_params' => $form_params,
'content_cells' => $content_cells,
)
);
$html = PMA\libraries\Template::get('columns_definitions/column_definitions_form')
->render(
array(
'is_backup' => $is_backup,
'fields_meta' => isset($fields_meta) ? $fields_meta : null,
'mimework' => $cfgRelation['mimework'],
'action' => $action,
'form_params' => $form_params,
'content_cells' => $content_cells,
)
);
unset($form_params);

59
libraries/tracking.lib.php
View File

@ -242,11 +242,13 @@ function PMA_getListOfVersionsOfTable()
{
$cfgRelation = PMA_getRelationsParam();
$sql_query = " SELECT * FROM " .
PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
PMA\libraries\Util::backquote($cfgRelation['tracking']) .
" WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($_REQUEST['db']) . "' " .
" AND table_name = '" . PMA\libraries\Util::sqlAddSlashes($_REQUEST['table']) . "' " .
" ORDER BY version DESC ";
PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
PMA\libraries\Util::backquote($cfgRelation['tracking']) .
" WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($_REQUEST['db']) .
"' " .
" AND table_name = '" .
PMA\libraries\Util::sqlAddSlashes($_REQUEST['table']) . "' " .
" ORDER BY version DESC ";
return PMA_queryAsControlUser($sql_query);
}
@ -290,7 +292,10 @@ function PMA_getHtmlForTableVersionDetails(
$GLOBALS['dbi']->dataSeek($sql_result, 0);
$delete = PMA\libraries\Util::getIcon('b_drop.png', __('Delete version'));
$report = PMA\libraries\Util::getIcon('b_report.png', __('Tracking report'));
$structure = PMA\libraries\Util::getIcon('b_props.png', __('Structure snapshot'));
$structure = PMA\libraries\Util::getIcon(
'b_props.png',
__('Structure snapshot')
);
while ($version = $GLOBALS['dbi']->fetchArray($sql_result)) {
if ($version['version'] == $last_version) {
@ -348,7 +353,11 @@ function PMA_getHtmlForTableVersionDetails(
$html .= '</tbody>';
$html .= '</table>';
$html .= PMA\libraries\Util::getWithSelected($pmaThemeImage, $text_dir, "versionsForm");
$html .= PMA\libraries\Util::getWithSelected(
$pmaThemeImage,
$text_dir,
"versionsForm"
);
$html .= PMA\libraries\Util::getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_delete_version',
__('Delete version'), 'b_drop.png', 'delete_version'
@ -395,10 +404,11 @@ function PMA_getSQLResultForSelectableTables()
$cfgRelation = PMA_getRelationsParam();
$sql_query = " SELECT DISTINCT db_name, table_name FROM " .
PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
PMA\libraries\Util::backquote($cfgRelation['tracking']) .
" WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($GLOBALS['db']) . "' " .
" ORDER BY db_name, table_name";
PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
PMA\libraries\Util::backquote($cfgRelation['tracking']) .
" WHERE db_name = '" . PMA\libraries\Util::sqlAddSlashes($GLOBALS['db']) .
"' " .
" ORDER BY db_name, table_name";
return PMA_queryAsControlUser($sql_query);
}
@ -936,7 +946,9 @@ function PMA_getHtmlForField($index, $field, $style)
$html .= '<td>' . (($field['Null'] == 'YES') ? __('Yes') : __('No')) . '</td>';
$html .= '<td>';
if (isset($field['Default'])) {
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec($field['Type']);
$extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
$field['Type']
);
if ($extracted_columnspec['type'] == 'bit') {
// here, $field['Default'] contains something like b'010'
$html .= PMA\libraries\Util::convertBitDefaultValue($field['Default']);
@ -1490,7 +1502,11 @@ function PMA_displayUntrackedTables(
</tbody>
</table>
<?php
echo PMA\libraries\Util::getWithSelected($pmaThemeImage, $text_dir, "untrackedForm");
echo PMA\libraries\Util::getWithSelected(
$pmaThemeImage,
$text_dir,
"untrackedForm"
);
echo PMA\libraries\Util::getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_track',
__('Track table'), 'eye.png', 'track'
@ -1633,7 +1649,10 @@ function PMA_displayTrackedTables(
$delete = PMA\libraries\Util::getIcon('b_drop.png', __('Delete tracking'));
$versions = PMA\libraries\Util::getIcon('b_versions.png', __('Versions'));
$report = PMA\libraries\Util::getIcon('b_report.png', __('Tracking report'));
$structure = PMA\libraries\Util::getIcon('b_props.png', __('Structure snapshot'));
$structure = PMA\libraries\Util::getIcon(
'b_props.png',
__('Structure snapshot')
);
$style = 'odd';
while ($one_result = $GLOBALS['dbi']->fetchArray($all_tables_result)) {
@ -1641,8 +1660,10 @@ function PMA_displayTrackedTables(
$table_query = ' SELECT * FROM ' .
PMA\libraries\Util::backquote($cfgRelation['db']) . '.' .
PMA\libraries\Util::backquote($cfgRelation['tracking']) .
' WHERE `db_name` = \'' . PMA\libraries\Util::sqlAddSlashes($_REQUEST['db'])
. '\' AND `table_name` = \'' . PMA\libraries\Util::sqlAddSlashes($table_name)
' WHERE `db_name` = \''
. PMA\libraries\Util::sqlAddSlashes($_REQUEST['db'])
. '\' AND `table_name` = \''
. PMA\libraries\Util::sqlAddSlashes($table_name)
. '\' AND `version` = \'' . $version_number . '\'';
$table_result = PMA_queryAsControlUser($table_query);
@ -1701,7 +1722,11 @@ function PMA_displayTrackedTables(
</tbody>
</table>
<?php
echo PMA\libraries\Util::getWithSelected($pmaThemeImage, $text_dir, "trackedForm");
echo PMA\libraries\Util::getWithSelected(
$pmaThemeImage,
$text_dir,
"trackedForm"
);
echo PMA\libraries\Util::getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_delete_tracking',
__('Delete tracking'), 'b_drop.png', 'delete_tracking'

15
libraries/transformations.lib.php
View File

@ -339,7 +339,8 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation,
|| /*overload*/mb_strlen($transformationOpts)
|| /*overload*/mb_strlen($row['comment']))
) {
$upd_query = 'UPDATE ' . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
$upd_query = 'UPDATE '
. PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
. PMA\libraries\Util::backquote($cfgRelation['column_info'])
. ' SET '
. '`mimetype` = \''
@ -353,19 +354,23 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation,
. '`input_transformation_options` = \''
. PMA\libraries\Util::sqlAddSlashes($inputTransformOpts) . '\'';
} else {
$upd_query = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$upd_query = 'DELETE FROM '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['column_info']);
}
$upd_query .= '
WHERE `db_name` = \'' . PMA\libraries\Util::sqlAddSlashes($db) . '\'
AND `table_name` = \'' . PMA\libraries\Util::sqlAddSlashes($table) . '\'
AND `column_name` = \'' . PMA\libraries\Util::sqlAddSlashes($key) . '\'';
AND `table_name` = \'' . PMA\libraries\Util::sqlAddSlashes($table)
. '\'
AND `column_name` = \'' . PMA\libraries\Util::sqlAddSlashes($key)
. '\'';
} elseif (/*overload*/mb_strlen($mimetype)
|| /*overload*/mb_strlen($transformation)
|| /*overload*/mb_strlen($transformationOpts)
) {
$upd_query = 'INSERT INTO ' . PMA\libraries\Util::backquote($cfgRelation['db'])
$upd_query = 'INSERT INTO '
. PMA\libraries\Util::backquote($cfgRelation['db'])
. '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
. ' (db_name, table_name, column_name, mimetype, '
. 'transformation, transformation_options, '

3
libraries/user_preferences.inc.php
View File

@ -38,7 +38,8 @@ foreach (array_keys($forms) as $formset) {
'text' => PMA_lang('Form_' . $formset),
'icon' => $tabs_icons[$formset],
'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param));
$content .= PMA\libraries\Util::getHtmlTab($tab, array('form' => $formset)) . "\n";
$content .= PMA\libraries\Util::getHtmlTab($tab, array('form' => $formset))
. "\n";
}
echo PMA\libraries\Template::get('list/unordered')->render(
array(

3
tbl_structure.php
View File

@ -23,7 +23,8 @@ require_once 'libraries/config/page_settings.forms.php';
$container = libraries\di\Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\table\TableStructureController');
$container->alias(
'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
'TableStructureController',
'PMA\libraries\controllers\table\TableStructureController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');