X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=c8117204cc94a41181444b6828eb7d834269d0d1;hp=ea91b011ce3f2ae67bc4a1fc81ea41b700f52c26;hb=c9a7f083b220f2702f5de26e2252a4f3f4e0e45b;hpb=18ff7e0419aebe37fcebdbfb180550acb118c0cb

diff --git a/phpfspot.class.php b/phpfspot.class.php
index ea91b01..c811720 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);
@@ -63,15 +70,21 @@ class PHPFSPOT {
       $this->dbver = $this->getFspotDBVersion();
 
       if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
-         print dirname($this->cfg->phpfspot_db) .": directory is not writeable!";
+         print dirname($this->cfg->phpfspot_db) .": directory is not writeable for user ". $this->getuid() ."\n";
          exit(1);
       }
-         
+
+      if(!is_writeable($this->cfg->base_path ."/templates_c")) {
+         print $this->cfg->base_path ."/templates_c: directory is not writeable for user ". $this->getuid() ."\n";
+         exit(1);
+      }
+
       $this->cfg_db = new PHPFSPOT_DB($this, $this->cfg->phpfspot_db);
       if(!is_writeable($this->cfg->phpfspot_db)) {
          print $this->cfg->phpfspot_db ." is not writeable for user ". $this->getuid() ."\n";
          exit(1);
       }
+
       $this->check_config_table();
 
       /* include Smarty template engine */
