From 1d5fdf9fb17af355235588bbc4917959ddc3ab8e Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 16 Sep 2008 16:11:21 +0000 Subject: [PATCH] New bunch of value changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12489 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/contrib/gosa.conf.5 | 4 ++-- gosa-core/include/class_config.inc | 4 ++-- gosa-core/include/functions.inc | 4 ++-- gosa-core/plugins/admin/groups/class_groupGeneric.inc | 4 ++-- gosa-core/plugins/admin/ogroups/class_ogroup.inc | 8 ++++---- gosa-core/plugins/personal/posix/class_posixAccount.inc | 4 ++-- gosa-plugins/dak/addons/dak/class_DAK.inc | 2 +- gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc | 2 +- .../gofon/gofon/phoneaccount/class_phoneAccount.inc | 4 ++-- gosa-plugins/goto/addons/goto/class_target_list.inc | 4 ++-- .../goto/addons/goto/events/class_EventTargetAddList.inc | 4 ++-- .../goto/admin/systems/goto/class_printGeneric.inc | 8 ++++---- .../goto/admin/systems/goto/class_terminalGeneric.inc | 4 ++-- .../goto/admin/systems/goto/class_terminalService.inc | 4 ++-- .../goto/admin/systems/goto/class_terminalStartup.inc | 4 ++-- .../goto/admin/systems/goto/class_workstationService.inc | 4 ++-- .../goto/admin/systems/goto/class_workstationStartup.inc | 4 ++-- gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc | 2 +- .../goto/admin/systems/services/nfs/class_servNfs.inc | 2 +- .../admin/systems/services/shares/class_goShareServer.inc | 2 +- .../ldapmanager/addons/ldapmanager/class_exportxls.inc | 2 +- gosa-plugins/ldapmanager/html/getxls.php | 4 ++-- gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc | 4 ++-- .../sudo/admin/sudo/class_target_list_systems.inc | 8 ++++---- gosa-plugins/systems/admin/systems/class_servGeneric.inc | 6 +++--- .../systems/admin/systems/class_systemManagement.inc | 8 ++++---- gosa-plugins/systems/admin/systems/class_termDNS.inc | 4 ++-- gosa-plugins/systems/admin/systems/tabs_server.inc | 2 +- 28 files changed, 58 insertions(+), 58 deletions(-) diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5 index 9fd72e779..f48cddf83 100644 --- a/gosa-core/contrib/gosa.conf.5 +++ b/gosa-core/contrib/gosa.conf.5 @@ -697,7 +697,7 @@ departments. Default is .I ou=groups. .PP -.B serverou +.B serverRDN .I string .PP This statement defines the location where GOsa creates new servers inside of defined @@ -705,7 +705,7 @@ departments. Default is .I ou=servers. .PP -.B terminalou +.B terminalRDN .I string .PP This statement defines the location where GOsa creates new terminals inside of defined diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 1d5a9387f..4426bbdec 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -822,7 +822,7 @@ class config { */ function getShareList($listboxEntry = false) { - $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",get_ou("serverou"), + $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",get_ou("serverRDN"), $this->current['BASE'],array("goExportEntry","cn"), GL_NONE); $return =array(); foreach($tmp as $entry){ @@ -859,7 +859,7 @@ class config { $ui = get_userinfo(); $base = $config->current['BASE']; $res= get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))", "server", - get_ou("serverou"), $base,array("goExportEntry","cn"),GL_NONE | GL_NO_ACL_CHECK); + get_ou("serverRDN"), $base,array("goExportEntry","cn"),GL_NONE | GL_NO_ACL_CHECK); foreach($res as $entry){ diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index ddd59b466..b635eb88f 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -1156,8 +1156,8 @@ function get_ou($name) "ogroupou" => "ou=groups,", "applicationou" => "ou=apps,", "systemsou" => "ou=systems,", - "serverou" => "ou=servers,ou=systems,", - "terminalou" => "ou=terminals,ou=systems,", + "serverRDN" => "ou=servers,ou=systems,", + "terminalRDN" => "ou=terminals,ou=systems,", "workstationou" => "ou=workstations,ou=systems,", "printerou" => "ou=printers,ou=systems,", "phoneou" => "ou=phones,ou=systems,", diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc index 14bb6d69d..853d530cd 100644 --- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc +++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc @@ -372,9 +372,9 @@ class group extends plugin /* Search for systems */ $types = array(); - $types['server'] = array("OU" => get_ou("serverou"), "OC" => "(objectClass=goServer)"); + $types['server'] = array("OU" => get_ou("serverRDN"), "OC" => "(objectClass=goServer)"); $types['workstation'] = array("OU" => get_ou("workstationou"),"OC" => "(objectClass=gotoWorkstation)"); - $types['terminal'] = array("OU" => get_ou("terminalou"), "OC" => "(objectClass=gotoTerminal)"); + $types['terminal'] = array("OU" => get_ou("terminalRDN"), "OC" => "(objectClass=gotoTerminal)"); $res = array(); foreach($types as $acl => $data){ diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc index a41cff986..37754c093 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc @@ -335,8 +335,8 @@ class ogroup extends plugin $regex= $sysfilter['regex']; $filter= "(&(|(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal))$exclude(cn=*)(cn=$regex))"; - $deps_a = array(get_ou("serverou"), - get_ou("terminalou"), + $deps_a = array(get_ou("serverRDN"), + get_ou("terminalRDN"), get_ou("workstationou")); $res= get_sub_list($filter, array("terminal","server","workstation"), $deps_a, get_ou("systemsou").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT); @@ -656,13 +656,13 @@ class ogroup extends plugin "departments" => array("OBJ"=>"department", "CLASS"=>"gosaDepartment" , "DN"=> "" ,"ACL" => "department"), "servers" => array("OBJ"=>"servgeneric", "CLASS"=>"goServer" , - "DN"=> get_ou('serverou') ,"ACL" => "server"), + "DN"=> get_ou('serverRDN') ,"ACL" => "server"), "workstations" => array("OBJ"=>"workgeneric", "CLASS"=>"gotoWorkstation", "DN"=> get_ou('workstationou') ,"ACL" => "workstation"), "winstations" => array("OBJ"=>"wingeneric", "CLASS"=>"opsiClient", "DN"=> get_ou('SAMBAMACHINEACCOUNTRDN') ,"ACL" => "winstation"), "terminals" => array("OBJ"=>"termgeneric", "CLASS"=>"gotoTerminal" , - "DN"=> get_ou('terminalou') ,"ACL" => "terminal"), + "DN"=> get_ou('terminalRDN') ,"ACL" => "terminal"), "printers" => array("OBJ"=>"printgeneric", "CLASS"=>"gotoPrinter" , "DN"=> get_ou('printerou') ,"ACL" => "printer"), "phones" => array("OBJ"=>"phoneGeneric", "CLASS"=>"goFonHardware" , diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc index 630e180b6..87be6dcc0 100644 --- a/gosa-core/plugins/personal/posix/class_posixAccount.inc +++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc @@ -396,8 +396,8 @@ class posixAccount extends plugin $filter= "(&(|(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal))$exclude(cn=*)(cn=$regex))"; - $deps_a = array(get_ou("serverou"), - get_ou("terminalou"), + $deps_a = array(get_ou("serverRDN"), + get_ou("terminalRDN"), get_ou("workstationou")); $res= get_sub_list($filter, $acls, $deps_a, get_ou("systemsou").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT); diff --git a/gosa-plugins/dak/addons/dak/class_DAK.inc b/gosa-plugins/dak/addons/dak/class_DAK.inc index 79da99fb7..ce41bee46 100644 --- a/gosa-plugins/dak/addons/dak/class_DAK.inc +++ b/gosa-plugins/dak/addons/dak/class_DAK.inc @@ -45,7 +45,7 @@ class DAK } $res = array(); $rest = get_sub_list("(&(macAddress=*)(FAIrepository=*)(objectClass=FAIrepositoryServer))", - "server",get_ou("serverou"),$config->current['BASE'], + "server",get_ou("serverRDN"),$config->current['BASE'], array("cn","FAIrepository","macAddress"),GL_SUBSEARCH); foreach($rest as $attrs){ diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc index c3b17f671..af7994697 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc @@ -665,7 +665,7 @@ class DNS $ret = array(); $ldap = $config->get_ldap_link(); - $tmp = get_sub_list("(&(objectClass=dNSZone)(sOARecord=*))","",get_ou("serverou"), + $tmp = get_sub_list("(&(objectClass=dNSZone)(sOARecord=*))","",get_ou("serverRDN"), $config->current['BASE'],array("zoneName"),GL_NO_ACL_CHECK | GL_SUBSEARCH); foreach($tmp as $at){ diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc index cdde338d2..abffb0390 100644 --- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc +++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc @@ -179,8 +179,8 @@ class phoneAccount extends plugin $deps_a = array( get_people_ou(), get_ou("ogroupou"), - get_ou("serverou"), - get_ou("terminalou"), + get_ou("serverRDN"), + get_ou("terminalRDN"), get_ou("workstationou"), get_ou("printerou"), get_ou("componentou"), diff --git a/gosa-plugins/goto/addons/goto/class_target_list.inc b/gosa-plugins/goto/addons/goto/class_target_list.inc index 97b70e5c7..f5089cd4b 100644 --- a/gosa-plugins/goto/addons/goto/class_target_list.inc +++ b/gosa-plugins/goto/addons/goto/class_target_list.inc @@ -279,13 +279,13 @@ class target_list extends MultiSelectWindow array("cn","objectClass","ipHostNumber","description"), GL_SIZELIMIT ); $res= array_merge($res,get_list($filter, "workstation", get_ou('workstationou').$base, array("cn","objectClass","ipHostNumber","description"), GL_SIZELIMIT )); - $res= array_merge($res,get_list($filter, "server", get_ou('serverou').$base, + $res= array_merge($res,get_list($filter, "server", get_ou('serverRDN').$base, array("cn","objectClass","ipHostNumber","description"), GL_SIZELIMIT )); $deps_a = array( get_ou("workstationou"), get_ou("incominou"), - get_ou("serverou"), + get_ou("serverRDN"), get_ou("ogroupou")); $res = get_sub_list($filter,array("server","incoming","workstation","ogroup"), diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc index 0df9e751d..eae22e2fb 100644 --- a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc +++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc @@ -80,7 +80,7 @@ class EventTargetAddList extends MultiSelectWindow /* Create a list of servers */ $tmp = get_sub_list("(&(macAddress=*)(objectClass=goServer))", - "server",get_ou("serverou"),$config->current['BASE'], + "server",get_ou("serverRDN"),$config->current['BASE'], array("cn","objectClass","description","ipHostNumber","macAddress"),GL_SUBSEARCH); foreach($tmp as $server){ $this->server_list[$server['dn']] = $server; @@ -196,7 +196,7 @@ class EventTargetAddList extends MultiSelectWindow if($this->display_server){ $_target_list = array_merge($_target_list, get_list("(&(cn=".$this->regex.")(objectClass=goServer))", - "server",get_ou("serverou").$this->selectedBase, + "server",get_ou("serverRDN").$this->selectedBase, array("cn","objectClass","description","ipHostNumber","macAddress"),GL_NONE)); } if($this->display_workstation){ diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc index 46aa1f1f8..a2aa88a6f 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc @@ -63,7 +63,7 @@ class printgeneric extends plugin /* Update dn, to ensure storing as printer instead of WS / terminal */ if(preg_match("/Terminal/i",$this->BelongsTo) || preg_match("/TerminalTemplate/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN'))."/",get_ou('printerou'),$this->dn); } if(preg_match("/Workstation/i",$this->BelongsTo) || preg_match("/WorkstationTemplate/i",$this->BelongsTo)){ @@ -220,7 +220,7 @@ class printgeneric extends plugin /* Update dn, to ensure storing as printer instead of WS / terminal */ if(preg_match("/terminal/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN'))."/",get_ou('printerou'),$this->dn); } if(preg_match("/workstation/i",$this->BelongsTo)){ @@ -569,7 +569,7 @@ class printgeneric extends plugin /* Update dn, to ensure storing as printer instead of WS / terminal */ if(preg_match("/terminal/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou')).",/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN')).",/",get_ou('printerou'),$this->dn); } if(preg_match("/workstation/i",$this->BelongsTo)){ @@ -716,7 +716,7 @@ class printgeneric extends plugin /* Update dn, to ensure storing as printer instead of WS / terminal */ if(preg_match("/terminal/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou')).",/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN')).",/",get_ou('printerou'),$this->dn); } if(preg_match("/workstation/i",$this->BelongsTo)){ diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc index 611e87264..d2c28eb46 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc @@ -125,7 +125,7 @@ class termgeneric extends plugin $ui= get_userinfo(); $this->base= dn2base($ui->dn); } else { - $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("terminalou"))."/", "", $this->dn); + $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("terminalRDN"))."/", "", $this->dn); } /* Create an array of all Syslog servers */ @@ -426,7 +426,7 @@ class termgeneric extends plugin } /* Permissions for that base? */ - $this->dn= "cn=".$this->cn.",".get_ou('terminalou').$this->base; + $this->dn= "cn=".$this->cn.",".get_ou('terminalRDN').$this->base; if ($this->cn == ""){ $message[]= msgPool::required(_("Name")); diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc index 87f5ef44e..1e24104ae 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc @@ -199,8 +199,8 @@ class termservice extends plugin $deps_a = array( get_people_ou(), get_ou("ogroupou"), - get_ou("serverou"), - get_ou("terminalou"), + get_ou("serverRDN"), + get_ou("terminalRDN"), get_ou("workstationou"), get_ou("printerou"), get_ou("componentou"), diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc index ad5616739..96a816f97 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc @@ -355,7 +355,7 @@ class termstartup extends plugin $ldap= $this->config->get_ldap_link(); /* Strip relevant part from dn, keep trailing ',' */ - $tmp= preg_replace("/^cn=[^,]+,".get_ou('terminalou')."/i", "", $this->dn); + $tmp= preg_replace("/^cn=[^,]+,".get_ou('terminalRDN')."/i", "", $this->dn); $tmp= preg_replace("/".$this->config->current['BASE']."$/i", "", $tmp); /* Walk from top to base and try to load default values for @@ -363,7 +363,7 @@ class termstartup extends plugin while (TRUE){ $tmp= preg_replace ("/^[^,]+,/", "", $tmp); - $ldap->cat("cn=default,".get_ou('terminalou').$tmp. + $ldap->cat("cn=default,".get_ou('terminalRDN').$tmp. $this->config->current['BASE'], array('gotoTerminalPath')); $attrs= $ldap->fetch(); if (isset($attrs['gotoTerminalPath'])){ diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc index fe3d0e5b3..d9be8af66 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc @@ -162,8 +162,8 @@ class workservice extends plugin $deps_a = array( get_people_ou(), get_ou("ogroupou"), - get_ou("serverou"), - get_ou("terminalou"), + get_ou("serverRDN"), + get_ou("terminalRDN"), get_ou("workstationou"), get_ou("printerou"), get_ou("componentou"), diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc index 18aa50c93..ef3fa586a 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -801,7 +801,7 @@ class workstartup extends plugin $ldap= $this->config->get_ldap_link(); /* Strip relevant part from dn, keep trailing ',' */ - $tmp= preg_replace("/^cn=[^,]+,".get_ou('terminalou')."/i", "", $this->dn); + $tmp= preg_replace("/^cn=[^,]+,".get_ou('terminalRDN')."/i", "", $this->dn); $tmp= preg_replace("/".$this->config->current['BASE']."$/i", "", $tmp); /* Walk from top to base and try to load default values for @@ -809,7 +809,7 @@ class workstartup extends plugin while (TRUE){ $tmp= preg_replace ("/^[^,]+,/", "", $tmp); - $ldap->cat("cn=default,".get_ou('terminalou').$tmp. + $ldap->cat("cn=default,".get_ou('terminalRDN').$tmp. $this->config->current['BASE'], array('gotoTerminalPath')); $attrs= $ldap->fetch(); if (isset($attrs['gotoTerminalPath'])){ diff --git a/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc b/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc index 2a644f7fa..fbf62904c 100644 --- a/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc +++ b/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc @@ -81,7 +81,7 @@ class termtabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ $baseobject= $this->by_object['termgeneric']; - $this->dn= "cn=".$baseobject->cn.",".get_ou('terminalou').$baseobject->base; + $this->dn= "cn=".$baseobject->cn.",".get_ou('terminalRDN').$baseobject->base; $baseobject->dn= $this->dn; if($this->dn != $baseobject->orig_dn && $baseobject->orig_dn != "new"){ diff --git a/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc b/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc index 147cc912c..158f055f6 100644 --- a/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc +++ b/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc @@ -114,7 +114,7 @@ class servnfs extends plugin $smarty->assign("mount_checked", "checked"); } else { $tmp = split(",", $this->dn); - $clip = $tmp[0] . ",".get_ou('serverou'); + $clip = $tmp[0] . ",".get_ou('serverRDN'); $mountsdn = "cn=mounts," . substr($this->dn, strlen($clip)); switch ($this->type) { case "netatalk" : { diff --git a/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc b/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc index 23f527b52..e32e9555e 100644 --- a/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc +++ b/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc @@ -240,7 +240,7 @@ class goShareServer extends goService{ function process_mounts() { - $clip = "cn=" . $this->cn . ",".get_ou('serverou'); + $clip = "cn=" . $this->cn . ",".get_ou('serverRDN'); $mountsdn = "cn=mounts," . substr($this->dn, strlen($clip)); $mounts = array( diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc index 469090097..c0c4e8a0b 100644 --- a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc +++ b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc @@ -77,7 +77,7 @@ class xlsexport extends plugin $smarty->assign("choicelist",array( get_people_ou() =>"users" , get_groups_ou() =>"groups" , get_ou('systemsou') =>"computers", - get_ou('serverou') =>"servers", + get_ou('serverRDN') =>"servers", "dc=addressbook," =>"addressbook")); // Get the LDAP link, to generate the Export diff --git a/gosa-plugins/ldapmanager/html/getxls.php b/gosa-plugins/ldapmanager/html/getxls.php index bebcb3dd8..5f3249504 100644 --- a/gosa-plugins/ldapmanager/html/getxls.php +++ b/gosa-plugins/ldapmanager/html/getxls.php @@ -183,7 +183,7 @@ function dump_ldap ($mode= 0) /* SYSTEMS Get all systems from th $dn and put them into the xls work sheet */ - case get_ou('serverou'): $servers= $ldap->gen_xls($dn,"(objectClass=*)",array("cn")); + case get_ou('serverRDN'): $servers= $ldap->gen_xls($dn,"(objectClass=*)",array("cn")); $intitul=array(_("Server name").":"); //name of the xls file @@ -288,7 +288,7 @@ function dump_ldap ($mode= 0) $computers= $ldap->gen_xls("ou=computers,".$dn,"(objectClass=*)",array("cn","description","uid")); $computers_intitul=array(_("Description").":",_("UID").":"); //data about servers - $servers= $ldap->gen_xls(get_ou('serverou').$dn,"(objectClass=*)",array("cn")); + $servers= $ldap->gen_xls(get_ou('serverRDN').$dn,"(objectClass=*)",array("cn")); $servers_intitul=array(_("Name").":"); //data about addressbook $address= $ldap->gen_xls("dc=addressbook,".$dn,"(objectClass=*)", diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc index c7fc62c29..838b08590 100644 --- a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc +++ b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc @@ -620,9 +620,9 @@ class sudo extends plugin $filter= "(&(|(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal))$exclude(cn=*)(cn=$regex))"; $res = array(); - $res= array_merge($res,get_sub_list($filter, array("terminal"), get_ou("terminalou"), + $res= array_merge($res,get_sub_list($filter, array("terminal"), get_ou("terminalRDN"), get_ou("systemsou").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); - $res= array_merge($res,get_sub_list($filter, array("server"), get_ou("serverou"), + $res= array_merge($res,get_sub_list($filter, array("server"), get_ou("serverRDN"), get_ou("systemsou").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); $res= array_merge($res,get_sub_list($filter, array("workstation"), get_ou("workstationou"), get_ou("systemsou").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); diff --git a/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc b/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc index 64a676a48..04d7942f1 100644 --- a/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc +++ b/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc @@ -232,7 +232,7 @@ class target_list_systems extends MultiSelectWindow if($this->terminal){ $filter = "(objectClass=gotoTerminal)"; $filter= "(&(cn=".$Regex.")(|".$filter."))"; - $res= array_merge($res,get_sub_list($filter,"terminal",get_ou('terminalou'),$base, + $res= array_merge($res,get_sub_list($filter,"terminal",get_ou('terminalRDN'),$base, array("cn","objectClass","description"), GL_SIZELIMIT | GL_SUBSEARCH)); } if($this->workstation){ @@ -244,7 +244,7 @@ class target_list_systems extends MultiSelectWindow if($this->server){ $filter = "(objectClass=goServer)"; $filter = "(&(cn=".$Regex.")(|".$filter."))"; - $res= array_merge($res,get_sub_list($filter, "server", get_ou('serverou'),$base, + $res= array_merge($res,get_sub_list($filter, "server", get_ou('serverRDN'),$base, array("cn","objectClass","description"), GL_SIZELIMIT | GL_SUBSEARCH)); } }else{ @@ -252,7 +252,7 @@ class target_list_systems extends MultiSelectWindow if($this->terminal){ $filter = "(objectClass=gotoTerminal)"; $filter= "(&(cn=".$Regex.")(|".$filter."))"; - $res= array_merge($res,get_list($filter,"terminal", get_ou('terminalou').$base, + $res= array_merge($res,get_list($filter,"terminal", get_ou('terminalRDN').$base, array("cn","objectClass","description"), GL_SIZELIMIT )); } if($this->workstation){ @@ -264,7 +264,7 @@ class target_list_systems extends MultiSelectWindow if($this->server){ $filter = "(objectClass=goServer)"; $filter = "(&(cn=".$Regex.")(|".$filter."))"; - $res= array_merge($res,get_list($filter, "server", get_ou('serverou').$base, + $res= array_merge($res,get_list($filter, "server", get_ou('serverRDN').$base, array("cn","objectClass","description"), GL_SIZELIMIT )); } } diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc index c52153441..a4fc61fa2 100644 --- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc @@ -92,7 +92,7 @@ class servgeneric extends plugin $this->base= dn2base($ui->dn); $this->cn= ""; } else { - $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("serverou"))."/", "", $this->dn); + $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("serverRDN"))."/", "", $this->dn); } $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses); $this->netConfigDNS->set_acl_category("server"); @@ -332,7 +332,7 @@ class servgeneric extends plugin /* Call common method to give check the hook */ $message= plugin::check(); $message= array_merge($message, $this->netConfigDNS->check()); - $this->dn= "cn=".$this->cn.",".get_ou('serverou').$this->base; + $this->dn= "cn=".$this->cn.",".get_ou('serverRDN').$this->base; /* must: cn */ if ($this->cn == ""){ @@ -351,7 +351,7 @@ class servgeneric extends plugin if ($ldap->count() != 0){ while ($attrs= $ldap->fetch()){ if ($attrs['dn'] != $this->orig_dn){ - if(!preg_match("/cn=dhcp,/",$attrs['dn']) && !preg_match("/,".get_ou('incomingou')."/",$attrs['dn']) && preg_match("/,".get_ou('serverou')."/",$attrs['dn'])){ + if(!preg_match("/cn=dhcp,/",$attrs['dn']) && !preg_match("/,".get_ou('incomingou')."/",$attrs['dn']) && preg_match("/,".get_ou('serverRDN')."/",$attrs['dn'])){ $message[]= msgPool::duplicated(_("Server name")); break; } diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index 1b26ef9a4..85ca9f84c 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -1062,10 +1062,10 @@ class systems extends plugin /* Check acls, if we are not allowed to create and write each plugin tab, skip this object */ $tabs = array( - "terminal" => get_ou('terminalou'), + "terminal" => get_ou('terminalRDN'), "workstation" => get_ou('workstationou'), "incoming" => get_ou('incomingou'), - "server" => get_ou('serverou'), + "server" => get_ou('serverRDN'), "printer" => get_ou('printerou'), "phone" => get_ou('phoneou'), "winworkstation" => get_winstations_ou(), @@ -1143,8 +1143,8 @@ class systems extends plugin /* This array represents the combination between checkboxes and search filters */ $objs = array( - "ShowServers" => array("TAB" => "servtabs", "CLASS" => "goServer" ,"TREE" => get_ou('serverou')), - "ShowTerminals" => array("TAB" => "termtabs", "CLASS" => "gotoTerminal" ,"TREE" => get_ou('terminalou')), + "ShowServers" => array("TAB" => "servtabs", "CLASS" => "goServer" ,"TREE" => get_ou('serverRDN')), + "ShowTerminals" => array("TAB" => "termtabs", "CLASS" => "gotoTerminal" ,"TREE" => get_ou('terminalRDN')), "ShowPrinters" => array("TAB" => "printtabs", "CLASS" => "gotoPrinter" ,"TREE" => get_ou('printerou')), "ShowDevices" => array("TAB" => "componenttabs", "CLASS" => "ieee802Device" ,"TREE" => get_ou('componentou')), "ShowPhones" => array("TAB" => "phonetabs", "CLASS" => "goFonHardware" ,"TREE" => get_ou('phoneou')), diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc index e0a6e7960..bca8b91ea 100644 --- a/gosa-plugins/systems/admin/systems/class_termDNS.inc +++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc @@ -185,8 +185,8 @@ class termDNS extends plugin */ $deps = array(); $ou = preg_replace("/,.*$/","",get_ou("systemsou")); - $a_ous = array(get_ou("serverou"), - get_ou("terminalou"), + $a_ous = array(get_ou("serverRDN"), + get_ou("terminalRDN"), get_ou("workstationou"), get_ou("printerou"), get_ou("phoneou"), diff --git a/gosa-plugins/systems/admin/systems/tabs_server.inc b/gosa-plugins/systems/admin/systems/tabs_server.inc index 0df20e09f..0c105219b 100644 --- a/gosa-plugins/systems/admin/systems/tabs_server.inc +++ b/gosa-plugins/systems/admin/systems/tabs_server.inc @@ -95,7 +95,7 @@ class servtabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ $baseobject= $this->by_object['servgeneric']; - $this->dn= "cn=$baseobject->cn,".get_ou('serverou').$baseobject->base; + $this->dn= "cn=$baseobject->cn,".get_ou('serverRDN').$baseobject->base; /* cn is not case sensitive for ldap, but for php it is!! */ if($baseobject->orig_dn != "new"){ -- 2.30.2