From bf5d26c294dd2678b5e45590a5d40a165006a5ea Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 26 May 2010 13:03:14 +0000 Subject: [PATCH] Updated mhash check git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@18756 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/setup/class_setupStep_Checks.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc index d231c4025..dc50f43a1 100644 --- a/gosa-core/setup/class_setupStep_Checks.inc +++ b/gosa-core/setup/class_setupStep_Checks.inc @@ -93,10 +93,10 @@ class Step_Checks extends setup_step $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); /* Check for installed mhash module */ - $N = msgPool::checkingFor("mhash"); - $D = _("GOsa requires this module to make use of SSHA encryption."); - $S = msgPool::installPhpModule("mhash"); - $R = is_callable("mhash"); + $N = msgPool::checkingFor("hash method"); + $D = _("GOsa requires either 'mhash' or the 'sha1' module to make use of SSHA encryption."); + $S = msgPool::installPhpModule("mhash/sha1"); + $R = is_callable('mhash') || is_callable('sha1'); $M = FALSE; $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); -- 2.30.2