Updated json Rop and RPC again

[gosa.git] / gosa-core / setup / class_setupStep_Checks.inc

diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index 2a4d698b51991655cb33700c64a8e1daa6ecc7b2..783ba98fd889f2b6c1333ddae5188a3d73860df2 100644 (file)
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -26,6 +26,8 @@ class Step_Checks extends setup_step
   var $config_checks= array();
   var $is_writeable = array();
   var $header_image = "images/setup/system.png";
+    
+    var $b_displayCheckbutton = TRUE;
 
   function Step_Checks()
   {
@@ -93,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 );
 
@@ -110,7 +112,7 @@ class Step_Checks extends setup_step
 
     /* Is imap module available */
     $N = msgPool::checkingFor(_("mbstring"));
-    $D = _("GOsa requires this module to handle unicode strings.");
+    $D = _("GOsa requires this module to handle Unicode strings.");
     $S = msgPool::installPhpModule("mbstring");
     $R = is_callable("mb_strlen");
     $M = TRUE;
@@ -145,7 +147,7 @@ class Step_Checks extends setup_step
 
     $N = msgPool::checkingFor(_("samba hash generator"));
     $D = _("GOsa requires this command to synchronize POSIX and samba passwords.");
-    $S = _("Deploy a gosa-si installation or install the perl Crypt::SmbHash modules.");
+    $S = _("Deploy a gosa-si installation or install the Perl Crypt::SmbHash modules.");
     $R = $have_mkntpwd;
     $M = TRUE;
     $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
@@ -213,7 +215,7 @@ class Step_Checks extends setup_step
 
     /* Check if memory limit is set to 32 or > */
     $N = "memory_limit &gt;= <b>32</b>";
-    $D = _("GOsa needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducable! Increase it for larger setups.");
+    $D = _("GOsa needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducible! Increase it for larger setups.");
     $S = _("Search for 'memory_limit' in your php.ini and set it to '32M' or higher.");
     $R = ini_get('memory_limit') >= 32 ;
     $M = TRUE;
@@ -264,9 +266,9 @@ class Step_Checks extends setup_step
      */
 
     /* Check if we can create a config file.*/
-    $N = _("Configuration writeable");
+    $N = _("Configuration writable");
     $D = _("The configuration file can't be written");
-    $S = sprintf(_("GOsa reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writeable."),CONFIG_DIR,CONFIG_FILE); 
+    $S = sprintf(_("GOsa reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writable."),CONFIG_DIR,CONFIG_FILE); 
     $R =    ( file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR."/".CONFIG_FILE)) // is there a config file ? 
         ||  (!file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR));  // There is non, but can we create a file there ?
     $M = FALSE;