Dummy mail Mehtod for setup

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

diff --git a/ihtml/themes/default/setup_step4.tpl b/ihtml/themes/default/setup_step4.tpl
index 194b40cd4e332bc2c6144d2dc0e1660618032b4d..8c3303be3a6b78ae72bdb48d2d47c74489e59164 100644 (file)
--- a/ihtml/themes/default/setup_step4.tpl
+++ b/ihtml/themes/default/setup_step4.tpl
@@ -88,7 +88,8 @@
   <td>{t}Mail method{/t}</td>
   <td>
      <select name="mail" size="1" title="">
-        {html_options options=$mail_methods selected=$mail}
+        <option name="mail" value="disabled">{t}disabled{/t}</option>
+               {html_options options=$mail_methods selected=$mail}
      </select>
  </tr>
 </table>

diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index 4e580256da781cbe58985b38c2e40826f8177e8c..91b45e51391682603b65116169f77c8650a28e7d 100644 (file)
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -390,6 +390,7 @@ function perform_additional_checks(&$faults)
 
 function parse_contrib_conf()
 {
+
   $str                = "";
   $used_samba_version = 0;
   $query              = ""; 
@@ -429,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}']  = "";