Fixed device Management error :

PHP Fehler "Object of class userinfo could not be converted to string"

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

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 953f18ddaab3023caf0e722c82c3ce6e4a25aa6e..85082ed23503f08d30d76bca1fce86cb3b8a3c8c 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1260,7 +1260,7 @@ class plugin
       $snapldapbase = $cfg['SNAPSHOT_BASE'];
       $ldap_to      = new LDAP($user,$password, $server);
       $ldap_to->cd ($snapldapbase);
-      show_ldap_error($ldap->get_error(), sprintf(_("Method get deleted snapshots with dn '%s' failed."),$this->dn));
+      show_ldap_error($ldap_to->get_error(), sprintf(_("Method get deleted snapshots with dn '%s' failed."),$this->dn));
     }else{
       $ldap_to    = $ldap;
     }

diff --git a/plugins/admin/devices/class_deviceManagement.inc b/plugins/admin/devices/class_deviceManagement.inc
index 93083f58d03827511d5a83e8d85ec9f97ed203e4..c63d064a62ca44d586bb8ee916e0517d76ce9ef7 100644 (file)
--- a/plugins/admin/devices/class_deviceManagement.inc
+++ b/plugins/admin/devices/class_deviceManagement.inc
@@ -15,6 +15,7 @@ class deviceManagement extends plugin
   var $snapDialog                     = NULL;
   var $CopyPasteHandler               = NULL;
   var $start_pasting_copied_objects;
+  var $dn ="";
 
   function deviceManagement(&$config, $dn= NULL)
   {

diff --git a/plugins/admin/devices/main.inc b/plugins/admin/devices/main.inc
index 78bbf035adaccba46294d2ad55ef3eb16b9e8162..92f901dd3a75fadb9c45e87cd2483331889d875a 100755 (executable)
--- a/plugins/admin/devices/main.inc
+++ b/plugins/admin/devices/main.inc
@@ -29,7 +29,7 @@ if ($remove_lock){
 
                /* Create DeviceManagement object on demand */
                if (!isset($_SESSION['DeviceManagement']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-                               $_SESSION['DeviceManagement']= new deviceManagement ($config, $_SESSION['ui']);
+                               $_SESSION['DeviceManagement']= new deviceManagement ($config);
                }
 
                /* Get object */