max the tag tab scrollable - don't know yet why the text runs into the content window
[phpfspot.git] / phpfspot.class.php
index c1bf643ba5dd2c0a517baac7c16ec38b252dc0ad..9c426a30ce20f678d9daa95eb2c141305d491faa 100644 (file)
@@ -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()
 
@@ -183,6 +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']);
       }
 
    } // delTag()
@@ -231,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;
       }
@@ -358,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;
@@ -490,50 +536,39 @@ class PHPFSPOT {
 
    } // check_config_table
 
-   public function gen_thumbs($idx = 0, $fromcmd = 0)
+   public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
    {
-      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($idx);
 
-         if($fromcmd) print "Image ". $details['name'] ." Thumbnails:";
+      $full_path = $this->translate_path($details['directory_path'])  ."/". $details['name'];
+      $file_md5 = md5_file($full_path);
 
-         /* 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;
-         }
+      if($fromcmd) print "Image [". $idx ."] ". $details['name'] ." Thumbnails:";
 
-         /* 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(!$force && $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)
    {
@@ -642,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()
+
 }
 
 ?>