public function showPhoto($photo)
{
- $all_photos = $this->getAllTagPhotos();
+ $all_photos = $this->getPhotoSelection();
foreach($all_photos as $all_photo) {
} // resetTags()
- public function getAllTagPhotos()
+ public function getPhotoSelection()
{
$tagged_photos = Array();
+ /* return a search result */
+ if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
+ $result = $this->db->db_query("
+ SELECT DISTINCT photo_id
+ FROM photo_tags pt
+ INNER JOIN photos p
+ ON p.id=pt.photo_id
+ INNER JOIN tags t
+ ON pt.tag_id=t.id
+ WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'
+ ORDER BY p.time ASC
+ ");
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
+ }
+ return $tagged_photos;
+ }
+
+ /* return according the selected tags */
if(isset($_SESSION['selected_tags'])) {
$selected = "";
foreach($_SESSION['selected_tags'] as $tag)
array_push($tagged_photos, $row['photo_id']);
}
}
- }
- else {
- $result = $this->db->db_query("
- SELECT DISTINCT photo_id
- FROM photo_tags pt
- INNER JOIN photos p
- ON p.id=pt.photo_id
- ORDER BY p.time ASC
- ");
- while($row = $this->db->db_fetch_object($result)) {
- array_push($tagged_photos, $row['photo_id']);
- }
+ return $tagged_photos;
}
+ /* return all available photos */
+ $result = $this->db->db_query("
+ SELECT DISTINCT photo_id
+ FROM photo_tags pt
+ INNER JOIN photos p
+ ON p.id=pt.photo_id
+ ORDER BY p.time ASC
+ ");
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
+ }
return $tagged_photos;
- } // getAllTagPhotos()
+ } // getPhotoSelection()
public function showPhotoIndex()
{
- if($_SESSION['searchfor'] == '')
- $photos = $this->getAllTagPhotos();
- else
- $photos = $this->getSearchResult($_SESSION['searchfor']);
+ $photos = $this->getPhotoSelection();
$count = count($photos);
// +1 for for smarty's selection iteration
$rows++;
- //$images.= "<img src=\"phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->thumb_width ."\" /><br />\n";
+ if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
+ $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
$this->tmpl->assign('count', $count);
$this->tmpl->assign('width', $this->cfg->thumb_width);
{
if(!$idx) {
/* get all available photos */
- $all = $this->getAllTagPhotos();
+ $all = $this->getPhotoSelection();
}
else
$all = Array($idx);
{
$_SESSION['searchfor'] = $searchfor;
- } // showSearchResult()
-
- public function getSearchResult($for)
- {
- $tagged_photos = Array();
-
- $result = $this->db->db_query("
- SELECT DISTINCT photo_id
- FROM photo_tags pt
- INNER JOIN photos p
- ON p.id=pt.photo_id
- INNER JOIN tags t
- ON pt.tag_id=t.id
- WHERE t.name LIKE '%". $for ."%'
- ORDER BY p.time ASC
- ");
-
- while($row = $this->db->db_fetch_object($result)) {
- array_push($tagged_photos, $row['photo_id']);
- }
-
- return $tagged_photos;
-
- } // getSearchResult()
+ } // startSearch()
}