A part of search_config replacements

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7374 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index 875c269f18e791fe51bf55f9096404225a123d33..0421166d24fb3004be975271edacbddb292b6cf2 100644 (file)
--- 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 5fc43bc3a3f18b92cb94c5ab0e90fa053d5f1648..aa71fcc6eff94c5dee3e7ad2a5414e0c45d27294 100644 (file)
--- 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 0ad27adc7022ac3d56b45e09c92545e9f49b9312..60b209ae7cd4ed682044dc861fea7d117b123b3a 100644 (file)
--- 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 9c22869a637848472970461d2c74be27946f0c3b..dd8806ff261e5623a179f88b7119d2f604b9d477 100644 (file)
--- 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 25b84307c6ddd77bdf25c17919cc4646d879b1c3..7b62408d41121f5a4870ae5e8ad7da04cd6d5868 100755 (executable)
--- 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 cf4d27fdb9aaac72f3df898bbb42a3aa231cd2ac..66f1c01feecb1e8399928a11cf5daabfe564c776 100755 (executable)
--- 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 68886fce03c345ff00fbe9a3d993e577f17c1da2..1abaa0b031a052a9dd02cb3c1716564343434d22 100644 (file)
--- 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"));