From: cajus Date: Wed, 17 Sep 2008 16:57:23 +0000 (+0000) Subject: Next bunch of renamings X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7b0a3278f618c4ca532c6c5f842661e1b5d436b6;p=gosa.git Next bunch of renamings git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12500 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5 index f48cddf83..4ece79621 100644 --- a/gosa-core/contrib/gosa.conf.5 +++ b/gosa-core/contrib/gosa.conf.5 @@ -713,7 +713,7 @@ departments. Default is .I ou=terminals. .PP -.B workstationou +.B workstationRDN .I string .PP This statement defines the location where GOsa creates new workstations inside of defined @@ -721,7 +721,7 @@ departments. Default is .I ou=workstations. .PP -.B printerou +.B printerRDN .I string .PP This statement defines the location where GOsa creates new printers inside of defined @@ -729,7 +729,7 @@ departments. Default is .I ou=printers. .PP -.B componentou +.B componentRDN .I string .PP This statement defines the location where GOsa creates new network components inside of defined @@ -737,7 +737,7 @@ departments. Default is .I ou=components. .PP -.B phoneou +.B phoneRDN .I string .PP This statement defines the location where GOsa creates new phones inside of defined @@ -745,7 +745,7 @@ departments. Default is .I ou=phones. .PP -.B conferenceou +.B phoneConferenceRDN .I string .PP This statement defines the location where GOsa creates new phone conferences inside of defined @@ -753,7 +753,7 @@ departments. Default is .I ou=conferences. .PP -.B blocklistou +.B faxBlocklistRDN .I string .PP This statement defines the location where GOsa creates new fax blocklists inside of defined @@ -761,7 +761,7 @@ departments. Default is .I ou=blocklists. .PP -.B incomingou +.B systemIncomingRDN .I string .PP This statement defines the location where GOsa looks for new systems to be joined to the LDAP. @@ -769,7 +769,7 @@ Default is .I ou=incoming. .PP -.B systemsou +.B systemRDN .I string .PP This statement defines the base location for servers, workstations, terminals, phones and diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index bffe5c9d7..9c2bbe840 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -1153,20 +1153,20 @@ function get_ou($name) $map = array( "ogroupou" => "ou=groups,", "applicationou" => "ou=apps,", - "systemsou" => "ou=systems,", + "systemRDN" => "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,", - "componentou" => "ou=netdevices,ou=systems,", + "workstationRDN" => "ou=workstations,ou=systems,", + "printerRDN" => "ou=printers,ou=systems,", + "phoneRDN" => "ou=phones,ou=systems,", + "componentRDN" => "ou=netdevices,ou=systems,", "sambaMachineAccountRDN" => "ou=winstation,", - "blocklistou" => "ou=gofax,ou=systems,", - "incomingou" => "ou=incoming,", + "faxBlocklistRDN" => "ou=gofax,ou=systems,", + "systemIncomingRDN" => "ou=incoming,", "aclroleou" => "ou=aclroles,", "macroou" => "ou=macros,ou=asterisk,ou=configs,ou=systems,", - "conferenceou" => "ou=conferences,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,", diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc index 09483d2c4..63fc809b4 100644 --- a/gosa-core/plugins/admin/acl/class_aclManagement.inc +++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc @@ -478,7 +478,7 @@ class aclManagement extends plugin /* Fetch following structures, this will be used if !$SubSearch */ $fetch_this = array( "ME" => array("TYPE" => "cat" , "FLAGS" => GL_SIZELIMIT ,"BASE"=>""), - "SYSTEMS" => array("TYPE" => "search" , "FLAGS" => GL_SIZELIMIT | GL_SUBSEARCH ,"BASE"=>get_ou('systemsou')), + "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')), "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())); diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc index 853d530cd..2226ac818 100644 --- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc +++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc @@ -373,13 +373,13 @@ class group extends plugin */ $types = array(); $types['server'] = array("OU" => get_ou("serverRDN"), "OC" => "(objectClass=goServer)"); - $types['workstation'] = array("OU" => get_ou("workstationou"),"OC" => "(objectClass=gotoWorkstation)"); + $types['workstation'] = array("OU" => get_ou("workstationRDN"),"OC" => "(objectClass=gotoWorkstation)"); $types['terminal'] = array("OU" => get_ou("terminalRDN"), "OC" => "(objectClass=gotoTerminal)"); $res = array(); foreach($types as $acl => $data){ $filter= "(&".$data['OC']."$exclude(cn=$regex))"; - $res= array_merge($res,get_sub_list($filter,array($acl),$data['OU'],get_ou("systemsou").$sysfilter['depselect'], + $res= array_merge($res,get_sub_list($filter,array($acl),$data['OU'],get_ou("systemRDN").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); } $wslist = array(); diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc index 37754c093..dd4f7146e 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc @@ -337,8 +337,8 @@ class ogroup extends plugin $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'], + get_ou("workstationRDN")); + $res= get_sub_list($filter, array("terminal","server","workstation"), $deps_a, get_ou("systemRDN").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT); $wslist= array(); foreach ($res as $attrs){ @@ -658,15 +658,15 @@ class ogroup extends plugin "servers" => array("OBJ"=>"servgeneric", "CLASS"=>"goServer" , "DN"=> get_ou('serverRDN') ,"ACL" => "server"), "workstations" => array("OBJ"=>"workgeneric", "CLASS"=>"gotoWorkstation", - "DN"=> get_ou('workstationou') ,"ACL" => "workstation"), + "DN"=> get_ou('workstationRDN') ,"ACL" => "workstation"), "winstations" => array("OBJ"=>"wingeneric", "CLASS"=>"opsiClient", "DN"=> get_ou('SAMBAMACHINEACCOUNTRDN') ,"ACL" => "winstation"), "terminals" => array("OBJ"=>"termgeneric", "CLASS"=>"gotoTerminal" , "DN"=> get_ou('terminalRDN') ,"ACL" => "terminal"), "printers" => array("OBJ"=>"printgeneric", "CLASS"=>"gotoPrinter" , - "DN"=> get_ou('printerou') ,"ACL" => "printer"), + "DN"=> get_ou('printerRDN') ,"ACL" => "printer"), "phones" => array("OBJ"=>"phoneGeneric", "CLASS"=>"goFonHardware" , - "DN"=> get_ou('phoneou') ,"ACL" => "phone")); + "DN"=> get_ou('phoneRDN') ,"ACL" => "phone")); /* Allow searching for applications, if we are not using release managed applications diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc index 87be6dcc0..a83d287ae 100644 --- a/gosa-core/plugins/personal/posix/class_posixAccount.inc +++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc @@ -398,9 +398,9 @@ class posixAccount extends plugin $deps_a = array(get_ou("serverRDN"), get_ou("terminalRDN"), - get_ou("workstationou")); + get_ou("workstationRDN")); - $res= get_sub_list($filter, $acls, $deps_a, get_ou("systemsou").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT); + $res= get_sub_list($filter, $acls, $deps_a, get_ou("systemRDN").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT); $wslist= array(); foreach ($res as $attrs){ $wslist[]= preg_replace('/\$/', '', $attrs['cn'][0]); diff --git a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc index b4dd9a335..613ceda10 100644 --- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc +++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc @@ -62,7 +62,7 @@ class addressbook extends plugin $this->config= &$config; /* Check if there is a special ldap-sub-tree specified, instead of dc=addressbook, */ - $aoc = $this->config->search("addressbook", "LDAP_OBJECT_CLASS",array('menu')); + $aoc = $this->config->search("addressbook", "addressbookBaseDN",array('menu')); if ($aoc != ""){ $this->abobjectclass = $aoc; } diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc index 6f39cfdb1..68f427dd1 100644 --- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc +++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc @@ -87,7 +87,7 @@ class faiManagement extends plugin if(!session::is_set("fai_filter")){ /* Set intial release */ - $rel = $config->search("faiManagement","DEFAULT_RELEASE",array("menu")); + $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu")); $rels = array_flip($this->getBranches()); if(isset($rels[$rel])){ $rel = $rels[$rel]; diff --git a/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc b/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc index e2e9a4d8a..2a6025b76 100644 --- a/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc +++ b/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc @@ -196,12 +196,12 @@ class servRepositorySetup extends plugin function GetHookElements() { $ret = array(); - $cmd = $this->config->search("servrepository", "REPOSITORY_HOOK",array('tabs')); + $cmd = $this->config->search("servrepository", "repositoryBranchHook",array('tabs')); if(!empty($cmd)){ $res = shell_exec($cmd); $res2 = trim($res); if(!$res || empty($res2)){ - msg_dialog::display(_("Error"), msgPool::cmdexecfailed("REPOSITORY_HOOK", $cmd, _("Repository service")), ERROR_DIALOG); + msg_dialog::display(_("Error"), msgPool::cmdexecfailed("repositoryBranchHook", $cmd, _("Repository service")), ERROR_DIALOG); }else{ $tmp = split("\n",$res); foreach($tmp as $hook){ diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc index c7c95e575..edd51c29d 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc @@ -219,7 +219,7 @@ class blocklistGeneric extends plugin } if ($this->dn == 'new'){ $ldap= $this->config->get_ldap_link(); - $ldap->cd (get_ou('blocklistou').$this->config->current["BASE"]); + $ldap->cd (get_ou('faxBlocklistRDN').$this->config->current["BASE"]); $ldap->search ("(&(|(objectClass=goFaxSBlock)(objectClass=goFaxRBlock))(cn=".$this->cn."))", array("cn")); if ($ldap->count() != 0){ $message[]= msgPool::duplicated(_("Name")); diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc index d7265abe9..37a80a28f 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc @@ -368,7 +368,7 @@ class blocklist extends plugin /* Return departments, that will be included within snapshot detection */ function get_used_snapshot_bases() { - return(array(get_ou('blocklistou').$this->DivListBlocklist->selectedBase)); + return(array(get_ou('faxBlocklistRDN').$this->DivListBlocklist->selectedBase)); } @@ -389,7 +389,7 @@ class blocklist extends plugin if($SubSearch){ $Flags |= GL_SUBSEARCH; }else{ - $base = get_ou('blocklistou').$base; + $base = get_ou('faxBlocklistRDN').$base; } /* Create filter */ diff --git a/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc b/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc index 32a674705..54a378674 100644 --- a/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc +++ b/gosa-plugins/gofax/gofax/blocklists/tabs_blocklist.inc @@ -15,7 +15,7 @@ class faxblocktabs extends tabs $baseobject= $this->by_object['blocklistGeneric']; /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ - $new_dn= "cn=".$baseobject->cn.",".get_ou('blocklistou').$baseobject->base; + $new_dn= "cn=".$baseobject->cn.",".get_ou('faxBlocklistRDN').$baseobject->base; /* Move group? */ if ($this->dn != $new_dn){ diff --git a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc index 2bf6b1049..41072b938 100644 --- a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc +++ b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc @@ -62,7 +62,7 @@ class phoneGeneric extends plugin $this->base= dn2base($ui->dn); $this->cn= ""; } else { - $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("phoneou"))."/", "", $this->dn); + $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("phoneRDN"))."/", "", $this->dn); } if($this->goFonMSN != ""){ @@ -323,7 +323,7 @@ class phoneGeneric extends plugin $message= plugin::check(); $message= array_merge($message, $this->netConfigDNS->check()); - $this->dn= "cn=".$this->cn.",".get_ou('phoneou').$this->base; + $this->dn= "cn=".$this->cn.",".get_ou('phoneRDN').$this->base; /* To check for valid ip*/ if($this->netConfigDNS->ipHostNumber == ""){ diff --git a/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc b/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc index e4d05b1e0..b8a859058 100644 --- a/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc +++ b/gosa-plugins/gofon/admin/systems/gofon/tabs_phone.inc @@ -25,7 +25,7 @@ class phonetabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ $baseobject= $this->by_object['phoneGeneric']; - $this->dn= "cn=$baseobject->cn,".get_ou('phoneou').$baseobject->base; + $this->dn= "cn=$baseobject->cn,".get_ou('phoneRDN').$baseobject->base; $baseobject->dn= $this->dn; foreach ($this->by_object as $key => $obj){ diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc index d10d1b85f..afd83c515 100644 --- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc +++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc @@ -119,7 +119,7 @@ class conference extends plugin } else { /* Get base */ - $this->base = preg_replace ("/^[^,]+,".normalizePreg(get_ou('conferenceou'))."/i","",$this->dn);; + $this->base = preg_replace ("/^[^,]+,".normalizePreg(get_ou('phoneConferenceRDN'))."/i","",$this->dn);; } $this->goFonConferenceOwner=$this->ui->dn; @@ -404,7 +404,7 @@ class conference extends plugin if($this->old_cn != $this->cn || $this->base != $this->old_base){ $ldap = $this->config->get_ldap_link(); - $ldap->cd(get_ou('conferenceou').$this->base); + $ldap->cd(get_ou('phoneConferenceRDN').$this->base); $ldap->search("(&(objectClass=goFonConference)(cn=".$this->cn."))",array("cn")); if($ldap->count()){ $message[] = msgPool::duplicated(_("Name")); diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc index 685c6c580..a944a1571 100644 --- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc +++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc @@ -323,7 +323,7 @@ class phoneConferenceManagment extends plugin /* Insert new entry*/ if($s_action == "new" ){ - $dummy_dn = "cn=dummy,".get_ou('conferenceou').$this->DivListConference->selectedBase; + $dummy_dn = "cn=dummy,".get_ou('phoneConferenceRDN').$this->DivListConference->selectedBase; $acl = $this->ui->get_permissions($dummy_dn,"gofonconference/conference"); if(preg_match("/c/",$acl)){ /* Set up the users ACL's for this 'dn' */ @@ -423,7 +423,7 @@ class phoneConferenceManagment extends plugin /* Return departments, that will be included within snapshot detection */ function get_used_snapshot_bases() { - return(array(get_ou('conferenceou').$this->DivListConference->selectedBase)); + return(array(get_ou('phoneConferenceRDN').$this->DivListConference->selectedBase)); } @@ -432,7 +432,7 @@ class phoneConferenceManagment extends plugin */ function reload() { - $Base = get_ou('conferenceou').$this->DivListConference->selectedBase; + $Base = get_ou('phoneConferenceRDN').$this->DivListConference->selectedBase; $SubSearch = $this->DivListConference->SubSearch; $Regex = $this->DivListConference->Regex; $Flags = GL_SIZELIMIT ; diff --git a/gosa-plugins/gofon/gofon/conference/tabs_conference.inc b/gosa-plugins/gofon/gofon/conference/tabs_conference.inc index dce1febd0..8d51b1f9b 100644 --- a/gosa-plugins/gofon/gofon/conference/tabs_conference.inc +++ b/gosa-plugins/gofon/gofon/conference/tabs_conference.inc @@ -22,7 +22,7 @@ class conferencetabs extends tabs function save($ignore_account= FALSE) { $baseobject= $this->by_object['conference']; - $new_dn= 'cn='.$baseobject->cn.','.get_ou('conferenceou').$baseobject->base; + $new_dn= 'cn='.$baseobject->cn.','.get_ou('phoneConferenceRDN').$baseobject->base; if(strtolower($this->dn)==strtolower($new_dn)){ $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 abffb0390..6b2edea24 100644 --- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc +++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc @@ -159,7 +159,7 @@ class phoneAccount extends plugin /* Get available phone hardware * Search for all available phone hardware */ - $tmp = get_sub_list("(objectClass=goFonHardware)","phone",array(get_ou("phoneou")), + $tmp = get_sub_list("(objectClass=goFonHardware)","phone",array(get_ou("phoneRDN")), $this->config->current['BASE'],array("cn","description"), GL_SUBSEARCH); foreach($tmp as $attrs){ $cn= $attrs['cn'][0]; @@ -181,10 +181,10 @@ class phoneAccount extends plugin get_ou("ogroupou"), get_ou("serverRDN"), get_ou("terminalRDN"), - get_ou("workstationou"), - get_ou("printerou"), - get_ou("componentou"), - get_ou("phoneou")); + get_ou("workstationRDN"), + get_ou("printerRDN"), + get_ou("componentRDN"), + get_ou("phoneRDN")); $tmp = get_sub_list("(goFonHardware=*)","phone",$deps_a,$this->config->current['BASE'], array('cn','dn','goFonHardware'),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 f5089cd4b..e37a2bcdd 100644 --- a/gosa-plugins/goto/addons/goto/class_target_list.inc +++ b/gosa-plugins/goto/addons/goto/class_target_list.inc @@ -277,19 +277,19 @@ class target_list extends MultiSelectWindow }else{ $res= get_list($filter, "ogroups", get_groups_ou().$base, array("cn","objectClass","ipHostNumber","description"), GL_SIZELIMIT ); - $res= array_merge($res,get_list($filter, "workstation", get_ou('workstationou').$base, + $res= array_merge($res,get_list($filter, "workstation", get_ou('workstationRDN').$base, array("cn","objectClass","ipHostNumber","description"), GL_SIZELIMIT )); $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("workstationRDN"), get_ou("incominou"), get_ou("serverRDN"), get_ou("ogroupou")); $res = get_sub_list($filter,array("server","incoming","workstation","ogroup"), - $deps_a,get_ou("systemsou").$base,array("cn","objectClass","ipHostNumber","description"),GL_SIZELIMIT); + $deps_a,get_ou("systemRDN").$base,array("cn","objectClass","ipHostNumber","description"),GL_SIZELIMIT); } $this->list= $res; diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc index eae22e2fb..f0baa6e86 100644 --- a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc +++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc @@ -89,7 +89,7 @@ class EventTargetAddList extends MultiSelectWindow /* Create a list of workstations */ $tmp = get_sub_list("(&(macAddress=*)(objectClass=gotoWorkstation))", - "server",get_ou("workstationou"),$config->current['BASE'], + "server",get_ou("workstationRDN"),$config->current['BASE'], array("cn","objectClass","description","ipHostNumber","macAddress"),GL_SUBSEARCH); foreach($tmp as $server){ $this->workstation_list[$server['dn']] = $server; @@ -202,7 +202,7 @@ class EventTargetAddList extends MultiSelectWindow if($this->display_workstation){ $_target_list = array_merge($_target_list, get_list("(&(cn=".$this->regex.")(objectClass=gotoWorkstation))", - "workstation",get_ou("workstationou").$this->selectedBase, + "workstation",get_ou("workstationRDN").$this->selectedBase, array("cn","objectClass","description","ipHostNumber","macAddress"),GL_NONE)); } if($this->display_ogroup){ diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc index bf332fed6..20f16feb5 100644 --- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc +++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc @@ -84,7 +84,7 @@ class applicationManagement extends plugin /* Set intial release */ $this->app_base = get_ou("applicationou").$this->config->current['BASE']; - $rel = $config->search("faiManagement","DEFAULT_RELEASE",array("menu")); + $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu")); $rels = array_flip($this->getReleases()); if(isset($rels[$rel])){ $rel = $rels[$rel]; diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc index 23754acb8..732147f57 100644 --- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc +++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc @@ -36,7 +36,7 @@ class appgroup extends plugin $this->Releases = $this->getReleases(); /* Set intial release */ - $this->FAIrelease = $config->search("faiManagement","DEFAULT_RELEASE",array("menu")); + $this->FAIrelease = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu")); if(empty($this->FAIrelease) || !isset($this->Releases[$this->FAIrelease])){ $this->FAIrelease = "/"; } diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc index 1621ce3b3..3498d6da1 100644 --- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc +++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeManagement.inc @@ -79,7 +79,7 @@ class mimetypeManagement extends plugin if(!session::is_set("mime_filter")){ /* Set intial release */ - $rel = $config->search("faiManagement","DEFAULT_RELEASE",array("menu")); + $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu")); if(empty($rel)){ $rel = $this->mime_base; } @@ -91,7 +91,7 @@ class mimetypeManagement extends plugin $this->mime_base = get_ou("mimetypeou").$this->config->current['BASE']; /* Set intial release */ - $rel = $config->search("faiManagement","DEFAULT_RELEASE",array("menu")); + $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu")); $rels = array_flip($this->getReleases()); if(isset($rels[$rel])){ $rel = $rels[$rel]; diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc index a2aa88a6f..5f5a840a4 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc @@ -63,11 +63,11 @@ 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('terminalRDN'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN'))."/",get_ou('printerRDN'),$this->dn); } if(preg_match("/Workstation/i",$this->BelongsTo) || preg_match("/WorkstationTemplate/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('workstationRDN'))."/",get_ou('printerRDN'),$this->dn); } $this->orig_dn = $this->dn; @@ -96,10 +96,10 @@ class printgeneric extends plugin } else { /* Set base and check if the extracted base exists */ - if(preg_match("/".normalizePreg(get_ou('incomingou'))."/",$this->dn)){ - $this->base= preg_replace("/".normalizePreg(get_ou('incomingou'))."/","",dn2base($this->dn)); + if(preg_match("/".normalizePreg(get_ou('systemIncomingRDN'))."/",$this->dn)){ + $this->base= preg_replace("/".normalizePreg(get_ou('systemIncomingRDN'))."/","",dn2base($this->dn)); }else{ - $this->base= preg_replace("/".normalizePreg(get_ou('printerou'))."/","",dn2base($this->dn)); + $this->base= preg_replace("/".normalizePreg(get_ou('printerRDN'))."/","",dn2base($this->dn)); } if(!isset($this->config->idepartments[$this->base])){ @@ -220,11 +220,11 @@ 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('terminalRDN'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN'))."/",get_ou('printerRDN'),$this->dn); } if(preg_match("/workstation/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('workstationRDN'))."/",get_ou('printerRDN'),$this->dn); } /* Detect if this is a valid printer account; @@ -569,11 +569,11 @@ 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('terminalRDN')).",/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN')).",/",get_ou('printerRDN'),$this->dn); } if(preg_match("/workstation/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('workstationRDN'))."/",get_ou('printerRDN'),$this->dn); } /* Check if this dn points to a printer, to avoid deleting something else */ @@ -663,7 +663,7 @@ class printgeneric extends plugin } } - $dn= "cn=".$this->cn.get_ou('printerou').",".$this->base; + $dn= "cn=".$this->cn.get_ou('printerRDN').",".$this->base; /* must: cn */ if(($this->BelongsTo == "Printer") && $this->cn == ""){ @@ -684,7 +684,7 @@ class printgeneric extends plugin if (($this->orig_dn != $dn)&&( preg_match("/printer/i",$this->BelongsTo))){ $ldap= $this->config->get_ldap_link(); $ldap->cd ($this->base); - $ldap->ls("(cn=".$this->cn.")",get_ou('printerou').$this->base, array("cn")); + $ldap->ls("(cn=".$this->cn.")",get_ou('printerRDN').$this->base, array("cn")); if ($ldap->count() != 0){ while ($attrs= $ldap->fetch()){ if(preg_match("/cn=dhcp,/",$attrs['dn'])){ @@ -716,11 +716,11 @@ 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('terminalRDN')).",/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('terminalRDN')).",/",get_ou('printerRDN'),$this->dn); } if(preg_match("/workstation/i",$this->BelongsTo)){ - $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn); + $this->dn= preg_replace("/".normalizePreg(get_ou('workstationRDN'))."/",get_ou('printerRDN'),$this->dn); } if(!$this->is_account) return; @@ -847,7 +847,7 @@ class printgeneric extends plugin } /* Ensure to create a new object */ - if(preg_match("/".normalizePreg(get_ou('incomingou'))."/",$this->orig_dn)){ + if(preg_match("/".normalizePreg(get_ou('systemIncomingRDN'))."/",$this->orig_dn)){ $this->orig_dn = "new"; } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc index d2c28eb46..9fdf6fabe 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc @@ -449,7 +449,7 @@ class termgeneric extends plugin } if ($ldap->count() != 0){ while ($attrs= $ldap->fetch()){ - if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".normalizePreg(get_ou('incomingou'))."/", $ldap->getDN())){ + if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".normalizePreg(get_ou('systemIncomingRDN'))."/", $ldap->getDN())){ continue; } else { if ($attrs['dn'] != $this->orig_dn){ diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc index 1e24104ae..f0e66df31 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc @@ -180,7 +180,7 @@ class termservice extends plugin /* Load phone hardware list */ - $tmp = get_sub_list("(objectClass=goFonHardware)","",array(get_ou("phoneou")), + $tmp = get_sub_list("(objectClass=goFonHardware)","",array(get_ou("phoneRDN")), $this->config->current['BASE'],array("cn","description"), GL_NO_ACL_CHECK); foreach($tmp as $attrs){ $cn= $attrs['cn'][0]; @@ -201,10 +201,10 @@ class termservice extends plugin get_ou("ogroupou"), get_ou("serverRDN"), get_ou("terminalRDN"), - get_ou("workstationou"), - get_ou("printerou"), - get_ou("componentou"), - get_ou("phoneou")); + get_ou("workstationRDN"), + get_ou("printerRDN"), + get_ou("componentRDN"), + get_ou("phoneRDN")); $tmp = get_sub_list("(goFonHardware=*)","",$deps_a,$this->config->current['BASE'], array('cn','dn','goFonHardware'),GL_NO_ACL_CHECK); diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc index 96a816f97..9ae9ad960 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc @@ -78,10 +78,10 @@ class termstartup extends plugin /* Get list of boot kernels */ if (isset($this->config->data['TABS'])){ - $command= $this->config->search(get_class($this), "KERNELS",array('tabs')); + $command= $this->config->search(get_class($this), "systemKernelsHook",array('tabs')); if (!check_command($command)){ - $message[]= sprintf(_("Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to exist."), $command, + $message[]= sprintf(_("Command '%s', specified as systemKernelsHook for plugin '%s' doesn't seem to exist."), $command, get_class($this)); } else { $fh= popen($command, "r"); diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index 5c8ea3b0d..0be3299ab 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -143,7 +143,7 @@ class workgeneric extends plugin $ui= get_userinfo(); $this->base= dn2base($ui->dn); } else { - $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("workstationou"))."/i", "", $this->dn); + $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("workstationRDN"))."/i", "", $this->dn); } /* Create an array of all Syslog servers */ @@ -450,7 +450,7 @@ class workgeneric extends plugin $message= array_merge($message, $this->netConfigDNS->check()); } - $this->dn= "cn=".$this->cn.",".get_ou('workstationou').$this->base; + $this->dn= "cn=".$this->cn.",".get_ou('workstationRDN').$this->base; if ($this->cn == ""){ $message[]= msgPool::required(_("Name")); @@ -472,7 +472,7 @@ class workgeneric extends plugin } if ($ldap->count() != 0){ while ($attrs= $ldap->fetch()){ - if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".get_ou('incomingou')."/", $ldap->getDN())){ + if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".get_ou('systemIncomingRDN')."/", $ldap->getDN())){ continue; } else { if ($attrs['dn'] != $this->orig_dn){ @@ -502,7 +502,7 @@ class workgeneric extends plugin }else{ /* Warn the user, that this host is currently installing */ if($this->currently_installing && !$this->currently_installing_warned && - !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){ + !preg_match("/".normalizePreg(get_ou("systemIncomingRDN"))."/",$this->orig_dn)){ /* Force aborting without message dialog */ $message[] = ""; diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc index d9be8af66..942c329be 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc @@ -143,7 +143,7 @@ class workservice extends plugin /* Load phone hardware list */ - $tmp = get_sub_list("(objectClass=goFonHardware)","",array(get_ou("phoneou")), + $tmp = get_sub_list("(objectClass=goFonHardware)","",array(get_ou("phoneRDN")), $this->config->current['BASE'],array("cn","description"), GL_NO_ACL_CHECK); foreach($tmp as $attrs){ $cn= $attrs['cn'][0]; @@ -164,10 +164,10 @@ class workservice extends plugin get_ou("ogroupou"), get_ou("serverRDN"), get_ou("terminalRDN"), - get_ou("workstationou"), - get_ou("printerou"), - get_ou("componentou"), - get_ou("phoneou")); + get_ou("workstationRDN"), + get_ou("printerRDN"), + get_ou("componentRDN"), + get_ou("phoneRDN")); $tmp = get_sub_list("(goFonHardware=*)","",$deps_a,$this->config->current['BASE'], array('cn','dn','goFonHardware'),GL_NO_ACL_CHECK); @@ -466,7 +466,7 @@ class workservice extends plugin */ $p = $this->parent->by_object['ogroup']; foreach($p->memberList as $dn => $obj){ - if(preg_match("/".normalizePreg(get_ou("incomingou"))."/",$dn)) continue; + if(preg_match("/".normalizePreg(get_ou("systemIncomingRDN"))."/",$dn)) continue; if(isset($p->objcache[$dn]['macAddress']) && !empty($p->objcache[$dn]['macAddress'])){ $macs[] = $p->objcache[$dn]['macAddress']; } @@ -476,7 +476,7 @@ class workservice extends plugin /* We are a workstation. Add current mac. */ $mac = $this->parent->by_object['workgeneric']->netConfigDNS->macAddress; - if(!empty($mac) && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){ + if(!empty($mac) && !preg_match("/".normalizePreg(get_ou("systemIncomingRDN"))."/",$this->orig_dn)){ $macs[] = $mac; } } diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc index 8932b8a98..e4aec9673 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -1306,14 +1306,14 @@ class workstartup extends plugin function GetHookElements() { $ret = array(); - $cmd= $this->config->search("servrepository", "REPOSITORY_HOOK",array('tabs')); + $cmd= $this->config->search("servrepository", "repositoryBranchHook",array('tabs')); if(!empty($cmd)){ $res = shell_exec($cmd); $res2 = trim($res); if((!$res)){ - msg_dialog::display(_("Configuration error"), msgPool::cmdexecfailed("REPOSITORY_HOOK", $cmd), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"), msgPool::cmdexecfailed("repositoryBranchHook", $cmd), ERROR_DIALOG); }elseif(empty($res2)){ - msg_dialog::display(_("Configuration error"), _("REPOSITORY_HOOK returned no result!"), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"), _("repositoryBranchHook returned no result!"), ERROR_DIALOG); }else{ $tmp = split("\n",$res); foreach($tmp as $line){ diff --git a/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc b/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc index 0d0516ab3..a7d777d5e 100644 --- a/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc +++ b/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc @@ -75,7 +75,7 @@ class printtabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ $baseobject= $this->by_object['printgeneric']; - $this->dn= "cn=$baseobject->cn,".get_ou('printerou').$baseobject->base; + $this->dn= "cn=$baseobject->cn,".get_ou('printerRDN').$baseobject->base; $baseobject->dn= $this->dn; foreach ($this->by_object as $key => $obj){ diff --git a/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc b/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc index 08e095ee1..2ee579984 100644 --- a/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc +++ b/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc @@ -78,7 +78,7 @@ class worktabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ $baseobject= $this->by_object['workgeneric']; - $this->dn= "cn=".$baseobject->cn.",".get_ou('workstationou').$baseobject->base; + $this->dn= "cn=".$baseobject->cn.",".get_ou('workstationRDN').$baseobject->base; if($this->dn != $baseobject->orig_dn && $baseobject->orig_dn != "new"){ diff --git a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc index 473733c98..b4da61ca1 100644 --- a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc +++ b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc @@ -131,7 +131,7 @@ class selectPrinterDialog extends plugin if ($this->subtreesearch){ $res = get_list($filter,$module,$base,$attrs, GL_SIZELIMIT | GL_SUBSEARCH); } else { - $base= get_ou('printerou').$base; + $base= get_ou('printerRDN').$base; $res = get_list($filter,$module,$base,$attrs, GL_SIZELIMIT ); } diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc index c0c4e8a0b..33250ca77 100644 --- a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc +++ b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc @@ -76,7 +76,7 @@ class xlsexport extends plugin $smarty->assign("deplist", $bases); $smarty->assign("choicelist",array( get_people_ou() =>"users" , get_groups_ou() =>"groups" , - get_ou('systemsou') =>"computers", + get_ou('systemRDN') =>"computers", get_ou('serverRDN') =>"servers", "dc=addressbook," =>"addressbook")); diff --git a/gosa-plugins/ldapmanager/html/getxls.php b/gosa-plugins/ldapmanager/html/getxls.php index 5f3249504..8455d77c0 100644 --- a/gosa-plugins/ldapmanager/html/getxls.php +++ b/gosa-plugins/ldapmanager/html/getxls.php @@ -152,7 +152,7 @@ function dump_ldap ($mode= 0) /* SYSTEMS Get all systems from th $dn and put them into the xls work sheet */ - case get_ou('systemsou'): + case get_ou('systemRDN'): $name_section=_("Servers"); $computers= $ldap->gen_xls($dn,"(&(objectClass=*)(cn=*))",array("cn","description","uid")); diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc index 838b08590..9343b8192 100644 --- a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc +++ b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc @@ -621,11 +621,11 @@ class sudo extends plugin $res = array(); $res= array_merge($res,get_sub_list($filter, array("terminal"), get_ou("terminalRDN"), - get_ou("systemsou").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); + get_ou("systemRDN").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); $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)); + get_ou("systemRDN").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); + $res= array_merge($res,get_sub_list($filter, array("workstation"), get_ou("workstationRDN"), + get_ou("systemRDN").$sysfilter['depselect'], array("cn"), GL_SUBSEARCH | GL_SIZELIMIT)); $wslist= array(); foreach ($res as $attrs){ 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 04d7942f1..8c08ad300 100644 --- a/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc +++ b/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc @@ -238,7 +238,7 @@ class target_list_systems extends MultiSelectWindow if($this->workstation){ $filter = "(objectClass=gotoWorkstation)"; $filter= "(&(cn=".$Regex.")(|".$filter."))"; - $res= array_merge($res,get_sub_list($filter, "workstation", get_ou('workstationou'),$base, + $res= array_merge($res,get_sub_list($filter, "workstation", get_ou('workstationRDN'),$base, array("cn","objectClass","description"), GL_SIZELIMIT | GL_SUBSEARCH)); } if($this->server){ @@ -258,7 +258,7 @@ class target_list_systems extends MultiSelectWindow if($this->workstation){ $filter = "(objectClass=gotoWorkstation)"; $filter= "(&(cn=".$Regex.")(|".$filter."))"; - $res= array_merge($res,get_list($filter, "workstation", get_ou('workstationou').$base, + $res= array_merge($res,get_list($filter, "workstation", get_ou('workstationRDN').$base, array("cn","objectClass","description"), GL_SIZELIMIT )); } if($this->server){ diff --git a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc index 294e9a0ed..97cf914da 100644 --- a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc @@ -50,7 +50,7 @@ class componentGeneric extends plugin $this->base= dn2base($ui->dn); $this->cn= ""; } else { - $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("componentou"))."/", "", $this->dn); + $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("componentRDN"))."/", "", $this->dn); } $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses, true); /* Save dn for later references */ @@ -203,7 +203,7 @@ class componentGeneric extends plugin $message= plugin::check(); $message= array_merge($message,$this->netConfigDNS->check()); - $this->dn= "cn=".$this->cn.",".get_ou('componentou').$this->base; + $this->dn= "cn=".$this->cn.",".get_ou('componentRDN').$this->base; if ($this->cn == "" ){ $message[]= msgPool::required(_("Component name")); @@ -232,7 +232,7 @@ class componentGeneric extends plugin if(preg_match("/cn=dhcp,/",$attrs['dn'])){ continue; } - if ($attrs['dn'] != $this->orig_dn && preg_match("/".normalizePreg(get_ou("componentou"))."/",$attrs['dn'])){ + if ($attrs['dn'] != $this->orig_dn && preg_match("/".normalizePreg(get_ou("componentRDN"))."/",$attrs['dn'])){ $message[]= msgPool::duplicated(_("Component name")); break; } diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc index a4fc61fa2..3257f7025 100644 --- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc @@ -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('serverRDN')."/",$attrs['dn'])){ + if(!preg_match("/cn=dhcp,/",$attrs['dn']) && !preg_match("/,".get_ou('systemIncomingRDN')."/",$attrs['dn']) && preg_match("/,".get_ou('serverRDN')."/",$attrs['dn'])){ $message[]= msgPool::duplicated(_("Server name")); break; } @@ -361,7 +361,7 @@ class servgeneric extends plugin } /* Warn the user, that this host is currently installing */ - if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){ + if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".normalizePreg(get_ou("systemIncomingRDN"))."/",$this->orig_dn)){ /* Force aborting without message dialog */ $message[] = ""; diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index 85ca9f84c..117847772 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -243,7 +243,7 @@ class systems extends plugin $dsc = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w")); /* Get and check command */ - $command= $this->config->search("workgeneric", "ISOCMD",array('tabs')); + $command= $this->config->search("workgeneric", "SYSTEMISOHOOK",array('tabs')); if (check_command($command)){ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute"); @@ -999,7 +999,7 @@ class systems extends plugin $dialog = FALSE; $hide_apply = $this->dn == "new"; - $hide_apply = ($this->dn == "new") || (preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->dn)); + $hide_apply = ($this->dn == "new") || (preg_match("/".normalizePreg(get_ou("systemIncomingRDN"))."/",$this->dn)); if(is_object($this->systab) && !isset($this->systab->by_object)){ $dialog = TRUE; $hide_apply = TRUE; @@ -1063,13 +1063,13 @@ class systems extends plugin $tabs = array( "terminal" => get_ou('terminalRDN'), - "workstation" => get_ou('workstationou'), - "incoming" => get_ou('incomingou'), + "workstation" => get_ou('workstationRDN'), + "incoming" => get_ou('systemIncomingRDN'), "server" => get_ou('serverRDN'), - "printer" => get_ou('printerou'), - "phone" => get_ou('phoneou'), + "printer" => get_ou('printerRDN'), + "phone" => get_ou('phoneRDN'), "winworkstation" => get_winstations_ou(), - "component" => get_ou('componentou') + "component" => get_ou('componentRDN') ); foreach($tabs as $acl_cat => $dn){ @@ -1145,10 +1145,10 @@ class systems extends plugin $objs = array( "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')), - "ShowWorkstations" => array("TAB" => "worktabs", "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')), + "ShowPrinters" => array("TAB" => "printtabs", "CLASS" => "gotoPrinter" ,"TREE" => get_ou('printerRDN')), + "ShowDevices" => array("TAB" => "componenttabs", "CLASS" => "ieee802Device" ,"TREE" => get_ou('componentRDN')), + "ShowPhones" => array("TAB" => "phonetabs", "CLASS" => "goFonHardware" ,"TREE" => get_ou('phoneRDN')), + "ShowWorkstations" => array("TAB" => "worktabs", "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationRDN')), "ShowWinWorkstations"=> array("TAB" => "wintabs", "CLASS" => $samba ,"TREE" => get_winstations_ou() )); /* Include the 'Display Systems of user' attribute */ @@ -1188,7 +1188,7 @@ class systems extends plugin /* Search for incoming objects */ $filter = "(|(&".$userregex."(objectClass=goHard)(cn=".$this->DivListSystem->Regex.")))"; - $res = array_merge($res,get_list($filter,$sys_categories, get_ou('incomingou').$base,$sys_attrs, GL_SIZELIMIT)); + $res = array_merge($res,get_list($filter,$sys_categories, get_ou('systemIncomingRDN').$base,$sys_attrs, GL_SIZELIMIT)); /* Append opsi systems, the opsi extension have to installed. */ @@ -1221,7 +1221,7 @@ class systems extends plugin } /* check if current object is a new one */ - if (preg_match ("/,".get_ou('incomingou')."/i", $tmp)){ + if (preg_match ("/,".get_ou('systemIncomingRDN')."/i", $tmp)){ if (in_array_ics('gotoTerminal', $value['objectClass'])){ $add= "- "._("New terminal"); }elseif (in_array_ics('gotoWorkstation', $value['objectClass'])){ diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc index bca8b91ea..7d5ffc58e 100644 --- a/gosa-plugins/systems/admin/systems/class_termDNS.inc +++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc @@ -184,13 +184,13 @@ class termDNS extends plugin over the whole ldap server was 10 to 20 times slower. */ $deps = array(); - $ou = preg_replace("/,.*$/","",get_ou("systemsou")); + $ou = preg_replace("/,.*$/","",get_ou("systemRDN")); $a_ous = array(get_ou("serverRDN"), get_ou("terminalRDN"), - get_ou("workstationou"), - get_ou("printerou"), - get_ou("phoneou"), - get_ou("componentou")); + get_ou("workstationRDN"), + get_ou("printerRDN"), + get_ou("phoneRDN"), + get_ou("componentRDN")); $ldap = $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); diff --git a/gosa-plugins/systems/admin/systems/services/class_goService.inc b/gosa-plugins/systems/admin/systems/services/class_goService.inc index f02f7cc97..1134f1cd7 100644 --- a/gosa-plugins/systems/admin/systems/services/class_goService.inc +++ b/gosa-plugins/systems/admin/systems/services/class_goService.inc @@ -203,7 +203,7 @@ class goService extends plugin{ function action_hook($add_attrs= array()) { /* Find postcreate entries for this class */ - $command= $this->config->search(get_class($this), "ACTION_HOOK",array('menu','tabs')); + $command= $this->config->search(get_class($this), "SERVICEACTIONHOOK",array('menu','tabs')); if ($command != ""){ /* Walk through attribute list */ @@ -234,7 +234,7 @@ class goService extends plugin{ exec($command); } else { - msg_dialog::display(_("Configuration error"), msgPool::cmdnotfound("ACTION_HOOK", get_class($this)), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"), msgPool::cmdnotfound("SERVICEACTIONHOOK", get_class($this)), ERROR_DIALOG); } } } diff --git a/gosa-plugins/systems/admin/systems/tabs_component.inc b/gosa-plugins/systems/admin/systems/tabs_component.inc index 22638c12f..dc0d743b0 100644 --- a/gosa-plugins/systems/admin/systems/tabs_component.inc +++ b/gosa-plugins/systems/admin/systems/tabs_component.inc @@ -45,7 +45,7 @@ class componenttabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ $baseobject= $this->by_object['componentGeneric']; - $this->dn= "cn=$baseobject->cn,".get_ou('componentou').$baseobject->base; + $this->dn= "cn=$baseobject->cn,".get_ou('componentRDN').$baseobject->base; if($this->dn != $baseobject->orig_dn && $baseobject->orig_dn != "new"){