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

Timestamp:

07/15/08 13:36:59 (4 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #169 - no duplicate album names within the same collection
+ Extended the duplicate collection name verification
+ Fixed issues with move_picture to behave more like add_picture (adds a (#) at the end of the filename if duplicate filenames)

Files:

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

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

@@ -42 +42 @@
         $result = array(
                 'output' => '',
+                'errors' => '',
                 'picture_id' => false,
         );
@@ -198 +199 @@
         } else {
                 return array('errors' => plog_tr('Could not modify selected picture'));
-        };
+        }
 
 }
@@ -208 +209 @@
         $pic_id = intval($pic_id);
 
-        $query = "SELECT * FROM ".TABLE_PREFIX."albums WHERE `id` = '$to_album'";
+        $query = "SELECT * FROM ".TABLE_PREFIX."albums WHERE `id` = '".$to_album."'";
         $result = run_query($query);
         $row = mysql_fetch_assoc($result);
@@ -214 +215 @@
         if (!is_array($row)) {
                 return array('errors' => sprintf(plog_tr('There is no album with id %d'),$to_album));
-        };
+        }
 
         $new_collection = $row['parent_id'];
-        
 
         // move picture to new location
@@ -226 +226 @@
 
         $filename = SmartStripSlashes(basename($picture['path']));
-        $directory = SmartStripSlashes($album['collection_path'])."/".SmartStripSlashes($album['album_path'])."/";
-        $new_path = $directory.$filename;
-
-        if (!rename($config['basedir']."plog-content/images/".SmartStripSlashes($picture['path']), $config['basedir']."plog-content/images/".$new_path)) {
-                return array('errors' => sprintf(plog_tr("Could not move file! %s to %s"),$picture["path"],$new_path));
-        };
-
-        $new_path = mysql_real_escape_string($new_path);
+        $target_path = SmartStripSlashes($album['collection_path'])."/".SmartStripSlashes($album['album_path']);
+
+        $filename_parts = explode(".",strrev($filename),2);
+        $filename_base = strrev($filename_parts[1]);
+        $filename_ext = strrev($filename_parts[0]);
+        $unique_filename_base = strtolower(SmartStripSlashes($filename_base));
+
+        $i = 0;
+        while ($to_album != $picture['parent_album'] && is_file($config['basedir'].'plog-content/images/'.$target_path."/".$unique_filename_base.".".$filename_ext)){
+                $unique_filename_base = $filename_base." (" . ++$i . ")";
+        }
+
+        // final fully qualified file name
+        $picture_path = $target_path.'/'.$unique_filename_base.".".$filename_ext;
+        $final_fqfn = $config['basedir'].'plog-content/images/'.$picture_path;
+
+        if (!rename($config['basedir']."plog-content/images/".SmartStripSlashes($picture['path']), $final_fqfn)) {
+                return array('errors' => sprintf(plog_tr("Could not move file! %s to %s"),$picture['path'],$final_fqfn));
+        }
 
         // update database
         $sql = "UPDATE ".TABLE_PREFIX."pictures SET
-                        path = '$new_path',
-                        parent_album = '$to_album',
-                        parent_collection = '$new_collection'
-                WHERE id = '$pic_id'";
+                        path = '".mysql_real_escape_string($picture_path)."',
+                        parent_album = '".$to_album."',
+                        parent_collection = '".$new_collection."'
+                WHERE id = '".$pic_id."'";
         if (!mysql_query($sql)) {
                 return array('errors' => mysql_error());
-        };
+        }
         return array('output' => plog_tr('Success'));
 }
@@ -297 +308 @@
         if (empty($collection_name)) {
                 return array("errors" => plog_tr("Please enter a valid name for the collection"));
-        };
-
-        // do not allow collections with duplicate names, otherwise mod_rewritten links will start
-        // to behave weird.
-        $collection_exists = get_collection_by_name($collection_name);
-        if ($collection_exists) {
-                return array("errors" => sprintf(plog_tr('New collection could not be created, because there already is one named `%s`!'),$collection_exists));
         }
 
@@ -311 +315 @@
         // anyway
         $create_path = $config["basedir"] . "plog-content/images/".$collection_folder;
+
+        // do not allow collections with duplicate names, otherwise mod_rewritten links will start
+        // to behave weird.
+        if (is_dir($create_path)) {
+                // if there is already a directory, check to see if it's in the database
+                $collection_data = get_collection_by_name($collection_name);
+                if ($collection_data){
+                        // it's in the database, so throw duplicate collection error
+                        return array("errors" => sprintf(plog_tr('New collection could not be created, because there already is one named `%s`!'),$collection_name));
+                } else{
+                        // it's not in the database so attempt to delete the directory
+                        if (!@rmdir($target_path)){
+                                // could not delete the directory, so prompt the user to delete it manually
+                                return array("errors" => sprintf(plog_tr('Collection directory `%s` exists, but no collection exists in the database. Attempt to delete automatically failed. Please delete folder via FTP manually and try again.'), $target_path));
+                        }
+                }
+        }
 
         // create directory
