diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-14 20:56:44 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-14 20:56:44 +0200 |
| commit | 4b5fb08c2cda4a13a1b81699f308d21b89f1723b (patch) | |
| tree | a1f40bb6c6bcaf4e9093c2153d0a32fefecf2b79 /apps/files_encryption/hooks/hooks.php | |
| parent | e5761d90ef223a04205ad93eea7706439ef0b60e (diff) | |
| parent | 994537a5b94826294e61231768f27964bc736ced (diff) | |
| download | nextcloud-server-4b5fb08c2cda4a13a1b81699f308d21b89f1723b.tar.gz nextcloud-server-4b5fb08c2cda4a13a1b81699f308d21b89f1723b.zip | |
Merge master into oc_preview
Diffstat (limited to 'apps/files_encryption/hooks/hooks.php')
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 741df166b70..07da839e8a2 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -40,9 +40,9 @@ class Hooks { public static function login($params) {
$l = new \OC_L10N('files_encryption');
//check if all requirements are met
- if(!Helper::checkRequirements() ) {
+ if(!Helper::checkRequirements() || !Helper::checkConfiguration() ) {
$error_msg = $l->t("Missing requirements.");
- $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
+ $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
\OC_App::disable('files_encryption');
\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
\OCP\Template::printErrorPage($error_msg, $hint);
|