Updated config->search calls.

Don't search whole in config, just search in tabs or menu ..

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

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index 0421166d24fb3004be975271edacbddb292b6cf2..be1a6c6327e6b32ba7ab6ad1e83e8e5fe9873d2e 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 = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     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 = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     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 aa71fcc6eff94c5dee3e7ad2a5414e0c45d27294..95d05a84d7b3d1564fdd4ac78f250a01e6fa89cd 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 = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       return(true);
     }

diff --git a/plugins/admin/applications/tabs_application.inc b/plugins/admin/applications/tabs_application.inc
index 60b209ae7cd4ed682044dc861fea7d117b123b3a..aa9600808dd87643369e500dd5051437ac6bb655 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 = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if((!empty($tmp)) && (isset($_SESSION['appfilter']['release']))){
       if(!$baseobject->isReleaseApplikation){
         $new_dn= "cn=".$baseobject->cn.",ou=apps,".$baseobject->base;

diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc
index 7b66f47b8eb7a8494b968d0142068482aac028b7..020dac80ae31186ed84ce059333839165c30be1a 100644 (file)
--- a/plugins/admin/fai/class_divListFai.inc
+++ b/plugins/admin/fai/class_divListFai.inc
@@ -94,8 +94,8 @@ class divListFai extends MultiSelectWindow
       /* Check if there are post commands available for fai management.
        * If not, grey out freeze/branch and release remove buttons.
        */
-      $r = $this->config->search("faiManagement", "POSTREMOVE");
-      $c = $this->config->search("faiManagement", "POSTCREATE");
+      $r = $this->config->search("faiManagement", "POSTREMOVE",array('tabs'));
+      $c = $this->config->search("faiManagement", "POSTCREATE",array('tabs'));
 
       $smarty = get_smarty();
       $smarty->assign("allow_create", $c);

diff --git a/plugins/admin/fai/class_faiSummaryTab.inc b/plugins/admin/fai/class_faiSummaryTab.inc
index 0ba1257a6a7d804a65ccf705a37af573f2d99c67..91c5ec346fde6050f8b3990e8edf6455c33c9f35 100644 (file)
--- a/plugins/admin/fai/class_faiSummaryTab.inc
+++ b/plugins/admin/fai/class_faiSummaryTab.inc
@@ -170,7 +170,7 @@ class faiSummaryTab extends plugin{
   {
 
     /* Skip this if fai is deactivated */
-    $tmp = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(empty($tmp)){
       $str = "<h2>"._("You can't use this plugin until FAI is activated.")."</h2>";
       return $str;

diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index faabcfcb495d79ee0720a83d23d2de0cfb63854d..28c683586c2f6660f2a2616496d846028ed82a27 100644 (file)
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -45,7 +45,7 @@ class appgroup extends plugin
   {
    
     /* Check if we have relase mangement enabled and prepare group application for release management */ 
-    $tmp = $config->search("faiManagement", "CLASS");
+    $tmp = $config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       $this->enableReleaseManagement = true;
       $this->objectclasses  [] = "FAIreleaseTag";
@@ -539,7 +539,7 @@ class appgroup extends plugin
           $ldap= $this->config->get_ldap_link();
 
           /* Check if we have release management enabled */
-          $tmp = $this->config->search("faiManagement", "CLASS");
+          $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
           if(!empty($tmp)){
     
             /* Get application parameter from ldap */
@@ -1015,7 +1015,7 @@ class appgroup extends plugin
     $this->apps= array();
 
     /* Special handling for release managed apps */
-    $tmp = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp) && count($this->Releases)){
       $this->enableReleaseManagement = true;
 
@@ -1071,7 +1071,7 @@ class appgroup extends plugin
 
     /* Get all apps ... */
     $res = get_list("objectClass=gosaApplication","application",$this->config->current['BASE'],array("gosaApplicationParameter","cn"),GL_SUBSEARCH); 
-    $tmp = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     $this->AllAppsForRelease = array();
     if(!empty($tmp)){
       $tmp = array_flip($this->Releases);

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 59d189c6aba564023afd36f1ff67606fa259e676..0b0030bbb67a6596ef79151fc93f7c43aa3c1c9f 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -561,7 +561,7 @@ class groupManagement extends plugin
     $attrs = array("cn", "description", "gidNumber", "objectClass");
  
     /* If subsearch is activated search for subobjects too */
-    $tmp = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       $attrs [] = "FAIrelease";
     }

diff --git a/plugins/admin/mimetypes/class_mimetypeGeneric.inc b/plugins/admin/mimetypes/class_mimetypeGeneric.inc
index dd8806ff261e5623a179f88b7119d2f604b9d477..bac08e9cd915e64acf308cbf6e1a52bafe22baa2 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 = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)) {
       $this->isReleaseMimeType= true;
     }

diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index 7b62408d41121f5a4870ae5e8ad7da04cd6d5868..eda0cf23ca2d0e3a8c13479f2607b4a175a2e2cf 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 = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       return(true);
     }

diff --git a/plugins/admin/mimetypes/tabs_mimetypes.inc b/plugins/admin/mimetypes/tabs_mimetypes.inc
index 379ae57fd18552f08c94130d720f4b37ae5909d5..0aae1f43bef15af9a407f53c7da787d950afdd2b 100755 (executable)
--- a/plugins/admin/mimetypes/tabs_mimetypes.inc
+++ b/plugins/admin/mimetypes/tabs_mimetypes.inc
@@ -26,7 +26,7 @@ class mimetabs extends tabs
 
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
-    $tmp = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
 
     if((!empty($tmp)) && (isset($_SESSION['mimefilter']['release']))){
       if(!$baseobject->isReleaseMimeType){

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index ce5aeb07d64be2a7f9e6e367b7f82501820602f5..efb4bd8f89dcad787fddf9dfc0dc57a26dd84fec 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -33,7 +33,7 @@ class servrepository extends goService
     plugin::plugin ($config, $dn, $parent);
 
     /* Skip this if fai is deactivated */
-    $tmp= $this->config->search("faiManagement", "CLASS");
+    $tmp= $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       $this->fai_activated = TRUE;    
     }else{

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 8c4c5c3ccdec41f9c7d6f2bb4f6b377b9dce39fc..b7bdc36e95702487a3374ec5b532e8bfd37a7ca8 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -957,7 +957,7 @@ class systems extends plugin
     $sys_categories   = array("terminal", "workstation", "server", "phone" ,"printer");
 
     /* Add FAIstate to attributes if FAI is activated */
-    $tmp = $this->config->search("faiManagement", "CLASS");
+    $tmp = $this->config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       $sys_attrs[] = "FAIstate";
     }    

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index e0f05f8623b2d9d3285ff1d5ac34e3053a938e84..72d81633dad2746dc01789a34f6f2b04ed2335fb 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -63,7 +63,7 @@ class termgeneric extends plugin
   function termgeneric (&$config, $dn= NULL, $parent= NULL)
   {
     /* Check if FAI is activated */
-    $tmp= $config->search("faiManagement", "CLASS");
+    $tmp= $config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       $this->fai_activated = TRUE;
     }

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index ae31c93c0f4c3923c19ad2bd53a0abc31441be4c..5144b16888d6845f0ce0365992d831b02ade0c6b 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -68,7 +68,7 @@ class workgeneric extends plugin
 
   function workgeneric (&$config, $dn= NULL, $parent= NULL)
   {
-    $tmp= $config->search("faiManagement", "CLASS");
+    $tmp= $config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       $this->fai_activated = TRUE;
     }

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 3f6c1c1c713a3a67ae297cc867e861b9ea868d30..eaecb0187e89af333c0dddea2901c8c2feaf59b9 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -61,7 +61,7 @@ class workstartup extends plugin
   function workstartup (&$config, $dn= NULL, $parent= NULL)
   {
     /* Check if FAI is active */
-    $tmp= $config->search("faiManagement", "CLASS");
+    $tmp= $config->search("faiManagement", "CLASS",array('tabs'));
     if(!empty($tmp)){
       $this->fai_activated = TRUE;
     }else{

diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc
index ee27afe83d7624235d0e6f757c966495abbc9af6..4c7dee76b0c87b4968b41fe72643879723fd7d85 100644 (file)
--- a/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/plugins/personal/connectivity/class_opengwAccount.inc
@@ -51,7 +51,7 @@ class opengwAccount extends plugin
                $this->is_account           = false;
 
                /* Get configurations */
-    if($this->config->search("opengwAccount", 'USERNAME',array('data'))){
+    if($this->config->search("opengwAccount", 'USERNAME',array('tabs'))){
       $atr = array();
       $atr['LOGIN']    =         $this->config->search("opengwAccount", 'USERNAME',array('tabs'));
       $atr['PASSWORD']=        $this->config->search("opengwAccount", 'PASSWORD',array('tabs'));

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index d7050e187eedd1c43699f5df878f2c822c649035..a4d59a4b301413d167601a9feb0592a1b2f2455d 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -239,7 +239,7 @@ class environment extends plugin
     $this->gotoAvailableShares= $config->getShareList(false);  
 
 
-    if($this->config->search('environment', 'kioskpath') != ""){
+    if($this->config->search('environment', 'kioskpath',array('tabs')) != ""){
       $tmp = new kioskManagementDialog($this->config,$this->dn);
       $list = $tmp->getKioskProfiles($this->newKioskProfiles);
       $list['none']=_("None");

diff --git a/plugins/personal/environment/class_kioskManagementDialog.inc b/plugins/personal/environment/class_kioskManagementDialog.inc
index 384306e21fccd8b817fd12d106c39a51206ed608..ba4fa9ffc64c9e38a601ff6abaeae26c25e55322 100644 (file)
--- a/plugins/personal/environment/class_kioskManagementDialog.inc
+++ b/plugins/personal/environment/class_kioskManagementDialog.inc
@@ -24,7 +24,7 @@ class kioskManagementDialog extends plugin
     if($attach){
       $this->filesToAttach = $attach;
     }
-    $this->baseDir = $this->config->search('environment', 'kioskpath');
+    $this->baseDir = $this->config->search('environment', 'kioskpath',array('tabs'));
   }
 
   function execute()