Changeset 548

Timestamp:

06/09/08 13:19:25 (5 months ago)

Author:

sidtheduck

Message:

+ Fix for pagination on "Collections" level
+ Fix for collection and album count on gallery front-end when album or collection has no pictures.

Files:

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

trunk/plog-functions.php

@@ -1028 +1028 @@
         // if adding arguments to mod_rewritten urls, then I need ? (question mark) before the arguments
         // otherwise I want &
-        $last = substr($url,-1);
-        
-        if ($last == "/") {
+        //$last = substr($url,-1);
+        
+        if (!strpos($url,"?")) {
                 //$url = substr($url,0,-1);
                 $separator = "?";
@@ -1600 +1600 @@
         
         // -1 is just for the case there are no collections at all
-        $image_count = array(-1 => -1);
+        $image_collection_count = array(-1 => -1);
+        $image_album_count = array();
         $album_count = array();
         
         // 1. create a list of all albums with at least one photo
-        $sql = "SELECT parent_collection,COUNT(*) AS imagecount
-                                FROM `".TABLE_PREFIX."pictures` GROUP BY parent_collection";
+        $sql = "SELECT parent_collection,parent_album,COUNT(*) AS imagecount
+                                FROM `".TABLE_PREFIX."pictures` GROUP BY parent_collection,parent_album";
         $result = run_query($sql);
         while($row = mysql_fetch_assoc($result)) {
-                $image_count[$row["parent_collection"]] = $row["imagecount"];
-        }
-        
-        $imlist = join(",",array_keys($image_count));
+                $image_collection_count[$row["parent_collection"]] = $row["imagecount"];
+                $image_album_count[$row["parent_album"]] = $row["imagecount"];
+        }
+        $imlist = join(",",array_keys($image_collection_count));
+        $albumlist = join(",",array_keys($image_album_count));
         
         $cond = '';
         
         if (empty($arr['all_collections'])) {
-                $cond = " WHERE parent_id IN ($imlist) ";
+                $cond = " WHERE `parent_id` IN ($imlist) AND `id` IN ($albumlist) ";
         }
         
@@ -1640 +1642 @@
         // override that with passing all_collections as an argument to 
         // this function
-        if (empty($arr['all_collections'])) {
-                $cond = " WHERE id IN ($imlist) ";
+  if (empty($arr['all_collections'])) {
+                $cond = " WHERE `id` IN ($imlist) ";
         }
         
@@ -2242 +2244 @@
 function plogger_count_collections() {
         
-        $numquery = "SELECT COUNT(*) AS `num_collections` FROM `".TABLE_PREFIX."collections`";
+        $numquery = "SELECT COUNT(DISTINCT `parent_collection`) AS `num_collections` FROM `".TABLE_PREFIX."pictures`";
                 
         $numresult = run_query($numquery);