Changeset 546 for trunk/plog-functions.php

Timestamp:

06/05/08 17:18:12 (6 months ago)

Author:

sidtheduck

Message:

+ Lots of sorting fixes

• Now sorting is the same throughout . defaults from Admin->Options are used on both Admin->Manage and front-end gallery . plogger_init_picture order = plogger_init_pictures order . sorting fixes from Import display to actually saving the files

+ Additional check for safe_mode workaround to see if ftp_connect function exists in compiled PHP installation before attempting the workaround

Files:

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

trunk/plog-functions.php

@@ -1075 +1075 @@
                         $result = run_query($query);
                         $row = mysql_fetch_assoc($result);
-                        $rv = $config["baseurl"].rawurlencode(SmartStripSlashes($row["path"]));
+                        $rv = $config["baseurl"].rawurlencode(SmartStripSlashes($row["path"]))."/";
                 } else if ($level == "album") {
                         $query = "SELECT
@@ -1086 +1086 @@
                         $row = mysql_fetch_assoc($result);
                         
-                        $rv = $config["baseurl"].rawurlencode(SmartStripSlashes($row["collection_path"])) . '/' . rawurlencode(SmartStripSlashes($row["album_path"]));
+                        $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 .= $aval."/";
                                 }
                         }
@@ -1097 +1097 @@
                         $pic = get_picture_by_id($id);
                         $album = $pic["parent_album"];
-                        $rv = $config["baseurl"].str_replace("%2F", "/", rawurlencode(substr(SmartStripSlashes($pic['path']), 0, -4)));
+                        $rv = $config["baseurl"].str_replace("%2F", "/", rawurlencode(substr(SmartStripSlashes($pic['path']), 0, -4)))."/";
                 }
         } else {
@@ -1322 +1322 @@
         
         // determine sort ordering
-        switch ($_SESSION["plogger_sortby"]){
+        switch ($_SESSION['plogger_sortby']){
                 case 'number_of_comments':
                         $sql = "SELECT
@@ -1343 +1343 @@
                         break;
                 case 'date':
+                        $sql .= " ORDER BY `date_submitted` ";
+                        break;
                 default:
-                        $sql .= " ORDER BY `date_submitted` ";
+                        $sql .= " ORDER BY `id` ";
                         break;
         }
@@ -1357 +1359 @@
                         break;
         }
+
+  // if sorting by number_of_comments, we sub-sort by 'id' DESC
+        if ($_SESSION['plogger_sortby']=="number_of_comments"){
+                $sql .= ",`p`.`id` DESC";
+        }
         
         $result = run_query($sql);
@@ -1401 +1408 @@
 
 function plogger_init_pictures($arr) {
-        $sql = "
-                FROM `".TABLE_PREFIX."pictures` `p`
-                        LEFT JOIN `".TABLE_PREFIX."comments` `c` ON `p`.`id`=`c`.`parent_id`";
-        
-        $type = $arr['type'];
+        $sql = " FROM `".TABLE_PREFIX."pictures` AS `p`";
+
+  // if sorting by number_of_comments, we need to join the comments table
+        if (isset($arr['sortby']) && $arr['sortby']=="number_of_comments"){
+                $sql .= " LEFT JOIN `".TABLE_PREFIX."comments` AS `c` ON `p`.`id`=`c`.`parent_id`";
+        }
         
         // right now only single id is supported, maybe I want to specify multiple id-s as well
         $value = (isset($arr['value']) && $arr['value'] > 0) ? $arr['value'] : -1;
         
-        if ('collection' == $type) {
-                $sql .= " WHERE p.`parent_collection` = ".$value;
-        } elseif ('id' == $type) {
-                $sql .= " WHERE p.`id` = ".$value;
-        } elseif ('album' == $type) {
-                $sql .= " WHERE p.`parent_album` = ".$value;
-        } elseif ('latest' == $type) {
-                // add nothing, only limit takes effect
-        } else {
-                // so what do you want anyway? 
-                return 0;
-        }
-        
-        $from = 0;
-        $limit = 20;        // Default limit if nothing is set
-        $max_limit = 1000;  // Hard-coded max limit, no matter what you do you cannot 
-                      // go beyond this limit for number of pictures in thumbnails, 
-                      // slideshow etc.
-        
-        if (isset($arr["from"]) && $arr["from"] > 0) {
-                $from = $arr["from"];
-        }
-        
-        // Enforce hard-coded max limit if the provided limit is extreme
-        if (isset($arr['limit']) && $arr['limit'] > 0 && $arr['limit'] <= $max_limit) {
-                $limit = $arr['limit'];
-        } elseif (isset($arr['limit']) && $arr['limit'] == -1) {
-    $limit = -1;      // Set to -1 for slideshow, so limit will not be used
-  }
-
+        switch ($arr['type']) {
+                case 'collection':
+                        $sql .= " WHERE `p`.`parent_collection` = ".$value;
+                        break;
+                case 'album':
+                        $sql .= " WHERE `p`.`parent_album` = ".$value;
+                        break;
+                case 'id':
+                        $sql .= " WHERE `p`.`id` = ".$value;
+                        break;
+                case 'latest':
+                        break;
+                default:
+      return 0;
+        }
+        
         $result = run_query("SELECT COUNT(DISTINCT p.`id`) AS cnt " . $sql);
         $row = mysql_fetch_assoc($result);
-        
+
         $GLOBALS["total_pictures"] = $row["cnt"];
-        
-        // grouping is needed to get comment count
-        $sql .= " GROUP BY p.`id`";
+
+
+  // if sorting by number_of_comments, we need group and count the results
+        if (isset($arr['sortby']) && $arr['sortby']=="number_of_comments"){
+                $sql = ",COUNT(`comment`) AS `num_comments` ".$sql." GROUP BY `p`.`id`";
+        }
+
         
         // query database and retreive all pictures withing selected album
@@ -1456 +1454 @@
                 'filename' => 'path',
                 'date' => 'date_submitted',
-                'id' => 'id',
+                'id' => 'id'
         );
         
@@ -1462 +1460 @@
                 $sortby = $arr['sortby'];
         } else {
-        $sortby = 'date';      // Default sort, is to sort by date
+        $sortby = "id";      // Default sort, is to sort by id
   }
         
         $sortby = $sort_fields[$sortby];
