[VD] use tmbPath as tmp directory as fallback

Studio-42 · Apr 24, 2017 · f47a64d · f47a64d
1 parent 4560db0
commit f47a64d
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 14 deletions.
diff --git a/php/elFinderVolumeBox.class.php b/php/elFinderVolumeBox.class.php
@@ -796,9 +796,6 @@ protected function init()
             }
         }
 
-        if (!$this->tmp && is_writable($this->options['tmbPath'])) {
-            $this->tmp = $this->options['tmbPath'];
-        }
         if (!$this->tmp && ($tmp = elFinder::getStaticVar('commonTempPath'))) {
             $this->tmp = $tmp;
         }
@@ -821,6 +818,11 @@ protected function configure()
     {
         parent::configure();
 
+        // fallback of $this->tmp
+        if (!$this->tmp && $this->tmbPathWritable) {
+            $this->tmp = $this->tmbPath;
+        }
+
         $this->disabled[] = 'archive';
         $this->disabled[] = 'extract';
     }

diff --git a/php/elFinderVolumeDropbox2.class.php b/php/elFinderVolumeDropbox2.class.php
@@ -535,9 +535,6 @@ protected function init()
             }
         }
 
-        if (!$this->tmp && is_writable($this->options['tmbPath'])) {
-            $this->tmp = $this->options['tmbPath'];
-        }
         if (!$this->tmp && ($tmp = elFinder::getStaticVar('commonTempPath'))) {
             $this->tmp = $tmp;
         }
@@ -560,6 +557,11 @@ protected function configure()
     {
         parent::configure();
 
+        // fallback of $this->tmp
+        if (!$this->tmp && $this->tmbPathWritable) {
+        	$this->tmp = $this->tmbPath;
+        }
+
         $this->disabled[] = 'archive';
         $this->disabled[] = 'extract';
 

diff --git a/php/elFinderVolumeFTP.class.php b/php/elFinderVolumeFTP.class.php
@@ -217,7 +217,8 @@ protected function configure() {
 			$this->tmp = $tmp;
 		}
 
-		if (!$this->tmp && $this->tmbPath) {
+		// fallback of $this->tmp
+		if (!$this->tmp && $this->tmbPathWritable) {
 			$this->tmp = $this->tmbPath;
 		}
 

diff --git a/php/elFinderVolumeGoogleDrive.class.php b/php/elFinderVolumeGoogleDrive.class.php
@@ -110,6 +110,7 @@ public function __construct()
             'gdAlias' => '%s@GDrive',
             'googleApiClient' => '',
             'path' => '/',
+            'tmbPath' => '',
             'separator' => '/',
             'useGoogleTmb' => true,
             'acceptedName' => '#^[^/\\?*:|"<>]*[^./\\?*:|"<>]$#',
@@ -976,9 +977,6 @@ protected function init()
             }
         }
 
-        if (!$this->tmp && is_writable($this->options['tmbPath'])) {
-            $this->tmp = $this->options['tmbPath'];
-        }
         if (!$this->tmp && ($tmp = elFinder::getStaticVar('commonTempPath'))) {
             $this->tmp = $tmp;
         }
@@ -1005,6 +1003,11 @@ protected function configure()
     {
         parent::configure();
 
+        // fallback of $this->tmp
+        if (!$this->tmp && $this->tmbPathWritable) {
+        	$this->tmp = $this->tmbPath;
+        }
+
         $this->disabled[] = 'archive';
         $this->disabled[] = 'extract';
 

diff --git a/php/elFinderVolumeGroup.class.php b/php/elFinderVolumeGroup.class.php
@@ -26,6 +26,7 @@ public function __construct() {
 		$this->options['path'] = '/';
 		$this->options['dirUrlOwn'] = true;
 		$this->options['syncMinMs'] = 0;
+		$this->options['tmbPath'] = '';
 		$this->options['disabled'] = array(
 			'archive',
 			'cut',

diff --git a/php/elFinderVolumeMySQL.class.php b/php/elFinderVolumeMySQL.class.php
@@ -148,7 +148,8 @@ protected function configure() {
 			$this->tmpPath = $tmp;
 		}
 
-		if (!$this->tmpPath && $this->tmbPath && $this->tmbPathWritable) {
+		// fallback of $this->tmp
+		if (!$this->tmpPath && $this->tmbPathWritable) {
 			$this->tmpPath = $this->tmbPath;
 		}
 

diff --git a/php/elFinderVolumeOneDrive.class.php b/php/elFinderVolumeOneDrive.class.php
@@ -747,9 +747,6 @@ protected function init()
             }
         }
 
-        if (!$this->tmp && is_writable($this->options['tmbPath'])) {
-            $this->tmp = $this->options['tmbPath'];
-        }
         if (!$this->tmp && ($tmp = elFinder::getStaticVar('commonTempPath'))) {
             $this->tmp = $tmp;
         }
@@ -783,6 +780,11 @@ protected function configure()
     {
         parent::configure();
 
+        // fallback of $this->tmp
+        if (!$this->tmp && $this->tmbPathWritable) {
+        	$this->tmp = $this->tmbPath;
+        }
+
         $this->disabled[] = 'archive';
         $this->disabled[] = 'extract';
     }