Added configurable permission for creating folders

dotblue · Feb 27, 2015 · 6e7471a · 6e7471a
1 parent 7d0df26
commit 6e7471a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/examples/config.neon b/examples/config.neon
@@ -2,6 +2,7 @@ extensions:
 	webimages: DotBlue\WebImages\Extension
 
 webimages:
+	umask: 0777 # default FALSE
 	providers:
 		- DefaultImageProvider(%wwwDir%)
 		- FakeImageProvider

diff --git a/src/Extension.php b/src/Extension.php
@@ -14,6 +14,7 @@ class Extension extends DI\CompilerExtension
 
 	/** @var array */
 	private $defaults = [
+		'umask' => FALSE,
 		'routes' => [],
 		'prependRoutesToRouter' => TRUE,
 		'rules' => [],
@@ -35,6 +36,7 @@ public function loadConfiguration()
 		$generator = $container->addDefinition($this->prefix('generator'))
 			->setClass('DotBlue\WebImages\Generator', [
 				$config['wwwDir'],
+				$config['umask'],
 			]);
 
 		foreach ($config['rules'] as $rule) {

diff --git a/src/Generator.php b/src/Generator.php
@@ -33,12 +33,16 @@ class Generator extends Nette\Object
 
 	/** @var IProvider[] */
 	private $providers = [];
+
+	/** @var integer */
+	private $umask;
 
 
 
-	public function __construct($wwwDir, Http\IRequest $httpRequest, Http\IResponse $httpResponse, Validator $validator)
+	public function __construct($wwwDir, $umask, Http\IRequest $httpRequest, Http\IResponse $httpResponse, Validator $validator)
 	{
 		$this->wwwDir = $wwwDir;
+		$this->umask = $umask;
 		$this->httpRequest = $httpRequest;
 		$this->httpResponse = $httpResponse;
 		$this->validator = $validator;
@@ -91,10 +95,7 @@ public function generateImage(ImageRequest $request)
 
 		$dirname = dirname($destination);
 		if (!is_dir($dirname)) {
-			$success = @mkdir($dirname, 0777, TRUE);
-			if (!$success) {
-				throw new Application\BadRequestException;
-			}
+			$this->createFolder($dirname);
 		}
 
 		$success = $image->save($destination, 90, $format);
@@ -105,5 +106,22 @@ public function generateImage(ImageRequest $request)
 		$image->send();
 		exit;
 	}
+
+
+
+	private function createFolder($dirname)
+	{
+		if ($this->umask) {
+			$oldmask = umask(0);
+			$success = @mkdir($dirname, octdec($this->umask), TRUE);
+			umask($oldmask);
+		} else {
+			$success = @mkdir($dirname, 0777, TRUE);
+		}
+
+		if (!$success) {
+			throw new Application\BadRequestException;
+		}
+	}
 
 }