Updated a couple of config values

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

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index d092f09ee6ff4b84dbf5a43fce56ad1d828caf87..2ec3923c3dc7a3267a5a8f05279aa62cee9f66f3 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -134,7 +134,7 @@ A: Create a directory to keep a set of vacation messages which are readable by t
    %givenName %sn
    -----------------------------------------------------------------------------------
 
-   Place the config option vacationdir="/etc/gosa/vacation" in the location found in
+   Place the config option vacationTemplateDirectory="/etc/gosa/vacation" in the location found in
    gosa.conf and a template box is show in the vacation mail tab.
 
 
@@ -147,7 +147,7 @@ A: Add an entry describing your id policy in gosa.conf, location section:
       and add a percent sign befor it. Optionally you can strip it down to a number
       of characters, specified in []. I.e.
       
-       idgen="{%sn}-{%givenName[2-4]}"
+       idGenerator="{%sn}-{%givenName[2-4]}"
        
       will generate an ID using the full surename, adding a dash, and adding at least
       the first two characters of givenName. If this ID is used, it'll use up to four
@@ -156,11 +156,11 @@ A: Add an entry describing your id policy in gosa.conf, location section:
    b) using automatic id's
       I.e. specifying
       
-       idgen="acct{id:3}"
+       idGenerator="acct{id:3}"
 
       will generate a three digits id with the next free entry appended to "acct".
       
-       idgen="ext{id#3}"
+       idGenerator="ext{id#3}"
 
       will generate a three digits random number appended to "ext".
 
@@ -168,8 +168,8 @@ A: Add an entry describing your id policy in gosa.conf, location section:
 Q: I'm migrating from the current LDAP, now GOsa does not allow uid's and group
    with upper/lower case and spaces. What can I do?
 
-A: Include the strict="no" keyword in your gosa.conf's location section.
-   WARNING: using strict="no" will cause problems with cyrus/postfix!!
+A: Include the strictNamingRules="no" keyword in your gosa.conf's location section.
+   WARNING: using strictNamingRules="no" will cause problems with cyrus/postfix!!
 
 
 Q: I'd like to place my users under ou=staff, not under ou=people. Can I change
@@ -209,8 +209,8 @@ A: You've configured GOsa to use samba3, but your LDAP has no samba domain objec
 
    <location name=...>
              ...
-             ridbase="1000"
-             sid="0-815-4711" \>
+             sambaRidBase="1000"
+             sambaSID="0-815-4711" \>
 
    Remember to fill in your real domain sid which is retrievable by the command
    "net getlocalsid".
@@ -236,7 +236,7 @@ A: This is an additional security feature, so that no one can fall back to uid 0
 
    <location name=...>
        ...
-       minid="40"
+       minId="40"
        ... \>
 
    in your configuration. In this example 40 will be the smallest ID you can enter.
@@ -271,7 +271,7 @@ A: Yes, add
 
    <location ...>
    ...
-         tls="true"
+         ldapTLS="true"
    ... \>
 
    to the location section of GOsa. This switch affects LDAP connections for a single location only.
@@ -284,7 +284,7 @@ A: Yes, add
 
    <main ...>
    ...
-         cyrusunixstyle="true"
+         cyrusUseSlashes="true"
    ... \>
 
    to the main section of GOsa and the folders are created in unix style.
@@ -305,12 +305,12 @@ A: No need to modify anything. Just add a hook the the plugin you'd like to
 
 Q: Is there a way to use ACL independet filtering when using administrative units?
 
-A: Yes. Set STRICT_UNITS to "true" in your gosa.conf's location section.
+A: Yes. Set "honourUnitTags" to "true" in your gosa.conf's location section.
 
 
 Q: How can i active the account expiration code for the gosa interface?
 
-A: Yes. Just set "account_expiration" to "true" in your gosa.conf's main section.
+A: Yes. Just set "handleExpiredAccounts" to "true" in your gosa.conf's main section.
 
 
 Q: What is the correct connection string for a Kolab server in GOsa?
@@ -335,21 +335,21 @@ A: For Kolab to work correctly you have to include the rfc2739.schema
 Q: New implementations of OpenLDAP seem to require {sasl} instead of {kerberos}
    in password hashes. GOsa writes the wrong string. What can I do?
 
-A: You can set "krbsasl" to "true" in your gosa.conf's main section.
+A: You can set "useSaslForKerberos" to "true" in your gosa.conf's main section.
 
 
 Q: Is there a way to add the personalTitle attribute the the users dn?
 
 A: Just add this line into the location section of your gosa.conf.
    <location name=...
-       include_personal_title="true"
+    personalTitleInDN="true"
    ...>
 
 
 Q: I'd like to assign different uid bases for certain user/group objects.
    How can this be achieved?
 
-A: Use the base_hook in your gosa.conf's location section to specify a script
+A: Use the 'nextIdHook' in your gosa.conf's location section to specify a script
    which handles the ID generation externaly. It get's called with the "dn"
    and the attribute to be ID'd. It should return an integer value.
 

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 4b04ada5379ecc21ed68fe9338f96558da702483..48cabeebc33bf0031fff465ad5e0dff7049dde4f 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -547,7 +547,7 @@
               strictNamingRules="false"
 {/if}
 {if $cv.id_settings.minid_active}
