switch version to 1.5 and update CHANGELOG, README and UPDATE

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index eb2312bf709a9b5ff0302d4538fa18480e6c2a1b..bae4ae74dbc40ce34899bb4270397a3860000abf 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -122,7 +122,7 @@ class PHPFSPOT {
 
       /* set application name and version information */
       $this->cfg->product = "phpfspot";
 
       /* set application name and version information */
       $this->cfg->product = "phpfspot";

-      $this->cfg->version = "1.4";
+      $this->cfg->version = "1.5";

 
       $this->sort_orders= array(
          'date_asc' => 'Date ↑',
 
       $this->sort_orders= array(
          'date_asc' => 'Date ↑',


@@ -767,10 +767,15 @@ class PHPFSPOT {
       if(isset($_SESSION['searchfor_tag']))
          unset($_SESSION['searchfor_tag']);
 
       if(isset($_SESSION['searchfor_tag']))
          unset($_SESSION['searchfor_tag']);
 

+      // has the user requested to hide this tag, and still someone,
+      // somehow tries to add it, don't allow this.
+      if(!isset($this->cfg->hide_tags) &&
+         in_array($this->get_tag_name($tag), $this->cfg->hide_tags))
+         return "ok";
+

       if(!in_array($tag, $_SESSION['selected_tags']))
          array_push($_SESSION['selected_tags'], $tag);
 
       if(!in_array($tag, $_SESSION['selected_tags']))
          array_push($_SESSION['selected_tags'], $tag);
 

-

       return "ok";
    
    } // addTag()
       return "ok";
    
    } // addTag()


@@ -1337,7 +1342,7 @@ class PHPFSPOT {
    } // showCredits()
 
    /**
    } // showCredits()
 
    /**

-    * create_thumbnails for the requested width
+    * 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
     *
     * this function creates image thumbnails of $orig_image
     * stored as $thumb_image. It will check if the image is


@@ -1354,13 +1359,13 @@ class PHPFSPOT {
          return false;
       }
 
          return false;
       }
 

-      $details = getimagesize($orig_image);
-      
+      $mime = $this->get_mime_info($orig_image);
+

       /* check if original photo is a support image type */
       /* check if original photo is a support image type */

-      if(!$this->checkifImageSupported($details['mime']))
+      if(!$this->checkifImageSupported($mime))

          return false;
 
          return false;
 

-      switch($details['mime']) {
+      switch($mime) {

 
          case 'image/jpeg':
 
 
          case 'image/jpeg':
 


@@ -1399,27 +1404,23 @@ class PHPFSPOT {
             $handler = "gd";
             break;
 
             $handler = "gd";
             break;
 

-         case 'image/tiff':
+         case 'image/x-portable-pixmap':

 
             $src_img = new Imagick($orig_image);
 
             $src_img = new Imagick($orig_image);

-            print_r($src_img->queryFormats());
-            

             $handler = "imagick";
             $handler = "imagick";

-            exit(1);

             break;
 
       }
 
             break;
 
       }
 

+      if(!isset($src_img) || empty($src_img)) {
+         print "Can't load image from ". $orig_image ."\n";
+         return false;
+      }

 
       switch($handler) {
 
          case 'gd':
 
 
       switch($handler) {
 
          case 'gd':
 

-            if(!isset($src_img) || empty($src_img)) {
-               print "Can't load image from ". $orig_image ."\n";
-               return false;
-            }
-

             /* grabs the height and width */
             $cur_width = imagesx($src_img);
             $cur_height = imagesy($src_img);
             /* grabs the height and width */
             $cur_width = imagesx($src_img);
             $cur_height = imagesy($src_img);


@@ -1433,45 +1434,71 @@ class PHPFSPOT {
                imagedestroy($src_img);
                return true;
             }
                imagedestroy($src_img);
                return true;
             }

+            break;

 
 

-            // 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;
-            }
+         case 'imagick':

 
 

-            /* calculates aspect ratio */
-            $aspect_ratio = $cur_height / $cur_width;
+            $cur_width = $src_img->getImageWidth();
+            $cur_height = $src_img->getImageHeight();

 
 

-            /* sets new size */
-            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;
-               }
+            // If requested width is more then the actual image width,
+            // do not generate a thumbnail, instead safe the original
+            // as thumbnail but with lower quality. But if the image
+            // is to heigh too, then we still have to resize it.
+            if($width >= $cur_width && $cur_height < $this->cfg->thumb_height) {
+               $src_img->setCompressionQuality(75);
+               $src_img->setImageFormat('jpeg');
+               $src_img->writeImage($thumb_image);
+               $src_img->clear();
+               $src_img->destroy();
+               return true;

             }
             }

+            break;
+
+      }
+
+      // 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 = $cur_height / $cur_width;
+
+      /* sets new size */
+      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;
+         }
+      }
+
+      switch($handler) {
+
+         case 'gd':

 
             /* 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);


@@ -1515,6 +1542,38 @@ class PHPFSPOT {
 
          case 'imagick':
 
 
          case 'imagick':
 

+            $src_img->resizeImage($new_w, $new_h, Imagick::FILTER_LANCZOS, 1);
+
+            /* needs the image to be flipped horizontal? */
+            if($flip_hori) {
+               $this->_debug("(FLIP)");
+               $src_img->rotateImage(new ImagickPixel(), 90);
+               $src_img->flipImage();
+               $src_img->rotateImage(new ImagickPixel(), -90);
+            }
+            /* needs the image to be flipped vertical? */
+            if($flip_vert) {
+               $this->_debug("(FLIP)");
+               $src_img->flipImage();
+            }
+
+            if($rotate) {
+               $this->_debug("(ROTATE)");
+               $src_img->rotateImage(new ImagickPixel(), $rotate);
+            }
+
+            $src_img->setCompressionQuality(75);
+            $src_img->setImageFormat('jpeg');
+
+            if(!$src_img->writeImage($thumb_image)) {
+               print "Can't write thumbnail ". $thumb_image ."\n";
+               return false;
+            }
+
+            $src_img->clear();
+            $src_img->destroy();
+            return true;
+

             break;
 
       }
             break;
 
       }


