Renamed a couple of additional gosa.conf values

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

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index 4ece79621603f7b8dc01e564496c279168488383..58b46c2ff1f43d425e71b1b1aff15dd30b72e477 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -689,7 +689,7 @@ defined departments. The default is
 This statement defines the location where GOsa looks for new samba workstations.
 .PP
 
-.B ogroupou
+.B ogroupRDN
 .I string
 .PP
 This statement defines the location where GOsa creates new object groups inside of defined

diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index c5a43af17bfcb1706ef3ec2414fef9b74ac78443..38156dd54081c46b09cf1c2a39552af6def58bce 100644 (file)
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -949,7 +949,7 @@ class plugin
         if this is the case, then update this objectgroup to use the new dn.
      */
     $ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(member=*))","ogroups",
-        array(get_ou("ogroupou")),$this->config->current['BASE'],array("member"),
+        array(get_ou("ogroupRDN")),$this->config->current['BASE'],array("member"),
         GL_SUBSEARCH | GL_NO_ACL_CHECK) ;
 
     /* Walk through all objectGroups and check if there are 

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 0818cda61cb2b95fb3e2b077d83dbdacbe53694d..827a38f95583e944638613bbbd2c772646462380 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1151,8 +1151,8 @@ function get_ou($name)
   global $config;
 
   $map = array( 
-                "ogroupou"      => "ou=groups,",
-                "applicationou" => "ou=apps,",
+                "ogroupRDN"      => "ou=groups,",
+                "applicationRDN" => "ou=apps,",
                 "systemRDN"     => "ou=systems,",
                 "serverRDN"      => "ou=servers,ou=systems,",
                 "terminalRDN"    => "ou=terminals,ou=systems,",
@@ -1164,23 +1164,23 @@ function get_ou($name)
 
                 "faxBlocklistRDN"   => "ou=gofax,ou=systems,",
                 "systemIncomingRDN"    => "ou=incoming,",
-                "aclroleou"     => "ou=aclroles,",
-                "macroou"       => "ou=macros,ou=asterisk,ou=configs,ou=systems,",
+                "aclRoleRDN"     => "ou=aclroles,",
+                "phoneMacroRDN"       => "ou=macros,ou=asterisk,ou=configs,ou=systems,",
                 "phoneConferenceRDN"  => "ou=conferences,ou=asterisk,ou=configs,ou=systems,",
 
-                "faiou"         => "ou=fai,ou=configs,ou=systems,",
-                "faiscriptou"   => "ou=scripts,",
-                "faihookou"     => "ou=hooks,",
-                "faitemplateou" => "ou=templates,",
-                "faivariableou" => "ou=variables,",
-                "faiprofileou"  => "ou=profiles,",
-                "faipackageou"  => "ou=packages,",
-                "faipartitionou"=> "ou=disk,",
+                "faiBaseRDN"         => "ou=fai,ou=configs,ou=systems,",
+                "faiScriptRDN"   => "ou=scripts,",
+                "faiHookRDN"     => "ou=hooks,",
+                "faiTemplateRDN" => "ou=templates,",
+                "faiVariableRDN" => "ou=variables,",
+                "faiProfileRDN"  => "ou=profiles,",
+                "faiPackageRDN"  => "ou=packages,",
+                "faiPartitionRDN"=> "ou=disk,",
 
                 "sudoRDN"       => "ou=sudoers,",
 
-                "deviceou"      => "ou=devices,",
-                "mimetypeou"    => "ou=mime,");
+                "deviceRDN"      => "ou=devices,",
+                "mimetypeRDN"    => "ou=mime,");
 
   /* Preset ou... */
   if ($config->get_cfg_value($name, "_not_set_") != "_not_set_"){

diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc
index 63fc809b48e676325c232f367fcced41788e4ef6..910a319864f690d22dc771efb389aa4c2113ebe4 100644 (file)
--- a/gosa-core/plugins/admin/acl/class_aclManagement.inc
+++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc
@@ -479,7 +479,7 @@ class aclManagement extends plugin
     $fetch_this = array(
       "ME"      => array("TYPE" => "cat"    , "FLAGS" => GL_SIZELIMIT                ,"BASE"=>""),
       "SYSTEMS" => array("TYPE" => "search" , "FLAGS" => GL_SIZELIMIT | GL_SUBSEARCH ,"BASE"=>get_ou('systemRDN')),
-      "APPS"    => array("TYPE" => "search" , "FLAGS" => GL_SIZELIMIT | GL_SUBSEARCH ,"BASE"=>get_ou('applicationou')),
+      "APPS"    => array("TYPE" => "search" , "FLAGS" => GL_SIZELIMIT | GL_SUBSEARCH ,"BASE"=>get_ou('applicationRDN')),
       "PEOPLE"  => array("TYPE" => "search" , "FLAGS" => GL_SIZELIMIT | GL_SUBSEARCH ,"BASE"=>get_people_ou()),
       "GROUPS"  => array("TYPE" => "search" , "FLAGS" => GL_SIZELIMIT | GL_SUBSEARCH ,"BASE"=>get_groups_ou()));
 
@@ -506,7 +506,7 @@ class aclManagement extends plugin
 
     }else{
 
-      $tmp_roles = get_list($FilterRoles,  "acl", get_ou('aclroleou').$base, $Attrs,GL_SIZELIMIT);
+      $tmp_roles = get_list($FilterRoles,  "acl", get_ou('aclRoleRDN').$base, $Attrs,GL_SIZELIMIT);
 
       foreach($tmp_roles as $entry){
         $res[] = $entry;

diff --git a/gosa-core/plugins/admin/acl/tabs_acl_role.inc b/gosa-core/plugins/admin/acl/tabs_acl_role.inc
index ce8f984c64181c0c10c8197f966351469fd468e7..4b8a211a2cf10a51def2a9475d3b1614cd41fefa 100644 (file)
--- a/gosa-core/plugins/admin/acl/tabs_acl_role.inc
+++ b/gosa-core/plugins/admin/acl/tabs_acl_role.inc
@@ -35,7 +35,7 @@ class aclroletab extends tabs
 
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
-    $new_dn= 'cn='.$baseobject->cn.",".get_ou('aclroleou').$baseobject->base;
+    $new_dn= 'cn='.$baseobject->cn.",".get_ou('aclRoleRDN').$baseobject->base;
 
     if ($this->dn != $new_dn){
 

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index dd4f7146e1cc22950415d4ebde4c23703eac5009..761b4d9fabaa9d6aa895040c73067610a21ced55 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -124,7 +124,7 @@ class ogroup extends plugin
     if ($this->dn == "new"){
       $this->base = session::get('CurrentMainBase');
     } else {
-      $this->base= preg_replace("/^[^,]+,".normalizePreg(get_ou("ogroupou"))."/","",$this->dn);
+      $this->base= preg_replace("/^[^,]+,".normalizePreg(get_ou("ogroupRDN"))."/","",$this->dn);
 
       /* Is this account a trustAccount? */
       if ($this->is_account && isset($this->attrs['trustModel'])){
@@ -652,7 +652,7 @@ class ogroup extends plugin
     $p_f= array("accounts"=> array("OBJ"=>"user", "CLASS"=>"gosaAccount"    ,
           "DN"=> get_people_ou()           ,"ACL" => "users"), 
         "groups"          => array("OBJ"=>"group", "CLASS"=>"posixGroup"     ,
-          "DN"=> get_groups_ou('ogroupou') ,"ACL" => "groups"), 
+          "DN"=> get_groups_ou('ogroupRDN') ,"ACL" => "groups"), 
         "departments"     => array("OBJ"=>"department", "CLASS"=>"gosaDepartment" ,
           "DN"=> ""                        ,"ACL" => "department"), 
         "servers"         => array("OBJ"=>"servgeneric", "CLASS"=>"goServer"       ,
@@ -673,7 +673,7 @@ class ogroup extends plugin
       */
     if(!$this->IsReleaseManagementActivated()){
       $p_f[      "applications"]    = array("OBJ"=>"application", "CLASS"=>"gosaApplication",
-          "DN"=> get_ou('applicationou')   ,"ACL" => "application"); 
+          "DN"=> get_ou('applicationRDN')   ,"ACL" => "application"); 
     }
            
     /*###########
@@ -884,7 +884,7 @@ class ogroup extends plugin
 
     /* Permissions for that base? */
     if ($this->base != ""){
-      $new_dn= 'cn='.$this->cn.','.get_ou('ogroupou').$this->base;
+      $new_dn= 'cn='.$this->cn.','.get_ou('ogroupRDN').$this->base;
     } else {
       $new_dn= $this->dn;
     }
@@ -958,7 +958,7 @@ class ogroup extends plugin
 
     /* New accounts need proper 'dn', propagate it to remaining objects */
     if ($this->dn == 'new'){
-      $this->dn= 'cn='.$this->cn.','.get_ou('ogroupou').$this->base;
+      $this->dn= 'cn='.$this->cn.','.get_ou('ogroupRDN').$this->base;
     }
 
     /* Save data. Using 'modify' implies that the entry is already present, use 'add' for

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index 77e5c65344a4fb20816ef9dbeddf700304150c76..978bc0c87f4f8284b4ff00386eb5dce4f18a3fc4 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -513,7 +513,7 @@ class ogroupManagement extends plugin
   /* Return departments, that will be included within snapshot detection */
   function get_used_snapshot_bases()
   {
-    return(array(get_ou('ogroupou').$this->DivListOGroup->selectedBase));
+    return(array(get_ou('ogroupRDN').$this->DivListOGroup->selectedBase));
   }
 
   
@@ -601,9 +601,9 @@ class ogroupManagement extends plugin
     $filter= "(&(cn=$Regex)(objectClass=gosaGroupOfNames)(|$filter))";
 
     if($this->DivListOGroup->SubSearch){
-      $res= get_sub_list($filter, "ogroups",get_ou('ogroupou'), $base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT | GL_SUBSEARCH);
+      $res= get_sub_list($filter, "ogroups",get_ou('ogroupRDN'), $base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT | GL_SUBSEARCH);
     }else{
-      $res= get_sub_list($filter, "ogroups",get_ou('ogroupou'), get_ou('ogroupou').$base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT );
+      $res= get_sub_list($filter, "ogroups",get_ou('ogroupRDN'), get_ou('ogroupRDN').$base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT );
     }
 
     $this->ogrouplist= $res;

diff --git a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
index a2ea7c23e079a19d603f7ecdfff13e3a1c9d9e89..43804d1024c0db6361fa2d0713cb20503c9bf327 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
@@ -354,7 +354,7 @@ class ogrouptabs extends tabs
 
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
-    $new_dn= 'cn='.$baseobject->cn.','.get_ou('ogroupou').$baseobject->base;
+    $new_dn= 'cn='.$baseobject->cn.','.get_ou('ogroupRDN').$baseobject->base;
 
     /* Move group? */
     if ($this->dn != $new_dn){
@@ -370,7 +370,7 @@ class ogrouptabs extends tabs
     }
 
     if ($this->dn == "new"){
-      $this->dn= 'cn='.$baseobject->cn.','.get_ou('ogroupou').$baseobject->base;
+      $this->dn= 'cn='.$baseobject->cn.','.get_ou('ogroupRDN').$baseobject->base;
     }
 
     tabs::save();

diff --git a/gosa-plugins/fai/admin/fai/class_FAI.inc b/gosa-plugins/fai/admin/fai/class_FAI.inc
index ec75c333ef381f33ecad3e02390b42bc4688f0f2..3a5fc0063cf17e476ad4b890ce05df36b39e5e39 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_FAI.inc
+++ b/gosa-plugins/fai/admin/fai/class_FAI.inc
@@ -151,8 +151,8 @@ class FAI
   {
     global $config;
 
-    if(!preg_match("/".normalizePreg(get_ou('faiou'))."/",$dn)){
-      $base = get_ou('faiou').$dn;
+    if(!preg_match("/".normalizePreg(get_ou('faiBaseRDN'))."/",$dn)){
+      $base = get_ou('faiBaseRDN').$dn;
     }else{
       $base = $dn;
     }
@@ -163,7 +163,7 @@ class FAI
     $ldap->search("(objectClass=FAIbranch)",array("ou","dn"));
     while($attrs = $ldap->fetch()){
       if($appendedName){
-        $res[$attrs['dn']] = convert_department_dn(preg_replace("/,".normalizePreg(get_ou('faiou')).".*$/","",$attrs['dn']));
+        $res[$attrs['dn']] = convert_department_dn(preg_replace("/,".normalizePreg(get_ou('faiBaseRDN')).".*$/","",$attrs['dn']));
       }else{
         $res[$attrs['dn']] = $attrs['ou'][0];
       }
@@ -207,7 +207,7 @@ class FAI
 
       /* Dont't try to modify non FAIclasses  
        */
-      if(!preg_match("/[^,]+,".normalizePreg(get_ou("faiou"))."/",$obj_dn)){
+      if(!preg_match("/[^,]+,".normalizePreg(get_ou("faiBaseRDN"))."/",$obj_dn)){
         trigger_error("PLEASE check fai class handling in ".__LINE__." -> ".__FILE__);        
         echo "<br>-->".$Current_DN."<br>";
         echo "<br>-->".$obj_dn."<br>";
@@ -902,8 +902,8 @@ class FAI
     $ldap->search("(objectClass=FAIbranch)",array("ou","FAIstate"));
     while($attrs = $ldap->fetch()){
       foreach($sub_releases as $sub_rel){
-        if(preg_match("/^".normalizePreg($sub_rel.get_ou('faiou'))."/",$attrs['dn'])){
-          $f_releases[$sub_rel.get_ou('faiou')] = $attrs;
+        if(preg_match("/^".normalizePreg($sub_rel.get_ou('faiBaseRDN'))."/",$attrs['dn'])){
+          $f_releases[$sub_rel.get_ou('faiBaseRDN')] = $attrs;
         }
       }
     }
@@ -924,8 +924,8 @@ class FAI
     foreach($sub_releases as $name => $sub_rel){
 
       $FAIstate = "";
-      if(isset($f_releases[$sub_rel.get_ou('faiou')]) && isset($f_releases[$sub_rel.get_ou('faiou')]['FAIstate'])){
-        $FAIstate = $f_releases[$sub_rel.get_ou('faiou')]['FAIstate'][0];
+      if(isset($f_releases[$sub_rel.get_ou('faiBaseRDN')]) && isset($f_releases[$sub_rel.get_ou('faiBaseRDN')]['FAIstate'])){
+        $FAIstate = $f_releases[$sub_rel.get_ou('faiBaseRDN')]['FAIstate'][0];
       }
 
       foreach($groups as $dn => $data){

diff --git a/gosa-plugins/fai/admin/fai/class_faiHook.inc b/gosa-plugins/fai/admin/fai/class_faiHook.inc
index 141fc5e3d7ba9bb7f94137ebb870736e1a6ef890..def5b3541c964c7ab0d0cc30f27b341fd1bbab62 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiHook.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiHook.inc
@@ -437,7 +437,7 @@ class faiHook extends plugin
      */
     if($this->is_new){
       $release = $this->parent->parent->fai_release;
-      $new_dn= 'cn='.$this->cn.",".get_ou('faihookou').get_ou('faiou').$release;
+      $new_dn= 'cn='.$this->cn.",".get_ou('faiHookRDN').get_ou('faiBaseRDN').$release;
       $res = faiManagement::check_class_name("FAIhook",$this->cn,$new_dn);
       if(isset($res[$this->cn])){
         $message[] = msgPool::duplicated(_("Name"));

diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index 68f427dd1e63970908ca650584efbdd280cb929c..ef2e20c1850ababf3ba5f71d160b98be7c75b55b 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -82,7 +82,7 @@ class faiManagement extends plugin
     }
 
     /* Set default release */
-    $this->fai_base = get_ou("faiou").$this->config->current['BASE'];
+    $this->fai_base = get_ou("faiBaseRDN").$this->config->current['BASE'];
 
     if(!session::is_set("fai_filter")){
 
@@ -576,9 +576,9 @@ class faiManagement extends plugin
 
             $ldap->cd($bb);
             $ldap->recursive_remove();
-            $ldap->cd(preg_replace('/,'.normalizePreg(get_ou('faiou')).'/', ','.get_ou('applicationou'), $bb));
+            $ldap->cd(preg_replace('/,'.normalizePreg(get_ou('faiBaseRDN')).'/', ','.get_ou('applicationRDN'), $bb));
             $ldap->recursive_remove();
-            $ldap->cd(preg_replace('/,'.normalizePreg(get_ou('faiou')).'/', ','.get_ou('mimetypeou'), $bb));
+            $ldap->cd(preg_replace('/,'.normalizePreg(get_ou('faiBaseRDN')).'/', ','.get_ou('mimetypeRDN'), $bb));
             $ldap->recursive_remove();
 
             /* Search for all groups with configured application menus.
@@ -586,7 +586,7 @@ class faiManagement extends plugin
               - The search für menu configuration for the specified release and collect all those dns.
               - Remove entries
              */
-            $release_ou = preg_replace("/".normalizePreg(get_ou("faiou")).".*$/","",$bb);
+            $release_ou = preg_replace("/".normalizePreg(get_ou("faiBaseRDN")).".*$/","",$bb);
             $ldap->cd($this->config->current['BASE']);
             $ldap->search("(objectClass=posixGroup)",array("dn"));
           
@@ -728,11 +728,11 @@ class faiManagement extends plugin
           }
         }
 
-        $appsrc = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('applicationou'),$baseToUse); 
-        $appdst = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('applicationou'),"ou=".$name.",".$baseToUse) ; 
+        $appsrc = preg_replace("/".normalizePreg(get_ou('faiBaseRDN'))."/",get_ou('applicationRDN'),$baseToUse); 
+        $appdst = preg_replace("/".normalizePreg(get_ou('faiBaseRDN'))."/",get_ou('applicationRDN'),"ou=".$name.",".$baseToUse) ; 
 
-        $mimesrc = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('mimetypeou'),$baseToUse); 
-        $mimedst = preg_replace("/".normalizePreg(get_ou('faiou'))."/",get_ou('mimetypeou'),"ou=".$name.",".$baseToUse) ; 
+        $mimesrc = preg_replace("/".normalizePreg(get_ou('faiBaseRDN'))."/",get_ou('mimetypeRDN'),$baseToUse); 
+        $mimedst = preg_replace("/".normalizePreg(get_ou('faiBaseRDN'))."/",get_ou('mimetypeRDN'),"ou=".$name.",".$baseToUse) ; 
 
         /* Check if source depeartments exist */
         foreach(array($baseToUse,$appsrc,$mimesrc) as $dep){
@@ -1071,7 +1071,7 @@ class faiManagement extends plugin
   function get_used_snapshot_bases()
   {
     $tmp = array();
-    $types = array("faipartitionou","faiscriptou","faitemplateou","faihookou","faiprofileou","faivariableou","faipackageou");
+    $types = array("faiPartitionRDN","faiScriptRDN","faiTemplateRDN","faiHookRDN","faiProfileRDN","faiVariableRDN","faiPackageRDN");
     foreach($types as $type){
       $tmp[] = get_ou($type).$this->fai_release;
     }
@@ -1138,13 +1138,13 @@ class faiManagement extends plugin
      * Generate List of Partitions,Hooks,Scripts,Templates,Profiles ... 
      */
     $ObjectTypes = array(
-        "FAIpartitionTable"  => array("OU"=> get_ou('faipartitionou') , "CHKBOX"=>"ShowPartitions"  ,"ACL" => "faiPartitionTable"),
-        "FAIpackageList"     => array("OU"=> get_ou('faipackageou')   , "CHKBOX"=>"ShowPackages"    ,"ACL" => "faiPackage"),
-        "FAIscript"          => array("OU"=> get_ou('faiscriptou')    , "CHKBOX"=>"ShowScripts"     ,"ACL" => "faiScript"),
-        "FAIvariable"        => array("OU"=> get_ou('faivariableou')  , "CHKBOX"=>"ShowVariables"   ,"ACL" => "faiVariable"),
-        "FAIhook"            => array("OU"=> get_ou('faihookou')      , "CHKBOX"=>"ShowHooks"       ,"ACL" => "faiHook"),
-        "FAIprofile"         => array("OU"=> get_ou('faiprofileou')   , "CHKBOX"=>"ShowProfiles"    ,"ACL" => "faiProfile"),
-        "FAItemplate"        => array("OU"=> get_ou('faitemplateou')  , "CHKBOX"=>"ShowTemplates"   ,"ACL" => "faiTemplate"));
+        "FAIpartitionTable"  => array("OU"=> get_ou('faiPartitionRDN') , "CHKBOX"=>"ShowPartitions"  ,"ACL" => "faiPartitionTable"),
+        "FAIpackageList"     => array("OU"=> get_ou('faiPackageRDN')   , "CHKBOX"=>"ShowPackages"    ,"ACL" => "faiPackage"),
+        "FAIscript"          => array("OU"=> get_ou('faiScriptRDN')    , "CHKBOX"=>"ShowScripts"     ,"ACL" => "faiScript"),
+        "FAIvariable"        => array("OU"=> get_ou('faiVariableRDN')  , "CHKBOX"=>"ShowVariables"   ,"ACL" => "faiVariable"),
+        "FAIhook"            => array("OU"=> get_ou('faiHookRDN')      , "CHKBOX"=>"ShowHooks"       ,"ACL" => "faiHook"),
+        "FAIprofile"         => array("OU"=> get_ou('faiProfileRDN')   , "CHKBOX"=>"ShowProfiles"    ,"ACL" => "faiProfile"),
+        "FAItemplate"        => array("OU"=> get_ou('faiTemplateRDN')  , "CHKBOX"=>"ShowTemplates"   ,"ACL" => "faiTemplate"));
 
     $filter = "";
     foreach($ObjectTypes as $key => $data){

diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
index 88806cade7169344b163e7956cc9bfaaf0f9ba71..22c8637c07c0c0b564fb8ff1ad4855e749d94088 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
@@ -173,7 +173,7 @@ class faiPackage extends plugin
 
       /* Assemble release name */
       $release = $this->parent->parent->fai_release;
-      $tmp= preg_replace('/[,]*'.normalizePreg(get_ou('faiou')).'.*$/', '', $release);
+      $tmp= preg_replace('/[,]*'.normalizePreg(get_ou('faiBaseRDN')).'.*$/', '', $release);
       $tmp= preg_replace('/ou=/', '', $tmp);
       $rev= array_reverse(split(',', $tmp));
       $this->FAIdebianRelease= "/";
@@ -450,7 +450,7 @@ class faiPackage extends plugin
      */
     if($this->is_new){
       $release = $this->parent->parent->fai_release;
-      $new_dn= 'cn='.$this->cn.",".get_ou('faipackageou').get_ou('faiou').$release;
+      $new_dn= 'cn='.$this->cn.",".get_ou('faiPackageRDN').get_ou('faiBaseRDN').$release;
       $res = faiManagement::check_class_name("FAIpackageList",$this->cn,$new_dn);
       if(isset($res[$this->cn])){
         $message[] = msgPool::duplicated(_("Name"));
@@ -495,7 +495,7 @@ class faiPackage extends plugin
     if($this->FAIdebianRelease == "ClearFromCopyPaste"){
 
       $current_release  = $this->parent->parent->fai_release;
-      $tmp= preg_replace('/,'.normalizePreg(get_ou('faiou')).'.*$/', '', $current_release);
+      $tmp= preg_replace('/,'.normalizePreg(get_ou('faiBaseRDN')).'.*$/', '', $current_release);
       $tmp= preg_replace('/ou=/', '', $tmp);
       $rev= array_reverse(split(',', $tmp));
       $this->FAIdebianRelease= "";

diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index d624dfca520ce6aabac33462bf76fdff13936cf1..216369159799f70a22cde830a8c84d0480e8477f 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
@@ -365,7 +365,7 @@ class faiPartitionTable extends plugin
      */
     if($this->is_new){
       $release = $this->parent->parent->fai_release;
-      $new_dn= 'cn='.$this->cn.",".get_ou('faipartitionou').get_ou('faiou').$release;
+      $new_dn= 'cn='.$this->cn.",".get_ou('faiPartitionRDN').get_ou('faiBaseRDN').$release;
       $res = faiManagement::check_class_name("FAIpartitionTable",$this->cn,$new_dn);
       if(isset($res[$this->cn])){
         $message[] = msgPool::duplicated(_("Name"));

diff --git a/gosa-plugins/fai/admin/fai/class_faiProfile.inc b/gosa-plugins/fai/admin/fai/class_faiProfile.inc
index 601b2f1b2dfb296c33990d8753b0d5603dd82355..8e08c7635340d9031c6a12590f51fef242f2285d 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiProfile.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiProfile.inc
@@ -399,7 +399,7 @@ class faiProfile extends plugin
      */
     if($this->dn == "new" || $this->cn != $this->old_cn){
       $release = $this->parent->parent->fai_release;
-      $new_dn= 'cn='.$this->cn.",".get_ou('faiprofileou').get_ou('faiou').$release;
+      $new_dn= 'cn='.$this->cn.",".get_ou('faiProfileRDN').get_ou('faiBaseRDN').$release;
       $res = faiManagement::check_class_name("FAIprofile",$this->cn,$new_dn);
       if(isset($res[$this->cn])){
         $message[] = msgPool::duplicated(_("Name"));

diff --git a/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc b/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
index c0938a4c3300d6c7718ade6d06a0353928da4dce..53946eb4811ab455fa45b200a2344986e0382312 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
@@ -75,7 +75,7 @@ class faiProfileEntry extends plugin
 
     /* If no search filter is set, create one */
     if (!session::is_set("SUBfaifilter")){
-      $SUBfaifilter= array("base" => get_ou('faiou').session::get('CurrentMainBase'), "Sregex" => "*");
+      $SUBfaifilter= array("base" => get_ou('faiBaseRDN').session::get('CurrentMainBase'), "Sregex" => "*");
       $SUBfaifilter['SShowTemplates'] = true;
       $SUBfaifilter['SShowScripts']   = true;
       $SUBfaifilter['SShowHooks']     = true;

diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc
index fe28af277f9940572a0ab65e8f1a0687cddb5a26..67eed4dcebee304349f66afbbb2541055a117e2e 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiScript.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc
@@ -482,7 +482,7 @@ class faiScript extends plugin
      */
     if($this->is_new){
       $release = $this->parent->parent->fai_release;
-      $new_dn= 'cn='.$this->cn.",".get_ou('faiscriptou').get_ou('faiou').$release;
+      $new_dn= 'cn='.$this->cn.",".get_ou('faiScriptRDN').get_ou('faiBaseRDN').$release;
       $res = faiManagement::check_class_name("FAIscript",$this->cn,$new_dn);
       if(isset($res[$this->cn])){
         $message[] = msgPool::duplicated(_("Name"));

diff --git a/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc b/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc
index d948762b603ca0780a8d06d895ed152012a3e11c..99e6043783299f6b674cfae43fc8813ef36fb672 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc
@@ -41,13 +41,13 @@ class faiSummaryTab extends plugin{
 
     /* Base object configuration */
     $this->objs = array(       
-        "FAIscript"                => array(   "Image" =>"plugins/fai/images/fai_script.png",        "Name"=>_("Scripts")      ,"Tree" =>get_ou('faiscriptou')) ,
-        "FAIhook"                          => array(   "Image" =>"plugins/fai/images/fai_hook.png" ,         "Name"=>_("Hooks")        ,"Tree" =>get_ou('faihookou')),
-        "FAIvariable"            => array(     "Image" =>"plugins/fai/images/fai_variable.png",      "Name"=>_("Variables")    ,"Tree" =>get_ou('faivariableou')) ,
-        "FAItemplate"            => array(     "Image" =>"plugins/fai/images/fai_template.png",      "Name"=>_("Templates")    ,"Tree" =>get_ou('faitemplateou')) ,
-        "FAIpartitionTable" => array(  "Image" =>"plugins/fai/images/fai_partitionTable.png","Name"=>_("Partition table")  ,"Tree"     =>get_ou('faipartitionou')) ,
-        "FAIpackageList"         => array(     "Image" =>"plugins/fai/images/fai_packages.png",      "Name"=>_("Package list") ,"Tree" =>get_ou('faipackageou')) ,
-        "FAIprofile"               => array(   "Image" =>"plugins/fai/images/fai_profile.png",       "Name"=>_("Profiles")     ,"Tree" =>get_ou('faiprofileou')));
+        "FAIscript"                => array(   "Image" =>"plugins/fai/images/fai_script.png",        "Name"=>_("Scripts")      ,"Tree" =>get_ou('faiScriptRDN')) ,
+        "FAIhook"                          => array(   "Image" =>"plugins/fai/images/fai_hook.png" ,         "Name"=>_("Hooks")        ,"Tree" =>get_ou('faiHookRDN')),
+        "FAIvariable"            => array(     "Image" =>"plugins/fai/images/fai_variable.png",      "Name"=>_("Variables")    ,"Tree" =>get_ou('faiVariableRDN')) ,
+        "FAItemplate"            => array(     "Image" =>"plugins/fai/images/fai_template.png",      "Name"=>_("Templates")    ,"Tree" =>get_ou('faiTemplateRDN')) ,
+        "FAIpartitionTable" => array(  "Image" =>"plugins/fai/images/fai_partitionTable.png","Name"=>_("Partition table")  ,"Tree"     =>get_ou('faiPartitionRDN')) ,
+        "FAIpackageList"         => array(     "Image" =>"plugins/fai/images/fai_packages.png",      "Name"=>_("Package list") ,"Tree" =>get_ou('faiPackageRDN')) ,
+        "FAIprofile"               => array(   "Image" =>"plugins/fai/images/fai_profile.png",       "Name"=>_("Profiles")     ,"Tree" =>get_ou('faiProfileRDN')));
   }
 
 
@@ -69,7 +69,7 @@ class faiSummaryTab extends plugin{
       /* Get Classes and release */
       $this->Classes = $this->parent->by_object['faiProfile']->FAIclasses;
       $this->base    = $this->parent->by_object['faiProfile']->parent->parent->fai_release;
-      $str = preg_replace("/^.*".normalizePreg(get_ou('faiprofileou'))."/","",$this->dn);
+      $str = preg_replace("/^.*".normalizePreg(get_ou('faiProfileRDN'))."/","",$this->dn);
       $tmp  = $this->parent->by_object['faiProfile']->parent->parent->getBranches();
       $this->Release = $tmp[$this->base];
   

diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
index e1286d28210dd6700511957dad74c5db8fdb914f..8325cce888947faef4551e28ed0dacfb733157f0 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
@@ -414,7 +414,7 @@ class faiTemplate extends plugin
      */
     if($this->is_new){
       $release = $this->parent->parent->fai_release;
-      $new_dn= 'cn='.$this->cn.",".get_ou('faitemplateou').get_ou('faiou').$release;
+      $new_dn= 'cn='.$this->cn.",".get_ou('faiTemplateRDN').get_ou('faiBaseRDN').$release;
       $res = faiManagement::check_class_name("FAItemplate",$this->cn,$new_dn);
       if(isset($res[$this->cn])){
         $message[] = msgPool::duplicated(_("Name"));

diff --git a/gosa-plugins/fai/admin/fai/class_faiVariable.inc b/gosa-plugins/fai/admin/fai/class_faiVariable.inc
index c915d1f41b0486ae499b19df1b98b3d47167a4d3..36e01de5a8eafb9eb507c25736b795c2ef2d5cb5 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiVariable.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiVariable.inc
@@ -295,7 +295,7 @@ class faiVariable extends plugin
      */
     if($this->is_new){
       $release = $this->parent->parent->fai_release;
-      $new_dn= 'cn='.$this->cn.",".get_ou('faivariableou').get_ou('faiou').$release;
+      $new_dn= 'cn='.$this->cn.",".get_ou('faiVariableRDN').get_ou('faiBaseRDN').$release;
       $res = faiManagement::check_class_name("FAIvariable",$this->cn,$new_dn);
       if(isset($res[$this->cn])){
         $message[] = msgPool::duplicated(_("Name"));

diff --git a/gosa-plugins/fai/admin/fai/tabsHook.inc b/gosa-plugins/fai/admin/fai/tabsHook.inc
index a0a8e7887b27fb0b10ca3318436ef8588eeda4b4..2e9e00a8711e15d76c6ebc814eea042f8bd46605 100644 (file)
--- a/gosa-plugins/fai/admin/fai/tabsHook.inc
+++ b/gosa-plugins/fai/admin/fai/tabsHook.inc
@@ -21,7 +21,7 @@ class tabsHook extends tabs
   function save($ignore_account= FALSE)
   {
        $baseobject= $this->by_object['faiHook'];
-       $new_dn ='cn='.$baseobject->cn.",".get_ou('faihookou').$this->parent->fai_release;
+       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiHookRDN').$this->parent->fai_release;
 
        if ($this->dn != $new_dn && $this->dn != "new"){
                

diff --git a/gosa-plugins/fai/admin/fai/tabsPackage.inc b/gosa-plugins/fai/admin/fai/tabsPackage.inc
index 047d24ba36f5826eea56088e79f6c7f1a715a332..9f819d48ff8b0953017986714cdc96a5b73362e5 100644 (file)
--- a/gosa-plugins/fai/admin/fai/tabsPackage.inc
+++ b/gosa-plugins/fai/admin/fai/tabsPackage.inc
@@ -22,7 +22,7 @@ class tabsPackage extends tabs
   function save($ignore_account= FALSE)
   {
        $baseobject= $this->by_object['faiPackage'];
-       $new_dn ='cn='.$baseobject->cn.",".get_ou('faipackageou').$this->parent->fai_release;
+       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiPackageRDN').$this->parent->fai_release;
                        
        if ($this->dn != $new_dn && $this->dn != "new"){
                

diff --git a/gosa-plugins/fai/admin/fai/tabsPartition.inc b/gosa-plugins/fai/admin/fai/tabsPartition.inc
index aa491406768a7ac55ed8a0d20eb82b74673da730..76ac003f7f88018511b0773256d813065387f017 100644 (file)
--- a/gosa-plugins/fai/admin/fai/tabsPartition.inc
+++ b/gosa-plugins/fai/admin/fai/tabsPartition.inc
@@ -23,7 +23,7 @@ class tabsPartition extends tabs
   {
        $baseobject= $this->by_object['faiPartitionTable'];
 
-       $new_dn ='cn='.$baseobject->cn.",".get_ou('faipartitionou').$this->parent->fai_release;
+       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiPartitionRDN').$this->parent->fai_release;
 
        if ($this->dn != $new_dn && $this->dn != "new"){
                

diff --git a/gosa-plugins/fai/admin/fai/tabsProfile.inc b/gosa-plugins/fai/admin/fai/tabsProfile.inc
index 45e91d84aaa6a496e47baf58c6546e61760d230d..d14029c267d86d23e3945cab2670cb34687f5709 100644 (file)
--- a/gosa-plugins/fai/admin/fai/tabsProfile.inc
+++ b/gosa-plugins/fai/admin/fai/tabsProfile.inc
@@ -22,7 +22,7 @@ class tabsProfile extends tabs
   function save($ignore_account= FALSE)
   {
        $baseobject= $this->by_object['faiProfile'];
-       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiprofileou').$this->parent->fai_release;
+       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiProfileRDN').$this->parent->fai_release;
                        
        if ($this->dn != $new_dn && $this->dn != "new"){
                

diff --git a/gosa-plugins/fai/admin/fai/tabsScript.inc b/gosa-plugins/fai/admin/fai/tabsScript.inc
index 31f9b76400fbd8e428face89b754ea21a9dca302..915fb06c028683c4eafb939ef297f812ed95968a 100644 (file)
--- a/gosa-plugins/fai/admin/fai/tabsScript.inc
+++ b/gosa-plugins/fai/admin/fai/tabsScript.inc
@@ -22,7 +22,7 @@ class tabsScript extends tabs
   function save($ignore_account= FALSE)
   {
        $baseobject= $this->by_object['faiScript'];
-       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiscriptou').$this->parent->fai_release;
+       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiScriptRDN').$this->parent->fai_release;
        
        if ($this->dn != $new_dn && $this->dn != "new"){
                

diff --git a/gosa-plugins/fai/admin/fai/tabsTemplate.inc b/gosa-plugins/fai/admin/fai/tabsTemplate.inc
index 2f16a564c3460c2c6921d4f5c53bdc1af8a3aca0..2b8b15f5dd8efd854359f2814ad69ddfcdf0ae26 100644 (file)
--- a/gosa-plugins/fai/admin/fai/tabsTemplate.inc
+++ b/gosa-plugins/fai/admin/fai/tabsTemplate.inc
@@ -22,7 +22,7 @@ class tabsTemplate extends tabs
   function save($ignore_account= FALSE)
   {
        $baseobject= $this->by_object['faiTemplate'];
-       $new_dn ='cn='.$baseobject->cn.",".get_ou('faitemplateou').$this->parent->fai_release;
+       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiTemplateRDN').$this->parent->fai_release;
 
        if ($this->dn != $new_dn && $this->dn != "new"){
                

diff --git a/gosa-plugins/fai/admin/fai/tabsVariable.inc b/gosa-plugins/fai/admin/fai/tabsVariable.inc
index 37d8c68382b32817953f5ce005277809ba8e79db..5b23577d9eabf3d4d74bbe2d9403d9217823db5f 100644 (file)
--- a/gosa-plugins/fai/admin/fai/tabsVariable.inc
+++ b/gosa-plugins/fai/admin/fai/tabsVariable.inc
@@ -22,7 +22,7 @@ class tabsVariable extends tabs
   function save($ignore_account= FALSE)
   {
        $baseobject= $this->by_object['faiVariable'];
-       $new_dn ='cn='.$baseobject->cn.",".get_ou('faivariableou').$this->parent->fai_release;
+       $new_dn ='cn='.$baseobject->cn.",".get_ou('faiVariableRDN').$this->parent->fai_release;
                        
        if ($this->dn != $new_dn && $this->dn != "new"){
                

diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc
index b5e20f0e812a9cb5ab5ccfa422cbf40faf8b7d21..3037efa09cb7901aedc0d037c3cafddcb822fa99 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacro.inc
@@ -63,7 +63,7 @@ class macro extends plugin
       }
     } else {
       $this->orig_cn=$this->cn;
-      $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("macroou"))."/i", "", $this->dn);
+      $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("phoneMacroRDN"))."/i", "", $this->dn);
     }
 
     /* Check server configurations

diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
index 04a665f7c54f8935c23c6c17557953528a8cdf0b..a13484cd58dbcdbf291f8ba0e92d20020b3f2df5 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
@@ -525,7 +525,7 @@ class goFonMacro extends plugin
   /* Return departments, that will be included within snapshot detection */
   function get_used_snapshot_bases()
   {
-    return(array(get_ou('macroou').$this->DivListMacro->selectedBase));
+    return(array(get_ou('phoneMacroRDN').$this->DivListMacro->selectedBase));
   }
 
 
@@ -543,7 +543,7 @@ class goFonMacro extends plugin
     if($SubSearch){
       $Flags |= GL_SUBSEARCH;
     }else{
-      $base = get_ou('macroou').$base;
+      $base = get_ou('phoneMacroRDN').$base;
     }
 
     /* Generate macro list */

diff --git a/gosa-plugins/gofon/gofon/macro/tabs_macros.inc b/gosa-plugins/gofon/gofon/macro/tabs_macros.inc
index b2003f86e6055791a869745b7a585d9aef394776..f874015e40b23674dff177b529105e059e96bf49 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/tabs_macros.inc
+++ b/gosa-plugins/gofon/gofon/macro/tabs_macros.inc
@@ -17,7 +17,7 @@ class macrotabs extends tabs
 
        /* Check for new 'dn', in order to propagate the
           'dn' to all plugins */
-       $new_dn= "cn=".$baseobject->cn.",".get_ou('macroou').$baseobject->base;
+       $new_dn= "cn=".$baseobject->cn.",".get_ou('phoneMacroRDN').$baseobject->base;
 
         /* Move group? */
         if ($this->dn != $new_dn){

diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
index 6b2edea24e34be15b2e6e6147845ac105edcf909..1094e0280af5a6de9b2d1e80f0c0a5e8f502dfdb 100644 (file)
--- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
+++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
@@ -178,7 +178,7 @@ class phoneAccount extends plugin
      */
     $deps_a = array(
         get_people_ou(),
-        get_ou("ogroupou"),
+        get_ou("ogroupRDN"),
         get_ou("serverRDN"),
         get_ou("terminalRDN"),
         get_ou("workstationRDN"),
@@ -200,7 +200,7 @@ class phoneAccount extends plugin
      * Search for all Macros that are visible and create 
      *  an array with name and parameters 
      */
-    $tmp = get_sub_list("(&(objectClass=goFonMacro)(goFonMacroVisible=1))","gofonmacro",array(get_ou("macroou")),
+    $tmp = get_sub_list("(&(objectClass=goFonMacro)(goFonMacroVisible=1))","gofonmacro",array(get_ou("phoneMacroRDN")),
                   $this->config->current['BASE'],array("displayName","goFonMacroParameter","dn","cn"), GL_NO_ACL_CHECK | GL_SUBSEARCH );
     
 

diff --git a/gosa-plugins/goto/addons/goto/class_target_list.inc b/gosa-plugins/goto/addons/goto/class_target_list.inc
index e37a2bcdd96b53bc61de9de952c55f34345953bd..4463602625d9c88fb8522d2a3e1f5bd3e4c22e01 100644 (file)
--- a/gosa-plugins/goto/addons/goto/class_target_list.inc
+++ b/gosa-plugins/goto/addons/goto/class_target_list.inc
@@ -286,7 +286,7 @@ class target_list extends MultiSelectWindow
           get_ou("workstationRDN"),
           get_ou("incominou"),
           get_ou("serverRDN"),
-          get_ou("ogroupou"));
+          get_ou("ogroupRDN"));
 
       $res = get_sub_list($filter,array("server","incoming","workstation","ogroup"), 
                   $deps_a,get_ou("systemRDN").$base,array("cn","objectClass","ipHostNumber","description"),GL_SIZELIMIT);

diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc
index f0baa6e86efbceb13e569a9555e57ccce4e806c0..04546ad8545030e7697412e8645b44eadd345279 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc
@@ -208,7 +208,7 @@ class EventTargetAddList extends MultiSelectWindow
     if($this->display_ogroup){
       $_target_list = array_merge($_target_list,
             get_list("(&(cn=".$this->regex.")(member=*)(objectClass=gosaGroupOfNames))",
-            "ogroups",get_ou("ogroupou").$this->selectedBase,
+            "ogroups",get_ou("ogroupRDN").$this->selectedBase,
             array("cn","objectClass","description","member"),GL_NONE));
     }
     $this->_target_list = $_target_list;

diff --git a/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc b/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc
index 79e6b57fd1ed008c6d8c2ee94f93cadcfdabc5de..953f45a823a21adad40343c7fc1d3c7611df7755 100644 (file)
--- a/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc
@@ -57,7 +57,7 @@ class application extends plugin
         $this->base= dn2base($ui->dn);
       }
     } else {
-      $this->base= preg_replace ("/^[^,]+,".get_ou('applicationou')."/", "", $this->dn);
+      $this->base= preg_replace ("/^[^,]+,".get_ou('applicationRDN')."/", "", $this->dn);
     }
 
     $this->orig_cn = $this->cn;
@@ -229,7 +229,7 @@ class application extends plugin
     restore_error_handler();
 
     /* Parse release out of object dn */
-    $release = preg_replace("/".get_ou("applicationou").normalizePreg($this->base)."$/","",$this->dn);
+    $release = preg_replace("/".get_ou("applicationRDN").normalizePreg($this->base)."$/","",$this->dn);
     $release = preg_replace("/^cn=[^,]+,/","",$release);
 
     /* Get a list of all groups 
@@ -413,7 +413,7 @@ class application extends plugin
 
     /* Permissions for that base? */
     if ($this->base != ""){
-      $new_dn= "cn=".$this->cn.",".get_ou('applicationou').$this->base;
+      $new_dn= "cn=".$this->cn.",".get_ou('applicationRDN').$this->base;
     } else {
       $new_dn= $this->dn;
     }
@@ -445,7 +445,7 @@ class application extends plugin
     if($this->is_release()){
       $base = $this->parent->parent->app_release;
     }else{
-      $base = get_ou('applicationou').$this->base;
+      $base = get_ou('applicationRDN').$this->base;
     }
 
     $ldap->ls("(&(objectClass=gosaApplication)(cn=".$this->cn."))",$base,array("cn"));

diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
index 20f16feb52d0e37af37ad060cafc7f1e12abe8e1..0a8914e51ba4793ca1986c4d8ec37eb38025a614 100644 (file)
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -75,7 +75,7 @@ class applicationManagement extends plugin
 
     /* Set default release */
     if(!$this->IsReleaseManagementActivated()){
-      $this->app_base = get_ou("applicationou").$this->config->current['BASE'];
+      $this->app_base = get_ou("applicationRDN").$this->config->current['BASE'];
       if(!session::is_set("app_filter")){
         session::set("app_filter",array("app_base" => $this->app_base));
       }
@@ -83,7 +83,7 @@ class applicationManagement extends plugin
     }else{
 
       /* Set intial release */
-      $this->app_base = get_ou("applicationou").$this->config->current['BASE'];
+      $this->app_base = get_ou("applicationRDN").$this->config->current['BASE'];
       $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu"));
       $rels = array_flip($this->getReleases());
       if(isset($rels[$rel])){
@@ -572,7 +572,7 @@ class applicationManagement extends plugin
     if(!$this->IsReleaseManagementActivated()){
       $use_base = $this->app_base;
       if($SubSearch){
-        $use_base = preg_replace("/^".normalizePreg(get_ou("applicationou"))."/","",$use_base);
+        $use_base = preg_replace("/^".normalizePreg(get_ou("applicationRDN"))."/","",$use_base);
       }
     }else{
       $use_base = $this->app_release;
@@ -586,7 +586,7 @@ class applicationManagement extends plugin
     }
  
     if($SubSearch){ 
-      $res= get_sub_list($Filter, "application",get_ou("applicationou"), $use_base, $search_attrs, $Flags);
+      $res= get_sub_list($Filter, "application",get_ou("applicationRDN"), $use_base, $search_attrs, $Flags);
     }else{
       $res= get_list($Filter, "application",$use_base, $search_attrs, $Flags);
     }
@@ -738,7 +738,7 @@ class applicationManagement extends plugin
       $app_filter['app_release'] = $this->app_release;
       session::set("app_filter",$app_filter);
     }elseif(!$this->IsReleaseManagementActivated()){
-      $this->app_base = get_ou("applicationou").$this->DivListApplication->selectedBase;
+      $this->app_base = get_ou("applicationRDN").$this->DivListApplication->selectedBase;
       $app_filter     = session::get("app_filter");
       $app_filter['app_base'] = $this->app_base;
       session::set("app_filter",$app_filter);

diff --git a/gosa-plugins/goto/admin/applications/tabs_application.inc b/gosa-plugins/goto/admin/applications/tabs_application.inc
index 53b0916cd180ae348977b179be830d795f65451d..4be68a07bc8ff2ac068695cb41562e5a0c77f41b 100644 (file)
--- a/gosa-plugins/goto/admin/applications/tabs_application.inc
+++ b/gosa-plugins/goto/admin/applications/tabs_application.inc
@@ -30,7 +30,7 @@ class apptabs extends tabs
     if($this->parent->IsReleaseManagementActivated()){
       $new_dn= "cn=".$baseobject->cn.",".$this->parent->app_release;
     }else{
-      $new_dn= "cn=".$baseobject->cn.",".get_ou('applicationou').$baseobject->base;
+      $new_dn= "cn=".$baseobject->cn.",".get_ou('applicationRDN').$baseobject->base;
     }
 
     /* Move group? */

diff --git a/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc b/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
index 8d7ce93947195f9e2ca01798c2407e7d3754c7fd..0448b3bde477c104852c65bfc142a2dcb5f575ea 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceGeneric.inc
@@ -55,7 +55,7 @@ class deviceGeneric extends plugin
         $this->base= dn2base($ui->dn);
       }
     } else {
-      $this->base =preg_replace ("/^[^,]+,".get_ou('deviceou')."/","",$this->dn);
+      $this->base =preg_replace ("/^[^,]+,".get_ou('deviceRDN')."/","",$this->dn);
     }
     $this->orig_base = $this->base;
     $this->orig_dn   = $this->dn;

diff --git a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
index 08921f09ce7a6fa40fff49dbc417cc0d7beba68e..d82ac62e8d8a6ecc78b4ed4facdfc90e78208659 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
@@ -449,7 +449,7 @@ class deviceManagement extends plugin
   /* Return departments, that will be included within snapshot detection */
   function get_used_snapshot_bases()
   {
-    return(array(get_ou('deviceou').$this->DivListDevices->selectedBase));
+    return(array(get_ou('deviceRDN').$this->DivListDevices->selectedBase));
   }
 
   function copyPasteHandling_from_queue($s_action,$s_entry)
@@ -535,11 +535,11 @@ class deviceManagement extends plugin
     if($SubSearch){
       $Flags    |= GL_SUBSEARCH;
     }else{
-      $base = get_ou('deviceou').$base;
+      $base = get_ou('deviceRDN').$base;
     }
 
     /* Get results and create index */
-    $res= get_sub_list($Filter,"devices",get_ou('deviceou'), $base, array("cn","gotoHotplugDevice","description","dn","objectClass"), $Flags);
+    $res= get_sub_list($Filter,"devices",get_ou('deviceRDN'), $base, array("cn","gotoHotplugDevice","description","dn","objectClass"), $Flags);
     $tmp2 = array();
     foreach ($res as $val){
       if (!isset($val['description']) && isset($val['gotoHotplugDevice'][0])) {

diff --git a/gosa-plugins/goto/admin/devices/class_divListDevices.inc b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
index c5adfd07ad762916a1a82b1ade7a020cb0a2db9c..40d996d92c541eb1c0c0e9510741fda8755cf0cc 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_divListDevices.inc
+++ b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
@@ -71,7 +71,7 @@ class divListDevices extends MultiSelectWindow
 
     /* Get acls */
     $ui       = get_userinfo();
-    $acl      = $ui->get_permissions("cn=dummy,".get_ou('deviceou').$this->selectedBase,"devices/deviceGeneric");
+    $acl      = $ui->get_permissions("cn=dummy,".get_ou('deviceRDN').$this->selectedBase,"devices/deviceGeneric");
     $acl_all  = $ui->has_complete_category_acls($this->selectedBase,"devices") ;
 
 

diff --git a/gosa-plugins/goto/admin/devices/tabs_devices.inc b/gosa-plugins/goto/admin/devices/tabs_devices.inc
index 0feddfc4eaab39583ae0e401fb5764605f65735f..f6664a16f6edb85eb12968070ab76bc389394b4d 100644 (file)
--- a/gosa-plugins/goto/admin/devices/tabs_devices.inc
+++ b/gosa-plugins/goto/admin/devices/tabs_devices.inc
@@ -15,7 +15,7 @@ class devicetabs extends tabs
   function save($ignore_account= FALSE)
   {
     $baseobject= $this->by_object['deviceGeneric'];
-    $new_dn= "cn=".$baseobject->cn.",".get_ou('deviceou').$baseobject->base;
+    $new_dn= "cn=".$baseobject->cn.",".get_ou('deviceRDN').$baseobject->base;
 
     /* Move group? */
     if ($this->dn != $new_dn){

diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
index 732147f57b3b1bfad52471cca2898614776ef514..3ec0ce61e8e105ee017309f9934c4b9a1bd4916e 100644 (file)
--- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
+++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
@@ -140,26 +140,26 @@ class appgroup extends plugin
     */
   function getReleases()
   {
-    $ret =array("/" => array("name" => "/", "found" => TRUE , "parts" => array(),"suffix" => get_ou('applicationou')));
+    $ret =array("/" => array("name" => "/", "found" => TRUE , "parts" => array(),"suffix" => get_ou('applicationRDN')));
     if($this->enableReleaseManagement){
 
       /* Only display those releases that we are able to read 
        */
-      $dn     = get_ou("applicationou").$this->config->current['BASE'];
+      $dn     = get_ou("applicationRDN").$this->config->current['BASE'];
       $filter = "(&(objectClass=organizationalUnit)(objectClass=FAIbranch))";
       $res    = get_sub_list($filter,array("application","fai"), 
-          array(get_ou("applicationou"),get_ou("faiou")),$dn, array("ou","FAIstate"), GL_SUBSEARCH);
+          array(get_ou("applicationRDN"),get_ou("faiBaseRDN")),$dn, array("ou","FAIstate"), GL_SUBSEARCH);
 
       /* Go through all departments and check which department is a valid 
           department release.
        */
       foreach($res as $attrs){
-        if(preg_match("/".get_ou('applicationou')."/",$attrs['dn'])){
+        if(preg_match("/".get_ou('applicationRDN')."/",$attrs['dn'])){
 
           /* Parse all returned departments dns into a useable type.
              (ou=1.0.0,ou=halut,ou=apps  ==> halue/1.0.0)
            */
-          $bb     = preg_replace("/".get_ou('applicationou').".*/","",$attrs['dn']);
+          $bb     = preg_replace("/".get_ou('applicationRDN').".*/","",$attrs['dn']);
           $parts  = array_reverse(split("ou=",$bb));
 
           $str ="";
@@ -197,7 +197,7 @@ class appgroup extends plugin
               "found"    => $found,
               "FAIstate" => $FAIstate,
               "dn"       => $attrs['dn'], 
-              "parts"    => $parts,"suffix" => $bb.get_ou('applicationou'));
+              "parts"    => $parts,"suffix" => $bb.get_ou('applicationRDN'));
         }
       }
     }
@@ -468,7 +468,7 @@ class appgroup extends plugin
       if(in_array($app['cn'][0],$used_apps)){
         continue;
       }
-      if(!preg_match("/".get_ou('applicationou').normalizePreg($this->curbase)."$/",$app['dn'])){
+      if(!preg_match("/".get_ou('applicationRDN').normalizePreg($this->curbase)."$/",$app['dn'])){
         continue;
       }
 

diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
index 436f5c8f4e4ed6047b6444bb62d496e395bca852..b097b88b87aed860073144574e3b7f8a6c797359 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
@@ -129,7 +129,7 @@ class mimetype extends plugin
         $this->base= dn2base($ui->dn);
       }
     } else {
-      $this->base= preg_replace ("/^.*,".normalizePreg(get_ou("mimetypeou"))."/", "", $this->dn);
+      $this->base= preg_replace ("/^.*,".normalizePreg(get_ou("mimetypeRDN"))."/", "", $this->dn);
     }
 
     /* Get icon data */
@@ -542,7 +542,7 @@ class mimetype extends plugin
     if($this->is_release()){
       $base = $this->parent->parent->mime_release;
     }else{
-      $base = get_ou("mimetypeou").$this->base;
+      $base = get_ou("mimetypeRDN").$this->base;
     }
 
     $ldap->ls("(&(objectClass=gotoMimeType)(cn=".$this->cn."))",$base,array("cn"));

diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
index 3498d6da1d3956d6cb96e02325ba7b00b8ce7051..219e17d06445d8fbb74fa370dd62f46d59d52aa3 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc
@@ -75,7 +75,7 @@ class mimetypeManagement extends plugin
 
     /* Set default release */
     if(!$this->IsReleaseManagementActivated()){
-      $this->mime_base = get_ou("mimetypeou").$this->config->current['BASE'];
+      $this->mime_base = get_ou("mimetypeRDN").$this->config->current['BASE'];
       if(!session::is_set("mime_filter")){
 
         /* Set intial release */
@@ -88,7 +88,7 @@ class mimetypeManagement extends plugin
       $mime_filter     = session::get("mime_filter");
       $this->mime_base = $mime_filter['mime_base'];
     }else{
-      $this->mime_base = get_ou("mimetypeou").$this->config->current['BASE'];
+      $this->mime_base = get_ou("mimetypeRDN").$this->config->current['BASE'];
 
       /* Set intial release */
       $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu"));
@@ -682,7 +682,7 @@ class mimetypeManagement extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $this->CopyPasteHandler->SetVar("base",preg_replace("/^".normalizePreg(get_ou("mimetypeou"))."/","",$this->mime_base));
+      $this->CopyPasteHandler->SetVar("base",preg_replace("/^".normalizePreg(get_ou("mimetypeRDN"))."/","",$this->mime_base));
       $this->CopyPasteHandler->SetVar("parent",$this);
       $data = $this->CopyPasteHandler->execute();
 
@@ -750,7 +750,7 @@ class mimetypeManagement extends plugin
       $mime_filter['mime_release'] = $this->mime_release;
       session::set("mime_filter",$mime_filter);
     }elseif(!$this->IsReleaseManagementActivated()){
-      $this->mime_base = get_ou("mimetypeou").$this->DivListMimeTypes->selectedBase;
+      $this->mime_base = get_ou("mimetypeRDN").$this->DivListMimeTypes->selectedBase;
       $mime_filter     = session::get("mime_filter");
       $mime_filter['mime_base'] = $this->mime_base;
       session::set("mime_filter",$mime_filter);

diff --git a/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc b/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc
index 45a8f99dd55f374f4cd70daa98459fa022168ae3..efc06be710532ba7637ad58184ad881c3559c137 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc
+++ b/gosa-plugins/goto/admin/mimetypes/tabs_mimetypes.inc
@@ -30,7 +30,7 @@ class mimetabs extends tabs
     if($this->parent->IsReleaseManagementActivated()){
       $new_dn= "cn=".$baseobject->cn.",".$this->parent->mime_release;
     }else{
-      $new_dn= "cn=".$baseobject->cn.",".get_ou('mimetypeou').$baseobject->base;
+      $new_dn= "cn=".$baseobject->cn.",".get_ou('mimetypeRDN').$baseobject->base;
     }
 
     /* Move group? */

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
index f0e66df31ab213b490719df46d3acfcdc46f0fc8..7c574bf23dab6c1d6816d709e417b54de729d1d0 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc
@@ -198,7 +198,7 @@ class termservice extends plugin
      */
     $deps_a = array(
         get_people_ou(),
-        get_ou("ogroupou"),
+        get_ou("ogroupRDN"),
         get_ou("serverRDN"),
         get_ou("terminalRDN"),
         get_ou("workstationRDN"),

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index e3454ea98dd58a77c63af1628e154540b71c761f..7ac9455721a4781120d83ff051393bc6c214aaf6 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
@@ -161,7 +161,7 @@ class workservice extends plugin
      */
     $deps_a = array(
         get_people_ou(),
-        get_ou("ogroupou"),
+        get_ou("ogroupRDN"),
         get_ou("serverRDN"),
         get_ou("terminalRDN"),
         get_ou("workstationRDN"),

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index ea4db08a490e13d67b80f8cc1c65ac5ff10d370c..107a3efd62cb9d8d78b83059ca9ab35a89a1d40f 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -1331,7 +1331,7 @@ class workstartup extends plugin
    */
   function dn_to_release_name($dn)
   {
-    $relevant = preg_replace("/,".normalizePreg(get_ou("faiou")).".*$/","",$dn);
+    $relevant = preg_replace("/,".normalizePreg(get_ou("faiBaseRDN")).".*$/","",$dn);
     $parts    = array_reverse(split("\,",$relevant));
     $str ="";
     foreach($parts as $part){

diff --git a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
index 32be0aaab46a72643b05c5fc01b44d89f6e2af61..7719fdb06ab3655065a801b2802b340f15e57ce6 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
@@ -81,7 +81,7 @@ class hotplugDialog extends plugin
   function getHotplugs()
   {
     $ldap= $this->config->get_ldap_link();
-    $ldap->cd(get_ou('deviceou').$this->depselect);
+    $ldap->cd(get_ou('deviceRDN').$this->depselect);
     $ldap->search("(&(objectClass=gotoDevice)(|(cn=".$this->regex.")(description=".$this->regex.")))",array("gotoHotplugDevice","cn","dn")); 
 
     $a_return = array();  

diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index 732f8f6b1857aedff69207868aa6dcc18714bacf..1066c0bd292e3c32ad25838f3d8fbcc75e4e3751 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_divListSystem.inc
+++ b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
@@ -268,7 +268,7 @@ class divListSystem extends MultiSelectWindow
     $ogroups = array();
     if($this->parent->fai_activated){
       $ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(FAIclass=*)(member=*))",array("ogroups"),
-          get_ou("ogroupou"),$this->config->current['BASE'],array("FAIclass","member","cn"),GL_NO_ACL_CHECK | GL_SUBSEARCH);
+          get_ou("ogroupRDN"),$this->config->current['BASE'],array("FAIclass","member","cn"),GL_NO_ACL_CHECK | GL_SUBSEARCH);
       foreach($ogroups as $ogroup){
         for($i = 0 ; $i < $ogroup['member']['count'] ; $i++){
           if(preg_match("/:/",$ogroup['FAIclass'][0])) {