Added some attributes to setup

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index e9de57bf19ea5103754b61b25358bd06e2f5de3a..6ebd81c10b40e650fee3cc29c8016b2176f335f9 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -293,6 +293,15 @@
 {/if}
 {if $cv.optional.max_ldap_query_time_active}   
                max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
+{/if}
+{if $cv.optional.noprimarygroup}
+               noprimarygroup="true"
+{/if}
+{if $cv.optional.mailQueueScriptPath_active}
+               mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}"
+{/if}
+{if $cv.optional.auto_network_hook_active}
+               auto_network_hook="{$cv.optional.auto_network_hook} "
 {/if}
                lang="{$cv.lang}"
                theme="{$cv.theme}"
@@ -310,6 +319,12 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.optional.notifydir_active }
+                       notifydir="{$cv.optional.notifydir}"
+{/if}
+{if $cv.base_hook_active}
+                       base_hook="{$cv.base_hook}"
+{/if}
 {if $cv.generic_settings.wws_ou_active}
                        winstations="{$cv.generic_settings.wws_ou}"
 {/if}

diff --git a/setup/class_setupStep5.inc b/setup/class_setupStep5.inc
index 8b6acec6fba5674126e811647c8ca43b236db527..fefe51fa47831699b6ab8641af3f4d0c4661b567 100644 (file)
--- a/setup/class_setupStep5.inc
+++ b/setup/class_setupStep5.inc
@@ -27,6 +27,10 @@ class setup_step_5 extends setup_step
   var $groupou    =  "ou=groups";
   var $peopledn   = "cn";
   var $uidbase    = 1000;
+
+  var $base_hook         = "/usr/bin/sudo myscript"; 
+  var $base_hook_active  = FALSE; 
+
   var $encryption = "crypt";
   var $mail       = "none";
   var $theme      = "default"; 
@@ -47,7 +51,8 @@ class setup_step_5 extends setup_step
   var $mail_methods   = array();
 
 
-  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","mail","theme","errorlvl","cyrusunixstyle");
+  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","mail","theme","errorlvl","cyrusunixstyle",
+                          "base_hook","base_hook_active");
 
   function setup_step_5()
   {
@@ -203,6 +208,16 @@ class setup_step_5 extends setup_step
       }else{
         $this->pwd_rules['externalpwdhook_active'] = FALSE;
       }
+
+      /* Mail settings */
+      if(isset($_POST['base_hook_active'])){
+        $this->pwd_rules['base_hook_active'] = TRUE;
+        if(isset($_POST['base_hook'])){
+          $this->pwd_rules['base_hook'] = $_POST['base_hook'];
+        }
+      }else{
+        $this->pwd_rules['base_hook_active'] = FALSE;
+      }
     }
 
     $tmp = $this->check(); 

diff --git a/setup/class_setupStep6a.inc b/setup/class_setupStep6a.inc
index c2646799ff0976bdd7177ba40c3f38b78bdc4226..523d9d1eb91874735ea3494ded0cf2fbb738de49 100644 (file)
--- a/setup/class_setupStep6a.inc
+++ b/setup/class_setupStep6a.inc
@@ -36,6 +36,17 @@ class setup_step_6a extends setup_step
               "session_lifetime" => 7200,
               "max_ldap_query_time" => "5.0",
               "max_ldap_query_time_active" => FALSE,
+
+              "mailQueueScriptPath" => "/usr/bin/sudo /usr/local/sbin/mailqueue %action %id %server",
+              "mailQueueScriptPath_active" => FALSE,
+
+              "auto_network_hook" => "/etc/gosa/net-resolv.sh",
+              "auto_network_hook_active" => FALSE,
+
+              "notifydir" => "",
+              "notifydir_active" => FALSE,
+
+              "noprimarygroup"  => FALSE,
               "smbhash" => 'SMBHASH');
 
 
@@ -126,6 +137,32 @@ class setup_step_6a extends setup_step
         $this->optional['max_ldap_query_time_active'] = FALSE;
       }
 
