diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index c64f0c5aac..eba7600bfe 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -239,7 +239,7 @@ class PMA_DisplayResults * * @see sql.php */ - public function processParams( + public function setProperties( $unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func, $is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage, $text_dir, $is_maint, $is_explain, $is_show, $showtable, $printview, $url_query @@ -262,8 +262,8 @@ class PMA_DisplayResults $this->__set('_showtable', $showtable); $this->__set('_printview', $printview); $this->__set('_url_query', $url_query); - - } + + } // end of the 'setProperties()' function /** @@ -334,7 +334,7 @@ class PMA_DisplayResults $do_display['bkm_form'] = (string) '0'; $do_display['text_btn'] = (string) '0'; $do_display['pview_lnk'] = (string) '0'; - + } elseif ($this->__get('_is_count') || $this->__get('_is_analyse') || $this->__get('_is_maint') || $this->__get('_is_explain') ) { @@ -347,7 +347,7 @@ class PMA_DisplayResults $do_display['nav_bar'] = (string) '0'; $do_display['ins_row'] = (string) '0'; $do_display['bkm_form'] = (string) '1'; - + if ($this->__get('_is_maint')) { $do_display['text_btn'] = (string) '1'; } else { @@ -528,11 +528,14 @@ class PMA_DisplayResults return '' . '
' - . PMA_generate_common_hidden_inputs($this->__get('_db'), $this->__get('_table')) + . PMA_generate_common_hidden_inputs( + $this->__get('_db'), $this->__get('_table') + ) . '' . '' - . '' + . '' . $input_for_real_end . '' . '' - . PMA_generate_common_hidden_inputs($this->__get('_db'), $this->__get('_table')) + . PMA_generate_common_hidden_inputs( + $this->__get('_db'), $this->__get('_table') + ) . '' . '' . '' - . '' + . '' . '' . '
' . ''; @@ -822,7 +828,8 @@ class PMA_DisplayResults $onsubmit = 'onsubmit="return ' . ($_SESSION['tmp_user_values']['pos'] - + $_SESSION['tmp_user_values']['max_rows'] < $this->__get('_unlim_num_rows') + + $_SESSION['tmp_user_values']['max_rows'] + < $this->__get('_unlim_num_rows') && $this->__get('_num_rows') >= $_SESSION['tmp_user_values']['max_rows']) ? 'true' : 'false' . '"'; @@ -831,8 +838,10 @@ class PMA_DisplayResults $buttons_html .= $this->_getTableNavigationButton( '>>', _pgettext('Last page', 'End'), - @((ceil($this->__get('_unlim_num_rows') / $_SESSION['tmp_user_values']['max_rows'])- 1) - * $_SESSION['tmp_user_values']['max_rows']), + @((ceil( + $this->__get('_unlim_num_rows') + / $_SESSION['tmp_user_values']['max_rows'] + )- 1) * $_SESSION['tmp_user_values']['max_rows']), $html_sql_query, $onsubmit, $input_for_real_end, $onclick ); @@ -864,7 +873,8 @@ class PMA_DisplayResults $additional_fields_html .= '' - . '' + . '' . '' @@ -970,7 +980,9 @@ class PMA_DisplayResults $table_headers_html .= '' . '
' - . PMA_generate_common_hidden_inputs($this->__get('_db'), $this->__get('_table')) + . PMA_generate_common_hidden_inputs( + $this->__get('_db'), $this->__get('_table') + ) . '
'; // Output data needed for column reordering and show/hide column @@ -1187,7 +1199,9 @@ class PMA_DisplayResults $drop_down_html = ''; $drop_down_html .= '
' . "\n" - . PMA_generate_common_hidden_inputs($this->__get('_db'), $this->__get('_table')) + . PMA_generate_common_hidden_inputs( + $this->__get('_db'), $this->__get('_table') + ) . __('Sort by key') . ': ' . "\n"; } @@ -3901,6 +3917,7 @@ class PMA_DisplayResults */ private function _getOperationLinksForVerticleTable($operation) { + $link_html = '' . "\n"; $vertical_display = $this->__get('_vertical_display'); @@ -3933,7 +3950,7 @@ class PMA_DisplayResults * * @param string $dir _left / _right * - * @return $checkBoxes_html html content + * @return $checkBoxes_html html content * * @access private * diff --git a/sql.php b/sql.php index 5932221a8e..65a50cf440 100644 --- a/sql.php +++ b/sql.php @@ -937,7 +937,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { $printview = isset($printview) ? $printview : null; $url_query = isset($url_query) ? $url_query : null; - $displayResultsObject->processParams( + $displayResultsObject->setProperties( $unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func, $is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage, $text_dir, $is_maint, $is_explain, $is_show, $showtable, $printview, $url_query @@ -1097,7 +1097,7 @@ $(makeProfilingChart); $printview = isset($printview) ? $printview : null; $url_query = isset($url_query) ? $url_query : null; - $displayResultsObject->processParams( + $displayResultsObject->setProperties( $unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func, $is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage, $text_dir, $is_maint, $is_explain, $is_show, $showtable, $printview, $url_query