From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 6 Mar 2009 14:44:38 +0000 (+0000)
Subject: Updated conference listing
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d8cc6787ba7b9a234741245b146cac50657e77b;p=gosa.git

Updated conference listing
-Fixed recursive search in reload


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

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
index 4bf90de84..61fd3f93b 100644
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
@@ -436,20 +436,23 @@ class phoneConferenceManagment extends plugin
    */
   function reload()
   {
-    $Base             = get_ou('phoneConferenceRDN').$this->DivListConference->selectedBase;
     $SubSearch        = $this->DivListConference->SubSearch;
     $Regex            = $this->DivListConference->Regex;
-    $Flags            = GL_SIZELIMIT ; 
+    $Flags            = GL_SIZELIMIT ;
     $Filter           = "(&(|(cn=".$Regex.")(description=".$Regex."))(objectClass=goFonConference))";
     $Attrs            = array("cn","goFonConferenceOwner","goFonPIN","telephoneNumber");
- 
+
     if($SubSearch){
       $Flags |= GL_SUBSEARCH;
+      $Base  = $this->DivListConference->selectedBase;
+      $this->conferences= get_list($Filter, "gofonconference", $Base, $Attrs, $Flags);
+    }else{
+      $Base  = get_ou('phoneConferenceRDN').$this->DivListConference->selectedBase;
+      $this->conferences= get_list($Filter, "gofonconference", $Base, $Attrs, $Flags);
     }
-
-    $this->conferences= get_list($Filter, "gofonconference", $Base, $Attrs, $Flags);
   }
 
+
   function remove_from_parent()
   {
     /* Ehm what are we doinf here ? */