temp virus scan dir move to tmp/ rather than uploads/

config.php

@@ -58,7 +58,6 @@ function defineOnce($key, $value) {
 if (!defined('APP_LOCATION'))   define('APP_LOCATION',substr($_SERVER['SCRIPT_NAME'], 1, strrpos($_SERVER['SCRIPT_NAME'], '/')));
 if (!defined('APP_BASE'))       define('APP_BASE',substr(APP_LOCATION, 0, strrpos(APP_LOCATION, '/', -2)));
 if (!defined('APP_PATH'))       define('APP_PATH', realpath(dirname(__FILE__)));
-if (!defined('UPLOAD_PATH'))    define('UPLOAD_PATH', realpath(APP_PATH . '/uploads'));
 if (!defined('LIB_PATH'))       define('LIB_PATH', realpath(APP_PATH . '/lib'));
 if (!defined('CLASSES_PATH'))   define('CLASSES_PATH', realpath(LIB_PATH . '/classes'));
 
@@ -1309,6 +1308,7 @@ function defineOnce($key, $value) {
 defineOnce('CONTROLLERS_DIR', dirname(__FILE__) . '/controllers');
 defineOnce('MUSTACHE_DIR', VIEWS_DIR . '/mustache');
 defineOnce('TEMP_DIR', dirname(__FILE__) . '/tmp');
+defineOnce('VIRUS_SCAN_DIR', TEMP_DIR . '/uploads');
 defineOnce('CACHE_DIR', TEMP_DIR . '/cache');
 
 defineOnce('DEFAULT_CONTROLLER_NAME', 'Home');

controllers/File.php

@@ -52,7 +52,10 @@ public function add($reference = '', $isW9 = false) {
                 $ext = end(explode(".", $name));
                 $fileName = File::uniqueFilename($ext);
             }
-            $path = UPLOAD_PATH . '/' . $fileName;
+            if (!is_dir(VIRUS_SCAN_DIR)) {
+                mkdir(VIRUS_SCAN_DIR, 0750);
+            }
+            $path = VIRUS_SCAN_DIR . '/' . $fileName;
 
             $dest = fopen($path, 'w');
             while (!feof($source)) {

controllers/Upload.php

@@ -4,10 +4,7 @@ class UploadController extends Controller {
     public $view = null;
 
     function run($filename) {
-        $path = UPLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
-        if (!is_readable($path)) {
-            $path = APP_ATTACHMENT_URL . $filename;
-        }
+        $path = APP_ATTACHMENT_URL . $filename;
         $finfo = new finfo(FILEINFO_MIME);
         $content = file_get_contents($path);
         $file = new File();

lib/classes/ScanAssets.php

@@ -102,7 +102,7 @@ public function scanFile($id) {
         $file_name  = pathinfo(parse_url($row['url'],PHP_URL_PATH),PATHINFO_BASENAME);
 
         // Get the full path and prepare it for the command line.
-        $real_path = UPLOAD_PATH . '/' . $file_name;
+        $real_path = VIRUS_SCAN_DIR . '/' . $file_name;
         $safe_path = escapeshellarg($real_path);
         // Reset the values.
         $return = -1;
@@ -113,7 +113,6 @@ public function scanFile($id) {
         if (!empty($safe_path) && file_exists($real_path) && filesize($real_path) > 0 ) {
             // Execute the command.
             exec ($cmd, $out, $return);
-
             if ($return == 0) { //if clean update db
                 $sql = 'UPDATE `' . FILES . '` SET is_scanned = 1, scan_result = 0 WHERE `id` = ' . $id;
                 $notify = '';

setup.sh

@@ -12,7 +12,6 @@ SERVER_NAME=${WORKLIST_SERVER_NAME:="dev.worklist.net"}
 SERVER_CONFIG=$CURRENT_PATH/server.local.php
 CUSTOM_CONFIG=${WORKLIST_CUSTOM_CONFIG:=""}
 TMP_PATH=${WORKLIST_TMP_PATH:=$CURRENT_PATH/tmp}
-UPLOADS_PATH=${WORKLIST_UPLOADS_PATH:=$CURRENT_PATH/uploads}
 DEBUG_FILE=${WORKLIST_DEBUG_FILE:=$CURRENT_PATH/php.errors}
 
 # We assume that developers works on their own forked repos 
@@ -76,11 +75,4 @@ fi
 cp .htaccess_default .htaccess
 sed -i s/~unixusername/~$CURRENT_USER/g .htaccess
 sed -i s/sandboxdir/$SANDBOX_NAME/g .htaccess
-sed -i s/#RewriteBase/RewriteBase/g .htaccess
-
-# Uploads dir: same than tmp
-if [ ! -d  $UPLOADS_PATH ]
-then
-  mkdir $UPLOADS_PATH
-fi
-chmod -R 777 $UPLOADS_PATH
+sed -i s/#RewriteBase/RewriteBase/g .htaccess