Ticket #169: duplicate_album_fix.patch

plog-admin/plog-admin-functions.php

@@ -41 +41 @@
 
         $result = array(
                 'output' => '',
+                'errors' => '',
                 'picture_id' => false,
         );
 
@@ -296 +297 @@
         $collection_name = trim(SmartStripSlashes($collection_name));
         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));
         }
 
         $collection_folder = strtolower(sanitize_filename($collection_name));
@@ -311 +305 @@
         // 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
         if (!makeDirs($create_path, 0777)) {
                 $errors .= sprintf(plog_tr("Could not create directory %s!"),$create_path);
@@ -323 +334 @@
                 $id = mysql_insert_id();
 
                 $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
         // errors and output are separate, because this way the caller can format the return value
@@ -345 +356 @@
         $name = trim(SmartStripSlashes($name));
         if (empty($name)) {
                 return array("errors" => plog_tr("Please enter a valid name for the collection"));
-        };
+        }
 
         $target_name = strtolower(sanitize_filename($name));
 
@@ -366 +377 @@
         $result = run_query($sql);
         $row = mysql_fetch_assoc($result);
 
+        $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.
-        $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));
+        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));
+                        }
+                }
         }
 
-        $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;
-
         // 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);
 
@@ -388 +409 @@
         $result = mysql_query($query);
         if (!$result) {
                 return array("errors" => mysql_error());
-        };
+        }
 
         $output = plog_tr('You have successfully modified the selected collection.');
 
@@ -493 +514 @@
         $album_name = trim(SmartStripSlashes($album_name));
         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'";
 
@@ -503 +524 @@
         // this shouldn't happen
         if (empty($row)) {
                 return array("errors" => plog_tr("No such collection"));
-        };
+        }
 
         $album_folder = strtolower(sanitize_filename($album_name));
 
@@ -511 +532 @@
         // 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)) {
                 $errors .= sprintf(plog_tr("Could not create directory %s!"),$path);
         } else {
@@ -522 +559 @@
                 $id = mysql_insert_id();
 
                 $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
         // as it needs
@@ -561 +598 @@
         $source_path = $config['basedir'] . "plog-content/images/".$source_collection_name."/".$source_album_name;
         $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))
         {
                 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 +634 @@
         $result = mysql_query($query);
         if (!$result) {
                 return array("errors" => mysql_error());
-        };
+        }
 
         $output .= plog_tr('You have successfully modified the selected album.');
 
@@ -632 +685 @@
         };
 }
 
-function move_album($album_id,$to_collection) {
+function move_album($album_id, $to_collection) {
         global $config;
 
         $res = array(
@@ -665 +718 @@
         $source_path = $config['basedir']."plog-content/images/".$source_collection_name."/".$source_album_name;
         $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))
         //  $output .= '<p class="errors">Could not rename directory!</p>';
@@ -685 +756 @@
                 $new_path = $target_path."/".$filename;
 
                 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);
 
@@ -700 +771 @@
         $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;
 }
 
@@ -1069 +1148 @@
 function plog_add_album_form($parent_collection) {
         $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>
                                 <div class="cssbox_body-green">
@@ -1090 +1169 @@
         global $config, $thumbnail_config;
         $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);
 
         $auto_graphic = $config['gallery_url']."plog-admin/images/auto.gif";

plog-admin/plog-import.php

@@ -46 +46 @@
 // Check if update has been clicked, handle erroneous conditions, or upload
 //print_r($_POST);
 
