Changeset 600

Timestamp:

06/22/09 19:11:40 (15 months ago)

Author:

sidtheduck

Message:

-Fix for search function bug in r599
-minor syntax fixes for plog-xml.php
-minor syntax fix for intermediate images with denied full picture access

Location:

trunk

Files:

• plog-includes/plog-functions.php (modified) (2 diffs)
• plog-xml.php (modified) (2 diffs)
• plogger.php (modified) (1 diff)

trunk/plog-includes/plog-functions.php

@@ -387 +387 @@
                                         <input class="submit" type="submit" value="'.plog_tr('Search').'" />
                                 </div>';
-        if (!$config['use_mod_rewrite'] && !empty($config['query_args'])) {
-                $query = array();
-                $query_args = explode('&amp;', $config['query_args']);
-                foreach ($query_args as $value) {
-                        $query = explode('=', $value);
-                        $output .= "\n\t\t\t\t\t\t".'<input type="hidden" name="'.$query[0].'" value="'.$query[1].'" />';
+        if (!$config['use_mod_rewrite']) {
+                $output .= "\n\t\t\t\t\t".'<input type="hidden" name="level" value="search" />';
+                if (!empty($config['query_args'])) {
+                        $query = array();
+                        $query_args = explode('&amp;', $config['query_args']);
+                        foreach ($query_args as $value) {
+                                $query = explode('=', $value);
+                                $output .= "\n\t\t\t\t\t".'<input type="hidden" name="'.$query[0].'" value="'.$query[1].'" />';
+                        }
                 }
         }
@@ -640 +643 @@
         if ($orig_width <= $thumb_config['size'] && $orig_height <= $thumb_config['size']) {
                 // if fullsize image access is disabled, copy the file to the thumbs folder
-                if (!$config['allow_fullpic']) {
+                if ($config['allow_fullpic'] == 0) {
                         copy($source_file_name,$thumbpath); 
                         return $thumburl;

trunk/plog-xml.php

@@ -175 +175 @@
                         // Put together the tag attributes
                         foreach ($collection as $var => $val) {
-                                $xml .= ''.$var.'="'.htmlspecialchars($val).'"';
+                                $xml .= ' '.$var.'="'.htmlspecialchars($val).'"';
                         }
 
@@ -200 +200 @@
                                         }
 
+                                        $album['album_path'] = sanitize_filename($album['collection_name']).'/'.sanitize_filename($album['album_name']).'/';
                                         $album['thumb_path'] = 'plog-thumb.php?id='.$album['thumbnail_id'];
 
                                         $xml .= '<album';
                                         foreach ($album as $var => $val) {
-                                                $xml .= ''.$var.'="'.htmlspecialchars($val).'"';
+                                                $xml .= ' '.$var.'="'.htmlspecialchars($val).'"';
                                         }
                                         $xml .= '>';

trunk/plogger.php

@@ -15 +15 @@
         // The following line calculates the path in the album and excludes any subdirectories if
         // Plogger is installed in one
-        $path = join('/', array_diff(explode('/', $_REQUEST['path']), explode('/', $_SERVER['PHP_SELF'])));
+        $path = join('/', array_diff(explode('/', $_SERVER['REQUEST_URI']), explode('/', $_SERVER['PHP_SELF'])));
         $resolved_path = resolve_path($path);
         if (is_array($resolved_path)) {