fixed syntax error in phpfspot.js

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 3f7a7280253b04cdd44110ee3188ee7560610882..fc6b3764e9f0e3f22fa4bdf70cee29971515ad30 100644 (file)
--- 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) {
          
@@ -179,7 +193,7 @@ class PHPFSPOT {
 
    } // resetTags()
 
-   public function getAllTagPhotos()
+   public function getPhotoSelection()
    {  
       $tagged_photos = Array();
 
@@ -188,14 +202,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,19 +254,22 @@ 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;
 
-   } // getAllTagPhotos()
+   } // getPhotoSelection()
 
    public function showPhotoIndex()
    {
-      $photos = $this->getAllTagPhotos();
+      if($_SESSION['searchfor'] == '')
+         $photos = $this->getPhotoSelection();
+      else
+         $photos = $this->getSearchResult($_SESSION['searchfor']);
+
       $count = count($photos);
 
       $rows = 0;
@@ -364,7 +416,7 @@ class PHPFSPOT {
    {
       if(!$idx) {
          /* get all available photos */
-         $all = $this->getAllTagPhotos();
+         $all = $this->getPhotoSelection();
       }
       else
          $all = Array($idx);
@@ -430,6 +482,41 @@ class PHPFSPOT {
 
    } // setMD5()
 
+   public function setTagCondition($mode)
+   {
+      $_SESSION['tag_condition'] = $mode;
+
+   } // setTagCondition()
+
+   public function startSearch($searchfor)
+   {
+      $_SESSION['searchfor'] = $searchfor;
+
+   } // showSearchResult()
+
+   public function getSearchResult($for)
+   {
+      $tagged_photos = Array();
+
+      $result = $this->db->db_query("
+         SELECT DISTINCT photo_id
+            FROM photo_tags pt
+         INNER JOIN photos p
+            ON p.id=pt.photo_id
+         INNER JOIN tags t
+            ON pt.tag_id=t.id
+         WHERE t.name LIKE '%". $for ."%'
+            ORDER BY p.time ASC
+      ");
+
+      while($row = $this->db->db_fetch_object($result)) {
+         array_push($tagged_photos, $row['photo_id']);
+      }
+
+      return $tagged_photos;
+
+   } // getSearchResult()
+
 }
 
 ?>