summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/appinfo
diff options
context:
space:
mode:
authorSam Tuke <samtuke@owncloud.com>2013-01-23 19:24:26 +0000
committerSam Tuke <samtuke@owncloud.com>2013-01-23 19:24:26 +0000
commit59ca312263d358c95b950266c678c71bf97716f3 (patch)
treede61cad1224cf80c4d370de78d85e701eff7f121 /apps/files_encryption/appinfo
parentcd832935e8b92a2461dedbd9eed92d2cd3337d92 (diff)
downloadnextcloud-server-59ca312263d358c95b950266c678c71bf97716f3.tar.gz
nextcloud-server-59ca312263d358c95b950266c678c71bf97716f3.zip
Work on util: findFiles() and encryptAll(); both close to working
Ecnryption unit tests are failing, recursion in filecache{}
Diffstat (limited to 'apps/files_encryption/appinfo')
-rw-r--r--apps/files_encryption/appinfo/app.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index cc78402d1d0..fa293f45128 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -32,7 +32,7 @@ if (
&& OCA\Encryption\Crypt::mode() == 'server'
) {
- // Force the user to re-log in if the encryption key isn't unlocked
+ // Force the user to log-in again if the encryption key isn't unlocked
// (happens when a user is logged in before the encryption app is
// enabled)
OCP\User::logout();
@@ -44,4 +44,6 @@ if (
}
OCP\App::registerAdmin( 'files_encryption', 'settings' );
-OCP\App::registerPersonal( 'files_encryption', 'settings-personal' ); \ No newline at end of file
+
+// This is disabled until client-side encryption is supported:
+// OCP\App::registerPersonal( 'files_encryption', 'settings-personal' ); \ No newline at end of file