X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=9d159ff3ff02e09d46c374d50a0a23d1ccb89d87;hp=0a59d96c6eb804fc29fce69bc27a486815b00ddb;hb=4b243ea6dcf859c392ec52aad66a580c99fe2bb0;hpb=e00eef0a999c366bbfb7912841bd845f659af649

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 0a59d96..9d159ff 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -16,10 +16,14 @@ class PHPFSPOT {
 
    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);
       $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
       $this->check_config_table();
 
@@ -35,6 +39,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 +55,24 @@ 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']);
+
+      switch($_GET['mode']) {
+         case 'showpi':
+            if(isset($_GET['tags'])) {
+               $_SESSION['selected_tags'] = split(',', $_GET['tags']);
+            }
+            break;
+      }
+
+      $this->tmpl->assign('content_page', 'welcome.tpl');
       $this->tmpl->show("index.tpl");
 
+
    } // show()
 
    private function get_tags()
    {
+   
       $this->avail_tags = Array();
       $count = 0;
    
@@ -101,19 +121,24 @@ 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;
          }
       }
 
@@ -122,20 +147,25 @@ class PHPFSPOT {
       $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
 
       if(!file_exists($orig_path)) {
-         print "Photo ". $orig_path ." does not exist!<br />\n";
+         $this->_warning("Photo ". $orig_path ." does not exist!<br />\n");
       }
 
       if(!is_readable($orig_path)) {
-         print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\n";
+         $this->_warning("Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\n");
       }
 
       /* 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);
       }
 
       $meta = $this->get_meta_informations($orig_path);
 
+      $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_res  = isset($meta['ExifImageWidth']) ?  $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'] : "n/a";
+      $meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a";
+
       if(file_exists($thumb_path)) {
 
          $info = getimagesize($thumb_path);
@@ -145,18 +175,19 @@ class PHPFSPOT {
 
          $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('current', $current);
       }
       else {
-         print "Can't open file ". $thumb_path ."\n";
+         $this->_warning("Can't open file ". $thumb_path ."\n");
       }
 
       if($previous_img) {
@@ -265,6 +296,12 @@ class PHPFSPOT {
 
    } // resetTags()
 
+   public function resetTagSearch()
+   {
+      unset($_SESSION['searchfor']);
+
+   } // resetTagSearch()
+
    public function getPhotoSelection()
    {  
       $tagged_photos = Array();
@@ -362,15 +399,38 @@ class PHPFSPOT {
 
       $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(!isset($this->cfg->rows_per_page) || $this->cfg->rows_per_page == 0) {
 
-      if($this->cfg->rows_per_page == 0)
+         $begin_with = 0;
          $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);
+      }
 
    
       $rows = 0;
@@ -378,10 +438,12 @@ class PHPFSPOT {
       $images[$rows] = Array();
       $img_height[$rows] = Array();
       $img_width[$rows] = Array();
+      $img_id[$rows] = Array();
 
       for($i = $begin_with; $i < $end_with; $i++) {
 
          $images[$rows][$cols] = $photos[$i];
+         $img_id[$rows][$cols] = $i;
 
          $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]);
 
@@ -410,6 +472,8 @@ class PHPFSPOT {
          $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
 
       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);
 
@@ -417,17 +481,73 @@ class PHPFSPOT {
             $this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");"); 
          if($end_with < $count)
             $this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");"); 
+
+         /* page selector */
+         $photo_per_page  = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row;
+
+         /* until 6 pages we show the selector from 1-6
+            everything large will be
+            1 ... 2 3 4 (5) 6 7 ... 9
+         */ 
+         $last_page = ceil($count / $photo_per_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 = "";
+
+            $page_select.= "<a href=\"javascript:showPhotoIndex(". (($i*$photo_per_page)-$photo_per_page) .");\"";
+            if($style != "")
+               $page_select.= $style;
+            $page_select.= ">". $i ."</a>&nbsp;";
+
+         }
+
+         /* 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 = "";
+      if($_SESSION['selected_tags'] != "") {
+         foreach($_SESSION['selected_tags'] as $tag)
+            $current_tags.= $tag .",";
+         $current_tags = substr($current_tags, 0, strlen($current_tags)-1);
+      }
+
+      $extern_link = "http://". $_SERVER['SERVER_NAME'] ."/index.php?mode=showpi&tags=". $current_tags;
+
+      $this->tmpl->assign('extern_link', $extern_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('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()
 
@@ -447,12 +567,12 @@ class PHPFSPOT {
       $filesize = rand($filesize/1024, 2);
 
       if(!file_exists($orig_path)) {
-         print "Photo ". $orig_path ." does not exist!<br />\n";
+         $this->_warning("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";
+         $this->_warning("Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\n");
          return;
       }
 
@@ -481,6 +601,12 @@ class PHPFSPOT {
       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);
 
       $rotate = 0;
@@ -514,23 +640,39 @@ class PHPFSPOT {
       }
 
       /* 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;
       }
 
       /* 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);
+      }
 
       /* creates new image of that size */
       $dst_img = imagecreatetruecolor($new_w, $new_h);
@@ -550,7 +692,7 @@ class PHPFSPOT {
       }
 
       if($rotate) {
-         print "(ROTATE)";
+         $this->_debug("(ROTATE)");
          $dst_img = $this->rotateImage($dst_img, $rotate);
       }
 
@@ -601,21 +743,35 @@ class PHPFSPOT {
     * 2. Check if the md5sum of the original file has changed
     * 3. Generate the thumbnails if needed
     */
-   public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
+   public function gen_thumb($idx = 0, $force = 0)
    {
+      $error = 0;
+
       $resolutions = Array(
          $this->cfg->thumb_width,
          $this->cfg->bubble_width,
          $this->cfg->photo_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;
+      }
 
-      $error = 0;
+      if(!is_readable($full_path)) {
+         $this->_warning("File ". $full_path ." is not readable for ". get_current_user() ."\n");
+         return;
+      }
+
+      $file_md5 = md5_file($full_path);
+
+      $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
 
       foreach($resolutions as $resolution) {
 
@@ -624,16 +780,15 @@ class PHPFSPOT {
          /* 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 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;
 
@@ -641,10 +796,11 @@ class PHPFSPOT {
       }
 
       /* 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()
 
@@ -780,7 +936,7 @@ class PHPFSPOT {
 
    } // get_photo_tags()
 
-   function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
+   public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
    {
       if (strlen($color) != 6) 
          $color = 000000;
@@ -806,6 +962,58 @@ class PHPFSPOT {
 
    } // 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)) {
+         print "PEAR HTML_AJAX 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()
+
 }
 
 ?>