@@ -86,7 +99,9 @@ class PHPFSPOT {
       /* check if all necessary indices exist */
       $this->checkDbIndices();
 
-      session_start();
+      /* if session is not yet started, do it now */
+      if(session_id() == "")
+         session_start();
 
       if(!isset($_SESSION['tag_condition']))
          $_SESSION['tag_condition'] = 'or';
@@ -97,8 +112,8 @@ class PHPFSPOT {
       if(!isset($_SESSION['searchfor']))
          $_SESSION['searchfor'] = '';
 
-      // if begin_with is still set but rows_per_page is now 0, unset it
-      if(isset($_SESSION['begin_with']) && $this->cfg->rows_per_page == 0)
+      // if begin_with is still set but thumbs_per_page is now 0, unset it
+      if(isset($_SESSION['begin_with']) && $this->cfg->thumbs_per_page == 0)
          unset($_SESSION['begin_with']);
 
    } // __construct()
@@ -124,65 +139,68 @@ class PHPFSPOT {
       $this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
       $this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name);
 
-      $_SESSION['start_action'] = $_GET['mode'];
+      if(isset($_GET['mode'])) {
 
-      switch($_GET['mode']) {
-         case 'showpi':
-            if(isset($_GET['tags'])) {
-               $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
-            }
-            if(isset($_GET['from_date']) && $this->isValidDate($_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'] ." 23:59:59");
-            }
-            break;
-         case 'showp':
-            if(isset($_GET['tags'])) {
-               $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
-               $_SESSION['start_action'] = 'showp';
-            }
-            if(isset($_GET['id']) && is_numeric($_GET['id'])) {
-               $_SESSION['current_photo'] = $_GET['id'];
-               $_SESSION['start_action'] = 'showp';
-            }
-            if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
-               $_SESSION['from_date'] = strtotime($_GET['from_date']);
-            }
-            if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
-               $_SESSION['to_date'] = strtotime($_GET['to_date']);
-            }
-            break;
-         case 'export':
-            $this->tmpl->show("export.tpl");
-            return;
-            break;
-         case 'slideshow':
-            $this->tmpl->show("slideshow.tpl");
-            return;
-            break;
-         case 'rss':
-            if(isset($_GET['tags'])) {
-               $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
-            }
-            if(isset($_GET['from_date']) && $this->isValidDate($_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'] ." 23:59:59");
-            }
-            $this->getRSSFeed();
-            return;
-            break;
+         $_SESSION['start_action'] = $_GET['mode'];
+
+         switch($_GET['mode']) {
+            case 'showpi':
+               if(isset($_GET['tags'])) {
+                  $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+               }
+               if(isset($_GET['from_date']) && $this->isValidDate($_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'] ." 23:59:59");
+               }
+               break;
+            case 'showp':
+               if(isset($_GET['tags'])) {
+                  $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+                  $_SESSION['start_action'] = 'showp';
+               }
+               if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+                  $_SESSION['current_photo'] = $_GET['id'];
+                  $_SESSION['start_action'] = 'showp';
+               }
+               if(isset($_GET['from_date']) && $this->isValidDate($_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'] ." 23:59:59");
+               }
+               break;
+            case 'export':
+               $this->tmpl->show("export.tpl");
+               return;
+               break;
+            case 'slideshow':
+               $this->tmpl->show("slideshow.tpl");
+               return;
+               break;
+            case 'rss':
+               if(isset($_GET['tags'])) {
+                  $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+               }
+               if(isset($_GET['from_date']) && $this->isValidDate($_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'] ." 23:59:59");
+               }
+               $this->getRSSFeed();
+               return;
+               break;
+         }
       }
 
       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");
 
@@ -300,13 +318,19 @@ class PHPFSPOT {
          ";
       }
 
-      $result = $this->db->db_query($query_str);
+      if($result = $this->db->db_query($query_str)) {
 
-      if($this->dbver < 9) {
-         $result['uri'] = "file://". $result['directory_path'] ."/". $result['name'];
-      }
+         $row = $this->db->db_fetch_object($result);
+
+         if($this->dbver < 9) {
+            $row['uri'] = "file://". $row['directory_path'] ."/". $row['name'];
+         }
+
+         return $row;
 
-      return $this->db->db_fetch_object($result);
+      }
+   
+      return null;
 
    } // get_photo_details
 
@@ -408,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 */
@@ -446,30 +472,29 @@ class PHPFSPOT {
 
       $this->tmpl->assign('extern_link', $extern_link);
 
-      if(file_exists($thumb_path)) {
+      if(!file_exists($thumb_path)) {
+         $this->_error("Can't open file ". $thumb_path ."\n");
+         return;
+      }
 
-         $info = getimagesize($thumb_path);
+      $info = getimagesize($thumb_path);
 
-         $this->tmpl->assign('description', $details['description']);
-         $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename'));
+      $this->tmpl->assign('description', $details['description']);
+      $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename'));
 
-         $this->tmpl->assign('width', $info[0]);
-         $this->tmpl->assign('height', $info[1]);
-         $this->tmpl->assign('ExifMadeOn', $meta_date);
-         $this->tmpl->assign('ExifMadeWith', $meta_make);
-         $this->tmpl->assign('ExifOrigResolution', $meta_res);
-         $this->tmpl->assign('ExifFileSize', $meta_size);
-    
-         $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&amp;width=". $this->cfg->photo_width);
-         $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
+      $this->tmpl->assign('width', $info[0]);
+      $this->tmpl->assign('height', $info[1]);
+      $this->tmpl->assign('ExifMadeOn', $meta_date);
+      $this->tmpl->assign('ExifMadeWith', $meta_make);
+      $this->tmpl->assign('ExifOrigResolution', $meta_res);
+      $this->tmpl->assign('ExifFileSize', $meta_size);
+ 
+      $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&amp;width=". $this->cfg->photo_width);
+      $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
+      $this->tmpl->assign('image_filename', $this->parse_uri($details['uri'], 'filename'));
 
-         $this->tmpl->assign('tags', $this->get_photo_tags($photo));
-         $this->tmpl->assign('current', $current);
-      }
-      else {
-         $this->_error("Can't open file ". $thumb_path ."\n");
-         return;
-      }
+      $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+      $this->tmpl->assign('current', $current);
 
       if($previous_img) {
          $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -497,6 +522,7 @@ class PHPFSPOT {
     */
    public function getAvailableTags()
    {
+      /* retrive tags from database */
       $this->get_tags();
 
       $output = "";
@@ -540,10 +566,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);
@@ -568,9 +594,11 @@ class PHPFSPOT {
     */
    public function getSelectedTags()
    {
+      /* retrive tags from database */
       $this->get_tags();
 
       $output = "";
+
       foreach($this->avail_tags as $tag)
       {
          // return all selected tags
@@ -579,8 +607,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()
 
@@ -596,6 +629,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);
    
@@ -609,6 +645,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]);
@@ -826,18 +865,22 @@ 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 ." ";
 
       if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
-         $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')";
+	 if(isset($additional_where_cond))
+	    $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')";
+	 else
+	    $query_str.= "WHERE t.name IN ('".implode("','",$this->cfg->show_tags). "')";
       }
  
       if(isset($order_str))
@@ -845,7 +888,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;
 
@@ -866,75 +909,54 @@ class PHPFSPOT {
       if(isset($_SESSION['begin_with']) && $_SESSION['begin_with'] != "")
          $anchor = $_SESSION['begin_with'];
 
-      if(!isset($this->cfg->rows_per_page) || $this->cfg->rows_per_page == 0) {
+      if(!isset($this->cfg->thumbs_per_page) || $this->cfg->thumbs_per_page == 0) {
 
          $begin_with = 0;
          $end_with = $count;
 
       }
-      elseif($this->cfg->rows_per_page > 0) {
+      elseif($this->cfg->thumbs_per_page > 0) {
 
-         if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0)
+         if(!isset($_SESSION['begin_with']) || $_SESSION['begin_with'] == 0) {
             $begin_with = 0;
+         }
          else {
-
             $begin_with = $_SESSION['begin_with'];
-
-            // verify $begin_with - perhaps the thumbs-per-rows or
-            // rows-per-page variables have changed or the jump back
-            // from a photo wasn't exact - so calculate the real new
-            // starting point
-            $multiplicator = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row;
-            for($i = 0; $i <= $count; $i+=$multiplicator) {
-               if($begin_with >= $i && $begin_with < $i+$multiplicator) {
-                  $begin_with = $i;
-                  break;
-               }
-            }
          }
 
-         $end_with = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
+         $end_with = $begin_with + $this->cfg->thumbs_per_page;
       }
 
-   
-      $rows = 0;
-      $cols = 0;
-      $images[$rows] = Array();
-      $img_height[$rows] = Array();
-      $img_width[$rows] = Array();
-      $img_id[$rows] = Array();
-      $img_name[$rows] = Array();
+      $thumbs = 0;
+      $images[$thumbs] = Array();
+      $img_height[$thumbs] = Array();
+      $img_width[$thumbs] = Array();
+      $img_id[$thumbs] = Array();
+      $img_name[$thumbs] = Array();
       $img_title = Array();
 
       for($i = $begin_with; $i < $end_with; $i++) {
 
-         $images[$rows][$cols] = $photos[$i];
-         $img_id[$rows][$cols] = $i;
-         $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
-         $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
+         if(isset($photos[$i])) {
 
-         $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
+            $images[$thumbs] = $photos[$i];
+            $img_id[$thumbs] = $i;
+            $img_name[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
+            $img_title[$thumbs] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
 
-         if(file_exists($thumb_path)) {
-            $info = getimagesize($thumb_path); 
-            $img_width[$rows][$cols] = $info[0];
-            $img_height[$rows][$cols] = $info[1];
-         }
+            $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
 
-         if($cols == $this->cfg->thumbs_per_row-1) {
-            $cols = 0;
-            $rows++;
-            $images[$rows] = Array();
-            $img_width[$rows] = Array();
-            $img_height[$rows] = Array();
-         }
-         else {
-            $cols++;
-         }
-      } 
+            if(file_exists($thumb_path)) {
+               $info = getimagesize($thumb_path); 
+               $img_width[$thumbs] = $info[0];
+               $img_height[$thumbs] = $info[1];
+            }
+            $thumbs++;
+         } 
+      }
 
       // +1 for for smarty's selection iteration
-      $rows++;
+      $thumbs++;
 
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
          $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
@@ -949,18 +971,20 @@ class PHPFSPOT {
       }
 
       /* do we have to display the page selector ? */
-      if($this->cfg->rows_per_page != 0) {
+      if($this->cfg->thumbs_per_page != 0) {
+
+         $page_select = "";
       
          /* calculate the page switchers */
-         $previous_start = $begin_with - ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
-         $next_start = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
+         $previous_start = $begin_with - $this->cfg->thumbs_per_page;
+         $next_start = $begin_with + $this->cfg->thumbs_per_page;
 
          if($begin_with != 0) 
             $this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");"); 
          if($end_with < $count)
             $this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");"); 
 
-         $photo_per_page  = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row;
+         $photo_per_page  = $this->cfg->thumbs_per_page;
          $last_page = ceil($count / $photo_per_page);
 
          /* get the current selected page */
@@ -1048,14 +1072,15 @@ 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);
+      $this->tmpl->assign('thumb_container_height', $this->cfg->thumb_height+20);
       $this->tmpl->assign('images', $images);
       $this->tmpl->assign('img_width', $img_width);
       $this->tmpl->assign('img_height', $img_height);
       $this->tmpl->assign('img_id', $img_id);
       $this->tmpl->assign('img_name', $img_name);
       $this->tmpl->assign('img_title', $img_title);
-      $this->tmpl->assign('rows', $rows);
-      $this->tmpl->assign('columns', $this->cfg->thumbs_per_row);
+      $this->tmpl->assign('thumbs', $thumbs);
 
       $this->tmpl->show("photo_index.tpl");
 
@@ -1099,26 +1124,26 @@ class PHPFSPOT {
       $meta = $this->get_meta_informations($orig_image);
 
       $rotate = 0;
-      $flip = false;
+      $flip_hori = false;
+      $flip_vert = false;
 
       switch($meta['Orientation']) {
-
          case 1: /* top, left */
-            $rotate = 0; $flip = false; break;
+            /* nothing to do */ break;
          case 2: /* top, right */
-            $rotate = 0; $flip = true; break;
+            $rotate = 0; $flip_hori = true; break;
          case 3: /* bottom, left */
-            $rotate = 180; $flip = false; break;
+            $rotate = 180; break;
          case 4: /* bottom, right */
-            $rotate = 180; $flip = true; break;
+            $flip_vert = true; break;
          case 5: /* left side, top */
-            $rotate = 90; $flip = true; break;
+            $rotate = 90; $flip_vert = true; break;
          case 6: /* right side, top */
-            $rotate = 90; $flip = false; break;
+            $rotate = 90; break;
          case 7: /* left side, bottom */
-            $rotate = 270; $flip = true; break;
+            $rotate = 270; $flip_vert = true; break;
          case 8: /* right side, bottom */
-            $rotate = 270; $flip = false; break;
+            $rotate = 270; break;
       }
 
       $src_img = @imagecreatefromjpeg($orig_image);
@@ -1134,9 +1159,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;
@@ -1190,12 +1215,14 @@ class PHPFSPOT {
       imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $new_w, $new_h, imagesx($src_img), imagesy($src_img));
 
       /* needs the image to be flipped horizontal? */
-      if($flip) {
-         print "(FLIP)";
-         $image = $dst_img;
-         for($x = 0; $x < $new_w; $x++) {
-            imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
-         }
+      if($flip_hori) {
+         $this->_debug("(FLIP)");
+         $dst_img = $this->flipImage($dst_img, 'hori');
+      }
+      /* needs the image to be flipped vertical? */
+      if($flip_vert) {
+         $this->_debug("(FLIP)");
+         $dst_img = $this->flipImage($dst_img, 'vert');
       }
 
       if($rotate) {
@@ -1260,7 +1287,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;
 
@@ -1290,7 +1317,11 @@ class PHPFSPOT {
 
       $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:");
 
+      $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;
@@ -1301,21 +1332,27 @@ 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;
+            $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))
                $error = 1;
 
+            $changes = true;
          }
       }
 
+      if(!$changes) {
+         $this->_debug(" already exist");
+      }
+
       /* set the new/changed MD5 sum for the current photo */
       if(!$error) {
          $this->setMD5($idx, $file_md5);
@@ -1380,18 +1417,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']);
 
@@ -1406,6 +1444,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
     *
@@ -1483,6 +1538,35 @@ class PHPFSPOT {
 
    } // rotateImage()
 
+   /**
+    * returns flipped image
+    *
+    * this function will return an either horizontal or
+    * vertical flipped truecolor image.
+    */
+   private function flipImage($image, $mode)
+   {
+      $w = imagesx($image);
+      $h = imagesy($image);
+      $flipped = imagecreatetruecolor($w, $h);
+
+      switch($mode) {
+         case 'vert':
+            for ($y = 0; $y < $h; $y++) {
+               imagecopy($flipped, $image, 0, $y, 0, $h - $y - 1, $w, 1);
+            }
+            break;
+         case 'hori':
+            for ($x = 0; $x < $w; $x++) {
+               imagecopy($flipped, $image, $x, 0, $w - $x - 1, 0, 1, $h);
+            }
+            break;
+      }
+
+      return $flipped;
+
+   } // flipImage()
+
    /**
     * return all assigned tags for the specified photo
     */
@@ -1561,6 +1645,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))
@@ -1612,19 +1701,23 @@ class PHPFSPOT {
     */
    private function get_calendar($mode)
    {
-      $year = $_SESSION[$mode .'_date'] ? date("Y", $_SESSION[$mode .'_date']) : date("Y");
-      $month = $_SESSION[$mode .'_date'] ? date("m", $_SESSION[$mode .'_date']) : date("m");
-      $day = $_SESSION[$mode .'_date'] ? date("d", $_SESSION[$mode .'_date']) : date("d");
+      $year = isset($_SESSION[$mode .'_date']) ? date("Y", $_SESSION[$mode .'_date']) : date("Y");
+      $month = isset($_SESSION[$mode .'_date']) ? date("m", $_SESSION[$mode .'_date']) : date("m");
+      $day = isset($_SESSION[$mode .'_date']) ? date("d", $_SESSION[$mode .'_date']) : date("d");
 
       $output = "<input type=\"text\" size=\"3\" id=\"". $mode ."year\" value=\"". $year ."\"";
-      if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\"";
+      if(!isset($_SESSION[$mode .'_date']))
+         $output.= " disabled=\"disabled\"";
       $output.= " />\n";
       $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."month\" value=\"". $month ."\"";
-      if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\"";
+      if(!isset($_SESSION[$mode .'_date']))
+         $output.= " disabled=\"disabled\"";
       $output.= " />\n";
       $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."day\" value=\"". $day ."\"";
-      if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\"";
+      if(!isset($_SESSION[$mode .'_date']))
+         $output.= " disabled=\"disabled\"";
       $output.= " />\n";
+
       return $output;
 
    } // get_calendar()
@@ -1823,7 +1916,7 @@ class PHPFSPOT {
    private function getCurrentTags()
    {
       $current_tags = "";
-      if($_SESSION['selected_tags'] != "") {
+      if(isset($_SESSION['selected_tags']) && $_SESSION['selected_tags'] != "") {
          foreach($_SESSION['selected_tags'] as $tag)
             $current_tags.= $tag .",";
          $current_tags = substr($current_tags, 0, strlen($current_tags)-1);
@@ -1885,20 +1978,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
@@ -1913,10 +2007,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;
       }