X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Facl%2Fclass_aclRole.inc;h=45462de8f4848472b09a798c67d6d3bdce9a9511;hb=fd450a2cdb42590454fa0feebf2691cebbc2829f;hp=0fca34925c8b7ef1c331c1cb69c41bb4ce464c3c;hpb=71b14360681038a4738726db7120be6e5420df41;p=gosa.git

diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc
index 0fca34925..45462de8f 100644
--- a/gosa-core/plugins/admin/acl/class_aclRole.inc
+++ b/gosa-core/plugins/admin/acl/class_aclRole.inc
@@ -23,8 +23,8 @@
 class aclrole extends acl
 {
   /* Definitions */
-  var $plHeadline= "Access control list templates";
-  var $plDescription= "Edit ACL roles";
+  var $plHeadline= "Access control roles";
+  var $plDescription= "Edit AC roles";
 
   /* attribute list for save action */
   var $attributes= array('gosaAclTemplate',"cn","description");
@@ -127,7 +127,7 @@ class aclrole extends acl
     asort($this->aclObjects);
 
     /* Fill acl types */
-    $this->aclTypes= array( "reset" => _("Reset ACLs"),
+    $this->aclTypes= array( "reset" => _("Reset ACL"),
                              "one" => _("One level"),
                              "base" => _("Current object"),
                              "sub" => _("Complete subtree"),
@@ -252,7 +252,7 @@ class aclrole extends acl
           continue;
         }
 
-        /* Ordinary ACLs */
+        /* Ordinary ACL */
         if (!isset($new_acl[$object])){
           $new_acl[$object]= array();
         }
@@ -357,8 +357,8 @@ class aclrole extends acl
         $field2= array("string" => $this->assembleAclSummary($entry));
         $action= "<input type='image' name='sortup_$key' alt='up' title='"._("Up")."' src='images/sort_up.png' align='top'>";
         $action.= "<input type='image' name='sortdown_$key' alt='down' title='"._("Down")."' src='images/sort_down.png'>";
-        $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='acl_edit_$key' title='"._("Edit ACL")."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='acl_del_$key' title='"._("Delete ACL")."'>";
+        $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("Edit")."' name='acl_edit_$key' title='".msgPool::editButton(_("ACL"))."'>";
+        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("Delete")."' name='acl_del_$key' title='".msgPool::delButton(_("ACL"))."'>";
 
         $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
         $aclList->AddEntry(array($field1, $field2, $field3));
@@ -397,13 +397,13 @@ class aclrole extends acl
         if ($summary == ""){
           $summary= '<i>'._("No ACL settings for this category").'</i>';
         } else {
-          $summary= sprintf(_("Contains ACLs for these objects: %s"), preg_replace('/, $/', '', $summary));
+          $summary= sprintf(_("ACL for these objects: %s"), preg_replace('/, $/', '', $summary));
         }
 
         $field1= array("string" => $dsc, "attach" => "style='width:140px'");
         $field2= array("string" => $summary);
-        $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='cat_edit_$section' title='"._("Edit categories ACLs")."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='cat_del_$section' title='"._("Clear categories ACLs")."'>";
+        $action= "<input class='center' type='image' src='images/edit.png' alt='"._("Edit")."' name='cat_edit_$section' title='"._("Edit category ACL")."'>";
+        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("Delete")."' name='cat_del_$section' title='"._("Reset category ACL")."'>";
         $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'");
         $aclList->AddEntry(array($field1, $field2, $field3));
       }
@@ -581,9 +581,11 @@ class aclrole extends acl
       new log("create","aclroles/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
     }
 
-    show_ldap_error($ldap->get_error(), sprintf(_("Saving ACLs with dn '%s' failed."),$this->dn));
+    if (!$ldap->success()){
+      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, "", get_class()));
+    }
 
-    /* Refresh users ACLs */
+    /* Refresh users ACL */
     $ui= get_userinfo();
     $ui->loadACL();
     session::set('ui',$ui);
@@ -619,7 +621,9 @@ class aclrole extends acl
         
     $ldap->rmDir($this->dn);
     new log("remove","aclroles/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-    show_ldap_error($ldap->get_error(), sprintf(_("Removing of aclRole with dn '%s' failed."),$this->dn));
+    if (!$ldap->success()){
+      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, "", get_class()));
+    }
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events("remove");
@@ -631,7 +635,9 @@ class aclrole extends acl
       $og= new ogroup($this->config, $ldap->getDN());
       unset($og->member[$this->dn]);
       $og->save ();
-      show_ldap_error($ldap->get_error(), sprintf(_("Removing aclRole from objectgroup '%s' failed"), $og->dn));
+      if (!$ldap->success()){
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $og->dn, "", get_class()));
+      }
     }
   }
 
@@ -686,12 +692,12 @@ class aclrole extends acl
   {
     return (array(
           "plShortName" => _("Role"),
-          "plDescription" => _("ACL roles"),
+          "plDescription" => _("Access control roles"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
           "plPriority"    => 0,
           "plSection"     => array("admin"),
-          "plCategory"    => array("aclroles" => array("objectClass" => "gosaRole", "description" => _("Acl roles"))),
+          "plCategory"    => array("aclroles" => array("objectClass" => "gosaRole", "description" => _("Access control roles"))),
 
           "plProvidedAcls"    => array(
             "cn"                => _("Name"),