diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index dfb2ade1bf..dc3574b177 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -134,7 +134,7 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
// 2.3.2 Displays edit/delete/sort/insert links?
if ($is_link
&& ($fields_meta[$i]->table == '' || $fields_meta[$i]->table != $prev_table)
- ) {
+ ) {
$do_display['edit_lnk'] = 'nn'; // don't display links
$do_display['del_lnk'] = 'nn';
/**
@@ -362,9 +362,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
} // end show all
// Move to the next page or to the last one
- if (($_SESSION['tmp_user_values']['pos'] + $_SESSION['tmp_user_values']['max_rows'] < $unlim_num_rows) && $num_rows >= $_SESSION['tmp_user_values']['max_rows']
- && $_SESSION['tmp_user_values']['max_rows'] != 'all') {
-
+ if (($_SESSION['tmp_user_values']['pos'] + $_SESSION['tmp_user_values']['max_rows'] < $unlim_num_rows)
+ && $num_rows >= $_SESSION['tmp_user_values']['max_rows']
+ && $_SESSION['tmp_user_values']['max_rows'] != 'all'
+ ) {
// display the Next button
PMA_displayTableNavigationOneButton('>',
_pgettext('Next page', 'Next'),
@@ -505,9 +506,13 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$unsorted_sql_query = trim($unsorted_sql_query);
// sorting by indexes, only if it makes sense (only one table ref)
- if (isset($analyzed_sql) && isset($analyzed_sql[0]) &&
- isset($analyzed_sql[0]['querytype']) && $analyzed_sql[0]['querytype'] == 'SELECT' &&
- isset($analyzed_sql[0]['table_ref']) && count($analyzed_sql[0]['table_ref']) == 1) {
+ if (isset($analyzed_sql)
+ && isset($analyzed_sql[0])
+ && isset($analyzed_sql[0]['querytype'])
+ && $analyzed_sql[0]['querytype'] == 'SELECT'
+ && isset($analyzed_sql[0]['table_ref'])
+ && count($analyzed_sql[0]['table_ref']) == 1
+ ) {
// grab indexes data:
$indexes = PMA_Index::getFromTable($table, $db);
@@ -516,7 +521,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if ($indexes) {
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
$span = $fields_cnt;
if ($is_display['edit_lnk'] != 'nn') {
$span++;
@@ -707,13 +713,15 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
echo '">' . "\n";
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo '' . "\n";
}
// 1. Displays the full/partial text button (part 1)...
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
$colspan = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn')
? ' colspan="4"'
: '';
@@ -725,17 +733,19 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... before the result table
if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
- && $is_display['text_btn'] == '1') {
+ && $is_display['text_btn'] == '1'
+ ) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
@@ -1216,9 +1246,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// query without conditions to shorten URLs when needed, 200 is just
// guess, it should depend on remaining URL length
- if (isset($analyzed_sql) && isset($analyzed_sql[0]) &&
- isset($analyzed_sql[0]['querytype']) && $analyzed_sql[0]['querytype'] == 'SELECT' &&
- strlen($sql_query) > 200) {
+ if (isset($analyzed_sql)
+ && isset($analyzed_sql[0])
+ && isset($analyzed_sql[0]['querytype'])
+ && $analyzed_sql[0]['querytype'] == 'SELECT'
+ && strlen($sql_query) > 200
+ ) {
$url_sql_query = 'SELECT ';
if (isset($analyzed_sql[0]['queryflags']['distinct'])) {
@@ -1267,10 +1300,11 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$odd_row = true;
while ($row = PMA_DBI_fetch_row($dt_result)) {
// "vertical display" mode stuff
- if ($row_no != 0 && $_SESSION['tmp_user_values']['repeat_cells'] != 0 && !($row_no % $_SESSION['tmp_user_values']['repeat_cells'])
- && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'))
- {
+ if ($row_no != 0 && $_SESSION['tmp_user_values']['repeat_cells'] != 0
+ && !($row_no % $_SESSION['tmp_user_values']['repeat_cells'])
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')
+ ) {
echo '
@@ -747,15 +757,17 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... at the left column of the result table header if possible
// and required
elseif (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && $is_display['text_btn'] == '1') {
+ && $is_display['text_btn'] == '1'
+ ) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
>
' . "\n"
. ' ' . "\n"
. ' ' . "\n";
@@ -767,19 +779,21 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
&& ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>
>
' . "\n";
} // end vertical mode
}
// ... elseif display an empty column if the actions links are disabled to match the rest of the table
- elseif ($GLOBALS['cfg']['RowActionLinks'] == 'none' && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ elseif ($GLOBALS['cfg']['RowActionLinks'] == 'none'
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')
+ ) {
echo '';
}
@@ -790,7 +804,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.0.1 Prepare Display column comments if enabled ($GLOBALS['cfg']['ShowBrowseComments']).
// Do not show comments, if using horizontalflipped mode, because of space usage
if ($GLOBALS['cfg']['ShowBrowseComments']
- && $_SESSION['tmp_user_values']['disp_direction'] != 'horizontalflipped') {
+ && $_SESSION['tmp_user_values']['disp_direction'] != 'horizontalflipped'
+ ) {
$comments_map = array();
if (isset($analyzed_sql[0]) && is_array($analyzed_sql[0])) {
foreach ($analyzed_sql[0]['table_ref'] as $tbl) {
@@ -809,8 +824,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// See if we have to highlight any header fields of a WHERE query.
// Uses SQL-Parser results.
$highlight_columns = array();
- if (isset($analyzed_sql) && isset($analyzed_sql[0]) &&
- isset($analyzed_sql[0]['where_clause_identifiers'])) {
+ if (isset($analyzed_sql) && isset($analyzed_sql[0])
+ && isset($analyzed_sql[0]['where_clause_identifiers'])
+ ) {
$wi = 0;
if (isset($analyzed_sql[0]['where_clause_identifiers']) && is_array($analyzed_sql[0]['where_clause_identifiers'])) {
@@ -842,9 +858,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
// 2.0 Prepare comment-HTML-wrappers for each row, if defined/enabled.
- if (isset($comments_map) &&
- isset($comments_map[$fields_meta[$i]->table]) &&
- isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])) {
+ if (isset($comments_map)
+ && isset($comments_map[$fields_meta[$i]->table])
+ && isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])
+ ) {
$comments = '' . htmlspecialchars($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name]) . '';
} else {
$comments = '';
@@ -892,7 +909,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// Another query to test this:
// SELECT p.*, FROM_UNIXTIME(p.temps) FROM mytable AS p
// (and try clicking on each column's header twice)
- if (! empty($sort_tbl) && strpos($sort_expression_nodirection, $sort_tbl) === false && strpos($sort_expression_nodirection, '(') === false) {
+ if (! empty($sort_tbl)
+ && strpos($sort_expression_nodirection, $sort_tbl) === false
+ && strpos($sort_expression_nodirection, '(') === false
+ ) {
$sort_expression_nodirection = $sort_tbl . $sort_expression_nodirection;
}
$is_in_sort = (str_replace('`', '', $sort_tbl) . $name_to_use_in_sort == str_replace('`', '', $sort_expression_nodirection) ? true : false);
@@ -961,7 +981,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
}
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
- && $GLOBALS['cfg']['HeaderFlipType'] == 'css') {
+ && $GLOBALS['cfg']['HeaderFlipType'] == 'css'
+ ) {
$order_link_params['style'] = 'direction: ltr; writing-mode: tb-rl;';
}
$order_link_params['title'] = __('Sort');
@@ -969,7 +990,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_link = PMA_linkOrButton($order_url, $order_link_content . $order_img, $order_link_params, false, true);
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo ' ';
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
- && $GLOBALS['cfg']['HeaderFlipType'] == 'fake') {
+ && $GLOBALS['cfg']['HeaderFlipType'] == 'fake'
+ ) {
echo PMA_flipstring(htmlspecialchars($fields_meta[$i]->name), '
');
} else {
echo htmlspecialchars($fields_meta[$i]->name);
@@ -1042,18 +1067,20 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 3. Displays the needed checkboxes at the right
// column of the result table header if possible and required...
if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
- && $is_display['text_btn'] == '1') {
+ && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
+ && $is_display['text_btn'] == '1'
+ ) {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 1;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo "\n";
?>
>
' . "\n"
. ' ' . "\n"
. ' ' . "\n";
@@ -1063,23 +1090,26 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... elseif no button, displays empty columns if required
// (unless coming from Browse mode print view)
elseif (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
- && ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
- && (!$GLOBALS['is_header_sent'])) {
+ && ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
+ && (! $GLOBALS['is_header_sent'])
+ ) {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 1;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
echo "\n";
?>
>
' . "\n";
} // end vertical mode
}
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
+ ) {
?>