get_current_user() returns the OWNER of the php script - now we use posix functions...
[phpfspot.git] / phpfspot.class.php
index 18c00cfee37005b3ce9cac9a6f0c550d96ccd1c7..579054d6ebd70a18caba3abd46612723c6e5474f 100644 (file)
@@ -12,14 +12,23 @@ class PHPFSPOT {
    var $tmpl;
    var $tags;
    var $avail_tags;
-   var $current_tags;
 
    public function __construct()
    {
-      $this->cfg = new PHPFSPOT_CFG;
+      /* Check necessary requirements */
+      if(!$this->checkRequirements()) {
+         exit(1);
+      }
 
-      $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
+      $this->cfg = new PHPFSPOT_CFG;
 
+      $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);
       $this->check_config_table();
 
@@ -35,6 +44,10 @@ class PHPFSPOT {
       if(!isset($_SESSION['searchfor']))
          $_SESSION['searchfor'] = '';
 
+      // if begin_with is still set but rows_per_page is now 0, unset it
+      if(isset($_SESSION['begin_with']) && $this->cfg->rows_per_page == 0)
+         unset($_SESSION['begin_with']);
+
    } // __construct()
 
    public function __destruct()
@@ -47,12 +60,55 @@ class PHPFSPOT {
       $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
       $this->tmpl->assign('page_title', $this->cfg->page_title);
       $this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
+
+      $_SESSION['start_action'] = $_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;
+
+      }
+
+      $this->tmpl->assign('from_date', $this->get_calendar('from'));
+      $this->tmpl->assign('to_date', $this->get_calendar('to'));
+      $this->tmpl->assign('content_page', 'welcome.tpl');
       $this->tmpl->show("index.tpl");
 
+
    } // show()
 
    private function get_tags()
    {
+   
       $this->avail_tags = Array();
       $count = 0;
    
@@ -92,6 +148,18 @@ class PHPFSPOT {
 
    } // get_photo_details
 
+   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));
+         }
+         return $name;
+      }
+
+   } // getPhotoName()
+
    public function translate_path($path, $width = 0)
    {  
       return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
@@ -101,49 +169,103 @@ class PHPFSPOT {
    public function showPhoto($photo)
    {
       $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;
+            $next_img = $all_photos[$i];
             break;
          }
 
-         if($all_photo == $photo) {
+         if($all_photos[$i] == $photo) {
             $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);
-      $meta = $this->get_meta_informations($this->translate_path($details['directory_path']) ."/". $details['name']);
-      $info = getimagesize($this->translate_path($details['directory_path']) ."/thumbs/". $this->cfg->photo_width ."_". $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);
 
-      $this->tmpl->assign('description', $details['description']);
-      $this->tmpl->assign('image_name', $details['name']);
+      if(!file_exists($orig_path)) {
+         $this->_warning("Photo ". $orig_path ." does not exist!<br />\n");
+      }
+
+      if(!is_readable($orig_path)) {
+         $this->_warning("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)) {
+         $this->gen_thumb($photo, true);
+      }
+
+      $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";
+
+      $current_tags = $this->getCurrentTags();
+      $extern_link = "index.php?mode=showp&id=". $photo;
+      if($current_tags != "") {
+         $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'];
+      }
+
+      $this->tmpl->assign('extern_link', $extern_link);
+
+      if(file_exists($thumb_path)) {
+
+         $info = getimagesize($thumb_path);
+
+         $this->tmpl->assign('description', $details['description']);
+         $this->tmpl->assign('image_name', $details['name']);
 
-      $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('image_url', 'phpfspot_img.php?idx='. $photo ."&amp;width=". $this->cfg->photo_width);
-      $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
+         $this->tmpl->assign('width', $info[0]);
+         $this->tmpl->assign('height', $info[1]);
+         $this->tmpl->assign('ExifMadeOn', $meta_date);
+         $this->tmpl->assign('ExifMadeWith', $meta_make);
+         $this->tmpl->assign('ExifOrigResolution', $meta_res);
+         $this->tmpl->assign('ExifFileSize', $meta_size);
+    
+         $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&amp;width=". $this->cfg->photo_width);
+         $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
 
-      $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+         $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+         $this->tmpl->assign('current', $current);
+      }
+      else {
+         $this->_warning("Can't open file ". $thumb_path ."\n");
+      }
 
       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 .");");
+         $this->tmpl->assign('next_img', $next_img);
       }
+      $this->tmpl->assign('mini_width', $this->cfg->mini_width);
 
       $this->tmpl->show("single_photo.tpl");
 
@@ -206,19 +328,25 @@ class PHPFSPOT {
 
    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'])) {
-            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()
 
    public function addTag($tag)
    {
+      // if the result of a date search are displayed, reset them
+      $this->resetDateSearch();
+
       if(!isset($_SESSION['selected_tags']))
          $_SESSION['selected_tags'] = Array();
 
@@ -239,13 +367,37 @@ class PHPFSPOT {
 
    public function resetTags()
    {
-      unset($_SESSION['selected_tags']);
+      if(isset($_SESSION['selected_tags']))
+         unset($_SESSION['selected_tags']);
 
    } // resetTags()
 
+   public function resetPhotoView()
+   {
+      if(isset($_SESSION['current_photo']))
+         unset($_SESSION['current_photo']);
+
+   } // resetPhotoView();
+
+   public function resetTagSearch()
+   {
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
+   } // resetTagSearch()
+
+   public function resetDateSearch()
+   {
+      if(isset($_SESSION['from_date']))
+         unset($_SESSION['from_date']);
+      if(isset($_SESSION['to_date']))
+         unset($_SESSION['to_date']);
+
+   } // resetDateSearch();
+
    public function getPhotoSelection()
    {  
-      $tagged_photos = Array();
+      $matched_photos = Array();
 
       /* return a search result */
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
@@ -260,13 +412,13 @@ class PHPFSPOT {
                ORDER BY p.time ASC
          ");
          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 */
-      if(isset($_SESSION['selected_tags'])) {
+      if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
          $selected = "";
          foreach($_SESSION['selected_tags'] as $tag)
             $selected.= $tag .",";
@@ -284,6 +436,12 @@ class PHPFSPOT {
          }
          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 ...
@@ -314,11 +472,31 @@ class PHPFSPOT {
          }
 
          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;
       }
 
+      if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
+         $from_date = strtotime($_SESSION['from_date']);
+         $to_date = strtotime($_SESSION['to_date']);
+         $result = $this->db->db_query("
+            SELECT DISTINCT photo_id
+               FROM photo_tags pt
+            INNER JOIN photos p
+               ON p.id=pt.photo_id
+            WHERE 
+               time>='". $from_date ."'
+            AND
+               time<='". $to_date ."'
+            ORDER BY p.time ASC
+         ");
+         while($row = $this->db->db_fetch_object($result)) {
+            array_push($matched_photos, $row['photo_id']);
+         }
+         return $matched_photos;
+      } 
+
       /* return all available photos */
       $result = $this->db->db_query("
          SELECT DISTINCT photo_id
@@ -328,9 +506,9 @@ class PHPFSPOT {
          ORDER BY p.time ASC
       ");
       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()
 
@@ -340,18 +518,70 @@ 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) {
+
+         $begin_with = 0;
+         $end_with = $count;
+
+      }
+      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);
+      }
+
+   
       $rows = 0;
       $cols = 0;
       $images[$rows] = Array();
+      $img_height[$rows] = Array();
+      $img_width[$rows] = Array();
+      $img_id[$rows] = Array();
+      $img_name[$rows] = Array();
+      $img_title = Array();
 
-      for($i = 0; $i < $count; $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]);
+
+         if(file_exists($thumb_path)) {
+            $info = getimagesize($thumb_path); 
+            $img_width[$rows][$cols] = $info[0];
+            $img_height[$rows][$cols] = $info[1];
+         }
 
          if($cols == $this->cfg->thumbs_per_row-1) {
             $cols = 0;
             $rows++;
             $images[$rows] = Array();
+            $img_width[$rows] = Array();
+            $img_height[$rows] = Array();
          }
          else {
             $cols++;
@@ -364,42 +594,110 @@ class PHPFSPOT {
       if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
          $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
 
+      /* do we have to display the page selector ? */
+      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);
+
+         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;
+         $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++;
+            }
+         } 
+
+         for($i = 1; $i <= $last_page; $i++) {
+
+            if($current_page == $i)
+               $style = "style=\"font-size: 125%;\"";
+            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;
+                  continue;
+
+               }
+            }
+
+            $page_select.= ".";
+         }
+
+         /* 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";
+      if($current_tags != "") {
+         $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'];
+      }
+
+      $export_link = "index.php?mode=export";
+
+      $this->tmpl->assign('extern_link', $extern_link);
+      $this->tmpl->assign('export_link', $export_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('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->show("photo_index.tpl");
 
+      if(isset($anchor))
+         print "<script language=\"JavaScript\">self.location.hash = '#image". $anchor ."';</script>\n";
 
    } // showPhotoIndex()
 
-   public function showBubbleDetails($photo, $direction)
-   {
-      if($direction == "up")
-         $direction = "bubbleimg_up";
-      else
-         $direction = "bubbleimg_down";
-
-      $details = $this->get_photo_details($photo);
-
-      $image_url = "phpfspot_img.php?idx=". $photo ."&amp;width=". $this->cfg->bubble_width;
-
-      $filesize = filesize($this->translate_path($details['directory_path'])  ."/". $details['name']);
-      $filesize = rand($filesize/1024, 2);
-
-      $img = getimagesize($this->translate_path($details['directory_path'])  ."/". $details['name']);
-
-      $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()
-
    public function showCredits()
    {
       $this->tmpl->assign('version', $this->cfg->version);
@@ -408,69 +706,107 @@ class PHPFSPOT {
 
    } // showCredits()
 
-   public function create_thumbnail($image, $width)
+   public function create_thumbnail($orig_image, $thumb_image, $width)
    {  
-      if(!file_exists($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($image);
+      $meta = $this->get_meta_informations($orig_image);
 
       $rotate = 0;
       $flip = false;
 
       switch($meta['Orientation']) {
 
-         case 1:
+         case 1: /* top, left */
             $rotate = 0; $flip = false; break;
-         case 2:
+         case 2: /* top, right */
             $rotate = 0; $flip = true; break;
-         case 3:
+         case 3: /* bottom, left */
             $rotate = 180; $flip = false; break;
-         case 4:
+         case 4: /* bottom, right */
             $rotate = 180; $flip = true; break;
-         case 5:
+         case 5: /* left side, top */
             $rotate = 90; $flip = true; break;
-         case 6:
+         case 6: /* right side, top */
             $rotate = 90; $flip = false; break;
-         case 7:
+         case 7: /* left side, bottom */
             $rotate = 270; $flip = true; break;
-         case 8:
+         case 8: /* right side, bottom */
             $rotate = 270; $flip = false; break;
       }
 
-      $src_img = @imagecreatefromjpeg($image);
+      $src_img = @imagecreatefromjpeg($orig_image);
 
       if(!$src_img) {
-         print "Can't load image from ". $image ."\n";
+         print "Can't load image from ". $orig_image ."\n";
          return false;
       }
 
       /* 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,
       // do not generate a thumbnail
 
-      if($width >= $new_w) {
+      if($width >= $cur_width) {
          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 */
-      $aspect_ratio = $new_h / $new_w;
+      $aspect_ratio = $cur_height / $cur_width;
 
       /* 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);
+      $dst_img = imagecreatetruecolor($new_w, $new_h);
 
       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) {
@@ -482,29 +818,19 @@ class PHPFSPOT {
       }
 
       if($rotate) {
-         print "(ROTATE)";
+         $this->_debug("(ROTATE)");
          $dst_img = $this->rotateImage($dst_img, $rotate);
       }
 
       /* write down new generated file */
-
-      if(!file_exists(dirname($image) ."/thumbs")) {
-         $result = mkdir(dirname($image) ."/thumbs");
-         if($result === false) {
-            print "Can't create thumb directory ". dirname($image) ."/thumbs\n";
-            return false;
-         }
-      }
-
-      $newfile = dirname($image) ."/thumbs/". $width ."_". basename($image);
-      $result = imagejpeg($dst_img, $newfile, 75);
+      $result = imagejpeg($dst_img, $thumb_image, 75);
 
       /* free your mind */
       imagedestroy($dst_img);
       imagedestroy($src_img);
 
       if($result === false) {
-         print "Can't write thumbnail ". $newfile ."\n";
+         print "Can't write thumbnail ". $thumb_image ."\n";
          return false;
       }
 
@@ -532,45 +858,79 @@ class PHPFSPOT {
 
    } // check_config_table
 
-   public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
+   /**
+    * Generates a thumbnail from photo idx
+    *
+    * This function will generate JPEG thumbnails from provided F-Spot photo
+    * indizes.
+    *
+    * 1. Check if all thumbnail generations (width) are already in place and
+    *    readable
+    * 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)
    {
+      $error = 0;
+
+      $resolutions = Array(
+         $this->cfg->thumb_width,
+         $this->cfg->photo_width,
+         $this->cfg->mini_width,
+      );
+
+      /* get details from F-Spot's database */
       $details = $this->get_photo_details($idx);
 
+      /* calculate file MD5 sum */
       $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->_warning("File ". $full_path ." does not exist\n");
+         return;
+      }
 
