X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=c4dddb4efb3e85eed087f0348eb08441aa5bbdb4;hp=a936eecba35b32eaa7c1822707f2e73f2cd60ebd;hb=09ab990f8da2f25cb3540fd7fc853b73464b0ef0;hpb=e1117268a48440364cc10191a40eee45b8f514bd diff --git a/phpfspot.class.php b/phpfspot.class.php index a936eec..c4dddb4 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -27,6 +27,14 @@ class PHPFSPOT { $this->get_tags(); + session_start(); + + if(!isset($_SESSION['tag_condition'])) + $_SESSION['tag_condition'] = 'or'; + + if(!isset($_SESSION['searchfor'])) + $_SESSION['searchfor'] = ''; + } // __construct() public function __destruct() @@ -36,7 +44,9 @@ class PHPFSPOT { public function show() { + $this->tmpl->assign('searchfor', $_SESSION['searchfor']); $this->tmpl->assign('page_title', $this->cfg->page_title); + $this->tmpl->assign('current_condition', $_SESSION['tag_condition']); $this->tmpl->show("index.tpl"); } // show() @@ -57,6 +67,10 @@ class PHPFSPOT { $tag_id = $row['id']; $tag_name = $row['name']; + /* check if config requests to ignore this tag */ + if(in_array($row['name'], $this->cfg->hide_tags)) + continue; + $this->tags[$tag_id] = $tag_name; $this->avail_tags[$count] = $tag_id; @@ -86,7 +100,7 @@ class PHPFSPOT { public function showPhoto($photo) { - $all_photos = $this->getAllTagPhotos(); + $all_photos = $this->getPhotoSelection(); foreach($all_photos as $all_photo) { @@ -179,45 +193,99 @@ class PHPFSPOT { } // resetTags() - public function getAllTagPhotos() + public function getPhotoSelection() { $tagged_photos = Array(); - if(isset($_SESSION['selected_tags'])) { - $selected = ""; - foreach($_SESSION['selected_tags'] as $tag) - $selected.= $tag .","; - $selected = substr($selected, 0, strlen($selected)-1); + /* 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 - WHERE pt.tag_id IN (". $selected .") - ORDER BY p.time ASC + 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; } - 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 - "); + + /* return according the selected tags */ + if(isset($_SESSION['selected_tags'])) { + $selected = ""; + foreach($_SESSION['selected_tags'] as $tag) + $selected.= $tag .","; + $selected = substr($selected, 0, strlen($selected)-1); + + if($_SESSION['tag_condition'] == 'or') { + $result = $this->db->db_query(" + SELECT DISTINCT photo_id + 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 + "); + while($row = $this->db->db_fetch_object($result)) { + array_push($tagged_photos, $row['photo_id']); + } + } + elseif($_SESSION['tag_condition'] == 'and') { + $result = $this->db->db_query(" + SELECT DISTINCT photo_id, tag_id + 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 + "); + + /* now we need to check if each object fulfills the condition + and has all the selected tags assigned + */ + $match_object = Array(); + $matches_needed = count($_SESSION['selected_tags']); + while($row = $this->db->db_fetch_object($result)) { + /* set the counter for this object */ + if(!isset($match_object[$row['photo_id']])) + $match_object[$row['photo_id']] = $matches_needed; + + /* we have a match? decrement the counter */ + if(in_array($row['tag_id'], $_SESSION['selected_tags'])) + $match_object[$row['photo_id']]--; + + /* if the object has all necessary tags, add it to the result */ + if($match_object[$row['photo_id']] == 0) + 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() { - $photos = $this->getAllTagPhotos(); + $photos = $this->getPhotoSelection(); + $count = count($photos); $rows = 0; @@ -262,7 +330,7 @@ class PHPFSPOT { $details = $this->get_photo_details($photo); - $image_url = "phpfspot_img.php?idx=". $photo ."&width=200"; + $image_url = "phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->bubble_width; $filesize = filesize($this->translate_path($details['directory_path']) ."/". $details['name']); $filesize = rand($filesize/1024, 2); @@ -287,7 +355,7 @@ class PHPFSPOT { } // showCredits() - public function resize_image($image, $width) + public function create_thumbnail($image, $width) { // if thumbnail already exists, don't recreate it if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image))) @@ -337,7 +405,7 @@ class PHPFSPOT { imagedestroy($src_img); } - } // resize_image() + } // create_thumbnail() public function get_meta_informations($file) { @@ -360,16 +428,22 @@ class PHPFSPOT { } // check_config_table - public function gen_thumbs($fromcmd = 0) + public function gen_thumbs($idx = 0, $fromcmd = 0) { - /* get all available photos */ - $all = $this->getAllTagPhotos(); + if(!$idx) { + /* get all available photos */ + $all = $this->getPhotoSelection(); + } + else + $all = Array($idx); + foreach($all as $photo) { + $details = $this->get_photo_details($photo); + $full_path = $this->translate_path($details['directory_path']) ."/". $details['name']; $file_md5 = md5_file($full_path); - $details = $this->get_photo_details($photo); if($fromcmd) print "Image ". $details['name'] ." Thumbnails:"; /* if the file hasn't changed there is no need to regen the thumb */ @@ -381,10 +455,16 @@ class PHPFSPOT { /* set the new/changed MD5 sum for the current photo */ $this->setMD5($photo, $file_md5); + $resolutions = Array( + $this->cfg->thumb_width, + $this->cfg->bubble_width, + $this->cfg->photo_width + ); + /* create thumbnails for the requested resolutions */ - foreach(Array($this->cfg->thumb_width, $this->cfg->photo_width) as $resolution) { + foreach($resolutions as $resolution) { if($fromcmd) print " ". $resolution ."px"; - $this->resize_image($full_path, $resolution); + $this->create_thumbnail($full_path, $resolution); } if($fromcmd) print "\n"; @@ -418,6 +498,18 @@ class PHPFSPOT { } // setMD5() + public function setTagCondition($mode) + { + $_SESSION['tag_condition'] = $mode; + + } // setTagCondition() + + public function startSearch($searchfor) + { + $_SESSION['searchfor'] = $searchfor; + + } // startSearch() + } ?>