Ticket #160: cruft_free_pagination.patch

plog-admin/plog-manage.php

@@ -317 +317 @@
                 $cond = "WHERE `parent_album` = '$id'";
         }
 
-        $url = "?entries_per_page=$_SESSION[entries_per_page]&level=$_REQUEST[level]&id=$id";
-
         $plog_page = isset($_REQUEST['plog_page']) ? $_REQUEST['plog_page'] : 0;
         $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
         $recordCount = "SELECT COUNT(*) AS num_items FROM ".TABLE_PREFIX."$level $cond";
@@ -332 +330 @@
         $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("manage", $id, $page, $totalRows, $_SESSION['entries_per_page'], array("level" => $_REQUEST['level'], "entries_per_page" => $_SESSION['entries_per_page'])).'</div>';
 
         $output .= "\n\t\t" . '<form id="contentList" action="'.$_SERVER["PHP_SELF"].'" method="get">';
 
@@ -341 +339 @@
         if (empty($level)) {
                 $output .= generate_breadcrumb_admin("").$pagination_menu;
                 $output .= plog_collection_manager($first_item,$_SESSION['entries_per_page']);
-        };
+        }
 
         if ($level == "albums") {
                 $output .= generate_breadcrumb_admin("albums", $id).$pagination_menu;
@@ -373 +371 @@
 
 display($output, "manage");
 
-?>
- No newline at end of file
+?>

plog-includes/plog-functions.php

@@ -1023 +1023 @@
                         $current_level = $level;
                 }
         }
