Changeset 485 for trunk/lib/Upload.inc.php

Timestamp:

Aug 14, 2014 8:29:47 AM (10 years ago)

Author:

anonymous

Message:

Small bugs fixed while doing SBImedia

File:

• trunk/lib/Upload.inc.php (modified) (4 diffs)

trunk/lib/Upload.inc.php

@@ -82 +82 @@
             // Enforce valid upload_path parameter.
             if (isset($params['upload_path'])) {
-                $params['upload_path'] = realpath($params['upload_path']);
+                $upload_path = realpath($params['upload_path']);
                 // Source must be directory.
-                if (!is_dir($params['upload_path'])) {
-                    $app->logMsg(sprintf('Attempting to auto-create upload directory: %s', $params['upload_path']), LOG_NOTICE, __FILE__, __LINE__);
+                if (!is_dir($upload_path)) {
+                    $app->logMsg(sprintf('Attempting to auto-create upload directory: %s', $upload_path), LOG_NOTICE, __FILE__, __LINE__);
                     if (version_compare(PHP_VERSION, '5.0.0', '>=')) {
                         // Recursive.
-                        mkdir($params['upload_path'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
+                        mkdir($upload_path, isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
                     } else {
-                        mkdir($params['upload_path'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'));
+                        mkdir($upload_path, isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'));
                     }
-                    if (!is_dir($params['upload_path'])) {
+                    if (!is_dir($upload_path)) {
                         $app->logMsg(sprintf('Upload directory invalid: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
                         trigger_error(sprintf('Upload directory invalid: %s', $params['upload_path']), E_USER_ERROR);
@@ -98 +98 @@
                 }
                 // Source must be writable.
-                if (!is_writable($params['upload_path'])) {
+                if (!is_writable($upload_path)) {
                     $app->logMsg(sprintf('Upload directory not writable: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
                     trigger_error(sprintf('Upload directory not writable: %s', $params['upload_path']), E_USER_ERROR);
@@ -197 +197 @@
                     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);
+                        $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__);
@@ -520 +520 @@
         $app =& App::getInstance();
 
-        if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && $this->getParam('display_messages') & $type > 0)) {
+        if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && ($this->getParam('display_messages') & $type) > 0)) {
             $app->raiseMsg($message, $type, $file, $line);
         }