Changeset 286 for trunk/lib/Upload.inc.php
- Timestamp:
- Oct 21, 2007 1:01:28 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/Upload.inc.php
r259 r286 174 174 if ($num == 1) { 175 175 // Single upload. 176 if (isset($custom_file_name) && '' != $custom_file_name) { 177 // Valid custom file name. 178 $file_name = $custom_file_name; 179 $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__); 180 $app->logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__); 176 if (isset($custom_file_name)) { 177 if (is_array($custom_file_name) && sizeof($custom_file_name) == 1) { 178 // Is an array, but just one value. Pull it out. 179 $custom_file_name = current($custom_file_name); 180 $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__); 181 $app->logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__); 182 } else if (!is_array($custom_file_name) && '' != $custom_file_name) { 183 // Valid custom file name. 184 $file_name = $custom_file_name; 185 $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__); 186 $app->logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__); 187 } else { 188 // Invalid custom file name provided. Use uploaded file name. 189 $file_name = $files['name'][$i]; 190 $app->logMsg(sprintf('Custom filename invalid! Using uploaded file name: %s', $file_name), LOG_WARNING, __FILE__, __LINE__); 191 } 181 192 } else { 182 // Invalid custom file name provided. Use uploaded file name.193 // Normal case. Use uploaded file name. 183 194 $file_name = $files['name'][$i]; 184 195 $app->logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
Note: See TracChangeset
for help on using the changeset viewer.