X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=dbefee8b37f52ec13bd2bb61cf7529df3fa3d8cf;hp=168d08134fc5b3461a24b23d222dc47bca7802de;hb=ca33ffdcbb65a0b344e450966c2fcff1d9e9212b;hpb=495fee6e4ea622177353c74425d546aedf467991
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 168d081..dbefee8 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -39,7 +39,6 @@ class PHPFSPOT {
public function show()
{
- $this->prepare_single_photo($this->current_photo);
$this->tmpl->assign('tags', $this->tags);
$this->tmpl->show("index.tpl");
@@ -117,21 +116,23 @@ class PHPFSPOT {
} // translate_path
- public function prepare_single_photo($photo)
+ public function showPhoto($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($photo < count($this->avail_photos)) {
+ if($photo < count($this->photos)) {
$this->tmpl->assign('next_url', "javascript:showImage(". ($photo+1) .");");
}
- } // prepare_single_photo()
+ $this->tmpl->show("single_photo.tpl");
+
+ } // showPhoto()
public function getAvailableTags()
{
@@ -188,35 +189,69 @@ class PHPFSPOT {
public function getAllTagPhotos()
{
- $selected = "";
- foreach($_SESSION['selected_tags'] as $tag)
- $selected.= $tag .",";
- $selected = substr($selected, 0, strlen($selected)-1);
-
$tagged_photos = Array();
- $result = $this->db->db_query("
- SELECT DISTINCT photo_id
- FROM photo_tags
- WHERE tag_id IN (". $selected .")
- ");
+ 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.= "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");
- foreach($this->getAllTagPhotos() as $photo)
- {
- print "cfg->thumb_width ."\" />
\n";
- }
} // showPhotoIndex()