@@ -324 +345 @@
 
                 $output .= sprintf(plog_tr('You have successfully created the collection <strong>%s</strong>'),$collection_name);    
-        };
+        }
 
         // caller can check the value of id, if it is zero, then collection creation failed
@@ -346 +367 @@
         if (empty($name)) {
                 return array("errors" => plog_tr("Please enter a valid name for the collection"));
-        };
+        }
 
         $target_name = strtolower(sanitize_filename($name));
@@ -367 +388 @@
         $row = mysql_fetch_assoc($result);
 
-        // do not allow collections with duplicate names, otherwise mod_rewritten links will start
-        // to behave weird.
-        $collection_exists = get_collection_by_name($name);
-        if ($row["name"] != $name && $collection_exists) {
-                return array("errors" => sprintf(plog_tr('Collection `%s could not be renamed to `%s, because there is another collection with that name'),$row['name'],$name));
-        }
-
         $source_collection_name = SmartStripSlashes($row["collection_path"]);
         $source_path = $config["basedir"] . "plog-content/images/".$source_collection_name;
         $target_path = $config["basedir"] . "plog-content/images/".$target_name;
 
+        // do not allow collections with duplicate names, otherwise mod_rewritten links will start
+        // to behave weird.
+        if ($row["name"] != $name && is_dir($target_path)) {
+                // if there is already a directory, check to see if it's in the database
+                $collection_data = get_collection_by_name($name);
+                if ($collection_data){
+                        // it's in the database, so throw duplicate collection error
+                        return array("errors" => sprintf(plog_tr('Collection `%s` could not be renamed to `%s`, because there is another collection with that name'),$row['name'],$name));
+                } else{
+                        // it's not in the database so attempt to delete the directory
+                        if (!@rmdir($target_path)){
+                                // could not delete the directory, so prompt the user to delete it manually
+                                return array("errors" => sprintf(plog_tr('Collection directory `%s` exists, but no collection exists in the database. Attempt to delete automatically failed. Please delete folder via FTP manually and try again.'), $target_path));
+                        }
+                }
+        }
+
         // perform the rename on the directory
         if (!rename($source_path, $target_path)) {
                 return array("errors" => sprintf(plog_tr("Error renaming directory! (%s to %s)"),$source_path,$target_path));
-        };
+        }
 
         $target_name = mysql_real_escape_string($target_name);
@@ -389 +420 @@
         if (!$result) {
                 return array("errors" => mysql_error());
-        };
+        }
 
         $output = plog_tr('You have successfully modified the selected collection.');
@@ -494 +525 @@
         if (empty($album_name)) {
                 return array("errors" => plog_tr("Please enter a valid name for the album"));
-        };
+        }
         // get the parent collection name
         $query = "SELECT c.path as collection_path FROM ". TABLE_PREFIX."collections c WHERE id = '$pid'";
@@ -504 +535 @@
         if (empty($row)) {
                 return array("errors" => plog_tr("No such collection"));
-        };
+        }
 
         $album_folder = strtolower(sanitize_filename($album_name));
@@ -511 +542 @@
         // will be unusable anyway
         $create_path = $config["basedir"] . "plog-content/images/".SmartStripSlashes($row["collection_path"])."/".$album_folder;
+
+        // check path so we are not creating duplicate albums within the same collection
+        if (is_dir($create_path)){
+                // if there is already a directory, check to see if it's in the database
+                $album_data = get_album_by_name($album_name, $pid);
+                if ($album_data) {
+                        // it's in the database, so throw duplicate album error
+                        return array("output" => "existing", "id" => $album_data['id'], "errors" => sprintf(plog_tr('New album could not be created, because there already is one named `%s` in the collection `%s`!'), $album_folder, SmartStripSlashes($row['collection_path'])));
+                } else {
+                        // it's not in the database so attempt to delete the directory
+                        if (!@rmdir($create_path)){
+                                // could not delete the directory, so prompt the user to delete it manually
+                                return array("errors" => sprintf(plog_tr('Album directory `%s` exists, but no album exists in the database. Attempt to delete automatically failed. Please delete folder via FTP manually and try again.'), $create_path));
+                        }
+                }
+        }
 
         if (!makeDirs($create_path, 0777)) {
@@ -523 +570 @@
 
                 $output .= sprintf(plog_tr('You have successfully created the album <strong>%s</strong>'),$album_name);
-        };
+        }
         // caller can check the value of id, if it is zero, then album creation failed
         // errors and output are separate, because this way the caller can format the return value
@@ -561 +608 @@
         $target_path = $config['basedir'] . "plog-content/images/".$source_collection_name."/".$target_name;
 
