From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 15 Apr 2008 12:21:22 +0000 (+0000)
Subject: Fixed app sub search in non fai mode
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01a3a62d4a4c2aba7c5a139a665884e96dc379ef;p=gosa.git

Fixed app sub search in non fai mode


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

diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
index 71b9a49a6..81a5ced74 100644
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -534,15 +534,19 @@ class applicationManagement extends plugin
 
     if(!$this->IsReleaseManagementActivated()){
       $use_base = $this->app_base;
+      if($SubSearch){
+        $use_base = preg_replace("/^".normalizePreg(get_ou("applicationou"))."/","",$use_base);
+      }
     }else{
       $use_base = $this->app_release;
+      $SubSearch= FALSE;
     }
-
-    if($SubSearch){
-      $Flags    |= GL_SUBSEARCH;  
+  
+    if($SubSearch){ 
+      $res= get_sub_list($Filter, "application",get_ou("applicationou"), $use_base, array("cn","description","dn","objectClass"), $Flags);
+    }else{
+      $res= get_list($Filter, "application",$use_base, array("cn","description","dn","objectClass"), $Flags);
     }
-   
-    $res= get_list($Filter, "application", $use_base, array("cn","description","dn","objectClass"), $Flags);
     $tmp2 = array();
     foreach ($res as $val){
       $tmp[strtolower($val['cn'][0]).$val['cn'][0].$val['dn']]=$val;