Moved mail settings to config step 2

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

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index c2a0449b5d21f660c01df305ef1e6da5d2f39181..91bf20f8d938b54cc84e27e9e6f8c0e4e395182a 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -33,10 +33,8 @@ class Step_Config1 extends setup_step
   var $base_hook_active  = FALSE; 
 
   var $encryption = "crypt";
-  var $mail       = "none";
   var $theme      = "default"; 
   var $errorlvl   = FALSE;
-  var $cyrusunixstyle = FALSE;
 
   var $pwd_rules  = array("pwminlen" => 6, 
                           "pwminlen_active" => FALSE,
@@ -45,14 +43,9 @@ class Step_Config1 extends setup_step
                           "externalpwdhook" => "/path/to/your/script username oldpassword newpassword",
                           "externalpwdhook_active" => FALSE);
 
-  var $mail_settings = array("vacationdir"        => "/etc/gosa/vacation",
-                             "vacationdir_active" => FALSE);
- 
   var $crypt_methods  = array();
-  var $mail_methods   = array();
 
-
-  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","mail","theme","errorlvl","cyrusunixstyle",
+  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl",
                           "base_hook","base_hook_active");
 
   function Step_Config1()
@@ -63,10 +56,6 @@ class Step_Config1 extends setup_step
     foreach($tmp['name'] as $name){
       $this->crypt_methods[$name] = $name;
     }
-    $tmp = $this->get_available_mail_classes();
-    foreach($tmp['name'] as $name){
-      $this->mail_methods[$name] = $name;
-    }
   }
 
 
@@ -83,10 +72,8 @@ class Step_Config1 extends setup_step
     $smarty = get_smarty();
     $smarty->assign("peopledns",array("uid","cn"));
     $smarty->assign("crypt_methods",$this->crypt_methods);
-    $smarty->assign("mail_methods",$this->mail_methods);
     $smarty->assign("themes",$this->get_themes());
     $smarty->assign("pwd_rules",$this->pwd_rules);
-    $smarty->assign("mail_settings",$this->mail_settings);
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
@@ -95,30 +82,6 @@ class Step_Config1 extends setup_step
   }
 
 
-  /* Returns the classnames auf the mail classes */
-  function get_available_mail_classes()
-  {
-    $dir = opendir( "../include");
-    $methods = array();
-    $suffix = "class_mail-methods-";
-    $lensuf = strlen($suffix);
-    $prefix = ".inc";
-    $lenpre = strlen($prefix);
-    $i = 0;
-    while (($file = readdir($dir)) !== false){
-
-      if(stristr($file,$suffix)) {
-        $lenfile = strlen($file);
-        $methods['name'][$i] = substr($file,$lensuf,($lenfile-$lensuf)-$lenpre);
-        $methods['file'][$i] = $file;
-        $methods[$i]['file'] = $file;
-        $methods[$i]['name'] = substr($file,$lensuf,($lenfile-$lensuf)-$lenpre);
-        $i++;
-      }
-    }
-    return($methods); 
-  }
-
   function get_themes()
   {
     $dir = opendir( "../ihtml/themes/");
@@ -187,17 +150,7 @@ class Step_Config1 extends setup_step
         $this->pwd_rules['pwminlen_active'] = FALSE;
       }
 
