From f1c0088a3bf8fc3205a397b2e5a604cdf50d527e Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 21 Sep 2007 13:08:53 +0000 Subject: [PATCH] A part of search_config replacements git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7374 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/applications/class_applicationGeneric.inc | 4 ++-- plugins/admin/applications/class_applicationManagement.inc | 2 +- plugins/admin/applications/tabs_application.inc | 2 +- plugins/admin/mimetypes/class_mimetypeGeneric.inc | 2 +- plugins/admin/mimetypes/class_mimetypeManagement.inc | 2 +- plugins/admin/mimetypes/tabs_mimetypes.inc | 1 + plugins/admin/ogroups/class_termgroup.inc | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc index 875c269f1..0421166d2 100644 --- a/plugins/admin/applications/class_applicationGeneric.inc +++ b/plugins/admin/applications/class_applicationGeneric.inc @@ -33,7 +33,7 @@ class application extends plugin { plugin::plugin ($config, $dn, $parent); - $tmp = search_config($this->config->data,"faiManagement","CLASS"); + $tmp = $this->config->search("faiManagement", "CLASS"); if(!empty($tmp)) { if(!preg_match("/^ou=apps,/",$_SESSION['appfilter']['release'])){ $this->isReleaseApplikation = true; @@ -410,7 +410,7 @@ class application extends plugin $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current["BASE"]); - $tmp = search_config($this->config->data,"faiManagement","CLASS"); + $tmp = $this->config->search("faiManagement", "CLASS"); if((!empty($tmp)) && (isset($_SESSION['appfilter']['release']))){ $baseDn = str_replace($this->config->current['BASE'],$this->base,$_SESSION['appfilter']['release']); $baseDn = preg_replace("/ou=apps,.*/","ou=apps,".$this->base,$_SESSION['appfilter']['release']); diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc index 5fc43bc3a..aa71fcc6e 100644 --- a/plugins/admin/applications/class_applicationManagement.inc +++ b/plugins/admin/applications/class_applicationManagement.inc @@ -36,7 +36,7 @@ class applicationManagement extends plugin function IsReleaseManagementActivated() { /* Check if we should enable the release selection */ - $tmp = search_config($this->config->data,"faiManagement","CLASS"); + $tmp = $this->config->search("faiManagement", "CLASS"); if(!empty($tmp)){ return(true); } diff --git a/plugins/admin/applications/tabs_application.inc b/plugins/admin/applications/tabs_application.inc index 0ad27adc7..60b209ae7 100644 --- a/plugins/admin/applications/tabs_application.inc +++ b/plugins/admin/applications/tabs_application.inc @@ -26,7 +26,7 @@ class apptabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ - $tmp = search_config($this->config->data,"faiManagement","CLASS"); + $tmp = $this->config->search("faiManagement", "CLASS"); if((!empty($tmp)) && (isset($_SESSION['appfilter']['release']))){ if(!$baseobject->isReleaseApplikation){ $new_dn= "cn=".$baseobject->cn.",ou=apps,".$baseobject->base; diff --git a/plugins/admin/mimetypes/class_mimetypeGeneric.inc b/plugins/admin/mimetypes/class_mimetypeGeneric.inc index 9c22869a6..dd8806ff2 100644 --- a/plugins/admin/mimetypes/class_mimetypeGeneric.inc +++ b/plugins/admin/mimetypes/class_mimetypeGeneric.inc @@ -115,7 +115,7 @@ class mimetype extends plugin } /* Check if release Management is enabled */ - $tmp = search_config($this->config->data,"faiManagement","CLASS"); + $tmp = $this->config->search("faiManagement", "CLASS"); if(!empty($tmp)) { $this->isReleaseMimeType= true; } diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc index 25b84307c..7b62408d4 100755 --- a/plugins/admin/mimetypes/class_mimetypeManagement.inc +++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc @@ -592,7 +592,7 @@ class mimetypeManagement extends plugin function IsReleaseManagementActivated() { /* Check if we should enable the release selection */ - $tmp = search_config($this->config->data,"faiManagement","CLASS"); + $tmp = $this->config->search("faiManagement", "CLASS"); if(!empty($tmp)){ return(true); } diff --git a/plugins/admin/mimetypes/tabs_mimetypes.inc b/plugins/admin/mimetypes/tabs_mimetypes.inc index cf4d27fdb..66f1c01fe 100755 --- a/plugins/admin/mimetypes/tabs_mimetypes.inc +++ b/plugins/admin/mimetypes/tabs_mimetypes.inc @@ -27,6 +27,7 @@ class mimetabs extends tabs /* Check for new 'dn', in order to propagate the 'dn' to all plugins */ $tmp = search_config($this->config->data,"faiManagement","CLASS"); + $tmp = $this->config->search("faiManagement", "CLASS"); if((!empty($tmp)) && (isset($_SESSION['mimefilter']['release']))){ if(!$baseobject->isReleaseMimeType){ diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc index 68886fce0..1abaa0b03 100644 --- a/plugins/admin/ogroups/class_termgroup.inc +++ b/plugins/admin/ogroups/class_termgroup.inc @@ -198,7 +198,7 @@ class termgroup extends plugin /* Update members fai state */ $this->update_term_member_FAIstate(trim($_POST['saction'])); - $cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD"); + $cmd = $this->config->search("workgeneric", "ACTIONCMD",array('tabs')); if ($cmd == ""){ print_red(_("No ACTIONCMD definition found in your gosa.conf")); -- 2.30.2