From e93750c3ba3ee6f886b73ef86314904645e9800d Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 10 Sep 2008 09:59:45 +0000 Subject: [PATCH] Updated remaining attributes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12396 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/FAQ | 2 +- gosa-core/contrib/gosa.conf | 154 +++++++++--------- gosa-core/contrib/gosa.conf.5 | 6 +- gosa-core/html/index.php | 12 +- gosa-core/include/class_config.inc | 2 +- .../plugins/admin/acl/class_aclManagement.inc | 2 +- .../admin/groups/class_groupManagement.inc | 2 +- .../admin/ogroups/class_ogroupManagement.inc | 2 +- .../admin/users/class_userManagement.inc | 2 +- .../fai/admin/fai/class_faiManagement.inc | 2 +- .../blocklists/class_blocklistManagement.inc | 2 +- .../class_phoneConferenceManagment.inc | 2 +- .../macro/class_gofonMacroManagement.inc | 2 +- .../class_applicationManagement.inc | 2 +- .../admin/devices/class_deviceManagement.inc | 2 +- .../mimetypes/class_mimetypeManagement.inc | 2 +- .../sudo/admin/sudo/class_sudoManagement.inc | 2 +- .../admin/systems/class_systemManagement.inc | 2 +- 18 files changed, 101 insertions(+), 101 deletions(-) diff --git a/gosa-core/FAQ b/gosa-core/FAQ index fde2a3a8f..b662504fd 100644 --- a/gosa-core/FAQ +++ b/gosa-core/FAQ @@ -415,7 +415,7 @@ A: You can set a nesting limit which ensures that the user names will not be Q: I want to disable the "Is the configuration file up to date?" check when logging in. How can I disable this check? -A: Just set the config_version attribute to an empty value: +A: Just set the configVersion attribute to an empty value: diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf index bd92ebcef..f846184d0 100644 --- a/gosa-core/contrib/gosa.conf +++ b/gosa-core/contrib/gosa.conf @@ -35,7 +35,7 @@
- + {if $cv.use_netatalk} @@ -65,9 +65,9 @@ {/if} - + {if $cv.enableFAI_management} {else} @@ -184,7 +184,7 @@ - + @@ -199,7 +199,7 @@ {/if} - + @@ -208,7 +208,7 @@ - + {if $cv.enableFAI_management} @@ -311,11 +311,11 @@ username="OGo" password="" database="OGo" - datahost="localhost" /> + databaseServer="localhost" /> --> - + @@ -421,9 +421,9 @@ passwordHook="{$cv.pwd_rules.externalpwdhook}" {/if} {if $cv.errorlvl} - displayerrors="true" + displayErrors="true" {else} - displayerrors="false" + displayErrors="false" {/if} {if $cv.enable_schema_check} schemaCheck="true" @@ -431,94 +431,94 @@ schemaCheck="false" {/if} {if $cv.generic_settings.enableCopyPaste} - enableCopyPaste="true" + copyPaste="true" {else} - enableCopyPaste="false" + copyPaste="false" {/if} {if $cv.optional.forceglobals} - forceglobals="true" + forceGlobals="true" {else} - forceglobals="false" + forceGlobals="false" {/if} {if $cv.optional.forcessl} - forcessl="true" + forceSSL="true" {else} - forcessl="false" + forceSSL="false" {/if} {if $cv.optional.ldapstats} - ldapstats="true" + ldapStats="true" {else} - ldapstats="false" + ldapStats="false" {/if} {if $cv.optional.warnssl} - warnssl="true" + warnSSL="true" {else} - warnssl="false" + warnSSL="false" {/if} {if $cv.optional.ppd_path_active} - ppd_path="{$cv.optional.ppd_path}" + ppdPath="{$cv.optional.ppd_path}" {/if} {if $cv.optional.max_ldap_query_time_active} - max_ldap_query_time="{$cv.optional.max_ldap_query_time}" + ldapMaxQueryTime="{$cv.optional.max_ldap_query_time}" {/if} {if $cv.optional.noprimarygroup} - noprimarygroup="true" + primaryGroupFilter="true" {/if} {if $cv.optional.mailQueueScriptPath_active} mailQueueScriptPath="{$cv.optional.mailQueueScriptPath}" {/if} {if $cv.optional.user_filter_cookie} - save_filter="true" + storeFilterSettings="true" {else} - save_filter="false" + storeFilterSettings="false" {/if} {if $cv.compressed} - compressed="true" + sendCompressedOutput="true" {else} - compressed="false" + sendCompressedOutput="false" {/if} {if $cv.optional.uniq_identifier_active } - uniq_identifier="{$cv.optional.uniq_identifier}" + modificationDetectionAttribute="{$cv.optional.uniq_identifier}" {else} - uniq_identifier="" + modificationDetectionAttribute="" {/if} - lang="{$cv.lang_selected}" + language="{$cv.lang_selected}" theme="{$cv.theme}" - session_lifetime="{$cv.optional.session_lifetime}" - compile="{$cv.optional.compile}" - debuglevel="{$cv.optional.debuglevel}" - smbhash='{$cv.samba_settings.smbhash}' + sessionLifetime="{$cv.optional.session_lifetime}" + templateCompileDirectory="{$cv.optional.compile}" + debugLevel="{$cv.optional.debuglevel}" + sambaHashHook='{$cv.samba_settings.smbhash}' > + configBase="ou=gosa,ou=configs,ou=systems,{$cv.base}"> - + diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5 index 75724ba78..c6cd24ee2 100644 --- a/gosa-core/contrib/gosa.conf.5 +++ b/gosa-core/contrib/gosa.conf.5 @@ -263,11 +263,11 @@ or .I both. .PP -.B enableCopyPaste +.B copyPaste .I bool .PP The -.I enableCopyPaste +.I copyPaste statement enables copy and paste for LDAP entries managed with GOsa. .PP @@ -423,7 +423,7 @@ can be used if you want to use i.e. kerberos to authenticate the users. .PP .B gosa_si -.I bool +.I URI .PP The .I gosa_si diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php index 342d9a3b7..6f0b1699f 100644 --- a/gosa-core/html/index.php +++ b/gosa-core/html/index.php @@ -61,7 +61,7 @@ function displayLogin() if(!$config->check_session_lifetime()){ $smarty->assign ("lifetime", _("Warning").": ". - _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings.")); + _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings.")); }else{ $smarty->assign ("lifetime", ""); } @@ -161,7 +161,7 @@ $smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa'); /* Check for compile directory */ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){ msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"), - $smarty->compile_dir),FATAL_ERROR_DIALOG); + $smarty->compile_dir),FATAL_ERROR_DIALOG); exit(); } @@ -256,8 +256,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces /* Check for schema file presence */ #TODO: these three lines should go to the class_config.inc, shouldn't they? - if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){ - $config->data['MAIN']['SCHEMA_CHECK'] = "true"; + if(!isset($config->data['MAIN']['SCHEMACHECK'])){ + $config->data['MAIN']['SCHEMACHECK'] = "true"; } if ($config->get_cfg_value("schemaCheck") == "true"){ $recursive = ($config->get_cfg_value("recursive") == "true"); @@ -306,7 +306,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces $ok= false; } } - + if ($ok) { /* Login as user, initialize user ACL's */ @@ -454,7 +454,7 @@ if (session::is_set('errors') && session::get('errors') != ""){ $smarty->assign("focus", $focus); displayLogin(); -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: +// vim:tabstop=2:expandtab:shiftwidth=2:softtabstop=2:filetype=php:syntax:ruler: ?> diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index d99749904..9b789f7d3 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -137,7 +137,7 @@ class config { /* Trigger on CONF section */ if ($tag == 'CONF'){ $this->config_found= TRUE; - if(isset($attrs['CONFIG_VERSION'])){ + if(isset($attrs['CONFIGVERSION'])){ $this->config_version = $attrs['CONFIGVERSION']; } } diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc index 0b87aefd0..09483d2c4 100644 --- a/gosa-core/plugins/admin/acl/class_aclManagement.inc +++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc @@ -45,7 +45,7 @@ class aclManagement extends plugin $this->ui = &$ui; /* Copy & Paste enabled ?*/ - if ($this->config->get_cfg_value("enablecopypaste") == "true"){ + if ($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc index decaf8053..58db24e8d 100644 --- a/gosa-core/plugins/admin/groups/class_groupManagement.inc +++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc @@ -44,7 +44,7 @@ class groupManagement extends plugin $this->ui = &$ui; /* Copy & Paste enabled ?*/ - if($this->config->get_cfg_value("enablecopypaste") == "true"){ + if($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc index 6a5801781..77e5c6534 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc @@ -47,7 +47,7 @@ class ogroupManagement extends plugin /* Copy & Paste enabled ? */ - if ($this->config->get_cfg_value("enablecopypaste") == "true"){ + if ($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc index 8114ef094..bd26203f9 100644 --- a/gosa-core/plugins/admin/users/class_userManagement.inc +++ b/gosa-core/plugins/admin/users/class_userManagement.inc @@ -50,7 +50,7 @@ class userManagement extends plugin $this->ui= &$ui; /* Copy & Paste handler */ - if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){ + if ($this->config->boolValueIsTrue("main", "copyPaste")){ $this->CopyPasteHandler= new CopyPasteHandler($this->config); } diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc index 2a4eb0b42..6f39cfdb1 100644 --- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc +++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc @@ -77,7 +77,7 @@ class faiManagement extends plugin $this->DivListFai = new divListFai($this->config,$this); /* Copy & Paste handler */ - if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){ + if ($this->config->boolValueIsTrue("main", "copyPaste")){ $this->CopyPasteHandler= new CopyPasteHandler($this->config); } diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc index 5903800e9..d7265abe9 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc @@ -23,7 +23,7 @@ class blocklist extends plugin $this->DivListBlocklist = new divListBlocklist($this->config,$this); /* Initialize copy&paste queue */ - if ($this->config->boolValueIsTrue("main", "enableCopyPaste")){ + if ($this->config->boolValueIsTrue("main", "copyPaste")){ $this->CopyPasteHandler= new CopyPasteHandler($this->config); } } diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc index a723ed5b4..685c6c580 100644 --- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc +++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc @@ -49,7 +49,7 @@ class phoneConferenceManagment extends plugin $this->DivListConference = new divListConference($this->config,$this); /* Copy & Paste enabled ?*/ - if ($this->config->get_cfg_value("enablecopypaste") == "true"){ + if ($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } } diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc index 44b95fa00..04a665f7c 100644 --- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc +++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc @@ -48,7 +48,7 @@ class goFonMacro extends plugin $this->DivListMacro = new divListMacro($this->config,$this); /* Copy & Paste enabled ?*/ - if ($this->config->get_cfg_value("enablecopypaste") == "true"){ + if ($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } } diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc index b3cce2714..bf332fed6 100644 --- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc +++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc @@ -58,7 +58,7 @@ class applicationManagement extends plugin $this->ui = &$ui; /* Check if copy & paste is activated */ - if($this->config->boolValueIsTrue("MAIN","ENABLECOPYPASTE")){ + if($this->config->boolValueIsTrue("MAIN","COPYPASTE")){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } diff --git a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc index bad855796..08921f09c 100644 --- a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc +++ b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc @@ -27,7 +27,7 @@ class deviceManagement extends plugin $this->ui = get_userinfo(); /* Check if copy & paste is activated */ - if($this->config->get_cfg_value("enablecopypaste") == "true"){ + if($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc index 989e276a0..1621ce3b3 100644 --- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc +++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc @@ -57,7 +57,7 @@ class mimetypeManagement extends plugin $this->ui = &$ui; /* Check if copy & paste is activated */ - if($this->config->get_cfg_value("enablecopypaste")){ + if($this->config->get_cfg_value("copyPaste")){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc b/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc index 85e59850e..1ae560bc4 100644 --- a/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc +++ b/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc @@ -49,7 +49,7 @@ class sudoManagement extends plugin $this->base = sudo::get_sudoers_ou($this->config); /* Copy & Paste enabled ?*/ - if ($this->config->get_cfg_value("enablecopypaste") == "true"){ + if ($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index 265ea4ab0..61e2f725d 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -66,7 +66,7 @@ class systems extends plugin $this->DivListSystem = new divListSystem($this->config,$this); /* Copy & Paste enabled ?*/ - if ($this->config->get_cfg_value("enablecopypaste") == "true"){ + if ($this->config->get_cfg_value("copyPaste") == "true"){ $this->CopyPasteHandler = new CopyPasteHandler($this->config); } -- 2.30.2