From 5233193a26ebf169511f7a79f5f71a88711ccd5c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 12 Apr 2013 22:38:27 +0530 Subject: [PATCH 1/2] Wrap some long lines --- libraries/relation_cleanup.lib.php | 118 +++++++++++++++++------------ 1 file changed, 68 insertions(+), 50 deletions(-) diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 1c86a4b782..52d8812f47 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -23,32 +23,36 @@ function PMA_relationsCleanupColumn($db, $table, $column) $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['commwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['column_info']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'' - . ' AND column_name = \'' . PMA_Util::sqlAddSlashes($column) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['column_info']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'' + . ' AND column_name = \'' . PMA_Util::sqlAddSlashes($column) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['displaywork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'' - . ' AND display_field = \'' . PMA_Util::sqlAddSlashes($column) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['table_info']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'' + . ' AND display_field = \'' . PMA_Util::sqlAddSlashes($column) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['relwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND master_table = \'' . PMA_Util::sqlAddSlashes($table) . '\'' - . ' AND master_field = \'' . PMA_Util::sqlAddSlashes($column) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) + . ' WHERE master_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_Util::sqlAddSlashes($table) . '\'' + . ' AND master_field = \'' . PMA_Util::sqlAddSlashes($column) . '\''; PMA_queryAsControlUser($remove_query); - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) - . ' WHERE foreign_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND foreign_table = \'' . PMA_Util::sqlAddSlashes($table) . '\'' - . ' AND foreign_field = \'' . PMA_Util::sqlAddSlashes($column) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) + . ' WHERE foreign_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND foreign_table = \'' . PMA_Util::sqlAddSlashes($table) . '\'' + . ' AND foreign_field = \'' . PMA_Util::sqlAddSlashes($column) . '\''; PMA_queryAsControlUser($remove_query); } } @@ -66,42 +70,48 @@ function PMA_relationsCleanupTable($db, $table) $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['commwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['column_info']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['column_info']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['displaywork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['table_info']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['pdfwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['table_coords']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['designerwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['designer_coords']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['designer_coords']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['relwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND master_table = \'' . PMA_Util::sqlAddSlashes($table) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) + . ' WHERE master_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_Util::sqlAddSlashes($table) . '\''; PMA_queryAsControlUser($remove_query); - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) - . ' WHERE foreign_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' - . ' AND foreign_table = \'' . PMA_Util::sqlAddSlashes($table) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) + . ' WHERE foreign_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'' + . ' AND foreign_table = \'' . PMA_Util::sqlAddSlashes($table) . '\''; PMA_queryAsControlUser($remove_query); } } @@ -118,46 +128,54 @@ function PMA_relationsCleanupDatabase($db) $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['commwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['column_info']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['column_info']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['bookmarkwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['bookmark']) - . ' WHERE dbase = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['bookmark']) + . ' WHERE dbase = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['displaywork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['table_info']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['pdfwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['pdf_pages']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['table_coords']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['designerwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['designer_coords']) - . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['designer_coords']) + . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); } if ($cfgRelation['relwork']) { - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) + . ' WHERE master_db = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); - $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) - . ' WHERE foreign_db = \'' . PMA_Util::sqlAddSlashes($db) . '\''; + $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) + . ' WHERE foreign_db = \'' . PMA_Util::sqlAddSlashes($db) . '\''; PMA_queryAsControlUser($remove_query); } } From ea09916fe584d01f40c7c8b416674a986b0e964c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 12 Apr 2013 22:47:29 +0530 Subject: [PATCH 2/2] Wrap more long lines --- libraries/relation.lib.php | 54 ++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 584fcdf8ea..b2dfc03dfa 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -363,7 +363,8 @@ function PMA__getRelationsParam() $cfgRelation['user'] = null; $cfgRelation['db'] = null; - if ($GLOBALS['server'] == 0 || empty($GLOBALS['cfg']['Server']['pmadb']) + if ($GLOBALS['server'] == 0 + || empty($GLOBALS['cfg']['Server']['pmadb']) || ! PMA_DBI_select_db($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']) ) { // No server selected -> no bookmark table @@ -506,13 +507,17 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') `foreign_db`, `foreign_table`, `foreign_field` - FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) . ' + FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) . ' WHERE `master_db` = \'' . PMA_Util::sqlAddSlashes($db) . '\' AND `master_table` = \'' . PMA_Util::sqlAddSlashes($table) . '\' '; if (strlen($column)) { - $rel_query .= ' AND `master_field` = \'' . PMA_Util::sqlAddSlashes($column) . '\''; + $rel_query .= ' AND `master_field` = ' + . '\'' . PMA_Util::sqlAddSlashes($column) . '\''; } - $foreign = PMA_DBI_fetch_result($rel_query, 'master_field', null, $GLOBALS['controllink']); + $foreign = PMA_DBI_fetch_result( + $rel_query, 'master_field', null, $GLOBALS['controllink'] + ); } if (($source == 'both' || $source == 'foreign') && strlen($table)) { @@ -567,7 +572,9 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') */ $is_information_schema = strtolower($db) == 'information_schema'; $is_data_dictionary = PMA_DRIZZLE && strtolower($db) == 'data_dictionary'; - if (($is_information_schema || $is_data_dictionary) && ($source == 'internal' || $source == 'both')) { + if (($is_information_schema || $is_data_dictionary) + && ($source == 'internal' || $source == 'both') + ) { if ($is_information_schema) { $relations_key = 'information_schema_relations'; include_once './libraries/information_schema_relations.lib.php'; @@ -609,11 +616,14 @@ function PMA_getDisplayField($db, $table) if ($cfgRelation['displaywork']) { $disp_query = ' SELECT `display_field` - FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['table_info']) . ' + FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['table_info']) . ' WHERE `db_name` = \'' . PMA_Util::sqlAddSlashes($db) . '\' AND `table_name` = \'' . PMA_Util::sqlAddSlashes($table) . '\''; - $row = PMA_DBI_fetch_single_row($disp_query, 'ASSOC', $GLOBALS['controllink']); + $row = PMA_DBI_fetch_single_row( + $disp_query, 'ASSOC', $GLOBALS['controllink'] + ); if (isset($row['display_field'])) { return $row['display_field']; } @@ -687,7 +697,8 @@ function PMA_getDbComment($db) // pmadb internal db comment $com_qry = " SELECT `comment` - FROM " . PMA_Util::backquote($cfgRelation['db']) . "." . PMA_Util::backquote($cfgRelation['column_info']) . " + FROM " . PMA_Util::backquote($cfgRelation['db']) + . "." . PMA_Util::backquote($cfgRelation['column_info']) . " WHERE db_name = '" . PMA_Util::sqlAddSlashes($db) . "' AND table_name = '' AND column_name = '(db_comment)'"; @@ -719,7 +730,8 @@ function PMA_getDbComments() // pmadb internal db comment $com_qry = " SELECT `db_name`, `comment` - FROM " . PMA_Util::backquote($cfgRelation['db']) . "." . PMA_Util::backquote($cfgRelation['column_info']) . " + FROM " . PMA_Util::backquote($cfgRelation['db']) + . "." . PMA_Util::backquote($cfgRelation['column_info']) . " WHERE `column_name` = '(db_comment)'"; $com_rs = PMA_queryAsControlUser($com_qry, true, PMA_DBI_QUERY_STORE); @@ -795,7 +807,9 @@ function PMA_setDbComment($db, $comment = '') function PMA_setHistory($db, $table, $username, $sqlquery) { // Prevent to run this automatically on Footer class destroying in testsuite - if (defined('TESTSUITE') || strlen($sqlquery) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + if (defined('TESTSUITE') + || strlen($sqlquery) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] + ) { return; } @@ -864,7 +878,8 @@ function PMA_getHistory($username) SELECT `db`, `table`, `sqlquery` - FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['history']) . ' + FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['history']) . ' WHERE `username` = \'' . PMA_Util::sqlAddSlashes($username) . '\' ORDER BY `id` DESC'; @@ -896,7 +911,8 @@ function PMA_purgeHistory($username) $search_query = ' SELECT `timevalue` - FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['history']) . ' + FROM ' . PMA_Util::backquote($cfgRelation['db']) + . '.' . PMA_Util::backquote($cfgRelation['history']) . ' WHERE `username` = \'' . PMA_Util::sqlAddSlashes($username) . '\' ORDER BY `timevalue` DESC LIMIT ' . $GLOBALS['cfg']['QueryHistoryMax'] . ', 1'; @@ -963,11 +979,14 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) } if ($mode == 'content-id') { - $reloptions[] = $reloption . '>' . $value . ' - ' . htmlspecialchars($key) . ''; + $reloptions[] = $reloption . '>' + . $value . ' - ' . htmlspecialchars($key) . ''; } elseif ($mode == 'id-content') { - $reloptions[] = $reloption . '>' . htmlspecialchars($key) . ' - ' . $value . ''; + $reloptions[] = $reloption . '>' + . htmlspecialchars($key) . ' - ' . $value . ''; } elseif ($mode == 'id-only') { - $reloptions[] = $reloption . '>' . htmlspecialchars($key) . ''; + $reloptions[] = $reloption . '>' + . htmlspecialchars($key) . ''; } } // end foreach @@ -1277,8 +1296,9 @@ function PMA_REL_renameSingleTable($table, $query = 'UPDATE ' . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_Util::backquote($GLOBALS['cfgRelation'][$table]) - . ' SET ' . $db_field . ' = \'' . PMA_Util::sqlAddSlashes($target_db) . '\', ' - . ' ' . $table_field . ' = \'' . PMA_Util::sqlAddSlashes($target_table) . '\'' + . ' SET ' + . $db_field . ' = \'' . PMA_Util::sqlAddSlashes($target_db) . '\', ' + . $table_field . ' = \'' . PMA_Util::sqlAddSlashes($target_table) . '\'' . ' WHERE ' . $db_field . ' = \'' . PMA_Util::sqlAddSlashes($source_db) . '\'' . ' AND '