Show status icons for mount points in external storage UI

1 files changed, 29 insertions, 21 deletions

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 071a9cd5f95..97454b46015 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -16,28 +16,36 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	private $share;
 
 	public function __construct($params) {
-		$this->host=$params['host'];
-		$this->user=$params['user'];
-		$this->password=$params['password'];
-		$this->share=$params['share'];
-		$this->root=isset($params['root'])?$params['root']:'/';
-		if ( ! $this->root || $this->root[0]!='/') {
-			$this->root='/'.$this->root;
-		}
-		if (substr($this->root, -1, 1)!='/') {
-			$this->root.='/';
-		}
-		if ( ! $this->share || $this->share[0]!='/') {
-			$this->share='/'.$this->share;
-		}
-		if (substr($this->share, -1, 1)=='/') {
-			$this->share=substr($this->share, 0, -1);
-		}
-
-		//create the root folder if necesary
-		if ( ! $this->is_dir('')) {
-			$this->mkdir('');
+		if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
+			$this->host=$params['host'];
+			$this->user=$params['user'];
+			$this->password=$params['password'];
+			$this->share=$params['share'];
+			$this->root=isset($params['root'])?$params['root']:'/';
+			if ( ! $this->root || $this->root[0]!='/') {
+				$this->root='/'.$this->root;
+			}
+			if (substr($this->root, -1, 1)!='/') {
+				$this->root.='/';
+			}
+			if ( ! $this->share || $this->share[0]!='/') {
+				$this->share='/'.$this->share;
+			}
+			if (substr($this->share, -1, 1)=='/') {
+				$this->share=substr($this->share, 0, -1);
+			}
+			$test = $this->stat('');
+			if (!$test) {
+				throw new Exception();
+			}
+			//create the root folder if necesary
+			if ( ! $this->is_dir('')) {
+				$this->mkdir('');
+			}
+		} else {
+			throw new Exception();
 		}
+		
 	}
 
 	public function constructUrl($path) {