-if (isset($_POST['upload'])){
+if (isset($_POST['upload'])) {
 
         $destinations = isset($_POST['destinations']) ? $_POST['destinations'] : '';
         $captions = $_POST['captions'];
@@ -58 +58 @@
 
         $files = get_files($config['basedir'] . 'plog-content/uploads');
 
-        if ($_POST['destination_radio'] == "new" && $_POST["new_album_name"] == ""){
+        if ($_POST['destination_radio'] == "new" && $_POST["new_album_name"] == "") {
                 $output .= "\n\t" . '<p class="errors">' . plog_tr('New album name not specified!') . '</p>' . "\n";
-        }
-        else {
+        } else {
 
                 if ($_POST["destination_radio"] == "new"){
                         // Create the new album
-                        $result = add_album($_POST["new_album_name"], NULL, $_POST["collections_menu"]);
-                        $album_id = $result["id"];
-                }
-                else
-                {
+                        $result = add_album($_POST['new_album_name'], NULL, $_POST['collections_menu']);
+                        if (!$result['errors']) {
+                                // no errors, add images to new album
+                                $album_id = $result['id'];
+                        } else {
+                                // errors exist, let's find out what they are
+                                if (isset($result['output']) && $result['output'] == "existing" && isset($result['id'])) {
+                                        // album already exists so try insert images into the existing album
+                                        // and alert the user that their "new" album is already existing
+                                        $album_id = $result['id'];
+                                        // get the collection name for display
+                                        $sql = "SELECT `name` FROM ".TABLE_PREFIX."collections WHERE id = ".intval($_REQUEST['collections_menu']);
+                                        $result = run_query($sql);
+                                        $row = mysql_fetch_assoc($result);
+                                        $output .= "\n\t" . '<p class="actions">'.sprintf(plog_tr('Album already exists. Uploading file to existing album `%s` in collection `%s`'), $_REQUEST['new_album_name'], $row['name']).'</p>' . "\n";
+                                } else {
+                                        // error has nothing to do with an existing album, show the returned error
+                                        $album_id = '';
+                                        $output .= "\n\t" . '<p class="errors">' . $result['errors'] . '</p>' . "\n";
+                                }
+                        }
+                } else {
+                        // use an existing album
                         $album_id = $_POST["destination"];
                 }
 
@@ -92 +109 @@
                                                         $imported++;
                                                         // delete thumbnail file if it exists
                                                         $thumbpath = $config['basedir'] . 'plog-content/thumbs/import-'.substr($file_key,0,2).'-'.basename($file_name);
-                                                        if (is_file($thumbpath) && is_readable($thumbpath))
-                                                        {
+                                                        if (is_file($thumbpath) && is_readable($thumbpath)) {
                                                                 unlink($thumbpath);
-                                                        };
-                                                };
+                                                        }
+                                                }
                                         }
 
                                         $counter++;
-                                };
+                                }
 
                         }
 
                         // get album name for display
                         $sql = "SELECT name FROM ".TABLE_PREFIX."albums WHERE id = $album_id";
                         $result = run_query($sql);
-
                         $row = mysql_fetch_assoc($result);
 
                         $output .= "\n\t" . '<p class="actions">'.sprintf(plog_tr('%d picture(s) were successfully imported to album <strong>%s</strong>'),$imported,$row['name']). '</p>' . "\n";
 
-                        if ($imported == 0)
-                        $output .= "\n\t" . '<p class="errors">' . plog_tr('Make sure to CHMOD 777 your newly created folders within the \'plog-content/uploads/\' directory or else Plogger cannot access them. Plogger cannot CHMOD the directory for you while PHP is in safe mode.') . '</p>' . "\n";
+                        if ($imported == 0) {
+                                $output .= "\n\t" . '<p class="errors">' . plog_tr('Make sure to CHMOD 777 your newly created folders within the \'plog-content/uploads/\' directory or else Plogger cannot access them. Plogger cannot CHMOD the directory for you while PHP is in safe mode.') . '</p>' . "\n";
+                        }
+                        /* what is this for?
+                        else {
+                                $output .= "\n\t" . '<p class="errors">'.$result['output'].'</p>' . "\n";
+                        }*/
                 }
-                else
-                $output .= "\n\t" . '<p class="errors">'.$result['output'].'</p>' . "\n";
-
         }
 
         // read the list again, so any newly created directories show up

