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"; - // 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")) {