From e0e14326dbbddf476a0324df56cba351a58bca0c Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 11 Oct 2007 06:59:40 +0000
Subject: [PATCH] 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
---
 include/class_plugin.inc                         | 2 +-
 plugins/admin/devices/class_deviceManagement.inc | 1 +
 plugins/admin/devices/main.inc                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 953f18dda..85082ed23 100644
--- 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 93083f58d..c63d064a6 100644
--- 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 78bbf035a..92f901dd3 100755
--- 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 */
-- 
2.30.2