X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=cf0fa25686073478295144508e1b2e9eb5ac2718;hp=0dea249a6a56cf037fba99b2d6006f37b113216a;hb=02fa42f4fa425887713b1df57ed17a48f2b83c6e;hpb=b4b0a0aa7c7e8a598e296f42a55e96d614abff05
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 0dea249..cf0fa25 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -121,15 +121,22 @@ class PHPFSPOT {
$details = $this->get_photo_details($photo);
$meta = $this->get_meta_informations($this->translate_path($details['directory_path']) ."/". $details['name']);
$info = getimagesize($this->translate_path($details['directory_path']) ."/thumbs/". $this->cfg->photo_width ."_". $details['name']);
-
+
+ $this->tmpl->assign('description', $details['description']);
+ $this->tmpl->assign('image_name', $details['name']);
+
$this->tmpl->assign('width', $info[0]);
$this->tmpl->assign('height', $info[1]);
- $this->tmpl->assign('c_date', $meta['DateTime']);
- $this->tmpl->assign('madewith', $meta['Make'] ." ". $meta['Model']);
- $this->tmpl->assign('image_name', $details['name']);
+ $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $meta['FileDateTime']));
+ $this->tmpl->assign('ExifMadeWith', $meta['Make'] ." ". $meta['Model']);
+ $this->tmpl->assign('ExifOrigResolution', $meta['ExifImageWidth'] ."x". $meta['ExifImageLength']);
+ $this->tmpl->assign('ExifFileSize', round($meta['FileSize']/1024, 1));
+
$this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
$this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
+ $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
}
@@ -144,13 +151,52 @@ class PHPFSPOT {
public function getAvailableTags()
{
- foreach($this->avail_tags as $tag)
- {
- if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags']))
+ $result = $this->db->db_query("
+ SELECT tag_id as id, count(tag_id) as quantity
+ FROM photo_tags
+ GROUP BY tag_id
+ ORDER BY tag_id ASC
+ ");
+
+ $tags = Array();
+
+ while($row = $this->db->db_fetch_object($result)) {
+ $tags[$row['id']] = $row['quantity'];
+ }
+
+ // change these font sizes if you will
+ $max_size = 125; // max font size in %
+ $min_size = 75; // min font size in %
+
+ // get the largest and smallest array values
+ $max_qty = max(array_values($tags));
+ $min_qty = min(array_values($tags));
+
+ // find the range of values
+ $spread = $max_qty - $min_qty;
+ if (0 == $spread) { // we don't want to divide by zero
+ $spread = 1;
+ }
+
+ // determine the font-size increment
+ // this is the increase per tag quantity (times used)
+ $step = ($max_size - $min_size)/($spread);
+
+ // loop through our tag array
+ foreach ($tags as $key => $value) {
+
+ if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags']))
continue;
- // return all available (= not selected) tags
- print "". $this->tags[$tag] ." ";
+ // calculate CSS font-size
+ // find the $value in excess of $min_qty
+ // multiply by the font-size increment ($size)
+ // and add the $min_size set above
+ $size = $min_size + (($value - $min_qty) * $step);
+ // uncomment if you want sizes in whole %:
+ $size = ceil($size);
+
+ print "". $this->tags[$key] ." ";
}
@@ -174,7 +220,8 @@ class PHPFSPOT {
if(!isset($_SESSION['selected_tags']))
$_SESSION['selected_tags'] = Array();
- array_push($_SESSION['selected_tags'], $tag);
+ if(!in_array($tag, $_SESSION['selected_tags']))
+ array_push($_SESSION['selected_tags'], $tag);
} // addTag()
@@ -183,7 +230,7 @@ class PHPFSPOT {
if(isset($_SESSION['selected_tags'])) {
$key = array_search($tag, $_SESSION['selected_tags']);
unset($_SESSION['selected_tags'][$key]);
- sort($_SESSION['selected_tags']);
+ sort($_SESSION['selected_tags']);
}
} // delTag()
@@ -232,38 +279,40 @@ class PHPFSPOT {
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
+ /* Join together a table looking like
+
+ pt1.photo_id pt1.tag_id pt2.photo_id pt2.tag_id ...
+
+ so the query can quickly return all images matching the
+ selected tags in an AND condition
+
*/
- $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']);
+ $query_str = "
+ SELECT DISTINCT pt1.photo_id
+ FROM photo_tags pt1
+ ";
+
+ for($i = 0; $i < count($_SESSION['selected_tags']); $i++) {
+ $query_str.= "
+ INNER JOIN photo_tags pt". ($i+2) ."
+ ON pt1.photo_id=pt". ($i+2) .".photo_id
+ ";
+ }
+ $query_str.= "WHERE pt1.tag_id=". $_SESSION['selected_tags'][0];
+ for($i = 1; $i < count($_SESSION['selected_tags']); $i++) {
+ $query_str.= "
+ AND pt". ($i+1) .".tag_id=". $_SESSION['selected_tags'][$i] ."
+ ";
}
+ $result = $this->db->db_query($query_str);
+ }
+
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
}
return $tagged_photos;
}
@@ -359,10 +408,6 @@ class PHPFSPOT {
public function create_thumbnail($image, $width)
{
- // if thumbnail already exists, don't recreate it
- if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image)))
- return;
-
$meta = $this->get_meta_informations($image);
$rotate = 0;
@@ -507,7 +552,7 @@ class PHPFSPOT {
$full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
$file_md5 = md5_file($full_path);
- if($fromcmd) print "Image ". $details['name'] ." Thumbnails:";
+ if($fromcmd) print "Image [". $photo ."] ". $details['name'] ." Thumbnails:";
/* if the file hasn't changed there is no need to regen the thumb */
if($file_md5 == $this->getMD5($photo)) {
@@ -643,6 +688,25 @@ class PHPFSPOT {
} // rotateImage()
+ private function get_photo_tags($idx)
+ {
+ $result = $this->db->db_query("
+ SELECT t.id, t.name
+ FROM tags t
+ INNER JOIN photo_tags pt
+ ON t.id=pt.tag_id
+ WHERE pt.photo_id='". $idx ."'
+ ");
+
+ $tags = Array();
+
+ while($row = $this->db->db_fetch_object($result))
+ $tags[$row['id']] = $row['name'];
+
+ return $tags;
+
+ } // get_photo_tags()
+
}
?>