Changeset 563 for trunk/plog-includes/plog-functions.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-includes/plog-functions.php (modified) (13 diffs)

trunk/plog-includes/plog-functions.php

@@ -1025 +1025 @@
         }
 
-        if (!empty($names["collection"])) {
+        if (!empty($names['collection'])) {
+                // check for collections level pagination first
+                if ($names['collection'] == 'page' && !empty($names['album']) && is_numeric($names['album']) && intval($names['album']) == $names['album']) {
+                        return array("level" => "collections", "id" => 0, "plog_page" => intval($names['album']));
+                }
                 $sql = "SELECT *
                 FROM `".TABLE_PREFIX."collections`
-                WHERE `path`='".$names["collection"]."'";
+                WHERE `path`='".$names['collection']."'";
                 $result = run_query($sql);
 
@@ -1040 +1044 @@
                 // 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"]);
+                $rv = array("level" => "collection","id" => $collection['id']);
         }
 
         if (!empty($names['album'])) {
+                // check for collection level pagination first
+                if ($names['album'] == 'page' && !empty($names['picture']) && is_numeric($names['picture']) && intval($names['picture']) == $names['picture']) {
+                        return array("level" => "collection", "id" => $collection['id'], "plog_page" => intval($names['picture']));
+                }
                 $sql = "SELECT *
                 FROM `".TABLE_PREFIX."albums`
-                WHERE `path`='".$names["album"]."'
-                AND `parent_id`=".intval($collection["id"]);
+                WHERE `path`='".$names['album']."'
+                AND `parent_id`=".intval($collection['id']);
                 $result = run_query($sql);
 
@@ -1078 +1086 @@
         }
 
-        if (!empty($names["picture"])) {
+        if (!empty($names['picture'])) {
+                // check for album level pagination first
+                if ($names['picture'] == 'page' && !empty($names['arg1']) && is_numeric($names['arg1']) && intval($names['arg1']) == $names['arg1']) {
+                        return array("level" => "album", "id" => $album['id'], "plog_page" => intval($names['arg1']));
+                }
                 $sql = "SELECT *
                 FROM `".TABLE_PREFIX."pictures`
-                WHERE `caption`='".$names["picture"]."'
-                AND `parent_album`=".intval($album["id"]);
+                WHERE `caption`='".$names['picture']."'
+                AND `parent_album`=".intval($album['id']);
                 $result = run_query($sql);
 
@@ -1106 +1118 @@
                 }
 
-                $rv = array("level" => "picture", "id" => $picture["id"]);
+                $rv = array("level" => "picture", "id" => $picture['id']);
         }
 
@@ -1112 +1124 @@
 }
 
-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, $args = array(1 => "page")){
         $output = '';
 
-        if (!isset($GLOBALS["total_pictures"])) $GLOBALS["total_pictures"] = 0;
-
-        if (($items_total == 0) && ($GLOBALS["total_pictures"] > 0)) {
-                $items_total = $GLOBALS["total_pictures"];
+        if (!isset($GLOBALS['total_pictures'])) $GLOBALS['total_pictures'] = 0;
+
+        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> ';
+                        $args['plog_page'] = $current_page - 1;
+                        $output .= ' <a accesskey="," class="pagPrev" href="'.generate_url($level, $id, $args).'"><span>&laquo;</span></a> ';
                 }
 
@@ -1142 +1145 @@
                                 $output .= '<span class="page_link"> ['.$i.'] </span>';
                         } else{
-                                $output .= '<a href="'.$url.$separator.'plog_page='.$i.$extra_params.'" class="page_link">'.$i.'</a> ';
+                                $args['plog_page'] =  $i;
+                                $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> ';
+                        $args['plog_page'] =  $current_page + 1;
+                        $output .= ' <a accesskey="." class="pagNext" href="'.generate_url($level, $id, $args).'"><span>&raquo;</span></a> ';
                 }
         }
@@ -1167 +1172 @@
 
         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":
@@ -1172 +1185 @@
                                 $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":
@@ -1183 +1196 @@
                                 $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":
@@ -1204 +1209 @@
                                         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') {
+                                                // this temporary workaround removes the 'sorted' and 'plog_page' strings
+                                                if (!is_numeric($akey)) {
                                                         $rv .= "&amp;".$akey."=".$aval;
                                                 }
@@ -1212 +1217 @@
                                 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 (!is_numeric($akey)) {
+                                        $args .= "&amp;".$akey."=".$aval;
+                                }
+                        }
+                }
 
                 switch($level){
+                        // admin section for generate_url
+                        case "admin":
+                                $rv = $config['baseurl']."plog-admin/plog-".$id.".php?".substr($args, 5);
+                                break;
+                        // front end section for generate_url
                         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":
@@ -1240 +1254 @@
                                 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 "collections":
+                        default:
+                                $rv = $config['baseurl'];
+                                if ($query != "?" && empty($args)) {
+                                        if ($query == "?") { $args = substr($args, 5); }
+                                        $rv .= $query.$args;
                                 }
                                 break;
-                        case "collections":
-                                default:
-                                $query = (isset($config['query_args'])) ? "?".$config['query_args'] : $query = "";
-                                $rv = $config['baseurl'].$query;
-                                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);
@@ -1975 +1982 @@
 
         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;
-                }
-
-                return generate_pagination($p_url, $page, $num_items, $config["thumb_num"]);
+                                $level = "collections";
+                                $id = 0;
+                                $num_items = plogger_count_collections();
+                                break;
+                }
+
+                return generate_pagination($level, $id, $page, $num_items, $config['thumb_num']);
         }