From 0dbf1d02600ef4075ceffe9c62c1ed32cc24592f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 24 Dec 2012 13:45:52 -0500
Subject: [PATCH 01/23] Show status icons for mount points in external storage
 UI

---
 apps/files_external/ajax/addMountPoint.php |   5 +-
 apps/files_external/css/settings.css       |   5 +-
 apps/files_external/img/error.png          | Bin 0 -> 533 bytes
 apps/files_external/img/success.png        | Bin 0 -> 545 bytes
 apps/files_external/img/waiting.png        | Bin 0 -> 512 bytes
 apps/files_external/js/settings.js         |  21 +++++-
 apps/files_external/lib/amazons3.php       |  14 +++-
 apps/files_external/lib/config.php         |  37 ++++++++--
 apps/files_external/lib/dropbox.php        |   5 +-
 apps/files_external/lib/ftp.php            |  41 ++++++-----
 apps/files_external/lib/google.php         |   4 ++
 apps/files_external/lib/smb.php            |  50 +++++++------
 apps/files_external/lib/swift.php          |  45 ++++++------
 apps/files_external/lib/webdav.php         |  77 ++++++++++++---------
 apps/files_external/templates/settings.php |   6 ++
 15 files changed, 203 insertions(+), 107 deletions(-)
 create mode 100644 apps/files_external/img/error.png
 create mode 100644 apps/files_external/img/success.png
 create mode 100644 apps/files_external/img/waiting.png

diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
index 4cd8871b310..fed2ddfcf3d 100644
--- a/apps/files_external/ajax/addMountPoint.php
+++ b/apps/files_external/ajax/addMountPoint.php
@@ -10,9 +10,10 @@ if ($_POST['isPersonal'] == 'true') {
 	OCP\JSON::checkAdminUser();
 	$isPersonal = false;
 }
-OC_Mount_Config::addMountPoint($_POST['mountPoint'],
+$status = OC_Mount_Config::addMountPoint($_POST['mountPoint'],
 							   $_POST['class'],
 							   $_POST['classOptions'],
 							   $_POST['mountType'],
 							   $_POST['applicable'],
-							   $isPersonal);
\ No newline at end of file
+							   $isPersonal);
+OCP\JSON::success(array('data' => array('message' => $status)));
\ No newline at end of file
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index ca4b1c3ba89..94b453793b1 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,4 +1,7 @@
-.error { color: #FF3B3B; }
+td.status>span { display:inline-block; height:16px; width:16px; }
+span.success { background-image: url('../img/success.png'); background-repeat:no-repeat; }
+span.error { background-image: url('../img/error.png'); background-repeat:no-repeat; }
+span.waiting { background-image: url('../img/waiting.png'); background-repeat:no-repeat; }
 td.mountPoint, td.backend { width:10em; }
 td.remove>img { visibility:hidden; padding-top:0.8em; }
 tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
diff --git a/apps/files_external/img/error.png b/apps/files_external/img/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8cf45e7a41e358da5d573dc48edf966b9d8d3cb
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0ObG!
z00<T8#k&9i010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zc2H6AKe=-|qkb03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00DVPL_t(I%XO2zP9s4O
zguh~X5z9j$Ik*!Eu?ZcT0EtI%c=tr!kViP_BtS$CaeUzg7B7Jj7!|?H{uwjLtV-3>
zRn@&>@BFDwr{D!*hBZL|-hfuX?akZEddSzfxLzWDb$|;+?nzd2^ZxSt%L9Lp>wCjo
z7RIR5cLWLBC<71IZ`&(?BY?Z(dKqS3StOYXNP-X~AP`{_Kr)0izpLscfF7%Q3VJGf
z4;&5s?4Qd>umES9`pRhS<ZmI23s<m+fZ3?WHxFfkN4gBNNO&S^zir2AYXrC*h&s+B
zDhs!O2aW}D&o=6(>HdlY8_f9u^WUw@(B~!+tc1@Q1y$m+`aROHyyL9&FY2k_$#&<H
zF6}H|(jZ$GaRRtJy4Y>k$!-Ejh_DEk1(FGggfnJm+z@tivD>aYVgKXg9y8ycq@@yO
zj~gC-e!TXp4De(3dX=EbtDDs%pekKkJfLZd55>!KI++R<z|1fygpFY(bbI!(9sSOq
Xwz-@V96ggn00000NkvXXu0mjfFxlAE

literal 0
HcmV?d00001

diff --git a/apps/files_external/img/success.png b/apps/files_external/img/success.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7022ee7f5672b43bdf72f848a7358e4473eb60
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv01W`f
z0153aEtmiR010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zc2H2O;Kr!E68k03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00D(bL_t(I%Vm>6irYXC
zMc-GKU<An_yvq$7$i}mZ<`!OsWDYbIfdSuQW*4tQd<q{TUI-@ev*?!8@(83>RaaHl
z|G!$?Jl#{fHSB>Muqo~f_yios$A9NKUbS)e)E>a!C1KY)u0x0M@$JXE0^QH{#imD#
zvraQ0=N0ifetUZWXaKtB_CTUnfRb<ms@DlL*#T<QchBtsK;5z33jP?CBc>LN5O!H_
zxDv+Zb11Z5S`|z+EUcWIojJx*Nfy99NbGK@Dk&8MTF7!`i(L@f$gV<+BxKKMTz+KN
z)e&rhw6v)i-3sYyZ~hvL2|^d((}aJKQFFVugR?-@rBQHVk|~O?&00o6S-!}&lBT^=
zqokuk5JCwQLXiU$MfU_W!b!#FDfZZ0zm8`TLq0X1L@C6Skc?VT^3p+Qxc1|D2KeFE
z-HV`Ksa3|eqNk9m*X#Ybj55IWetaNlAj;^*GP<M;&q=7!FeSgI82I?R+k*F?9rgwZ
j@C9=Mj(@+5tLyw9e_(~Q`!lWl00000NkvXXu0mjf4Q1ws

literal 0
HcmV?d00001

diff --git a/apps/files_external/img/waiting.png b/apps/files_external/img/waiting.png
new file mode 100644
index 0000000000000000000000000000000000000000..02a8cbff0da63ad584ae7a5c11ddefdf0bd9e24b
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0KEXc
z0KI8K)u;df010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zc2H3N$_lTgm_c03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Cr4L_t(I%Wab}PQySD
zMc?=OBI&q6DAPm=ir@@s5Vr7fKnVhgoB>b>3PnmdMUL_*c5Saswz6mc{Mq^QM~u$q
z;bDqdA!fiNg-^f{*j7#Ro8vV~UISGZ@E8$cRnye}2%a7vKLrb?s4R>JnFbU?`@81;
zsv~&WJgqHP@(A2L!5F2lNMd<&Th+B*U!JF!p9pZ4GAu2?%6f`Smt_&k754co1hHC2
zuMB9jDnk)wWR>%D+MbovuzKZUU{;0@CXsniG{cPKwy`=fCuI=|IP>yea?!V#E~J)=
zGK6pfE(Vp{&LD!-GCR&Cjv*SX3?UqCE+jg^`j@EZ8+js~V_Af-1*-nuS-+{aoJ)`o
zY%73|xA!%;iYRscJGE;IrT^U0*EctHH@V$z7p?5^AamEdz1c69%d3CO^!2r0+f*dm
z<jJjxj5mwLqCUHg0N;nh)MzDnhM9P@&hz<vu+D$`?63=?tHJF60000<MNUMnLSTZ`
Cw$$DL

literal 0
HcmV?d00001

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 0dc983ca8ad..eb74dd487f7 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -4,6 +4,7 @@ OC.MountConfig={
 		if (mountPoint == '') {
 			return false;
 		}
+		var statusSpan = $(tr).find('.status span');
 		var backendClass = $(tr).find('.backend').data('class');
 		var configuration = $(tr).find('.configuration input');
 		var addMountPoint = true;
@@ -27,6 +28,7 @@ OC.MountConfig={
 			}
 		});
 		if (addMountPoint) {
+			var status = false;
 			if ($('#externalStorage').data('admin') === true) {
 				var isPersonal = false;
 				var multiselect = $(tr).find('.chzn-select').val();
@@ -47,7 +49,14 @@ OC.MountConfig={
 							oldUsers.splice($.inArray(applicable, oldUsers), 1);
 						}
 					}
-					$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+					$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) {
+						statusSpan.removeClass();
+						if (result && result.status == 'success' && result.data.message) {
+							statusSpan.addClass('success');
+						} else {
+							statusSpan.addClass('error');
+						}
+					});
 				});
 				var mountType = 'group';
 				$.each(oldGroups, function(index, applicable) {
@@ -61,7 +70,14 @@ OC.MountConfig={
 				var isPersonal = true;
 				var mountType = 'user';
 				var applicable = OC.currentUser;
-				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) {
+					statusSpan.removeClass();
+					if (result && result.status == 'success' && result.data.message) {
+						statusSpan.addClass('success');
+					} else {
+						statusSpan.addClass('error');
+					}
+				});
 			}
 			return true;
 		}
@@ -82,6 +98,7 @@ $(document).ready(function() {
 			$(tr).find('.mountPoint input').val(suggestMountPoint(selected.replace(/\s+/g, '')));
 		}
 		$(tr).addClass(backendClass);
+		$(tr).find('.status').append('<span class="waiting"></span>');
 		$(tr).find('.backend').data('class', backendClass);
 		var configurations = $(this).data('configurations');
 		var td = $(tr).find('td.configuration');
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 235ade06db6..c1b2e889bba 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -30,11 +30,19 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 
 	private static $tempFiles = array();
 
-	// TODO options: storage class, encryption server side, encrypt before upload?
+	// TODO Update to new AWS SDK
 
 	public function __construct($params) {
-		$this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
-		$this->bucket = $params['bucket'];
+		if (isset($params['key']) && isset($params['secret']) && isset($params['bucket'])) {
+			$this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
+			$this->bucket = $params['bucket'];
+			$test = $this->s3->get_canonical_user_id();
+			if (!isset($test['id']) || $test['id'] == '') {
+				throw new Exception();
+			}
+		} else {
+			throw new Exception();
+		}
 	}
 
 	private function getObject($path) {
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 1be544fbc07..99d31c5aa2d 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -131,7 +131,9 @@ class OC_Mount_Config {
 							'class' => $mount['class'],
 							'backend' => $backends[$mount['class']]['backend'],
 							'configuration' => $mount['options'],
-							'applicable' => array('groups' => array($group), 'users' => array()));
+							'applicable' => array('groups' => array($group), 'users' => array()),
+							'status' => self::getBackendStatus($mount['class'], $mount['options'])
+						);
 					}
 				}
 			}
@@ -146,10 +148,13 @@ class OC_Mount_Config {
 						$system[$mountPoint]['applicable']['users']
 							= array_merge($system[$mountPoint]['applicable']['users'], array($user));
 					} else {
-						$system[$mountPoint] = array('class' => $mount['class'],
+						$system[$mountPoint] = array(
+							'class' => $mount['class'],
 							'backend' => $backends[$mount['class']]['backend'],
 							'configuration' => $mount['options'],
-							'applicable' => array('groups' => array(), 'users' => array($user)));
+							'applicable' => array('groups' => array(), 'users' => array($user)),
+							'status' => self::getBackendStatus($mount['class'], $mount['options'])
+						);
 					}
 				}
 			}
@@ -170,14 +175,32 @@ class OC_Mount_Config {
 		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
 			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {
 				// Remove '/uid/files/' from mount point
-				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'],
-																'backend' => $backends[$mount['class']]['backend'],
-																'configuration' => $mount['options']);
+				$personal[substr($mountPoint, strlen($uid) + 8)] = array(
+					'class' => $mount['class'],
+					'backend' => $backends[$mount['class']]['backend'],
+					'configuration' => $mount['options'],
+					'status' => self::getBackendStatus($mount['class'], $mount['options'])
+				);
 			}
 		}
 		return $personal;
 	}
 
