Changeset 558

Timestamp:

07/15/08 13:36:59 (5 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)

Location:

trunk/plog-admin

Files:

• plog-admin-functions.php (modified) (24 diffs)
• plog-import.php (modified) (4 diffs)
• plog-manage.php (modified) (4 diffs)
• plog-upload.php (modified) (1 diff)

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

trunk/plog-admin/plog-import.php

@@ -47 +47 @@
 //print_r($_POST);
 
-if (isset($_POST['upload'])){
+if (isset($_POST['upload'])) {
 
         $destinations = isset($_POST['destinations']) ? $_POST['destinations'] : '';
@@ -59 +59 @@
         $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"];
                 }
@@ -93 +110 @@
                                                         // 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++;
-                                };
+                                }
 
                         }
@@ -108 +124 @@
                         $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";
-                }
-                else
-                $output .= "\n\t" . '<p class="errors">'.$result['output'].'</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";
+                        }*/
+                }
         }
 

trunk/plog-admin/plog-manage.php

@@ -132 +132 @@
 if (empty($_REQUEST['level'])) {
         $_REQUEST['level'] = '';
-};
+}
 
 // here we will determine if we need to perform a move or delete action.
@@ -186 +186 @@
 
                 if (isset($_REQUEST["selected"])) {
-                        foreach($_REQUEST["selected"] as $mov_id) {
+                        foreach ($_REQUEST["selected"] as $mov_id) {
 
                                 // if we are using pictures we need to update the parent_collection as well
@@ -196 +196 @@
                                         } else {
                                                 $output .= "\n\t" . '<p class="errors">' . $result['errors'] . '</p>' . "\n";
-                                        };
-                                }
-                                else if ($level == "albums") {
+                                        }
+                                } else if ($level == "albums") {
                                         // if we are moving entire albums then we need to rename the folder
                                         // $pid is our target collection id, $mov_id is our source album
@@ -207 +206 @@
                                         } else {
                                                 $output .= "\n\t" . '<p class="errors">' . $result['errors'] . '</p>' . "\n";
-                                        };
+                                        }
                                 }
 

trunk/plog-admin/plog-upload.php

@@ -108 +108 @@
                         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"];
+                                $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";
+                                }
+                        }
 
                 }