plog-admin/plog-upload.php

@@ -106 +106 @@
                         $output .= "\n\t" . '<p class="errors">' . plog_tr('New album name not specified!') . '</p>' . "\n";
                 } else {
                         if ($_REQUEST["destination_radio"] == "new"){
-                                // Create the new album
-                                $result = add_album(mysql_real_escape_string($_REQUEST["new_album_name"]), NULL, $_REQUEST["collections_menu"]);
-                                $album_id = $result["id"];
+                                // create a new album
+                                $result = add_album(mysql_real_escape_string($_REQUEST['new_album_name']), NULL, $_REQUEST['collections_menu']);
+                                if (!$result['errors']) {
+                                        // no errors, add uploaded image to new album
+                                        $album_id = $result['id'];
+                                } else {
+                                        // errors exist, let's find out what they are
+                                        if (isset($result['output']) && $result['output'] == "existing" && isset($result['id'])) {
+                                                // album already exists so try insert images into the existing album
+                                                // and alert the user that their "new" album is already existing
+                                                $album_id = $result['id'];
+                                                // get the collection name for display
+                                                $sql = "SELECT `name` FROM ".TABLE_PREFIX."collections WHERE id = ".intval($_REQUEST['collections_menu']);
+                                                $result = run_query($sql);
+                                                $row = mysql_fetch_assoc($result);
+                                                $output .= "\n\t" . '<p class="actions">'.sprintf(plog_tr('Album already exists. Uploading file to existing album `%s` in collection `%s`'), $_REQUEST['new_album_name'], $row['name']).'</p>' . "\n";
+                                        } else {
+                                                // error has nothing to do with an existing album, show the returned error
+                                                $album_id = '';
+                                                $output .= "\n\t" . '<p class="errors">' . $result['errors'] . '</p>' . "\n";
+                                        }
+                                }
                         } else {
+                                // use an existing album
                                 $album_id = $_REQUEST["albums_menu"];
                         }
 
-                        $result = add_picture($album_id,$_FILES["userfile"]["tmp_name"],$_FILES["userfile"]["name"],$_REQUEST["caption"], $_REQUEST["description"]);
-                        $output .= "\n\t" . '<p class="actions">'.$result["output"].'</p>' . "\n";
+                        if ($album_id){
+                                $result = add_picture($album_id,$_FILES["userfile"]["tmp_name"],$_FILES["userfile"]["name"],$_REQUEST["caption"], $_REQUEST["description"]);
+                                if (!$result['errors']) {
+                                        // added uploaded image successfully
+                                        $output .= "\n\t" . '<p class="actions">'.$result['output'].'</p>' . "\n";
+                                } else {
+                                        // errors adding the image, show the returned error
+                                        $output .= "\n\t" . '<p class="errors">' . $result['errors'] . '</p>' . "\n";
+                                }
+                        }
 
                 }
         }

plog-includes/plog-functions.php

@@ -728 +728 @@
                 return $album;
         }
 
-        function get_album_by_name($name) {
+        function get_album_by_name($name, $parent_id = 0) {
                 $sql = "SELECT *
-                FROM `".TABLE_PREFIX."albumss`
-                WHERE `name` = '".mysql_real_escape_string($name)."'";
+                FROM `".TABLE_PREFIX."albums`
+                WHERE `parent_id` = '".$parent_id."' AND `name` = '".mysql_real_escape_string($name)."'";
                 $result = run_query($sql);
 
                 if (mysql_num_rows($result) > 0){
@@ -781 +781 @@
                 return $collection;
         }
 
-        function get_collection_by_name($name) {
+        function get_collection_by_name($name, $parent_id = 0) {
                 $sql = "SELECT *
                 FROM `".TABLE_PREFIX."collections`
                 WHERE name = '".mysql_real_escape_string($name)."'";