From cb1c893934e3dc466ced61ee7c215030a1c07d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:05:37 +0200 Subject: [PATCH 1/8] Fixed indentation --- export.php | 2 +- libraries/DatabaseInterface.class.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/export.php b/export.php index e17897b68c..081eddf4b3 100644 --- a/export.php +++ b/export.php @@ -324,7 +324,7 @@ function PMA_exportOutputHandler($line) ) { $dump_buffer = bzcompress($dump_buffer); } elseif ($GLOBALS['compression'] == 'gzip' - && PMA_gzencodeNeeded() + && PMA_gzencodeNeeded() ) { // as a gzipped file // without the optional parameter level because it bugs diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index 5f7d91e611..9143e27321 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -619,7 +619,8 @@ class PMA_DatabaseInterface $each_tables[$table_name]['Type'] =& $each_tables[$table_name]['Engine']; } elseif (! isset($each_tables[$table_name]['Engine']) - && isset($each_tables[$table_name]['Type'])) { + && isset($each_tables[$table_name]['Type']) + ) { // old MySQL reports Type, newer MySQL reports Engine $each_tables[$table_name]['Engine'] =& $each_tables[$table_name]['Type']; From 0bf3f009abe69f74ad44102bc2e1f05ec8e7d626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:09:34 +0200 Subject: [PATCH 2/8] Simplify params processing by using local variable --- libraries/DisplayResults.class.php | 88 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 1acf310f77..98cbbf99e4 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4212,8 +4212,9 @@ class PMA_DisplayResults { $sql_md5 = md5($this->__get('sql_query')); + $session_data = $_SESSION['tmp_user_values']['query'][$sql_md5]; - $_SESSION['tmp_user_values']['query'][$sql_md5]['sql'] + $session_data['sql'] = $this->__get('sql_query'); $valid_disp_dir = PMA_isValid( @@ -4224,20 +4225,20 @@ class PMA_DisplayResults ); if ($valid_disp_dir) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction'] + $session_data['disp_direction'] = $_REQUEST['disp_direction']; unset($_REQUEST['disp_direction']); } elseif ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction']) + empty($session_data['disp_direction']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction'] + $session_data['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; } if ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells']) + empty($session_data['repeat_cells']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells'] + $session_data['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } @@ -4247,22 +4248,22 @@ class PMA_DisplayResults && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] + $session_data['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); } elseif ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']) + empty($session_data['max_rows']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] + $session_data['max_rows'] = $GLOBALS['cfg']['MaxRows']; } if (PMA_isValid($_REQUEST['pos'], 'numeric')) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['pos'] + $session_data['pos'] = $_REQUEST['pos']; unset($_REQUEST['pos']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['pos'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['pos'] = 0; + } elseif (empty($session_data['pos'])) { + $session_data['pos'] = 0; } if (PMA_isValid( @@ -4272,13 +4273,13 @@ class PMA_DisplayResults ) ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text'] + $session_data['display_text'] = $_REQUEST['display_text']; unset($_REQUEST['display_text']); } elseif ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['display_text']) + empty($session_data['display_text']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text'] + $session_data['display_text'] = self::DISPLAY_PARTIAL_TEXT; } @@ -4289,15 +4290,15 @@ class PMA_DisplayResults ) ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] + $session_data['relational_display'] = $_REQUEST['relational_display']; unset($_REQUEST['relational_display']); } elseif ( empty( - $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] + $session_data['relational_display'] ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] + $session_data['relational_display'] = self::RELATIONAL_KEY; } @@ -4309,40 +4310,40 @@ class PMA_DisplayResults ) ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display'] + $session_data['geometry_display'] = $_REQUEST['geometry_display']; unset($_REQUEST['geometry_display']); } elseif ( empty( - $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display'] + $session_data['geometry_display'] ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display'] + $session_data['geometry_display'] = self::GEOMETRY_DISP_GEOM; } if (isset($_REQUEST['display_binary'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary'] = true; + $session_data['display_binary'] = true; unset($_REQUEST['display_binary']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary']); + unset($session_data['display_binary']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { // selected by default because some operations like OPTIMIZE TABLE // and all queries involving functions return "binary" contents, // according to low-level field flags - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary'] = true; + $session_data['display_binary'] = true; } if (isset($_REQUEST['display_binary_as_hex'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex'] + $session_data['display_binary_as_hex'] = true; unset($_REQUEST['display_binary_as_hex']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5] + unset($session_data ['display_binary_as_hex'] ); } elseif (isset($_REQUEST['full_text_button'])) { @@ -4352,26 +4353,26 @@ class PMA_DisplayResults if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && ($GLOBALS['cfg']['DisplayBinaryAsHex'] === true) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5] + $session_data ['display_binary_as_hex'] = true; } } if (isset($_REQUEST['display_blob'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob'] = true; + $session_data['display_blob'] = true; unset($_REQUEST['display_blob']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob']); + unset($session_data['display_blob']); } if (isset($_REQUEST['hide_transformation'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['hide_transformation'] + $session_data['hide_transformation'] = true; unset($_REQUEST['hide_transformation']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5] + unset($session_data ['hide_transformation'] ); } @@ -4379,9 +4380,8 @@ class PMA_DisplayResults // move current query to the last position, to be removed last // so only least executed query will be removed if maximum remembered queries // limit is reached - $tmp = $_SESSION['tmp_user_values']['query'][$sql_md5]; unset($_SESSION['tmp_user_values']['query'][$sql_md5]); - $_SESSION['tmp_user_values']['query'][$sql_md5] = $tmp; + $_SESSION['tmp_user_values']['query'][$sql_md5] = $session_data; // do not exceed a maximum number of queries to remember if (count($_SESSION['tmp_user_values']['query']) > 10) { @@ -4391,41 +4391,41 @@ class PMA_DisplayResults // populate query configuration $_SESSION['tmp_user_values']['display_text'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text']; + = $session_data['display_text']; $_SESSION['tmp_user_values']['relational_display'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display']; + = $session_data['relational_display']; $_SESSION['tmp_user_values']['geometry_display'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display']; + = $session_data['geometry_display']; $_SESSION['tmp_user_values']['display_binary'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5] + = isset($session_data ['display_binary'] ) ? true : false; $_SESSION['tmp_user_values']['display_binary_as_hex'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5] + = isset($session_data ['display_binary_as_hex'] ) ? true : false; $_SESSION['tmp_user_values']['display_blob'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob']) + = isset($session_data['display_blob']) ? true : false; $_SESSION['tmp_user_values']['hide_transformation'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5] + = isset($session_data ['hide_transformation'] ) ? true : false; $_SESSION['tmp_user_values']['pos'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['pos']; + = $session_data['pos']; $_SESSION['tmp_user_values']['max_rows'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']; + = $session_data['max_rows']; $_SESSION['tmp_user_values']['repeat_cells'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells']; + = $session_data['repeat_cells']; $_SESSION['tmp_user_values']['disp_direction'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction']; + = $session_data['disp_direction']; } From c09a7e5345748ae33ce4ec095e1eea98ea7e5efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:12:10 +0200 Subject: [PATCH 3/8] Reindent some lines --- libraries/DisplayResults.class.php | 88 +++++++++--------------------- 1 file changed, 26 insertions(+), 62 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 98cbbf99e4..69a31d3c7f 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4214,8 +4214,7 @@ class PMA_DisplayResults $sql_md5 = md5($this->__get('sql_query')); $session_data = $_SESSION['tmp_user_values']['query'][$sql_md5]; - $session_data['sql'] - = $this->__get('sql_query'); + $session_data['sql'] = $this->__get('sql_query'); $valid_disp_dir = PMA_isValid( $_REQUEST['disp_direction'], @@ -4225,21 +4224,14 @@ class PMA_DisplayResults ); if ($valid_disp_dir) { - $session_data['disp_direction'] - = $_REQUEST['disp_direction']; + $session_data['disp_direction'] = $_REQUEST['disp_direction']; unset($_REQUEST['disp_direction']); - } elseif ( - empty($session_data['disp_direction']) - ) { - $session_data['disp_direction'] - = $GLOBALS['cfg']['DefaultDisplay']; + } elseif (empty($session_data['disp_direction'])) { + $session_data['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; } - if ( - empty($session_data['repeat_cells']) - ) { - $session_data['repeat_cells'] - = $GLOBALS['cfg']['RepeatCells']; + if (empty($session_data['repeat_cells'])) { + $session_data['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } // as this is a form value, the type is always string so we cannot @@ -4248,19 +4240,14 @@ class PMA_DisplayResults && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) ) { - $session_data['max_rows'] - = $_REQUEST['session_max_rows']; + $session_data['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); - } elseif ( - empty($session_data['max_rows']) - ) { - $session_data['max_rows'] - = $GLOBALS['cfg']['MaxRows']; + } elseif (empty($session_data['max_rows'])) { + $session_data['max_rows'] = $GLOBALS['cfg']['MaxRows']; } if (PMA_isValid($_REQUEST['pos'], 'numeric')) { - $session_data['pos'] - = $_REQUEST['pos']; + $session_data['pos'] = $_REQUEST['pos']; unset($_REQUEST['pos']); } elseif (empty($session_data['pos'])) { $session_data['pos'] = 0; @@ -4273,14 +4260,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['display_text'] - = $_REQUEST['display_text']; + $session_data['display_text'] = $_REQUEST['display_text']; unset($_REQUEST['display_text']); - } elseif ( - empty($session_data['display_text']) - ) { - $session_data['display_text'] - = self::DISPLAY_PARTIAL_TEXT; + } elseif (empty($session_data['display_text'])) { + $session_data['display_text'] = self::DISPLAY_PARTIAL_TEXT; } if (PMA_isValid( @@ -4290,16 +4273,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['relational_display'] - = $_REQUEST['relational_display']; + $session_data['relational_display'] = $_REQUEST['relational_display']; unset($_REQUEST['relational_display']); - } elseif ( - empty( - $session_data['relational_display'] - ) - ) { - $session_data['relational_display'] - = self::RELATIONAL_KEY; + } elseif (empty($session_data['relational_display'])) { + $session_data['relational_display'] = self::RELATIONAL_KEY; } if (PMA_isValid( @@ -4310,16 +4287,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['geometry_display'] - = $_REQUEST['geometry_display']; + $session_data['geometry_display'] = $_REQUEST['geometry_display']; unset($_REQUEST['geometry_display']); - } elseif ( - empty( - $session_data['geometry_display'] - ) - ) { - $session_data['geometry_display'] - = self::GEOMETRY_DISP_GEOM; + } elseif (empty($session_data['geometry_display'])) { + $session_data['geometry_display'] = self::GEOMETRY_DISP_GEOM; } if (isset($_REQUEST['display_binary'])) { @@ -4338,14 +4309,11 @@ class PMA_DisplayResults } if (isset($_REQUEST['display_binary_as_hex'])) { - $session_data['display_binary_as_hex'] - = true; + $session_data['display_binary_as_hex'] = true; unset($_REQUEST['display_binary_as_hex']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data - ['display_binary_as_hex'] - ); + unset($session_data['display_binary_as_hex']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { @@ -4353,8 +4321,7 @@ class PMA_DisplayResults if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && ($GLOBALS['cfg']['DisplayBinaryAsHex'] === true) ) { - $session_data - ['display_binary_as_hex'] = true; + $session_data['display_binary_as_hex'] = true; } } @@ -4367,19 +4334,16 @@ class PMA_DisplayResults } if (isset($_REQUEST['hide_transformation'])) { - $session_data['hide_transformation'] - = true; + $session_data['hide_transformation'] = true; unset($_REQUEST['hide_transformation']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data - ['hide_transformation'] - ); + unset($session_data['hide_transformation']); } // move current query to the last position, to be removed last - // so only least executed query will be removed if maximum remembered queries - // limit is reached + // so only least executed query will be removed if maximum remembered + // queries limit is reached unset($_SESSION['tmp_user_values']['query'][$sql_md5]); $_SESSION['tmp_user_values']['query'][$sql_md5] = $session_data; From 8dcdd6de7a93809b190331a113605f63a51c9248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:13:30 +0200 Subject: [PATCH 4/8] Better variable name --- libraries/DisplayResults.class.php | 88 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 69a31d3c7f..8af4c3a156 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4212,9 +4212,9 @@ class PMA_DisplayResults { $sql_md5 = md5($this->__get('sql_query')); - $session_data = $_SESSION['tmp_user_values']['query'][$sql_md5]; + $query = $_SESSION['tmp_user_values']['query'][$sql_md5]; - $session_data['sql'] = $this->__get('sql_query'); + $query['sql'] = $this->__get('sql_query'); $valid_disp_dir = PMA_isValid( $_REQUEST['disp_direction'], @@ -4224,14 +4224,14 @@ class PMA_DisplayResults ); if ($valid_disp_dir) { - $session_data['disp_direction'] = $_REQUEST['disp_direction']; + $query['disp_direction'] = $_REQUEST['disp_direction']; unset($_REQUEST['disp_direction']); - } elseif (empty($session_data['disp_direction'])) { - $session_data['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; + } elseif (empty($query['disp_direction'])) { + $query['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; } - if (empty($session_data['repeat_cells'])) { - $session_data['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; + if (empty($query['repeat_cells'])) { + $query['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } // as this is a form value, the type is always string so we cannot @@ -4240,17 +4240,17 @@ class PMA_DisplayResults && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) ) { - $session_data['max_rows'] = $_REQUEST['session_max_rows']; + $query['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); - } elseif (empty($session_data['max_rows'])) { - $session_data['max_rows'] = $GLOBALS['cfg']['MaxRows']; + } elseif (empty($query['max_rows'])) { + $query['max_rows'] = $GLOBALS['cfg']['MaxRows']; } if (PMA_isValid($_REQUEST['pos'], 'numeric')) { - $session_data['pos'] = $_REQUEST['pos']; + $query['pos'] = $_REQUEST['pos']; unset($_REQUEST['pos']); - } elseif (empty($session_data['pos'])) { - $session_data['pos'] = 0; + } elseif (empty($query['pos'])) { + $query['pos'] = 0; } if (PMA_isValid( @@ -4260,10 +4260,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['display_text'] = $_REQUEST['display_text']; + $query['display_text'] = $_REQUEST['display_text']; unset($_REQUEST['display_text']); - } elseif (empty($session_data['display_text'])) { - $session_data['display_text'] = self::DISPLAY_PARTIAL_TEXT; + } elseif (empty($query['display_text'])) { + $query['display_text'] = self::DISPLAY_PARTIAL_TEXT; } if (PMA_isValid( @@ -4273,10 +4273,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['relational_display'] = $_REQUEST['relational_display']; + $query['relational_display'] = $_REQUEST['relational_display']; unset($_REQUEST['relational_display']); - } elseif (empty($session_data['relational_display'])) { - $session_data['relational_display'] = self::RELATIONAL_KEY; + } elseif (empty($query['relational_display'])) { + $query['relational_display'] = self::RELATIONAL_KEY; } if (PMA_isValid( @@ -4287,33 +4287,33 @@ class PMA_DisplayResults ) ) ) { - $session_data['geometry_display'] = $_REQUEST['geometry_display']; + $query['geometry_display'] = $_REQUEST['geometry_display']; unset($_REQUEST['geometry_display']); - } elseif (empty($session_data['geometry_display'])) { - $session_data['geometry_display'] = self::GEOMETRY_DISP_GEOM; + } elseif (empty($query['geometry_display'])) { + $query['geometry_display'] = self::GEOMETRY_DISP_GEOM; } if (isset($_REQUEST['display_binary'])) { - $session_data['display_binary'] = true; + $query['display_binary'] = true; unset($_REQUEST['display_binary']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['display_binary']); + unset($query['display_binary']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { // selected by default because some operations like OPTIMIZE TABLE // and all queries involving functions return "binary" contents, // according to low-level field flags - $session_data['display_binary'] = true; + $query['display_binary'] = true; } if (isset($_REQUEST['display_binary_as_hex'])) { - $session_data['display_binary_as_hex'] = true; + $query['display_binary_as_hex'] = true; unset($_REQUEST['display_binary_as_hex']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['display_binary_as_hex']); + unset($query['display_binary_as_hex']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { @@ -4321,31 +4321,31 @@ class PMA_DisplayResults if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && ($GLOBALS['cfg']['DisplayBinaryAsHex'] === true) ) { - $session_data['display_binary_as_hex'] = true; + $query['display_binary_as_hex'] = true; } } if (isset($_REQUEST['display_blob'])) { - $session_data['display_blob'] = true; + $query['display_blob'] = true; unset($_REQUEST['display_blob']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['display_blob']); + unset($query['display_blob']); } if (isset($_REQUEST['hide_transformation'])) { - $session_data['hide_transformation'] = true; + $query['hide_transformation'] = true; unset($_REQUEST['hide_transformation']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['hide_transformation']); + unset($query['hide_transformation']); } // move current query to the last position, to be removed last // so only least executed query will be removed if maximum remembered // queries limit is reached unset($_SESSION['tmp_user_values']['query'][$sql_md5]); - $_SESSION['tmp_user_values']['query'][$sql_md5] = $session_data; + $_SESSION['tmp_user_values']['query'][$sql_md5] = $query; // do not exceed a maximum number of queries to remember if (count($_SESSION['tmp_user_values']['query']) > 10) { @@ -4355,41 +4355,41 @@ class PMA_DisplayResults // populate query configuration $_SESSION['tmp_user_values']['display_text'] - = $session_data['display_text']; + = $query['display_text']; $_SESSION['tmp_user_values']['relational_display'] - = $session_data['relational_display']; + = $query['relational_display']; $_SESSION['tmp_user_values']['geometry_display'] - = $session_data['geometry_display']; + = $query['geometry_display']; $_SESSION['tmp_user_values']['display_binary'] - = isset($session_data + = isset($query ['display_binary'] ) ? true : false; $_SESSION['tmp_user_values']['display_binary_as_hex'] - = isset($session_data + = isset($query ['display_binary_as_hex'] ) ? true : false; $_SESSION['tmp_user_values']['display_blob'] - = isset($session_data['display_blob']) + = isset($query['display_blob']) ? true : false; $_SESSION['tmp_user_values']['hide_transformation'] - = isset($session_data + = isset($query ['hide_transformation'] ) ? true : false; $_SESSION['tmp_user_values']['pos'] - = $session_data['pos']; + = $query['pos']; $_SESSION['tmp_user_values']['max_rows'] - = $session_data['max_rows']; + = $query['max_rows']; $_SESSION['tmp_user_values']['repeat_cells'] - = $session_data['repeat_cells']; + = $query['repeat_cells']; $_SESSION['tmp_user_values']['disp_direction'] - = $session_data['disp_direction']; + = $query['disp_direction']; } From 750c0902495714c5eff17f63a2d134f87581a98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:16:35 +0200 Subject: [PATCH 5/8] Separete checks for numeric and all and directly convert value --- libraries/DisplayResults.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 8af4c3a156..0811e0314e 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4236,11 +4236,11 @@ class PMA_DisplayResults // as this is a form value, the type is always string so we cannot // use PMA_isValid($_REQUEST['session_max_rows'], 'integer') - if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric') - && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) - || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) - ) { - $query['max_rows'] = $_REQUEST['session_max_rows']; + if (PMA_isValid($_REQUEST['session_max_rows'], 'numeric')) { + $query['max_rows'] = (int)$_REQUEST['session_max_rows']; + unset($_REQUEST['session_max_rows']); + } elseif ($_REQUEST['session_max_rows'] == self::ALL_ROWS) { + $query['max_rows'] = self::ALL_ROWS; unset($_REQUEST['session_max_rows']); } elseif (empty($query['max_rows'])) { $query['max_rows'] = $GLOBALS['cfg']['MaxRows']; From 2f38880f41749790dece7de95cf4ece2e8b744f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:17:39 +0200 Subject: [PATCH 6/8] Function isset already returns boolean, no need to process it again --- libraries/DisplayResults.class.php | 34 +++++++++++------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 0811e0314e..d6756667ef 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4360,28 +4360,18 @@ class PMA_DisplayResults = $query['relational_display']; $_SESSION['tmp_user_values']['geometry_display'] = $query['geometry_display']; - $_SESSION['tmp_user_values']['display_binary'] - = isset($query - ['display_binary'] - ) - ? true - : false; - $_SESSION['tmp_user_values']['display_binary_as_hex'] - = isset($query - ['display_binary_as_hex'] - ) - ? true - : false; - $_SESSION['tmp_user_values']['display_blob'] - = isset($query['display_blob']) - ? true - : false; - $_SESSION['tmp_user_values']['hide_transformation'] - = isset($query - ['hide_transformation'] - ) - ? true - : false; + $_SESSION['tmp_user_values']['display_binary'] = isset( + $query['display_binary'] + ); + $_SESSION['tmp_user_values']['display_binary_as_hex'] = isset( + $query['display_binary_as_hex'] + ); + $_SESSION['tmp_user_values']['display_blob'] = isset( + $query['display_blob'] + ); + $_SESSION['tmp_user_values']['hide_transformation'] = isset( + $query['hide_transformation'] + ); $_SESSION['tmp_user_values']['pos'] = $query['pos']; $_SESSION['tmp_user_values']['max_rows'] From 659156aeba56a89f35b59ab8d49ee44ca2f05e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:18:47 +0200 Subject: [PATCH 7/8] Wrap long line --- libraries/DisplayResults.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index d6756667ef..2e4fb54311 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4401,7 +4401,8 @@ class PMA_DisplayResults * @see sql.php file */ public function getTable( - &$dt_result, &$the_disp_mode, $analyzed_sql, $is_limited_display = false + &$dt_result, &$the_disp_mode, $analyzed_sql, + $is_limited_display = false ) { $table_html = ''; From 9310e76a0e809c3118c9359ffeca840bfb553e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:19:26 +0200 Subject: [PATCH 8/8] Fix indentation --- libraries/File.class.php | 3 ++- libraries/ServerStatusData.class.php | 5 +++-- libraries/Util.class.php | 10 ++++++---- libraries/core.lib.php | 3 ++- libraries/plugins/import/ImportMediawiki.class.php | 6 +++--- libraries/server_privileges.lib.php | 10 +++++----- libraries/transformations.lib.php | 6 ++++-- server_replication.php | 7 ++++--- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index d20e2db5c3..e26ef30f28 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -791,7 +791,8 @@ class PMA_File $result = substr($result, 3); // UTF-16 BE, LE } elseif (strncmp($result, "\xFE\xFF", 2) == 0 - || strncmp($result, "\xFF\xFE", 2) == 0) { + || strncmp($result, "\xFF\xFE", 2) == 0 + ) { $result = substr($result, 2); } } diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php index 47c8c0d3a2..324493a348 100644 --- a/libraries/ServerStatusData.class.php +++ b/libraries/ServerStatusData.class.php @@ -62,7 +62,7 @@ class PMA_ServerStatusData $server_status = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL STATUS', 0, 1); if (PMA_DRIZZLE) { // Drizzle doesn't put query statistics into variables, add it - $sql = "SELECT concat('Com_', variable_name), variable_value " + $sql = "SELECT concat('Com_', variable_name), variable_value " . "FROM data_dictionary.GLOBAL_STATEMENTS"; $statements = $GLOBALS['dbi']->fetchResult($sql, 0, 1); $server_status = array_merge($server_status, $statements); @@ -93,7 +93,8 @@ class PMA_ServerStatusData / $server_variables['key_buffer_size'] * 100; } elseif (isset($server_status['Key_blocks_used']) - && isset($server_variables['key_buffer_size'])) { + && isset($server_variables['key_buffer_size']) + ) { $server_status['Key_buffer_fraction_%'] = $server_status['Key_blocks_used'] * 1024 diff --git a/libraries/Util.class.php b/libraries/Util.class.php index ba11d6c2d7..ea210f328a 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -1116,7 +1116,8 @@ class PMA_Util ) ); } elseif (! empty($GLOBALS['parsed_sql']) - && $query_base == $GLOBALS['parsed_sql']['raw']) { + && $query_base == $GLOBALS['parsed_sql']['raw'] + ) { // (here, use "! empty" because when deleting a bookmark, // $GLOBALS['parsed_sql'] is set but empty $parsed_sql = $GLOBALS['parsed_sql']; @@ -1743,7 +1744,8 @@ class PMA_Util ) { $tab['class'] = 'active'; } elseif (is_null($tab['active']) && empty($GLOBALS['active_page']) - && (basename($GLOBALS['PMA_PHP_SELF']) == $tab['link'])) { + && (basename($GLOBALS['PMA_PHP_SELF']) == $tab['link']) + ) { $tab['class'] = 'active'; } } @@ -2229,8 +2231,8 @@ class PMA_Util $con_val = '= ' . $row[$i]; } elseif ((($meta->type == 'blob') || ($meta->type == 'string')) // hexify only if this is a true not empty BLOB or a BINARY - && stristr($field_flags, 'BINARY') - && ! empty($row[$i]) + && stristr($field_flags, 'BINARY') + && ! empty($row[$i]) ) { // do not waste memory building a too big condition if (strlen($row[$i]) < 1000) { diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fe26d3f2f3..7292477e62 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -515,7 +515,8 @@ function PMA_getenv($var_name) } elseif (getenv($var_name)) { return getenv($var_name); } elseif (function_exists('apache_getenv') - && apache_getenv($var_name, true)) { + && apache_getenv($var_name, true) + ) { return apache_getenv($var_name, true); } diff --git a/libraries/plugins/import/ImportMediawiki.class.php b/libraries/plugins/import/ImportMediawiki.class.php index 48870f7018..3011b4e730 100644 --- a/libraries/plugins/import/ImportMediawiki.class.php +++ b/libraries/plugins/import/ImportMediawiki.class.php @@ -217,8 +217,8 @@ class ImportMediawiki extends ImportPlugin // End processing because the current line does not // contain any column information } elseif (substr($cur_buffer_line, 0, 2) === '|-' - || substr($cur_buffer_line, 0, 2) === '|+' - || substr($cur_buffer_line, 0, 2) === '|}' + || substr($cur_buffer_line, 0, 2) === '|+' + || substr($cur_buffer_line, 0, 2) === '|}' ) { // Check begin row or end table @@ -570,4 +570,4 @@ class ImportMediawiki extends ImportPlugin { $this->_analyze = $analyze; } -} \ No newline at end of file +} diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 314ec1cdc4..e39ff57a27 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -115,8 +115,9 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false) $privs[] = $current_grant[1]; } } elseif (! empty($GLOBALS[$current_grant[0]]) - && is_array($GLOBALS[$current_grant[0]]) - && empty($GLOBALS[$current_grant[0] . '_none'])) { + && is_array($GLOBALS[$current_grant[0]]) + && empty($GLOBALS[$current_grant[0] . '_none']) + ) { if ($enableHTML) { $priv_string = '' . $current_grant[1] . ''; @@ -137,9 +138,8 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false) $privs[] = 'USAGE'; } } elseif ($allPrivileges - && (! isset($_POST['grant_count']) - || count($privs) == $_POST['grant_count']) - ) { + && (! isset($_POST['grant_count']) || count($privs) == $_POST['grant_count']) + ) { if ($enableHTML) { $privs = array('