Merge branch 'master' into googledrive

42 files changed, 2100 insertions, 1672 deletions

diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 15d6fc80bd3..d90e2999702 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
 "Unable to rename file" => "Não foi possível renomear o ficheiro",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 600048a321c..0bd207888dc 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
 "{count} files" => "{count} 個檔案",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
 "Unable to rename file" => "無法重新命名檔案",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 6d7953b5639..6a0186d5a9b 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -13,31 +13,47 @@ use OCA\Encryption;
 \OCP\JSON::checkAppEnabled('files_encryption');
 \OCP\JSON::callCheck();
 
-$l=OC_L10N::get('files_encryption');
+$l = OC_L10N::get('files_encryption');
 
 $return = false;
-
 // Enable recoveryAdmin
 
 $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
 
-if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
+if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') {
 
 	$return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
-	$action = "enable";
+
+	// Return success or failure
+	if ($return) {
+		\OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully enabled'))));
+	} else {
+		\OCP\JSON::error(array(
+							  'data' => array(
+								  'message' => $l->t(
+									  'Could not enable recovery key. Please check your recovery key password!')
+							  )
+						 ));
+	}
 
 // Disable recoveryAdmin
 } elseif (
 	isset($_POST['adminEnableRecovery'])
-	&& 0 == $_POST['adminEnableRecovery']
+	&& '0' === $_POST['adminEnableRecovery']
 ) {
 	$return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
-	$action = "disable";
-}
 
-// Return success or failure
-if ($return) {
-	\OCP\JSON::success(array("data" => array( "message" => $l->t('Recovery key successfully ' . $action.'d'))));
-} else {
-	\OCP\JSON::error(array("data" => array( "message" => $l->t('Could not '.$action.' recovery key. Please check your recovery key password!'))));
+	// Return success or failure
+	if ($return) {
+		\OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully disabled'))));
+	} else {
+		\OCP\JSON::error(array(
+							  'data' => array(
+								  'message' => $l->t(
+									  'Could not disable recovery key. Please check your recovery key password!')
+							  )
+						 ));
+	}
 }
+
+
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index d990796a4fb..b0594f967ba 100644
--- a/apps/files_encryption/ajax/changeRecoveryPassword.php
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  *
  * @brief Script to change recovery key password
- * 
+ *
  */
 
 use OCA\Encryption;
@@ -15,7 +15,7 @@ use OCA\Encryption;
 \OCP\JSON::checkAppEnabled('files_encryption');
 \OCP\JSON::callCheck();
 
-$l=OC_L10N::get('core');
+$l = OC_L10N::get('core');
 
 $return = false;
 
@@ -28,7 +28,7 @@ $result = $util->checkRecoveryPassword($oldPassword);
 
 if ($result) {
 	$keyId = $util->getRecoveryKeyId();
-	$keyPath = '/owncloud_private_key/' . $keyId . ".private.key";
+	$keyPath = '/owncloud_private_key/' . $keyId . '.private.key';
 	$view = new \OC\Files\View('/');
 
 	$proxyStatus = \OC_FileProxy::$enabled;
@@ -46,7 +46,7 @@ if ($result) {
 
 // success or failure
 if ($return) {
-	\OCP\JSON::success(array("data" => array( "message" => $l->t('Password successfully changed.'))));
+	\OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
 } else {
-	\OCP\JSON::error(array("data" => array( "message" => $l->t('Could not change the password. Maybe the old password was not correct.'))));
+	\OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.'))));
 }
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
index 1f42b376e42..1d0f1ac2d17 100644
--- a/apps/files_encryption/ajax/userrecovery.php
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -10,32 +10,32 @@
 use OCA\Encryption;
 
 \OCP\JSON::checkLoggedIn();
-\OCP\JSON::checkAppEnabled( 'files_encryption' );
+\OCP\JSON::checkAppEnabled('files_encryption');
 \OCP\JSON::callCheck();
 
-if ( 
-	isset( $_POST['userEnableRecovery'] ) 
-	&& ( 0 == $_POST['userEnableRecovery'] || 1 == $_POST['userEnableRecovery'] )
+if (
+	isset($_POST['userEnableRecovery'])
+	&& (0 == $_POST['userEnableRecovery'] || '1' === $_POST['userEnableRecovery'])
 ) {
 
 	$userId = \OCP\USER::getUser();
-	$view = new \OC_FilesystemView( '/' );
-	$util = new \OCA\Encryption\Util( $view, $userId );
-	
+	$view = new \OC_FilesystemView('/');
+	$util = new \OCA\Encryption\Util($view, $userId);
+
 	// Save recovery preference to DB
-	$return = $util->setRecoveryForUser( $_POST['userEnableRecovery'] );
+	$return = $util->setRecoveryForUser($_POST['userEnableRecovery']);
 
-	if ($_POST['userEnableRecovery'] == "1") {
+	if ($_POST['userEnableRecovery'] === '1') {
 		$util->addRecoveryKeys();
 	} else {
 		$util->removeRecoveryKeys();
 	}
-	
+
 } else {
 
 	$return = false;
-	
+
 }
 
 // Return success or failure
-( $return ) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
+($return) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 7d01696e08a..d9bb4d5e74e 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -10,7 +10,7 @@ OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
 OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
 OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
 
-OC_FileProxy::register( new OCA\Encryption\Proxy() );
+OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 // User related hooks
 OCA\Encryption\Helper::registerUserHooks();
@@ -21,7 +21,7 @@ OCA\Encryption\Helper::registerShareHooks();
 // Filesystem related hooks
 OCA\Encryption\Helper::registerFilesystemHooks();
 
-stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
+stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
 
 // check if we are logged in
 if (OCP\User::isLoggedIn()) {
@@ -46,6 +46,6 @@ if (OCP\User::isLoggedIn()) {
 }
 
 // Register settings scripts
-OCP\App::registerAdmin( 'files_encryption', 'settings-admin' );
-OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
+OCP\App::registerAdmin('files_encryption', 'settings-admin');
+OCP\App::registerPersonal('files_encryption', 'settings-personal');
 
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2066300a163..955425595ba 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -37,108 +37,106 @@ 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 ) {

-	

+	public static function login($params) {

+

 		// Manually initialise Filesystem{} singleton with correct 

 		// fake root path, in order to avoid fatal webdav errors

-        // NOTE: disabled because this give errors on webdav!

+		// NOTE: disabled because this give errors on webdav!

 		//\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );

-	

-		$view = new \OC_FilesystemView( '/' );

 

-		$util = new Util( $view, $params['uid'] );

+		$view = new \OC_FilesystemView('/');

+

+		$util = new Util($view, $params['uid']);

+

+		// setup user, if user not ready force relogin

+		if (Helper::setupUser($util, $params['password']) === false) {

+			return false;

+		}

+

+		$encryptedKey = Keymanager::getPrivateKey($view, $params['uid']);

 

-        // setup user, if user not ready force relogin

-		if(Helper::setupUser($util, $params['password']) === false) {

-            return false;

-        }

+		$privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $params['password']);

 

-		$encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );

-		

-		$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );

+		$session = new \OCA\Encryption\Session($view);

+

+		$session->setPrivateKey($privateKey, $params['uid']);

 

-		$session = new Session( $view );

-		

-		$session->setPrivateKey( $privateKey, $params['uid'] );

-		

 		// Check if first-run file migration has already been performed

 		$migrationCompleted = $util->getMigrationStatus();

-		

+

 		// If migration not yet done

-		if ( ! $migrationCompleted ) {

-		

-			$userView = new \OC_FilesystemView( '/' . $params['uid'] );

-			

+		if (!$migrationCompleted) {

+

+			$userView = new \OC_FilesystemView('/' . $params['uid']);

+

 			// Set legacy encryption key if it exists, to support 

 			// depreciated encryption system

 			if (

-				$userView->file_exists( 'encryption.key' )

-				&& $encLegacyKey = $userView->file_get_contents( 'encryption.key' )

+				$userView->file_exists('encryption.key')

+				&& $encLegacyKey = $userView->file_get_contents('encryption.key')

 			) {

-			

-				$plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );

-				

-				$session->setLegacyKey( $plainLegacyKey );

-			

+

+				$plainLegacyKey = Crypt::legacyBlockDecrypt($encLegacyKey, $params['password']);

+

+				$session->setLegacyKey($plainLegacyKey);

+

 			}

 

-			$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );

-			

 			// Encrypt existing user files:

 			// This serves to upgrade old versions of the encryption

 			// app (see appinfo/spec.txt)

 			if (

-				$util->encryptAll( '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )

+				$util->encryptAll('/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'])

 			) {

-				

-				\OC_Log::write( 

+

+				\OC_Log::write(

 					'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" completed'

-					, \OC_Log::INFO 

+					, \OC_Log::INFO

 				);

-			

+

 			}

 

 			// Register successful migration in DB

-			$util->setMigrationStatus( 1 );

-		

+			$util->setMigrationStatus(1);

+

 		}

 

 		return true;

 

 	}

 

-    /**

-     * @brief setup encryption backend upon user created

-     * @note This method should never be called for users using client side encryption

-     */

-    public static function postCreateUser( $params ) {

-        $view = new \OC_FilesystemView( '/' );

+	/**

+	 * @brief setup encryption backend upon user created

+	 * @note This method should never be called for users using client side encryption

+	 */

+	public static function postCreateUser($params) {

+		$view = new \OC_FilesystemView('/');

 

-        $util = new Util( $view, $params['uid'] );

+		$util = new Util($view, $params['uid']);

 

-        Helper::setupUser($util, $params['password']);

-    }

+		Helper::setupUser($util, $params['password']);

+	}

 

-    /**

-     * @brief cleanup encryption backend upon user deleted

-     * @note This method should never be called for users using client side encryption

-     */

-    public static function postDeleteUser( $params ) {

-        $view = new \OC_FilesystemView( '/' );

+	/**

+	 * @brief cleanup encryption backend upon user deleted

+	 * @note This method should never be called for users using client side encryption

+	 */

+	public static function postDeleteUser($params) {

+		$view = new \OC_FilesystemView('/');

 

-        // cleanup public key

-        $publicKey = '/public-keys/' . $params['uid'] . '.public.key';

+		// cleanup public key

+		$publicKey = '/public-keys/' . $params['uid'] . '.public.key';

 

-        // Disable encryption proxy to prevent recursive calls

-        $proxyStatus = \OC_FileProxy::$enabled;

-        \OC_FileProxy::$enabled = false;

+		// Disable encryption proxy to prevent recursive calls

+		$proxyStatus = \OC_FileProxy::$enabled;

+		\OC_FileProxy::$enabled = false;

 

-        $view->unlink($publicKey);

+		$view->unlink($publicKey);

 

-        \OC_FileProxy::$enabled = $proxyStatus;

-    }

+		\OC_FileProxy::$enabled = $proxyStatus;

+	}

 

-    /**

+	/**

 	 * @brief Change a user's encryption passphrase

 	 * @param array $params keys: uid, password

 	 */

@@ -147,13 +145,13 @@ class Hooks {
 		// Only attempt to change passphrase if server-side encryption

 		// is in use (client-side encryption does not have access to 

 		// the necessary keys)

-		if (Crypt::mode() == 'server') {

+		if (Crypt::mode() === 'server') {

 

-			if ($params['uid'] == \OCP\User::getUser()) {

+			if ($params['uid'] === \OCP\User::getUser()) {

 

 				$view = new \OC_FilesystemView('/');

 

-				$session = new Session($view);

+				$session = new \OCA\Encryption\Session($view);

 

 				// Get existing decrypted private key

 				$privateKey = $session->getPrivateKey();

@@ -167,10 +165,10 @@ class Hooks {
 				// NOTE: Session does not need to be updated as the

 				// private key has not changed, only the passphrase

 				// used to decrypt it has changed

-			

-				

+

+

 			} else { // admin changed the password for a different user, create new keys and reencrypt file keys

-				

+

 				$user = $params['uid'];

 				$recoveryPassword = $params['recoveryPassword'];

 				$newUserPassword = $params['password'];

@@ -181,21 +179,22 @@ class Hooks {
 				\OC\Files\Filesystem::initMountPoints($user);

 

 				$keypair = Crypt::createKeypair();

-				

+

 				// Disable encryption proxy to prevent recursive calls

 				$proxyStatus = \OC_FileProxy::$enabled;

 				\OC_FileProxy::$enabled = false;

 

 				// Save public key

-				$view->file_put_contents( '/public-keys/'.$user.'.public.key', $keypair['publicKey'] );

+				$view->file_put_contents('/public-keys/' . $user . '.public.key', $keypair['publicKey']);

 

 				// Encrypt private key empty passphrase

-				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $newUserPassword );

+				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $newUserPassword);

 

 				// Save private key

-				$view->file_put_contents( '/'.$user.'/files_encryption/'.$user.'.private.key', $encryptedPrivateKey );

+				$view->file_put_contents(

+					'/' . $user . '/files_encryption/' . $user . '.private.key', $encryptedPrivateKey);

 

-				if ( $recoveryPassword ) { // if recovery key is set we can re-encrypt the key files

+				if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files

 					$util = new Util($view, $user);

 					$util->recoverUsersFiles($recoveryPassword);

 				}

@@ -233,16 +232,17 @@ class Hooks {
 			}

 		}

 

-		if($error)

-			// Set flag var 'run' to notify emitting

+		if ($error) // Set flag var 'run' to notify emitting

 			// script that hook execution failed

+		{

 			$params['run']->run = false;

-			// TODO: Make sure files_sharing provides user

-			// feedback on failed share

+		}

+		// TODO: Make sure files_sharing provides user

+		// feedback on failed share

 	}

 

 	/**

-	 * @brief 

+	 * @brief

 	 */

 	public static function postShared($params) {

 

@@ -268,14 +268,14 @@ class Hooks {
 		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {

 

 			$view = new \OC_FilesystemView('/');

-			$session = new Session($view);

+			$session = new \OCA\Encryption\Session($view);

 			$userId = \OCP\User::getUser();

 			$util = new Util($view, $userId);

 			$path = $util->fileIdToPath($params['itemSource']);

 

 			$share = $util->getParentFromShare($params['id']);

 			//if parent is set, then this is a re-share action

-			if ($share['parent'] != null) {

+			if ($share['parent'] !== null) {

 

 				// get the parent from current share

 				$parent = $util->getShareParent($params['parent']);

@@ -336,15 +336,15 @@ class Hooks {
 

 			foreach ($allFiles as $path) {

 				$usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);

-				$util->setSharedFileKeyfiles( $session, $usersSharing, $path );

+				$util->setSharedFileKeyfiles($session, $usersSharing, $path);

 			}

 		}

 	}

-	

+

 	/**

-	 * @brief 

+	 * @brief

 	 */

-	public static function postUnshare( $params ) {

+	public static function postUnshare($params) {

 

 		// NOTE: $params has keys:

 		// [itemType] => file

@@ -353,40 +353,40 @@ class Hooks {
 		// [shareWith] => test1

 		// [itemParent] =>

 

-		if ( $params['itemType'] === 'file' || $params['itemType'] === 'folder' ) {

+		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {

 

-			$view = new \OC_FilesystemView( '/' );

+			$view = new \OC_FilesystemView('/');

 			$userId = \OCP\User::getUser();

-			$util = new Util( $view, $userId);

-			$path = $util->fileIdToPath( $params['itemSource'] );

+			$util = new Util($view, $userId);

+			$path = $util->fileIdToPath($params['itemSource']);

 

 			// check if this is a re-share

-			if ( $params['itemParent'] ) {

+			if ($params['itemParent']) {

 

 				// get the parent from current share

-				$parent = $util->getShareParent( $params['itemParent'] );

+				$parent = $util->getShareParent($params['itemParent']);

 

 				// get target path

-				$targetPath = $util->fileIdToPath( $params['itemSource'] );

-				$targetPathSplit = array_reverse( explode( '/', $targetPath ) );

+				$targetPath = $util->fileIdToPath($params['itemSource']);

+				$targetPathSplit = array_reverse(explode('/', $targetPath));

 

 				// init values

 				$path = '';

-				$sharedPart = ltrim( $parent['file_target'], '/' );

+				$sharedPart = ltrim($parent['file_target'], '/');

 

 				// rebuild path

-				foreach ( $targetPathSplit as $pathPart ) {

-				

-					if ( $pathPart !== $sharedPart ) {

-					

+				foreach ($targetPathSplit as $pathPart) {

+

+					if ($pathPart !== $sharedPart) {

+

 						$path = '/' . $pathPart . $path;

-						

+

 					} else {

-					

+

 						break;

-						

+

 					}

-					

+

 				}

 

 				// prefix path with Shared

@@ -394,118 +394,124 @@ class Hooks {
 			}

 

 			// for group shares get a list of the group members

-			if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_GROUP ) {

+			if ($params['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {

 				$userIds = \OC_Group::usersInGroup($params['shareWith']);

-			} else if ( $params['shareType'] == \OCP\Share::SHARE_TYPE_LINK ){

-				$userIds = array( $util->getPublicShareKeyId() );

 			} else {

-				$userIds = array( $params['shareWith'] );

+				if ($params['shareType'] === \OCP\Share::SHARE_TYPE_LINK) {

+					$userIds = array($util->getPublicShareKeyId());

+				} else {

+					$userIds = array($params['shareWith']);

+				}

 			}

 

 			// if we unshare a folder we need a list of all (sub-)files

-			if ( $params['itemType'] === 'folder' ) {

-			

-				$allFiles = $util->getAllFiles( $path );

-				

+			if ($params['itemType'] === 'folder') {

+

+				$allFiles = $util->getAllFiles($path);

+

 			} else {

-			

-				$allFiles = array( $path );

+

+				$allFiles = array($path);

 			}

 

-			foreach ( $allFiles as $path ) {

+			foreach ($allFiles as $path) {

 

 				// check if the user still has access to the file, otherwise delete share key

-				$sharingUsers = $util->getSharingUsersArray( true, $path );

+				$sharingUsers = $util->getSharingUsersArray(true, $path);

 

 				// Unshare every user who no longer has access to the file

-				$delUsers = array_diff( $userIds, $sharingUsers);

+				$delUsers = array_diff($userIds, $sharingUsers);

 

 				// delete share key

-				Keymanager::delShareKey( $view, $delUsers, $path );

+				Keymanager::delShareKey($view, $delUsers, $path);

 			}

 

 		}

 	}

-	

+

 	/**

-     * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing

-     * @param array with oldpath and newpath

-     *

-     * This function is connected to the rename signal of OC_Filesystem and adjust the name and location

-     * of the stored versions along the actual file

-     */

-    public static function postRename($params) {

-        // Disable encryption proxy to prevent recursive calls

-        $proxyStatus = \OC_FileProxy::$enabled;

-        \OC_FileProxy::$enabled = false;

-

-        $view = new \OC_FilesystemView('/');

-        $session = new Session($view);

-        $userId = \OCP\User::getUser();

-        $util = new Util( $view, $userId );

-

-        // Format paths to be relative to user files dir

-        $oldKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);

-        $newKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);

-

-        // add key ext if this is not an folder

-        if (!$view->is_dir($oldKeyfilePath)) {

-            $oldKeyfilePath .= '.key';

-            $newKeyfilePath .= '.key';

-

-            // handle share-keys

-            $localKeyPath = $view->getLocalFile($userId.'/files_encryption/share-keys/'.$params['oldpath']);

-            $matches = glob(preg_quote($localKeyPath).'*.shareKey');

-            foreach ($matches as $src) {

-                $dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));

-

-                // create destination folder if not exists

-                if(!file_exists(dirname($dst))) {

-                    mkdir(dirname($dst), 0750, true);

-                }

-

-                rename($src, $dst);

-            }

-

-        } else {

-            // handle share-keys folders

-            $oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);

-            $newShareKeyfilePath = \OC\Files\Filesystem::normalizePath($userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);

-

-            // create destination folder if not exists

-            if(!$view->file_exists(dirname($newShareKeyfilePath))) {

-                $view->mkdir(dirname($newShareKeyfilePath), 0750, true);

-            }

-

-            $view->rename($oldShareKeyfilePath, $newShareKeyfilePath);

-        }

-

-        // Rename keyfile so it isn't orphaned

-        if($view->file_exists($oldKeyfilePath)) {

-

-            // create destination folder if not exists

-            if(!$view->file_exists(dirname($newKeyfilePath))) {

-                $view->mkdir(dirname($newKeyfilePath), 0750, true);

-            }

-

-            $view->rename($oldKeyfilePath, $newKeyfilePath);

-        }

-

-        // build the path to the file

-        $newPath = '/' . $userId . '/files' .$params['newpath'];

-        $newPathRelative = $params['newpath'];

-

-        if($util->fixFileSize($newPath)) {

-            // get sharing app state

-            $sharingEnabled = \OCP\Share::isEnabled();

-

-            // get users

-            $usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);

-

-            // update sharing-keys

-            $util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);

-        }

-

-        \OC_FileProxy::$enabled = $proxyStatus;

-    }

+	 * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing

+	 * @param array with oldpath and newpath

+	 *

+	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location

+	 * of the stored versions along the actual file

+	 */

+	public static function postRename($params) {

+		// Disable encryption proxy to prevent recursive calls

+		$proxyStatus = \OC_FileProxy::$enabled;

+		\OC_FileProxy::$enabled = false;

+

+		$view = new \OC_FilesystemView('/');

+		$session = new \OCA\Encryption\Session($view);

+		$userId = \OCP\User::getUser();

+		$util = new Util($view, $userId);

+

+		// Format paths to be relative to user files dir

+		$oldKeyfilePath = \OC\Files\Filesystem::normalizePath(

+			$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);

+		$newKeyfilePath = \OC\Files\Filesystem::normalizePath(

+			$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);

+

+		// add key ext if this is not an folder

+		if (!$view->is_dir($oldKeyfilePath)) {

+			$oldKeyfilePath .= '.key';

+			$newKeyfilePath .= '.key';

+

+			// handle share-keys

+			$localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $params['oldpath']);

+			$matches = glob(preg_quote($localKeyPath) . '*.shareKey');

+			foreach ($matches as $src) {

+				$dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));

+

+				// create destination folder if not exists

+				if (!file_exists(dirname($dst))) {

+					mkdir(dirname($dst), 0750, true);

+				}

+

+				rename($src, $dst);

+			}

+

+		} else {

+			// handle share-keys folders

+			$oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath(

+				$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);

+			$newShareKeyfilePath = \OC\Files\Filesystem::normalizePath(

+				$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);

+

+			// create destination folder if not exists

+			if (!$view->file_exists(dirname($newShareKeyfilePath))) {

+				$view->mkdir(dirname($newShareKeyfilePath), 0750, true);

+			}

+

+			$view->rename($oldShareKeyfilePath, $newShareKeyfilePath);

+		}

+

+		// Rename keyfile so it isn't orphaned

+		if ($view->file_exists($oldKeyfilePath)) {

+

+			// create destination folder if not exists

+			if (!$view->file_exists(dirname($newKeyfilePath))) {

+				$view->mkdir(dirname($newKeyfilePath), 0750, true);

+			}

+

+			$view->rename($oldKeyfilePath, $newKeyfilePath);

+		}

+

+		// build the path to the file

+		$newPath = '/' . $userId . '/files' . $params['newpath'];

+		$newPathRelative = $params['newpath'];

+

+		if ($util->fixFileSize($newPath)) {

+			// get sharing app state

+			$sharingEnabled = \OCP\Share::isEnabled();

+

+			// get users

+			$usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);

+

+			// update sharing-keys

+			$util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);

+		}

+

+		\OC_FileProxy::$enabled = $proxyStatus;

+	}

 }

diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index c8d5361c08a..0501a9f4f4d 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,4 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Parool edukalt vahetatud.",
+"Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
 "Saving..." => "Salvestamine...",
-"Encryption" => "Krüpteerimine"
+"Encryption" => "Krüpteerimine",
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):",
+"Recovery account password" => "Konto taasteparool",
+"Enabled" => "Sisse lülitatud",
+"Disabled" => "Väljalülitatud",
+"Change encryption passwords recovery key:" => "Muuda taaste võtme krüpteerimise paroole:",
+"Old Recovery account password" => "Konto vana taaste parool",
+"New Recovery account password" => "Konto uus taasteparool",
+"Change Password" => "Muuda parooli",
+"Enable password recovery by sharing all files with your administrator:" => "Luba parooli taaste jagades kõik failid administraatoriga:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parool on kadunud",
+"File recovery settings updated" => "Faili taaste seaded uuendatud",
+"Could not update file recovery" => "Ei suuda uuendada taastefaili"
 );
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index a3384174d78..e58fc9a1cd3 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Recovery key successfully " => "O contrasinal foi recuperado satisfactoriamente",
-"Could not " => "Non foi posíbel",
 "Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
 "Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
 "Saving..." => "Gardando...",
@@ -10,5 +8,11 @@
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
 "Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
-"Change Password" => "Cambiar o contrasinal"
+"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
+"New Recovery account password" => "Novo contrasinal de recuperación da conta",
+"Change Password" => "Cambiar o contrasinal",
+"Enable password recovery by sharing all files with your administrator:" => "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde o contrasinal",
+"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
+"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 8f7a4023b6f..ecdb04a36bd 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Recovery key successfully " => "Chiave ripristinata correttamente",
-"Could not " => "Impossibile",
 "Password successfully changed." => "Password modificata correttamente.",
 "Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
 "Saving..." => "Salvataggio in corso...",
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 99fd3ec3aba..7f906ae5c03 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,10 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Recovery key successfully " => "鍵を復旧することができました。",
-"Could not " => "できませんでした。",
 "Password successfully changed." => "パスワードを変更できました。",
 "Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
 "Saving..." => "保存中...",
 "Encryption" => "暗号化",
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):",
 "Recovery account password" => "復旧アカウントのパスワード",
 "Enabled" => "有効",
 "Disabled" => "無効",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index e2f22b4d92f..ebcbdfab15f 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Recovery key successfully " => "Sleutelherstel succesvol",
-"Could not " => "Kon niet",
 "Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
 "Saving..." => "Opslaan",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 313d27b70c9..a6f90db4cd8 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Recovery key successfully " => "Odzyskanie klucza udane",
-"Could not " => "Nie można",
 "Password successfully changed." => "Zmiana hasła udana.",
 "Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
 "Saving..." => "Zapisywanie...",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 73d7b57b878..ce8814c233e 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,4 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Senha alterada com sucesso.",
+"Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
 "Saving..." => "Salvando...",
-"Encryption" => "Criptografia"
+"Encryption" => "Criptografia",
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
+"Recovery account password" => "Recuperar a senha da conta",
+"Enabled" => "Habilidado",
+"Disabled" => "Desabilitado",
+"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
+"Old Recovery account password" => "Recuperação de senha de conta antiga",
+"New Recovery account password" => "Senha Nova  da conta de Recuperação",
+"Change Password" => "Trocar Senha",
+"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida",
+"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
+"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
 );
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index be75c0b768a..e1bb17ecaa7 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,4 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Password alterada com sucesso.",
+"Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
 "Saving..." => "A guardar...",
-"Encryption" => "Encriptação"
+"Encryption" => "Encriptação",
+"Enabled" => "Activado",
+"Disabled" => "Desactivado",
+"Change Password" => "Mudar a Password"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index fac785730a8..aaf7f0997c3 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,4 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Пароль изменен удачно.",
+"Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
 "Saving..." => "Сохранение...",
-"Encryption" => "Шифрование"
+"Encryption" => "Шифрование",
+"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)",
+"Recovery account password" => "Восстановление пароля учетной записи",
+"Enabled" => "Включено",
+"Disabled" => "Отключено",
+"Change encryption passwords recovery key:" => "Изменить шифрование пароля ключа восстановления:",
+"Old Recovery account password" => "Старое Восстановление пароля учетной записи",
+"New Recovery account password" => "Новое Восстановление пароля учетной записи",
+"Change Password" => "Изменить пароль",
+"Enable password recovery by sharing all files with your administrator:" => "Включить восстановление пароля путем доступа Вашего администратора ко всем файлам",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля",
+"File recovery settings updated" => "Настройки файла восстановления обновлены",
+"Could not update file recovery" => "Невозможно обновить файл восстановления"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index fd77bb7e91d..279481fbd4f 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,4 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Heslo úspešne zmenené.",
 "Saving..." => "Ukladám...",
-"Encryption" => "Šifrovanie"
+"Encryption" => "Šifrovanie",
+"Enabled" => "Povolené",
+"Disabled" => "Zakázané",
+"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
+"Change Password" => "Zmeniť heslo",
+"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
+"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
 );
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 2bfadce8553..faea3f54a18 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,4 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "成功變更密碼。",
+"Could not change the password. Maybe the old password was not correct." => "無法變更密碼，或許是輸入的舊密碼不正確。",
 "Saving..." => "儲存中...",
