Updated opsi activation .

[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 bf1dd4134363b55befb81a31343a0f2f466952d2..39c030953e4a79ce799e8324b8c5019c19a2298d 100644 (file)
--- a/gosa-plugins/systems/admin/systems/tabs_server.inc
+++ b/gosa-plugins/systems/admin/systems/tabs_server.inc
@@ -22,6 +22,7 @@
 
 class servtabs extends tabs
 {
+  public $was_activated = FALSE;
 
   function servtabs($config, $data, $dn,$category)
   {
@@ -47,6 +48,7 @@ class servtabs extends tabs
 
       $this->by_object[$tab['CLASS']]->parent= &$this;
       $this->by_object[$tab['CLASS']]->set_acl_category($category);
+      $this->read_only |= $this->by_object[$tab['CLASS']]->read_only;
 
       /* Initialize current */
       if ($this->current == ""){
@@ -95,11 +97,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->get_cfg_value("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);
         }