+      if(isset($_POST['mailQueueScriptPath_active'])){
+        $this->optional['mailQueueScriptPath_active'] = TRUE;
+        if(isset($_POST['mailQueueScriptPath'])){
+          $this->optional['mailQueueScriptPath'] = $_POST['mailQueueScriptPath'];
+        }
+      }else{
+        $this->optional['mailQueueScriptPath_active'] = FALSE;
+      }
+
+      if(isset($_POST['auto_network_hook_active'])){
+        $this->optional['auto_network_hook_active'] = TRUE;
+        if(isset($_POST['auto_network_hook'])){
+          $this->optional['auto_network_hook'] = $_POST['auto_network_hook'];
+        }
+      }else{
+        $this->optional['auto_network_hook_active'] = FALSE;
+      }
+
+      if(isset($_POST['notifydir_active'])){
+        $this->optional['notifydir_active'] = TRUE;
+        if(isset($_POST['notifydir'])){
+          $this->optional['notifydir'] = $_POST['notifydir'];
+        }
+      }else{
+        $this->optional['notifydir_active'] = FALSE;
+      }
     }
 
     $tmp = $this->check();

diff --git a/setup/setup_step5.tpl b/setup/setup_step5.tpl
index ee93b8f90dd31644786ffa4499ba79720badc21a..faaf0551fc421705cb6983cf1a4265b6d94ad02f 100644 (file)
--- a/setup/setup_step5.tpl
+++ b/setup/setup_step5.tpl
@@ -72,6 +72,28 @@
         </div>
     </div>
 
+
+       <div class='step4_container'>
+       <div class='step4_name'>
+                {t}Base hook{/t}
+        </div>
+        <div class='step4_value'>
+            {if $base_hook_active == FALSE}
+                <input type='checkbox' value='1' name='base_hook_active'
+                    onClick='changeState("base_hook");'>
+                <input style='width:90%' id='base_hook' name='base_hook' type='text' value='{$base_hook}'      disabled>
+            {else}
+                <input type='checkbox' value='1' name='base_hook_active' checked>
+                <input style='width:90%' id='base_hook' name='base_hook' type='text' value='{$base_hook}'  >
+            {/if}
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Display PHP errors{/t}

diff --git a/setup/setup_step6a.tpl b/setup/setup_step6a.tpl
index b7db260a1710eaeca1b477d16a5104119ebbecef..fbd365fad38c837afd07906d2c4c0926202ab722 100644 (file)
--- a/setup/setup_step6a.tpl
+++ b/setup/setup_step6a.tpl
@@ -28,6 +28,22 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Disable primary group filter{/t}
+        </div>
+        <div class='step4_value'>
+       
+            <select name="noprimarygroup" size="1" title="">
+               {html_options options=$bool selected=$optional.noprimarygroup}
+            </select>
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Force globals{/t}
@@ -96,6 +112,72 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Network resolv hook{/t}
+        </div>
+        <div class='step4_value'>
+            {if $optional.auto_network_hook_active == FALSE}
+                <input type='checkbox' value='1' name='auto_network_hook_active'
+                    onClick='changeState("auto_network_hook");'>
+                <input style='width:90%' id='auto_network_hook' name='auto_network_hook' 
+                                       type='text' value='{$optional.auto_network_hook}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='auto_network_hook_active' checked>
+                <input style='width:90%' id='auto_network_hook' name='auto_network_hook' type='text' 
+                                       value='{$optional.auto_network_hook}'  >
+            {/if}
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Mail queue script path{/t}
+        </div>
+        <div class='step4_value'>
+            {if $optional.mailQueueScriptPath_active == FALSE}
+                <input type='checkbox' value='1' name='mailQueueScriptPath_active'
+                    onClick='changeState("mailQueueScriptPath");'>
+                <input style='width:90%' id='mailQueueScriptPath' name='mailQueueScriptPath' 
+                                       type='text' value='{$optional.mailQueueScriptPath}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='mailQueueScriptPath_active' checked>
+                <input style='width:90%' id='mailQueueScriptPath' name='mailQueueScriptPath' type='text' 
+                                       value='{$optional.mailQueueScriptPath}'  >
+            {/if}
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Notification path{/t}
+        </div>
+        <div class='step4_value'>
+            {if $optional.notifydir_active == FALSE}
+                <input type='checkbox' value='1' name='notifydir_active'
+                    onClick='changeState("notifydir");'>
+                <input style='width:90%' id='notifydir' name='notifydir' 
+                                       type='text' value='{$optional.notifydir}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='notifydir_active' checked>
+                <input style='width:90%' id='notifydir' name='notifydir' 
+                                       type='text' value='{$optional.notifydir}'  >
+            {/if}
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Kde applications menu{/t}