[connector:php:local] options quarantine allows path

Pashkinz92 · Dec 21, 2014 · fcaaf63 · fcaaf63
1 parent 6a8e40f
commit fcaaf63
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/php/elFinderVolumeLocalFileSystem.class.php b/php/elFinderVolumeLocalFileSystem.class.php
@@ -60,16 +60,6 @@ protected function configure() {
 		$this->aroot = realpath($this->root);
 		$root = $this->stat($this->root);
 
-		if ($this->options['quarantine']) {
-			$this->attributes[] = array(
-				'pattern' => '~^'.preg_quote(DIRECTORY_SEPARATOR.$this->options['quarantine']).'$~',
-				'read'    => false,
-				'write'   => false,
-				'locked'  => true,
-				'hidden'  => true
-			);
-		}
-
 		// chek thumbnails path
 		if ($this->options['tmbPath']) {
 			$this->options['tmbPath'] = strpos($this->options['tmbPath'], DIRECTORY_SEPARATOR) === false
@@ -92,17 +82,35 @@ protected function configure() {
 		}
 
 		// check quarantine dir
+		$this->quarantine = '';
 		if (!empty($this->options['quarantine'])) {
-			$this->quarantine = $this->root.DIRECTORY_SEPARATOR.$this->options['quarantine'];
-			if ((!is_dir($this->quarantine) && !$this->_mkdir($this->root, $this->options['quarantine'])) || !is_writable($this->quarantine)) {
-				$this->archivers['extract'] = array();
-				$this->disabled[] = 'extract';
+			if ($this->options['quarantine'] !== basename($this->options['quarantine'])) {
+				if (is_dir($this->options['quarantine']) && is_writable($this->options['quarantine'])) {
+					$this->quarantine = $this->options['quarantine'];
+				}
+				$this->options['quarantine'] = '';
+			} else {
+				$this->quarantine = $this->root.DIRECTORY_SEPARATOR.$this->options['quarantine'];
+				if ((!is_dir($this->quarantine) && !$this->_mkdir($this->root, $this->options['quarantine'])) || !is_writable($this->quarantine)) {
+					$this->options['quarantine'] = $this->quarantine = '';
+				}
 			}
-		} else {
+		}
+
+		if (!$this->quarantine) {
 			$this->archivers['extract'] = array();
 			$this->disabled[] = 'extract';
 		}
 
+		if ($this->options['quarantine']) {
+			$this->attributes[] = array(
+					'pattern' => '~^'.preg_quote(DIRECTORY_SEPARATOR.$this->options['quarantine']).'$~',
+					'read'    => false,
+					'write'   => false,
+					'locked'  => true,
+					'hidden'  => true
+			);
+		}
 	}
 
 	/*********************************************************************/