diff --git a/db_create.php b/db_create.php index e61343028b..eaaf716158 100644 --- a/db_create.php +++ b/db_create.php @@ -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(); diff --git a/db_designer.php b/db_designer.php index 32dd883f7a..5bdd004a16 100644 --- a/db_designer.php +++ b/db_designer.php @@ -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 + ) ); diff --git a/db_operations.php b/db_operations.php index 5176486af7..a78bda2aed 100644 --- a/db_operations.php +++ b/db_operations.php @@ -305,10 +305,11 @@ $response->addHTML(''); 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, diff --git a/db_qbe.php b/db_qbe.php index 5a74cc5176..8fec3a08a1 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -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); diff --git a/db_structure.php b/db_structure.php index c42deae2aa..f7341b2b18 100644 --- a/db_structure.php +++ b/db_structure.php @@ -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(); diff --git a/db_tracking.php b/db_tracking.php index 126a84e98b..7d18c79739 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -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 diff --git a/js/messages.php b/js/messages.php index 51b48b09b8..2d7f2e639d 100644 --- a/js/messages.php +++ b/js/messages.php @@ -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) */"; ?> diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php index 4965248510..c9aa4df2fe 100644 --- a/libraries/DatabaseInterface.php +++ b/libraries/DatabaseInterface.php @@ -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 .= '
' - . __('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/ diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index 9fb00bb621..6866f4c1a3 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -825,7 +825,8 @@ class DisplayResults $html_sql_query = htmlspecialchars($this->__get('sql_query')); // Navigation bar - $table_navigation_html .= '' + $table_navigation_html + .= '
' . '' . ''; @@ -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 .= '' . "\n" + $drop_down_html .= '' + . "\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 .= ''; + $button_html .= ''; } 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" . ''; + $right_column_html .= "\n" . ''; } $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 = '
' . __('Query results operations') - . ''; + $header = '
' + . __('Query results operations') . ''; $_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 = '' @@ -5551,10 +5565,11 @@ class DisplayResults $ret = ''; if (! empty($edit_url)) { - $ret .= '
'; diff --git a/libraries/OutputBuffering.php b/libraries/OutputBuffering.php index 13a8e0e79c..f232cf2b14 100644 --- a/libraries/OutputBuffering.php +++ b/libraries/OutputBuffering.php @@ -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; } } diff --git a/libraries/Scripts.php b/libraries/Scripts.php index c9720b4c5e..68dcc9047c 100644 --- a/libraries/Scripts.php +++ b/libraries/Scripts.php @@ -93,7 +93,8 @@ class Scripts . $separator . Header::getVersionParameter(); $static_scripts .= sprintf( - '', + '', htmlspecialchars($url) ); } diff --git a/libraries/Table.php b/libraries/Table.php index ccd70106c3..538c082e77 100644 --- a/libraries/Table.php +++ b/libraries/Table.php @@ -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"; diff --git a/libraries/Util.php b/libraries/Util.php index 8ebdde250d..b757f6dc28 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -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? diff --git a/libraries/VersionInformation.php b/libraries/VersionInformation.php index 4600b1eba5..3687d327f4 100644 --- a/libraries/VersionInformation.php +++ b/libraries/VersionInformation.php @@ -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; } } diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 4a16424cd2..34e2028d13 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -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(); } /** diff --git a/libraries/import.lib.php b/libraries/import.lib.php index a5631da716..5b8c402300 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -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 . ")"; } diff --git a/libraries/index.lib.php b/libraries/index.lib.php index c4de083556..c5d2439092 100644 --- a/libraries/index.lib.php +++ b/libraries/index.lib.php @@ -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 .= '
'; $html_output .= PMA_URL_getHiddenInputs( diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 06498881aa..5e850cc41e 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -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 .= '' . "\n"; $html_output .= '' . "\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? diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 5f00401d26..5c31a6b6cc 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -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 /** diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 88e83608ec..3d1a93ab7b 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -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'], diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php index c333d5867e..d14fe56b87 100644 --- a/libraries/mult_submits.lib.php +++ b/libraries/mult_submits.lib.php @@ -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) ? ');' : ''); diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index e7fb5595a3..3c5579f545 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -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'] . "'," diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 2286763472..53437f7773 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -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 .= '
'; } $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); } diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index b4f0f9a801..18514162e6 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -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); } } diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index b845ba93b1..0c808047af 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -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'] ) . "'" ); diff --git a/libraries/server_engines.lib.php b/libraries/server_engines.lib.php index 960df46738..1477b80fd1 100644 --- a/libraries/server_engines.lib.php +++ b/libraries/server_engines.lib.php @@ -96,7 +96,9 @@ function PMA_getHtmlForSpecifiedServerEngines() $html .= '

' . "\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" . '

' . "\n\n"; $html .= '

' . "\n" . ' ' . "\n" diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 9a7b21c6dc..ce5e8f490f 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -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 .= ''; diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php index f98c3de010..03a2283c10 100644 --- a/libraries/server_status_monitor.lib.php +++ b/libraries/server_status_monitor.lib.php @@ -280,7 +280,8 @@ function PMA_getHtmlForSettingsDialog() $retval .= PMA\libraries\Util::getImage('b_chart.png') . __('Add chart'); $retval .= ''; $retval .= ''; - $retval .= PMA\libraries\Util::getImage('b_tblops.png') . __('Enable charts dragging'); + $retval .= PMA\libraries\Util::getImage('b_tblops.png') + . __('Enable charts dragging'); $retval .= ''; $retval .= '

'; $retval .= '
'; diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php index 8305959e67..b8f62c87fe 100644 --- a/libraries/server_status_queries.lib.php +++ b/libraries/server_status_queries.lib.php @@ -125,7 +125,9 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData) $retval .= '">'; $retval .= '
'; $retval .= ''; $retval .= ''; $html .= '
' - . $full_or_partial_text_link . '' . $full_or_partial_text_link . '' - . Util::linkOrButton( - $edit_url, $edit_str, array(), false - ); + $ret .= '' + . 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 ) . '
' . $js_conf . '
' . '
' . htmlspecialchars($name) . ''; - $retval .= htmlspecialchars(PMA\libraries\Util::formatNumber($value, 5, 0, true)); + $retval .= htmlspecialchars( + PMA\libraries\Util::formatNumber($value, 5, 0, true) + ); $retval .= ''; $retval .= htmlspecialchars( diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php index 0724450521..467458f72f 100644 --- a/libraries/server_status_variables.lib.php +++ b/libraries/server_status_variables.lib.php @@ -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)) . ''; } 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); } diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php index 0b580aba51..6d38601105 100644 --- a/libraries/server_user_groups.lib.php +++ b/libraries/server_user_groups.lib.php @@ -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')) . ''; + . PMA\libraries\Util::getIcon('b_usrlist.png', __('View users')) + . ''; $html_output .= '  '; $html_output .= '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); } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 71bbcf239a..cff550b9a4 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -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 .= ''; $html .= '
'; $html .= ''; + $html .= '' . + ''; $html .= '
'; $html .= '
'; - $html .= '
'; $html .= '
'; @@ -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 { diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index e07243ccef..4dc04b57f3 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -268,7 +268,8 @@ function PMA_getHtmlForSqlQueryFormInsert( . 'multiple="multiple" ondblclick="insertValueQuery()">'; foreach ($columns_list as $field) { $html .= '
'; - $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 .= '' . (($field['Null'] == 'YES') ? __('Yes') : __('No')) . ''; $html .= ''; 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( 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( 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( diff --git a/tbl_structure.php b/tbl_structure.php index a06f4144e5..7932cc093b 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -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');