X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=0dea249a6a56cf037fba99b2d6006f37b113216a;hp=3f7a7280253b04cdd44110ee3188ee7560610882;hb=b4b0a0aa7c7e8a598e296f42a55e96d614abff05;hpb=082eccbfa232173126225daae427ef6a1832338e

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 3f7a728..0dea249 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -27,6 +27,14 @@ class PHPFSPOT {
 
       $this->get_tags();
 
+      session_start();
+
+      if(!isset($_SESSION['tag_condition']))
+         $_SESSION['tag_condition'] = 'or';
+
+      if(!isset($_SESSION['searchfor']))
+         $_SESSION['searchfor'] = '';
+
    } // __construct()
 
    public function __destruct()
@@ -36,7 +44,9 @@ class PHPFSPOT {
 
    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->show("index.tpl");
 
    } // show()
@@ -57,6 +67,10 @@ class PHPFSPOT {
          $tag_id = $row['id'];
          $tag_name = $row['name'];
 
+         /* check if config requests to ignore this tag */
+         if(in_array($row['name'], $this->cfg->hide_tags))
+            continue;
+
          $this->tags[$tag_id] = $tag_name; 
          $this->avail_tags[$count] = $tag_id;
 
@@ -86,7 +100,7 @@ class PHPFSPOT {
 
    public function showPhoto($photo)
    {
-      $all_photos = $this->getAllTagPhotos();
+      $all_photos = $this->getPhotoSelection();
 
       foreach($all_photos as $all_photo) {
          
@@ -107,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']);
@@ -136,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;";
 
       }
 
@@ -148,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;";
          }
 
       }
@@ -169,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()
@@ -179,45 +194,99 @@ class PHPFSPOT {
 
    } // resetTags()
 
-   public function getAllTagPhotos()
+   public function getPhotoSelection()
    {  
       $tagged_photos = Array();
 
-      if(isset($_SESSION['selected_tags'])) {
-         $selected = "";
-         foreach($_SESSION['selected_tags'] as $tag)
-            $selected.= $tag .",";
-         $selected = substr($selected, 0, strlen($selected)-1);
+      /* return a search result */
+      if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
          $result = $this->db->db_query("
             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
+            INNER JOIN tags t
+               ON pt.tag_id=t.id
+            WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'
+               ORDER BY p.time ASC
          ");
+         while($row = $this->db->db_fetch_object($result)) {
+            array_push($tagged_photos, $row['photo_id']);
+         }
+         return $tagged_photos;
       }
-      else {
-         $result = $this->db->db_query("
-            SELECT DISTINCT photo_id
-               FROM photo_tags pt
-            INNER JOIN photos p
-               ON p.id=pt.photo_id
-            ORDER BY p.time ASC
-         ");
+
+      /* return according the selected tags */
+      if(isset($_SESSION['selected_tags'])) {
+         $selected = "";
+         foreach($_SESSION['selected_tags'] as $tag)
+            $selected.= $tag .",";
+         $selected = substr($selected, 0, strlen($selected)-1);
+
+         if($_SESSION['tag_condition'] == 'or') {
+            $result = $this->db->db_query("
+               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
+            ");
+            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
+            */
+            $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']);
+            }
+         }
+         return $tagged_photos;
       }
 
+      /* return all available photos */
+      $result = $this->db->db_query("
+         SELECT DISTINCT photo_id
+            FROM photo_tags pt
+         INNER JOIN photos p
+            ON p.id=pt.photo_id
+         ORDER BY p.time ASC
+      ");
       while($row = $this->db->db_fetch_object($result)) {
          array_push($tagged_photos, $row['photo_id']);
       }
-
       return $tagged_photos;
 
-   } // getAllTagPhotos()
+   } // getPhotoSelection()
 
    public function showPhotoIndex()
    {
-      $photos = $this->getAllTagPhotos();
+      $photos = $this->getPhotoSelection();
+
       $count = count($photos);
 
       $rows = 0;
@@ -241,7 +310,8 @@ class PHPFSPOT {
       // +1 for for smarty's selection iteration
       $rows++;
 
-         //$images.= "<img src=\"phpfspot_img.php?idx=". $photo ."&amp;width=". $this->cfg->thumb_width ."\" /><br />\n";
+      if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
+         $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
 
       $this->tmpl->assign('count', $count);
       $this->tmpl->assign('width', $this->cfg->thumb_width);
@@ -293,6 +363,54 @@ class PHPFSPOT {
       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);
 
       if($src_img)
@@ -324,6 +442,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"))
@@ -341,7 +473,6 @@ class PHPFSPOT {
 
    public function get_meta_informations($file)
    {
-
       return exif_read_data($file);
 
    } // get_meta_informations()
@@ -364,7 +495,7 @@ class PHPFSPOT {
    {
       if(!$idx) {
          /* get all available photos */
-         $all = $this->getAllTagPhotos();
+         $all = $this->getPhotoSelection();
       }
       else
          $all = Array($idx);
@@ -430,6 +561,88 @@ class PHPFSPOT {
 
    } // setMD5()
 
+   public function setTagCondition($mode)
+   {
+      $_SESSION['tag_condition'] = $mode;
+
+   } // setTagCondition()
+
+   public function startSearch($searchfor)
+   {
+      $_SESSION['searchfor'] = $searchfor;
+
+   } // 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()
+
 }
 
 ?>