Changeset 563 for trunk/plog-admin/plog-manage.php

Timestamp:

07/21/08 19:18:07 (5 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #160 - cruft-free pagination
+ Couple of miscellaneous syntax edits

Files:

• trunk/plog-admin/plog-manage.php (modified) (5 diffs)

trunk/plog-admin/plog-manage.php

@@ -301 +301 @@
         // handle pagination
         // lets determine the limit filter based on current page and number of results per page
-        if (!isset($_REQUEST["page"])) $_REQUEST["page"] = "1"; // we're on the first page
-
-        if (isset($_REQUEST['entries_per_page']))
-        $_SESSION['entries_per_page'] = $_REQUEST['entries_per_page'];
-        else
-        $_SESSION['entries_per_page'] = 20;
+        if (isset($_REQUEST['entries_per_page'])) {
+                $_SESSION['entries_per_page'] = $_REQUEST['entries_per_page'];
+        } else {
+                $_SESSION['entries_per_page'] = 20;
+        }
 
         $cond = "";
@@ -318 +317 @@
         }
 
-        $url = "?entries_per_page=$_SESSION[entries_per_page]&level=$_REQUEST[level]&id=$id";
-
-        $plog_page = isset($_REQUEST['plog_page']) ? $_REQUEST['plog_page'] : 0;
+        $plog_page = isset($_REQUEST['plog_page']) ? $_REQUEST['plog_page'] : 1; // we're on the first page
         $first_item = ($plog_page - 1) * $_SESSION['entries_per_page'];
         if ($first_item < 0) {
                 $first_item = 0;
-        };
-        $limit = "LIMIT $first_item, $_SESSION[entries_per_page]";
+        }
+        $limit = "LIMIT ".$first_item.", ".$_SESSION['entries_per_page'];
 
         // lets generate the pagination menu as well
@@ -332 +329 @@
         $totalRows = mysql_result($totalRowsResult,'num_items');
 
-        $page = isset($_GET["plog_page"]) ? $_GET["plog_page"] : 1;
-        $pagination_menu = "\n\t\t" . '<div class="pagination">'.generate_pagination('plog-manage.php'.$url,$page,$totalRows,$_SESSION['entries_per_page']).'</div>';
+        $pagination_menu = "\n\t\t" . '<div class="pagination">'.generate_pagination("admin", "manage", $plog_page, $totalRows, $_SESSION['entries_per_page'], array("level" => $level, "id" => $id, "entries_per_page" => $_SESSION['entries_per_page'])).'</div>';
 
         $output .= "\n\t\t" . '<form id="contentList" action="'.$_SERVER["PHP_SELF"].'" method="get">';
@@ -339 +335 @@
         $level = $_REQUEST['level'];
 
-        if (empty($level)) {
+        if (empty($level) || $level == "collections") {
                 $output .= generate_breadcrumb_admin("").$pagination_menu;
                 $output .= plog_collection_manager($first_item,$_SESSION['entries_per_page']);
-        };
+        }
 
         if ($level == "albums") {
@@ -366 +362 @@
                 <input type="hidden" name="action" value="1" />
                 <input class="submit" type="submit" name="delete_checked" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete selected items?') . '\');" value="' . plog_tr('Delete Checked') . '" />';
-        if (!empty($level) && $level != "comments"){
+        if (!empty($level) && $level != "collections" && $level != "comments"){
                 $output .= generate_move_menu($level);
         };