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

diff --git a/phpfspot.class.php b/phpfspot.class.php
index dbefee8..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,11 +31,9 @@ class PHPFSPOT {
 
    public function show()
    {
-
-      $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()
@@ -70,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("
@@ -118,16 +81,33 @@ class PHPFSPOT {
 
    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='. $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->photos)) {
-         $this->tmpl->assign('next_url', "javascript:showImage(". ($photo+1) .");");
+      if($next_img) {
+         $this->tmpl->assign('next_url', "javascript:showImage(". $next_img .");");
       }
 
       $this->tmpl->show("single_photo.tpl");
@@ -159,8 +139,6 @@ class PHPFSPOT {
 
       }
 
-      print "<a href=\"javascript:Tags('reset', 0);\">Reset Tags</a>";
-
    } // getSelectedTags()
 
    public function addTag($tag)