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

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)

Files:

• trunk/plog-admin/plog-upload.php (modified) (1 diff)

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";
+                                }
+                        }
 
                 }