Fixed problem with unknown printer member

[gosa.git] / plugins / admin / applications / class_applicationManagement.inc

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 117ef50df85bbf5e43f94ada3eb6a90854f0910d..7f6ee679e333b7b4fb72da9599bfbd1d25b543f0 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -72,7 +72,7 @@ class applicationManagement extends plugin
     $ldap                   = $this->config->get_ldap_link();
     $dn                     = "ou=apps,".$base;
     $ret                    = array();
-    $ret [$base] = "/";
+    $ret ["ou=apps,".$base] = "/";
 
     $ldap->cd($dn);
     $ldap->search("objectClass=organizationalUnit",array("ou"));
@@ -365,7 +365,8 @@ class applicationManagement extends plugin
      ****************/
 
     /* Check if there is a snapshot dialog open */
-    if($str = $this->showSnapshotDialog($this->DivListApplication->selectedBase,"ou=apps,")){
+    $base = $this->DivListApplication->selectedBase;
+    if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases($base))){
       return($str);
     }
 
@@ -379,6 +380,16 @@ class applicationManagement extends plugin
   }
 
 
+  /* Return departments, that will be included within snapshot detection */
+  function get_used_snapshot_bases(){
+    if($this->DivListApplication->selectedRelease == "main"){
+      return(array($this->DivListApplication->selectedBase));
+    }else{
+      return(array($this->DivListApplication->selectedRelease));
+    }
+  }
+
+
   function reload()
   {
     $this->applications= array();
@@ -481,7 +492,6 @@ class applicationManagement extends plugin
   function check() {}
   function adapt_from_template($dn) {}
   function password_change_needed() {}
-  function show_header($button_text, $text, $disabled= FALSE) {}
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>