-      /* if the file hasn't changed there is no need to regen the thumb */
-      if(!$force && $file_md5 == $this->getMD5($idx)) {
-         if($fromcmd) print " file has not changed - skipping\n";
+      if(!is_readable($full_path)) {
+         $this->_warning("File ". $full_path ." is not readable for ". $this->getuid() ."\n");
          return;
       }
 
-      $resolutions = Array(
-         $this->cfg->thumb_width,
-         $this->cfg->bubble_width,
-         $this->cfg->photo_width
-      );
-      
-      $error = 0;
+      $file_md5 = md5_file($full_path);
+
+      $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
 
-      /* create thumbnails for the requested resolutions */
       foreach($resolutions as $resolution) {
-         if($fromcmd) print " ". $resolution ."px";
-         if(!$this->create_thumbnail($full_path, $resolution))
-            $error = 1;
+
+         $thumb_path = $this->cfg->base_path ."/thumbs/". $resolution ."_". $file_md5;
+
+         /* 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;
+         }
+
+         /* if the file hasn't changed there is no need to regen the thumb */
+         elseif($file_md5 != $this->getMD5($idx) || $force) {
+
+            $this->_debug(" ". $resolution ."px");
+            if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
+               $error = 1;
+
+         }
       }
 
       /* set the new/changed MD5 sum for the current photo */
-      if(!$error)
+      if(!$error) {
          $this->setMD5($idx, $file_md5);
+      }
 
-      if($fromcmd) print "\n";
+      $this->_debug("\n");
 
    } // gen_thumb()
 
