Merge pull request #14472 from owncloud/feature/wipencryptionapp

encryption 2.0 app

11 files changed, 41 insertions, 355 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 95afaf1ac0a..976d0a5c3f1 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -159,6 +159,7 @@ foreach ($forms as $index => $form) {
 if ($filesExternal) {
 	$formsAndMore[] = array('anchor' => 'files_external', 'section-name' => $l->t('External Storage'));
 }
+
 $template->assign('fileSharingSettings', $fileSharingSettings);
 $template->assign('filesExternal', $filesExternal);
 $template->assign('updaterAppPanel', $updaterAppPanel);
@@ -184,12 +185,13 @@ $formsMap = array_map(function ($form) {
 $formsAndMore = array_merge($formsAndMore, $formsMap);
 
 // add bottom hardcoded forms from the template
-$formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron'));
-$formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
-$formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'));
-$formsAndMore[] = array('anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks'));
+$formsAndMore[] = ['anchor' => 'encryptionAPI', 'section-name' => $l->t('Server Side Encryption')];
+$formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')];
+$formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server')];
+$formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')];
+$formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')];
 if ($updaterAppPanel) {
-	$formsAndMore[] = array('anchor' => 'updater', 'section-name' => $l->t('Updates'));
+	$formsAndMore[] = ['anchor' => 'updater', 'section-name' => $l->t('Updates')];
 }
 
 $template->assign('forms', $formsAndMore);
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
deleted file mode 100644
index 5925cee9dfd..00000000000
--- a/settings/ajax/decryptall.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Volkan Gezer <volkangezer@gmail.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-//encryption app needs to be loaded
-OC_App::loadApp('files_encryption');
-
-// init encryption app
-$params = array('uid' => \OCP\User::getUser(),
-				'password' => (string)$_POST['password']);
-
-$view = new OC\Files\View('/');
-$util = new \OCA\Files_Encryption\Util($view, \OCP\User::getUser());
-$l = \OC::$server->getL10N('settings');
-
-$result = $util->initEncryption($params);
-
-if ($result !== false) {
-
-	try {
-		$successful = $util->decryptAll();
-	} catch (\Exception $ex) {
-		\OCP\Util::writeLog('encryption library', "Decryption finished unexpected: " . $ex->getMessage(), \OCP\Util::ERROR);
-		$successful = false;
-	}
-
-	$util->closeEncryptionSession();
-
-	if ($successful === true) {
-		\OCP\JSON::success(array('data' => array('message' => $l->t('Files decrypted successfully'))));
-	} else {
-		\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator'))));
-	}
-} else {
-	\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, check your password and try again'))));
-}
-
diff --git a/settings/ajax/deletekeys.php b/settings/ajax/deletekeys.php
deleted file mode 100644
index 2192eb8c725..00000000000
--- a/settings/ajax/deletekeys.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = \OC::$server->getL10N('settings');
-
-$util = new \OCA\Files_Encryption\Util(new \OC\Files\View(), \OC_User::getUser());
-$result = $util->deleteBackup('decryptAll');
-
-if ($result) {
-	\OCP\JSON::success(array('data' => array('message' => $l->t('Encryption keys deleted permanently'))));
-} else {
-	\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t permanently delete your encryption keys, please check your owncloud.log or ask your administrator'))));
-}
diff --git a/settings/ajax/restorekeys.php b/settings/ajax/restorekeys.php
deleted file mode 100644
index 52c02b3aba4..00000000000
--- a/settings/ajax/restorekeys.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = \OC::$server->getL10N('settings');
-
-$util = new \OCA\Files_Encryption\Util(new \OC\Files\View(), \OC_User::getUser());
-$result = $util->restoreBackup('decryptAll');
-
-if ($result) {
-	\OCP\JSON::success(array('data' => array('message' => $l->t('Backups restored successfully'))));
-} else {
-	\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t restore your encryption keys, please check your owncloud.log or ask your administrator'))));
-}
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 1be30b725df..f041cb5b29f 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -77,16 +77,43 @@ class Controller {
 			exit();
 		}
 
-		if (\OC_App::isEnabled('files_encryption')) {
+		if (\OC_App::isEnabled('encryption')) {
 			//handle the recovery case
-			$util = new \OCA\Files_Encryption\Util(new \OC\Files\View('/'), $username);
-			$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+			$crypt = new \OCA\Encryption\Crypto\Crypt(
+				\OC::$server->getLogger(),
+				\OC::$server->getUserSession(),
+				\OC::$server->getConfig());
+			$keyStorage = \OC::$server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID);
+			$util = new \OCA\Encryption\Util(
+				new \OC\Files\View(),
+				$crypt,
+				\OC::$server->getLogger(),
+				\OC::$server->getUserSession(),
+				\OC::$server->getConfig());
+			$keyManager = new \OCA\Encryption\KeyManager(
+				$keyStorage,
+				$crypt,
+				\OC::$server->getConfig(),
+				\OC::$server->getUserSession(),
+				new \OCA\Encryption\Session(\OC::$server->getSession()),
+				\OC::$server->getLogger(),
+				$util);
+			$recovery = new \OCA\Encryption\Recovery(
+				\OC::$server->getUserSession(),
+				$crypt,
+				\OC::$server->getSecureRandom(),
+				$keyManager,
+				\OC::$server->getConfig(),
+				$keyStorage,
+				\OC::$server->getEncryptionFilesHelper(),
+				new \OC\Files\View());
+			$recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled();
 
 			$validRecoveryPassword = false;
 			$recoveryEnabledForUser = false;
 			if ($recoveryAdminEnabled) {
-				$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
-				$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+				$validRecoveryPassword = $keyManager->checkRecoveryPassword($recoveryPassword);
+				$recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser();
 			}
 
 			if ($recoveryEnabledForUser && $recoveryPassword === '') {
diff --git a/settings/js/personal.js b/settings/js/personal.js
index b269ebae3bc..43f328d2223 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -230,40 +230,6 @@ $(document).ready(function () {
 		return false;
 	});
 
-	$('button:button[name="submitDecryptAll"]').click(function () {
-		var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
-		$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
-		$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
-		OC.Encryption.decryptAll(privateKeyPassword);
-	});
-
-
-	$('button:button[name="submitRestoreKeys"]').click(function () {
-		$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
-		$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
-		OC.Encryption.restoreKeys();
-	});
-
-	$('button:button[name="submitDeleteKeys"]').click(function () {
-		$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
-		$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
-		OC.Encryption.deleteKeys();
-	});
-
-	$('#decryptAll input:password[name="privateKeyPassword"]').keyup(function (event) {
-		var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
-		if (privateKeyPassword !== '') {
-			$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", false);
-			if (event.which === 13) {
-				$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
-				$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
-				OC.Encryption.decryptAll(privateKeyPassword);
-			}
-		} else {
-			$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
-		}
-	});
-
 	var uploadparms = {
 		done: function (e, data) {
 			avatarResponseHandler(data.result);
@@ -371,47 +337,6 @@ $(document).ready(function () {
 });
 
 OC.Encryption = {
-	decryptAll: function (password) {
-		var message = t('settings', 'Decrypting files... Please wait, this can take some time.');
-		OC.Encryption.msg.start('#decryptAll .msg', message);
-		$.post('ajax/decryptall.php', {password: password}, function (data) {
-			if (data.status === "error") {
-				OC.Encryption.msg.finished('#decryptAll .msg', data);
-				$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", false);
-			} else {
-				OC.Encryption.msg.finished('#decryptAll .msg', data);
-			}
-			$('#restoreBackupKeys').removeClass('hidden');
-		});
-	},
-
-	deleteKeys: function () {
-		var message = t('settings', 'Delete encryption keys permanently.');
-		OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
-		$.post('ajax/deletekeys.php', null, function (data) {
-			if (data.status === "error") {
-				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
-				$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
-				$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
-			} else {
-				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
-			}
-		});
-	},
-
-	restoreKeys: function () {
-		var message = t('settings', 'Restore encryption keys.');
-		OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
-		$.post('ajax/restorekeys.php', {}, function (data) {
-			if (data.status === "error") {
-				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
-				$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
-				$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
-			} else {
-				OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
-			}
-		});
-	}
 };
 
 OC.Encryption.msg = {
diff --git a/settings/personal.php b/settings/personal.php
index e4d278d4f28..12b320ac001 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -59,11 +59,6 @@ $email=$config->getUserValue(OC_User::getUser(), 'settings', 'email', '');
 $userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
 
-//check if encryption was enabled in the past
-$filesStillEncrypted = OC_Util::encryptedFiles();
-$backupKeysExists = OC_Util::backupKeysExists();
-$enableDecryptAll = $filesStillEncrypted || $backupKeysExists;
-
 // array of common languages
 $commonlangcodes = array(
 	'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
@@ -120,9 +115,6 @@ $tmpl->assign('activelanguage', $userLang);
 $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
 $tmpl->assign('displayName', OC_User::getDisplayName());
-$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
-$tmpl->assign('backupKeysExists' , $backupKeysExists);
-$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted);
 $tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true));
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
 $tmpl->assign('certs', $certificateManager->listCertificates());
@@ -163,9 +155,6 @@ $formsAndMore = array_merge($formsAndMore, $formsMap);
 
 // add bottom hardcoded forms from the template
 $formsAndMore[]= array( 'anchor' => 'ssl-root-certificates', 'section-name' => $l->t('SSL root certificates') );
-if($enableDecryptAll) {
-	$formsAndMore[]= array( 'anchor' => 'encryption', 'section-name' => $l->t('Encryption') );
-}
 
 $tmpl->assign('forms', $formsAndMore);
 $tmpl->printPage();
diff --git a/settings/routes.php b/settings/routes.php
index 5a069e5a1c6..af9ac1d8eea 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -89,12 +89,6 @@ $this->create('settings_personal_changepassword', '/settings/personal/changepass
 	->action('OC\Settings\ChangePassword\Controller', 'changePersonalPassword');
 $this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
 	->actionInclude('settings/ajax/setlanguage.php');
-$this->create('settings_ajax_decryptall', '/settings/ajax/decryptall.php')
-	->actionInclude('settings/ajax/decryptall.php');
-$this->create('settings_ajax_restorekeys', '/settings/ajax/restorekeys.php')
-	->actionInclude('settings/ajax/restorekeys.php');
-$this->create('settings_ajax_deletekeys', '/settings/ajax/deletekeys.php')
-	->actionInclude('settings/ajax/deletekeys.php');
 $this->create('settings_cert_post', '/settings/ajax/addRootCertificate')
 	->actionInclude('settings/ajax/addRootCertificate.php');
 $this->create('settings_cert_remove', '/settings/ajax/removeRootCertificate')
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1b0ed66563e..1b8ab0e3819 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -295,73 +295,6 @@ if ($_['cronErrors']) {
 	</p>
 </div>
 
-<div class="section" id="shareAPI">
-	<h2><?php p($l->t('Sharing'));?></h2>
-		<p id="enable">
-			<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-				   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
-				   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
-		</p>
-
-			<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
-				<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword"
-						   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
-				<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
-
-				<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
-				       value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
-
-				<input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification"
-					value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
-
-				<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate"
-				       value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
-
-			</p>
-				<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
-					<?php p($l->t( 'Expire after ' )); ?>
-					<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
-						   value='<?php p($_['shareExpireAfterNDays']) ?>' />
-					<?php p($l->t( 'days' )); ?>
-					<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate"
-						   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
-					<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
-				</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-				   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers"
-				   value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
-			<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
-				   value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files to other users'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups"
-			       value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
-			<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
-		</p>
-			<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
-				<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px"/>
-				<br />
-				<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
-			</p>
-</div>
-
 <div class="section" id='encryptionAPI'>
 	<h2><?php p($l->t('Server Side Encryption'));?></h2>
 		<p id="enable">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 2a0b4bb0dc4..dfdc6191805 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -242,58 +242,6 @@ if($_['passwordChangeSupported']) {
 	</form>
 </div>
 
-<?php if($_['enableDecryptAll']): ?>
-<div id="encryption" class="section">
-
-	<h2>
-		<?php p( $l->t( 'Encryption' ) ); ?>
-	</h2>
-
-	<?php if($_['filesStillEncrypted']): ?>
-
-	<div id="decryptAll">
-	<?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
-	<p>
-		<input
-			type="password"
-			name="privateKeyPassword"
-			id="privateKeyPassword" />
-		<label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
-		<br />
-		<button
-			type="button"
-			disabled
-			name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
-		</button>
-		<span class="msg"></span>
-	</p>
-	<br />
-	</div>
-	<?php endif; ?>
-
-	<div id="restoreBackupKeys" <?php $_['backupKeysExists'] ? '' : print_unescaped("class='hidden'") ?>>
-
-	<?php p($l->t( "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." )); ?>
-	<p>
-		<button
-			type="button"
-			name="submitRestoreKeys"><?php p($l->t( "Restore Encryption Keys" )); ?>
-		</button>
-		<button
-			type="button"
-			name="submitDeleteKeys"><?php p($l->t( "Delete Encryption Keys" )); ?>
-		</button>
-		<span class="msg"></span>
-
-	</p>
-	<br />
-
-	</div>
-
-
-</div>
-	<?php endif; ?>
-
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br />
diff --git a/settings/users.php b/settings/users.php
index 08498edec29..0fc9fbeafc2 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -45,8 +45,8 @@ $groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager
 $groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT);
 list($adminGroup, $groups) = $groupsInfo->get();
 
-$recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
-					    $config->getAppValue( 'files_encryption', 'recoveryAdminEnabled', null );
+$recoveryAdminEnabled = OC_App::isEnabled('encryption') &&
+					    $config->getAppValue( 'encryption', 'recoveryAdminEnabled', null );
 
 if($isAdmin) {
 	$subadmins = OC_SubAdmin::getAllSubAdmins();