issue76, check if thumb_path is set

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 194b534ba63e61d9258ea0a1ce621d35673581f4..ce3731b3fe92522a855efff12618b31c1793444c 100644 (file)
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -56,10 +56,13 @@ class PHPFSPOT_IMG {
     */
    public function show($idx, $width = 0)
    {
+      if($idx == 'rand')
+         $idx = $this->parent->get_random_photo();
+
       $details = $this->parent->get_photo_details($idx);
    
       if(!$details) {
-         $this->parent->showTextImage("The image you requested is unknown");
+         $this->parent->showTextImage("The image (". $idx .") you requested is unknown");
          return;
       }
 
@@ -73,7 +76,7 @@ class PHPFSPOT_IMG {
          if(!$this->parent->getMD5($idx)) {
             $this->parent->gen_thumb($idx);
          }
-         $fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx);
+         $fullpath = $this->parent->get_thumb_path($width, $idx);
          /* if the thumb file does not exist, create it */
          if(!file_exists($fullpath)) {
             $this->parent->gen_thumb($idx);
@@ -103,7 +106,10 @@ class PHPFSPOT_IMG {
       Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
       Header("Accept-Ranges: bytes");
       Header("Connection: close");
-   
+      Header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+      Header("Cache-Control: no-cache");
+      Header("Pragma: no-cache");
+         
       $file = fopen($fullpath, "rb");
       fpassthru($file);
       @fclose($file);
@@ -112,7 +118,7 @@ class PHPFSPOT_IMG {
 
 }
 
-if(isset($_GET['idx']) && is_numeric($_GET['idx'])) {
+if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) {
 
    $img = new PHPFSPOT_IMG;