Changeset 556

Timestamp:

07/09/08 13:00:01 (3 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #177 - Deleting albums and collections
+ Fixed errors in "Air" theme comments.php and slideshow.php

Location:

trunk

Files:

• plog-admin/plog-admin-functions.php (modified) (6 diffs)
• plog-content/themes/air/comments.php (modified) (1 diff)
• plog-content/themes/air/slideshow.php (modified) (1 diff)

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

@@ -454 +454 @@
         if (!$collection) {
                 return array('errors' => plog_tr('No such collection'));
-        };
+        }
 
         // first delete all albums registered with this album
@@ -461 +461 @@
         while ($row = mysql_fetch_assoc($result)) {
                 delete_album($row['id']);
-        };
+        }
 
         // XXX: un-register collection
@@ -473 +473 @@
 
         $collection_directory = realpath($config['basedir'] . 'plog-content/images/'.$source_collection_name);
-        $relative_path = substr($collection_directory,0,strlen($config['basedir']));
-        $collection_path = explode('/',substr($collection_directory,strlen($config['basedir'])));
-        // it needs to have 2 parts - images and collection name, if it doesn't, then there is something
-        // wrong with collection name and it's probably not safe to try to delete the directory
-        if ($relative_path == $config['basedir'] && sizeof($collection_path) == 2) {
+        // check to see if the collection_directory is a real directory and then try to delete it
+        if (is_dir($collection_directory)){
                 @chmod($collection_directory,0777);
                 $delete_result = rmdir($collection_directory);
                 if (!$delete_result) {
                         return array('errors' => plog_tr('Collection directory still contains files after all albums have been deleted.'));
-                };
+                }
                 
         } else {
                 return array('errors' => plog_tr('Collection has invalid path, not deleting directory'));
-        };
+        }
         return array();
 }
@@ -718 +715 @@
         if (!$album) {
                 return array('errors' => plog_tr('No such album'));
-        };
+        }
 
         // first delete all pictures registered with this album
@@ -725 +722 @@
         while ($row = mysql_fetch_assoc($result)) {
                 delete_picture($row['id']);
-        };
+        }
 
         // XXX: un-register album
@@ -738 +735 @@
 
         $album_directory = realpath($config['basedir'] . 'plog-content/images/'.$source_collection_name."/".$source_album_name);
-        $relative_path = substr($album_directory,0,strlen($config['basedir']));
-        $album_path = explode('/',substr($album_directory,strlen($config['basedir'])));
-        // it needs to have 3 parts - images, collection name and album name, if it doesn't, then there is something
-        // wrong with either collection or album name and it's probably not safe to try to delete the directory
-        if ($relative_path == $config['basedir'] && sizeof($album_path) == 3) {
+        // check to see if the album_directory is a real directory and then try to delete it
+        if (is_dir($album_directory)){
                 @chmod($album_directory,0777);
                 $delete_result = rmdir($album_directory);
                 if (!$delete_result) {
                         return array('errors' => plog_tr('Album directory still contains files after all pictures have been deleted.'));
-                };
+                }
 
         } else {
                 return array('errors' => plog_tr('Album has invalid path, not deleting directory'));
-        };
+        }
         return array();
 }

trunk/plog-content/themes/air/comments.php

@@ -1 +1 @@
 
 <?php if (plogger_comments_on()) { ?>
-                <a name="comments"></a><h2 class="comment-heading">' . plog_tr('Comments') . ':</h2>';
+                <a name="comments"></a><h2 class="comment-heading"><?php echo plog_tr('Comments'); ?>:</h2>
 
                 <? if (plogger_picture_has_comments()) { ?>

trunk/plog-content/themes/air/slideshow.php

@@ -36 +36 @@
 
 <?php function generate_slideshow_interface() {
-        global $config;
+        global $config, $thumbnail_config;
         $large_link = '
         <a accesskey="v" title="' . plog_tr('View Large Image') . '" href="javascript:slides.hotlink()">
-                <img src="'.$config["gallery_url"].'graphics/search.gif" width="16" height="16" alt="'. plog_tr('View Large Image') . '"/>
+                <img src="'.THEME_URL.'images/search.gif" width="16" height="16" alt="'. plog_tr('View Large Image') . '"/>
         </a>';
 
         $prev_url = '
         <a accesskey="," title="' .plog_tr('Previous Image') . '" href="javascript:slides.previous();">
-                <img src="'.$config["gallery_url"].'graphics/rewind.gif" width="16" height="16" alt="' . plog_tr('Previous Image') . '" />
+                <img src="'.THEME_URL.'images/rewind.gif" width="16" height="16" alt="' . plog_tr('Previous Image') . '" />
         </a>';
 
         $next_url = '
         <a accesskey="." title="' . plog_tr('Next Image') . '" href="javascript:slides.next();">
-                <img src="'.$config["gallery_url"].'graphics/fforward.gif" width="16" height="16" alt="' . plog_tr('Next Image') . '" />
+                <img src="'.THEME_URL.'images/fforward.gif" width="16" height="16" alt="' . plog_tr('Next Image') . '" />
         </a>';
 
         $stop_url = '
         <a accesskey="x" title="'. plog_tr('Stop Slideshow') . '" href="javascript:slides.pause();">
-                <img src="'.$config["gallery_url"].'graphics/stop.gif" width="16" height="16" alt="' . plog_tr('Stop Slideshow') . '" />
+                <img src="'.THEME_URL.'images/stop.gif" width="16" height="16" alt="' . plog_tr('Stop Slideshow') . '" />
         </a>';
 
         $play_url = '
         <a accesskey="s" title="'. plog_tr('Start Slideshow') . '" href="javascript:slides.play();">
-                <img src="'.$config["gallery_url"].'graphics/play.gif" width="16" height="16" alt="' .  plog_tr('Start Slideshow') . '" />
+                <img src="'.THEME_URL.'images/play.gif" width="16" height="16" alt="' .  plog_tr('Start Slideshow') . '" />
         </a>';
 
-        $output = '<div class="large-thumb-toolbar" style="width:'.$config["max_display_size"].'">'.$large_link.$prev_url.$stop_url.$play_url.$next_url.'</div>';
+        $output = '<div class="large-thumb-toolbar" style="width:'.$thumbnail_config[THUMB_LARGE]["size"].'">'.$large_link.$prev_url.$stop_url.$play_url.$next_url.'</div>';
 
         $imgtag = '<img id="slideshow_image" class="photos-large" src="about:blank" title="" alt="" />';