Do not assume that subdirectories of temporary and data directories e…

…xist
midasplatform · Nov 7, 2014 · 600f9ce · 600f9ce
1 parent b0c2a2f
commit 600f9ce
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 27 deletions.
diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php
@@ -344,25 +344,32 @@ public static function run_sql_from_file($db, $sqlfile)
     public static function getDataDirectory($subdir = '')
     {
         $settingModel = MidasLoader::loadModel('Setting');
+
         try {
             $dataDirectory = $settingModel->getValueByName('data_directory');
         } catch (Exception $e) {
             $dataDirectory = null;
         }
+
         if (!isset($dataDirectory) || empty($dataDirectory)) {
             if (getenv('midas_data_path') !== false) {
                 $dataDirectory = getenv('midas_data_path');
             } else {
                 $dataDirectory = BASE_PATH.'/data';
             }
         }
+
         if ($subdir == '') {
-            $dataDirectory .= '/';
+            $path = $dataDirectory.'/';
         } else {
-            $dataDirectory .= '/'.$subdir.'/';
+            $path = $dataDirectory.'/'.$subdir.'/';
+        }
+
+        if (is_writable($dataDirectory) && !file_exists($path)) {
+            mkdir($path, 0777, true);
         }
 
-        return $dataDirectory;
+        return realpath($path);
     }
 
     /**
@@ -374,13 +381,15 @@ public static function getDataDirectory($subdir = '')
     public static function getTempDirectory($subdir = "misc")
     {
         $settingModel = MidasLoader::loadModel('Setting');
+
         try {
             $tempDirectory = $settingModel->getValueByName('temp_directory');
         } catch (Exception $e) {
             // if the setting model hasn't been installed, or there is no
             // value in the settings table for this, provide a default
             $tempDirectory = null;
         }
+
         if (!isset($tempDirectory) || empty($tempDirectory)) {
             if (getenv('midas_temp_path') !== false) {
                 $tempDirectory = getenv('midas_temp_path');
@@ -389,7 +398,13 @@ public static function getTempDirectory($subdir = "misc")
             }
         }
 
-        return $tempDirectory.'/'.$subdir;
+        $path = $tempDirectory.'/'.$subdir;
+
+        if (is_writable($tempDirectory) && !file_exists($path)) {
+            mkdir($path, 0777, true);
+        }
+
+        return realpath($path);
     }
 
     /**

diff --git a/data/assetstore/.gitignore → data/.gitignore b/data/assetstore/.gitignore → data/.gitignore
diff --git a/data/assetstore/.htaccess → data/.htaccess b/data/assetstore/.htaccess → data/.htaccess
diff --git a/data/thumbnail/.gitignore b/data/thumbnail/.gitignore
diff --git a/data/visualize/.gitignore b/data/visualize/.gitignore
diff --git a/tmp/.gitignore b/tmp/.gitignore
@@ -1 +1,3 @@
-pvw-data
+*
+!.gitignore
+!.htaccess
diff --git a/tmp/cache/db/.gitignore b/tmp/cache/db/.gitignore
diff --git a/tmp/cache/searchIndex/.gitignore b/tmp/cache/searchIndex/.gitignore
diff --git a/tmp/cache/translation/.gitignore b/tmp/cache/translation/.gitignore
diff --git a/tmp/exportTest/.gitignore b/tmp/exportTest/.gitignore
diff --git a/tmp/misc/.gitignore b/tmp/misc/.gitignore
diff --git a/tmp/remoteprocessing/.gitignore b/tmp/remoteprocessing/.gitignore
diff --git a/tmp/report/.gitignore b/tmp/report/.gitignore
diff --git a/tmp/visualize/.gitignore b/tmp/visualize/.gitignore