@@ -1593,10 +1652,27 @@ class PHPFSPOT {
          return;
       }
 
          return;
       }
 

-      $file_md5 = md5_file($full_path);
-

       $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:");
 
       $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:");
 

+      /* If Nikon NEF format, we need to treat it another way */
+      if(isset($this->cfg->dcraw_bin) &&
+         file_exists($this->cfg->dcraw_bin) &&
+         is_executable($this->cfg->dcraw_bin) &&
+         preg_match('/\.nef$/i', $details['uri'])) {
+
+         $ppm_path = preg_replace('/\.nef$/i', '.ppm', $full_path);
+
+         /* if PPM file does not exist, let dcraw convert it from NEF */
+         if(!file_exists($ppm_path)) {
+            system($this->cfg->dcraw_bin ." -a ". $full_path);
+         }
+
+         /* for now we handle the PPM instead of the NEF */
+         $full_path = $ppm_path;
+
+      }
+
+      $file_md5 = md5_file($full_path);

       $changes = false;
 
       foreach($resolutions as $resolution) {
       $changes = false;
 
       foreach($resolutions as $resolution) {


@@ -1899,8 +1975,11 @@ class PHPFSPOT {
 
       $tags = Array();
 
 
       $tags = Array();
 

-      while($row = $this->db->db_fetch_object($result))
+      while($row = $this->db->db_fetch_object($result)) {
+         if(isset($this->cfg->hide_tags) && in_array($row['name'], $this->cfg->hide_tags))
+            continue;

          $tags[$row['id']] = $row['name'];
          $tags[$row['id']] = $row['name'];

+      }

 
       return $tags;
 
 
       return $tags;
 


@@ -2002,7 +2081,14 @@ class PHPFSPOT {
     */
    public function checkifImageSupported($mime)
    {
     */
    public function checkifImageSupported($mime)
    {

-      if(in_array($mime, Array("image/jpeg", "image/png", "image/tiff")))
+      $supported_types =  Array(
+         "image/jpeg",
+         "image/png",
+         "image/x-portable-pixmap",
+         "image/tiff"
+      );
+
+      if(in_array($mime, $supported_types))

          return true;
 
       return false;
          return true;
 
       return false;


@@ -2449,11 +2535,26 @@ class PHPFSPOT {
    {
       $all = Array();
 
    {
       $all = Array();
 

-      $result = $this->db->db_query("
-         SELECT id
-         FROM photos
-      ");
-      
+      $query_str = "
+         SELECT p.id
+         FROM photos p
+      ";
+
+      /* if show_tags is set, only return details for photos which
+         are specified to be shown
+      */
+      if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+         $query_str.= "
+            INNER JOIN photo_tags pt
+               ON p.id=pt.photo_id
+            INNER JOIN tags t
+               ON pt.tag_id=t.id
+            WHERE
+               t.name IN ('".implode("','",$this->cfg->show_tags)."')";
+      }
+
+      $result = $this->db->db_query($query_str);
+

       while($row = $this->db->db_fetch_object($result)) {
          array_push($all, $row['id']);
       }
       while($row = $this->db->db_fetch_object($result)) {
          array_push($all, $row['id']);
       }


@@ -2819,6 +2920,57 @@ class PHPFSPOT {
 
    } // getCurrentPage()
 
 
    } // getCurrentPage()
 

+   /**
+    * return mime info
+    *
+    * this function tries to find out the correct mime-type
+    * for the provided file.
+    * @param string $file
+    * @return string
+    */
+   public function get_mime_info($file)
+   {
+      $details = getimagesize($orig_image);
+
+      /* if getimagesize() returns empty, try at least to find out the
+         mime type.
+      */
+      if(empty($details) && function_exists('mime_content_type')) {
+
+         // mime_content_type is marked as deprecated in the documentation,
+         // but is it really necessary to force users to install a PECL
+         // extension?
+         $details['mime'] = mime_content_type($file);
+      }
+
+      return $details['mime'];
+
+   } // get_mime_info()
+
+   /**
+    * return tag-name by tag-idx
+    *
+    * this function returns the tag-name for the requested
+    * tag specified by tag-idx.
+    * @param integer $idx
+    * @return string
+    */
+   public function get_tag_name($idx)
+   {
+       if($result = $this->db->db_fetchSingleRow("
+         SELECT name
+         FROM tags
+         WHERE
+            id LIKE '". $idx ."'")) {
+
+         return $result['name'];
+
+      }
+
+      return 0;
+      
+   } // get_tag_name()
+

 } // class PHPFSPOT
 
 ?>
 } // class PHPFSPOT
 
 ?>