$this->get_tags();
+ session_start();
+
+ if(!isset($_SESSION['tag_condition']))
+ $_SESSION['tag_condition'] = 'or';
+
} // __construct()
public function __destruct()
public function show()
{
$this->tmpl->assign('page_title', $this->cfg->page_title);
+ $this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
$this->tmpl->show("index.tpl");
} // show()
$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;
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 pt
- INNER JOIN photos p
- ON p.id=pt.photo_id
- WHERE pt.tag_id IN (". $selected .")
- ORDER BY p.time ASC
- ");
+
+ 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']);
+ }
+ }
}
else {
$result = $this->db->db_query("
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']);
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
+ }
}
return $tagged_photos;
$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);
} // 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->getAllTagPhotos();
+ }
+ 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 */
/* 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->create_thumbnail($full_path, $resolution);
}
} // setMD5()
+ public function setTagCondition($mode)
+ {
+ $_SESSION['tag_condition'] = $mode;
+
+ } // setTagCondition()
+
}
?>