startPath now works, closes Studio-42#141

brisc · Nov 22, 2011 · a53880b · a53880b
1 parent dcacca5
commit a53880b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/elfinder.src.html b/elfinder.src.html
@@ -159,9 +159,9 @@
 					}
 				},
 				// onlyMimes : ['image', 'text/plain']
-				lang : 'hu',
+				lang : 'ru',
 				// requestType : 'POST',
-				// rememberLastDir : false, // TODO need more testing
+				// rememberLastDir : false,
 				// ui : ['tree', 'toolbar'],
 				// commands : [],
 				// commandsOptions : {

diff --git a/php/connector.php b/php/connector.php
@@ -249,7 +249,7 @@ function validName($name) {
 			'tmbPath'    => '.tmb',
 			'utf8fix'    => true,
 			'tmbCrop'    => false,
-			'startPath'  => '../files/test',
+			// 'startPath'  => '../files/test',
 			// 'deep' => 3,	
 			// 'separator' => ':',
 			'attributes' => array(

diff --git a/php/elFinder.class.php b/php/elFinder.class.php
@@ -478,7 +478,7 @@ protected function open($args) {
 
 				if (($tree = $v->tree('', 0, $cwd['hash'])) != false) {
 					$files = array_merge($files, $tree);
-				} 
+				}
 			}
 		}
 

diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php
@@ -692,7 +692,7 @@ public function mount(array $opts) {
 						for ($i = 1, $size = count($mime); $i < $size ; $i++) {
 							if (!isset(self::$mimetypes[$mime[$i]])) {
 								self::$mimetypes[$mime[$i]] = $mime[0];
-							} 
+							}
 						}
 					}
 				}
@@ -716,11 +716,11 @@ public function mount(array $opts) {
 			if ($this->options['startPath']) {
 				$start = $this->stat($this->options['startPath']);
 				if (!empty($start)
-				&& $start['mime'] == 'directory' 
-				&& $start['read'] 
-				&& !$start['hidden'] 
+				&& $start['mime'] == 'directory'
+				&& $start['read']
+				&& !$start['hidden']
 				&& $this->_inpath($this->options['startPath'], $this->root)) {
-					$this->startPath = $path;
+					$this->startPath = $this->options['startPath'];
 				}
 			}
 		} else {
@@ -729,13 +729,12 @@ public function mount(array $opts) {
 			$this->options['tmbPath'] = '';
 			// read only volume
 			array_unshift($this->attributes, array(
-				'pattern' => '/.*/', 
+				'pattern' => '/.*/',
 				'read'    => false
 			));
 		}
-
 		$this->treeDeep = $this->options['treeDeep'] > 0 ? (int)$this->options['treeDeep'] : 1;
-		$this->tmbSize  = $this->options['tmbSize'] > 0 ? (int)$this->options['tmbSize'] : 48;		
+		$this->tmbSize  = $this->options['tmbSize'] > 0 ? (int)$this->options['tmbSize'] : 48;
 		$this->URL      = $this->options['URL'];
 		if ($this->URL && preg_match("|[^/?&=]$|", $this->URL)) {
 			$this->URL .= '/';
-Original file line number
+Diff line change
@@ Expand Up / @@ -478,7 +478,7 @@ protected function open($args) { @@
     				if (($tree = $v->tree('', 0, $cwd['hash'])) != false) {
     					$files = array_merge($files, $tree);
-    				}
+    				}
     			}
     		}
@@ Expand Down @@