X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=7bccc9e8672489dd294d2c538c9ba1dc03e00230;hp=e4ca4ffa9cde084ac3b7d6561e566a0e18e1994c;hb=2e0916a4507be603c5060ba66567ddaf4dbd87b2;hpb=ae3e56961cdc914f315c54b1e2918aa35b638221

diff --git a/phpfspot.class.php b/phpfspot.class.php
index e4ca4ff..7bccc9e 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -19,11 +19,19 @@ class PHPFSPOT {
       $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();
+
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
       $this->get_tags();
 
+      session_start();
+
+      if(!isset($_SESSION['tag_condition']))
+         $_SESSION['tag_condition'] = 'or';
+
    } // __construct()
 
    public function __destruct()
@@ -34,6 +42,7 @@ class PHPFSPOT {
    public function show()
    {
       $this->tmpl->assign('page_title', $this->cfg->page_title);
+      $this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
       $this->tmpl->show("index.tpl");
 
    } // show()
@@ -54,6 +63,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;
 
@@ -111,6 +124,7 @@ class PHPFSPOT {
       $this->tmpl->assign('madewith', $meta['Make'] ." ". $meta['Model']);
       $this->tmpl->assign('image_name', $details['name']);
       $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
+      $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
 
       if($previous_img) {
          $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -184,14 +198,49 @@ class PHPFSPOT {
          foreach($_SESSION['selected_tags'] as $tag)
             $selected.= $tag .",";
          $selected = substr($selected, 0, strlen($selected)-1);
-         $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
-         ");
+
+         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']);
+            }
+         }
       }
       else {
          $result = $this->db->db_query("
@@ -201,10 +250,9 @@ class PHPFSPOT {
                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']);
+         while($row = $this->db->db_fetch_object($result)) {
+            array_push($tagged_photos, $row['photo_id']);
+         }
       }
 
       return $tagged_photos;
@@ -258,7 +306,7 @@ class PHPFSPOT {
 
       $details = $this->get_photo_details($photo);
 
-      $image_url = "phpfspot_img.php?idx=". $photo ."&width=200";
+      $image_url = "phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->bubble_width;
 
       $filesize = filesize($this->translate_path($details['directory_path'])  ."/". $details['name']);
       $filesize = rand($filesize/1024, 2);
@@ -283,7 +331,7 @@ class PHPFSPOT {
 
    } // showCredits()
 
-   public function resize_image($image, $width)
+   public function create_thumbnail($image, $width)
    {  
       // if thumbnail already exists, don't recreate it
       if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image)))
@@ -333,7 +381,7 @@ class PHPFSPOT {
          imagedestroy($src_img);
       }
 
-   } // resize_image()
+   } // create_thumbnail()
 
    public function get_meta_informations($file)
    {
@@ -342,6 +390,96 @@ class PHPFSPOT {
 
    } // get_meta_informations()
 
+   public function check_config_table()
+   {
+      // if the config table doesn't exist yet, create it
+      if(!$this->cfg_db->db_check_table_exists("images")) {
+         $this->cfg_db->db_exec("
+            CREATE TABLE images (
+               img_idx int primary key,
+               img_md5 varchar(32)
+            )
+            ");
+      }
+
+   } // check_config_table
+
+   public function gen_thumbs($idx = 0, $fromcmd = 0)
+   {
+      if(!$idx) {
+         /* get all available photos */
+         $all = $this->getAllTagPhotos();
+      }
+      else
+         $all = Array($idx);
+      
+      foreach($all as $photo) {
+
+         $details = $this->get_photo_details($photo);
+
+         $full_path = $this->translate_path($details['directory_path'])  ."/". $details['name'];
+         $file_md5 = md5_file($full_path);
+
+         if($fromcmd) print "Image ". $details['name'] ." Thumbnails:";
+
+         /* if the file hasn't changed there is no need to regen the thumb */
+         if($file_md5 == $this->getMD5($photo)) {
+            if($fromcmd) print " file has not changed - skipping\n";
+            continue;
+         }
+
+         /* set the new/changed MD5 sum for the current photo */
+         $this->setMD5($photo, $file_md5);
+
+         $resolutions = Array(
+                           $this->cfg->thumb_width,
+                           $this->cfg->bubble_width,
+                           $this->cfg->photo_width
+                        );
+
+         /* create thumbnails for the requested resolutions */
+         foreach($resolutions as $resolution) {
+            if($fromcmd) print " ". $resolution ."px";
+            $this->create_thumbnail($full_path, $resolution);
+         }
+
+         if($fromcmd) print "\n";
+
+      }
+
+   } // gen_thumbs()
+
+   private function getMD5($idx)
+   {
+      $result = $this->cfg_db->db_query("
+         SELECT img_md5 
+         FROM images
+         WHERE img_idx='". $idx ."'
+      ");
+
+      if(!$result)
+         return 0;
+
+      $img = $this->cfg_db->db_fetch_object($result);
+      return $img['img_md5'];
+      
+   } // getMD5()
+
+   private function setMD5($idx, $md5)
+   {
+      $result = $this->cfg_db->db_exec("
+         REPLACE INTO images (img_idx, img_md5)
+         VALUES ('". $idx ."', '". $md5 ."')
+      ");
+
+   } // setMD5()
+
+   public function setTagCondition($mode)
+   {
+      $_SESSION['tag_condition'] = $mode;
+
+   } // setTagCondition()
+
 }
 
 ?>