From 4387b15e74807304b8f028860303370c0b393725 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 4 Apr 2007 12:22:38 +0000 Subject: [PATCH] Added some attributes to setup git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5980 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/gosa.conf | 15 +++++++ setup/class_setupStep5.inc | 17 +++++++- setup/class_setupStep6a.inc | 37 +++++++++++++++++ setup/setup_step5.tpl | 22 ++++++++++ setup/setup_step6a.tpl | 82 +++++++++++++++++++++++++++++++++++++ 5 files changed, 172 insertions(+), 1 deletion(-) diff --git a/contrib/gosa.conf b/contrib/gosa.conf index e9de57bf1..6ebd81c10 100644 --- 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 8b6acec6f..fefe51fa4 100644 --- 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 c2646799f..523d9d1eb 100644 --- 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 ee93b8f90..faaf0551f 100644 --- a/setup/setup_step5.tpl +++ b/setup/setup_step5.tpl @@ -72,6 +72,28 @@ + +
+
+ {t}Base hook{/t} +
+
+ {if $base_hook_active == FALSE} + + + {else} + + + {/if} +
+
+ {t}Infos in FAQ{/t}  + +
+
+ +
{t}Display PHP errors{/t} diff --git a/setup/setup_step6a.tpl b/setup/setup_step6a.tpl index b7db260a1..fbd365fad 100644 --- a/setup/setup_step6a.tpl +++ b/setup/setup_step6a.tpl @@ -28,6 +28,22 @@
+
+
+ {t}Disable primary group filter{/t} +
+
+ + +
+
+ {t}Infos in FAQ{/t}  + +
+
+
{t}Force globals{/t} @@ -96,6 +112,72 @@
+
+
+ {t}Network resolv hook{/t} +
+
+ {if $optional.auto_network_hook_active == FALSE} + + + {else} + + + {/if} +
+
+ {t}Infos in FAQ{/t}  + +
+
+ +
+
+ {t}Mail queue script path{/t} +
+
+ {if $optional.mailQueueScriptPath_active == FALSE} + + + {else} + + + {/if} +
+
+ {t}Infos in FAQ{/t}  + +
+
+ +
+
+ {t}Notification path{/t} +
+
+ {if $optional.notifydir_active == FALSE} + + + {else} + + + {/if} +
+
+ {t}Infos in FAQ{/t}  + +
+
+
{t}Kde applications menu{/t} -- 2.30.2