X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=0ce73936b10b8a66a62bcd7b2a07b11f92cff6cd;hp=d5eb9708a7741c6fa5604f9d89d8a36e4b2342a7;hb=dc9b1f546ef24b633190aac8fcd7fb6fa2674623;hpb=d4e3972681b66912c5594c9021b06eb73585c80a

diff --git a/phpfspot.class.php b/phpfspot.class.php
index d5eb970..0ce7393 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -49,6 +49,13 @@ class PHPFSPOT {
       $this->cfg->product = "phpfspot";
       $this->cfg->version = "1.2";
 
+      $this->sort_orders= array(
+         'date_asc' => 'Date ↑',
+         'date_desc' => 'Date ↓',
+         'name_asc' => 'Name ↑',
+         'name_desc' => 'Name ↓'
+      );
+
       /* Check necessary requirements */
       if(!$this->checkRequirements()) {
          exit(1);
@@ -158,10 +165,10 @@ class PHPFSPOT {
                   $_SESSION['start_action'] = 'showp';
                }
                if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
-                  $_SESSION['from_date'] = strtotime($_GET['from_date']);
+                  $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
                }
                if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
-                  $_SESSION['to_date'] = strtotime($_GET['to_date']);
+                  $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
                }
                break;
             case 'export':
@@ -191,9 +198,9 @@ class PHPFSPOT {
       if(isset($_SESSION['from_date']) && isset($_SESSION['to_date']))
          $this->tmpl->assign('date_search_enabled', true);
 
+      $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false);
       $this->tmpl->assign('from_date', $this->get_calendar('from'));
       $this->tmpl->assign('to_date', $this->get_calendar('to'));
-      $this->tmpl->assign('sort_field', $this->get_sort_field());
       $this->tmpl->assign('content_page', 'welcome.tpl');
       $this->tmpl->show("index.tpl");
 
@@ -425,10 +432,12 @@ class PHPFSPOT {
 
       if(!file_exists($orig_path)) {
          $this->_error("Photo ". $orig_path ." does not exist!<br />\n");
+         return;
       }
 
       if(!is_readable($orig_path)) {
          $this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."<br />\n");
+         return;
       }
 
       /* If the thumbnail doesn't exist yet, try to create it */
