Dummy mail Mehtod for setup

[gosa.git] / include / setup_checks.inc

diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index a3c8c146831c6e5749987516b157a140ec71924c..91b45e51391682603b65116169f77c8650a28e7d 100644 (file)
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -287,6 +287,9 @@ function perform_php_checks(&$faults)
   $msg.= check (       $faults, _("Checking for kadm5 module"),
       _("Managing users in kerberos requires the kadm5 module which is downloadable via PEAR network."),
       function_exists('kadm5_init_with_password'), FALSE);
+  $msg.= check (  $faults, _("Checking for snmp Module"),
+      _("Simple Network Management Protocol (SNMP) is required for client monitoring."),
+      function_exists('snmpgetnext'), FALSE);
   return ($msg);
 }
 
@@ -387,6 +390,7 @@ function perform_additional_checks(&$faults)
 
 function parse_contrib_conf()
 {
+
   $str                = "";
   $used_samba_version = 0;
   $query              = ""; 
@@ -426,7 +430,11 @@ function parse_contrib_conf()
   $replacements['{CRYPT}']         = $ldapconf['arr_cryptkeys'][$ldapconf['arr_crypts']];
   $replacements['{SID}\n']         = "";
   $replacements['{RIDBASE}\n']     = "";
-  $replacements['{MAILMETHOD}']    = $ldapconf['mail_methods'][$ldapconf['mail']];
+  if($ldapconf['mail'] == "disabled")
+    $replacements['{MAILMETHOD}']    = "";
+  else
+    $replacements['{MAILMETHOD}']    = $ldapconf['mail_methods'][$ldapconf['mail']];
+  if($ldapconf['mail'] == "disabled") 
   $replacements['{SMBHASH}']       = $pwdhash;
   $replacements['{GOVERNMENTMODE}']= "false"; 
   $replacements['{kolabAccount}']  = "";