From e1b170490c61df9cdc32629e6dfcd2c59946337a Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 22 Sep 2008 10:57:44 +0000 Subject: [PATCH] Renamed a couple of additional gosa.conf values git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12528 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/contrib/gosa.conf.5 | 2 +- gosa-core/include/class_plugin.inc | 2 +- gosa-core/include/functions.inc | 28 ++++++++-------- .../plugins/admin/acl/class_aclManagement.inc | 4 +-- gosa-core/plugins/admin/acl/tabs_acl_role.inc | 2 +- .../plugins/admin/ogroups/class_ogroup.inc | 10 +++--- .../admin/ogroups/class_ogroupManagement.inc | 6 ++-- .../plugins/admin/ogroups/tabs_ogroups.inc | 4 +-- gosa-plugins/fai/admin/fai/class_FAI.inc | 16 +++++----- gosa-plugins/fai/admin/fai/class_faiHook.inc | 2 +- .../fai/admin/fai/class_faiManagement.inc | 32 +++++++++---------- .../fai/admin/fai/class_faiPackage.inc | 6 ++-- .../fai/admin/fai/class_faiPartitionTable.inc | 2 +- .../fai/admin/fai/class_faiProfile.inc | 2 +- .../fai/admin/fai/class_faiProfileEntry.inc | 2 +- .../fai/admin/fai/class_faiScript.inc | 2 +- .../fai/admin/fai/class_faiSummaryTab.inc | 16 +++++----- .../fai/admin/fai/class_faiTemplate.inc | 2 +- .../fai/admin/fai/class_faiVariable.inc | 2 +- gosa-plugins/fai/admin/fai/tabsHook.inc | 2 +- gosa-plugins/fai/admin/fai/tabsPackage.inc | 2 +- gosa-plugins/fai/admin/fai/tabsPartition.inc | 2 +- gosa-plugins/fai/admin/fai/tabsProfile.inc | 2 +- gosa-plugins/fai/admin/fai/tabsScript.inc | 2 +- gosa-plugins/fai/admin/fai/tabsTemplate.inc | 2 +- gosa-plugins/fai/admin/fai/tabsVariable.inc | 2 +- .../gofon/gofon/macro/class_gofonMacro.inc | 2 +- .../macro/class_gofonMacroManagement.inc | 4 +-- .../gofon/gofon/macro/tabs_macros.inc | 2 +- .../gofon/phoneaccount/class_phoneAccount.inc | 4 +-- .../goto/addons/goto/class_target_list.inc | 2 +- .../goto/events/class_EventTargetAddList.inc | 2 +- .../applications/class_applicationGeneric.inc | 8 ++--- .../class_applicationManagement.inc | 10 +++--- .../admin/applications/tabs_application.inc | 2 +- .../admin/devices/class_deviceGeneric.inc | 2 +- .../admin/devices/class_deviceManagement.inc | 6 ++-- .../admin/devices/class_divListDevices.inc | 2 +- .../goto/admin/devices/tabs_devices.inc | 2 +- .../groups/apps/class_groupApplication.inc | 14 ++++---- .../admin/mimetypes/class_mimetypeGeneric.inc | 4 +-- .../mimetypes/class_mimetypeManagement.inc | 8 ++--- .../goto/admin/mimetypes/tabs_mimetypes.inc | 2 +- .../systems/goto/class_terminalService.inc | 2 +- .../systems/goto/class_workstationService.inc | 2 +- .../systems/goto/class_workstationStartup.inc | 2 +- .../environment/class_hotplugDialog.inc | 2 +- .../admin/systems/class_divListSystem.inc | 2 +- 48 files changed, 121 insertions(+), 121 deletions(-) diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5 index 4ece79621..58b46c2ff 100644 --- 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 c5a43af17..38156dd54 100644 --- 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 0818cda61..827a38f95 100644 --- 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 63fc809b4..910a31986 100644 --- 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 ce8f984c6..4b8a211a2 100644 --- 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 dd4f7146e..761b4d9fa 100644 --- 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 77e5c6534..978bc0c87 100644 --- 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 a2ea7c23e..43804d102 100644 --- 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 ec75c333e..3a5fc0063 100644 --- 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 "
-->".$Current_DN."
"; echo "
-->".$obj_dn."
"; @@ -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 141fc5e3d..def5b3541 100644 --- 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 68f427dd1..ef2e20c18 100644 --- 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 88806cade..22c8637c0 100644 --- 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 d624dfca5..216369159 100644 --- 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 601b2f1b2..8e08c7635 100644 --- 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 c0938a4c3..53946eb48 100644 --- 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 fe28af277..67eed4dce 100644 --- 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 d948762b6..99e604378 100644 --- 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 e1286d282..8325cce88 100644 --- 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 c915d1f41..36e01de5a 100644 --- 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 a0a8e7887..2e9e00a87 100644 --- 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 047d24ba3..9f819d48f 100644 --- 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 aa4914067..76ac003f7 100644 --- 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 45e91d84a..d14029c26 100644 --- 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 31f9b7640..915fb06c0 100644 --- 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 2f16a564c..2b8b15f5d 100644 --- 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 37d8c6838..5b23577d9 100644 --- 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 b5e20f0e8..3037efa09 100644 --- 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 04a665f7c..a13484cd5 100644 --- 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 b2003f86e..f874015e4 100644 --- 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 6b2edea24..1094e0280 100644 --- 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 e37a2bcdd..446360262 100644 --- 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 f0baa6e86..04546ad85 100644 --- 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 79e6b57fd..953f45a82 100644 --- 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 20f16feb5..0a8914e51 100644 --- 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 53b0916cd..4be68a07b 100644 --- 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 8d7ce9394..0448b3bde 100644 --- 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 08921f09c..d82ac62e8 100644 --- 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 c5adfd07a..40d996d92 100644 --- 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 0feddfc4e..f6664a16f 100644 --- 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 732147f57..3ec0ce61e 100644 --- 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 436f5c8f4..b097b88b8 100644 --- 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 3498d6da1..219e17d06 100644 --- 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 45a8f99dd..efc06be71 100644 --- 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 f0e66df31..7c574bf23 100644 --- 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 e3454ea98..7ac945572 100644 --- 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 ea4db08a4..107a3efd6 100644 --- 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 32be0aaab..7719fdb06 100644 --- 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 732f8f6b1..1066c0bd2 100644 --- 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])) { -- 2.30.2