From cfbdad9cdb5c978225af796c128e4ad7bd011eee Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 1 Aug 2013 11:50:56 +0200 Subject: catch broken server config and disable encryption app. --- apps/files_encryption/hooks/hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files_encryption/hooks/hooks.php') diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 741df166b70..e933207a9e1 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -40,7 +40,7 @@ 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.'); \OC_App::disable('files_encryption'); -- cgit v1.2.3 From 7ce03ba37c7ff45f2ee529c37469236a0a661725 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 1 Aug 2013 13:57:12 +0200 Subject: improved error message to refect openSSL PHP extension and stock openSSL configuration issues --- apps/files_encryption/hooks/hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files_encryption/hooks/hooks.php') diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index e933207a9e1..07da839e8a2 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -42,7 +42,7 @@ class Hooks { //check if all requirements are met 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); -- cgit v1.2.3