-        $sql .= " ORDER BY `$sortby` ";
-        
-        if (isset($arr['sortdir']) && (strcasecmp('asc',$arr['sortdir']) === 0)) {
-                $sortdir = ' ASC';
-        } else {
-    $sortdir = ' DESC';    // Default sort direction is descending
+        $sql .= " ORDER BY `".$sortby."`";
+        
+        // determine sort direction
+        if (isset($arr['sortdir']) && (strtoupper($arr['sortdir']) == 'ASC')) {
+                $sortdir = " ASC";
+        } else {
+    $sortdir = " DESC";    // Default sort direction is descending
   }
-        
         $sql .= $sortdir;
-        
-        // again, this is needed because of the comment counting
-        $sql .= ",p.`id` DESC ";
-        
+
+
+  // if sorting by number_of_comments, we sub-sort by 'id' DESC
+        if (isset($arr['sortby']) && $arr['sortby']=="number_of_comments"){
+                $sql .= ",`p`.`id` DESC";
+        }
+
+        
+        // set up limits, if needed
+        $from = 0;
+        $limit = 20;        // Default limit if nothing is set
+        $max_limit = 1000;  // Hard-coded max limit, no matter what you do you cannot
+                      // go beyond this limit for number of pictures in thumbnails,
+                      // slideshow etc.
+
+        if (isset($arr['from']) && $arr['from'] > 0) {
+                $from = $arr['from'];
+        }
+
+        // Enforce hard-coded max limit if the provided limit is extreme
+        if (isset($arr['limit']) && $arr['limit'] > 0 && $arr['limit'] <= $max_limit) {
+                $limit = $arr['limit'];
+        } elseif (isset($arr['limit']) && $arr['limit'] == -1) {
+    $limit = -1;      // Set to -1 for slideshow, so limit will not be used
+  }
+  
         if (($from >= 0) && ($limit >= 0)) $sql .= " LIMIT ".$from.",".$limit;
+
         
         $result = run_query("SELECT p.*,
                         UNIX_TIMESTAMP(`date_submitted`) AS `unix_date_submitted`,
-                        UNIX_TIMESTAMP(`EXIF_date_taken`) AS `unix_exif_date_taken`,
-                        COUNT(`comment`) AS `num_comments` " . $sql);
+                        UNIX_TIMESTAMP(`EXIF_date_taken`) AS `unix_exif_date_taken` " . $sql);
         
         $GLOBALS["available_pictures"] = mysql_num_rows($result);
@@ -1498 +1518 @@
 
 function plogger_init_search($arr) {
+        global $PLOGGER_DBH;
         $terms = explode(" ",$arr['searchterms']);
         $from = 0;
@@ -1517 +1538 @@
                 $query .= " WHERE ( ";
                 foreach ($terms as $term) {
+      $term = mysql_real_escape_string($term);
+      $multi_term = explode("+",$term);
+                        if (count($multi_term)>1) {
+                                $path = implode("%' AND `path` LIKE '%",$multi_term);
+                                $description = implode("%' AND `description` LIKE '%",$multi_term);
+                                $comment = implode("%' AND `comment` LIKE '%",$multi_term);
+                                $caption = implode("%' AND `caption` LIKE '%",$multi_term);
+      } else {
+        $path = $description = $comment = $caption = $term;
+      }
                         $query .= "
-                                `path` LIKE '%".mysql_real_escape_string($term)."%' OR
-                                `description` LIKE '%".mysql_real_escape_string($term)."%' OR
-                                `comment` LIKE '%".mysql_real_escape_string($term)."%' OR
-                                `caption` LIKE '%".mysql_real_escape_string($term)."%' OR ";
+                                `path` LIKE '%$path%' OR
+                                `description` LIKE '%$description%' OR
+                                `comment` LIKE '%$comment%' OR
+                                `caption` LIKE '%$caption%' OR ";
                 }
                 
@@ -1735 +1766 @@
                 global $path;
                 if (isset($path)) 
-                        $rss_link .= "http://".$_SERVER["SERVER_NAME"]."/".SmartStripSlashes(substr($path,1))."/feed/";
+                        $rss_link .= "http://".$_SERVER["SERVER_NAME"]."/".SmartStripSlashes(substr($path,1))."feed/";
                 else
                         $rss_link .= $config['gallery_url']."feed/";
@@ -2192 +2223 @@
 
 function plogger_collection_album_count() {
-        if (isset($GLOBALS['album_count']) && isset($GLOBALS['current_collection']['id'])) {
+        if (isset($GLOBALS['album_count']) && isset($GLOBALS['current_collection']['id']) && isset($GLOBALS['album_count'][$GLOBALS['current_collection']['id']])) {
                 return $GLOBALS['album_count'][$GLOBALS['current_collection']['id']];
         } else {
@@ -2261 +2292 @@
         if (isset($GLOBALS['current_album'])) {
                 $row = $GLOBALS['current_album'];
-                // XXX: surely this can be optimized?
-                $numquery = "SELECT COUNT(*) AS `num_pictures` FROM `".TABLE_PREFIX."pictures` WHERE `parent_album`='".$row['id']."'";
+                // XXX: this may be faster?
+        $numquery = "SELECT COUNT(DISTINCT `id`) AS `num_pictures` FROM `".TABLE_PREFIX."pictures` WHERE `parent_album`='".$row['id']."'";
                 $numresult = run_query($numquery);
                 return mysql_result($numresult, 'num_pictures');