From 1136e57c6caea14fc33e35256bbb523e28fb38a5 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 19 Apr 2007 11:59:38 +0000 Subject: [PATCH] Moved strict to step1 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6124 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/gosa.conf | 6 +++--- setup/class_setupStep_Config1.inc | 5 ++++- setup/class_setupStep_Config2.inc | 3 +-- setup/setup_config1.tpl | 11 +++++++++++ setup/setup_config2.tpl | 11 ----------- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/contrib/gosa.conf b/contrib/gosa.conf index b3618e933..98837ef31 100644 --- a/contrib/gosa.conf +++ b/contrib/gosa.conf @@ -271,10 +271,10 @@ {else} schema_check="false" {/if} -{if $cv.optional.enableCopyPaste} - enableCopyPaste="true" +{if $cv.generic_settings.enableCopyPaste} + enableCopyPaste="true" {else} - enableCopyPaste="false" + enableCopyPaste="false" {/if} {if $cv.optional.forceglobals} forceglobals="true" diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc index 6a5e8e2ea..f51e9cab9 100644 --- a/setup/class_setupStep_Config1.inc +++ b/setup/class_setupStep_Config1.inc @@ -27,6 +27,9 @@ class Step_Config1 extends setup_step var $groupou = "ou=groups"; var $peopledn = "cn"; var $uidbase = 1000; + + var $strict = TRUE; + var $header_image = "images/ldapserver.png"; var $account_expiration =FALSE; var $base_hook = "/usr/bin/sudo myscript"; @@ -51,7 +54,7 @@ class Step_Config1 extends setup_step var $crypt_methods = array(); var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl", - "base_hook","base_hook_active","account_expiration"); + "base_hook","base_hook_active","account_expiration","strict"); function Step_Config1() { diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc index 78d609456..8f3e499a7 100644 --- a/setup/class_setupStep_Config2.inc +++ b/setup/class_setupStep_Config2.inc @@ -24,7 +24,6 @@ class Step_Config2 extends setup_step { var $governmentmode = FALSE; var $sambaidmapping = FALSE; - var $strict = TRUE; var $header_image = "images/ldapserver.png"; var $cyrusunixstyle = FALSE; @@ -47,7 +46,7 @@ class Step_Config2 extends setup_step "samba_rid" => 1000, "samba_rid_active" => FALSE); - var $attributes = array("strict","governmentmode","sambaidmapping","cyrusunixstyle","mail"); + var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail"); function Step_Config2() { diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl index 17bd18c6b..695259da5 100644 --- a/setup/setup_config1.tpl +++ b/setup/setup_config1.tpl @@ -52,6 +52,17 @@ +
+
+ {t}Relaxed naming policies{/t} +
+
+ +
+
+
{t}Automatic uids{/t} diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl index 49a3e01a3..0d47fe43a 100644 --- a/setup/setup_config2.tpl +++ b/setup/setup_config2.tpl @@ -70,17 +70,6 @@
- -
-
- {t}Relaxed naming policies{/t} -
-
- -
-
-- 2.30.2