issue78, move version information to main class
[phpfspot.git] / phpfspot.class.php
index 6800da209794bd315979ec3f6926533491b4debb..6c150fa6c70ca9c97862ffb9c6d0a49ef55b1b23 100644 (file)
@@ -1,8 +1,28 @@
 <?php
 
 <?php
 
+/***************************************************************************
+ *
+ * Copyright (c) by Andreas Unterkircher, unki@netshadow.at
+ * All rights reserved
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ ***************************************************************************/
+
 require_once "phpfspot_cfg.php";
 require_once "phpfspot_db.php";
 require_once "phpfspot_cfg.php";
 require_once "phpfspot_db.php";
-require_once "phpfspot_tmpl.php";
 
 class PHPFSPOT {
 
 
 class PHPFSPOT {
 
@@ -12,17 +32,48 @@ class PHPFSPOT {
    var $tmpl;
    var $tags;
    var $avail_tags;
    var $tmpl;
    var $tags;
    var $avail_tags;
-   var $current_tags;
 
 
+   /**
+    * class constructor
+    *
+    * this function will be called on class construct
+    * and will check requirements, loads configuration,
+    * open databases and start the user session
+    */
    public function __construct()
    {
       $this->cfg = new PHPFSPOT_CFG;
 
    public function __construct()
    {
       $this->cfg = new PHPFSPOT_CFG;
 
-      $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
+      /* set application name and version information */
+      $this->cfg->product = "phpfspot";
+      $this->cfg->version = "1.1";
 
 
-      $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
+      /* Check necessary requirements */
+      if(!$this->checkRequirements()) {
+         exit(1);
+      }
+
+      $this->db  = new PHPFSPOT_DB($this, $this->cfg->fspot_db);
+      
+      if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
+         print dirname($this->cfg->phpfspot_db) .": directory is not writeable!";
+         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();
 
       $this->check_config_table();
 
+      /* include Smarty template engine */
+      if(!$this->check_readable($this->cfg->smarty_path .'/libs/Smarty.class.php')) {
+         exit(1);
+      }
+      require $this->cfg->smarty_path .'/libs/Smarty.class.php';
+      /* overload Smarty class if our own template handler */
+      require_once "phpfspot_tmpl.php";
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
       $this->get_tags();
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
       $this->get_tags();
@@ -32,9 +83,16 @@ class PHPFSPOT {
       if(!isset($_SESSION['tag_condition']))
          $_SESSION['tag_condition'] = 'or';
 
       if(!isset($_SESSION['tag_condition']))
          $_SESSION['tag_condition'] = 'or';
 
+      if(!isset($_SESSION['sort_order']))
+         $_SESSION['sort_order'] = 'date_asc';
+
       if(!isset($_SESSION['searchfor']))
          $_SESSION['searchfor'] = '';
 
       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)
+         unset($_SESSION['begin_with']);
+
    } // __construct()
 
    public function __destruct()
    } // __construct()
 
    public function __destruct()
@@ -42,15 +100,97 @@ class PHPFSPOT {
 
    } // __destruct()
 
 
    } // __destruct()
 
+   /**
+    * show - generate html output
+    *
+    * this function can be called after the constructor has
+    * prepared everyhing. it will load the index.tpl smarty
+    * template. if necessary it will registere pre-selects
+    * (photo index, photo, tag search, date search) into
+    * users session.
+    */
    public function show()
    {
       $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
       $this->tmpl->assign('page_title', $this->cfg->page_title);
       $this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
    public function show()
    {
       $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
       $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'];
+
+      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;
+      }
+
+      if(isset($_SESSION['from_date']) && isset($_SESSION['to_date']))
+         $this->tmpl->assign('date_search_enabled', true);
+
+      $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()
 
       $this->tmpl->show("index.tpl");
 
    } // show()
 
+   /**
+    * get_tags - grab all tags of f-spot's database
+    *
+    * 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
+    * fact, if the user requests (hide_tags) it will
+    * opt-out some of them.
+    *
+    * this function is getting called once by show()
+    */
    private function get_tags()
    {
       $this->avail_tags = Array();
    private function get_tags()
    {
       $this->avail_tags = Array();
@@ -80,6 +220,12 @@ class PHPFSPOT {
 
    } // get_tags()
 
 
    } // get_tags()
 
+   /** 
+    * extract all photo details
+    * 
+    * retrieve all available details from f-spot's
+    * database and return them as object
+    */
    public function get_photo_details($idx)
    {
       $result = $this->db->db_query("
    public function get_photo_details($idx)
    {
       $result = $this->db->db_query("
@@ -92,50 +238,138 @@ class PHPFSPOT {
 
    } // get_photo_details
 
 
    } // get_photo_details
 
+   /**
+    * returns aligned photo names 
+    *
+    * this function returns aligned (length) names for
+    * an specific photo. If the length of the name exceeds
+    * $limit the name will be shrinked (...)
+    */
+   public function getPhotoName($idx, $limit = 0)
+   {
+      if($details = $this->get_photo_details($idx)) {
+         $name = $this->shrink_text($details['name'], $limit);
+         return $name;
+      }
+
+   } // 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
+    * 
+    * as the full-qualified path recorded in the f-spot database
+    * is usally not the same as on the webserver, this function
+    * will replace the path with that one specified in the cfg
+    */
    public function translate_path($path, $width = 0)
    {  
       return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
 
    } // translate_path
 
    public function translate_path($path, $width = 0)
    {  
       return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
 
    } // translate_path
 
+   /**
+    * control HTML ouput for a single photo
+    *
+    * this function provides all the necessary information
+    * for the single photo template.
+    */
    public function showPhoto($photo)
    {
    public function showPhoto($photo)
    {
+      /* get all photos from the current photo selection */
       $all_photos = $this->getPhotoSelection();
       $all_photos = $this->getPhotoSelection();
+      $count = count($all_photos);
 
 
-      foreach($all_photos as $all_photo) {
+      for($i = 0; $i < $count; $i++) {
          
          
-         if($get_next) {
-            $next_img = $all_photo;
+         // $get_next will be set, when the photo which has to
+         // be displayed has been found - this means that the
+         // next available is in fact the NEXT image (for the
+         // navigation icons) 
+         if(isset($get_next)) {
+            $next_img = $all_photos[$i];
             break;
          }
 
             break;
          }
 
-         if($all_photo == $photo) {
+         /* the next photo is our NEXT photo */
+         if($all_photos[$i] == $photo) {
             $get_next = 1;
          }
          else {
             $get_next = 1;
          }
          else {
-            $previous_img = $all_photo;
+            $previous_img = $all_photos[$i];
+         }
+
+         if($photo == $all_photos[$i]) {
+               $current = $i;
          }
       }
 
       $details = $this->get_photo_details($photo);
          }
       }
 
       $details = $this->get_photo_details($photo);
+
+      if(!$details) {
+         print "error";
+         return;
+      }
+
       $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
       $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
-      $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);
 
       if(!file_exists($orig_path)) {
 
       if(!file_exists($orig_path)) {
-         print "Photo ". $orig_path ." does not exist!<br />\n";
+         $this->_error("Photo ". $orig_path ." does not exist!<br />\n");
       }
 
       if(!is_readable($orig_path)) {
       }
 
       if(!is_readable($orig_path)) {
-         print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\n";
+         $this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."<br />\n");
       }
 
       /* If the thumbnail doesn't exist yet, try to create it */
       if(!file_exists($thumb_path)) {
       }
 
       /* If the thumbnail doesn't exist yet, try to create it */
       if(!file_exists($thumb_path)) {
-         $this->gen_thumb($photo, 0, 1);
+         $this->gen_thumb($photo, true);
+         $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
       }
 
       }
 
+      /* get f-spot database meta information */
       $meta = $this->get_meta_informations($orig_path);
 
       $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]; 
+      }
+
+      $meta_date = isset($meta['FileDateTime']) ? strftime("%a %x %X", $meta['FileDateTime']) : "n/a";
+      $meta_make = isset($meta['Make']) ? $meta['Make'] ." / ". $meta['Model'] : "n/a";
+      $meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a";
+
+      $extern_link = "index.php?mode=showp&id=". $photo;
+      $current_tags = $this->getCurrentTags();
+      if($current_tags != "") {
+         $extern_link.= "&tags=". $current_tags;
+      }
+      if(isset($_SESSION['from_date']) && isset($_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)) {
 
          $info = getimagesize($thumb_path);
       if(file_exists($thumb_path)) {
 
          $info = getimagesize($thumb_path);
@@ -145,34 +379,50 @@ class PHPFSPOT {
 
          $this->tmpl->assign('width', $info[0]);
          $this->tmpl->assign('height', $info[1]);
 
          $this->tmpl->assign('width', $info[0]);
          $this->tmpl->assign('height', $info[1]);
-         $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $meta['FileDateTime']));
-         $this->tmpl->assign('ExifMadeWith', $meta['Make'] ." ". $meta['Model']);
-         $this->tmpl->assign('ExifOrigResolution', $meta['ExifImageWidth'] ."x". $meta['ExifImageLength']);
-         $this->tmpl->assign('ExifFileSize', round($meta['FileSize']/1024, 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('tags', $this->get_photo_tags($photo));
     
          $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('tags', $this->get_photo_tags($photo));
+         $this->tmpl->assign('current', $current);
       }
       else {
       }
       else {
-         print "Can't open file ". $thumb_path ."\n";
+         $this->_error("Can't open file ". $thumb_path ."\n");
+         return;
       }
 
       if($previous_img) {
          $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
       }
 
       if($previous_img) {
          $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
+         $this->tmpl->assign('prev_img', $previous_img);
       }
 
       if($next_img) {
          $this->tmpl->assign('next_url', "javascript:showImage(". $next_img .");");
       }
 
       if($next_img) {
          $this->tmpl->assign('next_url', "javascript:showImage(". $next_img .");");
+         $this->tmpl->assign('next_img', $next_img);
       }
       }
+      $this->tmpl->assign('mini_width', $this->cfg->mini_width);
+      $this->tmpl->assign('photo_number', $i);
+      $this->tmpl->assign('photo_count', count($all_photos));
 
       $this->tmpl->show("single_photo.tpl");
 
    } // showPhoto()
 
 
       $this->tmpl->show("single_photo.tpl");
 
    } // showPhoto()
 
+   /**
+    * all available tags and tag cloud
+    *
+    * this function outputs all available tags (time ordered)
+    * and in addition output them as tag cloud (tags which have
+    * many photos will appears more then others)
+    */
    public function getAvailableTags()
    {
    public function getAvailableTags()
    {
+      $output = "";
+
       $result = $this->db->db_query("
          SELECT tag_id as id, count(tag_id) as quantity
          FROM photo_tags
       $result = $this->db->db_query("
          SELECT tag_id as id, count(tag_id) as quantity
          FROM photo_tags
@@ -220,25 +470,45 @@ class PHPFSPOT {
           // uncomment if you want sizes in whole %:
          $size = ceil($size);
 
           // uncomment if you want sizes in whole %:
          $size = ceil($size);
 
-         print "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%;\">". $this->tags[$key] ."</a>, ";
+         $output.= "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%;\">". $this->tags[$key] ."</a>, ";
 
       }
 
 
       }
 
+      $output = substr($output, 0, strlen($output)-2);
+      print $output;
+
    } // getAvailableTags()
 
    } // getAvailableTags()
 
+   /**
+    * output all selected tags
+    *
+    * this function output all tags which have been selected
+    * by the user. the selected tags are stored in the 
+    * session-variable $_SESSION['selected_tags']
+    */
    public function getSelectedTags()
    {
    public function getSelectedTags()
    {
+      $output = "";
       foreach($this->avail_tags as $tag)
       {
          // return all selected tags
          if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) {
       foreach($this->avail_tags as $tag)
       {
          // return all selected tags
          if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) {
-            print "<a href=\"javascript:Tags('del', ". $tag .");\" class=\"tag\">". $this->tags[$tag] ."</a>&nbsp;";
+            $output.= "<a href=\"javascript:Tags('del', ". $tag .");\" class=\"tag\">". $this->tags[$tag] ."</a>, ";
          }
          }
-
       }
 
       }
 
+      $output = substr($output, 0, strlen($output)-2);
+      print $output;
+
    } // getSelectedTags()
 
    } // getSelectedTags()
 
+   /**
+    * add tag to users session variable
+    *
+    * this function will add the specified to users current
+    * tag selection. if a date search has been made before
+    * it will be now cleared
+    */
    public function addTag($tag)
    {
       if(!isset($_SESSION['selected_tags']))
    public function addTag($tag)
    {
       if(!isset($_SESSION['selected_tags']))
@@ -249,6 +519,12 @@ class PHPFSPOT {
    
    } // addTag()
 
    
    } // addTag()
 
+   /**
+    * remove tag to users session variable
+    *
+    * this function removes the specified tag from
+    * users current tag selection
+    */
    public function delTag($tag)
    {
       if(isset($_SESSION['selected_tags'])) {
    public function delTag($tag)
    {
       if(isset($_SESSION['selected_tags'])) {
@@ -259,32 +535,107 @@ class PHPFSPOT {
 
    } // delTag()
 
 
    } // delTag()
 
+   /**
+    * reset tag selection
+    *
+    * if there is any tag selection, it will be
+    * deleted now
+    */
    public function resetTags()
    {
    public function resetTags()
    {
-      unset($_SESSION['selected_tags']);
+      if(isset($_SESSION['selected_tags']))
+         unset($_SESSION['selected_tags']);
 
    } // resetTags()
 
 
    } // resetTags()
 
+   /**
+    * reset single photo
+    *
+    * if a specific photo was requested (external link)
+    * unset the session variable now
+    */
+   public function resetPhotoView()
+   {
+      if(isset($_SESSION['current_photo']))
+         unset($_SESSION['current_photo']);
+
+   } // resetPhotoView();
+
+   /**
+    * reset tag search
+    *
+    * if any tag search has taken place, reset
+    * it now
+    */
+   public function resetTagSearch()
+   {
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
+   } // resetTagSearch()
+
+    /**
+    * reset date search
+    *
+    * if any date search has taken place, reset
+    * it now
+    */
+   public function resetDateSearch()
+   {
+      if(isset($_SESSION['from_date']))
+         unset($_SESSION['from_date']);
+      if(isset($_SESSION['to_date']))
+         unset($_SESSION['to_date']);
+
+   } // resetDateSearch();
+
+   /**
+    * return all photo according selection
+    *
+    * this function returns all photos based on
+    * the tag-selection, tag- or date-search.
+    * the tag-search also has to take care of AND
+    * and OR conjunctions
+    */
    public function getPhotoSelection()
    {  
    public function getPhotoSelection()
    {  
-      $tagged_photos = Array();
+      $matched_photos = Array();
+
+      if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
+         $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['sort_order'])) {
+         $order_str = $this->get_sort_order();
+      }
 
       /* return a search result */
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
 
       /* return a search result */
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
-         $result = $this->db->db_query("
+         $query_str = "
             SELECT DISTINCT photo_id
                FROM photo_tags pt
             INNER JOIN photos p
                ON p.id=pt.photo_id
             INNER JOIN tags t
                ON pt.tag_id=t.id
             SELECT DISTINCT photo_id
                FROM photo_tags pt
             INNER JOIN photos p
                ON p.id=pt.photo_id
             INNER JOIN tags t
                ON pt.tag_id=t.id
-            WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'
-               ORDER BY p.time ASC
-         ");
+            WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'";
+
+         if(isset($additional_where_cond))
+            $query_str.= "AND ". $additional_where_cond ." ";
+         if(isset($order_str))
+            $query_str.= $order_str;
+
+         $result = $this->db->db_query($query_str);
          while($row = $this->db->db_fetch_object($result)) {
          while($row = $this->db->db_fetch_object($result)) {
-            array_push($tagged_photos, $row['photo_id']);
+            array_push($matched_photos, $row['photo_id']);
          }
          }
-         return $tagged_photos;
+         return $matched_photos;
       }
 
       /* return according the selected tags */
       }
 
       /* return according the selected tags */
@@ -295,17 +646,26 @@ class PHPFSPOT {
          $selected = substr($selected, 0, strlen($selected)-1);
 
          if($_SESSION['tag_condition'] == 'or') {
          $selected = substr($selected, 0, strlen($selected)-1);
 
          if($_SESSION['tag_condition'] == 'or') {
-            $result = $this->db->db_query("
+            $query_str = "
                SELECT DISTINCT photo_id
                   FROM photo_tags pt
                INNER JOIN photos p
                   ON p.id=pt.photo_id
                WHERE pt.tag_id IN (". $selected .")
                SELECT DISTINCT photo_id
                   FROM photo_tags pt
                INNER JOIN photos p
                   ON p.id=pt.photo_id
                WHERE pt.tag_id IN (". $selected .")
-               ORDER BY p.time ASC
-            ");
+            ";
+            if(isset($additional_where_cond)) 
+               $query_str.= "AND ". $additional_where_cond ." ";
+            if(isset($order_str))
+               $query_str.= $order_str;
          }
          elseif($_SESSION['tag_condition'] == 'and') {
 
          }
          elseif($_SESSION['tag_condition'] == 'and') {
 
+            if(count($_SESSION['selected_tags']) >= 32) {
+               print "A SQLite limit of 32 tables within a JOIN SELECT avoids to<br />\n";
+               print "evaluate your tag selection. Please remove some tags from your selection.\n";
+               return Array();
+            } 
+
             /* Join together a table looking like
 
                pt1.photo_id pt1.tag_id pt2.photo_id pt2.tag_id ...
             /* Join together a table looking like
 
                pt1.photo_id pt1.tag_id pt2.photo_id pt2.tag_id ...
@@ -326,51 +686,93 @@ class PHPFSPOT {
                      ON pt1.photo_id=pt". ($i+2) .".photo_id
                ";
             }
                      ON pt1.photo_id=pt". ($i+2) .".photo_id
                ";
             }
+            $query_str.= "
+               INNER JOIN photos p
+                  ON pt1.photo_id=p.id
+            ";
             $query_str.= "WHERE pt1.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] ."
                "; 
             }
             $query_str.= "WHERE pt1.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] ."
                "; 
             }
-            $result = $this->db->db_query($query_str);
+            if(isset($additional_where_cond)) 
+               $query_str.= "AND ". $additional_where_cond;
+            if(isset($order_str))
+               $query_str.= $order_str;
          }
 
          }
 
+         $result = $this->db->db_query($query_str);
          while($row = $this->db->db_fetch_object($result)) {
          while($row = $this->db->db_fetch_object($result)) {
-            array_push($tagged_photos, $row['photo_id']);
+            array_push($matched_photos, $row['photo_id']);
          }
          }
-         return $tagged_photos;
+         return $matched_photos;
       }
 
       /* return all available photos */
       }
 
       /* return all available photos */
-      $result = $this->db->db_query("
+      $query_str = "
          SELECT DISTINCT photo_id
             FROM photo_tags pt
          INNER JOIN photos p
             ON p.id=pt.photo_id
          SELECT DISTINCT photo_id
             FROM photo_tags pt
          INNER JOIN photos p
             ON p.id=pt.photo_id
-         ORDER BY p.time ASC
-      ");
+      ";
+      if(isset($additional_where_cond)) 
+         $query_str.= "WHERE ". $additional_where_cond ." ";
+      if(isset($order_str))
+         $query_str.= $order_str;
+
+      $result = $this->db->db_query($query_str);
       while($row = $this->db->db_fetch_object($result)) {
       while($row = $this->db->db_fetch_object($result)) {
-         array_push($tagged_photos, $row['photo_id']);
+         array_push($matched_photos, $row['photo_id']);
       }
       }
-      return $tagged_photos;
+      return $matched_photos;
 
    } // getPhotoSelection()
 
 
    } // getPhotoSelection()
 
+    /**
+    * control HTML ouput for photo index
+    *
+    * this function provides all the necessary information
+    * for the photo index template.
+    */
    public function showPhotoIndex()
    {
       $photos = $this->getPhotoSelection();
 
       $count = count($photos);
 
    public function showPhotoIndex()
    {
       $photos = $this->getPhotoSelection();
 
       $count = count($photos);
 
-      if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0)
-         $begin_with = 0;
-      else
-         $begin_with = $_SESSION['begin_with'];
+      if(isset($_SESSION['begin_with']) && $_SESSION['begin_with'] != "")
+         $anchor = $_SESSION['begin_with'];
 
 
-      if($this->cfg->rows_per_page == 0)
+      if(!isset($this->cfg->rows_per_page) || $this->cfg->rows_per_page == 0) {
+
+         $begin_with = 0;
          $end_with = $count;
          $end_with = $count;
-      else
+
+      }
+      elseif($this->cfg->rows_per_page > 0) {
+
+         if(!$_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->rows_per_page * $this->cfg->thumbs_per_row);
+      }
 
    
       $rows = 0;
 
    
       $rows = 0;
@@ -378,12 +780,18 @@ class PHPFSPOT {
       $images[$rows] = Array();
       $img_height[$rows] = Array();
       $img_width[$rows] = Array();
       $images[$rows] = Array();
       $img_height[$rows] = Array();
       $img_width[$rows] = Array();
+      $img_id[$rows] = Array();
+      $img_name[$rows] = Array();
+      $img_title = Array();
 
       for($i = $begin_with; $i < $end_with; $i++) {
 
          $images[$rows][$cols] = $photos[$i];
 
       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));
 
 
-         $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]);
+         $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
 
          if(file_exists($thumb_path)) {
             $info = getimagesize($thumb_path); 
 
          if(file_exists($thumb_path)) {
             $info = getimagesize($thumb_path); 
@@ -409,7 +817,19 @@ class PHPFSPOT {
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
          $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
 
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
          $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
 
+      if(isset($_SESSION['from_date']) && isset($_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'])) {
+         $this->tmpl->assign('tag_result', 1);
+      }
+
+      /* do we have to display the page selector ? */
       if($this->cfg->rows_per_page != 0) {
       if($this->cfg->rows_per_page != 0) {
+      
+         /* 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->rows_per_page * $this->cfg->thumbs_per_row);
          $next_start = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
 
@@ -417,57 +837,114 @@ class PHPFSPOT {
             $this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");"); 
          if($end_with < $count)
             $this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");"); 
             $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;
+         $last_page = ceil($count / $photo_per_page);
+
+         /* get the current selected page */
+         if($begin_with == 0) {
+            $current_page = 1;
+         } else {
+            $current_page = 0;
+            for($i = $begin_with; $i >= 0; $i-=$photo_per_page) {
+               $current_page++;
+            }
+         } 
+
+         $dotdot_made = 0;
+
+         for($i = 1; $i <= $last_page; $i++) {
+
+            if($current_page == $i)
+               $style = "style=\"font-size: 125%; text-decoration: underline;\"";
+            elseif($current_page-1 == $i || $current_page+1 == $i)
+               $style = "style=\"font-size: 105%;\"";
+            elseif(($current_page-5 >= $i) && ($i != 1) ||
+               ($current_page+5 <= $i) && ($i != $last_page))
+               $style = "style=\"font-size: 75%;\"";
+            else
+               $style = "";
+
+            $select = "<a href=\"javascript:showPhotoIndex(". (($i*$photo_per_page)-$photo_per_page) .");\"";
+               if($style != "")
+                  $select.= $style;
+            $select.= ">". $i ."</a>&nbsp;";
+
+            // until 9 pages we show the selector from 1-9
+            if($last_page <= 9) {
+               $page_select.= $select;
+               continue;
+            } else {
+               if($i == 1 /* first page */ || 
+                  $i == $last_page /* last page */ ||
+                  $i == $current_page /* current page */ ||
+                  $i == ceil($last_page * 0.25) /* first quater */ ||
+                  $i == ceil($last_page * 0.5) /* half */ ||
+                  $i == ceil($last_page * 0.75) /* third quater */ ||
+                  (in_array($i, array(1,2,3,4,5,6)) && $current_page <= 4) /* the first 6 */ ||
+                  (in_array($i, array($last_page, $last_page-1, $last_page-2, $last_page-3, $last_page-4, $last_page-5)) && $current_page >= $last_page-4) /* the last 6 */ ||
+                  $i == $current_page-3 || $i == $current_page-2 || $i == $current_page-1 /* three before */ ||
+                  $i == $current_page+3 || $i == $current_page+2 || $i == $current_page+1 /* three after */) {
+
+                  $page_select.= $select;
+                  $dotdot_made = 0;
+                  continue;
+
+               }
+            }
+
+            if(!$dotdot_made) {
+               $page_select.= ".........&nbsp;";
+               $dotdot_made = 1;
+            }
+         }
+
+         /* only show the page selector if we have more then one page */
+         if($last_page > 1)
+            $this->tmpl->assign('page_selector', $page_select);
       }
       }
-   
+
+      
+      $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=". $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";
+      $slideshow_link = "index.php?mode=slideshow";
+
+      $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('images', $images);
       $this->tmpl->assign('img_width', $img_width);
       $this->tmpl->assign('img_height', $img_height);
       $this->tmpl->assign('count', $count);
       $this->tmpl->assign('width', $this->cfg->thumb_width);
       $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('rows', $rows);
       $this->tmpl->assign('columns', $this->cfg->thumbs_per_row);
+
       $this->tmpl->show("photo_index.tpl");
 
       $this->tmpl->show("photo_index.tpl");
 
+      if(isset($anchor))
+         print "<script language=\"JavaScript\">self.location.hash = '#image". $anchor ."';</script>\n";
 
    } // showPhotoIndex()
 
 
    } // showPhotoIndex()
 
-   public function showBubbleDetails($photo, $direction)
-   {
-      if($direction == "up")
-         $direction = "bubbleimg_up";
-      else
-         $direction = "bubbleimg_down";
-
-      $details = $this->get_photo_details($photo);
-      $orig_path = $this->translate_path($details['directory_path'])  ."/". $details['name'];
-
-      $image_url = "phpfspot_img.php?idx=". $photo ."&amp;width=". $this->cfg->bubble_width;
-
-      $filesize = filesize($orig_path);
-      $filesize = rand($filesize/1024, 2);
-
-      if(!file_exists($orig_path)) {
-         print "Photo ". $orig_path ." does not exist!<br />\n";
-         return;
-      }
-      
-      if(!is_readable($orig_path)) {
-         print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\n";
-         return;
-      }
-
-      $img = getimagesize($orig_path);
-
-      $this->tmpl->assign('file_size', $filesize);
-      $this->tmpl->assign('width', $img[0]);
-      $this->tmpl->assign('height', $img[1]);
-      $this->tmpl->assign('file_name', $details['name']);
-      $this->tmpl->assign('image_id', $direction);
-      $this->tmpl->assign('image_url', $image_url);
-      $this->tmpl->show("bubble_details.tpl");
-
-   } // showBubbleDetails()
-
+   /**
+    * show credit template
+    */
    public function showCredits()
    {
       $this->tmpl->assign('version', $this->cfg->version);
    public function showCredits()
    {
       $this->tmpl->assign('version', $this->cfg->version);
@@ -476,9 +953,24 @@ class PHPFSPOT {
 
    } // showCredits()
 
 
    } // showCredits()
 
+   /**
+    * create_thumbnails for the requested width
+    *
+    * this function creates image thumbnails of $orig_image
+    * stored as $thumb_image. It will check if the image is
+    * in a supported format, if necessary rotate the image
+    * (based on EXIF orientation meta headers) and re-sizing.
+    */
    public function create_thumbnail($orig_image, $thumb_image, $width)
    {  
    public function create_thumbnail($orig_image, $thumb_image, $width)
    {  
-      if(!file_exists($orig_image))
+      if(!file_exists($orig_image)) {
+         return false;
+      }
+
+      $details = getimagesize($orig_image);
+      
+      /* check if original photo is a support image type */
+      if(!$this->checkifImageSupported($details['mime']))
          return false;
 
       $meta = $this->get_meta_informations($orig_image);
          return false;
 
       $meta = $this->get_meta_informations($orig_image);
@@ -488,21 +980,21 @@ class PHPFSPOT {
 
       switch($meta['Orientation']) {
 
 
       switch($meta['Orientation']) {
 
-         case 1:
+         case 1: /* top, left */
             $rotate = 0; $flip = false; break;
             $rotate = 0; $flip = false; break;
-         case 2:
+         case 2: /* top, right */
             $rotate = 0; $flip = true; break;
             $rotate = 0; $flip = true; break;
-         case 3:
+         case 3: /* bottom, left */
             $rotate = 180; $flip = false; break;
             $rotate = 180; $flip = false; break;
-         case 4:
+         case 4: /* bottom, right */
             $rotate = 180; $flip = true; break;
             $rotate = 180; $flip = true; break;
-         case 5:
+         case 5: /* left side, top */
             $rotate = 90; $flip = true; break;
             $rotate = 90; $flip = true; break;
-         case 6:
+         case 6: /* right side, top */
             $rotate = 90; $flip = false; break;
             $rotate = 90; $flip = false; break;
-         case 7:
+         case 7: /* left side, bottom */
             $rotate = 270; $flip = true; break;
             $rotate = 270; $flip = true; break;
-         case 8:
+         case 8: /* right side, bottom */
             $rotate = 270; $flip = false; break;
       }
 
             $rotate = 270; $flip = false; break;
       }
 
@@ -514,23 +1006,57 @@ class PHPFSPOT {
       }
 
       /* grabs the height and width */
       }
 
       /* grabs the height and width */
-      $new_w = imagesx($src_img);
-      $new_h = imagesy($src_img);
+      $cur_width = imagesx($src_img);
+      $cur_height = imagesy($src_img);
 
       // If requested width is more then the actual image width,
 
       // If requested width is more then the actual image width,
-      // do not generate a thumbnail
+      // do not generate a thumbnail, instead safe the original
+      // as thumbnail but with lower quality
 
 
-      if($width >= $new_w) {
+      if($width >= $cur_width) {
+         $result = imagejpeg($src_img, $thumb_image, 75);
          imagedestroy($src_img);
          return true;
       }
 
          imagedestroy($src_img);
          return true;
       }
 
+      // If the image will be rotate because EXIF orientation said so
+      // 'virtually rotate' the image for further calculations
+      if($rotate == 90 || $rotate == 270) {
+         $tmp = $cur_width;
+         $cur_width = $cur_height;
+         $cur_height = $tmp;
+      }
+
       /* calculates aspect ratio */
       /* calculates aspect ratio */
-      $aspect_ratio = $new_h / $new_w;
+      $aspect_ratio = $cur_height / $cur_width;
 
       /* sets new size */
 
       /* sets new size */
-      $new_w = $width;
-      $new_h = abs($new_w * $aspect_ratio);
+      if($aspect_ratio < 1) {
+         $new_w = $width;
+         $new_h = abs($new_w * $aspect_ratio);
+      } else {
+         /* 'virtually' rotate the image and calculate it's ratio */
+         $tmp_w = $cur_height;
+         $tmp_h = $cur_width;
+         /* now get the ratio from the 'rotated' image */
+         $tmp_ratio = $tmp_h/$tmp_w;
+         /* now calculate the new dimensions */
+         $tmp_w = $width;
+         $tmp_h = abs($tmp_w * $tmp_ratio);
+
+         // now that we know, how high they photo should be, if it
+         // gets rotated, use this high to scale the image
+         $new_h = $tmp_h;
+         $new_w = abs($new_h / $aspect_ratio);
+
+         // If the image will be rotate because EXIF orientation said so
+         // now 'virtually rotate' back the image for the image manipulation
+         if($rotate == 90 || $rotate == 270) {
+            $tmp = $new_w;
+            $new_w = $new_h;
+            $new_h = $tmp;
+         }
+      }
 
       /* creates new image of that size */
       $dst_img = imagecreatetruecolor($new_w, $new_h);
 
       /* creates new image of that size */
       $dst_img = imagecreatetruecolor($new_w, $new_h);
@@ -538,7 +1064,7 @@ class PHPFSPOT {
       imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
 
       /* copies resized portion of original image into new image */
       imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
 
       /* copies resized portion of original image into new image */
-      imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img));
+      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) {
 
       /* needs the image to be flipped horizontal? */
       if($flip) {
@@ -550,7 +1076,7 @@ class PHPFSPOT {
       }
 
       if($rotate) {
       }
 
       if($rotate) {
-         print "(ROTATE)";
+         $this->_debug("(ROTATE)");
          $dst_img = $this->rotateImage($dst_img, $rotate);
       }
 
          $dst_img = $this->rotateImage($dst_img, $rotate);
       }
 
@@ -570,12 +1096,22 @@ class PHPFSPOT {
 
    } // create_thumbnail()
 
 
    } // create_thumbnail()
 
+   /**
+    * return all exif meta data from the file
+    */
    public function get_meta_informations($file)
    {
       return exif_read_data($file);
 
    } // get_meta_informations()
 
    public function get_meta_informations($file)
    {
       return exif_read_data($file);
 
    } // get_meta_informations()
 
+   /**
+    * create phpfspot own sqlite database
+    *
+    * this function creates phpfspots own sqlite database
+    * if it does not exist yet. this own is used to store
+    * some necessary informations (md5 sum's, ...).
+    */
    public function check_config_table()
    {
       // if the config table doesn't exist yet, create it
    public function check_config_table()
    {
       // if the config table doesn't exist yet, create it
@@ -601,39 +1137,56 @@ class PHPFSPOT {
     * 2. Check if the md5sum of the original file has changed
     * 3. Generate the thumbnails if needed
     */
     * 2. Check if the md5sum of the original file has changed
     * 3. Generate the thumbnails if needed
     */
-   public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
+   public function gen_thumb($idx = 0, $force = 0)
    {
    {
+      $error = 0;
+
       $resolutions = Array(
          $this->cfg->thumb_width,
       $resolutions = Array(
          $this->cfg->thumb_width,
-         $this->cfg->bubble_width,
          $this->cfg->photo_width,
          $this->cfg->photo_width,
+         $this->cfg->mini_width,
       );
 
       );
 
+      /* get details from F-Spot's database */
       $details = $this->get_photo_details($idx);
       $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($details['directory_path'])  ."/". $details['name'];
-      $file_md5 = md5_file($full_path);
 
 
-      if($fromcmd) print "Image [". $idx ."] ". $details['name'] ." Thumbnails:";
+      if(!file_exists($full_path)) {
+         $this->_error("File ". $full_path ." does not exist\n");
+         return;
+      }
 
 
-      $error = 0;
+      if(!is_readable($full_path)) {
+         $this->_error("File ". $full_path ." is not readable for ". $this->getuid() ."\n");
+         return;
+      }
+
+      $file_md5 = md5_file($full_path);
+
+      $this->_debug("Image [". $idx ."] ". $this->shrink_text($details['name'], 20) ." Thumbnails:");
 
       foreach($resolutions as $resolution) {
 
 
       foreach($resolutions as $resolution) {
 
-         $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(!file_exists(dirname($thumb_path))) {
+            mkdir(dirname($thumb_path), 0755);
+         }
 
          /* if the thumbnail file doesn't exist, create it */
          if(!file_exists($thumb_path)) {
 
 
          /* if the thumbnail file doesn't exist, create it */
          if(!file_exists($thumb_path)) {
 
-            if($fromcmd) print " ". $resolution ."px";
+            $this->_debug(" ". $resolution ."px");
             if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
                $error = 1;
             if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
                $error = 1;
-
          }
          }
-
          /* if the file hasn't changed there is no need to regen the thumb */
          elseif($file_md5 != $this->getMD5($idx) || $force) {
 
          /* if the file hasn't changed there is no need to regen the thumb */
          elseif($file_md5 != $this->getMD5($idx) || $force) {
 
-            if($fromcmd) print " ". $resolution ."px";
+            $this->_debug(" ". $resolution ."px");
             if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
                $error = 1;
 
             if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
                $error = 1;
 
@@ -641,13 +1194,20 @@ class PHPFSPOT {
       }
 
       /* set the new/changed MD5 sum for the current photo */
       }
 
       /* set the new/changed MD5 sum for the current photo */
-      if(!$error)
+      if(!$error) {
          $this->setMD5($idx, $file_md5);
          $this->setMD5($idx, $file_md5);
+      }
 
 
-      if($fromcmd) print "\n";
+      $this->_debug("\n");
 
    } // gen_thumb()
 
 
    } // gen_thumb()
 
+   /**
+    * returns stored md5 sum for a specific photo
+    *
+    * this function queries the phpfspot database for a
+    * stored MD5 checksum of the specified photo
+    */
    public function getMD5($idx)
    {
       $result = $this->cfg_db->db_query("
    public function getMD5($idx)
    {
       $result = $this->cfg_db->db_query("
@@ -664,6 +1224,9 @@ class PHPFSPOT {
       
    } // getMD5()
 
       
    } // getMD5()
 
+   /**
+    * set MD5 sum for the specific photo
+    */
    private function setMD5($idx, $md5)
    {
       $result = $this->cfg_db->db_exec("
    private function setMD5($idx, $md5)
    {
       $result = $this->cfg_db->db_exec("
@@ -673,24 +1236,62 @@ class PHPFSPOT {
 
    } // setMD5()
 
 
    } // setMD5()
 
+   /**
+    * store current tag condition
+    *
+    * this function stores the current tag condition
+    * (AND or OR) in the users session variables
+    */
    public function setTagCondition($mode)
    {
       $_SESSION['tag_condition'] = $mode;
 
    } // setTagCondition()
 
    public function setTagCondition($mode)
    {
       $_SESSION['tag_condition'] = $mode;
 
    } // setTagCondition()
 
-   public function startSearch($searchfor)
+   /** 
+    * invoke tag & date search 
+    *
+    * this function will return all matching tags and store
+    * them in the session variable selected_tags. furthermore
+    * it also handles the date search.
+    * getPhotoSelection() will then only return the matching
+    * photos.
+    */
+   public function startSearch($searchfor, $sort_order, $from = 0, $to = 0)
    {
       $_SESSION['searchfor'] = $searchfor;
    {
       $_SESSION['searchfor'] = $searchfor;
+      $_SESSION['sort_order'] = $sort_order;
+      if($from != 0)
+         $_SESSION['from_date'] = strtotime($from);
+      else
+         unset($_SESSION['from_date']);
+      if($to != 0)
+         $_SESSION['to_date'] = strtotime($to);
+      else
+         unset($_SESSION['to_date']);
+
+      if($searchfor != "") {
+         /* 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]))
+               array_push($_SESSION['selected_tags'], $tag);
+         }
+      }
 
    } // startSearch()
 
 
    } // startSearch()
 
+   /**
+    * rotate image
+    *
+    * this function rotates the image according the
+    * specified angel.
+    */
    private function rotateImage($img, $degrees)
    {
    private function rotateImage($img, $degrees)
    {
-      if(function_exists("imagerotate"))
+      if(function_exists("imagerotate")) {
          $img = imagerotate($img, $degrees, 0);
          $img = imagerotate($img, $degrees, 0);
-      else
-      {
+      } else {
          function imagerotate($src_img, $angle)
          {
             $src_x = imagesx($src_img);
          function imagerotate($src_img, $angle)
          {
             $src_x = imagesx($src_img);
@@ -740,7 +1341,9 @@ class PHPFSPOT {
                   }
                   break;
 
                   }
                   break;
 
-               default: $rotate = $src_img;
+               default:
+                  $rotate = $src_img;
+                  break;
             };
 
             return $rotate;
             };
 
             return $rotate;
@@ -755,6 +1358,9 @@ class PHPFSPOT {
 
    } // rotateImage()
 
 
    } // rotateImage()
 
+   /**
+    * return all assigned tags for the specified photo
+    */
    private function get_photo_tags($idx)
    {
       $result = $this->db->db_query("
    private function get_photo_tags($idx)
    {
       $result = $this->db->db_query("
@@ -774,7 +1380,10 @@ class PHPFSPOT {
 
    } // get_photo_tags()
 
 
    } // get_photo_tags()
 
-   function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
+   /**
+    * create on-the-fly images with text within
+    */
+   public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
    {
       if (strlen($color) != 6) 
          $color = 000000;
    {
       if (strlen($color) != 6) 
          $color = 000000;
@@ -800,6 +1409,574 @@ class PHPFSPOT {
 
    } // showTextImage()
 
 
    } // showTextImage()
 
+   /**
+    * check if all requirements are met
+    */
+   private function checkRequirements()
+   {
+      if(!function_exists("imagecreatefromjpeg")) {
+         print "PHP GD library extension is missing<br />\n";
+         $missing = true;
+      }
+
+      if($this->cfg->db_access == "native" && !function_exists("sqlite3_open")) {
+         print "PHP SQLite3 library extension is missing<br />\n";
+         $missing = true;
+      }
+
+      /* Check for HTML_AJAX PEAR package, lent from Horde project */
+      ini_set('track_errors', 1);
+      @include_once 'HTML/AJAX/Server.php';
+      if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+         print "PEAR HTML_AJAX package is missing<br />\n";
+         $missing = true;
+      }
+      @include_once 'Calendar/Calendar.php';
+      if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+         print "PEAR Calendar package is missing<br />\n";
+         $missing = true;
+      }
+      ini_restore('track_errors');
+
+      if(isset($missing))
+         return false;
+
+      return true;
+
+   } // checkRequirements()
+
+   private function _debug($text)
+   {
+      if($this->fromcmd) {
+         print $text;
+      }
+
+   } // _debug()
+
+   /**
+    * check if specified MIME type is supported
+    */
+   public function checkifImageSupported($mime)
+   {
+      if(in_array($mime, Array("image/jpeg")))
+         return true;
+
+      return false;
+
+   } // checkifImageSupported()
+
+   public function _error($text)
+   {
+      switch($this->cfg->logging) {
+         case 'display':
+            print "<img src=\"resources/green_info.png\" alt=\"warning\" />\n";
+            print $text;
+            break;
+         case 'errorlog':  
+            error_log($text);
+            break;
+         case 'logfile':
+            error_log($text, 3, $his->cfg->log_file);
+            break;
+      }
+
+   } // _error()
+
+   /**
+    * output calendard input fields
+    */
+   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");
+
+      $output = "<input type=\"text\" size=\"3\" id=\"". $mode ."year\" value=\"". $year ."\"";
+      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\"";
+      $output.= " />\n";
+      $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."day\" value=\"". $day ."\"";
+      if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\"";
+      $output.= " />\n";
+      return $output;
+
+   } // get_calendar()
+
+   /**
+    * output calendar matrix
+    */
+   public function get_calendar_matrix($year = 0, $month = 0, $day = 0)
+   {
+      if (!isset($year)) $year = date('Y');
+      if (!isset($month)) $month = date('m');
+      if (!isset($day)) $day = date('d');
+      $rows = 1;
+      $cols = 1;
+      $matrix = Array();
+
+      require_once CALENDAR_ROOT.'Month/Weekdays.php';
+      require_once CALENDAR_ROOT.'Day.php';
+
+      // Build the month
+      $month = new Calendar_Month_Weekdays($year,$month);
+
+      // Create links
+      $prevStamp = $month->prevMonth(true);
+      $prev = "javascript:setMonth(". date('Y',$prevStamp) .", ". date('n',$prevStamp) .", ". date('j',$prevStamp) .");";
+      $nextStamp = $month->nextMonth(true);
+      $next = "javascript:setMonth(". date('Y',$nextStamp) .", ". date('n',$nextStamp) .", ". date('j',$nextStamp) .");";
+
+      $selectedDays = array (
+         new Calendar_Day($year,$month,$day),
+         new Calendar_Day($year,12,25),
+      );
+
+      // Build the days in the month
+      $month->build($selectedDays);
+
+      $this->tmpl->assign('current_month', date('F Y',$month->getTimeStamp()));
+      $this->tmpl->assign('prev_month', $prev);
+      $this->tmpl->assign('next_month', $next);
+
+      while ( $day = $month->fetch() ) {
+   
+         if(!isset($matrix[$rows]))
+            $matrix[$rows] = Array();
+
+         $string = "";
+
+         $dayStamp = $day->thisDay(true);
+         $link = "javascript:setCalendarDate(". date('Y',$dayStamp) .", ". date('n',$dayStamp).", ". date('j',$dayStamp) .");";
+
+         // isFirst() to find start of week
+         if ( $day->isFirst() )
+            $string.= "<tr>\n";
+
+         if ( $day->isSelected() ) {
+            $string.= "<td class=\"selected\">".$day->thisDay()."</td>\n";
+         } else if ( $day->isEmpty() ) {
+            $string.= "<td>&nbsp;</td>\n";
+         } else {
+            $string.= "<td><a class=\"calendar\" href=\"".$link."\">".$day->thisDay()."</a></td>\n";
+         }
+
+         // isLast() to find end of week
+         if ( $day->isLast() )
+            $string.= "</tr>\n";
+
+         $matrix[$rows][$cols] = $string;
+
+         $cols++;
+
+         if($cols > 7) {
+            $cols = 1;
+            $rows++;
+         }
+      }
+
+      $this->tmpl->assign('matrix', $matrix);
+      $this->tmpl->assign('rows', $rows);
+      $this->tmpl->show("calendar.tpl");
+
+   } // get_calendar_matrix()
+
+   /**
+    * output export page
+    */
+   public function getExport($mode)
+   {
+      $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'];
+         }
+
+         $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width;
+
+         switch($mode) {
+
+            case 'HTML':
+               // <a href="%pictureurl%"><img src="%thumbnailurl%" ></a>
+               print htmlspecialchars("<a href=\"". $orig_url ."\"><img src=\"". $thumb_url ."\" /></a>") ."<br />\n";
+               break;
+               
+            case 'MoinMoin':
+               // "[%pictureurl% %thumbnailurl%]"
+               print htmlspecialchars("[".$orig_url." ".$thumb_url."&fake=1.jpg]") ."<br />\n";
+               break;
+
+            case 'MoinMoinList':
+               // " * [%pictureurl% %thumbnailurl%]"
+               print "&nbsp;" . htmlspecialchars("* [".$orig_url." ".$thumb_url."&fake=1.jpg]") ."<br />\n";
+               break;
+         }
+
+      }
+
+   } // 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($details['directory_path']) ."/". $details['name'];
+         $meta = $this->get_meta_informations($orig_path);
+         $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path);
+
+?>
+  <item>
+   <title><?php print htmlspecialchars($details['name']); ?></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'] != "") {
+         foreach($_SESSION['selected_tags'] as $tag)
+            $current_tags.= $tag .",";
+         $current_tags = substr($current_tags, 0, strlen($current_tags)-1);
+      }
+      return $current_tags;
+
+   } // getCurrentTags()
+
+   /**
+    * return the current photo
+    */
+   public function getCurrentPhoto()
+   {
+      if(isset($_SESSION['current_photo'])) {
+         print $_SESSION['current_photo'];
+      }
+   } // getCurrentPhoto()
+
+   /**
+    * tells the client browser what to do
+    *
+    * this function is getting called via AJAX by the
+    * client browsers. it will tell them what they have
+    * to do next. This is necessary for directly jumping
+    * into photo index or single photo view when the are
+    * requested with specific URLs
+    */
+   public function whatToDo()
+   {
+      if(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') {
+         return "show_photo";
+      }
+      elseif(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
+         return "showpi_tags";
+      }
+      elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') {
+         return "showpi";
+      }
+
+      return "nothing special";
+
+   } // whatToDo()
+
+   /**
+    * return the current process-user
+    */
+   private function getuid()
+   {
+      if($uid = posix_getuid()) {
+         if($user = posix_getpwuid($uid)) {
+            return $user['name'];
+         }
+      }
+   
+      return 'n/a';
+   
+   } // getuid()
+
+   /**
+    * returns a select-dropdown box to select photo index sort parameters
+    */
+   private function get_sort_field()
+   {
+      $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.= " selected=\"selected\"";
+         }
+         $output.= ">". $sort_order ."</option>";
+      }
+      $output.= "</select>";
+      return $output;
+
+   } // get_sort_field()
+
+   /**
+    * returns the currently selected sort order
+    */ 
+   private function get_sort_order()
+   {
+      switch($_SESSION['sort_order']) {
+         case 'date_asc':
+            return " ORDER BY p.time ASC";
+            break;
+         case 'date_desc':
+            return " ORDER BY p.time DESC";
+            break;
+         case 'name_asc':
+            return " ORDER BY p.name ASC";
+            break;
+         case 'name_desc':
+            return " ORDER BY p.name DESC";
+            break;
+      }
+
+   } // get_sort_order()
+
+   /***
+     * return the next to be shown slide show image
+     *
+     * this function returns the URL of the next image
+     * in the slideshow sequence.
+     */
+   public function getNextSlideShowImage()
+   {
+      $all_photos = $this->getPhotoSelection();
+
+      if(!isset($_SESSION['slideshow_img']) || $_SESSION['slideshow_img'] == count($all_photos)-1) 
+         $_SESSION['slideshow_img'] = 0;
+      else
+         $_SESSION['slideshow_img']++;
+
+      return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
+
+   } // getNextSlideShowImage()
+
+   /***
+     * return the previous to be shown slide show image
+     *
+     * this function returns the URL of the previous image
+     * in the slideshow sequence.
+     */
+   public function getPrevSlideShowImage()
+   {
+      $all_photos = $this->getPhotoSelection();
+
+      if(!isset($_SESSION['slideshow_img']) || $_SESSION['slideshow_img'] == 0)
+         $_SESSION['slideshow_img'] = 0;
+      else
+         $_SESSION['slideshow_img']--;
+
+      return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
+
+   } // getPrevSlideShowImage()
+
+   public function resetSlideShow()
+   {
+      if(isset($_SESSION['slideshow_img']))
+         unset($_SESSION['slideshow_img']);
+   } // resetSlideShow()
+   
+   /***
+     * get random photo
+     *
+     * this function will get all photos from the fspot
+     * database and randomly return ONE entry
+     *
+     * saddly there is yet no sqlite3 function which returns
+     * the bulk result in array, so we have to fill up our
+     * own here.
+     */ 
+   public function get_random_photo()
+   {
+      $all = Array();
+
+      $result = $this->db->db_query("
+         SELECT id
+         FROM photos
+      ");
+      
+      while($row = $this->db->db_fetch_object($result)) {
+         array_push($all, $row['id']);
+      }
+
+      return $all[array_rand($all)];
+
+   } // 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)
+   {
+      $sub_path = substr($this->getMD5($photo), 0, 2);
+      return $this->cfg->thumb_path
+         . "/"
+         . $sub_path
+         . "/"
+         . $width
+         . "_"
+         . $this->getMD5($photo);
+
+   } // 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()
+   
+   /**
+    * 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()
+
 }
 
 ?>
 }
 
 ?>