ensure the browser does not wrap the photo index title text

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 60c06b00d47a2be5565c300332e44bca353e14ef..69f579bf20c04f32b16dc48228cf90ba3e8ce1d0 100644 (file)
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -21,15 +21,31 @@ class PHPFSPOT_IMG {
 
    public function show($idx, $width = 0)
    {
 
    public function show($idx, $width = 0)
    {

-      $this->parent->gen_thumb($idx);
-

       $details = $this->parent->get_photo_details($idx);
       $details = $this->parent->get_photo_details($idx);

+   
+      if(!$details) {
+         $this->parent->showTextImage("The image you requested is unknown");
+         return;
+      }

 
 

+      /* show original photo */

       if($width == 0) {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
       }
       if($width == 0) {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
       }

+      /* show thumbnail */

       else {
       else {

-         $fullpath = $this->parent->translate_path($details['directory_path'])  ."/thumbs/". $width ."_". $details['name'];
+         $fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx);
+         if(!file_exists($fullpath)) 
+            $this->parent->gen_thumb($idx, 0, 1);
+      }
+
+      if(!file_exists($fullpath)) {
+         $this->parent->showTextImage("test1");
+         return;
+      }
+      if(!is_readable($fullpath)) {
+         $this->parent->showTextImage("File ". $fullpath ." is not readable. Check the permissions");
+         return;

       }
 
       $tmp = getimagesize($fullpath);
       }
 
       $tmp = getimagesize($fullpath);