Tweak temporary directory methods to support subdirectories

Author: Jamie Snape

core/GlobalController.php

@@ -339,19 +339,19 @@ public function getEnvironment()
      *
      * @return string
      */
-    protected function getDataDirectory($subdir = '')
+    protected function getDataDirectory($subDirectory = '', $createDirectory = true)
     {
-        return UtilityComponent::getDataDirectory($subdir);
+        return UtilityComponent::getDataDirectory($subDirectory, $createDirectory);
     }
 
     /**
      * get the midas temporary directory
      *
      * @return string
      */
-    protected function getTempDirectory($subdir = 'misc')
+    protected function getTempDirectory($subDirectory = 'misc', $createDirectory = true)
     {
-        return UtilityComponent::getTempDirectory($subdir);
+        return UtilityComponent::getTempDirectory($subDirectory, $createDirectory);
     }
 
     /** return an array of form element     */

core/controllers/components/UtilityComponent.php

@@ -341,7 +341,7 @@ public static function run_sql_from_file($db, $sqlfile)
     }
 
     /** Get the data directory */
-    public static function getDataDirectory($subdir = '')
+    public static function getDataDirectory($subDirectory = '', $createDirectory = true)
     {
         $settingModel = MidasLoader::loadModel('Setting');
 
@@ -359,26 +359,26 @@ public static function getDataDirectory($subdir = '')
             }
         }
 
-        if ($subdir == '') {
+        if ($subDirectory == '') {
             $path = $dataDirectory.'/';
         } else {
-            $path = $dataDirectory.'/'.$subdir.'/';
+            $path = $dataDirectory.'/'.$subDirectory.'/';
         }
 
-        if (is_writable($dataDirectory) && !file_exists($path)) {
+        if ($createDirectory && is_writable($dataDirectory) && !file_exists($path)) {
             mkdir($path, 0777, true);
         }
 
         return realpath($path);
     }
 
     /**
-     * @param $subdir
+     * @param $subDirectory
      * get the midas temporary directory, appending the param $subdir, which
      * defaults to "misc"
      * @return string
      */
-    public static function getTempDirectory($subdir = "misc")
+    public static function getTempDirectory($subDirectory = 'misc', $createDirectory = true)
     {
         $settingModel = MidasLoader::loadModel('Setting');
 
@@ -398,9 +398,9 @@ public static function getTempDirectory($subdir = "misc")
             }
         }
 
-        $path = $tempDirectory.'/'.$subdir;
+        $path = $tempDirectory.'/'.$subDirectory;
 
-        if (is_writable($tempDirectory) && !file_exists($path)) {
+        if ($createDirectory && is_writable($tempDirectory) && !file_exists($path)) {
             mkdir($path, 0777, true);
         }
 

core/models/MIDASModel.php

@@ -49,9 +49,9 @@ public function initialize()
      *
      * @return string
      */
-    protected function getTempDirectory()
+    protected function getTempDirectory($subDirectory = 'misc', $createDirectory = true)
     {
-        return UtilityComponent::getTempDirectory();
+        return UtilityComponent::getTempDirectory($subDirectory, $createDirectory);
     }
 
     /**