merge master into filesystem

2 files changed, 17 insertions, 2 deletions

diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index db8f005745a..6990d928cff 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -32,7 +32,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	 */
 	protected function validateUserPass($username, $password) {
 		if (OC_User::isLoggedIn()) {
-			OC_Util::setupFS($username);
+			OC_Util::setupFS(OC_User::getUser());
 			return true;
 		} else {
 			OC_Util::setUpFS();//login hooks may need early access to the filesystem
@@ -45,4 +45,19 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 			}
 		}
 	}
+
+	/**
+	 * Returns information about the currently logged in username.
+	 *
+	 * If nobody is currently logged in, this method should return null.
+	 *
+	 * @return string|null
+	 */
+	public function getCurrentUser() {
+		$user = OC_User::getUser();
+		if(!$user) {
+			return null;
+		}
+		return $user;
+	}
 }
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php
index a56a65ad863..fbbb4a3cf6f 100644
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@ -51,7 +51,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
 			}
 			list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
 			if ($length > OC_Filesystem::free_space($parentUri)) {
-				throw new Sabre_DAV_Exception('Quota exceeded. File is too big.');
+				throw new Sabre_DAV_Exception_InsufficientStorage();
 			}
 		}
 		return true;