Changeset 286

Timestamp:

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

Author:

quinn

Message:

 

Files:

• branches/1.1dev/lib/Upload.inc.php (modified) (1 diff)
• tags/2.0.2/lib/App.inc.php (modified) (3 diffs)
• trunk/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.

tags/2.0.2/lib/App.inc.php

@@ -668 +668 @@
         // Get the first delimiter that is needed in the url.
         $delim = strpos($url, '?') !== false ? ini_get('arg_separator.output') : '?';
-
+        
+        // Separate any #anchor component.
+        preg_match('/^([^#]+)#([^#]+)$/i', $url, $anchor_match);
+        if (isset($anchor_match[2])) {
+            $url = $anchor_match[1];
+            $anchor = '#' . $anchor_match[2];
+        } else {
+            $anchor = '';
+        }
 
         $q = '';
@@ -674 +682 @@
             // Join the global _carry_queries and local one_time_carry_queries.
             $query_args = urlEncodeArray(array_merge($_this->_carry_queries, $one_time_carry_queries));
-            foreach ($query_args as $key=>$val) {
+            foreach ($query_args as $key => $val) {
                 // Check value is set and value does not already exist in the url.
                 if (!preg_match('/[?&]' . preg_quote($key) . '=/', $url)) {
@@ -711 +719 @@
             && !preg_match('/[?&]' . preg_quote(session_name()) . '=/', $url)
         ) {
-            $url .= $q . $delim . session_name() . '=' . session_id();
-            return $url;
-        } else {
-            $url .= $q;
-            return $url;
-        }
+            $q .= $delim . session_name() . '=' . session_id();
+        }
+
+        return $url . $q . $anchor;
     }
 

trunk/lib/Upload.inc.php

@@ -174 +174 @@
             if ($num == 1) {
                 // Single upload.
-                if (isset($custom_file_name) && '' != $custom_file_name) {
-                    // Valid custom file name.
-                    $file_name = $custom_file_name;
-                    $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
-                    $app->logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __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);
+                        $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                        $app->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;
+                        $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                        $app->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];
+                        $app->logMsg(sprintf('Custom filename invalid! Using uploaded file name: %s', $file_name), LOG_WARNING, __FILE__, __LINE__);
+                    }
                 } else {
-                    // Invalid custom file name provided. Use uploaded file name.
+                    // Normal case. Use uploaded file name.
                     $file_name = $files['name'][$i];
                     $app->logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);