From 931c4695a60d7c46d225152f0628fdd7f1574027 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 27 Jul 2012 13:58:58 +0200
Subject: [PATCH] run setup routine only for server side encryption

---
 apps/files_encryption/hooks/hooks.php | 36 +++++++++++++++------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 654686208f..80daf50a24 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -34,24 +34,28 @@ class Hooks {
 	 * @brief Startup encryption backend upon user login
 	 * @note This method should never be called for users using client side encryption
 	 */
-	public static function login( $params ){
-		
-		$view = new \OC_FilesystemView( '/' );
-		
-		$util = new Util( $view, $params['uid'] );
-		
-		if ( !$util->ready() ) {
-		
-			return $util->setup( $params['password'] );
-			
+
+	public static function login( $params ) {
+
+		if (Crypt::mode($params['uid'])=='server') {
+
+			$view = new \OC_FilesystemView( '/' );
+
+			$util = new Util( $view, $params['uid'] );
+
+			if ( !$util->ready()) {
+
+				return $util->setupServerSide( $params['password'] );
+
+			}
+
+			$encryptedKey = Keymanager::getPrivateKey( $params['uid'] );
+
+			$_SESSION['enckey'] = Crypt::symmetricEncryptFileContent( $encryptedKey, $params['password'] );
 		}
-		
-		$encryptedKey = Keymanager::getPrivateKey( $params['uid'] );
-		
-		$_SESSION['enckey'] = Crypt::symmetricEncryptFileContent( $encryptedKey, $params['password'] );
-		
+
 		return true;
-		
+
 	}
 
 }