Changeset 286 for branches/1.1dev/lib

Timestamp:

Oct 21, 2007 1:01:28 AM (17 years ago)

Author:

quinn

Message:

 

File:

• branches/1.1dev/lib/Upload.inc.php (modified) (1 diff)

branches/1.1dev/lib/Upload.inc.php

@@ -370 +370 @@
             if ($num == 1) {
                 // Single upload.
-                if (isset($custom_file_name) && '' != $custom_file_name) {
-                    // Valid custom file name.
-                    $file_name = $custom_file_name;
-                    if ($this->display_messages) {
-                        raiseMsg(sprintf(_("The file <strong>%s</strong> has been renamed to <strong>%s</strong>."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                if (isset($custom_file_name)) {
+                    if (is_array($custom_file_name) && sizeof($custom_file_name) == 1) {
+                        // Is an array, but just one value. Pull it out.
+                        $custom_file_name = current($custom_file_name);
+                        raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                        logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                    } else if (!is_array($custom_file_name) && '' != $custom_file_name) {
+                        // Valid custom file name.
+                        $file_name = $custom_file_name;
+                        raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                        logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                    } else {
+                        // Invalid custom file name provided. Use uploaded file name.
+                        $file_name = $files['name'][$i];
+                        logMsg(sprintf('Custom filename invalid! Using uploaded file name: %s', $file_name), LOG_WARNING, __FILE__, __LINE__);
                     }
-                    logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
-                } else {
-                    // Invalid custom file name provided. Use uploaded file name.
-                    $file_name = $files['name'][$i];
-                    logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
-                }
+                } else {
+                    // Normal case. Use uploaded file name.
+                    $file_name = $files['name'][$i];
+                    logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                }
             } else {
                 // Multiple upload. Final file names must be array.