X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=27a0079e30936f194877c3cd582530dedf4e3a8c;hp=1a344f465e66bd1b75b01a3a138e03bf59b1c4bb;hb=415b51224f80a7ac111ffc2ad09f298849fcca4d;hpb=7a8bacbb65ce47c96fb30144f1a06d9d9a17c319
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 1a344f4..27a0079 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -10,9 +10,7 @@ class PHPFSPOT {
var $db;
var $tmpl;
var $tags;
- var $avail_photos;
- var $photos;
- var $current_photo;
+ var $avail_tags;
var $current_tags;
public function __construct()
@@ -23,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()
@@ -37,16 +31,16 @@ 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()
{
+ $this->avail_tags = Array();
+ $count = 0;
+
$result = $this->db->db_query("
SELECT id,name
FROM tags
@@ -59,37 +53,13 @@ class PHPFSPOT {
$tag_name = $row['name'];
$this->tags[$tag_id] = $tag_name;
-
- }
- } // 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;
+ $this->avail_tags[$count] = $tag_id;
$count++;
}
- } // get_photos()
+ } // get_tags()
public function get_photo_details($idx)
{
@@ -109,21 +79,159 @@ 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($previous_img) {
+ $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
+ }
+
+ if($next_img) {
+ $this->tmpl->assign('next_url', "javascript:showImage(". $next_img .");");
+ }
+
+ $this->tmpl->show("single_photo.tpl");
+
+ } // showPhoto()
+
+ public function getAvailableTags()
+ {
+ foreach($this->avail_tags as $tag)
+ {
+ if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags']))
+ continue;
+
+ // return all available (= not selected) tags
+ print "". $this->tags[$tag] ." ";
+
+ }
+
+ } // getAvailableTags()
+
+ public function getSelectedTags()
+ {
+ foreach($this->avail_tags as $tag)
+ {
+ // return all selected tags
+ if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) {
+ print "". $this->tags[$tag] ." ";
+ }
+
+ }
+
+ } // getSelectedTags()
+
+ public function addTag($tag)
+ {
+ if(!isset($_SESSION['selected_tags']))
+ $_SESSION['selected_tags'] = Array();
+
+ array_push($_SESSION['selected_tags'], $tag);
+
+ } // addTag()
+
+ public function delTag($tag)
+ {
+ if(isset($_SESSION['selected_tags'])) {
+ $key = array_search($tag, $_SESSION['selected_tags']);
+ unset($_SESSION['selected_tags'][$key]);
}
- if($photo > 0) {
- $this->tmpl->assign('previous_url', "javascript:showImage(". ($photo-1) .");");
+ } // delTag()
+
+ public function resetTags()
+ {
+ unset($_SESSION['selected_tags']);
+
+ } // 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
+ ");
}
- if($photo < count($this->avail_photos)) {
- $this->tmpl->assign('next_url', "javascript:showImage(". ($photo+1) .");");
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
}
- } // prepare_single_photo()
+ 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.= "cfg->thumb_width ."\" />
\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");
+
+
+ } // showPhotoIndex()
}