+	private static function getBackendStatus($class, $options) {
+		foreach ($options as &$option) {
+			$option = str_replace('$user', OCP\User::getUser(), $option);
+		}
+		if (class_exists($class)) {
+			try {
+				new $class($options);
+				return true;
+			} catch (Exception $exception) {
+				return false;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Add directory for mount point to the filesystem
 	 * @param OC_Fileview instance $view
@@ -259,7 +282,7 @@ class OC_Mount_Config {
 			$mountPoints[$mountType] = $mount;
 		}
 		self::writeData($isPersonal, $mountPoints);
-		return true;
+		return self::getBackendStatus($class, $classOptions);
 	}
 
 	/**
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 33ca14cab15..a4f3f678344 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -41,7 +41,10 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$oauth->setToken($params['token'], $params['token_secret']);
 			$this->dropbox = new Dropbox_API($oauth, 'dropbox');
-			$this->mkdir('');
+			$test = $this->stat('');
+			if (!$test) {
+				throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
+			}
 		} else {
 			throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
 		}
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index e796ae446bf..ac487156c18 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -16,26 +16,35 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 	private static $tempFiles=array();
 
 	public function __construct($params) {
-		$this->host=$params['host'];
-		$this->user=$params['user'];
-		$this->password=$params['password'];
-		if (isset($params['secure'])) {
-			if (is_string($params['secure'])) {
-				$this->secure = ($params['secure'] === 'true');
+		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+			$this->host=$params['host'];
+			$this->user=$params['user'];
+			$this->password=$params['password'];
+			if (isset($params['secure'])) {
+				if (is_string($params['secure'])) {
+					$this->secure = ($params['secure'] === 'true');
+				} else {
+					$this->secure = (bool)$params['secure'];
+				}
 			} else {
-				$this->secure = (bool)$params['secure'];
+				$this->secure = false;
+			}
+			$this->root=isset($params['root'])?$params['root']:'/';
+			if ( ! $this->root || $this->root[0]!='/') {
+				$this->root='/'.$this->root;
+			}
+			$test = $this->stat('');
+			if (!$test) {
+				throw new Exception();
+			}
+			//create the root folder if necesary
+			if ( ! $this->is_dir('')) {
+				$this->mkdir('');
 			}
 		} else {
-			$this->secure = false;
-		}
-		$this->root=isset($params['root'])?$params['root']:'/';
-		if ( ! $this->root || $this->root[0]!='/') {
-			$this->root='/'.$this->root;
-		}
-		//create the root folder if necesary
-		if ( ! $this->is_dir('')) {
-			$this->mkdir('');
+			throw new Exception();
 		}
+		
 	}
 
 	/**
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index c836a5a07c0..19772d4d37f 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -42,6 +42,10 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			$this->oauth_token = new OAuthToken($params['token'], $params['token_secret']);
 			$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
 			$this->entries = array();
+			$test = $this->free_space('');
+			if (!$test) {
+				throw new Exception();
+			}
 		} else {
 			throw new Exception('Creating OC_Filestorage_Google storage failed');
 		}
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) {
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index a071dfdbb03..e2add2c9873 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -267,32 +267,37 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	}
 
 	public function __construct($params) {
-		$this->token=$params['token'];
-		$this->host=$params['host'];
-		$this->user=$params['user'];
-		$this->root=isset($params['root'])?$params['root']:'/';
-		if (isset($params['secure'])) {
-			if (is_string($params['secure'])) {
-				$this->secure = ($params['secure'] === 'true');
+		if (isset($params['token']) && isset($params['host']) && isset($params['user'])) {
+			$this->token=$params['token'];
+			$this->host=$params['host'];
+			$this->user=$params['user'];
+			$this->root=isset($params['root'])?$params['root']:'/';
+			if (isset($params['secure'])) {
+				if (is_string($params['secure'])) {
+					$this->secure = ($params['secure'] === 'true');
+				} else {
+					$this->secure = (bool)$params['secure'];
+				}
 			} else {
-				$this->secure = (bool)$params['secure'];
+				$this->secure = false;
 			}
-		} else {
-			$this->secure = false;
-		}
-		if ( ! $this->root || $this->root[0]!='/') {
-			$this->root='/'.$this->root;
-		}
-		$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);
-		$this->auth->authenticate();
+			if ( ! $this->root || $this->root[0]!='/') {
+				$this->root='/'.$this->root;
+			}
+			$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);
+			$this->auth->authenticate();
 
-		$this->conn = new CF_Connection($this->auth);
+			$this->conn = new CF_Connection($this->auth);
 
-		if ( ! $this->containerExists('/')) {
-			$this->rootContainer=$this->createContainer('/');
+			if ( ! $this->containerExists('/')) {
+				$this->rootContainer=$this->createContainer('/');
+			} else {
+				$this->rootContainer=$this->getContainer('/');
+			}
 		} else {
-			$this->rootContainer=$this->getContainer('/');
+			throw new Exception();
 		}
+		
 	}
 
 
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 68aca228bc5..cfe073a1f1c 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -20,47 +20,56 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	private static $tempFiles=array();
 
 	public function __construct($params) {
-		$host = $params['host'];
-		//remove leading http[s], will be generated in createBaseUri()
-		if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
-		else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
-		$this->host=$host;
-		$this->user=$params['user'];
-		$this->password=$params['password'];
-		if (isset($params['secure'])) {
-			if (is_string($params['secure'])) {
-				$this->secure = ($params['secure'] === 'true');
+		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+			$host = $params['host'];
+			//remove leading http[s], will be generated in createBaseUri()
+			if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
+			else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
+			$this->host=$host;
+			$this->user=$params['user'];
+			$this->password=$params['password'];
+			if (isset($params['secure'])) {
+				if (is_string($params['secure'])) {
+					$this->secure = ($params['secure'] === 'true');
+				} else {
+					$this->secure = (bool)$params['secure'];
+				}
 			} else {
-				$this->secure = (bool)$params['secure'];
+				$this->secure = false;
+			}
+			$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.='/';
 			}
-		} else {
-			$this->secure = false;
-		}
-		$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.='/';
-		}
 
-		$settings = array(
-			'baseUri' => $this->createBaseUri(),
-			'userName' => $this->user,
-			'password' => $this->password,
-		);
+			$settings = array(
+				'baseUri' => $this->createBaseUri(),
+				'userName' => $this->user,
+				'password' => $this->password,
+			);
 
-		$this->client = new OC_Connector_Sabre_Client($settings);
+			$this->client = new OC_Connector_Sabre_Client($settings);
 
-		$caview = \OCP\Files::getStorage('files_external');
-		if ($caview) {
-			$certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt';
-			if (file_exists($certPath)) {
-				$this->client->addTrustedCertificates($certPath);
+			$caview = \OCP\Files::getStorage('files_external');
+			if ($caview) {
+				$certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt';
+				if (file_exists($certPath)) {
+					$this->client->addTrustedCertificates($certPath);
+				}
+			}
+			$test = $this->stat('');
+			if (!$test) {
+				throw new Exception();
 			}
+			//create the root folder if necesary
+			$this->mkdir('');
+		} else {
+			throw new Exception();
 		}
-		//create the root folder if necesary
-		$this->mkdir('');
+		
 	}
 
 	private function createBaseUri() {
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index dd537d779a6..9702ebfb4c7 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -5,6 +5,7 @@
 		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
+					<th></th>
 					<th><?php echo $l->t('Mount point'); ?></th>
 					<th><?php echo $l->t('Backend'); ?></th>
 					<th><?php echo $l->t('Configuration'); ?></th>
@@ -17,6 +18,11 @@
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
 				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
+					<td class="status">
+					<?php if (isset($mount['status'])): ?>
+						<span class="<?php echo ($mount['status']) ? 'success' : 'error'; ?>"></span>
+					<?php endif; ?>
+					</td>
 					<td class="mountPoint"><input type="text" name="mountPoint"
 												  value="<?php echo $mountPoint; ?>"
 												  placeholder="<?php echo $l->t('Mount point'); ?>" /></td>

From 3c08d2ba23e36dbf79ea5fdabaf931bdad32b3b9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 24 Dec 2012 13:48:18 -0500
Subject: [PATCH 02/23] Change callback url to path only in case oauth
 parameters are still in url

---
 apps/files_external/js/google.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 0b3c314eb5d..f9fb8078612 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -60,7 +60,7 @@ $(document).ready(function() {
 		var configured = $(this).parent().find('[data-parameter="configured"]');
 		var token = $(this).parent().find('[data-parameter="token"]');
 		var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
-		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: window.location.href }, function(result) {
+		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
 			if (result && result.status == 'success') {
 				$(configured).val('false');
 				$(token).val(result.data.request_token);

From a0e47a2c67f0fe5ff3ed07174e0922dae67707dc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 24 Dec 2012 13:55:37 -0500
Subject: [PATCH 03/23] Prevent javascript error if no value is set for the
 multiselect

---
 apps/files_external/js/settings.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index eb74dd487f7..a3abcfebb8b 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -27,11 +27,16 @@ OC.MountConfig={
 				classOptions[$(input).data('parameter')] = $(input).val();
 			}
 		});
+		if ($('#externalStorage').data('admin') === true) {
+			var multiselect = $(tr).find('.chzn-select').val();
+			if (multiselect == null) {
+				return false;
+			}
+		}
 		if (addMountPoint) {
 			var status = false;
 			if ($('#externalStorage').data('admin') === true) {
 				var isPersonal = false;
-				var multiselect = $(tr).find('.chzn-select').val();
 				var oldGroups = $(tr).find('.applicable').data('applicable-groups');
 				var oldUsers = $(tr).find('.applicable').data('applicable-users');
 				$.each(multiselect, function(index, value) {

From 30a07e95737e3bed7be1d418c49fa9b60e160e7b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 26 Dec 2012 13:35:22 -0500
Subject: [PATCH 04/23] Save configuration after paste events and 2 seconds
 after typing

---
 apps/files_external/js/settings.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index a3abcfebb8b..f2a08ed6dfb 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -157,8 +157,23 @@ $(document).ready(function() {
 		return defaultMountPoint+append;
 	}
 
-	$('#externalStorage td').live('change', function() {
-		OC.MountConfig.saveStorage($(this).parent());
+	$('#externalStorage td').live('paste', function() {
+		var tr = $(this).parent();
+		setTimeout(function() {
+			OC.MountConfig.saveStorage(tr);
+		}, 20);
+	});
+
+	var timer;
+
+	$('#externalStorage td').live('keyup', function() {
+		clearTimeout(timer);
+		var tr = $(this).parent();
+		if ($(this).val) {
+			timer = setTimeout(function() {
+				OC.MountConfig.saveStorage(tr);
+			}, 2000);
+		}
 	});
 
 	$('td.remove>img').live('click', function() {

From 5d68e04e5a43d6d6f52ff511f899bc831a6aa4be Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 26 Dec 2012 13:45:22 -0500
Subject: [PATCH 05/23] Change callback url for dropbox as well

---
 apps/files_external/js/dropbox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index c1e38640708..cc6a37d0511 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -61,7 +61,7 @@ $(document).ready(function() {
 			var configured = $(this).parent().find('[data-parameter="configured"]');
 			var token = $(this).parent().find('[data-parameter="token"]');
 			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
-			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: window.location.href }, function(result) {
+			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
 				if (result && result.status == 'success') {
 					$(configured).val('false');
 					$(token).val(result.data.request_token);

From 48a3966ea979a56e9277f588d6001c47e8a9c606 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 26 Dec 2012 14:04:02 -0500
Subject: [PATCH 06/23] Listen to paste events for dropbox configuration

---
 apps/files_external/js/dropbox.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index cc6a37d0511..824c47d9f6d 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -36,9 +36,20 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#externalStorage tbody tr input').live('keyup', function() {
-		var tr = $(this).parent().parent();
-		if ($(tr).hasClass('OC_Filestorage_Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') {
+	$('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('paste', function() {
+		var tr = $(this).parent();
+		setTimeout(function() {
+			showButton(tr);
+		}, 20);
+	});
+
+	$('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() {
+		showButton($(this).parent().parent());
+		
+	});
+
+	function showButton(tr) {
+		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
 			var config = $(tr).find('.configuration');
 			if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') {
 				if ($(tr).find('.dropbox').length == 0) {
@@ -50,7 +61,7 @@ $(document).ready(function() {
 				$(tr).find('.dropbox').hide();
 			}
 		}
-	});
+	}
 
 	$('.dropbox').live('click', function(event) {
 		event.preventDefault();

From d9ff3b68602d511ede1fd8bf2516a842dee2cfd1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 26 Dec 2012 14:18:51 -0500
Subject: [PATCH 07/23] Fix last commit's variable

---
 apps/files_external/js/dropbox.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 824c47d9f6d..247d6bb8bb6 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -44,8 +44,7 @@ $(document).ready(function() {
 	});
 
 	$('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() {
-		showButton($(this).parent().parent());
-		
+		showButton($(this).parent());
 	});
 
 	function showButton(tr) {

From ad902a9848a66135ae85a04b1c66b663219a53ea Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 28 Dec 2012 12:00:48 -0500
Subject: [PATCH 08/23] Move storage backend tests from constructor to test
 function

---
 apps/files_external/lib/amazons3.php | 12 ++++++++----
 apps/files_external/lib/config.php   |  4 ++--
 apps/files_external/lib/dropbox.php  |  4 ----
 apps/files_external/lib/ftp.php      |  4 ----
 apps/files_external/lib/google.php   | 11 +++++++----
 apps/files_external/lib/smb.php      |  4 ----
 apps/files_external/lib/webdav.php   |  4 ----
 lib/filestorage.php                  |  1 +
 lib/filestorage/common.php           |  8 ++++++++
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index c1b2e889bba..5ab89df732d 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -36,10 +36,6 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 		if (isset($params['key']) && isset($params['secret']) && isset($params['bucket'])) {
 			$this->s3 = new AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
 			$this->bucket = $params['bucket'];
-			$test = $this->s3->get_canonical_user_id();
-			if (!isset($test['id']) || $test['id'] == '') {
-				throw new Exception();
-			}
 		} else {
 			throw new Exception();
 		}
@@ -250,4 +246,12 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 		return $response->isOK();
 	}
 
+	public function test() {
+		$test = $this->s3->get_canonical_user_id();
+		if (isset($test['id']) && $test['id'] != '') {
+			return true;
+		}
+		return false;
+	}
+
 }
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 99d31c5aa2d..fd654f04e98 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -192,8 +192,8 @@ class OC_Mount_Config {
 		}
 		if (class_exists($class)) {
 			try {
-				new $class($options);
-				return true;
+				$storage = new $class($options);
+				return $storage->test();
 			} catch (Exception $exception) {
 				return false;
 			}
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index a4f3f678344..66dfd3e595e 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -41,10 +41,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$oauth->setToken($params['token'], $params['token_secret']);
 			$this->dropbox = new Dropbox_API($oauth, 'dropbox');
-			$test = $this->stat('');
-			if (!$test) {
-				throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
-			}
 		} else {
 			throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
 		}
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index ac487156c18..ca408d5d224 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -33,10 +33,6 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 			if ( ! $this->root || $this->root[0]!='/') {
 				$this->root='/'.$this->root;
 			}
-			$test = $this->stat('');
-			if (!$test) {
-				throw new Exception();
-			}
 			//create the root folder if necesary
 			if ( ! $this->is_dir('')) {
 				$this->mkdir('');
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 19772d4d37f..8710c979117 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -42,10 +42,6 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			$this->oauth_token = new OAuthToken($params['token'], $params['token_secret']);
 			$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
 			$this->entries = array();
-			$test = $this->free_space('');
-			if (!$test) {
-				throw new Exception();
-			}
 		} else {
 			throw new Exception('Creating OC_Filestorage_Google storage failed');
 		}
@@ -594,4 +590,11 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 
 	}
 
+	public function test() {
+		if ($this->free_space('')) {
+			return true;
+		}
+		return false;
+	}
+
 }
\ No newline at end of file
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 97454b46015..5b73e993e4f 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -34,10 +34,6 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 			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('');
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index cfe073a1f1c..31d36f1e78b 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -60,10 +60,6 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 					$this->client->addTrustedCertificates($certPath);
 				}
 			}
-			$test = $this->stat('');
-			if (!$test) {
-				throw new Exception();
-			}
 			//create the root folder if necesary
 			$this->mkdir('');
 		} else {
diff --git a/lib/filestorage.php b/lib/filestorage.php
index dd65f4421b7..9d42c0bcb60 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -64,4 +64,5 @@ abstract class OC_Filestorage{
 	 */
 	abstract public function hasUpdated($path, $time);
 	abstract public function getOwner($path);
+	abstract public function test();
 }
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index b97eb79d8d4..e2af0c6d7f4 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -288,4 +288,12 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 	public function getOwner($path) {
 		return OC_User::getUser();
 	}
+
+	public function test() {
+		if ($this->stat('')) {
+			return true;
+		}
+		return false;
+	}
+
 }

