Backport from trunk

[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 0c105219b39724cad92c061201bd4485d556ade0..d4ae749931470857e6707cb065f359e441c61eea 100644 (file)
--- a/gosa-plugins/systems/admin/systems/tabs_server.inc
+++ b/gosa-plugins/systems/admin/systems/tabs_server.inc
@@ -22,13 +22,18 @@
 
 class servtabs extends tabs
 {
+  public $was_activated = FALSE;
 
-  function servtabs($config, $data, $dn,$category)
+  function servtabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
   {
     /* Save dn */
     $this->dn= $dn;
     $this->config= $config;
 
+    $this->hide_acls = $hide_acls;
+    $this->hide_refs = $hide_refs;
+
+    $this->acl_category = $category;
     $baseobject= NULL;
 
     foreach ($data as $tab){
@@ -47,6 +52,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 == ""){
@@ -67,7 +73,7 @@ class servtabs extends tabs
     $baseobject= NULL;
     foreach($this->by_object as $name => $object){
       $class = get_class($object);
-      if(in_array($class,array("reference","acl"))) continue;
+      if(in_array_strict($class,array("reference","acl"))) continue;
       if ($baseobject === NULL){
         $baseobject= new $class($this->config, $this->dn,NULL,$this);
         $baseobject->enable_CSN_check();
@@ -95,11 +101,13 @@ 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('serverRDN').$baseobject->base;
+    $cn      = preg_replace('/,/', '\,', $baseobject->cn);
+    $cn      = preg_replace('/"/', '\"', $cn);
+    $this->dn= "cn={$cn},".get_ou("servgeneric", "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("accountPrimaryAttribute") == "cn"){
+      if($this->config->get_cfg_value("core","accountPrimaryAttribute") == "cn"){
         if (strtolower($baseobject->orig_dn) != (strtolower($this->dn))){
           $baseobject->recursive_move($baseobject->orig_dn, $this->dn);
         }