Fixed ldap->search for environment->pluglist->reload

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

diff --git a/include/class_location.inc b/include/class_location.inc
index 75aa3f12155fbf848a83bf2be634bd7e6e03201e..15c30b06f157d2f7cc9f71fd217d8ea1830d0652 100644 (file)
--- a/include/class_location.inc
+++ b/include/class_location.inc
@@ -12,7 +12,6 @@ $class_mapping= array(
                 "selectPrinterDialog" => "plugins/personal/environment/class_selectPrinterDialog.inc",
                 "environment" => "plugins/personal/environment/class_environment.inc",
                 "logonManagementDialog" => "plugins/personal/environment/class_logonManagementDialog.inc",
-                "kioskManagementDialog" => "plugins/personal/environment/class_kioskManagementDialog.inc",
                 "user" => "plugins/personal/generic/class_user.inc",
                 "webdavAccount" => "plugins/personal/connectivity/class_webdavAccount.inc",
                 "proxyAccount" => "plugins/personal/connectivity/class_proxyAccount.inc",
@@ -183,6 +182,10 @@ $class_mapping= array(
                 "ogroup" => "plugins/admin/ogroups/class_ogroup.inc",
                 "phonequeue" => "plugins/admin/ogroups/class_phonequeue.inc",
                 "mailogroup" => "plugins/admin/ogroups/class_mailogroup.inc",
+                "devicetabs" => "plugins/admin/devices/tabs_devices.inc",
+                "deviceManagement" => "plugins/admin/devices/class_deviceManagement.inc",
+                "divListDevices" => "plugins/admin/devices/class_divListDevices.inc",
+                "deviceGeneric" => "plugins/admin/devices/class_deviceGeneric.inc",
                 "fonreport" => "plugins/gofon/fonreports/class_fonreport.inc",
                 "divListMacro" => "plugins/gofon/macro/class_divListMacros.inc",
                 "goFonMacro" => "plugins/gofon/macro/class_gofonMacroManagement.inc",

diff --git a/plugins/personal/environment/class_hotplugDialog.inc b/plugins/personal/environment/class_hotplugDialog.inc
index a4b446b7bb1f674a8f066e2a8e3c690d1919bd81..0dd418e13c3934f4fa8b568127e6f63aa94e3c47 100644 (file)
--- a/plugins/personal/environment/class_hotplugDialog.inc
+++ b/plugins/personal/environment/class_hotplugDialog.inc
@@ -75,7 +75,7 @@ class hotplugDialog extends plugin
   function getHotplugs()
   {
     $ldap= $this->config->get_ldap_link();
-    $ldap->cd($this->depselect);
+    $ldap->cd("ou=devices,".$this->depselect);
     $ldap->search("(&(objectClass=gotoDevice)(|(cn=".$this->regex.")(description=".$this->regex.")))",array("gotoHotplugDevice","cn","dn")); 
 
     $a_return = array();