Backports from trunk

[gosa.git] / gosa-plugins / systems / admin / systems / class_systemManagement.inc

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 39835f2275e1d0819fc96b759934d2b43b9d3444..3c2b052f4ce518de9f461479be2f42f2c36d4f7c 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -661,7 +661,7 @@ class systemManagement extends management
                     // Delete the object
                     $this->dn = $dn;
                     if($info['tabClass'] == "phonetabs"){
-                        $this->tabObject= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $dn,$type);
+                        $this->tabObject= new $info['tabClass']($this->config, $this->config->data['TABS'][$info['tabDesc']], $dn,$type);
                         $this->tabObject->set_acl_base($dn);
                         $this->tabObject->by_object['phoneGeneric']->remove_from_parent ();
                     }else{
@@ -701,6 +701,12 @@ class systemManagement extends management
             $headpage = $this->getHeadpage();
             $dn = $target[0];
             $type =$headpage->getType($dn);
+
+            if(!isset($tInfo[$type])){
+                msg_dialog::display(_("Information"),sprintf(_("The object-type '%s' cannot be managed with your setup of GOsa, please install the required  plugins!"), $type), ERROR_DIALOG);
+                return;
+            }
+
             $tData = $tInfo[$type];
 
             if($type == "FAKE_OC_ArpNewDevice"){
@@ -1274,7 +1280,7 @@ class systemManagement extends management
     {
         $tabs = array(
                 "device" => array(
-                    "ou"          => get_ou('Device','DeviceRDN'),
+                    "ou"          => get_ou('Device','GOsaDeviceRDN'),
                     "plugClass"   => "Device",
                     "tabClass"    => "DeviceTab",
                     "tabDesc"     => "NEWDEVICETABS",