issue28, use getimagesize if no exif data is available

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 818aca658730bf4e0468a9735711abc612ebafc7..0047f90fbc28ba85edacbe93ff8f4f6142b24081 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -112,6 +112,22 @@ class PHPFSPOT {
 
    } // get_photo_details
 
+   public function getPhotoName($idx)
+   {
+      if($details = $this->get_photo_details($idx)) {
+
+         $name = $details['name'];
+
+         if(strlen($name) > 15) {
+            $name = substr($name, 0, 10) ."...". substr($name, -10);
+         }
+
+         return $name;
+   
+      }
+
+   } // getPhotoName()
+
    public function translate_path($path, $width = 0)
    {  
       return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
@@ -161,9 +177,16 @@ class PHPFSPOT {
 
       $meta = $this->get_meta_informations($orig_path);
 
+      /* If EXIF data are available, use them */
+      if(isset($meta['ExifImageWidth'])) {
+         $meta_res = $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'];
+      } else {
+         $info = getimagesize($orig_path);
+         $meta_res = $info[0] ."x". $info[1]; 
+      }
+
       $meta_date = isset($meta['FileDateTime']) ? strftime("%a %x %X", $meta['FileDateTime']) : "n/a";
       $meta_make = isset($meta['Make']) ? $meta['Make'] ." ". $meta['Model'] : "n/a";
-      $meta_res  = isset($meta['ExifImageWidth']) ?  $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'] : "n/a";
       $meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a";
 
       if(file_exists($thumb_path)) {
@@ -439,11 +462,13 @@ class PHPFSPOT {
       $img_height[$rows] = Array();
       $img_width[$rows] = Array();
       $img_id[$rows] = Array();
+      $img_name[$rows] = Array();
 
       for($i = $begin_with; $i < $end_with; $i++) {
 
          $images[$rows][$cols] = $photos[$i];
          $img_id[$rows][$cols] = $i;
+         $img_name[$rows][$cols] = $this->getPhotoName($photos[$i]);
 
          $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]);
 
@@ -544,6 +569,7 @@ class PHPFSPOT {
       $this->tmpl->assign('img_width', $img_width);
       $this->tmpl->assign('img_height', $img_height);
       $this->tmpl->assign('img_id', $img_id);
+      $this->tmpl->assign('img_name', $img_name);
       $this->tmpl->assign('rows', $rows);
       $this->tmpl->assign('columns', $this->cfg->thumbs_per_row);