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

Timestamp:

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

Author:

sidtheduck

Message:

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

Files:

• trunk/plog-admin/plog-feedback.php (modified) (4 diffs)

trunk/plog-admin/plog-feedback.php

@@ -110 +110 @@
 $url = "?entries_per_page=$_SESSION[entries_per_page]";
 
-$first_item = ($_REQUEST['plog_page'] - 1) * $_SESSION['entries_per_page'];
+$plog_page = isset($_REQUEST["plog_page"]) ? $_REQUEST["plog_page"] : 1;
+
+$first_item = ($plog_page - 1) * $_SESSION['entries_per_page'];
 $limit = "LIMIT $first_item, $_SESSION[entries_per_page]";
 
@@ -122 +124 @@
 $num_comments_im = mysql_result($mod_result, "in_moderation");
 
-$page = isset($_GET["plog_page"]) ? $_GET["plog_page"] : 1;
-
 // filter based on whether were looking at approved comments or unmoderated comments
-$approved = isset($_GET["moderate"]) ? 0 : 1;
-
-if ($approved)
-        $pagination_menu = generate_pagination('plog-feedback.php'.$url,$page,$num_comments,$_SESSION['entries_per_page']);
-else
-        $pagination_menu = generate_pagination('plog-feedback.php'.$url,$page,$num_comments_im,$_SESSION['entries_per_page'],"&moderate=1");
+$approved = isset($_REQUEST['moderate']) ? 0 : 1;
+
+if ($approved) {
+        $pagination_menu = generate_pagination("admin", "feedback", $plog_page, $num_comments, $_SESSION['entries_per_page']);
+} else {
+        $pagination_menu = generate_pagination("admin", "feedback", $plog_page, $num_comments_im, $_SESSION['entries_per_page'], array("moderate" => 1));
+}
+$pagination_menu = "\n\t\t" . '<div class="pagination">'.$pagination_menu.'</div>';
 
 // generate javascript init function for ajax editing
@@ -186 +188 @@
                 </table>';
 
+                        if (!$empty) { $output .= $pagination_menu; }
+
                         $output .= "\n\n\t\t" . '<table style="width: 100%;" cellpadding="4">
                         <tr class="header">
@@ -269 +273 @@
 }
 
-if (!$empty)
-        $output .= "\n\n\t\t" . '<table style="width: 100%;">
-                        <tr>
-                                <td><a href="#" onclick="checkAll(document.getElementById(\'contentList\')); return false;">' . plog_tr('Invert Checkbox Selection') . '</a></td>
-                                <td align="right">'.$pagination_menu.'</td>
-                        </tr>
-                </table>';
-
-$output .= "\n\n\t\t" . '<div><input class="submit" type="submit" name="delete_checked" onclick="return confirm(\''. plog_tr('Are you sure you want to delete the selected comments?') . '\');" value="' . plog_tr('Delete Checked') . '" /><input class="submit" type="submit" name="approve_checked" onclick="return confirm(\'' . plog_tr('Are you sure you want to approve the selected comments?') . '\');" value="' . plog_tr('Approve Checked') . '" /></div>';
+if (!$empty) {
+        $output .= "\n\n\t\t" . '<div><a href="#" onclick="checkAll(document.getElementById(\'contentList\')); return false;">' . plog_tr('Invert Checkbox Selection') . '</a></div>
+                '.$pagination_menu;
+}
+
+$output .= "\n\n\t\t" . '<div><input class="submit" type="submit" name="delete_checked" onclick="return confirm(\''. plog_tr('Are you sure you want to delete the selected comments?') . '\');" value="' . plog_tr('Delete Checked') . '" />';
+if (!$approved) {
+        $output .= '<input class="submit" type="submit" name="approve_checked" onclick="return confirm(\'' . plog_tr('Are you sure you want to approve the selected comments?') . '\');" value="' . plog_tr('Approve Checked') . '" /></div>';
+}
 
 $output .= "\n\n\t\t" . '</form>'. "\n";