Changeset 105

Timestamp:

04/ 8/08 5:52:32 AM (9 months ago)

Author:

noel

Message:

fixing those damn paths

Location:

trunk

Files:

• includes/config.class.php (modified) (1 diff)
• includes/photostack.class.php (modified) (4 diffs)
• organize.php (modified) (1 diff)
• thumb.php (modified) (4 diffs)

trunk/includes/config.class.php

@@ -67 +67 @@
                                         $value = 'http://' . $_SERVER['HTTP_HOST'] . $base;
                                 }
-                        
+                                
                                 if($key == "chmod_value") {
-                                        
-                                if(!preg_match('/0[0-9]*/', $value)) $value = "0755";
-                                        #$pid = posix_getpwuid(posix_geteuid());
-                                        #$pid = $pid['uid'];
-                                        #fileowner($this->pathto_galleries);
+                                        if(!preg_match('/0[0-9]*/', $value)) $value = "0755";
+                                }
+                                
+                                if($key == 'base_path') {
+                                        $value = dirname($_SERVER['SCRIPT_FILENAME']).'/';
                                 }
                                 $this->$key = $value;

trunk/includes/photostack.class.php

@@ -77 +77 @@
         //is template in templates dir?
         $tplPath = realpath($this->config->pathto_templates);
-        if(substr(realpath($this->config->pathto_templates.$_REQUEST['template']), 0, strlen($tplPath)) != $tplPath){
+        if(substr(@realpath($this->config->pathto_templates.$_REQUEST['template']), 0, strlen($tplPath)) != $tplPath){
                 return $this->config->pathto_current_template."index.php";
         }
@@ -170 +170 @@
 
         //reindex the galleries
-        if(!$this->reindexed) $this->reindex();
+        if(!@$this->reindexed) $this->reindex();
 
     //sort galleries and images
@@ -200 +200 @@
         $images_changed = 0;
 
-        $dir = $this->get_listing($this->config->pathto_galleries.$this->gallery->id,"images");
+        $dir = $this->get_listing($this->config->base_path.$this->config->pathto_galleries.$this->gallery->id,"images");
         usort($this->gallery->images, array($this, "quicksort"));
         foreach($this->gallery->images as $key => $value) $filenames[] = $value->filename;
+        
         if(is_array($filenames) && is_array($dir->files)) $unset = array_diff($filenames, $dir->files);
         if($unset) {
@@ -806 +807 @@
 }
 
-function loop($kind = null) {
+function loop() {
         /* Thanks Matt & Wordpress! */
-
-        if(!$this->index) { $this->index = $this->startat; }
+        if(!$this->index) { $this->index = $this->startat;}
         if($this->first_time) { $this->index++; } else { $this->index_rewind = $this->index + $this->startat; $this->first_time = true; }
-        if($this->is_gallery() && $kind != 'images' or $kind == 'albums') {
+        if($this->is_gallery()) {
                 $selected = $this->selected_gallery_count();
-        } elseif($this->is_album() or $this->is_image() or $kind == 'images') {
+        } elseif($this->is_album() or $this->is_image()) {
                 $selected = $this->selected_images_count();
         }
-        if($this->index < $selected + $this->startat ) return true;
+        if($this->index < $selected + $this->startat) return true;
+        return false;
 }
 

trunk/organize.php

@@ -13 +13 @@
 $ps = new admin();
 
-                        if($_REQUEST['session_id']) session_id($_REQUEST['session_id']);
-                        session_start();
+if($_REQUEST['session_id']) session_id($_REQUEST['session_id']);
+session_start();
 
 //check if user is logged in

trunk/thumb.php

@@ -21 +21 @@
   
   //security check: make sure requested file is in galleries directory
-  $gal_path = realpath($this->config->pathto_galleries);
-  $img_path = realpath($this->config->pathto_galleries.$gallery."/".$image);
+  $gal_path = realpath($this->config->base_path.$this->config->pathto_galleries);
+  $img_path = realpath($this->config->base_path.$this->config->pathto_galleries.$gallery."/".$image);
+
         $ext = strtolower(pathinfo($img_path, PATHINFO_EXTENSION));
   if(substr($img_path,0,strlen($gal_path)) != $gal_path) header("HTTP/1.0 404 Not Found");
@@ -33 +34 @@
 if(in_array($ext, $movie_extensions)) $movie = true;
 
-        $image_path = realpath($this->config->pathto_galleries."$gallery/$image");
+        $image_path = realpath($this->config->base_path.'/'.$this->config->pathto_galleries."$gallery/$image");
+
         $thumb_path = $this->config->pathto_cache.$max_width."x".$max_height.($force_size?"f":"").strtr("-$gallery-$image",":/?\\","----");
         $movie_path = $this->config->pathto_cache.md5(strtr("-$gallery-$image",":/?\\","----")).'.flv';
@@ -57 +59 @@
         }
         }
-        #header('Content-Disposition: inline; filename='.$_GET['image']);
+        header('Content-Disposition: inline; filename='.$_GET['image']);
 
         //if thumbnail is newer than image then output cached thumbnail and exit
         if($imageModified<$thumbModified) { 
-    #   header("Last-Modified: ".gmdate("D, d M Y H:i:s",$thumbModified)." GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s",$thumbModified)." GMT");
         readfile($thumb_path);
         exit;
@@ -85 +87 @@
                 $thumbQuality = $this->config->thumbnail_quality;
                 list($image_width, $image_height, $image_type) = GetImageSize($image_path);
+
         }
           //if aspect ratio is to be constrained set crop size