Changeset 558 for trunk/plog-admin/plog-import.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-import.php (modified) (4 diffs)

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