From 595e72ade8906346c9de8500685f5968d67afd2f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 28 Dec 2012 15:56:48 -0500
Subject: [PATCH 09/23] Fix some of the default mount points creating sub
 folders i.e. SMB / CIFS, ownCloud / WebDAV

---
 apps/files_external/js/settings.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index f2a08ed6dfb..182c427e180 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -100,7 +100,7 @@ $(document).ready(function() {
 		var backendClass = $(this).val();
 		$(this).parent().text(selected);
 		if ($(tr).find('.mountPoint input').val() == '') {
-			$(tr).find('.mountPoint input').val(suggestMountPoint(selected.replace(/\s+/g, '')));
+			$(tr).find('.mountPoint input').val(suggestMountPoint(selected));
 		}
 		$(tr).addClass(backendClass);
 		$(tr).find('.status').append('<span class="waiting"></span>');
@@ -136,6 +136,11 @@ $(document).ready(function() {
 	});
 
 	function suggestMountPoint(defaultMountPoint) {
+		var pos = defaultMountPoint.indexOf('/');
+		if (pos !== -1) {
+			defaultMountPoint = defaultMountPoint.substring(0, pos);
+		}
+		defaultMountPoint = defaultMountPoint.replace(/\s+/g, '');
 		var i = 1;
 		var append = '';
 		var match = true;

From 442a045ef605f63c1fed3868ef9ddad28c33409b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 28 Dec 2012 17:38:24 -0500
Subject: [PATCH 10/23] Fix problems with chosen multiselect

---
 apps/files_external/js/settings.js | 46 ++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 182c427e180..25f6ed57984 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -39,6 +39,8 @@ OC.MountConfig={
 				var isPersonal = false;
 				var oldGroups = $(tr).find('.applicable').data('applicable-groups');
 				var oldUsers = $(tr).find('.applicable').data('applicable-users');
+				var groups = [];
+				var users = [];
 				$.each(multiselect, function(index, value) {
 					var pos = value.indexOf('(group)');
 					if (pos != -1) {
@@ -47,12 +49,14 @@ OC.MountConfig={
 						if ($.inArray(applicable, oldGroups) != -1) {
 							oldGroups.splice($.inArray(applicable, oldGroups), 1);
 						}
+						groups.push(applicable);
 					} else {
 						var mountType = 'user';
 						var applicable = value;
 						if ($.inArray(applicable, oldUsers) != -1) {
 							oldUsers.splice($.inArray(applicable, oldUsers), 1);
 						}
+						users.push(applicable);
 					}
 					$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) {
 						statusSpan.removeClass();
@@ -63,6 +67,8 @@ OC.MountConfig={
 						}
 					});
 				});
+				$(tr).find('.applicable').data('applicable-groups', groups);
+				$(tr).find('.applicable').data('applicable-users', users);
 				var mountType = 'group';
 				$.each(oldGroups, function(index, applicable) {
 					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
@@ -128,7 +134,11 @@ $(document).ready(function() {
 				return false;
 			}
 		});
-		$('.chz-select').chosen();
+		// Reset chosen
+		var chosen = $(tr).find('.applicable select');
+		chosen.parent().find('div').remove();
+		chosen.removeAttr('id').removeClass('chzn-done').css({display:'inline-block'});
+		chosen.chosen();
 		$(tr).find('td').last().attr('class', 'remove');
 		$(tr).find('td').last().removeAttr('style');
 		$(tr).removeAttr('id');
@@ -171,9 +181,9 @@ $(document).ready(function() {
 
 	var timer;
 
-	$('#externalStorage td').live('keyup', function() {
+	$('#externalStorage td input').live('keyup', function() {
 		clearTimeout(timer);
-		var tr = $(this).parent();
+		var tr = $(this).parent().parent();
 		if ($(this).val) {
 			timer = setTimeout(function() {
 				OC.MountConfig.saveStorage(tr);
@@ -181,6 +191,10 @@ $(document).ready(function() {
 		}
 	});
 
+	$('.applicable .chzn-select').live('change', function() {
+		OC.MountConfig.saveStorage($(this).parent().parent());
+	});
+
 	$('td.remove>img').live('click', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
@@ -193,23 +207,25 @@ $(document).ready(function() {
 		if ($('#externalStorage').data('admin') === true) {
 			var isPersonal = false;
 			var multiselect = $(tr).find('.chzn-select').val();
-			$.each(multiselect, function(index, value) {
-				var pos = value.indexOf('(group)');
-				if (pos != -1) {
-					var mountType = 'group';
-					var applicable = value.substr(0, pos);
-				} else {
-					var mountType = 'user';
-					var applicable = value;
-				}
-				$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
-			});
+			if (multiselect != null) {
+				$.each(multiselect, function(index, value) {
+					var pos = value.indexOf('(group)');
+					if (pos != -1) {
+						var mountType = 'group';
+						var applicable = value.substr(0, pos);
+					} else {
+						var mountType = 'user';
+						var applicable = value;
+					}
+					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+				});
+			}
 		} else {
 			var mountType = 'user';
 			var applicable = OC.currentUser;
 			var isPersonal = true;
+			$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 		}
-		$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 		$(tr).remove();
 	});
 

From a69de3a8f1dd3ef9a17b0f65b7058681eebb6145 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 1 Jan 2013 16:19:40 -0500
Subject: [PATCH 11/23] Turn off async for saving mount points, improve input
 detection for Google and Dropbox 'Grant Access' buttons

---
 apps/files_external/js/dropbox.js  | 49 ++++++++++---------
 apps/files_external/js/google.js   | 67 ++++++++++++-------------
 apps/files_external/js/settings.js | 78 ++++++++++++++++++++++++------
 3 files changed, 123 insertions(+), 71 deletions(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 247d6bb8bb6..92a92467c79 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -24,14 +24,12 @@ $(document).ready(function() {
 							$(tr).find('.configuration input').attr('disabled', 'disabled');
 							$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 						} else {
-							OC.dialogs.alert(result.data.message,
-                                t('files_external', 'Error configuring Dropbox storage')
-                            );
+							OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
 						}
 					});
 				}
-			} else if ($(this).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '' && $(this).find('.dropbox').length == 0) {
-				$(this).find('.configuration').append('<a class="button dropbox">'+t('files_external', 'Grant access')+'</a>');
+			} else {
+				onDropboxInputsChange($(this));
 			}
 		}
 	});
@@ -39,18 +37,27 @@ $(document).ready(function() {
 	$('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('paste', function() {
 		var tr = $(this).parent();
 		setTimeout(function() {
-			showButton(tr);
+			onDropboxInputsChange(tr);
 		}, 20);
 	});
 
 	$('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() {
-		showButton($(this).parent());
+		onDropboxInputsChange($(this).parent());
 	});
 
-	function showButton(tr) {
+	$('#externalStorage tbody tr.OC_Filestorage_Dropbox .chzn-select').live('change', function() {
+		onDropboxInputsChange($(this).parent().parent());
+	});
+
+	function onDropboxInputsChange(tr) {
 		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
 			var config = $(tr).find('.configuration');
-			if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') {
+			if ($(tr).find('.mountPoint input').val() != ''
+				&& $(config).find('[data-parameter="app_key"]').val() != ''
+				&& $(config).find('[data-parameter="app_secret"]').val() != ''
+				&& ($(tr).find('.chzn-select').length == 0
+				|| $(tr).find('.chzn-select').val() != null))
+			{
 				if ($(tr).find('.dropbox').length == 0) {
 					$(config).append('<a class="button dropbox">'+t('files_external', 'Grant access')+'</a>');
 				} else {
@@ -64,8 +71,10 @@ $(document).ready(function() {
 
 	$('.dropbox').live('click', function(event) {
 		event.preventDefault();
+		var tr = $(this).parent().parent();
 		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
 		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
+		var statusSpan = $(tr).find('.status span');
 		if (app_key != '' && app_secret != '') {
 			var tr = $(this).parent().parent();
 			var configured = $(this).parent().find('[data-parameter="configured"]');
@@ -76,25 +85,19 @@ $(document).ready(function() {
 					$(configured).val('false');
 					$(token).val(result.data.request_token);
 					$(token_secret).val(result.data.request_token_secret);
-					if (OC.MountConfig.saveStorage(tr)) {
-						window.location = result.data.url;
-					} else {
-						OC.dialogs.alert(
-                            t('files_external', 'Fill out all required fields'),
-                            t('files_external', 'Error configuring Dropbox storage')
-                        );
-					}
+					OC.MountConfig.saveStorage(tr);
+					statusSpan.removeClass();
+					statusSpan.addClass('waiting');
+					window.location = result.data.url;
 				} else {
-					OC.dialogs.alert(result.data.message,
-                        t('files_external', 'Error configuring Dropbox storage')
-                    );
+					OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
 				}
 			});
 		} else {
 			OC.dialogs.alert(
-                t('files_external', 'Please provide a valid Dropbox app key and secret.'),
-                t('files_external', 'Error configuring Dropbox storage')
-            );
+				t('files_external', 'Please provide a valid Dropbox app key and secret.'),
+				t('files_external', 'Error configuring Dropbox storage')
+			);
 		}
 	});
 
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index f9fb8078612..a3b3e9cb3d2 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -3,8 +3,7 @@ $(document).ready(function() {
 	$('#externalStorage tbody tr.OC_Filestorage_Google').each(function() {
 		var configured = $(this).find('[data-parameter="configured"]');
 		if ($(configured).val() == 'true') {
-			$(this).find('.configuration')
-                .append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 		} else {
 			var token = $(this).find('[data-parameter="token"]');
 			var token_secret = $(this).find('[data-parameter="token_secret"]');
@@ -22,37 +21,44 @@ $(document).ready(function() {
 						OC.MountConfig.saveStorage(tr);
 						$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 					} else {
-						OC.dialogs.alert(result.data.message,
-                            t('files_external', 'Error configuring Google Drive storage')
-                        );
+						OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage'));
 					}
 				});
-			} else if ($(this).find('.google').length == 0) {
-				$(this).find('.configuration').append('<a class="button google">'+t('files_external', 'Grant access')+'</a>');
+			} else {
+				onGoogleInputsChange(this);
 			}
 		}
 	});
 
-	$('#externalStorage tbody tr').live('change', function() {
-		if ($(this).hasClass('OC_Filestorage_Google') && $(this).find('[data-parameter="configured"]').val() != 'true') {
-			if ($(this).find('.mountPoint input').val() != '') {
-				if ($(this).find('.google').length == 0) {
-					$(this).find('.configuration').append('<a class="button google">'+t('files_external', 'Grant access')+'</a>');
-				}
-			}
-		}
+	$('#externalStorage tbody tr.OC_Filestorage_Google td').live('paste', function() {
+		var tr = $(this).parent();
+		setTimeout(function() {
+			onGoogleInputsChange(tr);
+		}, 20);
 	});
 
-	$('#externalStorage tbody tr .mountPoint input').live('keyup', function() {
-		var tr = $(this).parent().parent();
-		if ($(tr).hasClass('OC_Filestorage_Google') && $(tr).find('[data-parameter="configured"]').val() != 'true' && $(tr).find('.google').length > 0) {
-			if ($(this).val() != '') {
-				$(tr).find('.google').show();
-			} else {
+	$('#externalStorage tbody tr.OC_Filestorage_Google td').live('keyup', function() {
+		onGoogleInputsChange($(this).parent());
+	});
+
+	$('#externalStorage tbody tr.OC_Filestorage_Google .chzn-select').live('change', function() {
+		onGoogleInputsChange($(this).parent().parent());
+	});
+
+	function onGoogleInputsChange(tr) {
+		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
+			var config = $(tr).find('.configuration');
+			if ($(tr).find('.mountPoint input').val() != '' && ($(tr).find('.chzn-select').length == 0 || $(tr).find('.chzn-select').val() != null)) {
+				if ($(tr).find('.google').length == 0) {
+					$(config).append('<a class="button google">'+t('files_external', 'Grant access')+'</a>');
+				} else {
+					$(tr).find('.google').show();
+				}
+			} else if ($(tr).find('.google').length > 0) {
 				$(tr).find('.google').hide();
 			}
 		}
-	});
+	}
 
 	$('.google').live('click', function(event) {
 		event.preventDefault();
@@ -60,23 +66,18 @@ $(document).ready(function() {
 		var configured = $(this).parent().find('[data-parameter="configured"]');
 		var token = $(this).parent().find('[data-parameter="token"]');
 		var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
+		var statusSpan = $(tr).find('.status span');
 		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
 			if (result && result.status == 'success') {
 				$(configured).val('false');
 				$(token).val(result.data.request_token);
 				$(token_secret).val(result.data.request_token_secret);
-				if (OC.MountConfig.saveStorage(tr)) {
-					window.location = result.data.url;
-				} else {
-					OC.dialogs.alert(
-                        t('files_external', 'Fill out all required fields'),
-                        t('files_external', 'Error configuring Google Drive storage')
-                    );
-				}
+				OC.MountConfig.saveStorage(tr);
+				statusSpan.removeClass();
+				statusSpan.addClass('waiting');
+				window.location = result.data.url;
 			} else {
-				OC.dialogs.alert(result.data.message,
-                    t('files_external', 'Error configuring Google Drive storage')
-                );
+				OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage'));
 			}
 		});
 	});
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 25f6ed57984..b98fcf1b0ae 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -58,12 +58,25 @@ OC.MountConfig={
 						}
 						users.push(applicable);
 					}
-					$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) {
-						statusSpan.removeClass();
-						if (result && result.status == 'success' && result.data.message) {
-							statusSpan.addClass('success');
-						} else {
-							statusSpan.addClass('error');
+					$.ajax({type: 'POST',
+						url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
+						data: {
+							mountPoint: mountPoint,
+							class: backendClass,
+							classOptions: classOptions,
+							mountType: mountType,
+							applicable: applicable,
+							isPersonal: isPersonal
+						},
+						async: false,
+						success: function(result) {
+							statusSpan.removeClass();
+							if (result && result.status == 'success' && result.data.message) {
+								status = true;
+								statusSpan.addClass('success');
+							} else {
+								statusSpan.addClass('error');
+							}
 						}
 					});
 				});
@@ -71,26 +84,61 @@ OC.MountConfig={
 				$(tr).find('.applicable').data('applicable-users', users);
 				var mountType = 'group';
 				$.each(oldGroups, function(index, applicable) {
-					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+					$.ajax({type: 'POST',
+						url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'),
+						data: {
+							mountPoint: mountPoint,
+							class: backendClass,
+							classOptions: classOptions,
+							mountType: mountType,
+							applicable: applicable,
+							isPersonal: isPersonal
+						},
+						async: false
+					});
 				});
 				var mountType = 'user';
 				$.each(oldUsers, function(index, applicable) {
-					$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
+					$.ajax({type: 'POST',
+						url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'),
+						data: {
+							mountPoint: mountPoint,
+							class: backendClass,
+							classOptions: classOptions,
+							mountType: mountType,
+							applicable: applicable,
+							isPersonal: isPersonal
+						},
+						async: false
+					});
 				});
 			} else {
 				var isPersonal = true;
 				var mountType = 'user';
 				var applicable = OC.currentUser;
-				$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal }, function(result) {
-					statusSpan.removeClass();
-					if (result && result.status == 'success' && result.data.message) {
-						statusSpan.addClass('success');
-					} else {
-						statusSpan.addClass('error');
+				$.ajax({type: 'POST',
+					url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
+					data: {
+						mountPoint: mountPoint,
+						class: backendClass,
+						classOptions: classOptions,
+						mountType: mountType,
+						applicable: applicable,
+						isPersonal: isPersonal
+					},
+					async: false,
+					success: function(result) {
+						statusSpan.removeClass();
+						if (result && result.status == 'success' && result.data.message) {
+							status = true;
+							statusSpan.addClass('success');
+						} else {
+							statusSpan.addClass('error');
+						}
 					}
 				});
 			}
-			return true;
+			return status;
 		}
 	}
 };

From d65cb7ae0954e89de0a1b56170ffab683c39e3cc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 2 Jan 2013 11:54:21 -0500
Subject: [PATCH 12/23] Fix 'Grant Access' button for multiple Google Drive
 mount points and prevent multiple scripts being added

---
 apps/files_external/appinfo/update.php     |  5 +++++
 apps/files_external/js/google.js           | 26 +++++++++++++++-------
 apps/files_external/templates/settings.php |  5 ++---
 3 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 apps/files_external/appinfo/update.php

diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php
new file mode 100644
index 00000000000..15d7e4168ee
--- /dev/null
+++ b/apps/files_external/appinfo/update.php
@@ -0,0 +1,5 @@
+<?php
+$installedVersion = OCP\Config::getAppValue('files_external', 'installed_version');
+if (version_compare($installedVersion, '0.2', '<')) {
+	
+}
\ No newline at end of file
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index a3b3e9cb3d2..89daa0078e8 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -1,18 +1,27 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr.OC_Filestorage_Google').each(function() {
-		var configured = $(this).find('[data-parameter="configured"]');
+	$('#externalStorage tbody tr.OC_Filestorage_Google').each(function(index, tr) {
+		setupGoogleRow(tr);
+	});
+
+	$('#selectBackend').live('change', function() {
+		if ($(this).val() == 'OC_Filestorage_Google') {
+			setupGoogleRow($('#externalStorage tbody>tr:last').prev('tr'));
+		}
+	});
+
+	function setupGoogleRow(tr) {
+		var configured = $(tr).find('[data-parameter="configured"]');
 		if ($(configured).val() == 'true') {
-			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+			$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 		} else {
-			var token = $(this).find('[data-parameter="token"]');
-			var token_secret = $(this).find('[data-parameter="token_secret"]');
+			var token = $(tr).find('[data-parameter="token"]');
+			var token_secret = $(tr).find('[data-parameter="token_secret"]');
 			var params = {};
 			window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
 				params[key] = value;
 			});
 			if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
-				var tr = $(this);
 				$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
 					if (result && result.status == 'success') {
 						$(token).val(result.access_token);
@@ -22,13 +31,14 @@ $(document).ready(function() {
 						$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
 					} else {
 						OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage'));
+						onGoogleInputsChange(tr);
 					}
 				});
 			} else {
-				onGoogleInputsChange(this);
+				onGoogleInputsChange(tr);
 			}
 		}
-	});
+	}
 
 	$('#externalStorage tbody tr.OC_Filestorage_Google td').live('paste', function() {
 		var tr = $(this).parent();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 9702ebfb4c7..6f22de392fa 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -73,9 +73,8 @@
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endforeach; ?>
-							<?php if (isset($_['backends'][$mount['class']]['custom'])): ?>
-								<?php OCP\Util::addScript('files_external',
-														  $_['backends'][$mount['class']]['custom']); ?>
+							<?php if (isset($_['backends'][$mount['class']]['custom']) && !in_array('files_external/js/'.$_['backends'][$mount['class']]['custom'], \OC_Util::$scripts)): ?>
+								<?php OCP\Util::addScript('files_external', $_['backends'][$mount['class']]['custom']); ?>
 							<?php endif; ?>
 						<?php endif; ?>
 					</td>

From db90f2c296c4a74933c2d258d8b335a3093db0f9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 2 Jan 2013 12:13:59 -0500
Subject: [PATCH 13/23] Listen to checkbox changes as well

---
 apps/files_external/js/settings.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index b98fcf1b0ae..2a8d8d2c284 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -239,6 +239,10 @@ $(document).ready(function() {
 		}
 	});
 
+	$('#externalStorage td input:checkbox').live('change', function() {
+		OC.MountConfig.saveStorage($(this).parent().parent().parent());
+	});
+
 	$('.applicable .chzn-select').live('change', function() {
 		OC.MountConfig.saveStorage($(this).parent().parent());
 	});

From 7f218c4dc07edd2393ffa132745dcc0df16508e3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 2 Jan 2013 13:20:44 -0500
Subject: [PATCH 14/23] Remove accidentally included file

---
 apps/files_external/appinfo/update.php | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 apps/files_external/appinfo/update.php

diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php
deleted file mode 100644
index 15d7e4168ee..00000000000
--- a/apps/files_external/appinfo/update.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$installedVersion = OCP\Config::getAppValue('files_external', 'installed_version');
-if (version_compare($installedVersion, '0.2', '<')) {
-	
-}
\ No newline at end of file

From 78043d73e83b95b0d1328598f59a1a65707f4ca6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 9 Jan 2013 21:47:24 -0500
Subject: [PATCH 15/23] Set status to waiting for Dropbox and Google Drive
 while authenticating

---
 apps/files_external/js/dropbox.js | 3 +++
 apps/files_external/js/google.js  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 92a92467c79..9314a4c7927 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -15,6 +15,9 @@ $(document).ready(function() {
 				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
 					var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
 					var tr = $(this);
+					var statusSpan = $(tr).find('.status span');
+					statusSpan.removeClass();
+					statusSpan.addClass('waiting');
 					$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
 						if (result && result.status == 'success') {
 							$(token).val(result.access_token);
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 89daa0078e8..ad6fc6a0f9a 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -22,6 +22,9 @@ $(document).ready(function() {
 				params[key] = value;
 			});
 			if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
+				var statusSpan = $(tr).find('.status span');
+				statusSpan.removeClass();
+				statusSpan.addClass('waiting');
 				$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
 					if (result && result.status == 'success') {
 						$(token).val(result.access_token);

From 6f08b1f829e9d4c49f66b19fdda8c229bc8ae3f3 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 11 Feb 2013 18:04:54 -0500
Subject: [PATCH 16/23] Change wordings

---
 apps/files_external/templates/settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 6f22de392fa..62bbf3a5ae1 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -6,8 +6,8 @@
 			<thead>
 				<tr>
 					<th></th>
-					<th><?php echo $l->t('Mount point'); ?></th>
-					<th><?php echo $l->t('Backend'); ?></th>
+					<th><?php echo $l->t('Folder name'); ?></th>
+					<th><?php echo $l->t('External storage'); ?></th>
 					<th><?php echo $l->t('Configuration'); ?></th>
 					<!--<th><?php echo $l->t('Options'); ?></th> -->
 					<?php if ($_['isAdminPage']) echo '<th>'.$l->t('Applicable').'</th>'; ?>
@@ -30,7 +30,7 @@
 						<td class="backend">
 							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
 								<option value="" disabled selected
-										style="display:none;"><?php echo $l->t('Add mount point'); ?></option>
+										style="display:none;"><?php echo $l->t('Add storage'); ?></option>
 								<?php foreach ($_['backends'] as $class => $backend): ?>
 									<option value="<?php echo $class; ?>"><?php echo $backend['backend']; ?></option>
 								<?php endforeach; ?>

From ad6e133ca6cfe30e76fb402e5a266bca90f8c80b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 11 Feb 2013 20:35:40 -0500
Subject: [PATCH 17/23] Replace another mount point placeholder

---
 apps/files_external/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index c6025aa0ffe..6dc416303af 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -25,7 +25,7 @@
 					</td>
 					<td class="mountPoint"><input type="text" name="mountPoint"
 												  value="<?php echo $mountPoint; ?>"
-												  placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
+												  placeholder="<?php echo $l->t('Folder name'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
 							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>

From 646d60ee83168169050271ee9d5442e2dc626e8a Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 12 Feb 2013 11:00:38 +0100
Subject: [PATCH 18/23] fixing namespace

---
 apps/files_external/lib/amazons3.php | 2 +-
 apps/files_external/lib/ftp.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 3800a14c37c..d00e9a08231 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -41,7 +41,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$this->s3 = new \AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
 			$this->bucket = $params['bucket'];
 		} else {
-			throw new Exception();
+			throw new \Exception();
 		}
 	}
 
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index a76a3dc80f8..fa8698af7ac 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -35,7 +35,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 			if ( ! $this->root || $this->root[0]!='/') {
 				$this->root='/'.$this->root;
 			}
-			//create the root folder if necesary
+			//create the root folder if necessary
 			if ( ! $this->is_dir('')) {
 				$this->mkdir('');
 			}
@@ -88,7 +88,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 				} else {
 					$ext='';
 				}
-				$tmpFile=OCP\Files::tmpFile($ext);
+				$tmpFile=\OCP\Files::tmpFile($ext);
 				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if ($this->file_exists($path)) {
 					$this->getFile($path, $tmpFile);

From 6b594c1eb84dccb57c5050f9d686734c98cc6d39 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 12 Feb 2013 11:05:12 +0100
Subject: [PATCH 19/23] fixing namespace

---
 apps/files_external/lib/swift.php  | 2 +-
 apps/files_external/lib/webdav.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index bab49524746..20af67cb8b6 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -264,7 +264,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 	private function getSubContainerFile($container) {
 		try {
 			return $container->get_object(self::SUBCONTAINER_FILE);
-		} catch(NoSuchObjectException $e) {
+		} catch(\NoSuchObjectException $e) {
 			return $container->create_object(self::SUBCONTAINER_FILE);
 		}
 	}
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 2b7ab4cee0a..2d183c8893d 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -73,7 +73,7 @@ class DAV extends \OC\Files\Storage\Common{
 				$this->client->addTrustedCertificates($certPath);
 			}
 		}
-		//create the root folder if necesary
+		//create the root folder if necessary
 		$this->mkdir('');
 	}
 
@@ -317,7 +317,7 @@ class DAV extends \OC\Files\Storage\Common{
 		}
 	}
 
-	private function cleanPath($path) {
+	public function cleanPath($path) {
 		if ( ! $path || $path[0]=='/') {
 			return substr($path, 1);
 		} else {

From 010c4c289123da70ccceee22e9f56927d7fe553f Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 12 Feb 2013 23:27:31 +0100
Subject: [PATCH 20/23] adding spinner while talking to the backend

---
 apps/files_external/css/settings.css | 1 +
 apps/files_external/js/settings.js   | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 94b453793b1..2580fe48ae0 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -2,6 +2,7 @@ td.status>span { display:inline-block; height:16px; width:16px; }
 span.success { background-image: url('../img/success.png'); background-repeat:no-repeat; }
 span.error { background-image: url('../img/error.png'); background-repeat:no-repeat; }
 span.waiting { background-image: url('../img/waiting.png'); background-repeat:no-repeat; }
+span.pending { background-image: url('%webroot%/core/img/loading.gif'); background-repeat:no-repeat; }
 td.mountPoint, td.backend { width:10em; }
 td.remove>img { visibility:hidden; padding-top:0.8em; }
 tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 5dffbce5bdf..30b2eac417f 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -58,6 +58,8 @@ OC.MountConfig={
 						}
 						users.push(applicable);
 					}
+					statusSpan.removeClass();
+					statusSpan.addClass('pending');
 					$.ajax({type: 'POST',
 						url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 						data: {
@@ -68,7 +70,7 @@ OC.MountConfig={
 							applicable: applicable,
 							isPersonal: isPersonal
 						},
-						async: false,
+						async: true,
 						success: function(result) {
 							statusSpan.removeClass();
 							if (result && result.status == 'success' && result.data.message) {
@@ -116,6 +118,8 @@ OC.MountConfig={
 				var isPersonal = true;
 				var mountType = 'user';
 				var applicable = OC.currentUser;
+				statusSpan.removeClass();
+				statusSpan.addClass('pending');
 				$.ajax({type: 'POST',
 					url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 					data: {
@@ -126,7 +130,7 @@ OC.MountConfig={
 						applicable: applicable,
 						isPersonal: isPersonal
 					},
-					async: false,
+					async: true,
 					success: function(result) {
 						statusSpan.removeClass();
 						if (result && result.status == 'success' && result.data.message) {

From 037c3ee4ecf6f3ffae0f1707074ac13b234dc1ec Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 13 Feb 2013 00:23:37 +0100
Subject: [PATCH 21/23] fixing issues with UTF8 characters in translatable
 strings

---
 apps/files_external/css/settings.css | 1 -
 apps/files_external/js/settings.js   | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 2580fe48ae0..94b453793b1 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -2,7 +2,6 @@ td.status>span { display:inline-block; height:16px; width:16px; }
 span.success { background-image: url('../img/success.png'); background-repeat:no-repeat; }
 span.error { background-image: url('../img/error.png'); background-repeat:no-repeat; }
 span.waiting { background-image: url('../img/waiting.png'); background-repeat:no-repeat; }
-span.pending { background-image: url('%webroot%/core/img/loading.gif'); background-repeat:no-repeat; }
 td.mountPoint, td.backend { width:10em; }
 td.remove>img { visibility:hidden; padding-top:0.8em; }
 tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 30b2eac417f..5dffbce5bdf 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -58,8 +58,6 @@ OC.MountConfig={
 						}
 						users.push(applicable);
 					}
-					statusSpan.removeClass();
-					statusSpan.addClass('pending');
 					$.ajax({type: 'POST',
 						url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 						data: {
@@ -70,7 +68,7 @@ OC.MountConfig={
 							applicable: applicable,
 							isPersonal: isPersonal
 						},
-						async: true,
+						async: false,
 						success: function(result) {
 							statusSpan.removeClass();
 							if (result && result.status == 'success' && result.data.message) {
@@ -118,8 +116,6 @@ OC.MountConfig={
 				var isPersonal = true;
 				var mountType = 'user';
 				var applicable = OC.currentUser;
-				statusSpan.removeClass();
-				statusSpan.addClass('pending');
 				$.ajax({type: 'POST',
 					url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 					data: {
@@ -130,7 +126,7 @@ OC.MountConfig={
 						applicable: applicable,
 						isPersonal: isPersonal
 					},
-					async: true,
+					async: false,
 					success: function(result) {
 						statusSpan.removeClass();
 						if (result && result.status == 'success' && result.data.message) {

From 05a8766cbc5826a89e52248994e3e2d0b6c57be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 20 Feb 2013 12:06:08 +0100
Subject: [PATCH 22/23] attach on() events to external storage table, dom
 events in the table will always bubble up here

---
 apps/files_external/js/settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index be24812869e..ac408786ff6 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -146,7 +146,7 @@ OC.MountConfig={
 $(document).ready(function() {
 	$('.chzn-select').chosen();
 
-	$('#selectBackend').on('change', function() {
+	$('#externalStorage').on('change', '#selectBackend', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').append($(tr).clone());
 		$('#externalStorage tbody tr').last().find('.mountPoint input').val('');
@@ -243,11 +243,11 @@ $(document).ready(function() {
 		OC.MountConfig.saveStorage($(this).parent().parent().parent());
 	});
 
-	$('.applicable').on('change', '.chzn-select', function() {
+	$('#externalStorage').on('change', '.applicable .chzn-select', function() {
 		OC.MountConfig.saveStorage($(this).parent().parent());
 	});
 
-	$('td.remove>img').on('click', function() {
+	$('#externalStorage').on('click', 'td.remove>img', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if ( ! mountPoint) {

From 5b50bc8c0aaa294bc982deea626e6d1d303c1c23 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 25 Feb 2013 19:45:01 -0500
Subject: [PATCH 23/23] Fix Dropbox and Google ui

---
 apps/files_external/js/dropbox.js |  8 ++++----
 apps/files_external/js/google.js  | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index a8bbb7b02e2..957daeb4d1f 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -37,18 +37,18 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#externalStorage tbody').on('paste', 'tr.OC_Filestorage_Dropbox td', function() {
+	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
 		var tr = $(this).parent();
 		setTimeout(function() {
 			onDropboxInputsChange(tr);
 		}, 20);
 	});
 
-	$('#externalStorage tbody').on('keyup', 'tr.OC_Filestorage_Dropbox td', function() {
+	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
 		onDropboxInputsChange($(this).parent());
 	});
 
-	$('#externalStorage tbody').on('change', 'tr.OC_Filestorage_Dropbox .chzn-select', function() {
+	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox .chzn-select', function() {
 		onDropboxInputsChange($(this).parent().parent());
 	});
 
@@ -72,7 +72,7 @@ $(document).ready(function() {
 		}
 	}
 
-	$('.dropbox').on('click', function(event) {
+	$('#externalStorage').on('click', '.dropbox', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
 		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 46333d89d68..7be1b338e90 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -1,11 +1,11 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr.OC_Filestorage_Google').each(function(index, tr) {
+	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google').each(function(index, tr) {
 		setupGoogleRow(tr);
 	});
 
-	$('#selectBackend').on('change', function() {
-		if ($(this).val() == 'OC_Filestorage_Google') {
+	$('#externalStorage').on('change', '#selectBackend', function() {
+		if ($(this).val() == '\\OC\\Files\\Storage\\Google') {
 			setupGoogleRow($('#externalStorage tbody>tr:last').prev('tr'));
 		}
 	});
@@ -43,18 +43,18 @@ $(document).ready(function() {
 		}
 	}
 
-	$('#externalStorage tbody').on('paste', 'tr.OC_Filestorage_Google td', function() {
+	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td', function() {
 		var tr = $(this).parent();
 		setTimeout(function() {
 			onGoogleInputsChange(tr);
 		}, 20);
 	});
 
-	$('#externalStorage tbody').on('keyup', 'tr.OC_Filestorage_Google td', function() {
+	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td', function() {
 		onGoogleInputsChange($(this).parent());
 	});
 
-	$('#externalStorage tbody').on('change', 'tr.OC_Filestorage_Google .chzn-select', function() {
+	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google .chzn-select', function() {
 		onGoogleInputsChange($(this).parent().parent());
 	});
 
@@ -73,7 +73,7 @@ $(document).ready(function() {
 		}
 	}
 
-	$('.google').on('click', function(event) {
+	$('#externalStorage').on('click', '.google', function(event) {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
 		var configured = $(this).parent().find('[data-parameter="configured"]');