@@ -514,6 +523,7 @@ class PHPFSPOT {
     */
    public function getAvailableTags()
    {
+      /* retrive tags from database */
       $this->get_tags();
 
       $output = "";
@@ -557,10 +567,10 @@ class PHPFSPOT {
          if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags']))
             continue;
 
-          // calculate CSS font-size
-          // find the $value in excess of $min_qty
-          // multiply by the font-size increment ($size)
-          // and add the $min_size set above
+         // calculate CSS font-size
+         // find the $value in excess of $min_qty
+         // multiply by the font-size increment ($size)
+         // and add the $min_size set above
          $size = $min_size + (($value - $min_qty) * $step);
           // uncomment if you want sizes in whole %:
          $size = ceil($size);
@@ -585,9 +595,11 @@ class PHPFSPOT {
     */
    public function getSelectedTags()
    {
+      /* retrive tags from database */
       $this->get_tags();
 
       $output = "";
+
       foreach($this->avail_tags as $tag)
       {
          // return all selected tags
@@ -596,8 +608,13 @@ class PHPFSPOT {
          }
       }
 
-      $output = substr($output, 0, strlen($output)-2);
-      print $output;
+      if($output != "") {
+         $output = substr($output, 0, strlen($output)-2);
+         return $output;
+      }
+      else {
+         return "no tags selected";
+      }
 
    } // getSelectedTags()
 
@@ -613,6 +630,9 @@ class PHPFSPOT {
       if(!isset($_SESSION['selected_tags']))
          $_SESSION['selected_tags'] = Array();
 
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
       if(!in_array($tag, $_SESSION['selected_tags']))
          array_push($_SESSION['selected_tags'], $tag);
    
@@ -626,6 +646,9 @@ class PHPFSPOT {
     */
    public function delTag($tag)
    {
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
       if(isset($_SESSION['selected_tags'])) {
          $key = array_search($tag, $_SESSION['selected_tags']);
          unset($_SESSION['selected_tags'][$key]);
@@ -843,13 +866,14 @@ class PHPFSPOT {
 
       /* return all available photos */
       $query_str = "
-         SELECT DISTINCT photo_id
-            FROM photo_tags pt
-         INNER JOIN photos p
+         SELECT p.id
+         FROM photos p
+         LEFT JOIN photo_tags pt
             ON p.id=pt.photo_id
-         INNER JOIN tags t
+         LEFT JOIN tags t
             ON pt.tag_id=t.id
       ";
+
       if(isset($additional_where_cond)) 
          $query_str.= "WHERE ". $additional_where_cond ." ";
 
@@ -862,7 +886,7 @@ class PHPFSPOT {
 
       $result = $this->db->db_query($query_str);
       while($row = $this->db->db_fetch_object($result)) {
-         array_push($matched_photos, $row['photo_id']);
+         array_push($matched_photos, $row['id']);
       }
       return $matched_photos;
 
@@ -1071,6 +1095,8 @@ class PHPFSPOT {
       $this->tmpl->assign('rss_link', $rss_link);
       $this->tmpl->assign('count', $count);
       $this->tmpl->assign('width', $this->cfg->thumb_width);
+      $this->tmpl->assign('thumb_container_width', $this->cfg->thumb_width+20);
+      $this->tmpl->assign('thumb_container_height', $this->cfg->thumb_height);
       $this->tmpl->assign('images', $images);
       $this->tmpl->assign('img_width', $img_width);
       $this->tmpl->assign('img_height', $img_height);
@@ -1157,9 +1183,9 @@ class PHPFSPOT {
 
       // If requested width is more then the actual image width,
       // do not generate a thumbnail, instead safe the original
-      // as thumbnail but with lower quality
-
-      if($width >= $cur_width) {
+      // as thumbnail but with lower quality. But if the image
+      // is to heigh too, then we still have to resize it.
+      if($width >= $cur_width && $cur_height < $this->cfg->thumb_height) {
          $result = imagejpeg($src_img, $thumb_image, 75);
          imagedestroy($src_img);
          return true;
@@ -1283,7 +1309,7 @@ class PHPFSPOT {
     * 2. Check if the md5sum of the original file has changed
     * 3. Generate the thumbnails if needed
     */
-   public function gen_thumb($idx = 0, $force = 0)
+   public function gen_thumb($idx = 0, $force = 0, $overwrite = false)
    {
       $error = 0;
 
@@ -1316,6 +1342,8 @@ class PHPFSPOT {
       $changes = false;
 
       foreach($resolutions as $resolution) {
+   
+         $generate_it = false;
 
          $thumb_sub_path = substr($file_md5, 0, 2);
          $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5;
@@ -1326,15 +1354,14 @@ class PHPFSPOT {
 
          /* if the thumbnail file doesn't exist, create it */
          if(!file_exists($thumb_path)) {
-
-            $this->_debug(" ". $resolution ."px");
-            if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
-               $error = 1;
-
-            $changes = true;
+            $generate_it = true;
          }
          /* if the file hasn't changed there is no need to regen the thumb */
          elseif($file_md5 != $this->getMD5($idx) || $force) {
+            $generate_it = true;
+         }
+
+         if($generate_it || $overwrite) {
 
             $this->_debug(" ". $resolution ."px");
             if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
@@ -1412,18 +1439,19 @@ class PHPFSPOT {
     * getPhotoSelection() will then only return the matching
     * photos.
     */
-   public function startSearch($searchfor, $sort_order, $from = 0, $to = 0)
+   public function startSearch($searchfor, $from = 0, $to = 0)
    {
       $this->get_tags();
 
       $_SESSION['searchfor'] = $searchfor;
-      $_SESSION['sort_order'] = $sort_order;
+
       if($from != 0)
-         $_SESSION['from_date'] = strtotime($from);
+         $_SESSION['from_date'] = strtotime($from ." 00:00:00");
       else
          unset($_SESSION['from_date']);
+
       if($to != 0)
-         $_SESSION['to_date'] = strtotime($to);
+         $_SESSION['to_date'] = strtotime($to ." 23:59:59");
       else
          unset($_SESSION['to_date']);
 
@@ -1438,6 +1466,23 @@ class PHPFSPOT {
 
    } // startSearch()
 
+   /**
+    * updates sort order in session variable
+    *
+    * this function is invoked by RPC and will sort the requested
+    * sort order in the session variable.
+    */
+   public function updateSortOrder($order)
+   {
+      if(isset($this->sort_orders[$order])) {
+         $_SESSION['sort_order'] = $order;
+         return "ok";
+      }
+
+      return "unkown error";
+
+   } // updateSortOrder()
+
    /**
     * rotate image
     *
@@ -1593,6 +1638,11 @@ class PHPFSPOT {
          print "PEAR Calendar package is missing<br />\n";
          $missing = true;
       }
+      @include_once 'Console/Getopt.php';
+      if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+         print "PEAR Console_Getopt package is missing<br />\n";
+         $missing = true;
+      }
       ini_restore('track_errors');
 
       if(isset($missing))
@@ -1921,20 +1971,21 @@ class PHPFSPOT {
    /**
     * returns a select-dropdown box to select photo index sort parameters
     */
-   private function get_sort_field()
+   public function smarty_sort_select_list($params, &$smarty)
    {
-      $output = "<select name=\"sort_order\">";
-      foreach(array('date_asc', 'date_desc', 'name_asc', 'name_desc') as $sort_order) {
-         $output.= "<option value=\"". $sort_order ."\"";
-         if($sort_order == $_SESSION['sort_order']) {
+      $output = "";
+
+      foreach($this->sort_orders as $key => $value) {
+         $output.= "<option value=\"". $key ."\"";
+         if($key == $_SESSION['sort_order']) {
             $output.= " selected=\"selected\"";
          }
-         $output.= ">". $sort_order ."</option>";
+         $output.= ">". $value ."</option>";
       }
-      $output.= "</select>";
+
       return $output;
 
-   } // get_sort_field()
+   } // smarty_sort_select_list()
 
    /**
     * returns the currently selected sort order
@@ -1949,10 +2000,20 @@ class PHPFSPOT {
             return " ORDER BY p.time DESC";
             break;
          case 'name_asc':
-            return " ORDER BY p.name ASC";
+            if($this->dbver < 9) {
+               return " ORDER BY p.name ASC";
+            }
+            else {
+               return " ORDER BY basename(p.uri) ASC";
+            }
             break;
          case 'name_desc':
-            return " ORDER BY p.name DESC";
+            if($this->dbver < 9) {
+               return " ORDER BY p.name DESC";
+            }
+            else {
+               return " ORDER BY basename(p.uri) DESC";
+            }
             break;
       }