-              minid="{$cv.id_settings.minid}"
+              minId="{$cv.id_settings.minid}"
 {/if}
 {if $cv.mail != "disabled"}
               mailMethod="{$cv.mail}"

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index 5abb99fbea46b2d5f7ad26c6c2fb970195b12054..43b8644441fec9a96e1b559731c3edaf6ec71636 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -251,11 +251,11 @@ list.
 GOsa will not log anything, if the logging value is empty.
 .PP
 
-.B login_attribute
+.B loginAttribute
 .I string
 .PP
 The
-.I login_attribute
+.I loginAttribute
 statement tells GOsa which LDAP attribute is used as the login name
 during login. It can be set to
 .I uid, mail
@@ -352,30 +352,30 @@ The
 value should be a unix conform timezone value like in /etc/timezone.
 .PP
 
-.B governmentmode
+.B honourIvbbAttributes
 .I bool
 .PP
 The
-.I governmentmode
+.I honourIvbbAttributes
 statement enables the IVBB mode inside of GOsa. You need the ivbb.schema
 file from used by german authorities.
 .PP
 
-.B strict
+.B strictNamingRules
 .I bool
 .PP
 The
-.I strict
+.I strictNamingRules
 statement enables strict checking of uids and group names. If you need
 characters like . or - inside of your accounts, set this to
 .I false.
 .PP
 
-.B strict_units
+.B honourUnitTags
 .I bool
 .PP
 The
-.I strict_units
+.I honourUnitTags
 statement enables checking of
 .I unitTag
 attributes when using administrative units. If this is set to
@@ -566,20 +566,20 @@ location besides the LDAP. It will be called this way:
 /path/to/your/script "username" "oldpassword" "newpassword"
 .fi
 
-.B account_expiration
+.B handleExpiredAccounts
 .I bool
 .PP
 The
-.I account_expiration
+.I handleExpiredAccounts
 statement enables shadow attribute tests during the login to the GOsa web
 interface and forces password renewal or account lockout.
 .PP
 
-.B krbsasl
+.B useSaslForKerberos
 .I bool
 .PP
 The
-.I krbsasl
+.I useSaslForKerberos
 statement defines the way the kerberos realm is stored in the
 .I userPassword
 attribute. Set it to
@@ -612,11 +612,11 @@ statement enables or disables schema checking during login. It is recommended
 to switch this on in order to let GOsa handle object creation more efficient.
 .PP
 
-.B tls
+.B ldapTLS
 .I bool
 .PP
 The
-.I tls
+.I ldapTLS
 statement enables or disables TLS operating on LDAP connections.
 .PP
 
@@ -641,14 +641,14 @@ If you choose "cn" to be your
 .I accountPrimaryAttribute
 you can decide whether to include the personal title in your dn by
 selecting
-.I include_personal_title.
+.I personalTitleInDN.
 .PP
 
-.B include_personal_title
+.B personalTitleInDN
 .I bool
 .PP
 The
-.I include_personal_title
+.I personalTitleInDN
 option tells GOsa to include the personal title in user DNs when
 .I accountPrimaryAttribute
 is set to "cn".
@@ -820,7 +820,7 @@ with your
 .I adduser.conf
 to avoid overlapping uidNumber values between local and LDAP based lookups. The uidNumberBase
 can even be dynamic. Take a look at the
-.I base_hook
+.I nextIdHook
 definition below.
 .PP
 
@@ -834,24 +834,24 @@ with your
 .I adduser.conf
 to avoid overlapping gidNumber values between local and LDAP based lookups. The gidNumberBase
 can even be dynamic. Take a look at the
-.I base_hook
+.I nextIdHook
 definition below.
 .PP
 
-.B minid
+.B minId
 .I integer
 .PP
 The
-.I minid
+.I minId
 statement defines the minimum assignable user or group id to avoid security leaks with
 uid 0 accounts.
 .PP
 
-.B base_hook
+.B nextIdHook
 .I path
 .PP
 The
-.I base_hook
+.I nextIdHook
 statement defines a script to be called for finding the next free id for users or groups
 externaly. It gets called with the current entry "dn" and the attribute to be ID'd. It
 should return an integer value.
@@ -869,11 +869,11 @@ and
 These values will be overridden when using templates.
 .PP
 
-.B idgen
+.B idGenerator
 .I string
 .PP
 The
-.I idgen
+.I idGenerator
 statement describes an automatic way to generate new user ids. There are two basic
 functions supported - which can be combined:
 
@@ -884,7 +884,7 @@ functions supported - which can be combined:
     down to a number of characters, specified in []. I.e.
 
 .nf
-      idgen="{%sn}-{%givenName[2-4]}"
+      idGenerator="{%sn}-{%givenName[2-4]}"
 .fi
 
     will generate an ID using the full surename, adding a dash, and adding at
@@ -897,14 +897,14 @@ functions supported - which can be combined:
     I.e. specifying
 
 .nf
-      idgen="acct{id:3}"
+      idGenerator="acct{id:3}"
 .fi
 
     will generate a three digits id with the next free entry appended to
     "acct".
 
 .nf
-      idgen="ext{id#3}"
+      idGenerator="ext{id#3}"
 .fi
 
     will generate a three digits random number appended to "ext".