+        
+        // try to detect collections level paging for multiple collections. Downside is you cannot have an album named 'plog_page'
+        if (isset($names['collection']) && $names['collection'] == 'plog_page') {
+                if (isset($names['album'])) {
+                        return array("level" => "collections", "id" => 0, "plog_page" => intval($names['album']));
+                }
+        }
 
         if (!empty($names["collection"])) {
                 $sql = "SELECT *
@@ -1037 +1044 @@
 
                 $collection = mysql_fetch_assoc($result);
 
+                // try to detect collection level paging for multiple albums. Downside is you cannot have an album named 'plog_page'
+                if (isset($names['album']) && $names['album'] == 'plog_page') {
+                        if (isset($names['picture'])) {
+                                return array("level" => "collection", "id" => $collection['id'], "plog_page" => intval($names['picture']));
+                        }
+                }
+
                 // what if there are multiple collections with same names? I hope there aren't .. this would
                 // suck. But here is an idea, we shouldn't allow the user to enter similar names
                 $rv = array("level" => "collection","id" => $collection["id"]);
@@ -1056 +1070 @@
 
                 $album = mysql_fetch_assoc($result);
 
+                // try to detect album level paging for multiple pictures. Downside is you cannot have an picture named 'plog_page'
+                if (isset($names['picture']) && $names['picture'] == 'plog_page') {
+                        if (isset($names['arg1'])) {
+                                return array("level" => "album", "id" => $album['id'], "plog_page" => intval($names['arg1']));
+                        }
+                }
+
                 // try to detect slideshow. Downside is that you cannot have a picture with that name
                 if (isset($names['picture']) && $names['picture'] == 'slideshow') {
                         return array('level' => 'album','mode' => 'slideshow','id' => $album['id']);
@@ -1111 +1132 @@
         return $rv;
 }
 
-function generate_pagination($url, $current_page, $items_total, $items_on_page, $extra_params = ''){
+function generate_pagination($level, $id, $current_page, $items_total, $items_on_page, $extra_params = array()){
         $output = '';
 
-        if (!isset($GLOBALS["total_pictures"])) $GLOBALS["total_pictures"] = 0;
+        if (!isset($GLOBALS['total_pictures'])) $GLOBALS['total_pictures'] = 0;
 
-        if (($items_total == 0) && ($GLOBALS["total_pictures"] > 0)) {
-                $items_total = $GLOBALS["total_pictures"];
+        if (($items_total == 0) && ($GLOBALS['total_pictures'] > 0)) {
+                $items_total = $GLOBALS['total_pictures'];
         }
 
         $num_pages = ceil($items_total / $items_on_page);
 
-        // if adding arguments to mod_rewritten urls, then I need ? (question mark) before the arguments
-        // otherwise I want &
-        //$last = substr($url,-1);
-
-        if (!strpos($url,"?")) {
-                $separator = "?";
-        } else {
-                $separator = "&";
-        }
-
         if ($num_pages > 1){
                 if ($current_page > 1){
-                        $output .= ' <a accesskey="," class="pagPrev" href="'.$url.$separator.'plog_page='.($current_page - 1).$extra_params.'"><span>&laquo;</span></a> ';
+                        $page = array(1 => "plog_page", "plog_page" => $current_page - 1);
+                        $args = array_merge($page, $extra_params);
+                        $output .= ' <a accesskey="," class="pagPrev" href="'.generate_url($level, $id, $args).'"><span>&laquo;</span></a> ';
                 }
 
                 for ($i = 1; $i <= $num_pages; $i++){
                         if ($i == $current_page){
                                 $output .= '<span class="page_link"> ['.$i.'] </span>';
                         } else{
-                                $output .= '<a href="'.$url.$separator.'plog_page='.$i.$extra_params.'" class="page_link">'.$i.'</a> ';
+                                $page = array(1 => "plog_page", "plog_page" => $i);
+                                $args = array_merge($page, $extra_params);
+                                $output .= '<a href="'.generate_url($level, $id, $args).'" class="page_link">'.$i.'</a> ';
                         }
                 }
 
                 if ($current_page != $num_pages){
-                        $output .= ' <a accesskey="." class="pagNext" href="'.$url.$separator.'plog_page='.($current_page + 1).$extra_params.'"><span>&raquo;</span></a> ';
+                        $page = array(1 => "plog_page", "plog_page" => $current_page + 1);
+                        $args = array_merge($page, $extra_params);
+                        $output .= ' <a accesskey="." class="pagNext" href="'.generate_url($level, $id, $args).'"><span>&raquo;</span></a> ';
                 }
         }
 
@@ -1166 +1183 @@
         $rv = '';
 
         if ($config['use_mod_rewrite']){
+                $args = '';
+                // I need to give additional arguments to the url-s
+                if (sizeof($arg) > 0) {
+                        foreach($arg as $aval) {
+                                $args .= $aval."/";
+                        }
+                }
+
                 switch($level){
                         case "collection":
                                 $query = "SELECT `path` FROM `".TABLE_PREFIX."collections` WHERE `id`=".intval($id);
                                 $result = run_query($query);
                                 $row = mysql_fetch_assoc($result);
-                                $rv = $config['baseurl'].rawurlencode(SmartStripSlashes($row['path']))."/";
+                                $rv = $config['baseurl'].rawurlencode(SmartStripSlashes($row['path']))."/".$args;
                                 break;
                         case "album":
                                 $query = "SELECT
@@ -1182 +1207 @@
                                 WHERE `a`.`id`=".intval($id);
                                 $result = run_query($query);
                                 $row = mysql_fetch_assoc($result);
-
-                                $rv = $config['baseurl'].rawurlencode(SmartStripSlashes($row['collection_path'])) . '/' . rawurlencode(SmartStripSlashes($row['album_path']))."/";
-
-                                // I need to give additional arguments to the url-s
-                                if (sizeof($arg) > 0) {
-                                        foreach($arg as $aval) {
-                                                $rv .= $aval."/";
-                                        }
-                                }
+                                $rv = $config['baseurl'].rawurlencode(SmartStripSlashes($row['collection_path'])) . '/' . rawurlencode(SmartStripSlashes($row['album_path']))."/".$args;
                                 break;
                         case "picture":
                                 $pic = get_picture_by_id($id);
@@ -1202 +1219 @@
                                 // I need to give additional arguments to the url-s
                                 if (sizeof($arg) > 0) {
                                         foreach($arg as $akey => $aval) {
-                                                // mod_rewrite url-s need /sorted in them, the old style ones do not.
-                                                // this temporary workaround removes the 'sorted' string
-                                                if ($aval != 'sorted') {
+                                                // mod_rewrite url-s need /sorted and /plog_page in them, the old style ones do not.
+                                                // this temporary workaround removes the 'sorted' and 'plog_page' strings
+                                                if ($aval != "sorted" && $aval != "plog_page") {
                                                         $rv .= "&amp;".$akey."=".$aval;
                                                 }
                                         }
                                 }
+                                //$rv .= "?level=search&amp;searchterms=".$arg['searchterms'];
                                 break;
                         case "collections":
-                                default:
-                                $rv = $config['baseurl'];
+                        default:
+                                $rv = $config['baseurl'].$args;
                                 break;
                 }
         } else {
                 // if there are non-Plogger query items, get them here to prepend to the URL query string
-                $query = (isset($config['query_args'])) ? "?".$config['query_args']."&amp;" : $query = "?";
+                // non-Plogger query items only work with old style URLs (not with mod_rewrite URLs)
+                $query = (isset($config['query_args'])) ? "?".$config['query_args']."&amp;" : "?";
+                
+                $args = '';
+                // add on any additional arguments from the $arg array
+                if (sizeof($arg) > 0) {
+                        foreach($arg as $akey => $aval) {
+                                // mod_rewrite url-s need /sorted and /plog_page in them, the old style ones do not.
+                                // this temporary workaround removes the 'sorted' and 'plog_page' strings
+                                if ($aval != "sorted" && $aval != "plog_page") {
+                                        $args .= "&amp;".$akey."=".$aval;
+                                }
+                        }
+                }
 
                 switch($level){
                         case "collection":
-                                return $config['baseurl'].$query.'level=collection&amp;id='.$id;
+                                $rv = $config['baseurl'].$query.'level=collection&amp;id='.$id.$args;
                                 break;
                         case "album":
-                                $rv = $config['baseurl'].$query.'level=album&amp;id='.$id;
-                                if (sizeof($arg) > 0) {
-                                        foreach($arg as $akey => $aval) {
-                                                // mod_rewrite url-s need /sorted in them, the old style ones do not.
-                                                // this temporary workaround removes the 'sorted' string
-                                                if ($aval != 'sorted') {
-                                                        $rv .= "&amp;".$akey."=".$aval;
-                                                }
-                                        }
-                                }
+                                $rv = $config['baseurl'].$query.'level=album&amp;id='.$id.$args;
                                 break;
                         case "picture":
                                 $rv = $config['baseurl'].$query.'level=picture&amp;id='.$id;
                                 break;
                         case "search":
-                                $rv = $config['baseurl'].$query."level=search";
-                                // I need to give additional arguments to the url-s
-                                if (sizeof($arg) > 0) {
-                                        foreach($arg as $akey => $aval) {
-                                                // mod_rewrite url-s need /sorted in them, the old style ones do not.
-                                                // this temporary workaround removes the 'sorted' string
-                                                if ($aval != 'sorted') {
-                                                        $rv .= "&amp;".$akey."=".$aval;
-                                                }
-                                        }
-                                }
+                                $rv = $config['baseurl'].$query."level=search".$args;
                                 break;
+                        case "manage":
+                                $rv = $config['baseurl']."plog-admin/plog-manage.php?id=".$id.$args;
+                                break;
                         case "collections":
-                                default:
-                                $query = (isset($config['query_args'])) ? "?".$config['query_args'] : $query = "";
-                                $rv = $config['baseurl'].$query;
+                        default:
+                                $rv = $config['baseurl'];
+                                if ($query != "?" && empty($args)) {
+                                        $rv .= $query.$args;
+                                }
                                 break;
                 }
         }
 
-        // replace &amp; with & if outputting to email
+        // replace &amp; with & if formatting plaintext (i.e. outputting to email)
         if ($plaintext !== false){
                 $rv = str_replace("&amp;","&",$rv);
         }
@@ -1974 +1991 @@
         global $config;
 
         if ($GLOBALS['plogger_mode'] != 'slideshow') {
-                $page = isset($_GET["plog_page"]) ? intval($_GET["plog_page"]) : 1;
-
-                if ($GLOBALS['plogger_level'] == "search") {
-                        $p_url = generate_url("search", -1, array('searchterms'=>urlencode($_GET["searchterms"])));
-                }
-                else {
-                        if ($GLOBALS['plogger_level']) {
-                                $p_url = generate_url($GLOBALS['plogger_level'], $GLOBALS['plogger_id']);
-                        } else {
-                                $p_url = generate_url("collections");
-                        }
-                }
-
-                switch($GLOBALS['plogger_level']) {
+                $page = isset($_GET['plog_page']) ? intval($_GET['plog_page']) : 1;
+                $level = $GLOBALS['plogger_level'];
+                $id = $GLOBALS['plogger_id'];
+                switch($level) {
                         case 'search':
-                                $num_items = $GLOBALS["total_pictures"];
-                        break;
+                                $num_items = $GLOBALS['total_pictures'];
+                                return generate_pagination("search", -1, $page, $num_items, $config['thumb_num'], array('searchterms'=>urlencode($_GET['searchterms'])));
+                                break;
 
                         case 'album':
                                 $num_items = plogger_album_picture_count();
-                        break;
+                                break;
 
                         case 'collection':
                                 $num_items = plogger_collection_album_count();
-                        break;
+                                break;
 
                         default:
-                        $num_items = plogger_count_collections();
-                        break;
+                                $level = "collections";
+                                $id = 0;
+                                $num_items = plogger_count_collections();
+                                break;
                 }
 
-                return generate_pagination($p_url, $page, $num_items, $config["thumb_num"]);
+                return generate_pagination($level, $id, $page, $num_items, $config['thumb_num']);
         }
 
 }

plog-load-config.php

@@ -85 +85 @@
 // remove plog-admin/ from the end, if present .. is there a better way to determine the full url?
 // had to update this for new use of links without mod_rewrite turned on (only affects the View gallery greybox in Admin)
 if (strpos($config['baseurl'], "plog-admin/")) {
+        $config['use_mod_rewrite'] = 0;
         $config['baseurl'] = substr($config['baseurl'],0,strpos($config['baseurl'], "plog-admin/"));
 }
 
@@ -170 +171 @@
 
 }
 
-?>
- No newline at end of file
+?>

plogger.php

@@ -21 +21 @@
                 if (isset($resolved_path['id'])) {
                         $_GET['id'] = $resolved_path['id'];
                 }
+                if (isset($resolved_path['plog_page'])) {
+                        $_GET['plog_page'] = $resolved_path['plog_page'];
+                }
                 if (isset($resolved_path['mode'])) {
                         $_GET['mode'] = $resolved_path['mode'];
                 }
 
-                // get page number from url, if present
+                // get the path for RSS links (maybe should rework this)
                 $parts = parse_url($_SERVER['REQUEST_URI']);
-                if (isset($parts['query'])) {
-                        parse_str($parts['query'],$query_parts);
-                        if (!empty($query_parts['plog_page'])) {
-                                $_GET['plog_page'] = $query_parts['plog_page'];
-                        }
-                }
                 $path = $parts['path'];
         }
 } else {
@@ -153 +150 @@
                 include(PLOGGER_DIR.'/plog-content/themes/default/'.$use_file);
         }
 }
-?>
- No newline at end of file
+?>