- Timestamp:
- Dec 30, 2015 5:11:44 AM (8 years ago)
- Location:
- trunk/lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/App.inc.php
r557 r558 1486 1486 } 1487 1487 1488 if (!isset($_SESSION['_app'][$this->_ns]['boomerang']) ) {1489 $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set .', $id), LOG_DEBUG, __FILE__, __LINE__);1488 if (!isset($_SESSION['_app'][$this->_ns]['boomerang']) || !is_array($_SESSION['_app'][$this->_ns]['boomerang']) || empty($_SESSION['_app'][$this->_ns]['boomerang'])) { 1489 $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set, not an array, or empty.', $id), LOG_DEBUG, __FILE__, __LINE__); 1490 1490 return false; 1491 1491 } … … 1496 1496 $added_time = $_SESSION['_app'][$this->_ns]['boomerang'][$id]['added_time']; 1497 1497 } else if (!isset($id) || $use_nonspecificboomerang) { 1498 // Use nonspecific boomerang if available.1498 // Use most recent, non-specific boomerang if available. 1499 1499 $url = end($_SESSION['_app'][$this->_ns]['boomerang'])['url']; 1500 1500 $added_time = end($_SESSION['_app'][$this->_ns]['boomerang'])['added_time']; -
trunk/lib/Cache.inc.php
r537 r558 189 189 $_SESSION['_cache'][$this->_ns][$key] =& $var; 190 190 191 $app->logMsg(sprintf('Set cache item â%sâ', $key), LOG_DEBUG, __FILE__, __LINE__); 192 191 193 if ($var_len >= 1024000) { 192 194 $app->logMsg(sprintf('Successfully cached oversized variable (%s bytes).', $var_len), LOG_DEBUG, __FILE__, __LINE__); … … 262 264 263 265 if (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns])) { 266 $app->logMsg(sprintf('Deleting cache item â%sâ', $key), LOG_DEBUG, __FILE__, __LINE__); 264 267 unset($_SESSION['_cache'][$this->_ns][$key]); 265 268 return true; -
trunk/lib/Upload.inc.php
r530 r558 276 276 // Check to be sure the file has a valid file name extension. 277 277 if (!in_array(mb_strtolower(self::getFilenameExtension($file_name)), $this->getParam('valid_file_extensions'))) { 278 // TODO: Add option to allow any exten tion to be uploaded.278 // TODO: Add option to allow any extension to be uploaded. 279 279 $this->_raiseMsg(sprintf(_("The file %s failed uploading: it is an unrecognized type. Files must have one of the following file name extensions: %s."), $file_name, join(', ', $this->getParam('valid_file_extensions'))), MSG_ERR, __FILE__, __LINE__); 280 280 $app->logMsg(sprintf('The uploaded file %s has an unrecognized file name extension.', $file_name), LOG_WARNING, __FILE__, __LINE__); … … 293 293 // If the file name has no extension, use the mime-type to choose one. 294 294 if (!preg_match('/\.[^.]{1,5}$/', $file_name) && function_exists('mime_content_type')) { 295 // TODO: will this run if an exten tion is filtered by 'valid_file_extensions'?295 // TODO: will this run if an extension is filtered by 'valid_file_extensions'? 296 296 if ($ext = array_search(mime_content_type($files['tmp_name'][$i]), $this->mime_extension_map)) { 297 297 $file_name .= ".$ext";
Note: See TracChangeset
for help on using the changeset viewer.