Removed last calls of 'serch_config'

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

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index b4b36269f4a8bf8d2bd8817bd278f20727f8ce85..9f7923ea75c24aed3663c1f95191a983c43dfee5 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -405,9 +405,9 @@ class plugin
     }
 
     /* Find hooks entries for this class */
-    $command= search_config($this->config->data['MENU'], get_class($this), "CHECK");
+    $command= $this->config->search(get_class($this), "CHECK",array('menu'));
     if ($command == "" && isset($this->config->data['TABS'])){
-      $command= search_config($this->config->data['TABS'], get_class($this), "CHECK");
+      $command= $this->config->search(get_class($this), "CHECK",array('tabs'));
     }
 
     if ($command != ""){
@@ -569,9 +569,9 @@ class plugin
   function postcreate($add_attrs= array())
   {
     /* Find postcreate entries for this class */
-    $command= search_config($this->config->data['MENU'], get_class($this), "POSTCREATE");
+    $command= $this->config->search(get_class($this), "POSTCREATE",array('menu'));
     if ($command == "" && isset($this->config->data['TABS'])){
-      $command= search_config($this->config->data['TABS'], get_class($this), "POSTCREATE");
+      $command= $this->config->search(get_class($this), "POSTCREATE",array('tabs'));
     }
 
     if ($command != ""){
@@ -604,9 +604,9 @@ class plugin
   function postmodify($add_attrs= array())
   {
     /* Find postcreate entries for this class */
-    $command= search_config($this->config->data['MENU'], get_class($this), "POSTMODIFY");
+    $command= $this->config->search(get_class($this), "POSTMODIFY",array('menu'));
     if ($command == "" && isset($this->config->data['TABS'])){
-      $command= search_config($this->config->data['TABS'], get_class($this), "POSTMODIFY");
+      $command= $this->config->search(get_class($this), "POSTMODIFY",array('tabs'));
     }
 
     if ($command != ""){
@@ -639,9 +639,9 @@ class plugin
   function postremove($add_attrs= array())
   {
     /* Find postremove entries for this class */
-    $command= search_config($this->config->data['MENU'], get_class($this), "POSTREMOVE");
+    $command= $this->config->search(get_class($this), "POSTREMOVE",array('menu'));
     if ($command == "" && isset($this->config->data['TABS'])){
-      $command= search_config($this->config->data['TABS'], get_class($this), "POSTREMOVE");
+      $command= $this->config->search(get_class($this), "POSTREMOVE",array('tabs'));
     }
 
     if ($command != ""){

diff --git a/include/functions.inc b/include/functions.inc
index 23335677d478f78e08d324fab677b4be0fd53603..ab7915985e485af9f7962b93f0cae7ce347c13ed 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2569,7 +2569,7 @@ function change_password ($dn, $password, $mode=0, $hash= "")
   } else {
 
     /* Find postmodify entries for this class */
-    $command= search_config($config->data['MENU'], "password", "POSTMODIFY");
+    $command= $this->config->search("password", "POSTMODIFY",array('menu'));
 
     if ($command != ""){
       /* Walk through attribute list */

diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index a2eb279b557e4962b28a1765866a5194eabef25c..552b3de9faf9990b6422b16f730fd3de12013333 100644 (file)
--- a/plugins/addons/addressbook/class_addressbook.inc
+++ b/plugins/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 = search_config($this->config->data['MENU'], "addressbook", "LDAP_OBJECT_CLASS");
+    $aoc = $this->config->search("addressbook", "LDAP_OBJECT_CLASS",array('menu'));
     if ($aoc != ""){
       $this->abobjectclass  = $aoc;
     }

diff --git a/plugins/addons/gotomasses/class_gotomasses.inc b/plugins/addons/gotomasses/class_gotomasses.inc
index 67d4d3946795321d489cec40fb758f2f035277fe..981c4227671c34a0b230b0d4b1e412cca766aab0 100644 (file)
--- a/plugins/addons/gotomasses/class_gotomasses.inc
+++ b/plugins/addons/gotomasses/class_gotomasses.inc
@@ -27,7 +27,7 @@ class gotomasses extends plugin
 
     /* Define source file */
     $this->data_file = CONFIG_DIR."/gotomasses_machines";
-    $file = search_config($this->config->data['MENU'], "gotomasses", "STORAGE_FILE");
+    $file = $this->config->search("gotomasses", "STORAGE_FILE",array('menu'));
     if(!empty($file)){
       $this->data_file = $file;
     }

diff --git a/plugins/addons/notifications/class_msgplug.inc b/plugins/addons/notifications/class_msgplug.inc
index f21292ac5886951c2a4c9505de9d2e23ebbdeb65..84debeff8cd35d9c0575d6617b4eb30b30b0e6ea 100644 (file)
--- a/plugins/addons/notifications/class_msgplug.inc
+++ b/plugins/addons/notifications/class_msgplug.inc
@@ -98,7 +98,7 @@ class msgplug extends plugin
         if (!$this->acl_is_writeable('notify')){
           print_red(_("You have no permissions to send a message!"));
         } else {
-          $cmd= search_config($this->config->data['MENU'], "msgplug", "NOTIFY_COMMAND");
+          $cmd= $this->config->search("msgplug", "NOTIFY_COMMAND",array('menu'));
           if ($cmd == ""){
             print_red(_("No NOTIFY_COMMAND definition found in your gosa.conf"));
           } else {

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 4ecebf758389a1f8dcdc229b91167922ddbd4c7b..d7050e187eedd1c43699f5df878f2c822c649035 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -1075,7 +1075,7 @@ class environment extends plugin
 
     $realyUsedAttrs= array();
 
-    $path = search_config($this->config->data,"environment", "KIOSKPATH"); 
+    $tmp = $this->config->search("environment", "KIOSKPATH",array('tabs'));
     /* Creating Kiosk Profiles */
     foreach($this->newKioskProfiles as $file){
       $contents = $file['contents'];