From 42b15654c4a50b5df02749955b57a3e48fe33a96 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 9 Feb 2018 23:09:05 +0100 Subject: [PATCH] Wrap more into if (!is_ajax) --- adminer/select.inc.php | 160 +++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 79 deletions(-) diff --git a/adminer/select.inc.php b/adminer/select.inc.php index 932beecb..426eda3c 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -461,64 +461,65 @@ if (!$columns && support("table")) { echo "\n"; } - echo "
\n"; - if (($rows || $page) && !is_ajax()) { - $exact_count = true; - if ($_GET["page"] != "last") { - if ($limit == "" || (count($rows) < $limit && ($rows || !$page))) { - $found_rows = ($page ? $page * $limit : 0) + count($rows); - } elseif ($jush != "sql" || !$is_group) { - $found_rows = ($is_group ? false : found_rows($table_status, $where)); - if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) { - // slow with big tables - $found_rows = reset(slow_query(count_rows($TABLE, $where, $is_group, $group))); - } else { - $exact_count = false; + if (!is_ajax()) { + echo "
\n"; + if ($rows || $page) { + $exact_count = true; + if ($_GET["page"] != "last") { + if ($limit == "" || (count($rows) < $limit && ($rows || !$page))) { + $found_rows = ($page ? $page * $limit : 0) + count($rows); + } elseif ($jush != "sql" || !$is_group) { + $found_rows = ($is_group ? false : found_rows($table_status, $where)); + if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) { + // slow with big tables + $found_rows = reset(slow_query(count_rows($TABLE, $where, $is_group, $group))); + } else { + $exact_count = false; + } } } - } - if ($limit != "" && ($found_rows === false || $found_rows > $limit || $page)) { - echo "

\n"; - // display first, previous 4, next 4 and last page - $max_page = ($found_rows === false - ? $page + (count($rows) >= $limit ? 2 : 1) - : floor(($found_rows - 1) / $limit) - ); - if ($jush != "simpledb") { - echo '' . lang('Page') . ":"; - echo script("qsl('a').onclick = function () { pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "')); return false; };"); - echo pagination(0, $page) . ($page > 5 ? " ..." : ""); - for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) { - echo pagination($i, $page); - } - if ($max_page > 0) { - echo ($page + 5 < $max_page ? " ..." : ""); - echo ($exact_count && $found_rows !== false - ? pagination($max_page, $page) - : " " . lang('last') . "" - ); - } - echo (($found_rows === false ? count($rows) + 1 : $found_rows - $page * $limit) > $limit - ? ' ' . lang('Load more data') . '' - . script("qsl('a').onclick = partial(selectLoadMore, " . (+$limit) . ", '" . lang('Loading') . "...');", "") - : '' + if ($limit != "" && ($found_rows === false || $found_rows > $limit || $page)) { + echo "

\n"; + // display first, previous 4, next 4 and last page + $max_page = ($found_rows === false + ? $page + (count($rows) >= $limit ? 2 : 1) + : floor(($found_rows - 1) / $limit) ); - } else { - echo lang('Page') . ":"; - echo pagination(0, $page) . ($page > 1 ? " ..." : ""); - echo ($page ? pagination($page, $page) : ""); - echo ($max_page > $page ? pagination($page + 1, $page) . ($max_page > $page + 1 ? " ..." : "") : ""); + if ($jush != "simpledb") { + echo '' . lang('Page') . ":"; + echo script("qsl('a').onclick = function () { pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "')); return false; };"); + echo pagination(0, $page) . ($page > 5 ? " ..." : ""); + for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) { + echo pagination($i, $page); + } + if ($max_page > 0) { + echo ($page + 5 < $max_page ? " ..." : ""); + echo ($exact_count && $found_rows !== false + ? pagination($max_page, $page) + : " " . lang('last') . "" + ); + } + echo (($found_rows === false ? count($rows) + 1 : $found_rows - $page * $limit) > $limit + ? ' ' . lang('Load more data') . '' + . script("qsl('a').onclick = partial(selectLoadMore, " . (+$limit) . ", '" . lang('Loading') . "...');", "") + : '' + ); + } else { + echo lang('Page') . ":"; + echo pagination(0, $page) . ($page > 1 ? " ..." : ""); + echo ($page ? pagination($page, $page) : ""); + echo ($max_page > $page ? pagination($page + 1, $page) . ($max_page > $page + 1 ? " ..." : "") : ""); + } + echo "\n"; } - echo "\n"; - } - echo ($found_rows !== false ? "(" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " : ""); - $display_rows = ($exact_count ? "" : "~ ") . $found_rows; - echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n"; + echo ($found_rows !== false ? "(" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " : ""); + $display_rows = ($exact_count ? "" : "~ ") . $found_rows; + echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n"; - if ($adminer->selectCommandPrint()) { - ?> + if ($adminer->selectCommandPrint()) { + ?> >

>
@@ -528,40 +529,41 @@ if (!$columns && support("table")) {
dumpFormat(); + foreach ((array) $_GET["columns"] as $column) { + if ($column["fun"]) { + unset($format['sql']); + break; + } + } + if ($format) { + print_fieldset("export", lang('Export') . " "); + $output = $adminer->dumpOutput(); + echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : ""); + echo html_select("format", $format, $adminer_import["format"]); + echo " \n"; + echo "
\n"; + } + } - $format = $adminer->dumpFormat(); - foreach ((array) $_GET["columns"] as $column) { - if ($column["fun"]) { - unset($format['sql']); - break; - } - } - if ($format) { - print_fieldset("export", lang('Export') . " "); - $output = $adminer->dumpOutput(); - echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : ""); - echo html_select("format", $format, $adminer_import["format"]); - echo " \n"; + if ($adminer->selectImportPrint()) { + print_fieldset("import", lang('Import'), !$rows); + echo " "; + echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select + echo " "; echo "
\n"; } + $adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns); + echo "\n"; + echo "
\n"; + + echo "\n"; + echo (!$group && $select ? "" : script("tableCheck();")); } - - if ($adminer->selectImportPrint()) { - print_fieldset("import", lang('Import'), !$rows); - echo " "; - echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select - echo " "; - echo "\n"; - } - - $adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns); - echo "\n"; - echo "\n"; - - echo "\n"; - echo (!$group && $select ? "" : script("tableCheck();")); } }