-      /* Mail settings */
-      if(isset($_POST['vacationdir_active'])){
-        $this->mail_settings['vacationdir_active'] = TRUE;
-        if(isset($_POST['vacationdir'])){
-          $this->mail_settings['vacationdir'] = $_POST['vacationdir'];
-        }
-      }else{
-        $this->mail_settings['vacationdir_active'] = FALSE;
-      }
-
-      /* Mail settings */
+      /* External pwd settings */
       if(isset($_POST['externalpwdhook_active'])){
         $this->pwd_rules['externalpwdhook_active'] = TRUE;
         if(isset($_POST['externalpwdhook'])){
@@ -207,7 +160,7 @@ class Step_Config1 extends setup_step
         $this->pwd_rules['externalpwdhook_active'] = FALSE;
       }
 
-      /* Mail settings */
+      /* base hook settings */
       if(isset($_POST['base_hook_active'])){
         $this->pwd_rules['base_hook_active'] = TRUE;
         if(isset($_POST['base_hook'])){
@@ -231,7 +184,7 @@ class Step_Config1 extends setup_step
   function get_attributes()
   {
     $tmp = setup_step::get_attributes();
-    foreach(array("pwd_rules","mail_settings") as $attr){
+    foreach(array("pwd_rules") as $attr){
       $tmp[$attr]= $this->$attr;
     }
     return($tmp);

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 2e5039d76de2ac4a294897d20cd7e0e8a4a4eee8..7dbced6b9e39908fc326e2eace71867dfdf34b6b 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -29,6 +29,12 @@ class Step_Config2 extends setup_step
   var $account_expiration  =FALSE;
   var $header_image = "images/ldapserver.png";
 
+  var $cyrusunixstyle = FALSE;
+  var $mail       = "none";
+  var $mail_methods   = array();
+  var $mail_settings = array("vacationdir"        => "/etc/gosa/vacation",
+                             "vacationdir_active" => FALSE);
+
   var $generic_settings  = array( "idgen"         => "{%sn}-{%givenName[2-4]}",
                                   "idgen_active"  => FALSE,
                                   "minid"         => "100",
@@ -46,11 +52,15 @@ class Step_Config2 extends setup_step
                                   "samba_sid_active" => FALSE,
                                   "samba_rid"        => 1000,
                                   "samba_rid_active" => FALSE); 
-  var $attributes = array("strict","governmentmode","sambaidmapping","account_expiration");
+  var $attributes = array("strict","governmentmode","sambaidmapping","account_expiration","cyrusunixstyle","mail");
 
   function Step_Config2()
   {
     $this->update_strings();
+    $tmp = $this->get_available_mail_classes();
+    foreach($tmp['name'] as $name){
+      $this->mail_methods[$name] = $name;
+    }
   }
 
  
@@ -77,6 +87,8 @@ class Step_Config2 extends setup_step
 
     $smarty = get_smarty();
     $smarty->assign("generic_settings",$this->generic_settings);
+    $smarty->assign("mail_settings",$this->mail_settings);
+    $smarty->assign("mail_methods",$this->mail_methods);
     $smarty->assign("samba_settings",$this->samba_settings);
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
         foreach($this->attributes as $attr){
@@ -96,6 +108,16 @@ class Step_Config2 extends setup_step
         }
       }
 
+      /* Mail settings */
+      if(isset($_POST['vacationdir_active'])){
+        $this->mail_settings['vacationdir_active'] = TRUE;
+        if(isset($_POST['vacationdir'])){
+          $this->mail_settings['vacationdir'] = $_POST['vacationdir'];
+        }
+      }else{
+        $this->mail_settings['vacationdir_active'] = FALSE;
+      }
+
       if(isset($_POST['minid_active'])){
         $this->generic_settings['minid_active'] = TRUE;
         if(isset($_POST['minid'])){
@@ -189,12 +211,36 @@ class Step_Config2 extends setup_step
   function get_attributes()
   {
     $tmp = setup_step::get_attributes();
-    foreach(array("samba_settings","generic_settings") as $attr){
+    foreach(array("samba_settings","generic_settings","mail_settings") as $attr){
       $tmp[$attr]= $this->$attr;
     }
     return($tmp);
   }
 
+/* Returns the classnames auf the mail classes */
+  function get_available_mail_classes()
+  {
+    $dir = opendir( "../include");
+    $methods = array();
+    $suffix = "class_mail-methods-";
+    $lensuf = strlen($suffix);
+    $prefix = ".inc";
+    $lenpre = strlen($prefix);
+    $i = 0;
+    while (($file = readdir($dir)) !== false){
+
+      if(stristr($file,$suffix)) {
+        $lenfile = strlen($file);
+        $methods['name'][$i] = substr($file,$lensuf,($lenfile-$lensuf)-$lenpre);
+        $methods['file'][$i] = $file;
+        $methods[$i]['file'] = $file;
+        $methods[$i]['name'] = substr($file,$lensuf,($lenfile-$lensuf)-$lenpre);
+        $i++;
+      }
+    }
+    return($methods);
+  }
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 060571ba38dfd97a74289920e47c2d6f63cda53c..31b2ba89d1bebe2865a6ede2f2c26426f476a98e 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -135,50 +135,6 @@
             {/if}
         </div>
     </div>
-
-    <p><b>{t}Mail settings{/t}</b></p>
-
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Mail method{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="mail" size="1" title="">
-                <option  value="disabled">{t}disabled{/t}</option>
-                {html_options options=$mail_methods selected=$mail}
-            </select>
-        </div>
-        <div class='step4_status'>
-        </div>
-    </div>
-
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Vacation templates{/t}
-        </div>
-        <div class='step4_value'>
-            {if $mail_settings.vacationdir_active == FALSE}
-                <input type='checkbox' value='1' name='vacationdir_active'
-                    onClick='changeState("vacationdir");'>
-                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}' disabled>
-            {else}
-                <input type='checkbox' value='1' name='vacationdir_active' checked>
-                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}'  >
-            {/if}
-        </div>
-    </div>
-
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Use Cyrus UNIX style{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="cyrusunixstyle" size="1" title="">
-                       {html_options options=$bool selected=$cyrusunixstyle}
-            </select>
-        </div>
-    </div>
-
 <input type='hidden' value='1' name='step5_posted'>
 <!--
          {t}GOsa supports several encryption types for your passwords. Normally this is adjustable via user templates, but you can specify a default method to be used here, too.{/t}

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 8b3bc32275de123a45de1417e366d2496bed3b27..5cde3b4d784b3bdd7ac385570ebc4128bff47656 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -123,6 +123,57 @@
             </select>
         </div>
     </div>
+
+
+
+    <p><b>{t}Mail settings{/t}</b></p>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Mail method{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="mail" size="1" title="">
+                <option  value="disabled">{t}disabled{/t}</option>
+                {html_options options=$mail_methods selected=$mail}
+            </select>
+        </div>
+        <div class='step4_status'>
+        </div>
+    </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Vacation templates{/t}
+        </div>
+        <div class='step4_value'>
+            {if $mail_settings.vacationdir_active == FALSE}
+                <input type='checkbox' value='1' name='vacationdir_active'
+                    onClick='changeState("vacationdir");'>
+                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='vacationdir_active' checked>
+                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}'  >
+            {/if}
+        </div>
+    </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Use Cyrus UNIX style{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="cyrusunixstyle" size="1" title="">
+            {html_options options=$bool selected=$cyrusunixstyle}
+            </select>
+        </div>
+    </div>
+
+
+
+
+
+
        <div class='step4_container' style='height:12em;'>
        <p><b>{t}Snapshots / Undo{/t}</b></p>
         <div class='step4_name'  style='height:12em;width:60%;background-color:red;'>