we check now for file changes with md5 sums.
[phpfspot.git] / phpfspot.class.php
index c954a3ac95f35625531dc8f3fdc3435610195bf3..0095ca819b13157c4e971acaecb907db3a42296b 100644 (file)
@@ -121,7 +121,7 @@ class PHPFSPOT {
       $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']);
-
+   
       $this->tmpl->assign('width', $info[0]);
       $this->tmpl->assign('height', $info[1]);
       $this->tmpl->assign('c_date', $meta['DateTime']);
@@ -150,7 +150,7 @@ class PHPFSPOT {
             continue;
 
          // return all available (= not selected) tags
-         print "<a href=\"javascript:Tags('add', ". $tag .");\">". $this->tags[$tag] ."</a>&nbsp;";
+         print "<a href=\"javascript:Tags('add', ". $tag .");\" class=\"tag\">". $this->tags[$tag] ."</a>&nbsp;";
 
       }
 
@@ -162,7 +162,7 @@ class PHPFSPOT {
       {
          // return all selected tags
          if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) {
-            print "<a href=\"javascript:Tags('del', ". $tag .");\">". $this->tags[$tag] ."</a>&nbsp;";
+            print "<a href=\"javascript:Tags('del', ". $tag .");\" class=\"tag\">". $this->tags[$tag] ."</a>&nbsp;";
          }
 
       }
@@ -183,6 +183,7 @@ class PHPFSPOT {
       if(isset($_SESSION['selected_tags'])) {
          $key = array_search($tag, $_SESSION['selected_tags']);
          unset($_SESSION['selected_tags'][$key]);
+         sort($_SESSION['selected_tags']);
       }
 
    } // delTag()
@@ -231,38 +232,40 @@ class PHPFSPOT {
                WHERE pt.tag_id IN (". $selected .")
                ORDER BY p.time ASC
             ");
-            while($row = $this->db->db_fetch_object($result)) {
-               array_push($tagged_photos, $row['photo_id']);
-            }
          }
          elseif($_SESSION['tag_condition'] == 'and') {
-            $result = $this->db->db_query("
-               SELECT DISTINCT photo_id, tag_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
-            ");
 
-            /* now we need to check if each object fulfills the condition
-               and has all the selected tags assigned
+            /* Join together a table looking like
+
+               pt1.photo_id pt1.tag_id pt2.photo_id pt2.tag_id ...
+
+               so the query can quickly return all images matching the
+               selected tags in an AND condition
+
             */
-            $match_object = Array();
-            $matches_needed = count($_SESSION['selected_tags']);
-            while($row = $this->db->db_fetch_object($result)) {
-               /* set the counter for this object */
-               if(!isset($match_object[$row['photo_id']]))
-                  $match_object[$row['photo_id']] = $matches_needed;
-               
-               /* we have a match? decrement the counter */
-               if(in_array($row['tag_id'], $_SESSION['selected_tags']))
-                  $match_object[$row['photo_id']]--;
 
-               /* if the object has all necessary tags, add it to the result */
-               if($match_object[$row['photo_id']] == 0)
-                  array_push($tagged_photos, $row['photo_id']);
+            $query_str = "
+               SELECT DISTINCT pt1.photo_id
+                  FROM photo_tags pt1
+            ";
+
+            for($i = 0; $i < count($_SESSION['selected_tags']); $i++) {
+               $query_str.= "
+                  INNER JOIN photo_tags pt". ($i+2) ."
+                     ON pt1.photo_id=pt". ($i+2) .".photo_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] ."
+               "; 
             }
+            $result = $this->db->db_query($query_str);
+         }
+
+         while($row = $this->db->db_fetch_object($result)) {
+            array_push($tagged_photos, $row['photo_id']);
          }
          return $tagged_photos;
       }
@@ -358,9 +361,53 @@ class PHPFSPOT {
 
    public function create_thumbnail($image, $width)
    {  
-      // if thumbnail already exists, don't recreate it
-      if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image)))
-         return;
+      $meta = $this->get_meta_informations($image);
+
+      $rotate = 0;
+      $flip = false;
+
+      switch($meta['Orientation']) {
+
+         case 1:
+            $rotate = 0;
+            $flip = false;
+            break;
+
+         case 2:
+            $rotate = 0;
+            $flip = true;
+            break;
+
+         case 3:
+            $rotate = 180;
+            $flip = false;
+            break;
+
+         case 4:
+            $rotate = 180;
+            $flip = true;
+            break;
+
+         case 5:
+            $rotate = 90;
+            $flip = true;
+            break;
+
+         case 6:
+            $rotate = 90;
+            $flip = false;
+            break;
+
+         case 7:
+            $rotate = 270;
+            $flip = true;
+            break;
+
+         case 8:
+            $rotate = 270;
+            $flip = false;
+            break;
+      }
 
       $src_img = @imagecreatefromjpeg($image);
 
