Changeset 556 for trunk/plog-admin/plog-admin-functions.php

Timestamp:

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

Author:

sidtheduck

Message:

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

Files:

• trunk/plog-admin/plog-admin-functions.php (modified) (6 diffs)

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();
 }