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

Timestamp:

May 24, 2015 3:01:42 PM (9 years ago)

Author:

anonymous

Message:

First set of changes towards 2.2.0. Improved functinoality with integration in wordpress; bugs fixed.

File:

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

trunk/lib/Upload.inc.php

@@ -80 +80 @@
 
         if (isset($params) && is_array($params)) {
-
             // Enforce valid upload_path parameter.
             if (isset($params['upload_path'])) {
-                $upload_path = realpath($params['upload_path']);
                 // Source must be directory.
-                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($upload_path, isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
+                if (!is_dir($params['upload_path'])) {
+                    $app->logMsg(sprintf('Attempting to auto-create upload directory: %s', $params['upload_path']), LOG_NOTICE, __FILE__, __LINE__);
+                    mkdir($params['upload_path'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
+                    if (is_dir($params['upload_path'])) {
+                        $app->logMsg(sprintf('Created upload directory: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
                     } else {
-                        mkdir($upload_path, isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'));
-                    }
-                    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);
+                        $app->logMsg(sprintf('Upload directory not found: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
+                        trigger_error(sprintf('Upload directory not found: %s', $params['upload_path']), E_USER_ERROR);
                     }
                 }
                 // Source must be writable.
-                if (!is_writable($upload_path)) {
+                if (!is_writable($params['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);
@@ -189 +184 @@
             if ('' == trim($files['name'][$i])) {
                 // User may not have attached a file.
+                $app->logMsg(sprintf('Skipping file %s with empty name', $i), LOG_DEBUG, __FILE__, __LINE__);
                 continue;
             }