+        // check path so we are not creating duplicate albums within the same collection
+        if (is_dir($target_path)){
+                // if there is already a directory, check to see if it's in the database
+                $album_data = get_album_by_name($album_name, $to_collection);
+                if ($album_data) {
+                        // it's in the database, so throw duplicate album error
+                        return array("errors" => sprintf(plog_tr('New album could not be created, because there already is one named `%s` in the collection `%s`!'), $target_name, $source_collection_name));
+                } else {
+                        // it's not in the database so attempt to delete the directory
+                        if (!@rmdir($target_path)){
+                                // could not delete the directory, so prompt the user to delete it manually
+                                return array("errors" => sprintf(plog_tr('Album directory `%s` exists, but no album exists in the database. Attempt to delete automatically failed. Please delete folder via FTP manually and try again.'), $target_path));
+                        }
+                }
+        }
+
         // perform the rename on the directory
         if (!rename($source_path, $target_path))
@@ -566 +629 @@
                 return array(
                         "errors" => sprintf(plog_tr("Error renaming directory! (%s to %s)"),$source_path,$target_path));
-        };
+        }
 
         $target_name = mysql_real_escape_string($target_name);
@@ -581 +644 @@
         if (!$result) {
                 return array("errors" => mysql_error());
-        };
+        }
 
         $output .= plog_tr('You have successfully modified the selected album.');
@@ -632 +695 @@
 }
 
-function move_album($album_id,$to_collection) {
+function move_album($album_id, $to_collection) {
         global $config;
 
@@ -665 +728 @@
         $target_path = $config['basedir']."plog-content/images/".$target_collection_name."/".$source_album_name;
 
+        // check path so we are not creating duplicate albums within the same collection
+        if (is_dir($target_path)){
+                // if there is already a directory, check to see if it's in the database
+                $album_data = get_album_by_name($source_album_name, $to_collection);
+                if ($album_data) {
+                        // it's in the database, so throw duplicate album error
+                        return array("errors" => sprintf(plog_tr('New album could not be created, because there already is one named `%s` in the collection `%s`!'), $source_album_name, $target_collection_name));
+                } else {
+                        // it's not in the database so attempt to delete the directory
+                        if (!@rmdir($target_path)){
+                                // could not delete the directory, so prompt the user to delete it manually
+                                return array("errors" => sprintf(plog_tr('Album directory `%s` exists, but no album exists in the database. Attempt to delete automatically failed. Please delete folder via FTP manually and try again.'), $target_path));
+                        }
+                }
+        }
+
         // attempt to make new album directory in target collection
-        @mkdir($target_path, 0775);
+        if (!makeDirs($target_path, 0777)) {
+                return array("errors" => sprintf(plog_tr('Could not create directory `%s`!'),$target_path));
+        }
 
         //if (!rename($source_path, $target_path))
@@ -685 +766 @@
 
                 if (!rename($old_path, $new_path))
-                        $res['errors'] .=  sprintf(plog_tr("Could not move file! %s to %s"),$old_path,$new_path);
+                        $res['errors'] .=  sprintf(plog_tr("Could not move file! `%s` to `%s`"),$old_path,$new_path);
 
                 $path_insert = mysql_real_escape_string($target_collection_name."/".$source_album_name."/".$filename);
@@ -699 +780 @@
         $query = "UPDATE ".TABLE_PREFIX."albums SET `parent_id` = '$to_collection' WHERE `id`='$album_id'";
         $result = run_query($query);
+
+        // attempt to delete the old folder if there were no errors moving the files
+        if ($res['errors'] == ''){
+                @chmod($source_path,0777);
+                if (!rmdir($source_path)) {
+                        return array("errors" => sprintf(plog_tr('Could not remove album from collection `%s`. Album still contains files after all pictures have been moved.'), $source_collection_name));
+                }
+        }
 
         return $res;
@@ -1068 +1157 @@
         $parent_collection = intval($parent_collection);
         $output = "\n\t\t" . '<input type="button" class="submit" id="show-album" onclick="toggle(\'create-album\'); toggle(\'show-album\')" value="' . plog_tr('Create an Album') . '" />';
-        $output .= "\n\t\t" . '<form action="'.$_SERVER["PHP_SELF"].'" method="post">
+        $output .= "\n\t\t" . '<form action="'.$_SERVER["REQUEST_URI"].'" method="post">
                         <div id="create-album" class="cssbox-green" style="width: 385px !important; display: none;">
                                 <div class="cssbox_head-green"><h2>' . plog_tr('Create an Album') . '</h2></div>
@@ -1089 +1178 @@
         $output = '';
         $collection_id = intval($collection_id);
-        $output .= "\n\t\t" . '<form class="edit" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+        $output .= "\n\t\t" . '<form class="edit" action="'.$_SERVER["REQUEST_URI"].'" method="post">';
         $collection = get_collection_by_id($collection_id);