@@ -914,21 +914,21 @@ functions supported - which can be combined:
 
 .B Samba options
 .PP
-.B sid
+.B sambaSID
 .I string
 .PP
 The
-.I sid
+.I sambaSID
 statement defines a samba SID if not available inside of the LDAP. You can retrieve
 the current sid by
 .I net getlocalsid.
 .PP
 
-.B ridbase
+.B sambaRidBase
 .I integer
 .PP
 The
-.I ridbase
+.I sambaRidBase
 statement defines the base id to add to ordinary sid calculations - if not available
 inside of the LDAP.
 .PP
@@ -1004,11 +1004,11 @@ is like cyrus, but lets the kolab daemon maintain the accounts.
 .I sendmail just disables everything which is IMAP dependent.
 .PP
 
-.B cyrusunixstyle
+.B cyrusUseSlashes
 .I bool
 .PP
 The
-.I cyrusunixstyle
+.I cyrusUseSlashes
 statement determines if GOsa should use "foo/bar" or "foo.bar" namespaces
 in IMAP. Unix style is with slashes.
 
@@ -1028,22 +1028,22 @@ The
 statement defines a file to include for the postfix module in order
 to display user defined protocols.
 
-.B mail_attrib
+.B mailAttribute
 .I mail/uid
 .PP
 The
-.I mail_attrib
+.I mailAttribute
 statement determines which attribute GOsa will use to create accounts.
 Valid values are
 .I mail
 and
 .I uid.
 
-.B vacationdir
+.B vacationTemplateDirectory
 .I path
 .PP
 The
-.I vacationdir
+.I vacationTemplateDirectory
 statement sets the path where GOsa will look for vacation message
 templates. Default is /etc/gosa/vacation.
 

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index e9723e0e7b578e16705797dcda709b320d15806c..1330e97b9ca27d394bb208aac67715a1d1d89371 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -261,7 +261,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
   }
   if ($config->get_cfg_value("schemaCheck") == "true"){
     $recursive = ($config->get_cfg_value("recursive") == "true");
-    $tls =       ($config->get_cfg_value("tls") == "true");
+    $tls =       ($config->get_cfg_value("ldapTLS") == "true");
 
     if(!count($ldap->get_objectclasses())){
       msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG);
@@ -363,7 +363,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
       }
 
       /* are we using accountexpiration */
