BUG: refs #0458. Added is_writable check to prevent breaking json parsing.

Michael Grauer · Michael Grauer · commit 548f25454b2e · 2012-01-18T14:20:18.000-05:00
diff --git a/core/controllers/components/HttpuploadComponent.php b/core/controllers/components/HttpuploadComponent.php
@@ -74,7 +74,7 @@ public function generateToken($args, $dirname = '')
 
     if(!file_exists($dir))
       {
-      if(!mkdir($dir, 0700, true))
+      if(!is_writable($dir) || !mkdir($dir, 0700, true))
         {
         throw new Exception('Failed to create temporary upload dir', MIDAS_HTTPUPLOAD_TMP_DIR_CREATION_FAILED);
         }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function generateToken($args, $dirname = '')`
`74`	`74`
`75`	`75`	`if(!file_exists($dir))`
`76`	`76`	`{`
`77`		`- if(!mkdir($dir, 0700, true))`
	`77`	`+ if(!is_writable($dir) \|\| !mkdir($dir, 0700, true))`
`78`	`78`	`{`
`79`	`79`	`throw new Exception('Failed to create temporary upload dir', MIDAS_HTTPUPLOAD_TMP_DIR_CREATION_FAILED);`
`80`	`80`	`}`