[VD:abstract] fix notice error on options()

horkenw · Jul 16, 2016 · 4307093 · 4307093
1 parent 266b79f
commit 4307093
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php
@@ -969,7 +969,7 @@ public function mount(array $opts) {
 			$parts = explode(',', isset($this->options['uploadOrder']) ? $this->options['uploadOrder'] : 'deny,allow');
 			$this->uploadOrder = array(trim($parts[0]), trim($parts[1]));
 		} else { // telephat_mode off
-			$this->uploadOrder = $this->options['uploadOrder'];
+			$this->uploadOrder = ! empty($this->options['uploadOrder'])? $this->options['uploadOrder'] : array('deny', 'allow');
 		}
 
 		if (!empty($this->options['uploadMaxSize'])) {
@@ -1330,7 +1330,7 @@ public function options($hash) {
 			'uploadMaxSize'   => intval($this->uploadMaxSize),
 			'uploadMaxConn'   => intval($this->options['uploadMaxConn']),
 			'uploadMime'      => array(
-				'firstOrder' => $this->uploadOrder[0],
+				'firstOrder' => isset($this->uploadOrder[0])? $this->uploadOrder[0] : 'deny',
 				'allow'      => $this->uploadAllow,
 				'deny'       => $this->uploadDeny
 			),
@@ -1341,7 +1341,7 @@ public function options($hash) {
 				'extract'   => isset($this->archivers['extract']) && is_array($this->archivers['extract']) ? array_keys($this->archivers['extract']) : array(),
 				'createext' => $createext
 			),
-			'uiCmdMap'        => $this->options['uiCmdMap'],
+			'uiCmdMap'        => (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap']))? array_values($this->options['uiCmdMap']) : array(),
 			'syncChkAsTs'     => intval($this->options['syncChkAsTs']),
 			'syncMinMs'       => intval($this->options['syncMinMs'])
 		);