From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 26 May 2010 12:31:23 +0000 (+0000)
Subject: Updated mhash check
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=17445e27e639753d38b8cde6d5f478b999670bbf;p=gosa.git

Updated mhash check
-Ensure that either 'mhash' or 'sha1' is installed


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18753 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index 15f224c6b..67336dd70 100644
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -95,10 +95,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 );