Changeset 614 for trunk

Timestamp:

03/24/10 13:58:31 (2 years ago)

Author:

sidtheduck

Message:

• Fix for RSS pictures/albums at collections level
• Fix for copying original image to thumbnail if access is not allowed for original images and there is a permissions issue for the copy command
• Better path error reporting if images are missing during upgrade
• Fix to reset the sorting session variables if defaults changed in Admin -> Options so a browser session restart is not needed to see the results
• Fix for pagination truncation at search level
• Minor fixes for some additional undefined variable notices in certain server setups

Location:

trunk

Files:

• plog-admin/includes/install-functions.php (modified) (1 diff)
• plog-admin/plog-admin-functions.php (modified) (1 diff)
• plog-admin/plog-options.php (modified) (1 diff)
• plog-includes/plog-functions.php (modified) (2 diffs)
• plog-rss.php (modified) (1 diff)

trunk/plog-admin/includes/install-functions.php

@@ -954 +954 @@
                         } else {
                                 // Have no idea where the old image is
-                                $path = '';
+                                $path = 'missing/';
                         }
                         $list[$total] = array('id' => $row['pid'], 'old_path' => $path.$row['path'], 'new_path' => $new_path);

trunk/plog-admin/plog-admin-functions.php

@@ -1984 +1984 @@
                                 if($gd_info == "") {
                                         $gd_info = plog_tr('Not installed');
-                                } else if ($gd_info1['JPG Support']) {
+                                } else if (isset($gd_info1['JPG Support'])) {
                                         $gd_info .= plog_tr(' with JPEG support');
                                 }

trunk/plog-admin/plog-options.php

@@ -131 +131 @@
         configure_mod_rewrite($config['use_mod_rewrite']);
 
+        // Reset the sorting session variables if they have changed so you don't need to do a browser refresh
+        if ($_POST['default_sortby'] != $config['default_sortby']) {
+                $_SESSION['plogger_sortby'] = $_POST['default_sortby'];
+        }
+        if ($_POST['plogger_sortdir'] != $config['plogger_sortdir']) {
+                $_SESSION['plogger_sortdir'] = $_POST['plogger_sortdir'];
+        }
+
         if (!isset($error_flag)) $output .= "\n\t" . '<p class="success">'.plog_tr('You have updated your settings successfully').'.</p>' . "\n";
-
         $_SESSION['msg'] = $output;
+
         unset($_POST);
         // do a quick refresh to prevent multiple form submits

trunk/plog-includes/plog-functions.php

@@ -652 +652 @@
                 // if fullsize image access is disabled, copy the file to the thumbs folder
                 if ($config['allow_fullpic'] == 0) {
-                        copy($source_file_name, $thumbpath); 
-                        return $thumburl;
+                        // try to copy and return the thumbpath
+                        // if it fails (most likely due to permissions issues) then we continue on to generate a thumbnail
+                        if(@copy($source_file_name, $thumbpath)) {
+                                return $thumburl;
+                        }
                 // otherwise return the original file path
                 } else {
@@ -2298 +2301 @@
                                 $num_items = $GLOBALS['total_pictures'];
                                 $args['searchterms'] = urlencode($_REQUEST['searchterms']);
-                                return generate_pagination('search', -1, $page, $num_items, $config['thumb_num'], $args);
+                                return generate_pagination('search', -1, $page, $num_items, $config['thumb_num'], $args, $page_range);
                                 break;
                         case 'album':

trunk/plog-rss.php

@@ -64 +64 @@
 
         } else if (($level == 'collections') or ($level == '')) {
-                plogger_init_albums(array(
-                'collection_id' => -1,
-                'sortby' => 'id',
-                'sortdir' => 'DESC',
-                'from' => 0,
-                'limit' => $config['feed_num_entries']
-                ));
+                if ($config['feed_content'] == 0 ) {
+                        plogger_init_albums(array(
+                                'collection_id' => -1,
+                                'sortby' => 'id',
+                                'sortdir' => 'DESC',
+                                'from' => 0,
+                                'limit' => $config['feed_num_entries']
+                        ));
+                } else {
+                        plogger_init_pictures(array(
+                                'type' => 'latest',
+                                'sortby' => 'id',
+                                'limit' => $config['feed_num_entries']
+                        ));
+                }
                 $config['feed_title'] .= ': '.plog_tr('Entire Gallery');
         }