issue113, fix getting EXIF data right in time for the single-photo view
[phpfspot.git] / phpfspot.class.php
index 9d3f548a2f38e7d714687e9cbabf0c52375aa598..b375ffde64ccd99b680e09f626e358d0465170ef 100644 (file)
@@ -23,7 +23,6 @@
 
 require_once "phpfspot_cfg.php";
 require_once "phpfspot_db.php";
-require_once "phpfspot_tmpl.php";
 
 class PHPFSPOT {
 
@@ -34,6 +33,9 @@ class PHPFSPOT {
    var $tags;
    var $avail_tags;
 
+   private $runtime_error = false;
+   private $dbver;
+
    /**
     * class constructor
     *
@@ -43,45 +45,112 @@ class PHPFSPOT {
     */
    public function __construct()
    {
+      $this->cfg = new PHPFSPOT_CFG;
+
+      /* verify config settings */
+      if($this->check_config_options()) {
+         exit(1);
+      }
+
+      /* set application name and version information */
+      $this->cfg->product = "phpfspot";
+      $this->cfg->version = "1.4";
+
+      $this->sort_orders= array(
+         'date_asc' => 'Date ↑',
+         'date_desc' => 'Date ↓',
+         'name_asc' => 'Name ↑',
+         'name_desc' => 'Name ↓',
+         'tags_asc' => 'Tags ↑',
+         'tags_desc' => 'Tags ↓',
+      );
+
       /* Check necessary requirements */
-      if(!$this->checkRequirements()) {
+      if(!$this->check_requirements()) {
          exit(1);
       }
 
-      $this->cfg = new PHPFSPOT_CFG;
+      /******* Opening F-Spot's sqlite database *********/
 
-      $this->db  = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
-      
+      /* Check if database file is writeable */
+      if(!is_writeable($this->cfg->fspot_db)) {
+         print $this->cfg->fspot_db ." is not writeable for user ". $this->getuid() ."\n";
+         exit(1);
+      }
+
+      /* open the database */
+      $this->db  = new PHPFSPOT_DB($this, $this->cfg->fspot_db);
+
+      /* change sqlite temp directory, if requested */
+      if(isset($this->cfg->sqlite_temp_dir)) {
+         $this->db->db_exec("
+            PRAGMA
+               temp_store_directory = '". $this->cfg->sqlite_temp_dir ."'
+         ");
+      }
+
+      $this->dbver = $this->getFspotDBVersion();
+
+      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);
+      }
+
+      if(!is_writeable($this->cfg->thumb_path)) {
+         print $this->cfg->thumb_path .": directory is not writeable for user ". $this->getuid() ."\n";
+         exit(1);
+      }
+
+      /******* Opening phpfspot's sqlite database *********/
+
+      /* Check if directory where the database file is stored is writeable  */
       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);
       }
-         
-      $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
+
+      /* Check if database file is writeable */
       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();
 
+      /* open the database */
+      $this->cfg_db = new PHPFSPOT_DB($this, $this->cfg->phpfspot_db);
+
+      /* change sqlite temp directory, if requested */
+      if(isset($this->cfg->sqlite_temp_dir)) {
+         $this->cfg_db->db_exec("
+            PRAGMA
+               temp_store_directory = '". $this->cfg->sqlite_temp_dir ."'
+         ");
+      }
 
+      /* Check if some tables need to be created */
+      $this->check_config_table();
+
+      /* overload Smarty class with our own template handler */
+      require_once "phpfspot_tmpl.php";
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
-      $this->get_tags();
+      /* 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';
 
       if(!isset($_SESSION['sort_order']))
-         $_SESSION['sort_order'] = 'date_asc';
+         $_SESSION['sort_order'] = 'date_desc';
 
-      if(!isset($_SESSION['searchfor']))
-         $_SESSION['searchfor'] = '';
+      if(!isset($_SESSION['searchfor_tag']))
+         $_SESSION['searchfor_tag'] = '';
 
-      // 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()
@@ -102,61 +171,76 @@ class PHPFSPOT {
     */
    public function show()
    {
-      $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
+      $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']);
       $this->tmpl->assign('page_title', $this->cfg->page_title);
       $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'] = split(',', $_GET['tags']);
-            }
-            if(isset($_GET['from_date'])) {
-               $_SESSION['from_date'] = $_GET['from_date'];
-            }
-            if(isset($_GET['to_date'])) {
-               $_SESSION['to_date'] = $_GET['to_date'];
-            }
-            break;
-         case 'showp':
-            if(isset($_GET['tags'])) {
-               $_SESSION['selected_tags'] = split(',', $_GET['tags']);
-               $_SESSION['start_action'] = 'showp';
-            }
-            if(isset($_GET['id'])) {
-               $_SESSION['current_photo'] = $_GET['id'];
-               $_SESSION['start_action'] = 'showp';
-            }
-            if(isset($_GET['from_date'])) {
-               $_SESSION['from_date'] = $_GET['from_date'];
-            }
-            if(isset($_GET['to_date'])) {
-               $_SESSION['to_date'] = $_GET['to_date'];
-            }
-            break;
-         case 'export':
-            $this->tmpl->show("export.tpl");
-            return;
-            break;
-         case 'slideshow':
-            $this->tmpl->show("slideshow.tpl");
-            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->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");
 
-
    } // show()
 
    /**
@@ -164,7 +248,7 @@ class PHPFSPOT {
     *
     * this function will get all available tags from
     * the f-spot database and store them within two
-    * arrays within this clase for later usage. in
+    * arrays within this class for later usage. in
     * fact, if the user requests (hide_tags) it will
     * opt-out some of them.
     *
@@ -175,24 +259,57 @@ class PHPFSPOT {
       $this->avail_tags = Array();
       $count = 0;
    
-      $result = $this->db->db_query("
-         SELECT id,name
-         FROM tags
-         ORDER BY sort_priority ASC
-      ");
+      if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+         $query_str="
+            SELECT
+               DISTINCT t1.id as id, t1.name as name
+            FROM  
+               photo_tags pt1
+            INNER JOIN photo_tags
+               pt2 ON pt1.photo_id=pt2.photo_id
+            INNER JOIN tags t1
+               ON t1.id=pt1.tag_id
+            INNER JOIN tags t2
+               ON t2.id=pt2.tag_id
+            WHERE
+               t2.name IN  ('".implode("','",$this->cfg->show_tags)."')
+            ORDER BY
+               t1.sort_priority ASC";
+
+         $result = $this->db->db_query($query_str);
+      }
+      else
+      {
+         $result = $this->db->db_query("
+            SELECT id,name
+            FROM tags
+            ORDER BY sort_priority ASC
+         ");
+      }
       
       while($row = $this->db->db_fetch_object($result)) {
 
          $tag_id = $row['id'];
          $tag_name = $row['name'];
 
-         /* check if config requests to ignore this tag */
+         /* if the user has specified to ignore this tag in phpfspot's
+            configuration, ignore it here so it does not get added to
+            the tag list.
+         */
          if(in_array($row['name'], $this->cfg->hide_tags))
             continue;
 
+         /* if you include the following if-clause and the user has specified
+            to only show certain tags which are specified in phpfspot's
+            configuration, ignore all others so they will not be added to the
+            tag list.
+         if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags) &&
+            !in_array($row['name'], $this->cfg->show_tags))
+            continue;
+         */
+
          $this->tags[$tag_id] = $tag_name; 
          $this->avail_tags[$count] = $tag_id;
-
          $count++;
 
       }
