X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=c954a3ac95f35625531dc8f3fdc3435610195bf3;hp=f405626dc4f573f3f922f427e4512ed56457ead8;hb=46969d30b2966f33b0529435a5840d5289996799;hpb=7ca20d2b9cd665125a20a3d480694db0fde0afdc

diff --git a/phpfspot.class.php b/phpfspot.class.php
index f405626..c954a3a 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()
@@ -90,7 +100,7 @@ class PHPFSPOT {
 
    public function showPhoto($photo)
    {
-      $all_photos = $this->getAllTagPhotos();
+      $all_photos = $this->getPhotoSelection();
 
       foreach($all_photos as $all_photo) {
          
@@ -183,45 +193,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;
@@ -245,7 +309,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);
@@ -368,7 +433,7 @@ class PHPFSPOT {
    {
       if(!$idx) {
          /* get all available photos */
-         $all = $this->getAllTagPhotos();
+         $all = $this->getPhotoSelection();
       }
       else
          $all = Array($idx);
@@ -434,6 +499,18 @@ class PHPFSPOT {
 
    } // setMD5()
 
+   public function setTagCondition($mode)
+   {
+      $_SESSION['tag_condition'] = $mode;
+
+   } // setTagCondition()
+
+   public function startSearch($searchfor)
+   {
+      $_SESSION['searchfor'] = $searchfor;
+
+   } // startSearch()
+
 }
 
 ?>