![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a6ce5a2)
raw | patch | inline | side by side (parent: a6ce5a2)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 17 Sep 2008 16:57:23 +0000 (16:57 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 17 Sep 2008 16:57:23 +0000 (16:57 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12500 594d385d-05f5-0310-b6e9-bd551577e9d8
43 files changed:
index f48cddf83c08cebf926d543d5bf625e547fe860a..4ece79621603f7b8dc01e564496c279168488383 100644 (file)
.I ou=terminals.
.PP
-.B workstationou
+.B workstationRDN
.I string
.PP
This statement defines the location where GOsa creates new workstations inside of defined
.I ou=workstations.
.PP
-.B printerou
+.B printerRDN
.I string
.PP
This statement defines the location where GOsa creates new printers inside of defined
.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
.I ou=components.
.PP
-.B phoneou
+.B phoneRDN
.I string
.PP
This statement defines the location where GOsa creates new phones inside of defined
.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
.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
.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.
.I ou=incoming.
.PP
-.B systemsou
+.B systemRDN
.I string
.PP
This statement defines the base location for servers, workstations, terminals, phones and
index bffe5c9d74ddac157acff5eb5ee3f0d546984ed2..9c2bbe8407db45560f3ba6ce416cf74cbb4d2717 100644 (file)
$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 09483d2c42da11fdd6f9fa2452690bebca838fe1..63fc809b48e676325c232f367fcced41788e4ef6 100644 (file)
/* 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 853d530cd493104e571ed903799caec590542f61..2226ac818f8b885138a23d8c571c9507c5c91ab3 100644 (file)
*/
$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 37754c093047c2168b4a3e09e9f2d958e5e56b94..dd4f7146e1cc22950415d4ebde4c23703eac5009 100644 (file)
$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){
"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 87be6dcc0e198083882b318d4f8bbac4336699c4..a83d287ae68b913b872fe89a41923c09c14ef3d3 100644 (file)
$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 b4dd9a3357cd1a9fc4f08233e945c39cedab799c..613ceda101a469113367e7c282822158cd825bf7 100644 (file)
$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 6f39cfdb1521fa9d0dbbca1c926678d1108c7b44..68f427dd1e63970908ca650584efbdd280cb929c 100644 (file)
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 e2e9a4d8a0af1ac7d73c3d753c64a675cc5fed9c..2a6025b7682822c846ae7c92b7828bcfe3a12551 100644 (file)
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 c7c95e575fbf337c36a38a9a0d673d66bcb64526..edd51c29d9e50a713748ab26eb697781bf771a29 100644 (file)
}
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 d7265abe95aa4d31fc6dee2648f54489b32d9efd..37a80a28f71c216139cb8d82ea23f704d2c53291 100644 (file)
/* 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));
}
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 32a67470584370d3807cb104e72309606c6de210..54a378674caab0e73b02d45936497184023e5f37 100644 (file)
$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 2bf6b104927deb7ef8132aaa36dac4a80906e325..41072b9383ba53eba5bff9b8510b135e121811a9 100644 (file)
$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 != ""){
$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 e4d05b1e04c053bdbef19e39c8b4f71b5e47046a..b8a85905814a36caa918fb90ac3754f0303f27bd 100644 (file)
/* 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 d10d1b85f6b9f1383fbde6940336d49eb4733869..afd83c515d02fe93afce04a71aea602f187e7c6a 100644 (file)
} 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;
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 685c6c580c794a1648bf0c7d30417b1171ea66b7..a944a1571ef339f852266205208c83baea5afa99 100644 (file)
/* 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' */
/* 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));
}
*/
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 dce1febd0acb8e8fb7164cf02bb3898764c9cc1c..8d51b1f9bb95bde204288502fbf20838a6b38e59 100644 (file)
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 abffb0390682508886e5a1e02f7940e846cc269b..6b2edea24e34be15b2e6e6147845ac105edcf909 100644 (file)
/* 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];
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 f5089cd4b243c366a6defa0400448bd071f1bf02..e37a2bcdd96b53bc61de9de952c55f34345953bd 100644 (file)
}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 eae22e2fb8f004deb1066eaba78e195e6d0583f3..f0baa6e86efbceb13e569a9555e57ccce4e806c0 100644 (file)
/* 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;
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 bf332fed67a4135eee35fc88da6a97963f8fc740..20f16feb52d0e37af37ad060cafc7f1e12abe8e1 100644 (file)
/* 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 23754acb81e37ef57ff8bd00970b26bf9ed089b8..732147f57b3b1bfad52471cca2898614776ef514 100644 (file)
$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 1621ce3b3f7c1544817bf128d71ab626c1f61b2c..3498d6da1d3956d6cb96e02325ba7b00b8ce7051 100644 (file)
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;
}
$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 a2aa88a6f0f1999c2b4cd47c026320a8bcf3e22e..5f5a840a46a25451dceb0f4b07c2145ef90e69e0 100644 (file)
/* 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;
} 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])){
/* 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;
/* 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 */
}
}
- $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 == ""){
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'])){
/* 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;
}
/* 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 d2c28eb469c7856d4372efa87427bfe8a62e3674..9fdf6fabeae2b5438450bfa54308c02c450c7ccb 100644 (file)
}
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 1e24104ae8b760c8ea2e9b943c59e8677c62f6d1..f0e66df31ab213b490719df46d3acfcdc46f0fc8 100644 (file)
/* 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];
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 96a816f97632c23a59b45a14d8b1f5abac17b27d..9ae9ad960c486b930c36e3bbbc0ff357b177206d 100644 (file)
/* 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 5c8ea3b0d16c747d84f77309fa101b3df7bc69bf..0be3299abe16d4e8d31f43b2f81d2d5585d56cd5 100644 (file)
$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 */
$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"));
}
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){
}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 d9be8af66deff8ccc992375c5ef2e392bf9b4ab0..942c329beeb79a7f2d9756be0e79954ad20d775c 100644 (file)
/* 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];
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);
*/
$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'];
}
/* 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 8932b8a984a5b5649414d3387978184851a063fb..e4aec967325dfb41f85fb5992531dbae6fbf6242 100644 (file)
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 0d0516ab39d43ece2e330a13c980a51e40c2a4b0..a7d777d5ee03c8f7b0babb529e5c2a2fe18f3625 100644 (file)
/* 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 08e095ee165a6691147759abbfa44cf225486a98..2ee5799846210c3feb0a5cc9a3988e4cebb446b7 100644 (file)
/* 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 473733c98c506c8b04fbbbc6980de57ddb168b25..b4da61ca1b797729710c4fd83c15404ceb802e87 100644 (file)
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 c0c4e8a0b4abdd84346be52c314f7964e7541767..33250ca77dc237186f710d8ea70e5d4627e57251 100644 (file)
$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"));
index 5f324950458bc53ce64e980829243740fd669042..8455d77c01a19157b6a919b300e24cd8eaa61710 100644 (file)
/* 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 838b0859066b1b64beec10d6d37f251da7459296..9343b8192905a094ae3cc05ff030f4d1a53cc64f 100644 (file)
$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 04d7942f18aec4a12d391a013aea6d3b7551cf8a..8c08ad30008f1e14e7b9d5d2dd7deefddde44b43 100644 (file)
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){
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 294e9a0ede38867d304d63b9f602128ded60f153..97cf914dac6781a14278afb32b102a691cb50c62 100644 (file)
$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 */
$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"));
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 a4fc61fa2ef8ace9a06e3a3d17ae888e1ee65aef..3257f7025f09345bd1f0d405add1af79d1d0604d 100644 (file)
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;
}
}
/* 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 85ca9f84ca7b81f2ecc2fdd2f602186ea8c32e05..117847772083673a53e8f95b09364f4fb04d1116 100644 (file)
$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");
$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;
$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){
$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 */
/* 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.
*/
}
/* 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 bca8b91eafa02e07123d980b403e05915f47f873..7d5ffc58edf7eb29bf55375a86bcfad4519799d5 100644 (file)
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 f02f7cc9797215cfa96b0f76f3f0720eaba36ea7..1134f1cd7fc3927a1297dda5570c10732b632f3e 100644 (file)
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 */
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 22638c12f7e5d39a280b426f04f3fb0b4cdb30aa..dc0d743b07e53be2bedfb2e65625014d8eabc50b 100644 (file)
/* 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"){