@@ -207,13 +324,50 @@ class PHPFSPOT {
     */
    public function get_photo_details($idx)
    {
-      $result = $this->db->db_query("
-         SELECT *
-         FROM photos
-         WHERE id='". $idx ."'
-      ");
-      
-      return $this->db->db_fetch_object($result);
+      if($this->dbver < 9) {
+         $query_str = "
+            SELECT p.id, p.name, p.time, p.directory_path, p.description
+            FROM photos p
+         ";
+      }
+      else {
+         $query_str = "
+            SELECT p.id, p.uri, p.time, p.description
+            FROM photos p
+         ";
+      }
+
+      /* if show_tags is set, only return details for photos which
+         are specified to be shown
+      */
+      if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+         $query_str.= "
+            INNER JOIN photo_tags pt
+               ON p.id=pt.photo_id
+            INNER JOIN tags t
+               ON pt.tag_id=t.id
+            WHERE p.id='". $idx ."'
+            AND t.name IN ('".implode("','",$this->cfg->show_tags)."')";
+      }
+      else {
+         $query_str.= "
+            WHERE p.id='". $idx ."'
+         ";
+      }
+
+      if($result = $this->db->db_query($query_str)) {
+
+         $row = $this->db->db_fetch_object($result);
+
+         if($this->dbver < 9) {
+            $row['uri'] = "file://". $row['directory_path'] ."/". $row['name'];
+         }
+
+         return $row;
+
+      }
+   
+      return null;
 
    } // get_photo_details
 
@@ -227,15 +381,33 @@ class PHPFSPOT {
    public function getPhotoName($idx, $limit = 0)
    {
       if($details = $this->get_photo_details($idx)) {
-         $name = $details['name'];
-         if($limit != 0 && strlen($name) > $limit) {
-            $name = substr($name, 0, $limit-5) ."...". substr($name, -($limit-5));
+         if($long_name = $this->parse_uri($details['uri'], 'filename')) {
+            $name = $this->shrink_text($long_name, $limit);
+            return $name;
          }
-         return $name;
       }
 
+      return null;
+
    } // getPhotoName()
 
+   /**
+    * shrink text according provided limit
+    *
+    * If the length of the name exceeds $limit the
+    * text will be shortend and some content in between
+    * will be replaced with "..." 
+    */
+   private function shrink_text($text, $limit)
+   {
+      if($limit != 0 && strlen($text) > $limit) {
+         $text = substr($text, 0, $limit-5) ."...". substr($text, -($limit-5));
+      }
+
+      return $text;
+
+   } // shrink_text();
+
    /**
     * translate f-spoth photo path
     * 
@@ -292,31 +464,37 @@ class PHPFSPOT {
          return;
       }
 
-      $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
-      $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
+      $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
+      $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
 
       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 */
       if(!file_exists($thumb_path)) {
          $this->gen_thumb($photo, true);
-         $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
+         $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
       }
 
-      /* get f-spot database meta information */
-      $meta = $this->get_meta_informations($orig_path);
+      /* get mime-type, height and width from the original photo */
+      $info = getimagesize($orig_path);
+
+      /* get EXIF information if JPEG */
+      if($info['mime'] == "image/jpeg") {
+         $meta = $this->get_meta_informations($orig_path);
+      }
 
       /* If EXIF data are available, use them */
       if(isset($meta['ExifImageWidth'])) {
          $meta_res = $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'];
       } else {
-         $info = getimagesize($orig_path);
          $meta_res = $info[0] ."x". $info[1]; 
       }
 
@@ -330,35 +508,35 @@ class PHPFSPOT {
          $extern_link.= "&tags=". $current_tags;
       }
       if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
-         $extern_link.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date'];
+         $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']);
       }
 
       $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_thumb = getimagesize($thumb_path);
 
-         $this->tmpl->assign('description', $details['description']);
-         $this->tmpl->assign('image_name', $details['name']);
+      $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_thumb[0]);
+      $this->tmpl->assign('height', $info_thumb[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_page', $this->getCurrentPage($current, $count));
+      $this->tmpl->assign('current_img', $photo);
 
       if($previous_img) {
          $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -370,6 +548,7 @@ class PHPFSPOT {
          $this->tmpl->assign('next_img', $next_img);
       }
       $this->tmpl->assign('mini_width', $this->cfg->mini_width);
+      $this->tmpl->assign('photo_width', $this->cfg->photo_width);
       $this->tmpl->assign('photo_number', $i);
       $this->tmpl->assign('photo_count', count($all_photos));
 
@@ -386,6 +565,9 @@ class PHPFSPOT {
     */
    public function getAvailableTags()
    {
+      /* retrive tags from database */
+      $this->get_tags();
+
       $output = "";
 
       $result = $this->db->db_query("
@@ -407,6 +589,10 @@ class PHPFSPOT {
       $max_size = 125; // max font size in %
       $min_size = 75; // min font size in %
 
+      // color
+      $max_sat = hexdec('cc');
+      $min_sat = hexdec('44');
+
       // get the largest and smallest array values
       $max_qty = max(array_values($tags));
       $min_qty = min(array_values($tags));
@@ -420,6 +606,7 @@ class PHPFSPOT {
       // determine the font-size increment
       // this is the increase per tag quantity (times used)
       $step = ($max_size - $min_size)/($spread);
+      $step_sat = ($max_sat - $min_sat)/($spread);
 
       // loop through our tag array
       foreach ($tags as $key => $value) {
@@ -427,15 +614,23 @@ 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);
 
-         $output.= "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%;\">". $this->tags[$key] ."</a>, ";
+         $color = $min_sat + ($value - $min_qty) * $step_sat;
+
+         $r = '44';
+         $g = dechex($color);
+         $b = '88';
+
+         if(isset($this->tags[$key])) {
+            $output.= "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\">". $this->tags[$key] ."</a>, ";
+         }
 
       }
 
@@ -453,7 +648,11 @@ class PHPFSPOT {
     */
    public function getSelectedTags()
    {
+      /* retrive tags from database */
+      $this->get_tags();
+
       $output = "";
+
       foreach($this->avail_tags as $tag)
       {
          // return all selected tags
@@ -462,8 +661,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()
 
@@ -479,8 +683,14 @@ class PHPFSPOT {
       if(!isset($_SESSION['selected_tags']))
          $_SESSION['selected_tags'] = Array();
 
+      if(isset($_SESSION['searchfor_tag']))
+         unset($_SESSION['searchfor_tag']);
+
       if(!in_array($tag, $_SESSION['selected_tags']))
          array_push($_SESSION['selected_tags'], $tag);
+
+
+      return "ok";
    
    } // addTag()
 
@@ -492,12 +702,17 @@ class PHPFSPOT {
     */
    public function delTag($tag)
    {
+      if(isset($_SESSION['searchfor_tag']))
+         unset($_SESSION['searchfor_tag']);
+
       if(isset($_SESSION['selected_tags'])) {
          $key = array_search($tag, $_SESSION['selected_tags']);
          unset($_SESSION['selected_tags'][$key]);
          sort($_SESSION['selected_tags']);
       }
 
+      return "ok";
+
    } // delTag()
 
    /**
@@ -513,6 +728,57 @@ class PHPFSPOT {
 
    } // resetTags()
 
+   /**
+    * returns the value for the autocomplet tag-search
+    */
+   public function get_xml_tag_list()
+   {
+      if(!isset($_GET['search']) || !is_string($_GET['search']))
+         $_GET['search'] = '';
+      
+      $length = 15;
+      $i = 1;
+         
+      /* retrive tags from database */
+      $this->get_tags();
+
+      $matched_tags = Array();
+
+      header("Content-Type: text/xml");
+
+      $string = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n";
+      $string.= "<results>\n";
+
+      foreach($this->avail_tags as $tag)
+      {
+         if(!empty($_GET['search']) &&
+            preg_match("/". $_GET['search'] ."/i", $this->tags[$tag]) &&
+            count($matched_tags) < $length) {
+
+            $count = $this->get_num_photos($tag);
+
+            if($count == 1) {
+               $string.= " <rs id=\"". $i ."\" info=\"". $count ." photo\">". $this->tags[$tag] ."</rs>\n";
+            }
+            else {
+               $string.= " <rs id=\"". $i ."\" info=\"". $count ." photos\">". $this->tags[$tag] ."</rs>\n";
+
+            }
+            $i++;
+         }
+
+         /* if we have collected enough items, break out */
+         if(count($matched_tags) >= $length)
+            break;
+      }
+
+      $string.= "</results>\n";
+
+      return $string;
+
+   } // get_xml_tag_list()
+
+
    /**
     * reset single photo
     *
@@ -529,17 +795,28 @@ class PHPFSPOT {
    /**
     * reset tag search
     *
-    * if any tag search has taken place, reset
-    * it now
+    * if any tag search has taken place, reset it now
     */
    public function resetTagSearch()
    {
-      if(isset($_SESSION['searchfor']))
-         unset($_SESSION['searchfor']);
+      if(isset($_SESSION['searchfor_tag']))
+         unset($_SESSION['searchfor_tag']);
 
    } // resetTagSearch()
 
-    /**
+   /**
+    * reset name search
+    *
+    * if any name search has taken place, reset it now
+    */
+   public function resetNameSearch()
+   {
+      if(isset($_SESSION['searchfor_name']))
+         unset($_SESSION['searchfor_name']);
+
+   } // resetNameSearch()
+
+   /**
     * reset date search
     *
     * if any date search has taken place, reset
@@ -565,34 +842,65 @@ class PHPFSPOT {
    public function getPhotoSelection()
    {  
       $matched_photos = Array();
+      $additional_where_cond = "";
 
       if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
-         $from_date = strtotime($_SESSION['from_date'] ." 00:00:00");
-         $to_date = strtotime($_SESSION['to_date'] ." 23:59:59");
-         $additional_where_cond = "
+         $from_date = $_SESSION['from_date'];
+         $to_date = $_SESSION['to_date'];
+         $additional_where_cond.= "
                p.time>='". $from_date ."'
             AND
                p.time<='". $to_date ."'
          ";
       } 
 
+      if(isset($_SESSION['searchfor_name'])) {
+         if($this->dbver < 9) {
+            $additional_where_cond.= "
+                  (
+                        p.name LIKE '%". $_SESSION['searchfor_name'] ."%'
+                     OR
+                        p.description LIKE '%". $_SESSION['searchfor_name'] ."%'
+                  )
+            ";
+         }
+         else {
+            $additional_where_cond.= "
+                  (
+                        basename(p.uri) LIKE '%". $_SESSION['searchfor_name'] ."%'
+                     OR
+                        p.description LIKE '%". $_SESSION['searchfor_name'] ."%'
+                  )
+            ";
+         }
+      }
+
       if(isset($_SESSION['sort_order'])) {
          $order_str = $this->get_sort_order();
       }
 
       /* return a search result */
-      if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
+      if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '') {
          $query_str = "
-            SELECT DISTINCT photo_id
-               FROM photo_tags pt
-            INNER JOIN photos p
-               ON p.id=pt.photo_id
+            SELECT DISTINCT pt1.photo_id
+               FROM photo_tags pt1
+            INNER JOIN photo_tags pt2
+               ON pt1.photo_id=pt2.photo_id
             INNER JOIN tags t
-               ON pt.tag_id=t.id
-            WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'";
+               ON pt1.tag_id=t.id
+            INNER JOIN photos p
+               ON pt1.photo_id=p.id
+            INNER JOIN tags t2
+               ON pt2.tag_id=t2.id
+            WHERE t.name LIKE '%". $_SESSION['searchfor_tag'] ."%' ";
 
-         if(isset($additional_where_cond))
+         if(isset($additional_where_cond) && !empty($additional_where_cond))
             $query_str.= "AND ". $additional_where_cond ." ";
+
+         if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+            $query_str.= "AND t2.name IN ('".implode("','",$this->cfg->show_tags)."')";
+         }
+         
          if(isset($order_str))
             $query_str.= $order_str;
 
@@ -610,19 +918,30 @@ class PHPFSPOT {
             $selected.= $tag .",";
          $selected = substr($selected, 0, strlen($selected)-1);
 
+         /* photo has to match at least on of the selected tags */
          if($_SESSION['tag_condition'] == 'or') {
             $query_str = "
-               SELECT DISTINCT photo_id
-                  FROM photo_tags pt
+               SELECT DISTINCT pt1.photo_id
+                  FROM photo_tags pt1
+               INNER JOIN photo_tags pt2
+                  ON pt1.photo_id=pt2.photo_id
+               INNER JOIN tags t
+                  ON pt2.tag_id=t.id
                INNER JOIN photos p
-                  ON p.id=pt.photo_id
-               WHERE pt.tag_id IN (". $selected .")
+                  ON pt1.photo_id=p.id
+               WHERE pt1.tag_id IN (". $selected .")
             ";
-            if(isset($additional_where_cond)) 
+            if(isset($additional_where_cond) && !empty($additional_where_cond)
                $query_str.= "AND ". $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($order_str))
                $query_str.= $order_str;
          }
+         /* photo has to match all selected tags */
          elseif($_SESSION['tag_condition'] == 'and') {
 
             if(count($_SESSION['selected_tags']) >= 32) {
@@ -645,6 +964,13 @@ class PHPFSPOT {
                   FROM photo_tags pt1
             ";
 
+            if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+               $query_str.= "
+                  INNER JOIN tags t
+                     ON pt1.tag_id=t.id
+               ";
+            }
+
             for($i = 0; $i < count($_SESSION['selected_tags']); $i++) {
                $query_str.= "
                   INNER JOIN photo_tags pt". ($i+2) ."
@@ -655,16 +981,22 @@ class PHPFSPOT {
                INNER JOIN photos p
                   ON pt1.photo_id=p.id
             ";
-            $query_str.= "WHERE pt1.tag_id=". $_SESSION['selected_tags'][0];
+            $query_str.= "WHERE pt2.tag_id=". $_SESSION['selected_tags'][0]." ";
             for($i = 1; $i < count($_SESSION['selected_tags']); $i++) {
                $query_str.= "
-                  AND pt". ($i+1) .".tag_id=". $_SESSION['selected_tags'][$i] ."
+                  AND pt". ($i+2) .".tag_id=". $_SESSION['selected_tags'][$i] ."
                "; 
             }
-            if(isset($additional_where_cond)) 
+            if(isset($additional_where_cond) && !empty($additional_where_cond)
                $query_str.= "AND ". $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($order_str))
                $query_str.= $order_str;
+
          }
 
          $result = $this->db->db_query($query_str);
@@ -676,19 +1008,30 @@ class PHPFSPOT {
 
       /* return all available photos */
       $query_str = "
-         SELECT DISTINCT photo_id
-            FROM photo_tags pt
-         INNER JOIN photos p
+         SELECT DISTINCT p.id
+         FROM photos p
+         LEFT JOIN photo_tags pt
             ON p.id=pt.photo_id
+         LEFT JOIN tags t
+            ON pt.tag_id=t.id
       ";
-      if(isset($additional_where_cond)) 
+
+      if(isset($additional_where_cond) && !empty($additional_where_cond)) 
          $query_str.= "WHERE ". $additional_where_cond ." ";
+
+      if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+         if(isset($additional_where_cond) && !empty($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))
          $query_str.= $order_str;
 
       $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;
 
@@ -706,85 +1049,63 @@ class PHPFSPOT {
 
       $count = count($photos);
 
-      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 all thumbnails should be shown on one page */
+      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) {
+      /* thumbnails should be splitted up in several pages */
+      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_fullname[$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->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]);
+            $images[$thumbs] = $photos[$i];
+            $img_id[$thumbs] = $i;
+            $img_name[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
+            $img_fullname[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 0));
+            $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']);
+      if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '')
+         $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']);
 
       if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
-         $this->tmpl->assign('from_date', $_SESSION['from_date']);
-         $this->tmpl->assign('to_date', $_SESSION['to_date']);
+         $this->tmpl->assign('from_date', $this->ts2str($_SESSION['from_date']));
+         $this->tmpl->assign('to_date', $this->ts2str($_SESSION['to_date']));
       }
 
       if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
@@ -792,18 +1113,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 */
@@ -872,11 +1195,14 @@ class PHPFSPOT {
       
       $current_tags = $this->getCurrentTags();
       $extern_link = "index.php?mode=showpi";
+      $rss_link = "index.php?mode=rss";
       if($current_tags != "") {
          $extern_link.= "&tags=". $current_tags;
+         $rss_link.= "&tags=". $current_tags;
       }
       if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
-         $extern_link.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date'];
+         $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']);
+         $rss_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']);
       }
 
       $export_link = "index.php?mode=export";
@@ -885,21 +1211,31 @@ class PHPFSPOT {
       $this->tmpl->assign('extern_link', $extern_link);
       $this->tmpl->assign('slideshow_link', $slideshow_link);
       $this->tmpl->assign('export_link', $export_link);
+      $this->tmpl->assign('rss_link', $rss_link);
       $this->tmpl->assign('count', $count);
       $this->tmpl->assign('width', $this->cfg->thumb_width);
+      $this->tmpl->assign('preview_width', $this->cfg->photo_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_fullname', $img_fullname);
       $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");
 
-      if(isset($anchor))
-         print "<script language=\"JavaScript\">self.location.hash = '#image". $anchor ."';</script>\n";
+      /* if we are returning to photo index from an photo-view,
+         scroll the window to the last shown photo-thumbnail.
+         after this, unset the last_photo session variable.
+      */
+      if(isset($_SESSION['last_photo'])) {
+         print "<script language=\"JavaScript\">moveToThumb(". $_SESSION['last_photo'] .");</script>\n";
+         unset($_SESSION['last_photo']);
+      }
 
    } // showPhotoIndex()
 
@@ -910,6 +1246,7 @@ class PHPFSPOT {
    {
       $this->tmpl->assign('version', $this->cfg->version);
       $this->tmpl->assign('product', $this->cfg->product);
+      $this->tmpl->assign('db_version', $this->dbver);
       $this->tmpl->show("credits.tpl");
 
    } // showCredits()
@@ -934,33 +1271,45 @@ class PHPFSPOT {
       if(!$this->checkifImageSupported($details['mime']))
          return false;
 
-      $meta = $this->get_meta_informations($orig_image);
+      switch($details['mime']) {
+
+         case 'image/jpeg':
+
+            $meta = $this->get_meta_informations($orig_image);
+
+            $rotate = 0;
+            $flip_hori = false;
+            $flip_vert = false;
+
+            switch($meta['Orientation']) {
+               case 1: /* top, left */
+                  /* nothing to do */ break;
+               case 2: /* top, right */
+                  $rotate = 0; $flip_hori = true; break;
+               case 3: /* bottom, left */
+                  $rotate = 180; break;
+               case 4: /* bottom, right */
+                  $flip_vert = true; break;
+               case 5: /* left side, top */
+                  $rotate = 90; $flip_vert = true; break;
+               case 6: /* right side, top */
+                  $rotate = 90; break;
+               case 7: /* left side, bottom */
+                  $rotate = 270; $flip_vert = true; break;
+               case 8: /* right side, bottom */
+                  $rotate = 270; break;
+            }
+
+            $src_img = @imagecreatefromjpeg($orig_image);
+            break;
 
-      $rotate = 0;
-      $flip = false;
+         case 'image/png':
 
-      switch($meta['Orientation']) {
+            $src_img = @imagecreatefrompng($orig_image);
+            break;
 
-         case 1: /* top, left */
-            $rotate = 0; $flip = false; break;
-         case 2: /* top, right */
-            $rotate = 0; $flip = true; break;
-         case 3: /* bottom, left */
-            $rotate = 180; $flip = false; break;
-         case 4: /* bottom, right */
-            $rotate = 180; $flip = true; break;
-         case 5: /* left side, top */
-            $rotate = 90; $flip = true; break;
-         case 6: /* right side, top */
-            $rotate = 90; $flip = false; break;
-         case 7: /* left side, bottom */
-            $rotate = 270; $flip = true; break;
-         case 8: /* right side, bottom */
-            $rotate = 270; $flip = false; break;
       }
 
-      $src_img = @imagecreatefromjpeg($orig_image);
-
       if(!$src_img) {
          print "Can't load image from ". $orig_image ."\n";
          return false;
@@ -972,9 +1321,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;
@@ -1028,12 +1377,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) {
@@ -1098,7 +1449,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;
 
@@ -1112,7 +1463,7 @@ class PHPFSPOT {
       $details = $this->get_photo_details($idx);
 
       /* calculate file MD5 sum */
-      $full_path = $this->translate_path($details['directory_path'])  ."/". $details['name'];
+      $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
 
       if(!file_exists($full_path)) {
          $this->_error("File ". $full_path ." does not exist\n");
@@ -1126,29 +1477,45 @@ class PHPFSPOT {
 
       $file_md5 = md5_file($full_path);
 
-      $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
+      $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_path = $this->cfg->base_path ."/thumbs/". $resolution ."_". $file_md5;
+         $thumb_sub_path = substr($file_md5, 0, 2);
+         $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5;
+
+         /* if thumbnail-subdirectory does not exist yet, create it */
+         if(!file_exists(dirname($thumb_path))) {
+            mkdir(dirname($thumb_path), 0755);
+         }
 
          /* 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);
@@ -1202,6 +1569,8 @@ class PHPFSPOT {
    {
       $_SESSION['tag_condition'] = $mode;
 
+      return "ok";
+
    } // setTagCondition()
 
    /** 
@@ -1213,23 +1582,67 @@ class PHPFSPOT {
     * getPhotoSelection() will then only return the matching
     * photos.
     */
-   public function startSearch($searchfor, $from, $to, $sort_order)
+   public function startSearch()
    {
-      $_SESSION['searchfor'] = $searchfor;
-      $_SESSION['from_date'] = $from;
-      $_SESSION['to_date'] = $to;
-      $_SESSION['sort_order'] = $sort_order;
+      if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) {
+         $from = $_POST['from'];
+      }
+      if(isset($_POST['to']) && $this->isValidDate($_POST['to'])) {
+         $to = $_POST['to'];
+      }
+
+      if(isset($_POST['for_tag']) && is_string($_POST['for_tag'])) {
+         $searchfor_tag = $_POST['for_tag'];
+         $_SESSION['searchfor_tag'] = $_POST['for_tag'];
+      }
+
+      if(isset($_POST['for_name']) && is_string($_POST['for_name'])) {
+         $searchfor_name = $_POST['for_name'];
+         $_SESSION['searchfor_name'] = $_POST['for_name'];
+      }
+
+      $this->get_tags();
 
-      if($searchfor != "") {
+      if(isset($from) && !empty($from))
+         $_SESSION['from_date'] = strtotime($from ." 00:00:00");
+      else
+         unset($_SESSION['from_date']);
+
+      if(isset($to) && !empty($to))
+         $_SESSION['to_date'] = strtotime($to ." 23:59:59");
+      else
+         unset($_SESSION['to_date']);
+
+      if(isset($searchfor_tag) && !empty($searchfor_tag)) {
          /* new search, reset the current selected tags */
          $_SESSION['selected_tags'] = Array();
          foreach($this->avail_tags as $tag) {
-            if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+            if(preg_match('/'. $searchfor_tag .'/i', $this->tags[$tag]))
                array_push($_SESSION['selected_tags'], $tag);
          }
       }
+
+      return "ok";
+
    } // 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
     *
@@ -1307,6 +1720,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
     */
@@ -1361,14 +1803,14 @@ class PHPFSPOT {
    /**
     * check if all requirements are met
     */
-   private function checkRequirements()
+   private function check_requirements()
    {
       if(!function_exists("imagecreatefromjpeg")) {
          print "PHP GD library extension is missing<br />\n";
          $missing = true;
       }
 
-      if(!function_exists("sqlite3_open")) {
+      if($this->cfg->db_access == "native" && !function_exists("sqlite3_open")) {
          print "PHP SQLite3 library extension is missing<br />\n";
          $missing = true;
       }
@@ -1385,6 +1827,16 @@ 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;
+      }
+      @include_once $this->cfg->smarty_path .'/libs/Smarty.class.php';
+      if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+         print "Smarty template engine can not be found in ". $this->cfg->smarty_path ."/libs/Smarty.class.php<br />\n";
+         $missing = true;
+      }
       ini_restore('track_errors');
 
       if(isset($missing))
@@ -1392,7 +1844,7 @@ class PHPFSPOT {
 
       return true;
 
-   } // checkRequirements()
+   } // check_requirements()
 
    private function _debug($text)
    {
@@ -1407,7 +1859,7 @@ class PHPFSPOT {
     */
    public function checkifImageSupported($mime)
    {
-      if(in_array($mime, Array("image/jpeg")))
+      if(in_array($mime, Array("image/jpeg", "image/png")))
          return true;
 
       return false;
@@ -1417,9 +1869,10 @@ class PHPFSPOT {
    public function _error($text)
    {
       switch($this->cfg->logging) {
+         default:
          case 'display':
             print "<img src=\"resources/green_info.png\" alt=\"warning\" />\n";
-            print $text;
+            print $text ."<br />\n";
             break;
          case 'errorlog':  
             error_log($text);
@@ -1429,6 +1882,8 @@ class PHPFSPOT {
             break;
       }
 
+      $this->runtime_error = true;
+
    } // _error()
 
    /**
@@ -1436,19 +1891,23 @@ class PHPFSPOT {
     */
    private function get_calendar($mode)
    {
-      $year = $_SESSION[$mode .'_date'] ? date("Y", strtotime($_SESSION[$mode .'_date'])) : date("Y");
-      $month = $_SESSION[$mode .'_date'] ? date("m", strtotime($_SESSION[$mode .'_date'])) : date("m");
-      $day = $_SESSION[$mode .'_date'] ? date("d", strtotime($_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()
@@ -1539,14 +1998,9 @@ class PHPFSPOT {
       $pictures = $this->getPhotoSelection();
       $current_tags = $this->getCurrentTags();  
 
-      if(!isset($_SERVER['HTTPS'])) $protocol = "http";
-      else $protocol = "https";
-
-      $server_name = $_SERVER['SERVER_NAME'];
-
       foreach($pictures as $picture) {
 
-         $orig_url = $protocol ."://". $server_name . $this->cfg->web_path ."index.php?mode=showp&id=". $picture;
+         $orig_url = $this->get_phpfspot_url() ."index.php?mode=showp&id=". $picture;
          if($current_tags != "") {
             $orig_url.= "&tags=". $current_tags;
          } 
@@ -1554,7 +2008,7 @@ class PHPFSPOT {
             $orig_url.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date'];
          }
 
-         $thumb_url = $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width;
+         $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width;
 
          switch($mode) {
 
@@ -1578,13 +2032,86 @@ class PHPFSPOT {
 
    } // getExport()
 
+   /**
+    * output RSS feed
+    */
+   public function getRSSFeed()
+   {
+      Header("Content-type: text/xml; charset=utf-8");
+      print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+?>
+<rss version="2.0"
+   xmlns:media="http://search.yahoo.com/mrss/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+ >
+ <channel>
+  <title>phpfspot</title>
+  <description>phpfspot RSS feed</description>
+  <link><?php print htmlspecialchars($this->get_phpfspot_url()); ?></link>
+  <pubDate><?php print strftime("%a, %d %b %Y %T %z"); ?></pubDate>
+  <generator>phpfspot</generator>
+<?php
+
+      $pictures = $this->getPhotoSelection();
+      $current_tags = $this->getCurrentTags();  
+
+      foreach($pictures as $picture) {
+
+         $orig_url = $this->get_phpfspot_url() ."index.php?mode=showp&id=". $picture;
+         if($current_tags != "") {
+            $orig_url.= "&tags=". $current_tags;
+         } 
+         if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
+            $orig_url.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date'];
+         }
+
+         $details = $this->get_photo_details($picture);
+
+         $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width;
+         $thumb_html = htmlspecialchars("
+<a href=\"". $orig_url ."\"><img src=\"". $thumb_url ."\" /></a>
+<br>
+". $details['description']);
+
+         $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
+
+         /* get EXIF information if JPEG */
+         if($details['mime'] == "image/jpeg") {
+            $meta = $this->get_meta_informations($orig_path);
+         }
+
+         $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path);
+
+?>
+  <item>
+   <title><?php print htmlspecialchars($this->parse_uri($details['uri'], 'filename')); ?></title>
+   <link><?php print htmlspecialchars($orig_url); ?></link>
+   <guid><?php print htmlspecialchars($orig_url); ?></guid>
+   <dc:date.Taken><?php print strftime("%Y-%m-%dT%H:%M:%S+00:00", $meta_date); ?></dc:date.Taken>
+   <description>
+    <?php print $thumb_html; ?> 
+   </description>
+   <pubDate><?php print strftime("%a, %d %b %Y %T %z", $meta_date); ?></pubDate>
+  </item>
+<?php
+
+      }
+?>
+ </channel>
+</rss>
+<?php
+
+
+   } // getExport()
+
    /**
     * return all selected tags as one string
     */
    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);
@@ -1617,9 +2144,8 @@ class PHPFSPOT {
       if(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') {
          return "show_photo";
       }
-      elseif((isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) ||
-         (isset($_SESSION['from_date']) && isset($_SESSION['to_date']))) {
-         return "showpi";
+      elseif(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
+         return "showpi_tags";
       }
       elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') {
          return "showpi";
@@ -1647,20 +2173,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
@@ -1675,10 +2202,26 @@ 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;
+         case 'tags_asc':
+            return " ORDER BY t.name ASC ,p.time ASC";
+            break;
+         case 'tags_desc':
+            return " ORDER BY t.name DESC ,p.time ASC";
             break;
       }
 
@@ -1699,11 +2242,7 @@ class PHPFSPOT {
       else
          $_SESSION['slideshow_img']++;
 
-      $server_name = $_SERVER['SERVER_NAME'];
-      if(!isset($_SERVER['HTTPS'])) $protocol = "http";
-      else $protocol = "https";
-
-      return $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
+      return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
 
    } // getNextSlideShowImage()
 
@@ -1722,11 +2261,7 @@ class PHPFSPOT {
       else
          $_SESSION['slideshow_img']--;
 
-      $server_name = $_SERVER['SERVER_NAME'];
-      if(!isset($_SERVER['HTTPS'])) $protocol = "http";
-      else $protocol = "https";
-
-      return $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
+      return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
 
    } // getPrevSlideShowImage()
 
@@ -1734,6 +2269,7 @@ class PHPFSPOT {
    {
       if(isset($_SESSION['slideshow_img']))
          unset($_SESSION['slideshow_img']);
+
    } // resetSlideShow()
    
    /***
@@ -1763,6 +2299,337 @@ class PHPFSPOT {
 
    } // get_random_photo()
 
-}
+   /**
+    * validates provided date
+    *
+    * this function validates if the provided date
+    * contains a valid date and will return true 
+    * if it is.
+    */
+   public function isValidDate($date_str)
+   {
+      $timestamp = strtotime($date_str);
+   
+      if(is_numeric($timestamp))
+         return true;
+      
+      return false;
+
+   } // isValidDate()
+
+   /**
+    * timestamp to string conversion
+    */
+   private function ts2str($timestamp)
+   {
+      return strftime("%Y-%m-%d", $timestamp);
+   } // ts2str()
+
+   private function extractTags($tags_str)
+   {
+      $not_validated = split(',', $_GET['tags']);
+      $validated = array();
+
+      foreach($not_validated as $tag) {
+         if(is_numeric($tag))
+            array_push($validated, $tag);
+      }
+   
+      return $validated;
+   
+   } // extractTags()
+
+   /**
+    * returns the full path to a thumbnail
+    */
+   public function get_thumb_path($width, $photo)
+   {
+      $md5 = $this->getMD5($photo);
+      $sub_path = substr($md5, 0, 2);
+      return $this->cfg->thumb_path
+         . "/"
+         . $sub_path
+         . "/"
+         . $width
+         . "_"
+         . $md5;
+
+   } // get_thumb_path()
+
+   /**
+    * returns server's virtual host name
+    */
+   private function get_server_name()
+   {
+      return $_SERVER['SERVER_NAME'];
+   } // get_server_name()
+
+   /**
+    * returns type of webprotocol which is
+    * currently used
+    */
+   private function get_web_protocol()
+   {
+      if(!isset($_SERVER['HTTPS']))
+         return "http";
+      else
+         return "https";
+   } // get_web_protocol()
+
+   /**
+    * return url to this phpfspot installation
+    */
+   private function get_phpfspot_url()
+   {
+      return $this->get_web_protocol() ."://". $this->get_server_name() . $this->cfg->web_path;
+   } // get_phpfspot_url()
+
+   /**
+    * returns the number of photos which are tagged with $tag_id
+    */
+   public function get_num_photos($tag_id)
+   {
+      if($result = $this->db->db_fetchSingleRow("
+         SELECT count(*) as number
+         FROM photo_tags
+         WHERE
+            tag_id LIKE '". $tag_id ."'")) {
+
+         return $result['number'];
+
+      }
+
+      return 0;
+      
+   } // get_num_photos()
+   
+   /**
+    * check file exists and is readable
+    *
+    * returns true, if everything is ok, otherwise false
+    * if $silent is not set, this function will output and
+    * error message
+    */
+   private function check_readable($file, $silent = null)
+   {
+      if(!file_exists($file)) {
+         if(!isset($silent))
+            print "File \"". $file ."\" does not exist.\n";
+         return false;
+      }
+
+      if(!is_readable($file)) {
+         if(!isset($silent))
+            print "File \"". $file ."\" is not reachable for user ". $this->getuid() ."\n";
+         return false;
+      }
+
+      return true;
+
+   } // check_readable()
+
+   /**
+    * check if all needed indices are present
+    *
+    * this function checks, if some needed indices are already
+    * present, or if not, create them on the fly. they are
+    * necessary to speed up some queries like that one look for
+    * all tags, when show_tags is specified in the configuration.
+    */
+   private function checkDbIndices()
+   {
+      $result = $this->db->db_exec("
+         CREATE INDEX IF NOT EXISTS
+            phototag
+         ON
+            photo_tags
+               (photo_id, tag_id)
+      ");
+
+   } // checkDbIndices()
+
+   /**
+    * retrive F-Spot database version
+    *
+    * this function will return the F-Spot database version number
+    * It is stored within the sqlite3 database in the table meta
+    */
+   public function getFspotDBVersion()
+   {
+      if($result = $this->db->db_fetchSingleRow("
+         SELECT data as version
+         FROM meta
+         WHERE
+            name LIKE 'F-Spot Database Version'
+      "))
+         return $result['version'];
+
+      return null;
+
+   } // getFspotDBVersion()
+
+   /**
+    * parse the provided URI and will returned the
+    * requested chunk
+    */
+   public function parse_uri($uri, $mode)
+   {
+      if(($components = parse_url($uri)) !== false) {
+
+         switch($mode) {
+            case 'filename':
+               return basename($components['path']);
+               break;
+            case 'dirname':
+               return dirname($components['path']);
+               break;
+            case 'fullpath':
+               return $components['path'];
+               break;
+         }
+      }
+
+      return $uri;
+
+   } // parse_uri()
+
+   /**
+    * validate config options
+    *
+    * this function checks if all necessary configuration options are
+    * specified and set.
+    */
+   private function check_config_options()
+   {
+      if(!isset($this->cfg->page_title) || $this->cfg->page_title == "")
+         $this->_error("Please set \$page_title in phpfspot_cfg");
+
+      if(!isset($this->cfg->base_path) || $this->cfg->base_path == "")
+         $this->_error("Please set \$base_path in phpfspot_cfg");
+
+      if(!isset($this->cfg->web_path) || $this->cfg->web_path == "")
+         $this->_error("Please set \$web_path in phpfspot_cfg");
+
+      if(!isset($this->cfg->thumb_path) || $this->cfg->thumb_path == "")
+         $this->_error("Please set \$thumb_path in phpfspot_cfg");
+
+      if(!isset($this->cfg->smarty_path) || $this->cfg->smarty_path == "")
+         $this->_error("Please set \$smarty_path in phpfspot_cfg");
+
+      if(!isset($this->cfg->fspot_db) || $this->cfg->fspot_db == "")
+         $this->_error("Please set \$fspot_db in phpfspot_cfg");
+
+      if(!isset($this->cfg->db_access) || $this->cfg->db_access == "")
+         $this->_error("Please set \$db_access in phpfspot_cfg");
+
+      if(!isset($this->cfg->phpfspot_db) || $this->cfg->phpfspot_db == "")
+         $this->_error("Please set \$phpfspot_db in phpfspot_cfg");
+
+      if(!isset($this->cfg->thumb_width) || $this->cfg->thumb_width == "")
+         $this->_error("Please set \$thumb_width in phpfspot_cfg");
+
+      if(!isset($this->cfg->thumb_height) || $this->cfg->thumb_height == "")
+         $this->_error("Please set \$thumb_height in phpfspot_cfg");
+
+      if(!isset($this->cfg->photo_width) || $this->cfg->photo_width == "")
+         $this->_error("Please set \$photo_width in phpfspot_cfg");
+
+      if(!isset($this->cfg->mini_width) || $this->cfg->mini_width == "")
+         $this->_error("Please set \$mini_width in phpfspot_cfg");
+
+      if(!isset($this->cfg->thumbs_per_page))
+         $this->_error("Please set \$thumbs_per_page in phpfspot_cfg");
+
+      if(!isset($this->cfg->path_replace_from) || $this->cfg->path_replace_from == "")
+         $this->_error("Please set \$path_replace_from in phpfspot_cfg");
+
+      if(!isset($this->cfg->path_replace_to) || $this->cfg->path_replace_to == "")
+         $this->_error("Please set \$path_replace_to in phpfspot_cfg");
+
+      if(!isset($this->cfg->hide_tags))
+         $this->_error("Please set \$hide_tags in phpfspot_cfg");
+
+      if(!isset($this->cfg->theme_name))
+         $this->_error("Please set \$theme_name in phpfspot_cfg");
+
+      if(!isset($this->cfg->logging))
+         $this->_error("Please set \$logging in phpfspot_cfg");
+
+      if(isset($this->cfg->logging) && $this->cfg->logging == 'logfile') {
+
+         if(!isset($this->cfg->log_file))
+            $this->_error("Please set \$log_file because you set logging = log_file in phpfspot_cfg");
+
+         if(!is_writeable($this->cfg->log_file))
+            $this->_error("The specified \$log_file ". $log_file ." is not writeable!");
+
+      }
+
+      /* check for pending slash on web_path */
+      if(!preg_match("/\/$/", $this->cfg->web_path))
+         $this->cfg->web_path.= "/";
+
+      return $this->runtime_error;
+
+   } // check_config_options()
+
+   /**
+    * cleanup phpfspot own database
+    *
+    * When photos are getting delete from F-Spot, there will remain
+    * remain some residues in phpfspot own database. This function
+    * will try to wipe them out.
+    */
+   public function cleanup_phpfspot_db()
+   {
+      $to_delete = Array();
+
+      $result = $this->cfg_db->db_query("
+         SELECT img_idx
+         FROM images
+         ORDER BY img_idx ASC
+      ");
+
+      while($row = $this->cfg_db->db_fetch_object($result)) {
+         if(!$this->db->db_fetchSingleRow("
+            SELECT id
+            FROM photos
+            WHERE id='". $row['img_idx'] ."'")) {
+
+            array_push($to_delete, $row['img_idx'], ',');
+         }
+      }
+
+      print count($to_delete) ." unnecessary objects will be removed from phpfspot's database.\n";
+
+      $this->cfg_db->db_exec("
+         DELETE FROM images
+         WHERE img_idx IN (". implode($to_delete) .")
+      ");
+
+   } // cleanup_phpfspot_db()
+
+   /**
+    * return first image of the page, the $current photo
+    * lies in.
+    *
+    * this function is used to find out the first photo of the
+    * current page, in which the $current photo lies. this is
+    * used to display the correct photo, when calling showPhotoIndex()
+    * from showImage()
+    */
+   private function getCurrentPage($current, $max)
+   {
+      if(isset($this->cfg->thumbs_per_page) && !empty($this->cfg->thumbs_per_page)) {
+         for($page_start = 0; $page_start <= $max; $page_start+=$this->cfg->thumbs_per_page) {
+            if($current >= $page_start && $current < ($page_start+$this->cfg->thumbs_per_page))
+               return $page_start;
+         }
+      }
+      return 0;
+
+   } // getCurrentPage()
+
+} // class PHPFSPOT
 
 ?>