X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Facl%2Ftabs_acl_role.inc;h=faa8214da81e2bdc3d32bf05e4dd6f591f973eb0;hb=8041be8a00be8cd76843ac29ce2c6f5833871bbc;hp=b1132357d14828b93a7d2bb638e3e95c3b9adc14;hpb=7f7f21906eb6121c29823abbf96461733d642509;p=gosa.git

diff --git a/gosa-core/plugins/admin/acl/tabs_acl_role.inc b/gosa-core/plugins/admin/acl/tabs_acl_role.inc
index b1132357d..faa8214da 100644
--- a/gosa-core/plugins/admin/acl/tabs_acl_role.inc
+++ b/gosa-core/plugins/admin/acl/tabs_acl_role.inc
@@ -1,4 +1,24 @@
 <?php
+/*
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 class aclroletab extends tabs
 {
@@ -15,7 +35,7 @@ class aclroletab extends tabs
 
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
-    $new_dn= 'cn='.$baseobject->cn.",ou=aclroles,".$baseobject->base;
+    $new_dn= 'cn='.$baseobject->cn.",".get_ou("aclrole", "aclRoleRDN").$baseobject->base;
 
     if ($this->dn != $new_dn){
 
@@ -31,10 +51,6 @@ class aclroletab extends tabs
 
     $ret= tabs::save();
 
-    /* Fix tagging if needed */
-    $baseobject->dn= $new_dn;
-    $baseobject->handle_object_tagging();
-
     return $ret;
   }
 
@@ -46,16 +62,18 @@ class aclroletab extends tabs
   function execute()
   {
     $display= tabs::execute();
-    if(!$this->by_object['aclrole']->dialog){
+    if($this->read_only){
+      $display.= "<div class='plugin-actions'>";
+      $display.= "  <button type=submit name=\"edit_cancel\">".msgPool::cancelButton()."</button>\n";
+      $display.= "</div>";
+    }elseif(!$this->by_object['aclrole']->dialog){
       $display.= "<p style=\"text-align:right\">\n";
-      $display.= "  <input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
-      $display.= "  &nbsp;\n";
-      $display.= "  <input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+      $display.= "  <button type=submit name=\"edit_finish\">".msgPool::okButton()."</button>\n";
+      $display.= "  <button type=submit name=\"edit_cancel\">".msgPool::cancelButton()."</button>\n";
       $display.= "</p>";
     }
     return($display);
   }
-
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>