X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=b0440245b4014926d5646a6c7ddc04320b4c6852;hp=e3a1ba617ff4453b9ab702bc2c3d51e5ed3950e9;hb=53c9a3f97dbe67a8695ce3504135b39afc45dfb8;hpb=d2108af33e8fa5dbddab409e379edfd3c92ea492

diff --git a/phpfspot.class.php b/phpfspot.class.php
index e3a1ba6..b044024 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 "<a href=\"javascript:Tags('add', ". $tag .");\" class=\"tag\">". $this->tags[$tag] ."</a>&nbsp;";
+          // 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 "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%;\">". $this->tags[$key] ."</a>&nbsp;";
 
       }
 
@@ -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;
@@ -645,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()
+
 }
 
 ?>