-   private function getMD5($idx)
+   public function getMD5($idx)
    {
       $result = $this->cfg_db->db_query("
          SELECT img_md5 
@@ -601,11 +961,25 @@ class PHPFSPOT {
 
    } // setTagCondition()
 
-   public function startSearch($searchfor)
+   public function startTagSearch($searchfor)
    {
       $_SESSION['searchfor'] = $searchfor;
+      $_SESSION['selected_tags'] = Array();
+
+      foreach($this->avail_tags as $tag) {
+         if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+            array_push($_SESSION['selected_tags'], $tag);
+      }
+
+      $this->resetDateSearch();
 
-   } // startSearch()
+   } // startTagSearch()
+
+   public function startDateSearch($from, $to)
+   {
+      $_SESSION['from_date'] = $from;
+      $_SESSION['to_date'] = $to;
+   }
 
    private function rotateImage($img, $degrees)
    {
@@ -696,6 +1070,267 @@ class PHPFSPOT {
 
    } // get_photo_tags()
 
+   public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
+   {
+      if (strlen($color) != 6) 
+         $color = 000000;
+
+      $int = hexdec($color);
+      $h = imagefontheight($font);
+      $fw = imagefontwidth($font);
+      $txt = explode("\n", wordwrap($txt, ($w / $fw), "\n"));
+      $lines = count($txt);
+      $im = imagecreate($w, (($h * $lines) + ($lines * $space)));
+      $bg = imagecolorallocate($im, 255, 255, 255);
+      $color = imagecolorallocate($im, 0xFF & ($int >> 0x10), 0xFF & ($int >> 0x8), 0xFF & $int);
+      $y = 0;
+
+      foreach ($txt as $text) {
+         $x = (($w - ($fw * strlen($text))) / 2);
+         imagestring($im, $font, $x, $y, $text, $color);
+         $y += ($h + $space);
+      }
+
+      Header("Content-type: image/png");
+      ImagePng($im);
+
+   } // showTextImage()
+
+   private function checkRequirements()
+   {
+      if(!function_exists("imagecreatefromjpeg")) {
+         print "PHP GD library extension is missing<br />\n";
+         $missing = true;
+      }
+
+      if(!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()
+
+   public function checkifImageSupported($mime)
+   {
+      if(in_array($mime, Array("image/jpeg")))
+         return true;
+
+      return false;
+
+   } // checkifImageSupported()
+
+   public function _warning($text)
+   {
+      print "<img src=\"resources/green_info.png\" alt=\"warning\" />\n";
+      print $text;
+
+   } // _warning()
+
+   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");
+
+      $output = "<input type=\"text\" size=\"3\" id=\"". $mode ."year\" value=\"". $year ."\" />\n";
+      $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."month\" value=\"". $month ."\" />\n";
+      $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."day\" value=\"". $day ."\" />\n";
+      return $output;
+
+   } // get_calendar()
+
+   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()
+
+   public function getExport($mode)
+   {
+      $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;
+         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 = $protocol ."://". $server_name . $this->cfg->web_path ."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;
+         }
+
+      }
+
+   } // getExport()
+
+   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()
+
+   public function getCurrentPhoto()
+   {
+      if(isset($_SESSION['current_photo'])) {
+         print $_SESSION['current_photo'];
+      }
+   } // getCurrentPhoto()
+
+   public function whatToDo()
+   {
+      if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
+         return "showpi_tags";
+      }
+      elseif(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
+         return "showpi_date";
+      }
+      elseif(isset($_SESSION['current_photo'])) {
+         return "show_photo";
+      }
+      elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') {
+         return "showpi";
+      }
+
+      return "nothing special";
+
+   } // whatToDo()
+
+   private function getuid()
+   {
+      if($uid = posix_getuid()) {
+         if($user = posix_getpwuid($uid)) {
+            return $user['name'];
+         }
+      }
+   
+      return 'n/a';
+   
+   } // getuid()
+
 }
 
 ?>