version 1.2.0

Controller.php

@@ -1,13 +1,12 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Администратор
  * Date: 20.01.14
  * Time: 13:26
  */
 
 namespace mihaildev\elfinder;
 
+use mihaildev\elfinder\volume\Local;
 use Yii;
 use yii\helpers\ArrayHelper;
 
@@ -39,11 +38,11 @@ public function getOptions()
 				$root = ['path' => $root];
 
 			if(!isset($root['class']))
-				$root['class'] = 'mihaildev\elfinder\LocalPath';
+				$root['class'] = Local::className();
 
 			$root = Yii::createObject($root);
 
-			/** @var \mihaildev\elfinder\LocalPath $root*/
+			/** @var \mihaildev\elfinder\volume\Local $root*/
 
 			if($root->isAvailable())
 				$this->_options['roots'][] = $root->getRoot();

PathController.php

@@ -12,6 +12,7 @@
 */
 
 namespace mihaildev\elfinder;
+use mihaildev\elfinder\volume\Local;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Url;
 use Yii;
@@ -49,7 +50,7 @@ public function getOptions()
 			$root = ['path' => $root];
 
 		if(!isset($root['class']))
-			$root['class'] = 'mihaildev\elfinder\LocalPath';
+			$root['class'] = Local::className();
 
 		if(!empty($subPath)){
 			if(preg_match("/\./i", $subPath)){
@@ -64,7 +65,7 @@ public function getOptions()
 
 		$root = Yii::createObject($root);
 
-		/** @var \mihaildev\elfinder\LocalPath $root*/
+		/** @var Local $root*/
 
 		if($root->isAvailable())
 			$this->_options['roots'][] = $root->getRoot();

views/connect.php

@@ -3,6 +3,8 @@
  * @var array $options
  */
 
+define('ELFINDER_IMG_PARENT_URL', \mihaildev\elfinder\Assets::getPathUrl());
+
 // run elFinder
 $connector = new elFinderConnector(new elFinder($options));
 $connector->run();

BasePath.php → volume/Base.php

@@ -4,17 +4,18 @@
  * Time: 10:39
  */
 
-namespace mihaildev\elfinder;
+namespace mihaildev\elfinder\volume;
 
 use Yii;
-use yii\base\Component as BaseComponent;
+use yii\base\Object;
+use yii\helpers\ArrayHelper;
 use yii\helpers\FileHelper;
 
 
 /**
  * @property array defaults
  */
-class BasePath extends BaseComponent{
+class Base extends Object{
 
 	public $driver = 'LocalFileSystem';
 
@@ -65,6 +66,10 @@ public function getDefaults(){
 		return $this->_defaults;
 	}
 
+    protected function optionsModifier($options){
+        return $options;
+    }
+
 	public function getRoot(){
 		$options['driver'] = $this->driver;
 		$options['defaults'] = $this->getDefaults();
@@ -94,8 +99,8 @@ public function getRoot(){
 			'locked' => false
 		];
 
-		//var_export($options);exit;
+        $options = $this->optionsModifier($options);
 
-		return \yii\helpers\ArrayHelper::merge($options, $this->options);
+		return ArrayHelper::merge($options, $this->options);
 	}
 }

LocalPath.php → volume/Local.php

@@ -4,11 +4,11 @@
  * Time: 22:47
  */
 
-namespace mihaildev\elfinder;
+namespace mihaildev\elfinder\volume;
 
 use Yii;
 
-class LocalPath extends BasePath{
+class Local extends Base{
 	public $path;
 
 	public $baseUrl = '@web';
@@ -28,9 +28,7 @@ public function getRealPath(){
 		return $path;
 	}
 
-	public function getRoot(){
-
-		$options = parent::getRoot();
+	protected function optionsModifier($options){
 
 		$options['path'] = $this->getRealPath();
 		$options['URL'] = $this->getUrl();

UserPath.php → volume/UserPath.php

@@ -4,11 +4,11 @@
  * Time: 14:13
  */
 
-namespace mihaildev\elfinder;
+namespace mihaildev\elfinder\volume;
 
 use Yii;
 
-class UserPath extends LocalPath{
+class UserPath extends Local{
 	public function isAvailable(){
 		if(Yii::$app->user->isGuest)
 			return false;