@@ -393,6 +440,20 @@ class PHPFSPOT {
          /* 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));
 
+         /* needs the image to be flipped horizontal? */
+         if($flip) {
+            print "(FLIP)";
+            $image = $dst_img;
+            for($x = 0; $x < $new_w; $x++) {
+               imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
+            }
+         }
+
+         if($rotate) {
+            print "(ROTATE)";
+            $dst_img = $this->rotateImage($dst_img, $rotate);
+         }
+
          /* write down new generated file */
 
          if(!file_exists(dirname($image) ."/thumbs"))
@@ -410,7 +471,6 @@ class PHPFSPOT {
 
    public function get_meta_informations($file)
    {
-
       return exif_read_data($file);
 
    } // get_meta_informations()
@@ -511,6 +571,76 @@ class PHPFSPOT {
 
    } // startSearch()
 
+   private function rotateImage($img, $degrees)
+   {
+      if(function_exists("imagerotate"))
+         $img = imagerotate($img, $degrees, 0);
+      else
+      {
+         function imagerotate($src_img, $angle)
+         {
+            $src_x = imagesx($src_img);
+            $src_y = imagesy($src_img);
+            if ($angle == 180) {
+               $dest_x = $src_x;
+               $dest_y = $src_y;
+            }
+            elseif ($src_x <= $src_y) {
+               $dest_x = $src_y;
+               $dest_y = $src_x;
+            }
+            elseif ($src_x >= $src_y) {
+               $dest_x = $src_y;
+               $dest_y = $src_x;
+            }
+               
+            $rotate=imagecreatetruecolor($dest_x,$dest_y);
+            imagealphablending($rotate, false);
+               
+            switch ($angle) {
+            
+               case 90:
+                  for ($y = 0; $y < ($src_y); $y++) {
+                     for ($x = 0; $x < ($src_x); $x++) {
+                        $color = imagecolorat($src_img, $x, $y);
+                        imagesetpixel($rotate, $dest_x - $y - 1, $x, $color);
+                     }
+                  }
+                  break;
+
+               case 270:
+                  for ($y = 0; $y < ($src_y); $y++) {
+                     for ($x = 0; $x < ($src_x); $x++) {
+                        $color = imagecolorat($src_img, $x, $y);
+                        imagesetpixel($rotate, $y, $dest_y - $x - 1, $color);
+                     }
+                  }
+                  break;
+
+               case 180:
+                  for ($y = 0; $y < ($src_y); $y++) {
+                     for ($x = 0; $x < ($src_x); $x++) {
+                        $color = imagecolorat($src_img, $x, $y);
+                        imagesetpixel($rotate, $dest_x - $x - 1, $dest_y - $y - 1, $color);
+                     }
+                  }
+                  break;
+
+               default: $rotate = $src_img;
+            };
+
+            return $rotate;
+
+         }
+
+         $img = imagerotate($img, $degrees);
+
+      }
+
+      return $img;
+
+   } // rotateImage()
+
 }
 
 ?>