1 files changed, 11 insertions, 8 deletions
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 7e50c900fa1..90b24dc8ddb 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -37,14 +37,17 @@ class Crypt {
 	 */
 	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;
-			
+		$mode = \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' );
+		
+		if ( $mode == 'user') {
+			$mode = 'none';
+			if ( $user ) {
+				$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
+				$result = $query->execute(array($user));
+				if ($row = $result->fetchRow()){
+					$mode = $row['mode'];
+				}
+			}
 		}
 		
 		return $mode;