-      if ($config->get_cfg_value("account_expiration") == "true"){
+      if ($config->get_cfg_value("handleExpiredAccounts") == "true"){
         $expired= ldap_expired_account($config, $ui->dn, $ui->username);
 
         if ($expired == 1){

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 43f85119060831d154b19e3514e73480042d9c32..8cdb4a2390586d1d6e062cce0e480f2c330ec8a9 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -344,7 +344,7 @@ if (session::is_set('post_cnt')){
 }
 
 /* check if we are using account expiration */
-if ($config->get_cfg_value("account_expiration") == "true"){
+if ($config->get_cfg_value("handleExpiredAccounts") == "true"){
   $expired= ldap_expired_account($config, $ui->dn, $ui->username);
 
   if ($expired == 2){

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 9430543471a78a4058581edf702544f8d3971e39..8a83b1093c1f09680e02d05e2f9536c46fb003bd 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -623,13 +623,13 @@ class config  {
 
       /* If no samba servers are found, look for configured sid/ridbase */
       if (count($this->data['SERVERS']['SAMBA']) == 0){
-        if (!isset($this->current["SID"]) || !isset($this->current["RIDBASE"])){
-          msg_dialog::display(_("Configuration error"), _("SID and/or RIDBASE missing in the configuration!"), FATAL_ERROR_DIALOG);
+        if (!isset($this->current["SAMBASID"]) || !isset($this->current["SAMBARIDBASE"])){
+          msg_dialog::display(_("Configuration error"), _("sambaSID and/or sambaRidBase missing in the configuration!"), FATAL_ERROR_DIALOG);
           exit();
         } else {
           $this->data['SERVERS']['SAMBA']['DEFAULT']= array(
-              "SID" => $this->current["SID"],
-              "RIDBASE" => $this->current["RIDBASE"]);
+              "SID" => $this->current["SAMBASID"],
+              "RIDBASE" => $this->current["SAMBARIDBASE"]);
         }
       }
     }
@@ -727,7 +727,7 @@ class config  {
     foreach ($this->departments as $key => $val){
 
       /* When using strict_units, filter non relevant parts */
-      if (isset($config->current['STRICT_UNITS']) && preg_match('/true/i', $config->current['STRICT_UNITS'])){
+      if (isset($config->current['HONOURUNITTAGS']) && preg_match('/true/i', $config->current['HONOURUNITTAGS'])){
         if ($ui->gosaUnitTag != "" && isset($this->tdepartments[$val]) &&
             $this->tdepartments[$val] != $ui->gosaUnitTag){
 #          continue;

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index d0b5cc71e9bf35ac68c9994fb52877a7892f4571..8d40ad58071fd1da4ee0a29f8453c4fabe763532 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -345,7 +345,7 @@ function ldap_init ($server, $base, $binddn='', $pass='')
 
   $ldap = new LDAP ($binddn, $pass, $server,
       isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true",
-      isset($config->current['TLS']) && $config->current['TLS'] == "true");
+      isset($config->current['LDAPTLS']) && $config->current['LDAPTLS'] == "true");
 
   /* Sadly we've no proper return values here. Use the error message instead. */
   if (!$ldap->success()){
@@ -370,7 +370,7 @@ function process_htaccess ($username, $kerberos= FALSE)
   
     $config->set_current($name);
     $mode= "kerberos";
-    if ($config->get_cfg_value("krbsasl") == "true"){
+    if ($config->get_cfg_value("useSaslForKerberos") == "true"){
       $mode= "sasl";
     }
 
@@ -448,8 +448,8 @@ function ldap_login_user ($username, $password)
   $ldap->cd($config->current['BASE']);
   $allowed_attributes = array("uid","mail");
   $verify_attr = array();
-  if($config->get_cfg_value("login_attribute") != ""){
-    $tmp = split(",", $config->get_cfg_value("login_attribute")); 
+  if($config->get_cfg_value("loginAttribute") != ""){
+    $tmp = split(",", $config->get_cfg_value("loginAttribute")); 
     foreach($tmp as $attr){
       if(in_array($attr,$allowed_attributes)){
         $verify_attr[] = $attr;
@@ -505,8 +505,8 @@ function ldap_login_user ($username, $password)
   $ldap= new LDAP($ui->dn, $password, $config->current['SERVER'],
       isset($config->current['RECURSIVE']) &&
       $config->current['RECURSIVE'] == "true",
-      isset($config->current['TLS'])
-      && $config->current['TLS'] == "true");
+      isset($config->current['LDAPTLS'])
+      && $config->current['LDAPTLS'] == "true");
   if (!$ldap->success()){
     return (NULL);
   }
@@ -1252,7 +1252,7 @@ function strict_uid_mode()
   global $config;
 
   if (isset($config)){
-    return ($config->get_cfg_value("strict") == "true");
+    return ($config->get_cfg_value("strictNamingRules") == "true");
   }
   return (TRUE);
 }
@@ -1651,7 +1651,7 @@ function expand_id($rule, $attributes)
     return ($result);
   }
 
-  echo "Error in idgen string: don't know how to handle rule $rule.\n";
+  echo "Error in idGenerator string: don't know how to handle rule $rule.\n";
   return (array($rule));
 }
 
@@ -2192,10 +2192,10 @@ function get_base_from_hook($dn, $attrib)
 {
   global $config;
 
-  if ($config->get_cfg_value("base_hook") != ""){
+  if ($config->get_cfg_value("nextIdHook") != ""){
     
     /* Call hook script - if present */
-    $command= $config->get_cfg_value("base_hook");
+    $command= $config->get_cfg_value("nextIdHook");
 
     if ($command != ""){
       $command.= " '".LDAP::fix($dn)."' $attrib";
@@ -2205,17 +2205,17 @@ function get_base_from_hook($dn, $attrib)
         if (preg_match("/^[0-9]+$/", $output[0])){
           return ($output[0]);
         } else {
-          msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
+          msg_dialog::display(_("Warning"), _("'nextIdHook' is not available. Using default base!"), WARNING_DIALOG);
           return ($config->get_cfg_value("uidNumberBase"));
         }
       } else {
-        msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
+        msg_dialog::display(_("Warning"), _("'nextIdHook' is not available. Using default base!"), WARNING_DIALOG);
         return ($config->get_cfg_value("uidNumberBase"));
       }
 
     } else {
 
-      msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
+      msg_dialog::display(_("Warning"), _("'nextIdHook' is not available. Using default base!"), WARNING_DIALOG);
       return ($config->get_cfg_value("uidNumberBase"));
 
     }
@@ -2234,7 +2234,7 @@ function check_schema($cfg,$rfc2307bis = FALSE)
   $messages= array();
 
   /* Get objectclasses */
-  $ldap = new ldapMultiplexer(new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE,$cfg['tls']));
+  $ldap = new ldapMultiplexer(new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE,$cfg['LDAPTLS']));
   $objectclasses = $ldap->get_objectclasses();
   if(count($objectclasses) == 0){
     msg_dialog::display(_("LDAP warning"), _("Cannot get schema information from server. No schema check possible!"), WARNING_DIALOG);

diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
index 4ced859b014e720d27871bc242e25d3027509d4d..45569c04d39533f29fd464136e1092317fb8c986 100644 (file)
--- a/gosa-core/locale/core/de/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
@@ -3526,8 +3526,8 @@ msgstr "Kann nicht in Revisions-Datei schreiben!"
 
 #: include/functions.inc:2207 include/functions.inc:2211
 #: include/functions.inc:2217
-msgid "'base_hook' is not available. Using default base!"
-msgstr "'base_hook' ist nicht verfügbar. Verwende die Standard-Basis!"
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr "'nextIdHook' ist nicht verfügbar. Verwende die Standard-Basis!"
 
 #: include/functions.inc:2239
 msgid "LDAP warning"

diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
index b0b76b50195012eb00fe6872b77b7586fd264d78..3449bba563e0f750a7f37817798d1c59fab8498a 100644 (file)
--- a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
@@ -3478,7 +3478,7 @@ msgstr "Impossible d'écrire le fichier de revision !"
 #: include/functions.inc:2217
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
-"Attention - base_hook n'est pas disponible. Utilisation de la base par "
+"Attention - 'nextIdHook' n'est pas disponible. Utilisation de la base par "
 "défaut !"
 
 #: include/functions.inc:2239

diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
index 3e7fe590a30e090c238377ff2d17664c9c4651a2..033c03aacb2a75da36482868267a0e07736d263b 100644 (file)
--- a/gosa-core/locale/core/it/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
@@ -3538,7 +3538,7 @@ msgstr "Rimuovi"
 
 #: include/functions.inc:2207 include/functions.inc:2211
 #: include/functions.inc:2217
-msgid "'base_hook' is not available. Using default base!"
+msgid "'nextIdHook' is not available. Using default base!"
 msgstr ""
 
 #: include/functions.inc:2239

diff --git a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
index 05caca4bc2932cfbb5dc46b1b92b040325a73234..4939c811e71d93654e4b98be0d4ff3f7dba670e8 100644 (file)
--- a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
@@ -3485,7 +3485,7 @@ msgstr "Không thể viết lên revision file!"
 #: include/functions.inc:2207 include/functions.inc:2211
 #: include/functions.inc:2217
 msgid "'base_hook' is not available. Using default base!"
-msgstr "'base_hook' không có. Hãy sử dụng cơ sở mặc định!"
+msgstr "'nextIdHook' không có. Hãy sử dụng cơ sở mặc định!"
 
 #: include/functions.inc:2239
 msgid "LDAP warning"

diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
index 890d0f35186f65e8e591adb4c91361f83cbd94aa..56554213e7b3106aedd4d591da6932deaf3e35be 100644 (file)
--- a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
@@ -3517,7 +3517,7 @@ msgstr "无法创建文件 '%s'。"
 #: include/functions.inc:2217
 #, fuzzy
 msgid "'base_hook' is not available. Using default base!"
-msgstr "警告： base_hook不可用。使用缺省 base。"
+msgstr "警告： nextIdHook不可用。使用缺省 base。"
 
 #: include/functions.inc:2239
 #, fuzzy

diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index 66c3554f3f1427094cd0e899d15ef9882244ee76..543bca59684901f2d651d57886b3ec4b51a6eb34 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -143,7 +143,7 @@ class group extends plugin
         if(isset($attrs['sambaAlgorithmicRidBase'])){  
           $this->ridBase= $attrs['sambaAlgorithmicRidBase'][0];  
         } else {  
-          $this->ridBase= $this->config->get_cfg_value("ridbase");
+          $this->ridBase= $this->config->get_cfg_value("sambaRidBase");
         } 
 
         /* Get domain name for SID */
@@ -155,9 +155,9 @@ class group extends plugin
           }
         }
       } else {
-        if ($this->config->get_cfg_value("ridbase") != ""){
+        if ($this->config->get_cfg_value("sambaRidBase") != ""){
           $this->sambaDomainName= "DEFAULT";
-          $this->ridBase= $this->config->get_cfg_value("ridbase");
+          $this->ridBase= $this->config->get_cfg_value("sambaRidBase");
           $this->SID= $this->config->get_cfg_value("sid");
         } else {
           msg_dialog::display(_("Configuration error"), _("Cannot find group SID in your configuration!"), ERROR_DIALOG);
@@ -1145,8 +1145,8 @@ class group extends plugin
       if (!tests::is_id($this->gidNumber)){
         $message[]= msgPool::invalid(_("GID"), $this->gidNumber, "/[0-9]/");
       } else {
-        if ($this->gidNumber < $this->config->get_cfg_value("minid")){
-          $message[]= msgPool::toosmall(_("GID"), $this->config->get_cfg_value("minid"));
+        if ($this->gidNumber < $this->config->get_cfg_value("minId")){
+          $message[]= msgPool::toosmall(_("GID"), $this->config->get_cfg_value("minId"));
         }
 
       }
@@ -1187,7 +1187,7 @@ class group extends plugin
     }
 
     /* Find out next free id near to UID_BASE */
-    if ($this->config->get_cfg_value("base_hook") == ""){
+    if ($this->config->get_cfg_value("nextIdHook") == ""){
       $base= $this->config->get_cfg_value("uidNumberBase");
     } else {
       /* Call base hook */

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index bd26203f9d195d6b7c7dc88eace62a36484640f3..3cafa82664b88a07973703976789b872900a05d0 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -803,7 +803,7 @@ class userManagement extends plugin
          react on this. */
       $this->dn= "new";
       
-       $this->got_uid= ($this->config->get_cfg_value("idgen") == "");
+       $this->got_uid= ($this->config->get_cfg_value("idGenerator") == "");
 
       /* Create new usertab object */
       $this->usertab= new usertabs($this->config,$this->config->data['TABS']['USERTABS'], $this->dn);
@@ -866,8 +866,8 @@ class userManagement extends plugin
         msg_dialog::displayChecks($message);
       } else {
         $attributes= array('sn' => $this->sn, 'givenName' => $this->givenName);
-        if ($this->config->get_cfg_value("idgen") != ""){
-          $uids= gen_uids ($this->config->get_cfg_value("idgen"), $attributes);
+        if ($this->config->get_cfg_value("idGenerator") != ""){
+          $uids= gen_uids ($this->config->get_cfg_value("idGenerator"), $attributes);
           if (count($uids)){
             $smarty->assign("edit_uid", "false");
             $smarty->assign("uids", $uids);

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 8e4b046f1fb907dac3a128a2672a5cce1539118c..eca6c0a0a09f47559e71bfdf7da10b4ca7476089 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -138,7 +138,7 @@ class user extends plugin
   {
     $this->config= $config;
     /* Configuration is fine, allways */
-    if($this->config->get_cfg_value("governmentmode") == "true"){
+    if($this->config->get_cfg_value("honourIvbbAttributes") == "true"){
       $this->governmentmode = TRUE;
       $this->attributes=array_merge($this->attributes,$this->govattrs);
     }
@@ -580,9 +580,9 @@ class user extends plugin
       }
   
       if($this->governmentmode){
-        $smarty->assign("governmentmode", "true");
+        $smarty->assign("honourIvbbAttributes", "true");
       }else{
-        $smarty->assign("governmentmode", "false");
+        $smarty->assign("honourIvbbAttributes", "false");
       }
       return($smarty->fetch (get_template_path('generic_certs.tpl', TRUE, dirname(__FILE__))));
     }
@@ -1089,7 +1089,7 @@ class user extends plugin
         ldap_set_option($this->cid, LDAP_OPT_REFERRALS, 1);
         ldap_set_rebind_proc($ds, array(&$this, "rebind"));
       }
-      if($this->config->get_cfg_value("tls") == "true"){
+      if($this->config->get_cfg_value("ldapTLS") == "true"){
         ldap_start_tls($ds);
       }
       if (!($res = @ldap_bind($ds, $this->config->current['ADMIN'],
@@ -1132,7 +1132,7 @@ class user extends plugin
   function update_new_dn()
   {
     $pt= "";
-    if($this->config->get_cfg_value("include_personal_title") == "true"){
+    if($this->config->get_cfg_value("personalTitleInDN") == "true"){
       if(!empty($this->personalTitle)){
         $pt = $this->personalTitle." ";
       }
@@ -1300,7 +1300,7 @@ class user extends plugin
       ldap_set_option($this->cid, LDAP_OPT_REFERRALS, 1);
       ldap_set_rebind_proc($ds, array(&$this, "rebind"));
     }
-    if ($this->config->get_cfg_value("tls") == "true"){
+    if ($this->config->get_cfg_value("ldapTLS") == "true"){
       ldap_start_tls($ds);
     }
 
@@ -1553,7 +1553,7 @@ class user extends plugin
 
     /* Append government attributes if required */
     global $config;
-    if($config->get_cfg_value("governmentmode") == "true"){
+    if($config->get_cfg_value("honourIvbbAttributes") == "true"){
       foreach($govattrs as $attr => $desc){
         $ret["plProvidedAcls"][$attr] = $desc;
       }

diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index 3470ed4129e700b8ec9f0697869373e3ce663ce5..e3684e05e14b31f916fe61b16e313bf66eea7d2c 100644 (file)
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -44,7 +44,7 @@ class password extends plugin
     $smarty->assign("NotAllowed" , !preg_match("/w/i",$password_ACLS));
 
     /* Display expiration template */
-    if ($this->config->get_cfg_value("account_expiration") == "true"){
+    if ($this->config->get_cfg_value("handleExpiredAccounts") == "true"){
       $expired= ldap_expired_account($this->config, $ui->dn, $ui->username);
       if($expired == 4){
         return($smarty->fetch(get_template_path("nochange.tpl", TRUE)));
@@ -100,7 +100,7 @@ class password extends plugin
             $_POST['current_password'],
             $this->config->current['SERVER'],
             $this->config->get_cfg_value("recursive") == "true",
-            $this->config->get_cfg_value("tls") == "true");
+            $this->config->get_cfg_value("ldapTLS") == "true");
 
         /* connection Successfull ? */
         if (!$tldap->success()){

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 93393a5bb607ed8f4bf65bc171867fdb269354b0..630e180b6650e22ee1c6ab649c5f6c56fb89317d 100644 (file)
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -1028,15 +1028,15 @@ class posixAccount extends plugin
       if (!tests::is_id($this->uidNumber)){
         $message[]= msgPool::invalid(_("UID"), $this->uidNumber, "/[0-9]/");
       } else {
-        if ($this->uidNumber < $this->config->get_cfg_value("minid")){
-          $message[]= msgPool::toosmall(_("UID"), $this->config->get_cfg_value("minid"));
+        if ($this->uidNumber < $this->config->get_cfg_value("minId")){
+          $message[]= msgPool::toosmall(_("UID"), $this->config->get_cfg_value("minId"));
         }
       }
       if (!tests::is_id($this->gidNumber)){
         $message[]= msgPool::invalid(_("GID"), $this->gidNumber, "/[0-9]/");
       } else {
-        if ($this->gidNumber < $this->config->get_cfg_value("minid")){
-          $message[]= msgPool::toosmall(_("GID"), $this->config->get_cfg_value("minid"));
+        if ($this->gidNumber < $this->config->get_cfg_value("minId")){
+          $message[]= msgPool::toosmall(_("GID"), $this->config->get_cfg_value("minId"));
         }
       }
     }
@@ -1317,7 +1317,7 @@ class posixAccount extends plugin
     }
 
     /* Find out next free id near to UID_BASE */
-    if ($this->config->get_cfg_value("base_hook") == ""){
+    if ($this->config->get_cfg_value("nextIdHook") == ""){
       $base= $lwm;
     } else {
       /* Call base hook */

diff --git a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
index 397b2fd302e6142c4c9901b28744986746f23ca6..6e59f90aa890d0388786ed20b9a875ae3ac879ca 100644 (file)
--- a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
+++ b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
@@ -138,7 +138,7 @@ class passwordMethodheimdal extends passwordMethod
        function generate_hash($pwd)
        {
     $mode= "kerberos";
-    if ($this->config->get_cfg_value("krbsasl") == "true"){
+    if ($this->config->get_cfg_value("useSaslForKerberos") == "true"){
       $mode= "sasl";
     }
 
@@ -196,7 +196,7 @@ class passwordMethodheimdal extends passwordMethod
   function get_hash_name()
   {
     $mode= "kerberos";
-    if ($this->config->get_cfg_value("krbsasl") == "true"){
+    if ($this->config->get_cfg_value("useSaslForKerberos") == "true"){
       $mode= "sasl";
     }
     return "$mode";

diff --git a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc
index 7c656a606aa001ef1eca27897e411b0671ddae8a..eba099944c74f5beb05a63972f0fd1bdbc057a03 100644 (file)
--- a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc
+++ b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc
@@ -38,12 +38,12 @@ class mailMethodGolab extends mailMethodCyrus
     /* Check if the mail account identification attribute
        is overridden in the configuration file
      */
-    if ($config->get_cfg_value("mail_attrib") != ""){
-      $new_uattrib= strtolower($config->get_cfg_value("mail_attrib"));
+    if ($config->get_cfg_value("mailAttribute") != ""){
+      $new_uattrib= strtolower($config->get_cfg_value("mailAttribute"));
       if(in_array($new_uattrib,array("mail","uid"))){
         $this->uattrib = $new_uattrib;
       }else{
-        trigger_error(sprintf("Unsupported MAIL_ATTRIB in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
+        trigger_error(sprintf("Unsupported 'mailAttribute' in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
       }
     }
 

diff --git a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
index f4ae1d7747bc398df7d70aa01ab4105bea1c3b53..101361a5e128c6da3d50eda11c7279b57e452870 100644 (file)
--- a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
+++ b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
@@ -37,12 +37,12 @@ class mailMethodKolab extends mailMethodCyrus
     /* Check if the mail account identification attribute
        is overridden in the configuration file
      */
-    if ($config->get_cfg_value("mail_attrib") != ""){
-      $new_uattrib= strtolower($config->get_cfg_value("mail_attrib"));
+    if ($config->get_cfg_value("mailAttribute") != ""){
+      $new_uattrib= strtolower($config->get_cfg_value("mailAttribute"));
       if(in_array($new_uattrib,array("mail","uid"))){
         $this->uattrib = $new_uattrib;
       }else{
-        trigger_error(sprintf("Unsupported MAIL_ATTRIB in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
+        trigger_error(sprintf("Unsupported 'mailAttribute' in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
       }
     }
 

diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_export.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_export.inc
index da643f7737db1a6108ee8eed7641ffea18c69a0d..1f2d38ccf9a3fba051805c8e5590f57e7e517f36 100644 (file)
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/class_export.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/class_export.inc
@@ -69,8 +69,8 @@ class ldifexport extends plugin
     // Get the LDAP link, to generate the Export
     $ldap = $this->config->get_ldap_link();
 
-    if ($this->config->get_cfg_value('governmentmode') == 'true'){
-      $smarty->assign ("govmode", $this->config->get_cfg_value("governmentmode"));
+    if ($this->config->get_cfg_value('honourIvbbAttributes') == 'true'){
+      $smarty->assign ("govmode", $this->config->get_cfg_value("honourIvbbAttributes"));
       $smarty->assign("LDIFError",FALSE);
     }
 

diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
index e9464a3d4e188b9c0eb586930ba5c5006b32d94a..469090097c5a6395a9d43ff76bc8abfd565b9870 100644 (file)
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
@@ -83,7 +83,7 @@ class xlsexport extends plugin
     // Get the LDAP link, to generate the Export
     $ldap = $this->config->get_ldap_link();
 
-    $smarty->assign ("govmode", $this->config->get_cfg_value("governmentmode"));
+    $smarty->assign ("govmode", $this->config->get_cfg_value("honourIvbbAttributes"));
     $smarty->assign("LDIFError",FALSE);
 
     if(isset($dn))

diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
index c1e524199f39a397d44d440dcae2c0fb2ecc6ccc..147661bf8235683855725f8ba83a36e077583b50 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
@@ -33,19 +33,19 @@ class mailMethodCyrus extends mailMethod
     /* Check if the mail account identification attribute
        is overridden in the configuration file
      */
-    if($config->get_cfg_value("mail_attrib") != ""){
-      $new_uattrib= strtolower($config->get_cfg_value("mail_attrib"));
+    if($config->get_cfg_value("mailAttribute") != ""){
+      $new_uattrib= strtolower($config->get_cfg_value("mailAttribute"));
       if(in_array($new_uattrib,array("mail","uid"))){
         $this->uattrib = $new_uattrib;
       }else{
-        trigger_error(sprintf("Unsupported MAIL_ATTRIB in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
+        trigger_error(sprintf("Unsupported 'mailAttribute' in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
       }
     }
     
     /* Create the account prefix  user. user/ 
        Preset folder prefix. Will change it later to respect
        altnamespace. */
-    if ($config->get_cfg_value("cyrusunixstyle") == "true"){
+    if ($config->get_cfg_value("cyrusUseSlashes") == "true"){
       $this->user_prefix= "user/";
     }
 

diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc
index b80758ea432e668fdcb3aac79cecc24fd491f955..498fb3ecb9b7a0a28428f383c74529696107c5fc 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc
@@ -26,12 +26,12 @@ class mailMethodSendmailCyrus extends mailMethodCyrus
     /* Check if the mail account identification attribute
        is overridden in the configuration file
      */
-    if($config->get_cfg_value("mail_attrib") != ""){
-      $new_uattrib= strtolower($config->get_cfg_value("mail_attrib"));
+    if($config->get_cfg_value("mailAttribute") != ""){
+      $new_uattrib= strtolower($config->get_cfg_value("mailAttribute"));
       if(in_array($new_uattrib,array("mail","uid"))){
         $this->uattrib = $new_uattrib;
       }else{
-        trigger_error(sprintf("Unsupported MAIL_ATTRIB in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
+        trigger_error(sprintf("Unsupported 'mailAttribute' in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
       }
     }
 

diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods.inc b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
index a1f2af0ecf2ba438b39cc1b9a580bd3882cd4b6f..570a38aca2cfb181e60ffc05b9c174085783ce92 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mail-methods.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
@@ -30,12 +30,12 @@ class mailMethod
     /* Check if the mail account identification attribute
        is overridden in the configuration file
      */
-    if($config->get_cfg_value("mail_attrib") != ""){
-      $new_uattrib= strtolower($config->get_cfg_value("mail_attrib"));
+    if($config->get_cfg_value("mailAttribute") != ""){
+      $new_uattrib= strtolower($config->get_cfg_value("mailAttribute"));
       if(in_array($new_uattrib,array("mail","uid"))){
         $this->uattrib = $new_uattrib;
       }else{
-        trigger_error(sprintf("Unsupported MAIL_ATTRIB in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
+        trigger_error(sprintf("Unsupported 'mailAttribute' in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.",            $new_uattrib));
       }
     }
   }

diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index 23ff5785bbd13934f0473bb8b67b9bda3c7953d8..42251b8724ccf4456668f20a2a73642fe2f4a156 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -163,8 +163,8 @@ class mailAccount extends plugin
 
     /* Fill vacation array */
     $this->vacation= array();
-    if ($this->config->get_cfg_value("vacationdir") != ""){
-      $dir= $this->config->get_cfg_value("vacationdir");
+    if ($this->config->get_cfg_value("vacationTemplateDirectory") != ""){
+      $dir= $this->config->get_cfg_value("vacationTemplateDirectory");
       if (is_dir($dir) && is_readable($dir)){
 
         /* Look for files and build the vacation array */

diff --git a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc
index 0c2636864290b0dca8f886d626dc0acf74c8eca6..134b1501d0ce8981693391610c0b50ab4a927400 100644 (file)
--- a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc
+++ b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc
@@ -338,7 +338,7 @@ class passwordMethodMIT extends passwordMethod
   public function generate_hash($pwd = "")
   {
     $mode= "kerberos";
-    if ($this->config->get_cfg_value("krbsasl") == "true"){
+    if ($this->config->get_cfg_value("useSaslForKerberos") == "true"){
       $mode= "sasl";
     }
     return "{".$mode."}".$this->attrs['uid'][0]."@".$this->goKrbRealm;
@@ -384,7 +384,7 @@ class passwordMethodMIT extends passwordMethod
   public function get_hash_name()
   {
     $mode= "kerberos";
-    if ($this->config->get_cfg_value("krbsasl") == "true"){
+    if ($this->config->get_cfg_value("useSaslForKerberos") == "true"){
       $mode= "sasl";
     }
     return "$mode";

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index fe3c81d08dcda523402f0772bb8709f6998979c3..42b84c08993c59ae1c06355bf24b340baf9456c2 100644 (file)
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -135,7 +135,7 @@ class sambaAccount extends plugin
         if(isset($attrs['sambaAlgorithmicRidBase'])){
           $this->ridBase= $attrs['sambaAlgorithmicRidBase'][0];
         } else {
-          $this->ridBase= $this->config->get_cfg_value("ridbase");
+          $this->ridBase= $this->config->get_cfg_value("sambaRidBase");
         }
         if ($this->sambaDomainName == ""){
           $this->sambaDomainName= $attrs['sambaDomainName'][0];
@@ -144,8 +144,8 @@ class sambaAccount extends plugin
         if ($this->sambaDomainName == ""){
           $this->sambaDomainName= "DEFAULT";
         }
-        $this->ridBase= $this->config->get_cfg_value("ridbase");
-        $this->SID= $this->config->get_cfg_value("sid");
+        $this->ridBase= $this->config->get_cfg_value("sambaRidBase");
+        $this->SID= $this->config->get_cfg_value("sambaSid");
       }
 
       /* Save in order to compare later on */