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

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 3f7a728..7bccc9e 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -27,6 +27,11 @@ class PHPFSPOT {
 
       $this->get_tags();
 
+      session_start();
+
+      if(!isset($_SESSION['tag_condition']))
+         $_SESSION['tag_condition'] = 'or';
+
    } // __construct()
 
    public function __destruct()
@@ -37,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()
@@ -57,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;
 
@@ -188,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("
@@ -205,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;
@@ -430,6 +474,12 @@ class PHPFSPOT {
 
    } // setMD5()
 
+   public function setTagCondition($mode)
+   {
+      $_SESSION['tag_condition'] = $mode;
+
+   } // setTagCondition()
+
 }
 
 ?>