photoshop does the job

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 6d66aaefd102f4e39f1934c3dace91c93b8cacee..5b18be5c90f870b86e297ba83f6c0d61767b4fea 100644 (file)
--- 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("
@@ -176,8 +139,6 @@ class PHPFSPOT {
 
       }
 
-      print "<a href=\"javascript:Tags('reset', 0);\">Reset Tags</a>";
-
    } // getSelectedTags()
 
    public function addTag($tag)
@@ -215,14 +176,20 @@ class PHPFSPOT {
          $selected = substr($selected, 0, strlen($selected)-1);
          $result = $this->db->db_query("
             SELECT DISTINCT photo_id
-            FROM photo_tags
-            WHERE tag_id IN (". $selected .")
+               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
          ");
       }
       else {
          $result = $this->db->db_query("
             SELECT DISTINCT photo_id
-            FROM photo_tags
+               FROM photo_tags pt
+            INNER JOIN photos p
+               ON p.id=pt.photo_id
+            ORDER BY p.time ASC
          ");
       }