Updated System Managenemt

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

diff --git a/gosa-plugins/systems/admin/systems/tabs_server.inc b/gosa-plugins/systems/admin/systems/tabs_server.inc
index 63a1a9545c40bef7eb8daa39f4950ea394495b23..0c105219b39724cad92c061201bd4485d556ade0 100644 (file)
--- a/gosa-plugins/systems/admin/systems/tabs_server.inc
+++ b/gosa-plugins/systems/admin/systems/tabs_server.inc
@@ -32,8 +32,12 @@ class servtabs extends tabs
     $baseobject= NULL;
 
     foreach ($data as $tab){
-      $this->by_name[$tab['CLASS']]= $tab['NAME'];
+  
+      if(!class_available($tab['CLASS'])){
+        continue;
+      }
 
+      $this->by_name[$tab['CLASS']]= $tab['NAME'];
       if ($baseobject === NULL){
         $baseobject= new $tab['CLASS']($this->config, $this->dn,NULL,$this);
         $this->by_object[$tab['CLASS']]= $baseobject;
@@ -91,11 +95,11 @@ class servtabs extends tabs
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
     $baseobject= $this->by_object['servgeneric'];
-    $this->dn= "cn=$baseobject->cn,".get_ou('serverou').$baseobject->base;
+    $this->dn= "cn=$baseobject->cn,".get_ou('serverRDN').$baseobject->base;
 
     /* cn is not case sensitive for ldap, but for php it is!! */
     if($baseobject->orig_dn != "new"){
-      if($this->config->current['DNMODE'] == "cn"){
+      if($this->config->get_cfg_value("accountPrimaryAttribute") == "cn"){
         if (strtolower($baseobject->orig_dn) != (strtolower($this->dn))){
           $baseobject->recursive_move($baseobject->orig_dn, $this->dn);
         }