Moved more values

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

diff --git a/gosa-core/Changelog b/gosa-core/Changelog
index cba0fc95465100824ce29be2a614db0cf81d57a0..c86aa51d86f10c548165be34fe2d74cda1646267 100644 (file)
--- a/gosa-core/Changelog
+++ b/gosa-core/Changelog
@@ -1,7 +1,7 @@
 GOsa2 changelog
 ===============
 
-* gosa 2.6beta1
+* gosa 2.6
 
 * gosa 2.5.13
   - Re-added ISC DHCP support

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index fc072e156a5754178440187319bfdb5cb09d3e76..d092f09ee6ff4b84dbf5a43fce56ad1d828caf87 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -178,8 +178,8 @@ Q: I'd like to place my users under ou=staff, not under ou=people. Can I change
 A: Yes. You can change the people and group locations by adding the following
    statements to your location sections:
 
-   people="ou=staff"
-   groups="ou=crowds"
+   userRDN="ou=staff"
+   groupRDN="ou=crowds"
 
    After logging in again, people and groups are created in the configured places.
    As a side note, you can leave these strings blank for flat structures, too.

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 8d5ae5d210bdfd3b6ab9eacd966ae8016d8cb02e..1cc8e3b17e1b882c96259ad91122271c04696043 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -501,7 +501,7 @@
               uidNumberBase="{$cv.uidbase}"
               logging="{$cv.generic_settings.logging}"
 {if $cv.optional.sudoou_active}
-              sudoSubtree="{$cv.optional.sudoou}"
+              sudoRDN="{$cv.optional.sudoou}"
 {/if}
 {if $cv.optional.login_attribute}
               loginAttribute="{$cv.optional.login_attribute}"

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index a581a9faebdf033662be461dce745ef46c6f29ba..5abb99fbea46b2d5f7ad26c6c2fb970195b12054 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -663,21 +663,21 @@ defined departments. The default is
 .I ou=people.
 .PP
 
-.B groups
+.B groupsRDN
 .I string
 .PP
 The
-.I groups
+.I groupsRDN
 statement defines the location where new groups will be created inside of
 defined departments. The default is
 .I ou=groups.
 .PP
 
-.B sudoou
+.B sudoRDN
 .I string
 .PP
 The
-.I sudoou
+.I sudoRDN
 statement defines the location where new groups will be created inside of
 defined departments. The default is
 .I ou=groups.
@@ -810,29 +810,29 @@ statement tells GOsa to follow LDAP referrals.
 
 .B Account creation options
 .PP
-.B uidbase
+.B uidNumberBase
 .I integer
 .PP
 The
-.I uidbase
+.I uidNumberBase
 statement defines where to start looking for a new free user id. This should be synced
 with your
 .I adduser.conf
-to avoid overlapping uidNumber values between local and LDAP based lookups. The uidbase
+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
 definition below.
 .PP
 
-.B gidbase
+.B gidNumberBase
 .I integer
 .PP
 The
-.I gidbase
+.I gidNumberBase
 statement defines where to start looking for a new free group id. This should be synced
 with your
 .I adduser.conf
-to avoid overlapping gidNumber values between local and LDAP based lookups. The gidbase
+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
 definition below.

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 481da05236d2f7d39cdca2c3e8db040025fd97ab..9430543471a78a4058581edf702544f8d3971e39 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -293,7 +293,7 @@ class config  {
     if (!isset($this->current['USERRDN'])){
       $this->current['USERRDN']= "ou=people";
     }
-    if (!isset($this->current['GROUPS'])){
+    if (!isset($this->current['GROUPRDN'])){
       $this->current['GROUPS']= "ou=groups";
     }
 
@@ -302,7 +302,7 @@ class config  {
     }
   
     /* Remove possibly added ',' from end of group and people ou */
-    $this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPS']);
+    $this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPRDN']);
     $this->current['USERRDN'] = preg_replace("/,*$/","",$this->current['USERRDN']);
 
     if (!isset($this->current['WINSTATIONS'])){

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index f58ed2a2e60ab73da2d552bd8bbf1711abc85f30..d0b5cc71e9bf35ac68c9994fb52877a7892f4571 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1221,7 +1221,7 @@ function get_people_ou()
 
 function get_groups_ou()
 {
-  return (get_ou("GROUPS"));
+  return (get_ou("GROUPRDN"));
 }
 
 
@@ -2206,17 +2206,17 @@ function get_base_from_hook($dn, $attrib)
           return ($output[0]);
         } else {
           msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
-          return ($config->get_cfg_value("uidbase"));
+          return ($config->get_cfg_value("uidNumberBase"));
         }
       } else {
         msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
-        return ($config->get_cfg_value("uidbase"));
+        return ($config->get_cfg_value("uidNumberBase"));
       }
 
     } else {
 
       msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
-      return ($config->get_cfg_value("uidbase"));
+      return ($config->get_cfg_value("uidNumberBase"));
 
     }
   }

diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index 13c16fac5dde0e62af68c8ca4c107fc14b743322..66c3554f3f1427094cd0e899d15ef9882244ee76 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -1188,7 +1188,7 @@ class group extends plugin
 
     /* Find out next free id near to UID_BASE */
     if ($this->config->get_cfg_value("base_hook") == ""){
-      $base= $this->config->get_cfg_value("uidbase");
+      $base= $this->config->get_cfg_value("uidNumberBase");
     } else {
       /* Call base hook */
       $base= get_base_from_hook($dn, $attrib);

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index efb332422e0b8c984af58fcce11db82f7c20594a..93393a5bb607ed8f4bf65bc171867fdb269354b0 100644 (file)
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -1302,10 +1302,10 @@ class posixAccount extends plugin
 
     /* get the ranges */
     $tmp = array('0'=> 1000); 
-    if (preg_match('/posixAccount/', $oc) && $this->config->get_cfg_value("uidbase") != ""){
-      $tmp= split('-',$this->config->get_cfg_value("uidbase"));
-    } elseif($this->config->get_cfg_value("gidbase") != ""){
-      $tmp= split('-',$this->config->get_cfg_value("gidbase"));
+    if (preg_match('/posixAccount/', $oc) && $this->config->get_cfg_value("uidNumberBase") != ""){
+      $tmp= split('-',$this->config->get_cfg_value("uidNumberBase"));
+    } elseif($this->config->get_cfg_value("gidNumberBase") != ""){
+      $tmp= split('-',$this->config->get_cfg_value("gidNumberBase"));
     }
 
     /* Set hwm to max if not set - for backward compatibility */