X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=2ffec5fa82b5c7f24ddd90c2483981884d5624db;hp=e3a1ba617ff4453b9ab702bc2c3d51e5ed3950e9;hb=764ad0eb8718d3611956402725d6a4615f688d8a;hpb=d2108af33e8fa5dbddab409e379edfd3c92ea492
diff --git a/phpfspot.class.php b/phpfspot.class.php
index e3a1ba6..2ffec5f 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()
@@ -361,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;
@@ -493,50 +536,39 @@ class PHPFSPOT {
} // check_config_table
- public function gen_thumbs($idx = 0, $fromcmd = 0)
+ public function gen_thumb($idx = 0, $fromcmd = 0)
{
- if(!$idx) {
- /* get all available photos */
- $all = $this->getPhotoSelection();
- }
- else
- $all = Array($idx);
-
- foreach($all as $photo) {
-
- $details = $this->get_photo_details($photo);
+ $details = $this->get_photo_details($idx);
- $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
- $file_md5 = md5_file($full_path);
+ $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 [". $idx ."] ". $details['name'] ." Thumbnails:";
- /* if the file hasn't changed there is no need to regen the thumb */
- if($file_md5 == $this->getMD5($photo)) {
- if($fromcmd) print " file has not changed - skipping\n";
- continue;
- }
-
- /* 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
- );
+ /* if the file hasn't changed there is no need to regen the thumb */
+ if($file_md5 == $this->getMD5($idx)) {
+ if($fromcmd) print " file has not changed - skipping\n";
+ return;
+ }
- /* create thumbnails for the requested resolutions */
- foreach($resolutions as $resolution) {
- if($fromcmd) print " ". $resolution ."px";
- $this->create_thumbnail($full_path, $resolution);
- }
+ /* set the new/changed MD5 sum for the current photo */
+ $this->setMD5($idx, $file_md5);
- if($fromcmd) print "\n";
+ $resolutions = Array(
+ $this->cfg->thumb_width,
+ $this->cfg->bubble_width,
+ $this->cfg->photo_width
+ );
+ /* create thumbnails for the requested resolutions */
+ foreach($resolutions as $resolution) {
+ if($fromcmd) print " ". $resolution ."px";
+ $this->create_thumbnail($full_path, $resolution);
}
- } // gen_thumbs()
+ if($fromcmd) print "\n";
+
+ } // gen_thumb()
private function getMD5($idx)
{
@@ -645,6 +677,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()
+
}
?>