From f6863f9e51ca1523e43c92a1ecbfe6f70c090494 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 31 Jul 2012 16:52:21 +0200
Subject: [PATCH] get encryption mode from the settings

---
 apps/files_encryption/lib/crypt.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 090b1db061..fdace3e61d 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -32,13 +32,19 @@ class Crypt {
 
 	/**
 	 * @brief return encryption mode client or server side encryption
-	 * @param string user name 
+	 * @param string user name (use system wide setting if name=null)
 	 * @return string 'client' or 'server'
 	 */
-	public static function mode($user) {
-		//TODO: allow user to set encryption mode and check the selection of the user
-		// for the moment I just return 'client' for test purposes
-		return 'client';
+	public static function mode($user=null) {
+		
+		$mode = \OC_Appconfig::getValue('files_encryption', 'mode', 'unknown');
+		
+		if ($mode == 'unknown') {
+			error_log('no encryption mode configured');
+			return false;
+		}
+		
+		return $mode;
 	}
 	
         /**