-"Encryption" => "加密"
+"Encryption" => "加密",
+"Enabled" => "已啓用",
+"Disabled" => "已停用",
+"Change encryption passwords recovery key:" => "變更加密密碼還原金鑰：",
+"Change Password" => "變更密碼",
+"Enable password recovery by sharing all files with your administrator:" => "與管理員分享所有檔案以啓用密碼還原功能：",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "啓用此選項允許您未來遺失密碼時重新取得已加密的檔案",
+"File recovery settings updated" => "檔案還原設定已更新",
+"Could not update file recovery" => "無法更新檔案還原設定"
 );
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index f5b7a8a0a40..ddeb3590f60 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -26,21 +26,20 @@
 namespace OCA\Encryption;

 

 //require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';

-require_once realpath( dirname( __FILE__ ) . '/../3rdparty/Crypt_Blowfish/Blowfish.php' );

+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');

 

 /**

  * Class for common cryptography functionality

  */

 

-class Crypt

-{

+class Crypt {

 

 	/**

 	 * @brief return encryption mode client or server side encryption

 	 * @param string $user name (use system wide setting if name=null)

 	 * @return string 'client' or 'server'

 	 */

-	public static function mode( $user = null ) {

+	public static function mode($user = null) {

 

 		return 'server';

 

@@ -52,17 +51,20 @@ class Crypt
 	 */

 	public static function createKeypair() {

 

-		$res = openssl_pkey_new( array( 'private_key_bits' => 4096 ) );

+		$res = openssl_pkey_new(array('private_key_bits' => 4096));

 

 		// Get private key

-		openssl_pkey_export( $res, $privateKey );

+		openssl_pkey_export($res, $privateKey);

 

 		// Get public key

-		$publicKey = openssl_pkey_get_details( $res );

+		$publicKey = openssl_pkey_get_details($res);

 

 		$publicKey = $publicKey['key'];

 

-		return ( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );

+		return (array(

+			'publicKey' => $publicKey,

+			'privateKey' => $privateKey

+		));

 

 	}

 

@@ -75,7 +77,7 @@ class Crypt
 	 * blocks with encryption alone, hence padding is added to achieve the

 	 * required length.

 	 */

-	public static function addPadding( $data ) {

+	public static function addPadding($data) {

 

 		$padded = $data . 'xx';

 

@@ -88,11 +90,11 @@ class Crypt
 	 * @param string $padded padded data to remove padding from

 	 * @return string unpadded data on success, false on error

 	 */

-	public static function removePadding( $padded ) {

+	public static function removePadding($padded) {

 

-		if ( substr( $padded, -2 ) == 'xx' ) {

+		if (substr($padded, -2) === 'xx') {

 

-			$data = substr( $padded, 0, -2 );

+			$data = substr($padded, 0, -2);

 

 			return $data;

 

@@ -111,26 +113,26 @@ class Crypt
 	 * @return boolean

 	 * @note see also OCA\Encryption\Util->isEncryptedPath()

 	 */

-	public static function isCatfileContent( $content ) {

+	public static function isCatfileContent($content) {

 

-		if ( !$content ) {

+		if (!$content) {

 

 			return false;

 

 		}

 

-		$noPadding = self::removePadding( $content );

+		$noPadding = self::removePadding($content);

 

 		// Fetch encryption metadata from end of file

-		$meta = substr( $noPadding, -22 );

+		$meta = substr($noPadding, -22);

 

 		// Fetch IV from end of file

-		$iv = substr( $meta, -16 );

+		$iv = substr($meta, -16);

 

 		// Fetch identifier from start of metadata

-		$identifier = substr( $meta, 0, 6 );

+		$identifier = substr($meta, 0, 6);

 

-		if ( $identifier == '00iv00' ) {

+		if ($identifier === '00iv00') {

 

 			return true;

 

@@ -147,15 +149,15 @@ class Crypt
 	 * @param string $path

 	 * @return bool

 	 */

-	public static function isEncryptedMeta( $path ) {

+	public static function isEncryptedMeta($path) {

 

 		// TODO: Use DI to get \OC\Files\Filesystem out of here

 

 		// Fetch all file metadata from DB

-		$metadata = \OC\Files\Filesystem::getFileInfo( $path );

+		$metadata = \OC\Files\Filesystem::getFileInfo($path);

 

 		// Return encryption status

-		return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];

+		return isset($metadata['encrypted']) && ( bool )$metadata['encrypted'];

 

 	}

 

@@ -166,18 +168,17 @@ class Crypt
 	 *        e.g. filename or /Docs/filename, NOT admin/files/filename

 	 * @return boolean

 	 */

-	public static function isLegacyEncryptedContent( $data, $relPath ) {

+	public static function isLegacyEncryptedContent($data, $relPath) {

 

 		// Fetch all file metadata from DB

-		$metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );

+		$metadata = \OC\Files\Filesystem::getFileInfo($relPath, '');

 

 		// If a file is flagged with encryption in DB, but isn't a 

 		// valid content + IV combination, it's probably using the 

 		// legacy encryption system

-		if (

-			isset( $metadata['encrypted'] )

-			and $metadata['encrypted'] === true

-			and !self::isCatfileContent( $data )

+		if (isset($metadata['encrypted'])

+			&& $metadata['encrypted'] === true

+			&& !self::isCatfileContent($data)

 		) {

 

 			return true;

@@ -197,15 +198,15 @@ class Crypt
 	 * @param string $passphrase

 	 * @return string encrypted file content

 	 */

-	public static function encrypt( $plainContent, $iv, $passphrase = '' ) {

+	public static function encrypt($plainContent, $iv, $passphrase = '') {

 

-		if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {

+		if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {

 

 			return $encryptedContent;

 

 		} else {

 

-			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );

+			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR);

 

 			return false;

 

@@ -221,15 +222,15 @@ class Crypt
 	 * @throws \Exception

 	 * @return string decrypted file content

 	 */

-	public static function decrypt( $encryptedContent, $iv, $passphrase ) {

+	public static function decrypt($encryptedContent, $iv, $passphrase) {

 

-		if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {

+		if ($plainContent = openssl_decrypt($encryptedContent, 'AES-128-CFB', $passphrase, false, $iv)) {

 

 			return $plainContent;

 

 		} else {

 

-			throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );

+			throw new \Exception('Encryption library: Decryption (symmetric) of content failed');

 

 		}

 

@@ -241,7 +242,7 @@ class Crypt
 	 * @param string $iv IV to be concatenated

 	 * @returns string concatenated content

 	 */

-	public static function concatIv( $content, $iv ) {

+	public static function concatIv($content, $iv) {

 

 		$combined = $content . '00iv00' . $iv;

 

@@ -254,20 +255,20 @@ class Crypt
 	 * @param string $catFile concatenated data to be split

 	 * @returns array keys: encrypted, iv

 	 */

-	public static function splitIv( $catFile ) {

+	public static function splitIv($catFile) {

 

 		// Fetch encryption metadata from end of file

-		$meta = substr( $catFile, -22 );

+		$meta = substr($catFile, -22);

 

 		// Fetch IV from end of file

-		$iv = substr( $meta, -16 );

+		$iv = substr($meta, -16);

 

 		// Remove IV and IV identifier text to expose encrypted content

-		$encrypted = substr( $catFile, 0, -22 );

+		$encrypted = substr($catFile, 0, -22);

 

 		$split = array(

-			'encrypted' => $encrypted

-		, 'iv' => $iv

+			'encrypted' => $encrypted,

+			'iv' => $iv

 		);

 

 		return $split;

@@ -283,9 +284,9 @@ class Crypt
 	 * @note IV need not be specified, as it will be stored in the returned keyfile

 	 * and remain accessible therein.

 	 */

-	public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {

+	public static function symmetricEncryptFileContent($plainContent, $passphrase = '') {

 

-		if ( !$plainContent ) {

+		if (!$plainContent) {

 

 			return false;

 

@@ -293,18 +294,18 @@ class Crypt
 

 		$iv = self::generateIv();

 

-		if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {

+		if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {

 

 			// Combine content to encrypt with IV identifier and actual IV

-			$catfile = self::concatIv( $encryptedContent, $iv );

+			$catfile = self::concatIv($encryptedContent, $iv);

 

-			$padded = self::addPadding( $catfile );

+			$padded = self::addPadding($catfile);

 

 			return $padded;

 

 		} else {

 

-			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );

+			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);

 

 			return false;

 

@@ -326,21 +327,21 @@ class Crypt
 	 *

 	 * This function decrypts a file

 	 */

-	public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {

+	public static function symmetricDecryptFileContent($keyfileContent, $passphrase = '') {

 

-		if ( !$keyfileContent ) {

+		if (!$keyfileContent) {

 

-			throw new \Exception( 'Encryption library: no data provided for decryption' );

+			throw new \Exception('Encryption library: no data provided for decryption');

 

 		}

 

 		// Remove padding

-		$noPadding = self::removePadding( $keyfileContent );

+		$noPadding = self::removePadding($keyfileContent);

 

 		// Split into enc data and catfile

-		$catfile = self::splitIv( $noPadding );

+		$catfile = self::splitIv($noPadding);

 

-		if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {

+		if ($plainContent = self::decrypt($catfile['encrypted'], $catfile['iv'], $passphrase)) {

 

 			return $plainContent;

 

@@ -358,11 +359,11 @@ class Crypt
 	 *

 	 * This function decrypts a file

 	 */

-	public static function symmetricEncryptFileContentKeyfile( $plainContent ) {

+	public static function symmetricEncryptFileContentKeyfile($plainContent) {

 

 		$key = self::generateKey();

 

-		if ( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {

+		if ($encryptedContent = self::symmetricEncryptFileContent($plainContent, $key)) {

 

 			return array(

 				'key' => $key,

@@ -384,13 +385,13 @@ class Crypt
 	 * @returns array keys: keys (array, key = userId), data

 	 * @note symmetricDecryptFileContent() can decrypt files created using this method

 	 */

-	public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {

+	public static function multiKeyEncrypt($plainContent, array $publicKeys) {

 

 		// openssl_seal returns false without errors if $plainContent 

 		// is empty, so trigger our own error

-		if ( empty( $plainContent ) ) {

+		if (empty($plainContent)) {

 

-			throw new \Exception( 'Cannot mutliKeyEncrypt empty plain content' );

+			throw new \Exception('Cannot mutliKeyEncrypt empty plain content');

 

 		}

 

@@ -399,13 +400,13 @@ class Crypt
 		$shareKeys = array();

 		$mappedShareKeys = array();

 

-		if ( openssl_seal( $plainContent, $sealed, $shareKeys, $publicKeys ) ) {

+		if (openssl_seal($plainContent, $sealed, $shareKeys, $publicKeys)) {

 

 			$i = 0;

 

 			// Ensure each shareKey is labelled with its 

 			// corresponding userId

-			foreach ( $publicKeys as $userId => $publicKey ) {

+			foreach ($publicKeys as $userId => $publicKey) {

 

 				$mappedShareKeys[$userId] = $shareKeys[$i];

 				$i++;

@@ -437,21 +438,21 @@ class Crypt
 	 *

 	 * This function decrypts a file

 	 */

-	public static function multiKeyDecrypt( $encryptedContent, $shareKey, $privateKey ) {

+	public static function multiKeyDecrypt($encryptedContent, $shareKey, $privateKey) {

 

-		if ( !$encryptedContent ) {

+		if (!$encryptedContent) {

 

 			return false;

 

 		}

 

-		if ( openssl_open( $encryptedContent, $plainContent, $shareKey, $privateKey ) ) {

+		if (openssl_open($encryptedContent, $plainContent, $shareKey, $privateKey)) {

 

 			return $plainContent;

 

 		} else {

 

-			\OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );

+			\OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OCP\Util::ERROR);

 

 			return false;

 

@@ -461,11 +462,13 @@ class Crypt
 

 	/**

 	 * @brief Asymetrically encrypt a string using a public key

+	 * @param $plainContent

+	 * @param $publicKey

 	 * @return string encrypted file

 	 */

-	public static function keyEncrypt( $plainContent, $publicKey ) {

+	public static function keyEncrypt($plainContent, $publicKey) {

 

-		openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );

+		openssl_public_encrypt($plainContent, $encryptedContent, $publicKey);

 

 		return $encryptedContent;

 

@@ -473,13 +476,15 @@ class Crypt
 

 	/**

 	 * @brief Asymetrically decrypt a file using a private key

+	 * @param $encryptedContent

+	 * @param $privatekey

 	 * @return string decrypted file

 	 */

-	public static function keyDecrypt( $encryptedContent, $privatekey ) {

+	public static function keyDecrypt($encryptedContent, $privatekey) {

 

-		$result = @openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );

+		$result = @openssl_private_decrypt($encryptedContent, $plainContent, $privatekey);

 

-		if ( $result ) {

+		if ($result) {

 			return $plainContent;

 		}

 

@@ -493,24 +498,24 @@ class Crypt
 	 */

 	public static function generateIv() {

 

-		if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {

+		if ($random = openssl_random_pseudo_bytes(12, $strong)) {

 

-			if ( !$strong ) {

+			if (!$strong) {

 

 				// If OpenSSL indicates randomness is insecure, log error

-				\OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );

+				\OCP\Util::writeLog('Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OCP\Util::WARN);

 

 			}

 

 			// We encode the iv purely for string manipulation 

 			// purposes - it gets decoded before use

-			$iv = base64_encode( $random );

+			$iv = base64_encode($random);

 

 			return $iv;

 

 		} else {

 

-			throw new \Exception( 'Generating IV failed' );

+			throw new \Exception('Generating IV failed');

 

 		}

 

@@ -523,12 +528,12 @@ class Crypt
 	public static function generateKey() {

 

 		// Generate key

-		if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {

+		if ($key = base64_encode(openssl_random_pseudo_bytes(183, $strong))) {

 

-			if ( !$strong ) {

+			if (!$strong) {

 

 				// If OpenSSL indicates randomness is insecure, log error

-				throw new \Exception( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );

+				throw new \Exception('Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()');

 

 			}

 

@@ -545,15 +550,15 @@ class Crypt
 	/**

 	 * @brief Get the blowfish encryption handeler for a key

 	 * @param $key string (optional)

-	 * @return Crypt_Blowfish blowfish object

+	 * @return \Crypt_Blowfish blowfish object

 	 *

 	 * if the key is left out, the default handeler will be used

 	 */

-	public static function getBlowfish( $key = '' ) {

+	public static function getBlowfish($key = '') {

 

-		if ( $key ) {

+		if ($key) {

 

-			return new \Crypt_Blowfish( $key );

+			return new \Crypt_Blowfish($key);

 

 		} else {

 

@@ -567,13 +572,13 @@ class Crypt
 	 * @param $passphrase

 	 * @return mixed

 	 */

-	public static function legacyCreateKey( $passphrase ) {

+	public static function legacyCreateKey($passphrase) {

 

 		// Generate a random integer

-		$key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );

+		$key = mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999);

 

 		// Encrypt the key with the passphrase

-		$legacyEncKey = self::legacyEncrypt( $key, $passphrase );

+		$legacyEncKey = self::legacyEncrypt($key, $passphrase);

 

 		return $legacyEncKey;

 

@@ -583,17 +588,15 @@ class Crypt
 	 * @brief encrypts content using legacy blowfish system

 	 * @param string $content the cleartext message you want to encrypt

 	 * @param string $passphrase

-	 * @return

-	 * @internal param \OCA\Encryption\the $key encryption key (optional)

 	 * @returns string encrypted content

 	 *

 	 * This function encrypts an content

 	 */

-	public static function legacyEncrypt( $content, $passphrase = '' ) {

+	public static function legacyEncrypt($content, $passphrase = '') {

 

-		$bf = self::getBlowfish( $passphrase );

+		$bf = self::getBlowfish($passphrase);

 

-		return $bf->encrypt( $content );

+		return $bf->encrypt($content);

 

 	}

 

@@ -601,20 +604,17 @@ class Crypt
 	 * @brief decrypts content using legacy blowfish system

 	 * @param string $content the cleartext message you want to decrypt

 	 * @param string $passphrase

-	 * @return string

-	 * @internal param \OCA\Encryption\the $key encryption key (optional)

 	 * @return string cleartext content

 	 *

 	 * This function decrypts an content

 	 */

-	public static function legacyDecrypt( $content, $passphrase = '' ) {

+	private static function legacyDecrypt($content, $passphrase = '') {

 

-		$bf = self::getBlowfish( $passphrase );

+		$bf = self::getBlowfish($passphrase);

 

-		$decrypted = $bf->decrypt( $content );

-

-		return rtrim( $decrypted, "\0" );;

+		$decrypted = $bf->decrypt($content);

 

+		return $decrypted;

 	}

 

 	/**

@@ -623,16 +623,17 @@ class Crypt
 	 * @param int $maxLength

 	 * @return string

 	 */

-	private static function legacyBlockDecrypt( $data, $key = '', $maxLength = 0 ) {

+	public static function legacyBlockDecrypt($data, $key = '', $maxLength = 0) {

+

 		$result = '';

-		while ( strlen( $data ) ) {

-			$result .= self::legacyDecrypt( substr( $data, 0, 8192 ), $key );

-			$data = substr( $data, 8192 );

+		while (strlen($data)) {

+			$result .= self::legacyDecrypt(substr($data, 0, 8192), $key);

+			$data = substr($data, 8192);

 		}

-		if ( $maxLength > 0 ) {

-			return substr( $result, 0, $maxLength );

+		if ($maxLength > 0) {

+			return substr($result, 0, $maxLength);

 		} else {

-			return rtrim( $result, "\0" );

+			return rtrim($result, "\0");

 		}

 	}

 

@@ -640,21 +641,23 @@ class Crypt
 	 * @param $legacyEncryptedContent

 	 * @param $legacyPassphrase

 	 * @param $publicKeys

-	 * @param $newPassphrase

-	 * @param $path

 	 * @return array

 	 */

-	public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKeys, $newPassphrase, $path ) {

+	public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys) {

 

-		$decrypted = self::legacyBlockDecrypt( $legacyEncryptedContent, $legacyPassphrase );

+		$decrypted = self::legacyBlockDecrypt($legacyEncryptedContent, $legacyPassphrase);

 

 		// Encrypt plain data, generate keyfile & encrypted file

-		$cryptedData = self::symmetricEncryptFileContentKeyfile( $decrypted );

+		$cryptedData = self::symmetricEncryptFileContentKeyfile($decrypted);

 

 		// Encrypt plain keyfile to multiple sharefiles

-		$multiEncrypted = Crypt::multiKeyEncrypt( $cryptedData['key'], $publicKeys );

+		$multiEncrypted = Crypt::multiKeyEncrypt($cryptedData['key'], $publicKeys);

 

-		return array( 'data' => $cryptedData['encrypted'], 'filekey' => $multiEncrypted['data'], 'sharekeys' => $multiEncrypted['keys'] );

+		return array(

+			'data' => $cryptedData['encrypted'],

+			'filekey' => $multiEncrypted['data'],

+			'sharekeys' => $multiEncrypted['keys']

+		);

 

 	}

 

diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 7a2d19eed57..1b3e5b1a642 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -23,15 +23,11 @@
 
 namespace OCA\Encryption;
 
-	/**
-	 * @brief Class to manage registration of hooks an various helper methods
-	 */
 /**
- * Class Helper
+ * @brief Class to manage registration of hooks an various helper methods
  * @package OCA\Encryption
  */
-class Helper
-{
+class Helper {
 
 	/**
 	 * @brief register share related hooks
@@ -39,9 +35,9 @@ class Helper
 	 */
 	public static function registerShareHooks() {
 
-		\OCP\Util::connectHook( 'OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared' );
-		\OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
-		\OCP\Util::connectHook( 'OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare' );
+		\OCP\Util::connectHook('OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared');
+		\OCP\Util::connectHook('OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared');
+		\OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare');
 	}
 
 	/**
@@ -50,10 +46,10 @@ class Helper
 	 */
 	public static function registerUserHooks() {
 
-		\OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-		\OCP\Util::connectHook( 'OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
-		\OCP\Util::connectHook( 'OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser' );
-		\OCP\Util::connectHook( 'OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser' );
+		\OCP\Util::connectHook('OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login');
+		\OCP\Util::connectHook('OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase');
+		\OCP\Util::connectHook('OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser');
+		\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
 	}
 
 	/**
@@ -62,7 +58,7 @@ class Helper
 	 */
 	public static function registerFilesystemHooks() {
 
-		\OCP\Util::connectHook( 'OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename' );
+		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
 	}
 
 	/**
@@ -72,13 +68,14 @@ class Helper
 	 * @param string $password
 	 * @return bool
 	 */
-	public static function setupUser( $util, $password ) {
+	public static function setupUser($util, $password) {
 		// Check files_encryption infrastructure is ready for action
-		if ( !$util->ready() ) {
+		if (!$util->ready()) {
 
-			\OC_Log::write( 'Encryption library', 'User account "' . $util->getUserId() . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
+			\OCP\Util::writeLog('Encryption library', 'User account "' . $util->getUserId()
+												 . '" is not ready for encryption; configuration started', \OCP\Util::DEBUG);
 
-			if ( !$util->setupServerSide( $password ) ) {
+			if (!$util->setupServerSide($password)) {
 				return false;
 			}
 		}
@@ -95,21 +92,21 @@ class Helper
 	 * @internal param string $password
 	 * @return bool
 	 */
-	public static function adminEnableRecovery( $recoveryKeyId, $recoveryPassword ) {
-		$view = new \OC\Files\View( '/' );
+	public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
+		$view = new \OC\Files\View('/');
 
-		if ( $recoveryKeyId === null ) {
-			$recoveryKeyId = 'recovery_' . substr( md5( time() ), 0, 8 );
-			\OC_Appconfig::setValue( 'files_encryption', 'recoveryKeyId', $recoveryKeyId );
+		if ($recoveryKeyId === null) {
+			$recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
+			\OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
 		}
 
-		if ( !$view->is_dir( '/owncloud_private_key' ) ) {
-			$view->mkdir( '/owncloud_private_key' );
+		if (!$view->is_dir('/owncloud_private_key')) {
+			$view->mkdir('/owncloud_private_key');
 		}
 
 		if (
-			( !$view->file_exists( "/public-keys/" . $recoveryKeyId . ".public.key" )
-				|| !$view->file_exists( "/owncloud_private_key/" . $recoveryKeyId . ".private.key" ) )
+			(!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
+			 || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
 		) {
 
 			$keypair = \OCA\Encryption\Crypt::createKeypair();
@@ -118,37 +115,37 @@ class Helper
 
 			// Save public key
 
-			if ( !$view->is_dir( '/public-keys' ) ) {
-				$view->mkdir( '/public-keys' );
+			if (!$view->is_dir('/public-keys')) {
+				$view->mkdir('/public-keys');
 			}
 
-			$view->file_put_contents( '/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey'] );
+			$view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
 
 			// Encrypt private key empthy passphrase
-			$encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $recoveryPassword );
+			$encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword);
 
 			// Save private key
-			$view->file_put_contents( '/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey );
+			$view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
 
 			// create control file which let us check later on if the entered password was correct.
-			$encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt( "ownCloud", $keypair['publicKey'] );
-			if ( !$view->is_dir( '/control-file' ) ) {
-				$view->mkdir( '/control-file' );
+			$encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
+			if (!$view->is_dir('/control-file')) {
+				$view->mkdir('/control-file');
 			}
-			$view->file_put_contents( '/control-file/controlfile.enc', $encryptedControlData );
+			$view->file_put_contents('/control-file/controlfile.enc', $encryptedControlData);
 
 			\OC_FileProxy::$enabled = true;
 
 			// Set recoveryAdmin as enabled
-			\OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
+			\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
 
 			$return = true;
 
 		} else { // get recovery key and check the password
-			$util = new \OCA\Encryption\Util( new \OC_FilesystemView( '/' ), \OCP\User::getUser() );
-			$return = $util->checkRecoveryPassword( $recoveryPassword );
-			if ( $return ) {
-				\OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 1 );
+			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+			$return = $util->checkRecoveryPassword($recoveryPassword);
+			if ($return) {
+				\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
 			}
 		}
 
@@ -162,15 +159,31 @@ class Helper
 	 * @param $recoveryPassword
 	 * @return bool
 	 */
-	public static function adminDisableRecovery( $recoveryPassword ) {
-		$util = new Util( new \OC_FilesystemView( '/' ), \OCP\User::getUser() );
-		$return = $util->checkRecoveryPassword( $recoveryPassword );
+	public static function adminDisableRecovery($recoveryPassword) {
+		$util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+		$return = $util->checkRecoveryPassword($recoveryPassword);
 
-		if ( $return ) {
+		if ($return) {
 			// Set recoveryAdmin as disabled
-			\OC_Appconfig::setValue( 'files_encryption', 'recoveryAdminEnabled', 0 );
+			\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
 		}
 
 		return $return;
 	}
+
+
+	/**
+	 * @brief checks if access is public/anonymous user
+	 * @return bool
+	 */
+	public static function isPublicAccess() {
+		if (\OCP\USER::getUser() === false
+			|| (isset($_GET['service']) && $_GET['service'] == 'files'
+				&& isset($_GET['t']))
+		) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index aaa2e4ba1b5..9bb854325de 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -27,8 +27,7 @@ namespace OCA\Encryption;
  * @brief Class to manage storage and retrieval of encryption keys
  * @note Where a method requires a view object, it's root must be '/'
  */
-class Keymanager
-{
+class Keymanager {
 
 	/**
 	 * @brief retrieve the ENCRYPTED private key from a user
@@ -38,14 +37,14 @@ class Keymanager
 	 * @return string private key or false (hopefully)
 	 * @note the key returned by this method must be decrypted before use
 	 */
-	public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
+	public static function getPrivateKey(\OC_FilesystemView $view, $user) {
 
 		$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$key = $view->file_get_contents( $path );
+		$key = $view->file_get_contents($path);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
@@ -58,12 +57,12 @@ class Keymanager
 	 * @param $userId
 	 * @return string public key or false
 	 */
-	public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+	public static function getPublicKey(\OC_FilesystemView $view, $userId) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$result = $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
+		$result = $view->file_get_contents('/public-keys/' . $userId . '.public.key');
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
@@ -77,11 +76,11 @@ class Keymanager
 	 * @param $userId
 	 * @return array keys: privateKey, publicKey
 	 */
-	public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
+	public static function getUserKeys(\OC_FilesystemView $view, $userId) {
 
 		return array(
-			'publicKey' => self::getPublicKey( $view, $userId )
-		, 'privateKey' => self::getPrivateKey( $view, $userId )
+			'publicKey' => self::getPublicKey($view, $userId),
+			'privateKey' => self::getPrivateKey($view, $userId)
 		);
 
 	}
@@ -92,13 +91,13 @@ class Keymanager
 	 * @param array $userIds
 	 * @return array of public keys for the specified users
 	 */
-	public static function getPublicKeys( \OC_FilesystemView $view, array $userIds ) {
+	public static function getPublicKeys(\OC_FilesystemView $view, array $userIds) {
 
 		$keys = array();
 
-		foreach ( $userIds as $userId ) {
+		foreach ($userIds as $userId) {
 
-			$keys[$userId] = self::getPublicKey( $view, $userId );
+			$keys[$userId] = self::getPublicKey($view, $userId);
 
 		}
 
@@ -118,40 +117,41 @@ class Keymanager
 	 * @note The keyfile is not encrypted here. Client code must
 	 * asymmetrically encrypt the keyfile before passing it to this method
 	 */
-	public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
+	public static function setFileKey(\OC_FilesystemView $view, $path, $userId, $catfile) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		//here we need the currently logged in user, while userId can be a different user
-		$util = new Util( $view, \OCP\User::getUser() );
-		list( $owner, $filename ) = $util->getUidAndFilename( $path );
+		$util = new Util($view, \OCP\User::getUser());
+		list($owner, $filename) = $util->getUidAndFilename($path);
 
 		$basePath = '/' . $owner . '/files_encryption/keyfiles';
 
-		$targetPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
+		$targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
 
-		if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
+		if (!$view->is_dir($basePath . '/' . $targetPath)) {
 
 			// create all parent folders
-			$info = pathinfo( $basePath . '/' . $targetPath );
-			$keyfileFolderName = $view->getLocalFolder( $info['dirname'] );
+			$info = pathinfo($basePath . '/' . $targetPath);
+			$keyfileFolderName = $view->getLocalFolder($info['dirname']);
 
-			if ( !file_exists( $keyfileFolderName ) ) {
+			if (!file_exists($keyfileFolderName)) {
 
-				mkdir( $keyfileFolderName, 0750, true );
+				mkdir($keyfileFolderName, 0750, true);
 
 			}
 		}
 
 		// try reusing key file if part file
-		if ( self::isPartialFilePath( $targetPath ) ) {
+		if (self::isPartialFilePath($targetPath)) {
 
-			$result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath( $targetPath ) . '.key', $catfile );
+			$result = $view->file_put_contents(
+				$basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile);
 
 		} else {
 
-			$result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+			$result = $view->file_put_contents($basePath . '/' . $targetPath . '.key', $catfile);
 
 		}
 
@@ -167,12 +167,12 @@ class Keymanager
 	 * @return string File path without .part extension
 	 * @note this is needed for reusing keys
 	 */
-	public static function fixPartialFilePath( $path ) {
+	public static function fixPartialFilePath($path) {
 
-		if ( preg_match( '/\.part$/', $path ) ) {
+		if (preg_match('/\.part$/', $path)) {
 
-			$newLength = strlen( $path ) - 5;
-			$fPath = substr( $path, 0, $newLength );
+			$newLength = strlen($path) - 5;
+			$fPath = substr($path, 0, $newLength);
 
 			return $fPath;
 
@@ -189,9 +189,9 @@ class Keymanager
 	 * @param string $path Path that may identify a .part file
 	 * @return bool
 	 */
-	public static function isPartialFilePath( $path ) {
+	public static function isPartialFilePath($path) {
 
-		if ( preg_match( '/\.part$/', $path ) ) {
+		if (preg_match('/\.part$/', $path)) {
 
 			return true;
 
@@ -213,14 +213,14 @@ class Keymanager
 	 * @note The keyfile returned is asymmetrically encrypted. Decryption
 	 * of the keyfile must be performed by client code
 	 */
-	public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+	public static function getFileKey(\OC_FilesystemView $view, $userId, $filePath) {
 
 		// try reusing key file if part file
-		if ( self::isPartialFilePath( $filePath ) ) {
+		if (self::isPartialFilePath($filePath)) {
 
-			$result = self::getFileKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
+			$result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
 
-			if ( $result ) {
+			if ($result) {
 
 				return $result;
 
@@ -228,19 +228,19 @@ class Keymanager
 
 		}
 
-		$util = new Util( $view, \OCP\User::getUser() );
+		$util = new Util($view, \OCP\User::getUser());
 
-		list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
-		$filePath_f = ltrim( $filename, '/' );
+		list($owner, $filename) = $util->getUidAndFilename($filePath);
+		$filePath_f = ltrim($filename, '/');
 
 		$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		if ( $view->file_exists( $keyfilePath ) ) {
+		if ($view->file_exists($keyfilePath)) {
 
-			$result = $view->file_get_contents( $keyfilePath );
+			$result = $view->file_get_contents($keyfilePath);
 
 		} else {
 
@@ -264,26 +264,29 @@ class Keymanager
 	 * @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
 	 *       /data/admin/files/mydoc.txt
 	 */
-	public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
+	public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path) {
 
-		$trimmed = ltrim( $path, '/' );
+		$trimmed = ltrim($path, '/');
 		$keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
 
 		$result = false;
 
-		if ( $view->is_dir( $keyPath ) ) {
+		if ($view->is_dir($keyPath)) {
 
-			$result = $view->unlink( $keyPath );
+			$result = $view->unlink($keyPath);
 
-		} else if ( $view->file_exists( $keyPath . '.key' ) ) {
+		} else {
+			if ($view->file_exists($keyPath . '.key')) {
 
-			$result = $view->unlink( $keyPath . '.key' );
+				$result = $view->unlink($keyPath . '.key');
 
+			}
 		}
 
-		if ( !$result ) {
+		if (!$result) {
 
-			\OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
+			\OCP\Util::writeLog('Encryption library',
+				'Could not delete keyfile; does not exist: "' . $keyPath, \OCP\Util::ERROR);
 
 		}
 
@@ -298,19 +301,19 @@ class Keymanager
 	 * @note Encryption of the private key must be performed by client code
 	 * as no encryption takes place here
 	 */
-	public static function setPrivateKey( $key ) {
+	public static function setPrivateKey($key) {
 
 		$user = \OCP\User::getUser();
 
-		$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
+		$view = new \OC_FilesystemView('/' . $user . '/files_encryption');
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		if ( !$view->file_exists( '' ) )
-			$view->mkdir( '' );
+		if (!$view->file_exists(''))
+			$view->mkdir('');
 
-		$result = $view->file_put_contents( $user . '.private.key', $key );
+		$result = $view->file_put_contents($user . '.private.key', $key);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
@@ -331,21 +334,21 @@ class Keymanager
 	 * @note The keyfile is not encrypted here. Client code must
 	 * asymmetrically encrypt the keyfile before passing it to this method
 	 */
-	public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
+	public static function setShareKey(\OC_FilesystemView $view, $path, $userId, $shareKey) {
 
 		// Here we need the currently logged in user, while userId can be a different user
-		$util = new Util( $view, \OCP\User::getUser() );
+		$util = new Util($view, \OCP\User::getUser());
 
-		list( $owner, $filename ) = $util->getUidAndFilename( $path );
+		list($owner, $filename) = $util->getUidAndFilename($path);
 
 		$basePath = '/' . $owner . '/files_encryption/share-keys';
 
-		$shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
+		$shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
 
 		// try reusing key file if part file
-		if ( self::isPartialFilePath( $shareKeyPath ) ) {
+		if (self::isPartialFilePath($shareKeyPath)) {
 
-			$writePath = $basePath . '/' . self::fixPartialFilePath( $shareKeyPath ) . '.' . $userId . '.shareKey';
+			$writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
 
 		} else {
 
@@ -356,12 +359,12 @@ class Keymanager
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$result = $view->file_put_contents( $writePath, $shareKey );
+		$result = $view->file_put_contents($writePath, $shareKey);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		if (
-			is_int( $result )
+			is_int($result)
 			&& $result > 0
 		) {
 
@@ -382,16 +385,16 @@ class Keymanager
 	 * @param array $shareKeys
 	 * @return bool
 	 */
-	public static function setShareKeys( \OC_FilesystemView $view, $path, array $shareKeys ) {
+	public static function setShareKeys(\OC_FilesystemView $view, $path, array $shareKeys) {
 
 		// $shareKeys must be  an array with the following format:
 		// [userId] => [encrypted key]
 
 		$result = true;
 
-		foreach ( $shareKeys as $userId => $shareKey ) {
+		foreach ($shareKeys as $userId => $shareKey) {
 
-			if ( !self::setShareKey( $view, $path, $userId, $shareKey ) ) {
+			if (!self::setShareKey($view, $path, $userId, $shareKey)) {
 
 				// If any of the keys are not set, flag false
 				$result = false;
@@ -415,14 +418,14 @@ class Keymanager
 	 * @note The sharekey returned is encrypted. Decryption
 	 * of the keyfile must be performed by client code
 	 */
-	public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
+	public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath) {
 
 		// try reusing key file if part file
-		if ( self::isPartialFilePath( $filePath ) ) {
+		if (self::isPartialFilePath($filePath)) {
 
-			$result = self::getShareKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
+			$result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
 
-			if ( $result ) {
+			if ($result) {
 
 				return $result;
 
@@ -434,14 +437,15 @@ class Keymanager
 		\OC_FileProxy::$enabled = false;
 
 		//here we need the currently logged in user, while userId can be a different user
-		$util = new Util( $view, \OCP\User::getUser() );
+		$util = new Util($view, \OCP\User::getUser());
 
-		list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
-		$shareKeyPath = \OC\Files\Filesystem::normalizePath( '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey' );
+		list($owner, $filename) = $util->getUidAndFilename($filePath);
+		$shareKeyPath = \OC\Files\Filesystem::normalizePath(
+			'/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
 
-		if ( $view->file_exists( $shareKeyPath ) ) {
+		if ($view->file_exists($shareKeyPath)) {
 
-			$result = $view->file_get_contents( $shareKeyPath );
+			$result = $view->file_get_contents($shareKeyPath);
 
 		} else {
 
@@ -461,17 +465,18 @@ class Keymanager
 	 * @param string $userId owner of the file
 	 * @param string $filePath path to the file, relative to the owners file dir
 	 */
-	public static function delAllShareKeys( \OC_FilesystemView $view, $userId, $filePath ) {
+	public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath) {
 
-		if ( $view->is_dir( $userId . '/files/' . $filePath ) ) {
-			$view->unlink( $userId . '/files_encryption/share-keys/' . $filePath );
+		if ($view->is_dir($userId . '/files/' . $filePath)) {
+			$view->unlink($userId . '/files_encryption/share-keys/' . $filePath);
 		} else {
-			$localKeyPath = $view->getLocalFile( $userId . '/files_encryption/share-keys/' . $filePath );
-			$matches = glob( preg_quote( $localKeyPath ) . '*.shareKey' );
-			foreach ( $matches as $ma ) {
-				$result = unlink( $ma );
-				if ( !$result ) {
-					\OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OC_Log::ERROR );
+			$localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $filePath);
+			$matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+			foreach ($matches as $ma) {
+				$result = unlink($ma);
+				if (!$result) {
+					\OCP\Util::writeLog('Encryption library',
+						'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OCP\Util::ERROR);
 				}
 			}
 		}
@@ -480,29 +485,31 @@ class Keymanager
 	/**
 	 * @brief Delete a single user's shareKey for a single file
 	 */
-	public static function delShareKey( \OC_FilesystemView $view, $userIds, $filePath ) {
+	public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath) {
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		//here we need the currently logged in user, while userId can be a different user
-		$util = new Util( $view, \OCP\User::getUser() );
+		$util = new Util($view, \OCP\User::getUser());
 
-		list( $owner, $filename ) = $util->getUidAndFilename( $filePath );
+		list($owner, $filename) = $util->getUidAndFilename($filePath);
 
-		$shareKeyPath = \OC\Files\Filesystem::normalizePath( '/' . $owner . '/files_encryption/share-keys/' . $filename );
+		$shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
 
-		if ( $view->is_dir( $shareKeyPath ) ) {
+		if ($view->is_dir($shareKeyPath)) {
 
-			$localPath = \OC\Files\Filesystem::normalizePath( $view->getLocalFolder( $shareKeyPath ) );
-			self::recursiveDelShareKeys( $localPath, $userIds );
+			$localPath = \OC\Files\Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
+			self::recursiveDelShareKeys($localPath, $userIds);
 
 		} else {
 
-			foreach ( $userIds as $userId ) {
+			foreach ($userIds as $userId) {
 
-				if ( !$view->unlink( $shareKeyPath . '.' . $userId . '.shareKey' ) ) {
-					\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId . '.shareKey"', \OC_Log::ERROR );
+				if (!$view->unlink($shareKeyPath . '.' . $userId . '.shareKey')) {
+					\OCP\Util::writeLog('Encryption library',
+						'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId
+						. '.shareKey"', \OCP\Util::ERROR);
 				}
 
 			}
@@ -517,42 +524,43 @@ class Keymanager
 	 * @param string $dir directory
 	 * @param array $userIds user ids for which the share keys should be deleted
 	 */
-	private static function recursiveDelShareKeys( $dir, $userIds ) {
-		foreach ( $userIds as $userId ) {
-			$matches = glob( preg_quote( $dir ) . '/*' . preg_quote( '.' . $userId . '.shareKey' ) );
+	private static function recursiveDelShareKeys($dir, $userIds) {
+		foreach ($userIds as $userId) {
+			$matches = glob(preg_quote($dir) . '/*' . preg_quote('.' . $userId . '.shareKey'));
 		}
 		/** @var $matches array */
-		foreach ( $matches as $ma ) {
-			if ( !unlink( $ma ) ) {
-				\OC_Log::write( 'Encryption library', 'Could not delete shareKey; does not exist: "' . $ma . '"', \OC_Log::ERROR );
+		foreach ($matches as $ma) {
+			if (!unlink($ma)) {
+				\OCP\Util::writeLog('Encryption library',
+					'Could not delete shareKey; does not exist: "' . $ma . '"', \OCP\Util::ERROR);
 			}
 		}
-		$subdirs = $directories = glob( preg_quote( $dir ) . '/*', GLOB_ONLYDIR );
-		foreach ( $subdirs as $subdir ) {
-			self::recursiveDelShareKeys( $subdir, $userIds );
+		$subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
+		foreach ($subdirs as $subdir) {
+			self::recursiveDelShareKeys($subdir, $userIds);
 		}
 	}
 
 	/**
 	 * @brief Make preparations to vars and filesystem for saving a keyfile
 	 */
-	public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
+	public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId) {
 
-		$targetPath = ltrim( $path, '/' );
+		$targetPath = ltrim($path, '/');
 
-		$path_parts = pathinfo( $targetPath );
+		$path_parts = pathinfo($targetPath);
 
 		// If the file resides within a subdirectory, create it
 		if (
-			isset( $path_parts['dirname'] )
-			&& !$view->file_exists( $basePath . '/' . $path_parts['dirname'] )
+			isset($path_parts['dirname'])
+			&& !$view->file_exists($basePath . '/' . $path_parts['dirname'])
 		) {
-			$sub_dirs = explode( DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname'] );
+			$sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']);
 			$dir = '';
-			foreach ( $sub_dirs as $sub_dir ) {
+			foreach ($sub_dirs as $sub_dir) {
 				$dir .= '/' . $sub_dir;
-				if ( !$view->is_dir( $dir ) ) {
-					$view->mkdir( $dir );
+				if (!$view->is_dir($dir)) {
+					$view->mkdir($dir);
 				}
 			}
 		}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index eaaeae9b619..11308612daf 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -34,8 +34,7 @@ namespace OCA\Encryption;
  * Class Proxy
  * @package OCA\Encryption
  */
-class Proxy extends \OC_FileProxy
-{
+class Proxy extends \OC_FileProxy {
 
 	private static $blackList = null; //mimetypes blacklisted from encryption
 
@@ -48,13 +47,13 @@ class Proxy extends \OC_FileProxy
 	 *
 	 * Tests if server side encryption is enabled, and file is allowed by blacklists
 	 */
-	private static function shouldEncrypt( $path ) {
+	private static function shouldEncrypt($path) {
 
-		if ( is_null( self::$enableEncryption ) ) {
+		if (is_null(self::$enableEncryption)) {
 
 			if (
-				\OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true'
-				&& Crypt::mode() == 'server'
+				\OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true'
+				&& Crypt::mode() === 'server'
 			) {
 
 				self::$enableEncryption = true;
@@ -67,27 +66,27 @@ class Proxy extends \OC_FileProxy
 
 		}
 
-		if ( !self::$enableEncryption ) {
+		if (!self::$enableEncryption) {
 
 			return false;
 
 		}
 
-		if ( is_null( self::$blackList ) ) {
+		if (is_null(self::$blackList)) {
 
-			self::$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
+			self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
 
 		}
 
-		if ( Crypt::isCatfileContent( $path ) ) {
+		if (Crypt::isCatfileContent($path)) {
 
 			return true;
 
 		}
 
-		$extension = substr( $path, strrpos( $path, '.' ) + 1 );
+		$extension = substr($path, strrpos($path, '.') + 1);
 
-		if ( array_search( $extension, self::$blackList ) === false ) {
+		if (array_search($extension, self::$blackList) === false) {
 
 			return true;
 
@@ -101,34 +100,34 @@ class Proxy extends \OC_FileProxy
 	 * @param $data
 	 * @return bool
 	 */
-	public function preFile_put_contents( $path, &$data ) {
+	public function preFile_put_contents($path, &$data) {
 
-		if ( self::shouldEncrypt( $path ) ) {
+		if (self::shouldEncrypt($path)) {
 
 			// Stream put contents should have been converted to fopen
-			if ( !is_resource( $data ) ) {
+			if (!is_resource($data)) {
 
 				$userId = \OCP\USER::getUser();
-				$view = new \OC_FilesystemView( '/' );
-				$util = new Util( $view, $userId );
-				$session = new Session( $view );
+				$view = new \OC_FilesystemView('/');
+				$util = new Util($view, $userId);
+				$session = new \OCA\Encryption\Session($view);
 				$privateKey = $session->getPrivateKey();
-				$filePath = $util->stripUserFilesPath( $path );
+				$filePath = $util->stripUserFilesPath($path);
 				// Set the filesize for userland, before encrypting
-				$size = strlen( $data );
+				$size = strlen($data);
 
 				// Disable encryption proxy to prevent recursive calls
 				$proxyStatus = \OC_FileProxy::$enabled;
 				\OC_FileProxy::$enabled = false;
 
 				// Check if there is an existing key we can reuse
-				if ( $encKeyfile = Keymanager::getFileKey( $view, $userId, $filePath ) ) {
+				if ($encKeyfile = Keymanager::getFileKey($view, $userId, $filePath)) {
 
 					// Fetch shareKey
-					$shareKey = Keymanager::getShareKey( $view, $userId, $filePath );
+					$shareKey = Keymanager::getShareKey($view, $userId, $filePath);
 
 					// Decrypt the keyfile
-					$plainKey = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+					$plainKey = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
 
 				} else {
 
@@ -138,37 +137,41 @@ class Proxy extends \OC_FileProxy
 				}
 
 				// Encrypt data
-				$encData = Crypt::symmetricEncryptFileContent( $data, $plainKey );
+				$encData = Crypt::symmetricEncryptFileContent($data, $plainKey);
 
 				$sharingEnabled = \OCP\Share::isEnabled();
 
 				// if file exists try to get sharing users
-				if ( $view->file_exists( $path ) ) {
-					$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $filePath, $userId );
+				if ($view->file_exists($path)) {
+					$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $filePath, $userId);
 				} else {
 					$uniqueUserIds[] = $userId;
 				}
 
 				// Fetch public keys for all users who will share the file
-				$publicKeys = Keymanager::getPublicKeys( $view, $uniqueUserIds );
+				$publicKeys = Keymanager::getPublicKeys($view, $uniqueUserIds);
 
 				// Encrypt plain keyfile to multiple sharefiles
-				$multiEncrypted = Crypt::multiKeyEncrypt( $plainKey, $publicKeys );
+				$multiEncrypted = Crypt::multiKeyEncrypt($plainKey, $publicKeys);
 
 				// Save sharekeys to user folders
-				Keymanager::setShareKeys( $view, $filePath, $multiEncrypted['keys'] );
+				Keymanager::setShareKeys($view, $filePath, $multiEncrypted['keys']);
 
 				// Set encrypted keyfile as common varname
 				$encKey = $multiEncrypted['data'];
 
 				// Save keyfile for newly encrypted file in parallel directory tree
-				Keymanager::setFileKey( $view, $filePath, $userId, $encKey );
+				Keymanager::setFileKey($view, $filePath, $userId, $encKey);
 
 				// Replace plain content with encrypted content by reference
 				$data = $encData;
 
 				// Update the file cache with file info
-				\OC\Files\Filesystem::putFileInfo( $filePath, array( 'encrypted' => true, 'size' => strlen( $data ), 'unencrypted_size' => $size ), '' );
+				\OC\Files\Filesystem::putFileInfo($filePath, array(
+																  'encrypted' => true,
+																  'size' => strlen($data),
+																  'unencrypted_size' => $size
+															 ), '');
 
 				// Re-enable proxy - our work is done
 				\OC_FileProxy::$enabled = $proxyStatus;
@@ -184,51 +187,51 @@ class Proxy extends \OC_FileProxy
 	 * @param string $path Path of file from which has been read
 	 * @param string $data Data that has been read from file
 	 */
-	public function postFile_get_contents( $path, $data ) {
+	public function postFile_get_contents($path, $data) {
 
 		$userId = \OCP\USER::getUser();
-		$view = new \OC_FilesystemView( '/' );
-		$util = new Util( $view, $userId );
+		$view = new \OC_FilesystemView('/');
+		$util = new Util($view, $userId);
 
-		$relPath = $util->stripUserFilesPath( $path );
+		$relPath = $util->stripUserFilesPath($path);
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		// init session
-		$session = new Session( $view );
+		$session = new \OCA\Encryption\Session($view);
 
 		// If data is a catfile
 		if (
-			Crypt::mode() == 'server'
-			&& Crypt::isCatfileContent( $data )
+			Crypt::mode() === 'server'
+			&& Crypt::isCatfileContent($data)
 		) {
 
-			$privateKey = $session->getPrivateKey( $userId );
+			$privateKey = $session->getPrivateKey($userId);
 
 			// Get the encrypted keyfile
-			$encKeyfile = Keymanager::getFileKey( $view, $userId, $relPath );
+			$encKeyfile = Keymanager::getFileKey($view, $userId, $relPath);
 
 			// Attempt to fetch the user's shareKey
-			$shareKey = Keymanager::getShareKey( $view, $userId, $relPath );
+			$shareKey = Keymanager::getShareKey($view, $userId, $relPath);
 
 			// Decrypt keyfile with shareKey
-			$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+			$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
 
-			$plainData = Crypt::symmetricDecryptFileContent( $data, $plainKeyfile );
+			$plainData = Crypt::symmetricDecryptFileContent($data, $plainKeyfile);
 
 		} elseif (
 			Crypt::mode() == 'server'
-			&& isset( $_SESSION['legacyenckey'] )
-			&& Crypt::isEncryptedMeta( $path )
+			&& \OC::$session->exists('legacyenckey')
+			&& Crypt::isEncryptedMeta($path)
 		) {
-			$plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
+			$plainData = Crypt::legacyBlockDecrypt($data, $session->getLegacyKey());
 		}
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if ( !isset( $plainData ) ) {
+		if (!isset($plainData)) {
 
 			$plainData = $data;
 
@@ -241,10 +244,10 @@ class Proxy extends \OC_FileProxy
 	/**
 	 * @brief When a file is deleted, remove its keyfile also
 	 */
-	public function preUnlink( $path ) {
+	public function preUnlink($path) {
 
 		// let the trashbin handle this  
-		if ( \OCP\App::isEnabled( 'files_trashbin' ) ) {
+		if (\OCP\App::isEnabled('files_trashbin')) {
 			return true;
 		}
 
@@ -252,23 +255,24 @@ class Proxy extends \OC_FileProxy
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$view = new \OC_FilesystemView( '/' );
+		$view = new \OC_FilesystemView('/');
 
 		$userId = \OCP\USER::getUser();
 
-		$util = new Util( $view, $userId );
+		$util = new Util($view, $userId);
 
 		// Format path to be relative to user files dir
-		$relPath = $util->stripUserFilesPath( $path );
+		$relPath = $util->stripUserFilesPath($path);
 
-		list( $owner, $ownerPath ) = $util->getUidAndFilename( $relPath );
+		list($owner, $ownerPath) = $util->getUidAndFilename($relPath);
 
 		// Delete keyfile & shareKey so it isn't orphaned
-		if ( !Keymanager::deleteFileKey( $view, $owner, $ownerPath ) ) {
-			\OC_Log::write( 'Encryption library', 'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OC_Log::ERROR );
+		if (!Keymanager::deleteFileKey($view, $owner, $ownerPath)) {
+			\OCP\Util::writeLog('Encryption library',
+				'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OCP\Util::ERROR);
 		}
 
-		Keymanager::delAllShareKeys( $view, $owner, $ownerPath );
+		Keymanager::delAllShareKeys($view, $owner, $ownerPath);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
@@ -282,8 +286,8 @@ class Proxy extends \OC_FileProxy
 	 * @param $path
 	 * @return bool
 	 */
-	public function postTouch( $path ) {
-		$this->handleFile( $path );
+	public function postTouch($path) {
+		$this->handleFile($path);
 
 		return true;
 	}
@@ -293,20 +297,20 @@ class Proxy extends \OC_FileProxy
 	 * @param $result
 	 * @return resource
 	 */
-	public function postFopen( $path, &$result ) {
+	public function postFopen($path, &$result) {
 
-		if ( !$result ) {
+		if (!$result) {
 
 			return $result;
 
 		}
 
 		// Reformat path for use with OC_FSV
-		$path_split = explode( '/', $path );
-		$path_f = implode( '/', array_slice( $path_split, 3 ) );
+		$path_split = explode('/', $path);
+		$path_f = implode('/', array_slice($path_split, 3));
 
 		// FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
-		if ( count($path_split) >= 2 && $path_split[2] == 'cache' ) {
+		if (isset($path_split) && $path_split[2] === 'cache') {
 			return $result;
 		}
 
@@ -314,31 +318,31 @@ class Proxy extends \OC_FileProxy
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$meta = stream_get_meta_data( $result );
+		$meta = stream_get_meta_data($result);
 
-		$view = new \OC_FilesystemView( '' );
+		$view = new \OC_FilesystemView('');
 
-		$util = new Util( $view, \OCP\USER::getUser() );
+		$util = new Util($view, \OCP\USER::getUser());
 
 		// If file is already encrypted, decrypt using crypto protocol
 		if (
-			Crypt::mode() == 'server'
-			&& $util->isEncryptedPath( $path )
+			Crypt::mode() === 'server'
+			&& $util->isEncryptedPath($path)
 		) {
 
 			// Close the original encrypted file
-			fclose( $result );
+			fclose($result);
 
 			// Open the file using the crypto stream wrapper 
 			// protocol and let it do the decryption work instead
-			$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
+			$result = fopen('crypt://' . $path_f, $meta['mode']);
 
 		} elseif (
-			self::shouldEncrypt( $path )
-			and $meta ['mode'] != 'r'
-			and $meta['mode'] != 'rb'
+			self::shouldEncrypt($path)
+			and $meta ['mode'] !== 'r'
+				and $meta['mode'] !== 'rb'
 		) {
-			$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
+			$result = fopen('crypt://' . $path_f, $meta['mode']);
 		}
 
 		// Re-enable the proxy
@@ -353,17 +357,17 @@ class Proxy extends \OC_FileProxy
 	 * @param $data
 	 * @return array
 	 */
-	public function postGetFileInfo( $path, $data ) {
+	public function postGetFileInfo($path, $data) {
 
 		// if path is a folder do nothing
-		if ( is_array( $data ) && array_key_exists( 'size', $data ) ) {
+		if (is_array($data) && array_key_exists('size', $data)) {
 
 			// Disable encryption proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
 
 			// get file size
-			$data['size'] = self::postFileSize( $path, $data['size'] );
+			$data['size'] = self::postFileSize($path, $data['size']);
 
 			// Re-enable the proxy
 			\OC_FileProxy::$enabled = $proxyStatus;
@@ -377,51 +381,51 @@ class Proxy extends \OC_FileProxy
 	 * @param $size
 	 * @return bool
 	 */
-	public function postFileSize( $path, $size ) {
+	public function postFileSize($path, $size) {
 
-		$view = new \OC_FilesystemView( '/' );
+		$view = new \OC_FilesystemView('/');
 
 		// if path is a folder do nothing
-		if ( $view->is_dir( $path ) ) {
+		if ($view->is_dir($path)) {
 			return $size;
 		}
 
 		// Reformat path for use with OC_FSV
-		$path_split = explode( '/', $path );
-		$path_f = implode( '/', array_slice( $path_split, 3 ) );
+		$path_split = explode('/', $path);
+		$path_f = implode('/', array_slice($path_split, 3));
 
 		// if path is empty we cannot resolve anything
-		if ( empty( $path_f ) ) {
+		if (empty($path_f)) {
 			return $size;
 		}
 
 		$fileInfo = false;
 		// get file info from database/cache if not .part file
-		if ( !Keymanager::isPartialFilePath( $path ) ) {
-			$fileInfo = $view->getFileInfo( $path );
+		if (!Keymanager::isPartialFilePath($path)) {
+			$fileInfo = $view->getFileInfo($path);
 		}
 
 		// if file is encrypted return real file size
-		if ( is_array( $fileInfo ) && $fileInfo['encrypted'] === true ) {
+		if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
 			$size = $fileInfo['unencrypted_size'];
 		} else {
 			// self healing if file was removed from file cache
-			if ( !is_array( $fileInfo ) ) {
+			if (!is_array($fileInfo)) {
 				$fileInfo = array();
 			}
 
 			$userId = \OCP\User::getUser();
-			$util = new Util( $view, $userId );
-			$fixSize = $util->getFileSize( $path );
-			if ( $fixSize > 0 ) {
+			$util = new Util($view, $userId);
+			$fixSize = $util->getFileSize($path);
+			if ($fixSize > 0) {
 				$size = $fixSize;
 
 				$fileInfo['encrypted'] = true;
 				$fileInfo['unencrypted_size'] = $size;
 
 				// put file info if not .part file
-				if ( !Keymanager::isPartialFilePath( $path_f ) ) {
-					$view->putFileInfo( $path, $fileInfo );
+				if (!Keymanager::isPartialFilePath($path_f)) {
+					$view->putFileInfo($path, $fileInfo);
 				}
 			}
 
@@ -432,32 +436,32 @@ class Proxy extends \OC_FileProxy
 	/**
 	 * @param $path
 	 */
-	public function handleFile( $path ) {
+	public function handleFile($path) {
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$view = new \OC_FilesystemView( '/' );
-		$session = new Session( $view );
+		$view = new \OC_FilesystemView('/');
+		$session = new \OCA\Encryption\Session($view);
 		$userId = \OCP\User::getUser();
-		$util = new Util( $view, $userId );
+		$util = new Util($view, $userId);
 
 		// Reformat path for use with OC_FSV
-		$path_split = explode( '/', $path );
-		$path_f = implode( '/', array_slice( $path_split, 3 ) );
+		$path_split = explode('/', $path);
+		$path_f = implode('/', array_slice($path_split, 3));
 
 		// only if file is on 'files' folder fix file size and sharing
-		if ( count($path_split) >= 2 && $path_split[2] == 'files' && $util->fixFileSize( $path ) ) {
+		if (isset($path_split) && $path_split[2] === 'files' && $util->fixFileSize($path)) {
 
 			// get sharing app state
 			$sharingEnabled = \OCP\Share::isEnabled();
 
 			// get users
-			$usersSharing = $util->getSharingUsersArray( $sharingEnabled, $path_f );
+			$usersSharing = $util->getSharingUsersArray($sharingEnabled, $path_f);
 
 			// update sharing-keys
-			$util->setSharedFileKeyfiles( $session, $usersSharing, $path_f );
+			$util->setSharedFileKeyfiles($session, $usersSharing, $path_f);
 		}
 
 		\OC_FileProxy::$enabled = $proxyStatus;
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 2ddad0a15da..bff1737554b 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -26,8 +26,7 @@ namespace OCA\Encryption;
  * Class for handling encryption related session data
  */
 
-class Session
-{
+class Session {
 
 	private $view;
 
@@ -37,26 +36,26 @@ class Session
 	 *
 	 * @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
 	 */
-	public function __construct( $view ) {
+	public function __construct($view) {
 
 		$this->view = $view;
 
-		if ( !$this->view->is_dir( 'owncloud_private_key' ) ) {
+		if (!$this->view->is_dir('owncloud_private_key')) {
 
-			$this->view->mkdir( 'owncloud_private_key' );
+			$this->view->mkdir('owncloud_private_key');
 
 		}
 
-		$publicShareKeyId = \OC_Appconfig::getValue( 'files_encryption', 'publicShareKeyId' );
+		$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
 
-		if ( $publicShareKeyId === null ) {
-			$publicShareKeyId = 'pubShare_' . substr( md5( time() ), 0, 8 );
-			\OC_Appconfig::setValue( 'files_encryption', 'publicShareKeyId', $publicShareKeyId );
+		if ($publicShareKeyId === null) {
+			$publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
+			\OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
 		}
 
 		if (
-			!$this->view->file_exists( "/public-keys/" . $publicShareKeyId . ".public.key" )
-			|| !$this->view->file_exists( "/owncloud_private_key/" . $publicShareKeyId . ".private.key" )
+			!$this->view->file_exists("/public-keys/" . $publicShareKeyId . ".public.key")
+			|| !$this->view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".private.key")
 		) {
 
 			$keypair = Crypt::createKeypair();
@@ -67,33 +66,31 @@ class Session
 
 			// Save public key
 
-			if ( !$view->is_dir( '/public-keys' ) ) {
-				$view->mkdir( '/public-keys' );
+			if (!$view->is_dir('/public-keys')) {
+				$view->mkdir('/public-keys');
 			}
 
-			$this->view->file_put_contents( '/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey'] );
+			$this->view->file_put_contents('/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey']);
 
 			// Encrypt private key empty passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], '' );
+			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], '');
 
 			// Save private key
-			$this->view->file_put_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey );
+			$this->view->file_put_contents(
+				'/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey);
 
 			\OC_FileProxy::$enabled = $proxyStatus;
 
 		}
 
-		if ( \OCP\USER::getUser() === false ||
-			( isset( $_GET['service'] ) && $_GET['service'] == 'files' &&
-				isset( $_GET['t'] ) )
-		) {
+		if (\OCA\Encryption\Helper::isPublicAccess()) {
 			// Disable encryption proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
 
 			$encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key' );
 			$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
-			$this->setPrivateKey( $privateKey );
+			$this->setPublicSharePrivateKey( $privateKey );
 
 			\OC_FileProxy::$enabled = $proxyStatus;
 		}
@@ -103,45 +100,71 @@ class Session
 	 * @brief Sets user private key to session
 	 * @param string $privateKey
 	 * @return bool
+	 *
+	 * @note this should only be set on login
 	 */
-	public function setPrivateKey( $privateKey ) {
+	public function setPrivateKey($privateKey) {
 
-		$_SESSION['privateKey'] = $privateKey;
+		\OC::$session->set('privateKey', $privateKey);
 
 		return true;
 
 	}
 
 	/**
-	 * @brief Gets user private key from session
+	 * @brief Gets user or public share private key from session
 	 * @returns string $privateKey The user's plaintext private key
 	 *
 	 */
 	public function getPrivateKey() {
+		// return the public share private key if this is a public access
+		if (\OCA\Encryption\Helper::isPublicAccess()) {
+			return $this->getPublicSharePrivateKey();
+		} else {
+			if (!is_null( \OC::$session->get('privateKey') )) {
+				return \OC::$session->get('privateKey');
+			} else {
+				return false;
+			}
+		}
+	}
 
-		if (
-			isset( $_SESSION['privateKey'] )
-			&& !empty( $_SESSION['privateKey'] )
-		) {
+	/**
+	 * @brief Sets public user private key to session
+	 * @param string $privateKey
+	 * @return bool
+	 */
+	public function setPublicSharePrivateKey($privateKey) {
 
-			return $_SESSION['privateKey'];
+			\OC::$session->set('publicSharePrivateKey', $privateKey);
 
-		} else {
+		return true;
 
-			return false;
+	}
 
-		}
+	/**
+	 * @brief Gets public share private key from session
+	 * @returns string $privateKey
+	 *
+	 */
+	public function getPublicSharePrivateKey() {
 
+		if (!is_null( \OC::$session->get('publicSharePrivateKey') )) {
+			return \OC::$session->get('publicSharePrivateKey');
+		} else {
+			return false;
+		}
 	}
 
+
 	/**
 	 * @brief Sets user legacy key to session
 	 * @param $legacyKey
 	 * @return bool
 	 */
-	public function setLegacyKey( $legacyKey ) {
+	public function setLegacyKey($legacyKey) {
 
-		$_SESSION['legacyKey'] = $legacyKey;
+		\OC::$session->set('legacyKey', $legacyKey);
 
 		return true;
 	}
@@ -153,12 +176,9 @@ class Session
 	 */
 	public function getLegacyKey() {
 
-		if (
-			isset( $_SESSION['legacyKey'] )
-			&& !empty( $_SESSION['legacyKey'] )
-		) {
+		if ( !is_null( \OC::$session->get('legacyKey') ) ) {
 
-			return $_SESSION['legacyKey'];
+			return \OC::$session->get('legacyKey');
 
 		} else {
 
@@ -168,4 +188,4 @@ class Session
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index fa9df02f085..072c5286644 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -48,8 +48,7 @@ namespace OCA\Encryption;
  * previous version deleted, this is handled by OC\Files\View, and thus the
  * encryption proxies are used and keyfiles deleted.
  */
-class Stream
-{
+class Stream {
 	private $plainKey;
 	private $encKeyfiles;
 
@@ -77,18 +76,18 @@ class Stream
 	 * @param $opened_path
 	 * @return bool
 	 */
-	public function stream_open( $path, $mode, $options, &$opened_path ) {
+	public function stream_open($path, $mode, $options, &$opened_path) {
 
-		if ( !isset( $this->rootView ) ) {
-			$this->rootView = new \OC_FilesystemView( '/' );
+		if (!isset($this->rootView)) {
+			$this->rootView = new \OC_FilesystemView('/');
 		}
 
-		$util = new Util( $this->rootView, \OCP\USER::getUser() );
+		$util = new Util($this->rootView, \OCP\USER::getUser());
 
 		$this->userId = $util->getUserId();
 
 		// Strip identifier text from path, this gives us the path relative to data/<user>/files
-		$this->relPath = \OC\Files\Filesystem::normalizePath( str_replace( 'crypt://', '', $path ) );
+		$this->relPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
 
 		// rawPath is relative to the data directory
 		$this->rawPath = $util->getUserFilesDir() . $this->relPath;
@@ -98,10 +97,10 @@ class Stream
 		\OC_FileProxy::$enabled = false;
 
 		if (
-			$mode == 'w'
-			or $mode == 'w+'
-			or $mode == 'wb'
-			or $mode == 'wb+'
+			$mode === 'w'
+			or $mode === 'w+'
+			or $mode === 'wb'
+			or $mode === 'wb+'
 		) {
 
 			// We're writing a new file so start write counter with 0 bytes
@@ -110,25 +109,25 @@ class Stream
 
 		} else {
 
-			$this->size = $this->rootView->filesize( $this->rawPath, $mode );
+			$this->size = $this->rootView->filesize($this->rawPath, $mode);
 		}
 
-		$this->handle = $this->rootView->fopen( $this->rawPath, $mode );
+		$this->handle = $this->rootView->fopen($this->rawPath, $mode);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if ( !is_resource( $this->handle ) ) {
+		if (!is_resource($this->handle)) {
 
-			\OCP\Util::writeLog( 'files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR );
+			\OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
 
 		} else {
 
-			$this->meta = stream_get_meta_data( $this->handle );
+			$this->meta = stream_get_meta_data($this->handle);
 
 		}
 
 
-		return is_resource( $this->handle );
+		return is_resource($this->handle);
 
 	}
 
@@ -136,11 +135,11 @@ class Stream
 	 * @param $offset
 	 * @param int $whence
 	 */
-	public function stream_seek( $offset, $whence = SEEK_SET ) {
+	public function stream_seek($offset, $whence = SEEK_SET) {
 
 		$this->flush();
 
-		fseek( $this->handle, $offset, $whence );
+		fseek($this->handle, $offset, $whence);
 
 	}
 
@@ -149,36 +148,37 @@ class Stream
 	 * @return bool|string
 	 * @throws \Exception
 	 */
-	public function stream_read( $count ) {
+	public function stream_read($count) {
 
 		$this->writeCache = '';
 
-		if ( $count != 8192 ) {
+		if ($count !== 8192) {
 
 			// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
 			// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
-			\OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL );
+			\OCP\Util::writeLog('files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
 
 			die();
 
 		}
 
 		// Get the data from the file handle
-		$data = fread( $this->handle, 8192 );
+		$data = fread($this->handle, 8192);
 
 		$result = '';
 
-		if ( strlen( $data ) ) {
+		if (strlen($data)) {
 
-			if ( !$this->getKey() ) {
+			if (!$this->getKey()) {
 
 				// Error! We don't have a key to decrypt the file with
-				throw new \Exception( 'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream' );
+				throw new \Exception(
+					'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream');
 
 			}
 
 			// Decrypt data
-			$result = Crypt::symmetricDecryptFileContent( $data, $this->plainKey );
+			$result = Crypt::symmetricDecryptFileContent($data, $this->plainKey);
 
 		}
 
@@ -192,10 +192,10 @@ class Stream
 	 * @param string $key key to use for encryption
 	 * @return string encrypted data on success, false on failure
 	 */
-	public function preWriteEncrypt( $plainData, $key ) {
+	public function preWriteEncrypt($plainData, $key) {
 
 		// Encrypt data to 'catfile', which includes IV
-		if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
+		if ($encrypted = Crypt::symmetricEncryptFileContent($plainData, $key)) {
 
 			return $encrypted;
 
@@ -215,7 +215,7 @@ class Stream
 	public function getKey() {
 
 		// Check if key is already set
-		if ( isset( $this->plainKey ) && isset( $this->encKeyfile ) ) {
+		if (isset($this->plainKey) && isset($this->encKeyfile)) {
 
 			return true;
 
@@ -223,18 +223,18 @@ class Stream
 
 		// Fetch and decrypt keyfile
 		// Fetch existing keyfile
-		$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->relPath );
+		$this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->userId, $this->relPath);
 
 		// If a keyfile already exists
-		if ( $this->encKeyfile ) {
+		if ($this->encKeyfile) {
 
-			$session = new Session( $this->rootView );
+			$session = new \OCA\Encryption\Session( $this->rootView );
 
-			$privateKey = $session->getPrivateKey( $this->userId );
+			$privateKey = $session->getPrivateKey($this->userId);
 
-			$shareKey = Keymanager::getShareKey( $this->rootView, $this->userId, $this->relPath );
+			$shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
 
-			$this->plainKey = Crypt::multiKeyDecrypt( $this->encKeyfile, $shareKey, $privateKey );
+			$this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $privateKey);
 
 			return true;
 
@@ -255,7 +255,7 @@ class Stream
 	 * @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
 	 * @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
 	 */
-	public function stream_write( $data ) {
+	public function stream_write($data) {
 
 		// Disable the file proxies so that encryption is not 
 		// automatically attempted when the file is written to disk - 
@@ -265,16 +265,16 @@ class Stream
 		\OC_FileProxy::$enabled = false;
 
 		// Get the length of the unencrypted data that we are handling
-		$length = strlen( $data );
+		$length = strlen($data);
 
 		// Find out where we are up to in the writing of data to the
 		// file
-		$pointer = ftell( $this->handle );
+		$pointer = ftell($this->handle);
 
 		// Get / generate the keyfile for the file we're handling
 		// If we're writing a new file (not overwriting an existing 
 		// one), save the newly generated keyfile
-		if ( !$this->getKey() ) {
+		if (!$this->getKey()) {
 
 			$this->plainKey = Crypt::generateKey();
 
@@ -282,7 +282,7 @@ class Stream
 
 		// If extra data is left over from the last round, make sure it 
 		// is integrated into the next 6126 / 8192 block
-		if ( $this->writeCache ) {
+		if ($this->writeCache) {
 
 			// Concat writeCache to start of $data
 			$data = $this->writeCache . $data;
@@ -294,15 +294,15 @@ class Stream
 		}
 
 		// While there still remains some data to be processed & written
-		while ( strlen( $data ) > 0 ) {
+		while (strlen($data) > 0) {
 
 			// Remaining length for this iteration, not of the
 			// entire file (may be greater than 8192 bytes)
-			$remainingLength = strlen( $data );
+			$remainingLength = strlen($data);
 
 			// If data remaining to be written is less than the
 			// size of 1 6126 byte block
-			if ( $remainingLength < 6126 ) {
+			if ($remainingLength < 6126) {
 
 				// Set writeCache to contents of $data
 				// The writeCache will be carried over to the 
@@ -320,25 +320,25 @@ class Stream
 			} else {
 
 				// Read the chunk from the start of $data
-				$chunk = substr( $data, 0, 6126 );
+				$chunk = substr($data, 0, 6126);
 
-				$encrypted = $this->preWriteEncrypt( $chunk, $this->plainKey );
+				$encrypted = $this->preWriteEncrypt($chunk, $this->plainKey);
 
 				// Write the data chunk to disk. This will be 
 				// attended to the last data chunk if the file
 				// being handled totals more than 6126 bytes
-				fwrite( $this->handle, $encrypted );
+				fwrite($this->handle, $encrypted);
 
 				// Remove the chunk we just processed from
 				// $data, leaving only unprocessed data in $data
 				// var, for handling on the next round
-				$data = substr( $data, 6126 );
+				$data = substr($data, 6126);
 
 			}
 
 		}
 
-		$this->size = max( $this->size, $pointer + $length );
+		$this->size = max($this->size, $pointer + $length);
 		$this->unencryptedSize += $length;
 
 		\OC_FileProxy::$enabled = $proxyStatus;
@@ -353,17 +353,17 @@ class Stream
 	 * @param $arg1
 	 * @param $arg2
 	 */
-	public function stream_set_option( $option, $arg1, $arg2 ) {
+	public function stream_set_option($option, $arg1, $arg2) {
 		$return = false;
-		switch ( $option ) {
+		switch ($option) {
 			case STREAM_OPTION_BLOCKING:
-				$return = stream_set_blocking( $this->handle, $arg1 );
+				$return = stream_set_blocking($this->handle, $arg1);
 				break;
 			case STREAM_OPTION_READ_TIMEOUT:
-				$return = stream_set_timeout( $this->handle, $arg1, $arg2 );
+				$return = stream_set_timeout($this->handle, $arg1, $arg2);
 				break;
 			case STREAM_OPTION_WRITE_BUFFER:
-				$return = stream_set_write_buffer( $this->handle, $arg1 );
+				$return = stream_set_write_buffer($this->handle, $arg1);
 		}
 
 		return $return;
@@ -373,14 +373,14 @@ class Stream
 	 * @return array
 	 */
 	public function stream_stat() {
-		return fstat( $this->handle );
+		return fstat($this->handle);
 	}
 
 	/**
 	 * @param $mode
 	 */
-	public function stream_lock( $mode ) {
-		return flock( $this->handle, $mode );
+	public function stream_lock($mode) {
+		return flock($this->handle, $mode);
 	}
 
 	/**
@@ -388,7 +388,7 @@ class Stream
 	 */
 	public function stream_flush() {
 
-		return fflush( $this->handle );
+		return fflush($this->handle);
 		// Not a typo: http://php.net/manual/en/function.fflush.php
 
 	}
@@ -397,19 +397,19 @@ class Stream
 	 * @return bool
 	 */
 	public function stream_eof() {
-		return feof( $this->handle );
+		return feof($this->handle);
 	}
 
 	private function flush() {
 
-		if ( $this->writeCache ) {
+		if ($this->writeCache) {
 
 			// Set keyfile property for file in question
 			$this->getKey();
 
-			$encrypted = $this->preWriteEncrypt( $this->writeCache, $this->plainKey );
+			$encrypted = $this->preWriteEncrypt($this->writeCache, $this->plainKey);
 
-			fwrite( $this->handle, $encrypted );
+			fwrite($this->handle, $encrypted);
 
 			$this->writeCache = '';
 
@@ -425,42 +425,42 @@ class Stream
 		$this->flush();
 
 		if (
-			$this->meta['mode'] != 'r'
-			and $this->meta['mode'] != 'rb'
-			and $this->size > 0
+			$this->meta['mode'] !== 'r'
+			and $this->meta['mode'] !== 'rb'
+				and $this->size > 0
 		) {
 			// Disable encryption proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
 
 			// Fetch user's public key
-			$this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+			$this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
 
 			// Check if OC sharing api is enabled
 			$sharingEnabled = \OCP\Share::isEnabled();
 
-			$util = new Util( $this->rootView, $this->userId );
+			$util = new Util($this->rootView, $this->userId);
 
 			// Get all users sharing the file includes current user
-			$uniqueUserIds = $util->getSharingUsersArray( $sharingEnabled, $this->relPath, $this->userId );
+			$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
 
 			// Fetch public keys for all sharing users
-			$publicKeys = Keymanager::getPublicKeys( $this->rootView, $uniqueUserIds );
+			$publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
 
 			// Encrypt enc key for all sharing users
-			$this->encKeyfiles = Crypt::multiKeyEncrypt( $this->plainKey, $publicKeys );
+			$this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
 
-			$view = new \OC_FilesystemView( '/' );
+			$view = new \OC_FilesystemView('/');
 
 			// Save the new encrypted file key
-			Keymanager::setFileKey( $this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data'] );
+			Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
 
 			// Save the sharekeys
-			Keymanager::setShareKeys( $view, $this->relPath, $this->encKeyfiles['keys'] );
+			Keymanager::setShareKeys($view, $this->relPath, $this->encKeyfiles['keys']);
 
 			// get file info
-			$fileInfo = $view->getFileInfo( $this->rawPath );
-			if ( !is_array( $fileInfo ) ) {
+			$fileInfo = $view->getFileInfo($this->rawPath);
+			if (!is_array($fileInfo)) {
 				$fileInfo = array();
 			}
 
@@ -473,10 +473,10 @@ class Stream
 			$fileInfo['unencrypted_size'] = $this->unencryptedSize;
 
 			// set fileinfo
-			$view->putFileInfo( $this->rawPath, $fileInfo );
+			$view->putFileInfo($this->rawPath, $fileInfo);
 		}
 
-		return fclose( $this->handle );
+		return fclose($this->handle);
 
 	}
 
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 2980aa94e0c..0d663549bf6 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -49,14 +49,13 @@ namespace OCA\Encryption;
 
 /**
  * @brief Class for utilities relating to encrypted file storage system
- * @param OC_FilesystemView $view expected to have OC '/' as root path
+ * @param \OC_FilesystemView $view expected to have OC '/' as root path
  * @param string $userId ID of the logged in user
  * @param int $client indicating status of client side encryption. Currently
  * unused, likely to become obsolete shortly
  */
 
-class Util
-{
+class Util {
 
 	// Web UI:
 
@@ -117,47 +116,50 @@ class Util
 	 * @param $userId
 	 * @param bool $client
 	 */
-	public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
+	public function __construct(\OC_FilesystemView $view, $userId, $client = false) {
 
 		$this->view = $view;
 		$this->userId = $userId;
 		$this->client = $client;
 		$this->isPublic = false;
 
-		$this->publicShareKeyId = \OC_Appconfig::getValue( 'files_encryption', 'publicShareKeyId' );
-		$this->recoveryKeyId = \OC_Appconfig::getValue( 'files_encryption', 'recoveryKeyId' );
+		$this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+		$this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
 
 		// if we are anonymous/public
-		if ( $this->userId === false ||
-			( isset( $_GET['service'] ) && $_GET['service'] == 'files' &&
-				isset( $_GET['t'] ) )
-		) {
+		if (\OCA\Encryption\Helper::isPublicAccess()) {
 			$this->userId = $this->publicShareKeyId;
 
 			// only handle for files_sharing app
-			if ( $GLOBALS['app'] === 'files_sharing' ) {
+			if (isset($GLOBALS['app']) && $GLOBALS['app'] === 'files_sharing') {
 				$this->userDir = '/' . $GLOBALS['fileOwner'];
 				$this->fileFolderName = 'files';
-				$this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+				$this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/'
+									  . $this->fileFolderName; // TODO: Does this need to be user configurable?
 				$this->publicKeyDir = '/' . 'public-keys';
 				$this->encryptionDir = '/' . $GLOBALS['fileOwner'] . '/' . 'files_encryption';
 				$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
 				$this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
-				$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
-				$this->privateKeyPath = '/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+				$this->publicKeyPath =
+					$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+				$this->privateKeyPath =
+					'/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
 				$this->isPublic = true;
 			}
 
 		} else {
 			$this->userDir = '/' . $this->userId;
 			$this->fileFolderName = 'files';
-			$this->userFilesDir = '/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+			$this->userFilesDir =
+				'/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
 			$this->publicKeyDir = '/' . 'public-keys';
 			$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
 			$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
 			$this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
-			$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
-			$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+			$this->publicKeyPath =
+				$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+			$this->privateKeyPath =
+				$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
 		}
 	}
 
@@ -167,11 +169,11 @@ class Util
 	public function ready() {
 
 		if (
-			!$this->view->file_exists( $this->encryptionDir )
-			or !$this->view->file_exists( $this->keyfilesPath )
-			or !$this->view->file_exists( $this->shareKeysPath )
-			or !$this->view->file_exists( $this->publicKeyPath )
-			or !$this->view->file_exists( $this->privateKeyPath )
+			!$this->view->file_exists($this->encryptionDir)
+			or !$this->view->file_exists($this->keyfilesPath)
+			or !$this->view->file_exists($this->shareKeysPath)
+			or !$this->view->file_exists($this->publicKeyPath)
+			or !$this->view->file_exists($this->privateKeyPath)
 		) {
 
 			return false;
@@ -188,24 +190,24 @@ class Util
 	 * @brief Sets up user folders and keys for serverside encryption
 	 * @param string $passphrase passphrase to encrypt server-stored private key with
 	 */
-	public function setupServerSide( $passphrase = null ) {
+	public function setupServerSide($passphrase = null) {
 
 		// Set directories to check / create
 		$setUpDirs = array(
-			$this->userDir
-		, $this->userFilesDir
-		, $this->publicKeyDir
-		, $this->encryptionDir
-		, $this->keyfilesPath
-		, $this->shareKeysPath
+			$this->userDir,
+			$this->userFilesDir,
+			$this->publicKeyDir,
+			$this->encryptionDir,
+			$this->keyfilesPath,
+			$this->shareKeysPath
 		);
 
 		// Check / create all necessary dirs
-		foreach ( $setUpDirs as $dirPath ) {
+		foreach ($setUpDirs as $dirPath) {
 
-			if ( !$this->view->file_exists( $dirPath ) ) {
+			if (!$this->view->file_exists($dirPath)) {
 
-				$this->view->mkdir( $dirPath );
+				$this->view->mkdir($dirPath);
 
 			}
 
@@ -214,8 +216,8 @@ class Util
 		// Create user keypair
 		// we should never override a keyfile
 		if (
-			!$this->view->file_exists( $this->publicKeyPath )
-			&& !$this->view->file_exists( $this->privateKeyPath )
+			!$this->view->file_exists($this->publicKeyPath)
+			&& !$this->view->file_exists($this->privateKeyPath)
 		) {
 
 			// Generate keypair
@@ -224,35 +226,44 @@ class Util
 			\OC_FileProxy::$enabled = false;
 
 			// Save public key
-			$this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
+			$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
 
 			// Encrypt private key with user pwd as passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
+			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
 
 			// Save private key
-			$this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
+			$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
 
 			\OC_FileProxy::$enabled = true;
 
 		} else {
 			// check if public-key exists but private-key is missing
-			if ( $this->view->file_exists( $this->publicKeyPath ) && !$this->view->file_exists( $this->privateKeyPath ) ) {
-				\OC_Log::write( 'Encryption library', 'public key exists but private key is missing for "' . $this->userId . '"', \OC_Log::FATAL );
-				return false;
-			} else if ( !$this->view->file_exists( $this->publicKeyPath ) && $this->view->file_exists( $this->privateKeyPath ) ) {
-				\OC_Log::write( 'Encryption library', 'private key exists but public key is missing for "' . $this->userId . '"', \OC_Log::FATAL );
+			if ($this->view->file_exists($this->publicKeyPath) && !$this->view->file_exists($this->privateKeyPath)) {
+				\OCP\Util::writeLog('Encryption library',
+					'public key exists but private key is missing for "' . $this->userId . '"', \OCP\Util::FATAL);
 				return false;
+			} else {
+				if (!$this->view->file_exists($this->publicKeyPath) && $this->view->file_exists($this->privateKeyPath)
+				) {
+					\OCP\Util::writeLog('Encryption library',
+						'private key exists but public key is missing for "' . $this->userId . '"', \OCP\Util::FATAL);
+					return false;
+				}
 			}
 		}
 
 		// If there's no record for this user's encryption preferences
-		if ( false === $this->recoveryEnabledForUser() ) {
+		if (false === $this->recoveryEnabledForUser()) {
 
 			// create database configuration
 			$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
-			$args = array( $this->userId, 'server-side', 0 );
-			$query = \OCP\DB::prepare( $sql );
-			$query->execute( $args );
+			$args = array(
+				$this->userId,
+				'server-side',
+				0
+			);
+			$query = \OCP\DB::prepare($sql);
+			$query->execute($args);
 
 		}
 
@@ -276,29 +287,29 @@ class Util
 	 */
 	public function recoveryEnabledForUser() {
 
-		$sql = 'SELECT 
-				recovery_enabled
-			FROM 
-				`*PREFIX*encryption` 
-			WHERE 
-				uid = ?';
+		$sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE  uid = ?';
 
-		$args = array( $this->userId );
+		$args = array($this->userId);
 
-		$query = \OCP\DB::prepare( $sql );
+		$query = \OCP\DB::prepare($sql);
 
-		$result = $query->execute( $args );
+		$result = $query->execute($args);
 
 		$recoveryEnabled = array();
 
-		while ( $row = $result->fetchRow() ) {
-
-			$recoveryEnabled[] = $row['recovery_enabled'];
-
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+				if (isset($row['recovery_enabled'])) {
+					$recoveryEnabled[] = $row['recovery_enabled'];
+				}
+			}
 		}
 
 		// If no record is found
-		if ( empty( $recoveryEnabled ) ) {
+		if (empty($recoveryEnabled)) {
 
 			return false;
 
@@ -316,36 +327,36 @@ class Util
 	 * @param bool $enabled Whether to enable or disable recovery
 	 * @return bool
 	 */
-	public function setRecoveryForUser( $enabled ) {
+	public function setRecoveryForUser($enabled) {
 
 		$recoveryStatus = $this->recoveryEnabledForUser();
 
 		// If a record for this user already exists, update it
-		if ( false === $recoveryStatus ) {
+		if (false === $recoveryStatus) {
 
-			$sql = 'INSERT INTO `*PREFIX*encryption` 
-					(`uid`,`mode`,`recovery_enabled`)
-				VALUES (?,?,?)';
+			$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
 
-			$args = array( $this->userId, 'server-side', $enabled );
+			$args = array(
+				$this->userId,
+				'server-side',
+				$enabled
+			);
 
 			// Create a new record instead
 		} else {
 
-			$sql = 'UPDATE 
-					*PREFIX*encryption 
-				SET 
-					recovery_enabled = ?
-				WHERE 
-					uid = ?';
+			$sql = 'UPDATE `*PREFIX*encryption` SET recovery_enabled = ? WHERE uid = ?';
 
-			$args = array( $enabled, $this->userId );
+			$args = array(
+				$enabled,
+				$this->userId
+			);
 
 		}
 
-		$query = \OCP\DB::prepare( $sql );
+		$query = \OCP\DB::prepare($sql);
 
-		if ( $query->execute( $args ) ) {
+		if ($query->execute($args)) {
 
 			return true;
 
@@ -360,50 +371,55 @@ class Util
 	/**
 	 * @brief Find all files and their encryption status within a directory
 	 * @param string $directory The path of the parent directory to search
+	 * @param bool $found the founded files if called again
 	 * @return mixed false if 0 found, array on success. Keys: name, path
 	 * @note $directory needs to be a path relative to OC data dir. e.g.
 	 *       /admin/files NOT /backup OR /home/www/oc/data/admin/files
 	 */
-	public function findEncFiles( $directory, &$found = false ) {
+	public function findEncFiles($directory, &$found = false) {
 
 		// Disable proxy - we don't want files to be decrypted before
 		// we handle them
 		\OC_FileProxy::$enabled = false;
 
-		if ( $found == false ) {
-			$found = array( 'plain' => array(), 'encrypted' => array(), 'legacy' => array() );
+		if ($found === false) {
+			$found = array(
+				'plain' => array(),
+				'encrypted' => array(),
+				'legacy' => array()
+			);
 		}
 
 		if (
-			$this->view->is_dir( $directory )
-			&& $handle = $this->view->opendir( $directory )
+			$this->view->is_dir($directory)
+			&& $handle = $this->view->opendir($directory)
 		) {
 
-			while ( false !== ( $file = readdir( $handle ) ) ) {
+			while (false !== ($file = readdir($handle))) {
 
 				if (
-					$file != "."
-					&& $file != ".."
+					$file !== "."
+					&& $file !== ".."
 				) {
 
-					$filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
-					$relPath = $this->stripUserFilesPath( $filePath );
+					$filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
+					$relPath = $this->stripUserFilesPath($filePath);
 
 					// If the path is a directory, search 
 					// its contents
-					if ( $this->view->is_dir( $filePath ) ) {
+					if ($this->view->is_dir($filePath)) {
 
-						$this->findEncFiles( $filePath, $found );
+						$this->findEncFiles($filePath, $found);
 
 						// If the path is a file, determine
 						// its encryption status
-					} elseif ( $this->view->is_file( $filePath ) ) {
+					} elseif ($this->view->is_file($filePath)) {
 
 						// Disable proxies again, some-
 						// where they got re-enabled :/
 						\OC_FileProxy::$enabled = false;
 
-						$data = $this->view->file_get_contents( $filePath );
+						$data = $this->view->file_get_contents($filePath);
 
 						// If the file is encrypted
 						// NOTE: If the userId is 
@@ -413,22 +429,31 @@ class Util
 						// scanning every file like this
 						// will eat server resources :(
 						if (
-							Keymanager::getFileKey( $this->view, $this->userId, $relPath )
-							&& Crypt::isCatfileContent( $data )
+							Keymanager::getFileKey($this->view, $this->userId, $relPath)
+							&& Crypt::isCatfileContent($data)
 						) {
 
-							$found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
+							$found['encrypted'][] = array(
+								'name' => $file,
+								'path' => $filePath
+							);
 
 							// If the file uses old
 							// encryption system
-						} elseif ( Crypt::isLegacyEncryptedContent( $this->tail( $filePath, 3 ), $relPath ) ) {
+						} elseif ( Crypt::isLegacyEncryptedContent( $data, $relPath ) ) {
 
-							$found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
+							$found['legacy'][] = array(
+								'name' => $file,
+								'path' => $filePath
+							);
 
 							// If the file is not encrypted
 						} else {
 
-							$found['plain'][] = array( 'name' => $file, 'path' => $relPath );
+							$found['plain'][] = array(
+								'name' => $file,
+								'path' => $relPath
+							);
 
 						}
 
@@ -440,7 +465,7 @@ class Util
 
 			\OC_FileProxy::$enabled = true;
 
-			if ( empty( $found ) ) {
+			if (empty($found)) {
 
 				return false;
 
@@ -463,38 +488,38 @@ class Util
 	 * @note Safe to use on large files; does not read entire file to memory
 	 * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
 	 */
-	public function tail( $filename, $numLines ) {
+	public function tail($filename, $numLines) {
 
 		\OC_FileProxy::$enabled = false;
 
 		$text = '';
 		$pos = -1;
-		$handle = $this->view->fopen( $filename, 'r' );
+		$handle = $this->view->fopen($filename, 'r');
 
-		while ( $numLines > 0 ) {
+		while ($numLines > 0) {
 
 			--$pos;
 
-			if ( fseek( $handle, $pos, SEEK_END ) !== 0 ) {
+			if (fseek($handle, $pos, SEEK_END) !== 0) {
 
-				rewind( $handle );
+				rewind($handle);
 				$numLines = 0;
 
-			} elseif ( fgetc( $handle ) === "\n" ) {
+			} elseif (fgetc($handle) === "\n") {
 
 				--$numLines;
 
 			}
 
-			$block_size = ( -$pos ) % 8192;
-			if ( $block_size === 0 || $numLines === 0 ) {
+			$block_size = (-$pos) % 8192;
+			if ($block_size === 0 || $numLines === 0) {
 
-				$text = fread( $handle, ( $block_size === 0 ? 8192 : $block_size ) ) . $text;
+				$text = fread($handle, ($block_size === 0 ? 8192 : $block_size)) . $text;
 
 			}
 		}
 
-		fclose( $handle );
+		fclose($handle);
 
 		\OC_FileProxy::$enabled = true;
 
@@ -506,7 +531,7 @@ class Util
 	 * @param $path
 	 * @return boolean
 	 */
-	public function isEncryptedPath( $path ) {
+	public function isEncryptedPath($path) {
 
 		// Disable encryption proxy so data retrieved is in its
 		// original form
@@ -515,15 +540,15 @@ class Util
 
 		// we only need 24 byte from the last chunk
 		$data = '';
-		$handle = $this->view->fopen( $path, 'r' );
-		if ( !fseek( $handle, -24, SEEK_END ) ) {
-			$data = fgets( $handle );
+		$handle = $this->view->fopen($path, 'r');
+		if (!fseek($handle, -24, SEEK_END)) {
+			$data = fgets($handle);
 		}
 
 		// re-enable proxy
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		return Crypt::isCatfileContent( $data );
+		return Crypt::isCatfileContent($data);
 
 	}
 
@@ -532,7 +557,7 @@ class Util
 	 * @param string $path absolute path
 	 * @return bool
 	 */
-	public function getFileSize( $path ) {
+	public function getFileSize($path) {
 
 		$result = 0;
 
@@ -541,33 +566,33 @@ class Util
 		\OC_FileProxy::$enabled = false;
 
 		// Reformat path for use with OC_FSV
-		$pathSplit = explode( '/', $path );
-		$pathRelative = implode( '/', array_slice( $pathSplit, 3 ) );
+		$pathSplit = explode('/', $path);
+		$pathRelative = implode('/', array_slice($pathSplit, 3));
 
-		if ( $pathSplit[2] == 'files' && $this->view->file_exists( $path ) && $this->isEncryptedPath( $path ) ) {
+		if (isset($pathSplit[2]) && $pathSplit[2] === 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
 
 			// get the size from filesystem
-			$fullPath = $this->view->getLocalFile( $path );
-			$size = filesize( $fullPath );
+			$fullPath = $this->view->getLocalFile($path);
+			$size = filesize($fullPath);
 
 			// calculate last chunk nr
-			$lastChunkNr = floor( $size / 8192 );
+			$lastChunkNr = floor($size / 8192);
 
 			// open stream
-			$stream = fopen( 'crypt://' . $pathRelative, "r" );
+			$stream = fopen('crypt://' . $pathRelative, "r");
 
-			if ( is_resource( $stream ) ) {
+			if (is_resource($stream)) {
 				// calculate last chunk position
-				$lastChunckPos = ( $lastChunkNr * 8192 );
+				$lastChunckPos = ($lastChunkNr * 8192);
 
 				// seek to end
-				fseek( $stream, $lastChunckPos );
+				fseek($stream, $lastChunckPos);
 
 				// get the content of the last chunk
-				$lastChunkContent = fread( $stream, 8192 );
+				$lastChunkContent = fread($stream, 8192);
 
 				// calc the real file size with the size of the last chunk
-				$realSize = ( ( $lastChunkNr * 6126 ) + strlen( $lastChunkContent ) );
+				$realSize = (($lastChunkNr * 6126) + strlen($lastChunkContent));
 
 				// store file size
 				$result = $realSize;
@@ -581,10 +606,10 @@ class Util
 
 	/**
 	 * @brief fix the file size of the encrypted file
-	 * @param $path absolute path
-	 * @return true / false if file is encrypted
+	 * @param string $path absolute path
+	 * @return boolean true / false if file is encrypted
 	 */
-	public function fixFileSize( $path ) {
+	public function fixFileSize($path) {
 
 		$result = false;
 
@@ -592,18 +617,18 @@ class Util
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$realSize = $this->getFileSize( $path );
+		$realSize = $this->getFileSize($path);
 
-		if ( $realSize > 0 ) {
+		if ($realSize > 0) {
 
-			$cached = $this->view->getFileInfo( $path );
+			$cached = $this->view->getFileInfo($path);
 			$cached['encrypted'] = true;
 
 			// set the size
 			$cached['unencrypted_size'] = $realSize;
 
 			// put file info
-			$this->view->putFileInfo( $path, $cached );
+			$this->view->putFileInfo($path, $cached);
 
 			$result = true;
 
@@ -618,12 +643,12 @@ class Util
 	 * @brief Format a path to be relative to the /user/files/ directory
 	 * @note e.g. turns '/admin/files/test.txt' into 'test.txt'
 	 */
-	public function stripUserFilesPath( $path ) {
+	public function stripUserFilesPath($path) {
 
-		$trimmed = ltrim( $path, '/' );
-		$split = explode( '/', $trimmed );
-		$sliced = array_slice( $split, 2 );
-		$relPath = implode( '/', $sliced );
+		$trimmed = ltrim($path, '/');
+		$split = explode('/', $trimmed);
+		$sliced = array_slice($split, 2);
+		$relPath = implode('/', $sliced);
 
 		return $relPath;
 
@@ -633,12 +658,12 @@ class Util
 	 * @param $path
 	 * @return bool
 	 */
-	public function isSharedPath( $path ) {
+	public function isSharedPath($path) {
 
-		$trimmed = ltrim( $path, '/' );
-		$split = explode( '/', $trimmed );
+		$trimmed = ltrim($path, '/');
+		$split = explode('/', $trimmed);
 
-		if ( $split[2] == "Shared" ) {
+		if (isset($split[2]) && $split[2] === 'Shared') {
 
 			return true;
 
@@ -658,97 +683,89 @@ class Util
 	 * @return bool
 	 * @note Encryption is recursive
 	 */
-	public function encryptAll( $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
+	public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null) {
 
-		if ( $found = $this->findEncFiles( $dirPath ) ) {
+		if ($found = $this->findEncFiles($dirPath)) {
 
 			// Disable proxy to prevent file being encrypted twice
 			\OC_FileProxy::$enabled = false;
 
 			// Encrypt unencrypted files
-			foreach ( $found['plain'] as $plainFile ) {
+			foreach ($found['plain'] as $plainFile) {
 
 				//relative to data/<user>/file
 				$relPath = $plainFile['path'];
 
 				//relative to /data
-				$rawPath = $this->userId . '/files/' . $plainFile['path'];
+				$rawPath = '/'.$this->userId . '/files/' . $plainFile['path'];
 
 				// Open plain file handle for binary reading
-				$plainHandle1 = $this->view->fopen( $rawPath, 'rb' );
+				$plainHandle = $this->view->fopen( $rawPath, 'rb' );
 
-				// 2nd handle for moving plain file - view->rename() doesn't work, this is a workaround
-				$plainHandle2 = $this->view->fopen( $rawPath . '.plaintmp', 'wb' );
+				// Open enc file handle for binary writing, with same filename as original plain file
+				$encHandle = fopen( 'crypt://' . $relPath.'.tmp', 'wb' );
 
 				// Move plain file to a temporary location
-				stream_copy_to_stream( $plainHandle1, $plainHandle2 );
+				$size = stream_copy_to_stream( $plainHandle, $encHandle );
 
-				// Close access to original file
-				// $this->view->fclose( $plainHandle1 ); // not implemented in view{}
-				// Delete original plain file so we can rename enc file later
-				$this->view->unlink( $rawPath );
+				fclose($encHandle);
 
-				// Open enc file handle for binary writing, with same filename as original plain file
-				$encHandle = fopen( 'crypt://' . $relPath, 'wb' );
+				$fakeRoot = $this->view->getRoot();
+				$this->view->chroot('/'.$this->userId.'/files');
 
-				// Save data from plain stream to new encrypted file via enc stream
-				// NOTE: Stream{} will be invoked for handling 
-				// the encryption, and should handle all keys 
-				// and their generation etc. automatically
-				stream_copy_to_stream( $plainHandle2, $encHandle );
+				$this->view->rename($relPath . '.tmp', $relPath);
 
-				// get file size
-				$size = $this->view->filesize( $rawPath . '.plaintmp' );
-
-				// Delete temporary plain copy of file
-				$this->view->unlink( $rawPath . '.plaintmp' );
+				$this->view->chroot($fakeRoot);
 
 				// Add the file to the cache
-				\OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
+				\OC\Files\Filesystem::putFileInfo( $relPath, array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
 			}
 
 			// Encrypt legacy encrypted files
 			if (
-				!empty( $legacyPassphrase )
-				&& !empty( $newPassphrase )
+				!empty($legacyPassphrase)
+				&& !empty($newPassphrase)
 			) {
 
-				foreach ( $found['legacy'] as $legacyFile ) {
+				foreach ($found['legacy'] as $legacyFile) {
 
 					// Fetch data from file
-					$legacyData = $this->view->file_get_contents( $legacyFile['path'] );
+					$legacyData = $this->view->file_get_contents($legacyFile['path']);
 
 					$sharingEnabled = \OCP\Share::isEnabled();
 
 					// if file exists try to get sharing users
-					if ( $this->view->file_exists( $legacyFile['path'] ) ) {
-						$uniqueUserIds = $this->getSharingUsersArray( $sharingEnabled, $legacyFile['path'], $this->userId );
+					if ($this->view->file_exists($legacyFile['path'])) {
+						$uniqueUserIds = $this->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
 					} else {
 						$uniqueUserIds[] = $this->userId;
 					}
 
 					// Fetch public keys for all users who will share the file
-					$publicKeys = Keymanager::getPublicKeys( $this->view, $uniqueUserIds );
+					$publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
 
 					// Recrypt data, generate catfile
-					$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path'] );
+					$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys );
 
 					$rawPath = $legacyFile['path'];
-					$relPath = $this->stripUserFilesPath( $rawPath );
+					$relPath = $this->stripUserFilesPath($rawPath);
 
 					// Save keyfile
-					Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['filekey'] );
+					Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
 
 					// Save sharekeys to user folders
-					Keymanager::setShareKeys( $this->view, $relPath, $recrypted['sharekeys'] );
+					Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
 
 					// Overwrite the existing file with the encrypted one
-					$this->view->file_put_contents( $rawPath, $recrypted['data'] );
+					$this->view->file_put_contents($rawPath, $recrypted['data']);
 
-					$size = strlen( $recrypted['data'] );
+					$size = strlen($recrypted['data']);
 
 					// Add the file to the cache
-					\OC\Files\Filesystem::putFileInfo( $rawPath, array( 'encrypted' => true, 'size' => $size ), '' );
+					\OC\Files\Filesystem::putFileInfo($rawPath, array(
+																	 'encrypted' => true,
+																	 'size' => $size
+																), '');
 				}
 			}
 
@@ -768,9 +785,9 @@ class Util
 	 * @param string $pathName Name of the directory to return the path of
 	 * @return string path
 	 */
-	public function getPath( $pathName ) {
+	public function getPath($pathName) {
 
-		switch ( $pathName ) {
+		switch ($pathName) {
 
 			case 'publicKeyDir':
 
@@ -812,40 +829,48 @@ class Util
 	 * @param int $fileId id of the file
 	 * @return string path of the file
 	 */
-	public static function fileIdToPath( $fileId ) {
+	public static function fileIdToPath($fileId) {
+
+		$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
 
-		$query = \OC_DB::prepare( 'SELECT `path`'
-			. ' FROM `*PREFIX*filecache`'
-			. ' WHERE `fileid` = ?' );
+		$query = \OCP\DB::prepare($sql);
 
-		$result = $query->execute( array( $fileId ) );
+		$result = $query->execute(array($fileId));
 
-		$row = $result->fetchRow();
+		$path = false;
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+				$path = substr($row['path'], strlen('files'));
+			}
+		}
 
-		return substr( $row['path'], 5 );
+		return $path;
 
 	}
 
 	/**
 	 * @brief Filter an array of UIDs to return only ones ready for sharing
 	 * @param array $unfilteredUsers users to be checked for sharing readiness
-	 * @return multi-dimensional array. keys: ready, unready
+	 * @return array as multi-dimensional array. keys: ready, unready
 	 */
-	public function filterShareReadyUsers( $unfilteredUsers ) {
+	public function filterShareReadyUsers($unfilteredUsers) {
 
 		// This array will collect the filtered IDs
 		$readyIds = $unreadyIds = array();
 
 		// Loop through users and create array of UIDs that need new keyfiles
-		foreach ( $unfilteredUsers as $user ) {
+		foreach ($unfilteredUsers as $user) {
 
-			$util = new Util( $this->view, $user );
+			$util = new Util($this->view, $user);
 
 			// Check that the user is encryption capable, or is the
 			// public system user 'ownCloud' (for public shares)
 			if (
-				$user == $this->publicShareKeyId
-				or $user == $this->recoveryKeyId
+				$user === $this->publicShareKeyId
+				or $user === $this->recoveryKeyId
 				or $util->ready()
 			) {
 
@@ -859,7 +884,8 @@ class Util
 
 				// Log warning; we can't do necessary setup here
 				// because we don't have the user passphrase
-				\OC_Log::write( 'Encryption library', '"' . $user . '" is not setup for encryption', \OC_Log::WARN );
+				\OCP\Util::writeLog('Encryption library',
+					'"' . $user . '" is not setup for encryption', \OCP\Util::WARN);
 
 			}
 
@@ -882,31 +908,31 @@ class Util
 	 * @note This was used when 2 types of encryption for keyfiles was used,
 	 *       but now we've switched to exclusively using openssl_seal()
 	 */
-	public function decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey ) {
+	public function decryptUnknownKeyfile($filePath, $fileOwner, $privateKey) {
 
 		// Get the encrypted keyfile
 		// NOTE: the keyfile format depends on how it was encrypted! At
 		// this stage we don't know how it was encrypted
-		$encKeyfile = Keymanager::getFileKey( $this->view, $this->userId, $filePath );
+		$encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath);
 
 		// We need to decrypt the keyfile
 		// Has the file been shared yet?
 		if (
-			$this->userId == $fileOwner
-			&& !Keymanager::getShareKey( $this->view, $this->userId, $filePath ) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
+			$this->userId === $fileOwner
+			&& !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
 		) {
 
 			// The file has no shareKey, and its keyfile must be 
 			// decrypted conventionally
-			$plainKeyfile = Crypt::keyDecrypt( $encKeyfile, $privateKey );
+			$plainKeyfile = Crypt::keyDecrypt($encKeyfile, $privateKey);
 
 
 		} else {
 
 			// The file has a shareKey and must use it for decryption
-			$shareKey = Keymanager::getShareKey( $this->view, $this->userId, $filePath );
+			$shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
 
-			$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+			$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
 
 		}
 
@@ -921,22 +947,24 @@ class Util
 	 * @param string $filePath path of the file to be shared
 	 * @return bool
 	 */
-	public function setSharedFileKeyfiles( Session $session, array $users, $filePath ) {
+	public function setSharedFileKeyfiles(Session $session, array $users, $filePath) {
 
 		// Make sure users are capable of sharing
-		$filteredUids = $this->filterShareReadyUsers( $users );
+		$filteredUids = $this->filterShareReadyUsers($users);
 
 		// If we're attempting to share to unready users
-		if ( !empty( $filteredUids['unready'] ) ) {
+		if (!empty($filteredUids['unready'])) {
 
-			\OC_Log::write( 'Encryption library', 'Sharing to these user(s) failed as they are unready for encryption:"' . print_r( $filteredUids['unready'], 1 ), \OC_Log::WARN );
+			\OCP\Util::writeLog('Encryption library',
+				'Sharing to these user(s) failed as they are unready for encryption:"'
+				. print_r($filteredUids['unready'], 1), \OCP\Util::WARN);
 
 			return false;
 
 		}
 
 		// Get public keys for each user, ready for generating sharekeys
-		$userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
+		$userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
 
 		// Note proxy status then disable it
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -945,22 +973,23 @@ class Util
 		// Get the current users's private key for decrypting existing keyfile
 		$privateKey = $session->getPrivateKey();
 
-		$fileOwner = \OC\Files\Filesystem::getOwner( $filePath );
+		$fileOwner = \OC\Files\Filesystem::getOwner($filePath);
 
 		// Decrypt keyfile
-		$plainKeyfile = $this->decryptUnknownKeyfile( $filePath, $fileOwner, $privateKey );
+		$plainKeyfile = $this->decryptUnknownKeyfile($filePath, $fileOwner, $privateKey);
 
 		// Re-enc keyfile to (additional) sharekeys
-		$multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
+		$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
 
 		// Save the recrypted key to it's owner's keyfiles directory
 		// Save new sharekeys to all necessary user directory
 		if (
-			!Keymanager::setFileKey( $this->view, $filePath, $fileOwner, $multiEncKey['data'] )
-			|| !Keymanager::setShareKeys( $this->view, $filePath, $multiEncKey['keys'] )
+			!Keymanager::setFileKey($this->view, $filePath, $fileOwner, $multiEncKey['data'])
+			|| !Keymanager::setShareKeys($this->view, $filePath, $multiEncKey['keys'])
 		) {
 
-			\OC_Log::write( 'Encryption library', 'Keyfiles could not be saved for users sharing ' . $filePath, \OC_Log::ERROR );
+			\OCP\Util::writeLog('Encryption library',
+				'Keyfiles could not be saved for users sharing ' . $filePath, \OCP\Util::ERROR);
 
 			return false;
 
@@ -976,11 +1005,11 @@ class Util
 	 * @brief Find, sanitise and format users sharing a file
 	 * @note This wraps other methods into a portable bundle
 	 */
-	public function getSharingUsersArray( $sharingEnabled, $filePath, $currentUserId = false ) {
+	public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false) {
 
 		// Check if key recovery is enabled
 		if (
-			\OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' )
+			\OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
 			&& $this->recoveryEnabledForUser()
 		) {
 
@@ -993,15 +1022,15 @@ class Util
 		}
 
 		// Make sure that a share key is generated for the owner too
-		list( $owner, $ownerPath ) = $this->getUidAndFilename( $filePath );
+		list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
 
 		$userIds = array();
-		if ( $sharingEnabled ) {
+		if ($sharingEnabled) {
 
 			// Find out who, if anyone, is sharing the file
-			$result = \OCP\Share::getUsersSharingFile( $ownerPath, $owner, true, true, true );
+			$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true, true, true);
 			$userIds = $result['users'];
-			if ( $result['public'] ) {
+			if ($result['public']) {
 				$userIds[] = $this->publicShareKeyId;
 			}
 
@@ -1009,10 +1038,10 @@ class Util
 
 		// If recovery is enabled, add the 
 		// Admin UID to list of users to share to
-		if ( $recoveryEnabled ) {
+		if ($recoveryEnabled) {
 
 			// Find recoveryAdmin user ID
-			$recoveryKeyId = \OC_Appconfig::getValue( 'files_encryption', 'recoveryKeyId' );
+			$recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
 
 			// Add recoveryAdmin to list of users sharing
 			$userIds[] = $recoveryKeyId;
@@ -1020,14 +1049,14 @@ class Util
 		}
 
 		// add current user if given
-		if ( $currentUserId != false ) {
+		if ($currentUserId !== false) {
 
 			$userIds[] = $currentUserId;
 
 		}
 
 		// Remove duplicate UIDs
-		$uniqueUserIds = array_unique( $userIds );
+		$uniqueUserIds = array_unique($userIds);
 
 		return $uniqueUserIds;
 
@@ -1038,20 +1067,18 @@ class Util
 	 * @param $status
 	 * @return bool
 	 */
-	public function setMigrationStatus( $status ) {
+	public function setMigrationStatus($status) {
 
-		$sql = 'UPDATE 
-				*PREFIX*encryption 
-			SET 
-				migration_status = ?
-			WHERE 
-				uid = ?';
+		$sql = 'UPDATE `*PREFIX*encryption` SET migration_status = ? WHERE uid = ?';
 
-		$args = array( $status, $this->userId );
+		$args = array(
+			$status,
+			$this->userId
+		);
 
-		$query = \OCP\DB::prepare( $sql );
+		$query = \OCP\DB::prepare($sql);
 
-		if ( $query->execute( $args ) ) {
+		if ($query->execute($args)) {
 
 			return true;
 
@@ -1071,28 +1098,29 @@ class Util
 	 */
 	public function getMigrationStatus() {
 
-		$sql = 'SELECT 
-				migration_status
-			FROM 
-				`*PREFIX*encryption` 
-			WHERE 
-				uid = ?';
+		$sql = 'SELECT `migration_status` FROM `*PREFIX*encryption`  WHERE uid = ?';
 
-		$args = array( $this->userId );
+		$args = array($this->userId);
 
-		$query = \OCP\DB::prepare( $sql );
+		$query = \OCP\DB::prepare($sql);
 
-		$result = $query->execute( $args );
+		$result = $query->execute($args);
 
 		$migrationStatus = array();
 
-		$row = $result->fetchRow();
-		if($row) {
-			$migrationStatus[] = $row['migration_status'];
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+				if (isset($row['migration_status'])) {
+					$migrationStatus[] = $row['migration_status'];
+				}
+			}
 		}
 
 		// If no record is found
-		if ( empty( $migrationStatus ) ) {
+		if (empty($migrationStatus)) {
 
 			return false;
 
@@ -1112,44 +1140,51 @@ class Util
 	 *       relative to /Shared are also acceptable
 	 * @return array
 	 */
-	public function getUidAndFilename( $path ) {
+	public function getUidAndFilename($path) {
 
-		$view = new \OC\Files\View( $this->userFilesDir );
-		$fileOwnerUid = $view->getOwner( $path );
+		$view = new \OC\Files\View($this->userFilesDir);
+		$fileOwnerUid = $view->getOwner($path);
 
 		// handle public access
-		if ( $this->isPublic ) {
+		if ($this->isPublic) {
 			$filename = $path;
 			$fileOwnerUid = $GLOBALS['fileOwner'];
 
-			return array( $fileOwnerUid, $filename );
+			return array(
+				$fileOwnerUid,
+				$filename
+			);
 		} else {
 
 			// Check that UID is valid
-			if ( !\OCP\User::userExists( $fileOwnerUid ) ) {
-				throw new \Exception( 'Could not find owner (UID = "' . var_export( $fileOwnerUid, 1 ) . '") of file "' . $path . '"' );
+			if (!\OCP\User::userExists($fileOwnerUid)) {
+				throw new \Exception(
+					'Could not find owner (UID = "' . var_export($fileOwnerUid, 1) . '") of file "' . $path . '"');
 			}
 
 			// NOTE: Bah, this dependency should be elsewhere
-			\OC\Files\Filesystem::initMountPoints( $fileOwnerUid );
+			\OC\Files\Filesystem::initMountPoints($fileOwnerUid);
 
 			// If the file owner is the currently logged in user
-			if ( $fileOwnerUid == $this->userId ) {
+			if ($fileOwnerUid === $this->userId) {
 
 				// Assume the path supplied is correct
 				$filename = $path;
 
 			} else {
 
-				$info = $view->getFileInfo( $path );
-				$ownerView = new \OC\Files\View( '/' . $fileOwnerUid . '/files' );
+				$info = $view->getFileInfo($path);
+				$ownerView = new \OC\Files\View('/' . $fileOwnerUid . '/files');
 
 				// Fetch real file path from DB
-				$filename = $ownerView->getPath( $info['fileid'] ); // TODO: Check that this returns a path without including the user data dir
+				$filename = $ownerView->getPath($info['fileid']); // TODO: Check that this returns a path without including the user data dir
 
 			}
 
-			return array( $fileOwnerUid, $filename );
+			return array(
+				$fileOwnerUid,
+				$filename
+			);
 		}
 
 
@@ -1160,26 +1195,26 @@ class Util
 	 * @param string $dir relative to the users files folder
 	 * @return array with list of files relative to the users files folder
 	 */
-	public function getAllFiles( $dir ) {
+	public function getAllFiles($dir) {
 
 		$result = array();
 
-		$content = $this->view->getDirectoryContent( $this->userFilesDir . $dir );
+		$content = $this->view->getDirectoryContent($this->userFilesDir . $dir);
 
 		// handling for re shared folders
-		$path_split = explode( '/', $dir );
+		$path_split = explode('/', $dir);
 
-		foreach ( $content as $c ) {
+		foreach ($content as $c) {
 
-			$sharedPart = $path_split[sizeof( $path_split ) - 1];
-			$targetPathSplit = array_reverse( explode( '/', $c['path'] ) );
+			$sharedPart = $path_split[sizeof($path_split) - 1];
+			$targetPathSplit = array_reverse(explode('/', $c['path']));
 
 			$path = '';
 
 			// rebuild path
-			foreach ( $targetPathSplit as $pathPart ) {
+			foreach ($targetPathSplit as $pathPart) {
 
-				if ( $pathPart !== $sharedPart ) {
+				if ($pathPart !== $sharedPart) {
 
 					$path = '/' . $pathPart . $path;
 
@@ -1193,9 +1228,9 @@ class Util
 
 			$path = $dir . $path;
 
-			if ( $c['type'] === "dir" ) {
+			if ($c['type'] === 'dir') {
 
-				$result = array_merge( $result, $this->getAllFiles( $path ) );
+				$result = array_merge($result, $this->getAllFiles($path));
 
 			} else {
 
@@ -1213,15 +1248,22 @@ class Util
 	 * @param int $id of the current share
 	 * @return array of the parent
 	 */
-	public static function getShareParent( $id ) {
+	public static function getShareParent($id) {
+
+		$sql = 'SELECT `file_target`, `item_type` FROM `*PREFIX*share` WHERE `id` = ?';
 
-		$query = \OC_DB::prepare( 'SELECT `file_target`, `item_type`'
-			. ' FROM `*PREFIX*share`'
-			. ' WHERE `id` = ?' );
+		$query = \OCP\DB::prepare($sql);
 
-		$result = $query->execute( array( $id ) );
+		$result = $query->execute(array($id));
 
-		$row = $result->fetchRow();
+		$row = array();
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+			}
+		}
 
 		return $row;
 
@@ -1232,15 +1274,22 @@ class Util
 	 * @param int $id of the current share
 	 * @return array of the parent
 	 */
-	public static function getParentFromShare( $id ) {
+	public static function getParentFromShare($id) {
 
-		$query = \OC_DB::prepare( 'SELECT `parent`'
-			. ' FROM `*PREFIX*share`'
-			. ' WHERE `id` = ?' );
+		$sql = 'SELECT `parent` FROM `*PREFIX*share` WHERE `id` = ?';
 
-		$result = $query->execute( array( $id ) );
+		$query = \OCP\DB::prepare($sql);
 
-		$row = $result->fetchRow();
+		$result = $query->execute(array($id));
+
+		$row = array();
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+			}
+		}
 
 		return $row;
 
@@ -1252,23 +1301,43 @@ class Util
 	 * @internal param int $Id of a share
 	 * @return string owner
 	 */
-	public function getOwnerFromSharedFile( $id ) {
+	public function getOwnerFromSharedFile($id) {
+
+		$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
 
-		$query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
-		$source = $query->execute( array( $id ) )->fetchRow();
+		$result = $query->execute(array($id));
+
+		$source = array();
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$source = $result->fetchRow();
+			}
+		}
 
 		$fileOwner = false;
 
-		if ( isset( $source['parent'] ) ) {
+		if (isset($source['parent'])) {
 
 			$parent = $source['parent'];
 
-			while ( isset( $parent ) ) {
+			while (isset($parent)) {
+
+				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
 
-				$query = \OC_DB::prepare( 'SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1 );
-				$item = $query->execute( array( $parent ) )->fetchRow();
+				$result = $query->execute(array($parent));
 
-				if ( isset( $item['parent'] ) ) {
+				$item = array();
+				if (\OCP\DB::isError($result)) {
+					\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+				} else {
+					if($result->numRows() > 0) {
+						$item = $result->fetchRow();
+					}
+				}
+
+				if (isset($item['parent'])) {
 
 					$parent = $item['parent'];
 
@@ -1309,7 +1378,7 @@ class Util
 	 * @param $password
 	 * @return bool
 	 */
-	public function checkRecoveryPassword( $password ) {
+	public function checkRecoveryPassword($password) {
 
 		$pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
 		$pathControlData = '/control-file/controlfile.enc';
@@ -1317,16 +1386,16 @@ class Util
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$recoveryKey = $this->view->file_get_contents( $pathKey );
+		$recoveryKey = $this->view->file_get_contents($pathKey);
 
-		$decryptedRecoveryKey = Crypt::symmetricDecryptFileContent( $recoveryKey, $password );
+		$decryptedRecoveryKey = Crypt::symmetricDecryptFileContent($recoveryKey, $password);
 
-		$controlData = $this->view->file_get_contents( $pathControlData );
-		$decryptedControlData = Crypt::keyDecrypt( $controlData, $decryptedRecoveryKey );
+		$controlData = $this->view->file_get_contents($pathControlData);
+		$decryptedControlData = Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if ( $decryptedControlData === 'ownCloud' ) {
+		if ($decryptedControlData === 'ownCloud') {
 			return true;
 		}
 
@@ -1343,19 +1412,20 @@ class Util
 	/**
 	 * @brief add recovery key to all encrypted files
 	 */
-	public function addRecoveryKeys( $path = '/' ) {
-		$dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
-		foreach ( $dirContent as $item ) {
+	public function addRecoveryKeys($path = '/') {
+		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		foreach ($dirContent as $item) {
 			// get relative path from files_encryption/keyfiles/
-			$filePath = substr( $item['path'], strlen('files_encryption/keyfiles') );
-			if ( $item['type'] == 'dir' ) {
-				$this->addRecoveryKeys( $filePath . '/' );
+			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+			if ($item['type'] === 'dir') {
+				$this->addRecoveryKeys($filePath . '/');
 			} else {
-				$session = new Session( new \OC_FilesystemView( '/' ) );
+				$session = new \OCA\Encryption\Session(new \OC_FilesystemView('/'));
 				$sharingEnabled = \OCP\Share::isEnabled();
-				$file = substr( $filePath, 0, -4 );
-				$usersSharing = $this->getSharingUsersArray( $sharingEnabled, $file );
-				$this->setSharedFileKeyfiles( $session, $usersSharing, $file );
+				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+				$file = substr($filePath, 0, -4);
+				$usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
+				$this->setSharedFileKeyfiles($session, $usersSharing, $file);
 			}
 		}
 	}
@@ -1363,16 +1433,17 @@ class Util
 	/**
 	 * @brief remove recovery key to all encrypted files
 	 */
-	public function removeRecoveryKeys( $path = '/' ) {
-		$dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
-		foreach ( $dirContent as $item ) {
+	public function removeRecoveryKeys($path = '/') {
+		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		foreach ($dirContent as $item) {
 			// get relative path from files_encryption/keyfiles
-			$filePath = substr( $item['path'], strlen('files_encryption/keyfiles') );
-			if ( $item['type'] == 'dir' ) {
-				$this->removeRecoveryKeys( $filePath . '/' );
+			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+			if ($item['type'] === 'dir') {
+				$this->removeRecoveryKeys($filePath . '/');
 			} else {
-				$file = substr( $filePath, 0, -4 );
-				$this->view->unlink( $this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey' );
+				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+				$file = substr($filePath, 0, -4);
+				$this->view->unlink($this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey');
 			}
 		}
 	}
@@ -1382,39 +1453,43 @@ class Util
 	 * @param string $file
 	 * @param string $privateKey recovery key to decrypt the file
 	 */
-	private function recoverFile( $file, $privateKey ) {
+	private function recoverFile($file, $privateKey) {
 
 		$sharingEnabled = \OCP\Share::isEnabled();
 
 		// Find out who, if anyone, is sharing the file
-		if ( $sharingEnabled ) {
-			$result = \OCP\Share::getUsersSharingFile( $file, $this->userId, true, true, true );
+		if ($sharingEnabled) {
+			$result = \OCP\Share::getUsersSharingFile($file, $this->userId, true, true, true);
 			$userIds = $result['users'];
 			$userIds[] = $this->recoveryKeyId;
-			if ( $result['public'] ) {
+			if ($result['public']) {
 				$userIds[] = $this->publicShareKeyId;
 			}
 		} else {
-			$userIds = array( $this->userId, $this->recoveryKeyId );
+			$userIds = array(
+				$this->userId,
+				$this->recoveryKeyId
+			);
 		}
-		$filteredUids = $this->filterShareReadyUsers( $userIds );
+		$filteredUids = $this->filterShareReadyUsers($userIds);
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		//decrypt file key
-		$encKeyfile = $this->view->file_get_contents( $this->keyfilesPath . $file . ".key" );
-		$shareKey = $this->view->file_get_contents( $this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey" );
-		$plainKeyfile = Crypt::multiKeyDecrypt( $encKeyfile, $shareKey, $privateKey );
+		$encKeyfile = $this->view->file_get_contents($this->keyfilesPath . $file . ".key");
+		$shareKey = $this->view->file_get_contents(
+			$this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey");
+		$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
 		// encrypt file key again to all users, this time with the new public key for the recovered use
-		$userPubKeys = Keymanager::getPublicKeys( $this->view, $filteredUids['ready'] );
-		$multiEncKey = Crypt::multiKeyEncrypt( $plainKeyfile, $userPubKeys );
+		$userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+		$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
 
 		// write new keys to filesystem TDOO!
-		$this->view->file_put_contents( $this->keyfilesPath . $file . '.key', $multiEncKey['data'] );
-		foreach ( $multiEncKey['keys'] as $userId => $shareKey ) {
+		$this->view->file_put_contents($this->keyfilesPath . $file . '.key', $multiEncKey['data']);
+		foreach ($multiEncKey['keys'] as $userId => $shareKey) {
 			$shareKeyPath = $this->shareKeysPath . $file . '.' . $userId . '.shareKey';
-			$this->view->file_put_contents( $shareKeyPath, $shareKey );
+			$this->view->file_put_contents($shareKeyPath, $shareKey);
 		}
 
 		// Return proxy to original status
@@ -1426,15 +1501,17 @@ class Util
 	 * @param string $path to look for files keys
 	 * @param string $privateKey private recovery key which is used to decrypt the files
 	 */
-	private function recoverAllFiles( $path, $privateKey ) {
-		$dirContent = $this->view->getDirectoryContent( $this->keyfilesPath . $path );
-		foreach ( $dirContent as $item ) {
-			$filePath = substr( $item['path'], 25 );
-			if ( $item['type'] == 'dir' ) {
-				$this->recoverAllFiles( $filePath . '/', $privateKey );
+	private function recoverAllFiles($path, $privateKey) {
+		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		foreach ($dirContent as $item) {
+			// get relative path from files_encryption/keyfiles
+			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+			if ($item['type'] === 'dir') {
+				$this->recoverAllFiles($filePath . '/', $privateKey);
 			} else {
-				$file = substr( $filePath, 0, -4 );
-				$this->recoverFile( $file, $privateKey );
+				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+				$file = substr($filePath, 0, -4);
+				$this->recoverFile($file, $privateKey);
 			}
 		}
 	}
@@ -1443,18 +1520,19 @@ class Util
 	 * @brief recover users files in case of password lost
 	 * @param string $recoveryPassword
 	 */
-	public function recoverUsersFiles( $recoveryPassword ) {
+	public function recoverUsersFiles($recoveryPassword) {
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
-		$encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $this->recoveryKeyId . '.private.key' );
-		$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $recoveryPassword );
+		$encryptedKey = $this->view->file_get_contents(
+			'/owncloud_private_key/' . $this->recoveryKeyId . '.private.key');
+		$privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $recoveryPassword);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		$this->recoverAllFiles( '/', $privateKey );
+		$this->recoverAllFiles('/', $privateKey);
 	}
 
 }
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
index 6cc5b997fdb..53676058982 100644
--- a/apps/files_encryption/settings-admin.php
+++ b/apps/files_encryption/settings-admin.php
@@ -8,16 +8,16 @@
 
 \OC_Util::checkAdminUser();
 
-$tmpl = new OCP\Template( 'files_encryption', 'settings-admin' );
+$tmpl = new OCP\Template('files_encryption', 'settings-admin');
 
 // Check if an adminRecovery account is enabled for recovering files after lost pwd
-$view = new OC_FilesystemView( '' );
+$view = new OC_FilesystemView('');
 
-$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
 
-$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );
+$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
 
-\OCP\Util::addscript( 'files_encryption', 'settings-admin' );
-\OCP\Util::addscript( 'core', 'multiselect' );
+\OCP\Util::addscript('files_encryption', 'settings-admin');
+\OCP\Util::addscript('core', 'multiselect');
 
 return $tmpl->fetchPage();
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 57f7f584523..3e96565949b 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -7,22 +7,22 @@
  */

 

 // Add CSS stylesheet

-\OC_Util::addStyle( 'files_encryption', 'settings-personal' );

- 

-$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');

+\OC_Util::addStyle('files_encryption', 'settings-personal');

+

+$tmpl = new OCP\Template('files_encryption', 'settings-personal');

 

 $user = \OCP\USER::getUser();

-$view = new \OC_FilesystemView( '/' );

-$util = new \OCA\Encryption\Util( $view, $user );

+$view = new \OC_FilesystemView('/');

+$util = new \OCA\Encryption\Util($view, $user);

 

-$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );

+$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');

 $recoveryEnabledForUser = $util->recoveryEnabledForUser();

 

-\OCP\Util::addscript( 'files_encryption', 'settings-personal' );

-\OCP\Util::addScript( 'settings', 'personal' );

+\OCP\Util::addscript('files_encryption', 'settings-personal');

+\OCP\Util::addScript('settings', 'personal');

 

-$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );

-$tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );

+$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);

+$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);

 

 return $tmpl->fetchPage();

 

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 621941c52a1..32156eea272 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -16,14 +16,16 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
 require_once realpath(dirname(__FILE__) . '/../lib/util.php');
 require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
 require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
 
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Crypt
  */
-class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
-{
+class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_CRYPT_USER1 = "test-crypt-user1";
 
 	public $userId;
 	public $pass;
@@ -39,12 +41,31 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	public $genPrivateKey;
 	public $genPublicKey;
 
-	function setUp()
-	{
+	public static function setUpBeforeClass() {
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
 
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerUserHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
+	}
+
+	function setUp() {
+		// set user id
+		\OC_User::setUserId(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+		$this->userId = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
+		$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
+
 		// set content for encrypting / decrypting in tests
 		$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
 		$this->dataShort = 'hats';
@@ -60,53 +81,29 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 		$this->view = new \OC_FilesystemView('/');
 
-		\OC_User::setUserId('admin');
-		$this->userId = 'admin';
-		$this->pass = 'admin';
-
-		$userHome = \OC_User::getHome($this->userId);
-		$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerUserHooks();
-
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// remember files_trashbin state
 		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
 
 		// we don't want to tests with app files_trashbin enabled
 		\OC_App::disable('files_trashbin');
-
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($this->userId);
-		\OC_User::setUserId($this->userId);
-
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
-		OCA\Encryption\Hooks::login($params);
-
 	}
 
-	function tearDown()
-	{
-		\OC_FileProxy::clearProxies();
-
+	function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		} else {
+		}
+		else {
 			OC_App::disable('files_trashbin');
 		}
 	}
 
-	function testGenerateKey()
-	{
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+	}
+
+	function testGenerateKey() {
 
 		# TODO: use more accurate (larger) string length for test confirmation
 
@@ -119,8 +116,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @return String
 	 */
-	function testGenerateIv()
-	{
+	function testGenerateIv() {
 
 		$iv = Encryption\Crypt::generateIv();
 
@@ -133,8 +129,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @depends testGenerateIv
 	 */
-	function testConcatIv($iv)
-	{
+	function testConcatIv($iv) {
 
 		$catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
 
@@ -157,7 +152,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 		return array(
 			'iv' => $iv
-		, 'catfile' => $catFile
+		,
+			'catfile' => $catFile
 		);
 
 	}
@@ -165,8 +161,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @depends testConcatIv
 	 */
-	function testSplitIv($testConcatIv)
-	{
+	function testSplitIv($testConcatIv) {
 
 		// Split catfile into components
 		$splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
@@ -182,8 +177,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @return string padded
 	 */
-	function testAddPadding()
-	{
+	function testAddPadding() {
 
 		$padded = Encryption\Crypt::addPadding($this->dataLong);
 
@@ -198,8 +192,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @depends testAddPadding
 	 */
-	function testRemovePadding($padded)
-	{
+	function testRemovePadding($padded) {
 
 		$noPadding = Encryption\Crypt::RemovePadding($padded);
 
@@ -207,8 +200,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testEncrypt()
-	{
+	function testEncrypt() {
 
 		$random = openssl_random_pseudo_bytes(13);
 
@@ -220,8 +212,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testDecrypt()
-	{
+	function testDecrypt() {
 
 		$random = openssl_random_pseudo_bytes(13);
 
@@ -235,8 +226,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testSymmetricEncryptFileContent()
-	{
+	function testSymmetricEncryptFileContent() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
 
@@ -251,8 +241,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testSymmetricStreamEncryptShortFileContent()
-	{
+	function testSymmetricStreamEncryptShortFileContent() {
 
 		$filename = 'tmp-' . time() . '.test';
 
@@ -281,7 +270,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
 
 		// get session
-		$session = new Encryption\Session($this->view);
+		$session = new \OCA\Encryption\Session($this->view);
 
 		// get private key
 		$privateKey = $session->getPrivateKey($this->userId);
@@ -307,8 +296,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
 	 * reassembly of its data
 	 */
-	function testSymmetricStreamEncryptLongFileContent()
-	{
+	function testSymmetricStreamEncryptLongFileContent() {
 
 		// Generate a a random filename
 		$filename = 'tmp-' . time() . '.test';
@@ -339,7 +327,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		//print_r($r);
 
 		// Join IVs and their respective data chunks
-		$e = array($r[0] . $r[1], $r[2] . $r[3], $r[4] . $r[5], $r[6] . $r[7], $r[8] . $r[9], $r[10] . $r[11]); //.$r[11], $r[12].$r[13], $r[14] );
+		$e = array(
+			$r[0] . $r[1],
+			$r[2] . $r[3],
+			$r[4] . $r[5],
+			$r[6] . $r[7],
+			$r[8] . $r[9],
+			$r[10] . $r[11]
+		); //.$r[11], $r[12].$r[13], $r[14] );
 
 		//print_r($e);
 
@@ -350,7 +345,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
 
 		// get session
-		$session = new Encryption\Session($this->view);
+		$session = new \OCA\Encryption\Session($this->view);
 
 		// get private key
 		$privateKey = $session->getPrivateKey($this->userId);
@@ -384,8 +379,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @brief Test that data that is read by the crypto stream wrapper
 	 */
-	function testSymmetricStreamDecryptShortFileContent()
-	{
+	function testSymmetricStreamDecryptShortFileContent() {
 
 		$filename = 'tmp-' . time();
 
@@ -412,8 +406,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$this->view->unlink($this->userId . '/files/' . $filename);
 	}
 
-	function testSymmetricStreamDecryptLongFileContent()
-	{
+	function testSymmetricStreamDecryptLongFileContent() {
 
 		$filename = 'tmp-' . time();
 
@@ -432,8 +425,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$this->view->unlink($this->userId . '/files/' . $filename);
 	}
 
-	function testSymmetricEncryptFileContentKeyfile()
-	{
+	function testSymmetricEncryptFileContentKeyfile() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
 
@@ -448,8 +440,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testIsEncryptedContent()
-	{
+	function testIsEncryptedContent() {
 
 		$this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
 
@@ -461,8 +452,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testMultiKeyEncrypt()
-	{
+	function testMultiKeyEncrypt() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
 
@@ -486,8 +476,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testKeyEncrypt()
-	{
+	function testKeyEncrypt() {
 
 		// Generate keypair
 		$pair1 = Encryption\Crypt::createKeypair();
@@ -507,8 +496,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @brief test encryption using legacy blowfish method
 	 */
-	function testLegacyEncryptShort()
-	{
+	function testLegacyEncryptShort() {
 
 		$crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
 
@@ -525,10 +513,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	 * @brief test decryption using legacy blowfish method
 	 * @depends testLegacyEncryptShort
 	 */
-	function testLegacyDecryptShort($crypted)
-	{
+	function testLegacyDecryptShort($crypted) {
 
-		$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+		$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
 
 		$this->assertEquals($this->dataShort, $decrypted);
 
@@ -537,8 +524,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	/**
 	 * @brief test encryption using legacy blowfish method
 	 */
-	function testLegacyEncryptLong()
-	{
+	function testLegacyEncryptLong() {
 
 		$crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
 
@@ -555,10 +541,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	 * @brief test decryption using legacy blowfish method
 	 * @depends testLegacyEncryptLong
 	 */
-	function testLegacyDecryptLong($crypted)
-	{
+	function testLegacyDecryptLong($crypted) {
 
-		$decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+		$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
 
 		$this->assertEquals($this->dataLong, $decrypted);
 
@@ -569,14 +554,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	 * @brief test generation of legacy encryption key
 	 * @depends testLegacyDecryptShort
 	 */
-	function testLegacyCreateKey()
-	{
+	function testLegacyCreateKey() {
 
 		// Create encrypted key
 		$encKey = Encryption\Crypt::legacyCreateKey($this->pass);
 
 		// Decrypt key
-		$key = Encryption\Crypt::legacyDecrypt($encKey, $this->pass);
+		$key = Encryption\Crypt::legacyBlockDecrypt($encKey, $this->pass);
 
 		$this->assertTrue(is_numeric($key));
 
@@ -589,10 +573,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 	 * @brief test decryption using legacy blowfish method
 	 * @depends testLegacyEncryptLong
 	 */
-	function testLegacyKeyRecryptKeyfileEncrypt($crypted)
-	{
+	function testLegacyKeyRecryptKeyfileEncrypt($crypted) {
 
-		$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey), $this->pass, '');
+		$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey));
 
 		$this->assertNotEquals($this->dataLong, $recrypted['data']);
 
@@ -603,8 +586,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testRenameFile()
-	{
+	function testRenameFile() {
 
 		$filename = 'tmp-' . time();
 
@@ -632,8 +614,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$view->unlink($newFilename);
 	}
 
-	function testMoveFileIntoFolder()
-	{
+	function testMoveFileIntoFolder() {
 
 		$filename = 'tmp-' . time();
 
@@ -663,8 +644,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$view->unlink($newFolder);
 	}
 
-	function testMoveFolder()
-	{
+	function testMoveFolder() {
 
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
@@ -696,11 +676,11 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 		// tear down
 		$view->unlink($newFolder);
+		$view->unlink('/newfolder');
 	}
 
-	function testChangePassphrase()
-	{
-	$filename = 'tmp-' . time();
+	function testChangePassphrase() {
+		$filename = 'tmp-' . time();
 
 		// Save long data as encrypted file using stream wrapper
 		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
@@ -733,8 +713,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$view->unlink($filename);
 	}
 
-	function testViewFilePutAndGetContents()
-	{
+	function testViewFilePutAndGetContents() {
 
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
@@ -765,8 +744,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$view->unlink($filename);
 	}
 
-	function testTouchExistingFile()
-	{
+	function testTouchExistingFile() {
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
@@ -787,8 +765,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$view->unlink($filename);
 	}
 
-	function testTouchFile()
-	{
+	function testTouchFile() {
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
@@ -809,8 +786,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 		$view->unlink($filename);
 	}
 
-	function testFopenFile()
-	{
+	function testFopenFile() {
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
diff --git a/apps/files_encryption/tests/encryption.key b/apps/files_encryption/tests/encryption.key
index 4495cee78e2..4ee962145c2 100644
--- a/apps/files_encryption/tests/encryption.key
+++ b/apps/files_encryption/tests/encryption.key
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index b1bae673e82..40ae1659a55 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -20,8 +20,7 @@ use OCA\Encryption;
 /**
  * Class Test_Encryption_Keymanager
  */
-class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
-{
+class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 	public $userId;
 	public $pass;
@@ -33,14 +32,35 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 	public $randomKey;
 	public $dataShort;
 
-	function setUp()
-	{
+	public static function setUpBeforeClass() {
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
 
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// disable file proxy by default
 		\OC_FileProxy::$enabled = false;
 
+		// setup filesystem
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		\OC\Files\Filesystem::tearDown();
+		\OC_Util::setupFS('admin');
+		\OC_User::setUserId('admin');
+
+		// login admin
+		$params['uid'] = 'admin';
+		$params['password'] = 'admin';
+		OCA\Encryption\Hooks::login($params);
+	}
+
+	function setUp() {
 		// set content for encrypting / decrypting in tests
 		$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
 		$this->dataShort = 'hats';
@@ -62,44 +82,28 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 		$userHome = \OC_User::getHome($this->userId);
 		$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
 
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// remember files_trashbin state
 		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
 
 		// we don't want to tests with app files_trashbin enabled
 		\OC_App::disable('files_trashbin');
-
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($this->userId);
-		\OC_User::setUserId($this->userId);
-
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
-		OCA\Encryption\Hooks::login($params);
 	}
 
-	function tearDown()
-	{
-
-		\OC_FileProxy::$enabled = true;
-		\OC_FileProxy::clearProxies();
-
+	function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		} else {
+		}
+		else {
 			OC_App::disable('files_trashbin');
 		}
 	}
 
-	function testGetPrivateKey()
-	{
+	public static function tearDownAfterClass() {
+		\OC_FileProxy::$enabled = true;
+	}
+
+	function testGetPrivateKey() {
 
 		$key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
 
@@ -115,8 +119,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testGetPublicKey()
-	{
+	function testGetPublicKey() {
 
 		$publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
 
@@ -129,8 +132,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 		$this->assertArrayHasKey('key', $sslInfo);
 	}
 
-	function testSetFileKey()
-	{
+	function testSetFileKey() {
 
 		# NOTE: This cannot be tested until we are able to break out 
 		# of the FileSystemView data directory root
@@ -163,8 +165,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testGetUserKeys()
-	{
+	function testGetUserKeys() {
 
 		$keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
 
@@ -187,8 +188,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 		$this->assertArrayHasKey('key', $sslInfoPrivate);
 	}
 
-	function testFixPartialFilePath()
-	{
+	function testFixPartialFilePath() {
 
 		$partFilename = 'testfile.txt.part';
 		$filename = 'testfile.txt';
@@ -202,8 +202,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 		$this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
 	}
 
-	function testRecursiveDelShareKeys()
-	{
+	function testRecursiveDelShareKeys() {
 
 		// generate filename
 		$filename = '/tmp-' . time() . '.txt';
@@ -230,7 +229,8 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase
 		Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
 
 		// check if share key not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
 
 		// enable encryption proxy
 		$proxyStatus = \OC_FileProxy::$enabled;
diff --git a/apps/files_encryption/tests/legacy-encrypted-text.txt b/apps/files_encryption/tests/legacy-encrypted-text.txt
index d38cb7d1b0d..1f5087178cd 100644
--- a/apps/files_encryption/tests/legacy-encrypted-text.txt
+++ b/apps/files_encryption/tests/legacy-encrypted-text.txt
@@ -1 +1 @@
-
�ߕ�t�.���dS@t9�QJ
\ No newline at end of file
+�5���ǡi���Zg�ESl�F=����
\ No newline at end of file
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 1d0cbfbc1de..6d92881ceb0 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -29,14 +29,20 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
 require_once realpath(dirname(__FILE__) . '/../lib/util.php');
 require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
 require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
 
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Share
  */
-class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
-{
+class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_SHARE_USER1 = "test-share-user1";
+	const TEST_ENCRYPTION_SHARE_USER2 = "test-share-user2";
+	const TEST_ENCRYPTION_SHARE_USER3 = "test-share-user3";
+	const TEST_ENCRYPTION_SHARE_USER4 = "test-share-user4";
+	const TEST_ENCRYPTION_SHARE_GROUP1 = "test-share-group1";
 
 	public $stateFilesTrashbin;
 	public $filename;
@@ -49,24 +55,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 	public $subfolder;
 	public $subsubfolder;
 
-	function setUp()
-	{
+	public static function setUpBeforeClass() {
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
 
-		$this->dataShort = 'hats';
-		$this->view = new \OC_FilesystemView('/');
-
-		$userHome = \OC_User::getHome('admin');
-		$this->dataDir = str_replace('/admin', '', $userHome);
-
-		$this->folder1 = '/folder1';
-		$this->subfolder = '/subfolder1';
-		$this->subsubfolder = '/subsubfolder1';
-
-		$this->filename = 'share-tmp.test';
-
 		// enable resharing
 		\OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
 
@@ -81,52 +74,66 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		// Filesystem related hooks
 		\OCA\Encryption\Helper::registerFilesystemHooks();
 
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
-		// remember files_trashbin state
-		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+		// create users
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, true);
+
+		// create group and assign users
+		\OC_Group::createGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+		\OC_Group::addToGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+		\OC_Group::addToGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+	}
+
+	function setUp() {
+		$this->dataShort = 'hats';
+		$this->view = new \OC_FilesystemView('/');
+
+		$this->folder1 = '/folder1';
+		$this->subfolder = '/subfolder1';
+		$this->subsubfolder = '/subsubfolder1';
+
+		$this->filename = 'share-tmp.test';
 
 		// we don't want to tests with app files_trashbin enabled
 		\OC_App::disable('files_trashbin');
 
-		// create users
-		$this->loginHelper('user1', true);
-		$this->loginHelper('user2', true);
-		$this->loginHelper('user3', true);
-
-		// create group and assign users
-		\OC_Group::createGroup('group1');
-		\OC_Group::addToGroup('user2', 'group1');
-		\OC_Group::addToGroup('user3', 'group1');
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
 	}
 
-	function tearDown()
-	{
+	function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		} else {
+		}
+		else {
 			OC_App::disable('files_trashbin');
 		}
+	}
 
+	public static function tearDownAfterClass() {
 		// clean group
-		\OC_Group::deleteGroup('group1');
+		\OC_Group::deleteGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
 
 		// cleanup users
-		\OC_User::deleteUser('user1');
-		\OC_User::deleteUser('user2');
-		\OC_User::deleteUser('user3');
-
-		\OC_FileProxy::clearProxies();
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
 	}
 
 	/**
 	 * @param bool $withTeardown
 	 */
-	function testShareFile($withTeardown = true)
-	{
+	function testShareFile($withTeardown = true) {
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
@@ -139,7 +146,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = false;
 
 		// get the file info from previous created file
-		$fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 		// check if we have a valid file info
 		$this->assertTrue(is_array($fileInfo));
@@ -151,19 +159,22 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user1 exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// login as user1
-		$this->loginHelper('user1');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// get file contents
-		$retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared/' . $this->filename);
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared/' . $this->filename);
 
 		// check if data is the same as we previously written
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
@@ -172,49 +183,57 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		if ($withTeardown) {
 
 			// login as admin
-			$this->loginHelper('admin');
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// unshare the file
-			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
-			$this->view->unlink('/admin/files/' . $this->filename);
+			$this->view->unlink(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 	}
 
 	/**
 	 * @param bool $withTeardown
 	 */
-	function testReShareFile($withTeardown = true)
-	{
+	function testReShareFile($withTeardown = true) {
 		$this->testShareFile(false);
 
 		// login as user1
-		$this->loginHelper('user1');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// get the file info
-		$fileInfo = $this->view->getFileInfo('/user1/files/Shared/' . $this->filename);
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared/' . $this->filename);
 
 		// share the file with user2
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user2 exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// login as user2
-		$this->loginHelper('user2');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 		// get file contents
-		$retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared/' . $this->filename);
 
 		// check if data is the same as previously written
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
@@ -223,28 +242,35 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		if ($withTeardown) {
 
 			// login as user1
-			$this->loginHelper('user1');
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// unshare the file with user2
-			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 			// login as admin
-			$this->loginHelper('admin');
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 			// unshare the file with user1
-			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
-			$this->view->unlink('/admin/files/' . $this->filename);
+			$this->view->unlink(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 	}
 
@@ -252,18 +278,21 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 	 * @param bool $withTeardown
 	 * @return array
 	 */
-	function testShareFolder($withTeardown = true)
-	{
+	function testShareFolder($withTeardown = true) {
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// create folder structure
-		$this->view->mkdir('/admin/files' . $this->folder1);
-		$this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
-		$this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+		$this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+			. $this->subsubfolder);
 
 		// save file with content
-		$cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
+		$cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+										 . $this->filename, $this->dataShort);
 
 		// test that data was successfully written
 		$this->assertTrue(is_int($cryptedFile));
@@ -273,7 +302,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = false;
 
 		// get the file info from previous created folder
-		$fileInfo = $this->view->getFileInfo('/admin/files' . $this->folder1);
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
 
 		// check if we have a valid file info
 		$this->assertTrue(is_array($fileInfo));
@@ -282,19 +312,24 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the folder with user1
-		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1', OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user1 exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// login as user1
-		$this->loginHelper('user1');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// get file contents
-		$retrievedCryptedFile = $this->view->file_get_contents('/user1/files/Shared' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/' . $this->filename);
 
 		// check if data is the same
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
@@ -303,19 +338,25 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		if ($withTeardown) {
 
 			// login as admin
-			$this->loginHelper('admin');
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// unshare the folder with user1
-			\OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+			\OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
-			$this->view->unlink('/admin/files' . $this->folder1);
+			$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 
 		return $fileInfo;
@@ -324,19 +365,20 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 	/**
 	 * @param bool $withTeardown
 	 */
-	function testReShareFolder($withTeardown = true)
-	{
+	function testReShareFolder($withTeardown = true) {
 		$fileInfoFolder1 = $this->testShareFolder(false);
 
 		// login as user1
-		$this->loginHelper('user1');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		// get the file info from previous created folder
-		$fileInfoSubFolder = $this->view->getFileInfo('/user1/files/Shared' . $this->folder1 . $this->subfolder);
+		$fileInfoSubFolder = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared' . $this->folder1
+			. $this->subfolder);
 
 		// check if we have a valid file info
 		$this->assertTrue(is_array($fileInfoSubFolder));
@@ -345,43 +387,54 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file with user2
-		\OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2', OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user2 exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// login as user2
-		$this->loginHelper('user2');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 		// get file contents
-		$retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared' . $this->subfolder
+			. $this->subsubfolder . '/' . $this->filename);
 
 		// check if data is the same
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
 
 		// get the file info
-		$fileInfo = $this->view->getFileInfo('/user2/files/Shared' . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared' . $this->subfolder
+			. $this->subsubfolder . '/' . $this->filename);
 
 		// check if we have fileInfos
 		$this->assertTrue(is_array($fileInfo));
 
 		// share the file with user3
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3', OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user3 exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// login as user3
-		$this->loginHelper('user3');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
 
 		// get file contents
-		$retrievedCryptedFile = $this->view->file_get_contents('/user3/files/Shared/' . $this->filename);
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '/files/Shared/' . $this->filename);
 
 		// check if data is the same
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
@@ -390,44 +443,57 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		if ($withTeardown) {
 
 			// login as user2
-			$this->loginHelper('user2');
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 			// unshare the file with user3
-			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user3');
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user3.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 			// login as user1
-			$this->loginHelper('user1');
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// unshare the folder with user2
-			\OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user2');
+			\OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user2.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 			// login as admin
-			$this->loginHelper('admin');
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// unshare the folder1 with user1
-			\OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, 'user1');
+			\OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
-			$this->view->unlink('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+			$this->view->unlink(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+				. $this->subsubfolder . '/' . $this->filename);
 
 			// check if share key not exists
-			$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 	}
 
-	function testPublicShareFile()
-	{
+	function testPublicShareFile() {
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
@@ -440,7 +506,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = false;
 
 		// get the file info from previous created file
-		$fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 		// check if we have a valid file info
 		$this->assertTrue(is_array($fileInfo));
@@ -455,16 +522,18 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
 
 		// check if share key for public exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $publicShareKeyId . '.shareKey'));
 
 		// some hacking to simulate public link
 		$GLOBALS['app'] = 'files_sharing';
-		$GLOBALS['fileOwner'] = 'admin';
+		$GLOBALS['fileOwner'] = \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1;
 		\OC_User::setUserId('');
 
 		// get file contents
@@ -476,25 +545,28 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		// tear down
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// unshare the file
 		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
 
 		// check if share key not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $publicShareKeyId . '.shareKey'));
 
 		// cleanup
-		$this->view->unlink('/admin/files/' . $this->filename);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 		// check if share key not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 	}
 
-	function testShareFileWithGroup()
-	{
+	function testShareFileWithGroup() {
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
@@ -507,7 +579,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = false;
 
 		// get the file info from previous created file
-		$fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 		// check if we have a valid file info
 		$this->assertTrue(is_array($fileInfo));
@@ -519,44 +592,57 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1', OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user2 and user3 exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user3.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// login as user1
-		$this->loginHelper('user2');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 		// get file contents
-		$retrievedCryptedFile = $this->view->file_get_contents('/user2/files/Shared/' . $this->filename);
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared/' . $this->filename);
 
 		// check if data is the same as we previously written
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// unshare the file
-		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1');
+		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
 
 		// check if share key not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user3.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// cleanup
-		$this->view->unlink('/admin/files/' . $this->filename);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 		// check if share key not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 
 	}
 
-	function testRecoveryFile()
-	{
+	function testRecoveryFile() {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
 		\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
 		$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
 
@@ -564,9 +650,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
-		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'admin');
+		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if recovery password match
 		$this->assertTrue($util->checkRecoveryPassword('test123'));
@@ -575,23 +661,37 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($util->setRecoveryForUser(1));
 
 		// create folder structure
-		$this->view->mkdir('/admin/files' . $this->folder1);
-		$this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder);
-		$this->view->mkdir('/admin/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+		$this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+			. $this->subsubfolder);
 
 		// save file with content
 		$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
-		$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
+		$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+										  . $this->filename, $this->dataShort);
 
 		// test that data was successfully written
 		$this->assertTrue(is_int($cryptedFile1));
 		$this->assertTrue(is_int($cryptedFile2));
 
 		// check if share key for admin and recovery exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.admin.shareKey'));
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.admin.shareKey'));
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 
 		// disable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(0));
@@ -600,8 +700,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		$util->removeRecoveryKeys('/');
 
 		// check if share key for recovery not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 
 		// enable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(1));
@@ -610,26 +715,35 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		$util->addRecoveryKeys('/');
 
 		// check if share key for admin and recovery exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 
 		// cleanup
-		$this->view->unlink('/admin/files/' . $this->filename);
-		$this->view->unlink('/admin/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->folder1);
 
 		// check if share key for recovery not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 
 		$this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
 		$this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
 		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
 	}
 
-	function testRecoveryForUser()
-	{
+	function testRecoveryForUser() {
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
 		$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
@@ -638,58 +752,83 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
 
 		// login as user1
-		$this->loginHelper('user1');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
-		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'user1');
+		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// enable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(1));
 
 		// create folder structure
-		$this->view->mkdir('/user1/files' . $this->folder1);
-		$this->view->mkdir('/user1/files' . $this->folder1 . $this->subfolder);
-		$this->view->mkdir('/user1/files' . $this->folder1 . $this->subfolder . $this->subsubfolder);
+		$this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder
+			. $this->subsubfolder);
 
 		// save file with content
 		$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
-		$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename, $this->dataShort);
+		$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+										  . $this->filename, $this->dataShort);
 
 		// test that data was successfully written
 		$this->assertTrue(is_int($cryptedFile1));
 		$this->assertTrue(is_int($cryptedFile2));
 
 		// check if share key for user and recovery exists
-		$this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
-		$this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
-		$this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
-		$this->assertTrue($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// change password
-		\OC_User::setPassword('user1', 'test', 'test123');
+		\OC_User::setPassword(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, 'test', 'test123');
 
 		// login as user1
-		$this->loginHelper('user1', false, 'test');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
 
 		// get file contents
 		$retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
-		$retrievedCryptedFile2 = file_get_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+		$retrievedCryptedFile2 = file_get_contents(
+			'crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
 
 		// check if data is the same as we previously written
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile1);
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile2);
 
 		// cleanup
-		$this->view->unlink('/user1/files' . $this->folder1);
-		$this->view->unlink('/user1/files' . $this->filename);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->filename);
 
 		// check if share key for user and recovery exists
-		$this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.user1.shareKey'));
-		$this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
-		$this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.user1.shareKey'));
-		$this->assertFalse($this->view->file_exists('/user1/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 
 		// enable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(0));
@@ -698,10 +837,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
 	}
 
-	function testFailShareFile()
-	{
+	function testFailShareFile() {
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
@@ -714,7 +852,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		\OC_FileProxy::$enabled = false;
 
 		// get the file info from previous created file
-		$fileInfo = $this->view->getFileInfo('/admin/files/' . $this->filename);
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 
 		// check if we have a valid file info
 		$this->assertTrue(is_array($fileInfo));
@@ -723,68 +862,50 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
 
 		// break users public key
-		$this->view->rename('/public-keys/user2.public.key', '/public-keys/user2.public.key_backup');
+		$this->view->rename('/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key',
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup');
 
 		// re-enable the file proxy
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1', OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
 
 		// login as admin
-		$this->loginHelper('admin');
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user1 not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		// break user1 public key
-		$this->view->rename('/public-keys/user2.public.key_backup', '/public-keys/user2.public.key');
+		$this->view->rename(
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup',
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key');
 
 		// remove share file
-		$this->view->unlink('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey');
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+							. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3
+							. '.shareKey');
 
 		// re-enable the file proxy
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// unshare the file with user1
-		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, 'group1');
+		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
 
 		// check if share key not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.user2.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// cleanup
-		$this->view->unlink('/admin/files/' . $this->filename);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 	}
 
-
-
-	/**
-	 * @param $user
-	 * @param bool $create
-	 * @param bool $password
-	 */
-	function loginHelper($user, $create = false, $password = false)
-	{
-		if ($create) {
-			\OC_User::createUser($user, $user);
-		}
-
-		if ($password === false) {
-			$password = $user;
-		}
-
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($user);
-		\OC_User::setUserId($user);
-
-		$params['uid'] = $user;
-		$params['password'] = $password;
-		OCA\Encryption\Hooks::login($params);
-	}
 }
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 3765d986e12..3d978767542 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -27,6 +27,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
 require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
 require_once realpath(dirname(__FILE__) . '/../lib/util.php');
 require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
 
 use OCA\Encryption;
 
@@ -34,8 +35,9 @@ use OCA\Encryption;
  * Class Test_Encryption_Stream
  * @brief this class provide basic stream tests
  */
-class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
-{
+class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_STREAM_USER1 = "test-stream-user1";
 
 	public $userId;
 	public $pass;
@@ -46,15 +48,27 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
 	public $dataShort;
 	public $stateFilesTrashbin;
 
-	function setUp()
-	{
+	public static function setUpBeforeClass() {
 		// reset backend
+		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
 
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
+	}
+
+	function setUp() {
 		// set user id
-		\OC_User::setUserId('admin');
-		$this->userId = 'admin';
-		$this->pass = 'admin';
+		\OC_User::setUserId(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
+		$this->userId = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
+		$this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
 
 		// init filesystem view
 		$this->view = new \OC_FilesystemView('/');
@@ -62,42 +76,26 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
 		// init short data
 		$this->dataShort = 'hats';
 
-		// init filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// register encryption file proxy
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// remember files_trashbin state
 		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
 
 		// we don't want to tests with app files_trashbin enabled
 		\OC_App::disable('files_trashbin');
-
-		// init filesystem for user
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($this->userId);
-		\OC_User::setUserId($this->userId);
-
-		// login user
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
-		OCA\Encryption\Hooks::login($params);
 	}
 
-	function tearDown()
-	{
+	function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		} else {
+		}
+		else {
 			OC_App::disable('files_trashbin');
 		}
+	}
 
-		// clear all proxies
-		\OC_FileProxy::clearProxies();
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
 	}
 
 	function testStreamOptions() {
@@ -113,7 +111,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
 		$handle = $view->fopen($filename, 'r');
 
 		// check if stream is at position zero
-		$this->assertEquals(0,ftell($handle));
+		$this->assertEquals(0, ftell($handle));
 
 		// set stream options
 		$this->assertTrue(flock($handle, LOCK_SH));
@@ -136,7 +134,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
 		$handle = $view->fopen($filename, 'r');
 
 		// set stream options
-		$this->assertTrue(stream_set_blocking($handle,1));
+		$this->assertTrue(stream_set_blocking($handle, 1));
 
 		// tear down
 		$view->unlink($filename);
@@ -155,7 +153,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
 		$handle = $view->fopen($filename, 'r');
 
 		// set stream options
-		$this->assertFalse(stream_set_timeout($handle,1));
+		$this->assertFalse(stream_set_timeout($handle, 1));
 
 		// tear down
 		$view->unlink($filename);
@@ -174,7 +172,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase
 		$handle = $view->fopen($filename, 'r');
 
 		// set stream options
-		$this->assertEquals(0, stream_set_write_buffer($handle,1024));
+		$this->assertEquals(0, stream_set_write_buffer($handle, 1024));
 
 		// tear down
 		$view->unlink($filename);
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index cc8709b6f24..29f8fb5a396 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -28,6 +28,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
 require_once realpath(dirname(__FILE__) . '/../lib/util.php');
 require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
 require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
 
 use OCA\Encryption;
 
@@ -35,8 +36,9 @@ use OCA\Encryption;
  * Class Test_Encryption_Trashbin
  * @brief this class provide basic trashbin app tests
  */
-class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
-{
+class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_TRASHBIN_USER1 = "test-trashbin-user1";
 
 	public $userId;
 	public $pass;
@@ -50,15 +52,33 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
 	public $subfolder;
 	public $subsubfolder;
 
-	function setUp()
-	{
+	public static function setUpBeforeClass() {
 		// reset backend
+		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
 
+		\OC_Hook::clear('OC_Filesystem');
+		\OC_Hook::clear('OC_User');
+
+		// trashbin hooks
+		\OCA\Files_Trashbin\Trashbin::registerHooks();
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1, true);
+	}
+
+	function setUp() {
 		// set user id
-		\OC_User::setUserId('admin');
-		$this->userId = 'admin';
-		$this->pass = 'admin';
+		\OC_User::setUserId(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+		$this->userId = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
+		$this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
 
 		// init filesystem view
 		$this->view = new \OC_FilesystemView('/');
@@ -70,48 +90,26 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
 		$this->subfolder = '/subfolder1';
 		$this->subsubfolder = '/subsubfolder1';
 
-		\OC_Hook::clear('OC_Filesystem');
-		\OC_Hook::clear('OC_User');
-
-		// init filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// register encryption file proxy
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
-		// trashbin hooks
-		\OCA\Files_Trashbin\Trashbin::registerHooks();
-
 		// remember files_trashbin state
 		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
 
-		// we don't want to tests with app files_trashbin enabled
+		// we want to tests with app files_trashbin enabled
 		\OC_App::enable('files_trashbin');
-
-		// init filesystem for user
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($this->userId);
-		\OC_User::setUserId($this->userId);
-
-		// login user
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
-		OCA\Encryption\Hooks::login($params);
 	}
 
-	function tearDown()
-	{
+	function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		} else {
+		}
+		else {
 			OC_App::disable('files_trashbin');
 		}
+	}
 
-		// clear all proxies
-		\OC_FileProxy::clearProxies();
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
 	}
 
 	/**
@@ -129,30 +127,40 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
 		$this->assertTrue(is_int($cryptedFile));
 
 		// check if key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
 
 		// check if share key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// delete file
 		\OC\FIles\Filesystem::unlink($filename);
 
 		// check if file not exists
-		$this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
 
 		// check if key for admin not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
 
 		// check if share key for admin not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// get files
-		$trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
+		$trashFiles = $this->view->getDirectoryContent(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
 
 		$trashFileSuffix = null;
 		// find created file with timestamp
-		foreach($trashFiles as $file) {
-			if(strncmp($file['path'], $filename, strlen($filename))) {
+		foreach ($trashFiles as $file) {
+			if (strncmp($file['path'], $filename, strlen($filename))) {
 				$path_parts = pathinfo($file['name']);
 				$trashFileSuffix = $path_parts['extension'];
 			}
@@ -162,10 +170,14 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
 		$this->assertNotNull($trashFileSuffix);
 
 		// check if key for admin not exists
-		$this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			. '.key.' . $trashFileSuffix));
 
 		// check if share key for admin not exists
-		$this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
 
 		// return filename for next test
 		return $filename . '.' . $trashFileSuffix;
@@ -182,19 +194,24 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
 		$path_parts = pathinfo($filename);
 		$trashFileSuffix = $path_parts['extension'];
 		$timestamp = str_replace('d', '', $trashFileSuffix);
-		$fileNameWithoutSuffix = str_replace('.'.$trashFileSuffix, '', $filename);
+		$fileNameWithoutSuffix = str_replace('.' . $trashFileSuffix, '', $filename);
 
 		// restore file
 		$this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename, $fileNameWithoutSuffix, $timestamp));
 
 		// check if file exists
-		$this->assertTrue($this->view->file_exists('/admin/files/' . $fileNameWithoutSuffix));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $fileNameWithoutSuffix));
 
 		// check if key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $fileNameWithoutSuffix . '.key'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
+			. $fileNameWithoutSuffix . '.key'));
 
 		// check if share key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $fileNameWithoutSuffix . '.admin.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $fileNameWithoutSuffix . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 	}
 
 	/**
@@ -212,44 +229,51 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
 		$this->assertTrue(is_int($cryptedFile));
 
 		// check if key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
 
 		// check if share key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// delete file
 		\OC\FIles\Filesystem::unlink($filename);
 
 		// check if file not exists
-		$this->assertFalse($this->view->file_exists('/admin/files/' . $filename));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
 
 		// check if key for admin not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/keyfiles/' . $filename . '.key'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
 
 		// check if share key for admin not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $filename . '.admin.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
-		// get files
-		$trashFiles = $this->view->getDirectoryContent('/admin/files_trashbin/files/');
-
-		$trashFileSuffix = null;
 		// find created file with timestamp
-		foreach($trashFiles as $file) {
-			if(strncmp($file['name'], $filename, strlen($filename)) == 0) {
-				$path_parts = pathinfo($file['name']);
-				$trashFileSuffix = $path_parts['extension'];
-				break;
-			}
-		}
+		$query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
+								 . ' WHERE `id`=?');
+		$result = $query->execute(array($filename))->fetchRow();
 
-		// check if we found the file we created
-		$this->assertNotNull($trashFileSuffix);
+		$this->assertTrue(is_array($result));
+
+		// build suffix
+		$trashFileSuffix = 'd' . $result['timestamp'];
 
 		// check if key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			. '.key.' . $trashFileSuffix));
 
 		// check if share key for admin exists
-		$this->assertTrue($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
 
 		// get timestamp from file
 		$timestamp = str_replace('d', '', $trashFileSuffix);
@@ -258,13 +282,19 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase
 		$this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
 
 		// check if key for admin not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_trashbin/files/' . $filename . '.' . $trashFileSuffix));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
+			. $trashFileSuffix));
 
 		// check if key for admin not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_trashbin/keyfiles/' . $filename . '.key.' . $trashFileSuffix));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			. '.key.' . $trashFileSuffix));
 
 		// check if share key for admin not exists
-		$this->assertFalse($this->view->file_exists('/admin/files_trashbin/share-keys/' . $filename . '.admin.shareKey.' . $trashFileSuffix));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
 	}
 
 }
\ No newline at end of file
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index a2be8a40417..0dc452a41c8 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -19,8 +19,10 @@ use OCA\Encryption;
 /**
  * Class Test_Encryption_Util
  */
-class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
-{
+class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_UTIL_USER1 = "test-util-user1";
+	const TEST_ENCRYPTION_UTIL_LEGACY_USER = "test-legacy-user";
 
 	public $userId;
 	public $encryptionDir;
@@ -40,16 +42,31 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 	public $dataShort;
 	public $legacyEncryptedData;
 	public $legacyEncryptedDataKey;
-	public $lagacyKey;
+	public $legacyKey;
+	public $stateFilesTrashbin;
 
-	function setUp()
-	{
+	public static function setUpBeforeClass() {
 		// reset backend
+		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
 
-		\OC_User::setUserId('admin');
-		$this->userId = 'admin';
-		$this->pass = 'admin';
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER, true);
+	}
+
+
+	function setUp() {
+		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+		$this->userId = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
+		$this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
 
 		// set content for encrypting / decrypting in tests
 		$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
@@ -58,7 +75,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 		$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
 		$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
 		$this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
-		$this->lagacyKey = '62829813025828180801';
+		$this->legacyKey = '30943623843030686906';
 
 		$keypair = Encryption\Crypt::createKeypair();
 
@@ -68,43 +85,42 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 		$this->publicKeyDir = '/' . 'public-keys';
 		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
 		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
-		$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
-		$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+		$this->publicKeyPath =
+			$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+		$this->privateKeyPath =
+			$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
 
 		$this->view = new \OC_FilesystemView('/');
 
-		$userHome = \OC_User::getHome($this->userId);
-		$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($this->userId);
-		\OC_User::setUserId($this->userId);
+		$this->util = new Encryption\Util($this->view, $this->userId);
 
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
-		OCA\Encryption\Hooks::login($params);
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
 
-		$this->util = new Encryption\Util($this->view, $this->userId);
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
 	}
 
-	function tearDown()
-	{
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
 
-		\OC_FileProxy::clearProxies();
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 	}
 
 	/**
 	 * @brief test that paths set during User construction are correct
 	 */
-	function testKeyPaths()
-	{
+	function testKeyPaths() {
 		$util = new Encryption\Util($this->view, $this->userId);
 
 		$this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
@@ -118,39 +134,37 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 	/**
 	 * @brief test setup of encryption directories
 	 */
-	function testSetupServerSide()
-	{
+	function testSetupServerSide() {
 		$this->assertEquals(true, $this->util->setupServerSide($this->pass));
 	}
 
 	/**
 	 * @brief test checking whether account is ready for encryption,
 	 */
-	function testUserIsReady()
-	{
+	function testUserIsReady() {
 		$this->assertEquals(true, $this->util->ready());
 	}
 
 	/**
 	 * @brief test checking whether account is not ready for encryption,
 	 */
-	function testUserIsNotReady()
-	{
-		$this->view->unlink($this->publicKeyDir);
-
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
-		$this->assertFalse(OCA\Encryption\Hooks::login($params));
-
-		$this->view->unlink($this->privateKeyPath);
-	}
+//	function testUserIsNotReady() {
+//		$this->view->unlink($this->publicKeyDir);
+//
+//		$params['uid'] = $this->userId;
+//		$params['password'] = $this->pass;
+//		$this->assertFalse(OCA\Encryption\Hooks::login($params));
+//
+//		$this->view->unlink($this->privateKeyPath);
+//	}
 
 	/**
 	 * @brief test checking whether account is not ready for encryption,
 	 */
-	function testIsLagacyUser()
-	{
-		$userView = new \OC_FilesystemView( '/' . $this->userId );
+	function testIsLegacyUser() {
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+		$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -161,19 +175,18 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
+		$params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
+		$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
 
-		$util = new Encryption\Util($this->view, $this->userId);
+		$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 		$util->setMigrationStatus(0);
 
 		$this->assertTrue(OCA\Encryption\Hooks::login($params));
 
-		$this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
+		$this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
 	}
 
-	function testRecoveryEnabledForUser()
-	{
+	function testRecoveryEnabledForUser() {
 
 		$util = new Encryption\Util($this->view, $this->userId);
 
@@ -193,10 +206,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 
 	}
 
-	function testGetUidAndFilename()
-	{
+	function testGetUidAndFilename() {
 
-		\OC_User::setUserId('admin');
+		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
 
 		$filename = 'tmp-' . time() . '.test';
 
@@ -213,9 +225,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 
 		list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
 
-		$this->assertEquals('admin', $fileOwnerUid);
+		$this->assertEquals(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, $fileOwnerUid);
 
 		$this->assertEquals($file, $filename);
+
+		$this->view->unlink($this->userId . '/files/' . $filename);
 	}
 
 	function testIsSharedPath() {
@@ -227,10 +241,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 		$this->assertFalse($this->util->isSharedPath($path));
 	}
 
-	function testEncryptLagacyFiles()
-	{
-		$userView = new \OC_FilesystemView( '/' . $this->userId);
-		$view = new \OC_FilesystemView( '/' . $this->userId . '/files' );
+	function testEncryptLegacyFiles() {
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+		$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+		$view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -250,23 +265,23 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
+		$params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
+		$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
 
-		$util = new Encryption\Util($this->view, $this->userId);
+		$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 		$util->setMigrationStatus(0);
 
 		$this->assertTrue(OCA\Encryption\Hooks::login($params));
 
-		$this->assertEquals($this->lagacyKey, $_SESSION['legacyKey']);
+		$this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
 
-		$files = $util->findEncFiles('/' . $this->userId . '/files/');
+		$files = $util->findEncFiles('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files/');
 
 		$this->assertTrue(is_array($files));
 
 		$found = false;
-		foreach($files['encrypted'] as $encryptedFile) {
-			if($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
+		foreach ($files['encrypted'] as $encryptedFile) {
+			if ($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
 				$found = true;
 				break;
 			}
@@ -274,4 +289,29 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase
 
 		$this->assertTrue($found);
 	}
-}
\ No newline at end of file
+
+	/**
+	 * @param $user
+	 * @param bool $create
+	 * @param bool $password
+	 */
+	public static function loginHelper($user, $create = false, $password = false) {
+		if ($create) {
+			\OC_User::createUser($user, $user);
+		}
+
+		if ($password === false) {
+			$password = $user;
+		}
+
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		\OC\Files\Filesystem::tearDown();
+		\OC_Util::setupFS($user);
+		\OC_User::setUserId($user);
+
+		$params['uid'] = $user;
+		$params['password'] = $password;
+		OCA\Encryption\Hooks::login($params);
+	}
+}
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 4b453d0c9d1..0b3bed93e1f 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -27,6 +27,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
 require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
 require_once realpath(dirname(__FILE__) . '/../lib/util.php');
 require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
 
 use OCA\Encryption;
 
@@ -34,8 +35,9 @@ use OCA\Encryption;
  * Class Test_Encryption_Webdav
  * @brief this class provide basic webdav tests for PUT,GET and DELETE
  */
-class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
-{
+class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_WEBDAV_USER1 = "test-webdav-user1";
 
 	public $userId;
 	public $pass;
@@ -46,15 +48,33 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 	public $dataShort;
 	public $stateFilesTrashbin;
 
-	function setUp()
-	{
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerUserHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
+	}
+
+	function setUp() {
 		// reset backend
 		\OC_User::useBackend('database');
 
 		// set user id
-		\OC_User::setUserId('admin');
-		$this->userId = 'admin';
-		$this->pass = 'admin';
+		\OC_User::setUserId(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+		$this->userId = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
+		$this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
 
 		// init filesystem view
 		$this->view = new \OC_FilesystemView('/');
@@ -62,42 +82,29 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 		// init short data
 		$this->dataShort = 'hats';
 
-		// init filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// register encryption file proxy
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// remember files_trashbin state
 		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
 
 		// we don't want to tests with app files_trashbin enabled
 		\OC_App::disable('files_trashbin');
 
-		// init filesystem for user
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($this->userId);
-		\OC_User::setUserId($this->userId);
-
-		// login user
-		$params['uid'] = $this->userId;
-		$params['password'] = $this->pass;
-		OCA\Encryption\Hooks::login($params);
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
 	}
 
-	function tearDown()
-	{
+	function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		} else {
+		}
+		else {
 			OC_App::disable('files_trashbin');
 		}
+	}
 
-		// clear all proxies
-		\OC_FileProxy::clearProxies();
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
 	}
 
 	/**
@@ -113,7 +120,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
 		$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
-		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
 		$_SERVER['CONTENT_TYPE'] = 'application/octet-stream';
 		$_SERVER['PATH_INFO'] = '/webdav' . $filename;
 		$_SERVER['CONTENT_LENGTH'] = strlen($this->dataShort);
@@ -125,10 +132,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files' . $filename));
 
 		// check if key-file was created
-		$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
 
 		// check if shareKey-file was created
-		$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
 
 		// disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -163,7 +172,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 		// set server vars
 		$_SERVER['REQUEST_METHOD'] = 'GET';
 		$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
-		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
 		$_SERVER['PATH_INFO'] = '/webdav' . $filename;
 
 		// handle webdav request
@@ -184,7 +193,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 		// set server vars
 		$_SERVER['REQUEST_METHOD'] = 'DELETE';
 		$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
-		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic YWRtaW46YWRtaW4=';
+		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
 		$_SERVER['PATH_INFO'] = '/webdav' . $filename;
 
 		// handle webdav request
@@ -194,10 +203,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 		$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files' . $filename));
 
 		// check if key-file was removed
-		$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
 
 		// check if shareKey-file was removed
-		$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
 	}
 
 	/**
@@ -229,7 +240,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase
 		$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
 
 		// And off we go!
-		if($body) {
+		if ($body) {
 			$server->httpRequest->setBody($body);
 		}
 
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index 6747faa4d43..b6638564cd8 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -71,6 +71,28 @@ class Shared_Permissions extends Permissions {
 	}
 
 	/**
+	 * get the permissions for all files in a folder
+	 *
+	 * @param int $parentId
+	 * @param string $user
+	 * @return int[]
+	 */
+	public function getDirectoryPermissions($parentId, $user) {
+		// Root of the Shared folder
+		if ($parentId === -1) {
+			return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_PERMISSIONS);
+		}
+		$permissions = $this->get($parentId, $user);
+		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `parent` = ?');
+		$result = $query->execute(array($parentId));
+		$filePermissions = array();
+		while ($row = $result->fetchRow()) {
+			$filePermissions[$row['fileid']] = $permissions;
+		}
+		return $filePermissions;
+	}
+
+	/**
 	 * remove the permissions for a file
 	 *
 	 * @param int $fileId
@@ -83,4 +105,5 @@ class Shared_Permissions extends Permissions {
 	public function removeMultiple($fileIds, $user) {
 		// Not a valid action for Shared Permissions
 	}
-}
+
+}
\ No newline at end of file
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 62948651806..07e7a4ca0c5 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -26,6 +26,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	const FORMAT_FILE_APP_ROOT = 2;
 	const FORMAT_OPENDIR = 3;
 	const FORMAT_GET_ALL = 4;
+	const FORMAT_PERMISSIONS = 5;
 
 	private $path;
 
@@ -125,6 +126,12 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				$ids[] = $item['file_source'];
 			}
 			return $ids;
+		} else if ($format === self::FORMAT_PERMISSIONS) {
+			$filePermissions = array();
+			foreach ($items as $item) {
+				$filePermissions[$item['file_source']] = $item['permissions'];
+			}
+			return $filePermissions;
 		}
 		return array();
 	}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 59598e35fa2..98d2a84fb66 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -84,7 +84,7 @@ if (isset($path)) {
 					exit();
 				} else {
 					// Save item id in session for future requests
-					$_SESSION['public_link_authenticated'] = $linkItem['id'];
+					\OC::$session->set('public_link_authenticated', $linkItem['id']);
 				}
 			} else {
 				OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
@@ -97,8 +97,8 @@ if (isset($path)) {
 
 		} else {
 			// Check if item id is set in session
-			if (!isset($_SESSION['public_link_authenticated'])
-				|| $_SESSION['public_link_authenticated'] !== $linkItem['id']
+			if ( ! \OC::$session->exists('public_link_authenticated')
+				|| \OC::$session->get('public_link_authenticated') !== $linkItem['id']
 			) {
 				// Prompt for password
 				$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index eed253d6602..691642811b7 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -93,6 +93,7 @@ $(document).ready(function() {
 		});
 
 		$('.undelete').click('click',function(event) {
+			event.preventDefault();
 			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
 			var files=getSelectedFiles('file');
 			var fileslist = JSON.stringify(files);
@@ -117,6 +118,7 @@ $(document).ready(function() {
 			});
 
 		$('.delete').click('click',function(event) {
+			event.preventDefault();
 			console.log("delete selected");
 			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
 			var files=getSelectedFiles('file');
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 29c814b5fb2..7edfe0919eb 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -79,6 +79,8 @@
 "Override UUID detection" => "Zastąp wykrywanie UUID",
 "UUID Attribute:" => "Atrybuty UUID:",
 "Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
+"Clear Username-LDAP User Mapping" => "Czyść Mapowanie użytkownika LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Czyść Mapowanie nazwy grupy LDAP",
 "Test Configuration" => "Konfiguracja testowa",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index b31fe377563..e36a1589367 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nepodarilo sa vymazať mapovania.",
 "Failed to delete the server configuration" => "Zlyhalo zmazanie nastavenia servera.",
 "The configuration is valid and the connection could be established!" => "Nastavenie je v poriadku a pripojenie je stabilné.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
 "Keep settings?" => "Ponechať nastavenia?",
 "Cannot add server configuration" => "Nemožno pridať nastavenie servera",
+"mappings cleared" => "mapovanie vymazané",
 "Success" => "Úspešné",
 "Error" => "Chyba",
 "Connection test succeeded" => "Test pripojenia bol úspešný",
@@ -72,6 +74,11 @@
 "Email Field" => "Pole email",
 "User Home Folder Naming Rule" => "Pravidlo pre nastavenie mena používateľského priečinka dát",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD.",
+"Internal Username" => "Interné používateľské meno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách bude číslo byť pridané / odobrané. Interné používateľské meno sa používa na identifikáciu používateľa interne. Je to tiež predvolený názov používateľského domovského priečinka v ownCloud. To je tiež port vzdialeného URL, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo mapovaných (pridaných) LDAP používateľov.",
+"Internal Username Attribute:" => "Atribút interného používateľského mena:",
+"Override UUID detection" => "Prepísať UUID detekciu",
+"UUID Attribute:" => "UUID atribút:",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );