X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=27a0079e30936f194877c3cd582530dedf4e3a8c;hp=20ab36d2c35bd4a1bf37f497f000dda7b5078edc;hb=415b51224f80a7ac111ffc2ad09f298849fcca4d;hpb=60b6594fad70d2d49676e02b6123385173bcdae3;ds=sidebyside

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 20ab36d..27a0079 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -11,9 +11,6 @@ class PHPFSPOT {
    var $tmpl;
    var $tags;
    var $avail_tags;
-   var $photos;
-   var $avail_photos;
-   var $current_photo;
    var $current_tags;
 
    public function __construct()
@@ -24,10 +21,6 @@ class PHPFSPOT {
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
       $this->get_tags();
-      $this->get_photos();
-
-      if(isset($_GET['id']) && is_numeric($_GET['id']))
-         $this->current_photo = $_GET['id'];
 
    } // __construct()
 
@@ -38,12 +31,9 @@ class PHPFSPOT {
 
    public function show()
    {
-
-      $this->prepare_single_photo($this->current_photo);
-      $this->tmpl->assign('tags', $this->tags);
+      $this->tmpl->assign('page_title', $this->cfg->page_title);
       $this->tmpl->show("index.tpl");
 
-
    } // show()
 
    private function get_tags()
@@ -71,34 +61,6 @@ class PHPFSPOT {
 
    } // get_tags()
 
-   private function get_photos()
-   {
-      $this->avail_photos = Array();
-      $count = 0;
-
-      $result = $this->db->db_query("
-         SELECT id, name
-         FROM photos
-         ORDER BY time ASC
-      ");
-      
-      while($row = $this->db->db_fetch_object($result)) {
-
-         $photo_id = $row['id'];
-         $photo_name = $row['name'];
-
-         $this->photos[$photo_id] = $photo_name;
-         $this->avail_photos[$count] = $photo_id;
-
-         if(!isset($this->current_photo))
-            $this->current_photo = $count;
-
-         $count++;
-
-      }
-
-   } // get_photos()
-
    public function get_photo_details($idx)
    {
       $result = $this->db->db_query("
@@ -117,21 +79,40 @@ class PHPFSPOT {
 
    } // translate_path
 
-   public function prepare_single_photo($photo)
+   public function showPhoto($photo)
    {
+      $all_photos = $this->getAllTagPhotos();
+
+      foreach($all_photos as $all_photo) {
+         
+         if($get_next) {
+            $next_img = $all_photo;
+            break;
+         }
+
+         if($all_photo == $photo) {
+            $get_next = 1;
+         }
+         else {
+            $previous_img = $all_photo;
+         }
+      }
+
       if(isset($photo)) {
-         $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $this->avail_photos[$photo] ."&width=". $this->cfg->photo_width);
+         $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
       }
 
-      if($photo > 0) {
-         $this->tmpl->assign('previous_url', "javascript:showImage(". ($photo-1) .");");
+      if($previous_img) {
+         $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
       }
 
-      if($photo < count($this->avail_photos)) {
-         $this->tmpl->assign('next_url', "javascript:showImage(". ($photo+1) .");");
+      if($next_img) {
+         $this->tmpl->assign('next_url', "javascript:showImage(". $next_img .");");
       }
 
-   } // prepare_single_photo()
+      $this->tmpl->show("single_photo.tpl");
+
+   } // showPhoto()
 
    public function getAvailableTags()
    {
@@ -158,8 +139,6 @@ class PHPFSPOT {
 
       }
 
-      print "<a href=\"javascript:Tags('reset', 0);\">Reset Tags</a>";
-
    } // getSelectedTags()
 
    public function addTag($tag)
@@ -186,13 +165,71 @@ class PHPFSPOT {
 
    } // resetTags()
 
+   public function getAllTagPhotos()
+   {  
+      $tagged_photos = Array();
+
+      if(isset($_SESSION['selected_tags'])) {
+         $selected = "";
+         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
+            WHERE tag_id IN (". $selected .")
+         ");
+      }
+      else {
+         $result = $this->db->db_query("
+            SELECT DISTINCT photo_id
+            FROM photo_tags
+         ");
+      }
+
+      while($row = $this->db->db_fetch_object($result)) {
+         array_push($tagged_photos, $row['photo_id']);
+      }
+
+      return $tagged_photos;
+
+   } // getAllTagPhotos()
+
    public function showPhotoIndex()
    {
+      $photos = $this->getAllTagPhotos();
+      $count = count($photos);
+
+      $rows = 0;
+      $cols = 0;
+      $images[$rows] = Array();
+
+      for($i = 0; $i < $count; $i++) {
+
+         $images[$rows][$cols] = $photos[$i];
+
+         if($cols == $this->cfg->thumbs_per_row-1) {
+            $cols = 0;
+            $rows++;
+            $images[$rows] = Array();
+         }
+         else {
+            $cols++;
+         }
+      } 
+
+      // +1 for for smarty's selection iteration
+      $rows++;
+
+         //$images.= "<img src=\"phpfspot_img.php?idx=". $photo ."&amp;width=". $this->cfg->thumb_width ."\" /><br />\n";
+
+      $this->tmpl->assign('count', $count);
+      $this->tmpl->assign('width', $this->cfg->thumb_width);
+      $this->tmpl->assign('images', $images);
+      $this->tmpl->assign('rows', $rows);
+      $this->tmpl->assign('columns', $this->cfg->thumbs_per_row);
+      $this->tmpl->show("photo_index.tpl");
 
-      foreach($this->avail_photos as $photo)
-      {
-         print "<img src=\"phpfspot_img.php?idx=". $photo ."&amp;width=". $this->cfg->thumb_width ."\" /><br />\n";
-      }
 
    } // showPhotoIndex()