From d9c82eb63294032cf16e003122eeeca5a6c8454e Mon Sep 17 00:00:00 2001
From: Yaron Yogev <yarony@jungo.com>
Date: Thu, 21 Jan 2010 21:23:40 +0100
Subject: Hebrew Language Update

---
 lib/plugins/acl/lang/he/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/he/lang.php b/lib/plugins/acl/lang/he/lang.php
index 7d73c63dd..ac00730dd 100644
--- a/lib/plugins/acl/lang/he/lang.php
+++ b/lib/plugins/acl/lang/he/lang.php
@@ -6,6 +6,7 @@
  * @author DoK <kamberd@yahoo.com>
  * @author Dotan Kamber <kamberd@yahoo.com>
  * @author Moshe Kaplan <mokplan@gmail.com>
+ * @author Yaron Yogev <yaronyogev@gmail.com>
  */
 $lang['admin_acl']             = 'ניהול רשימת בקרת גישות';
 $lang['acl_group']             = 'קבוצה';
-- 
cgit v1.2.3


From 4db7791517d8ffb7c863e0ca5bb455dad32877f8 Mon Sep 17 00:00:00 2001
From: Christian Marg <marg@rz.tu-clausthal.de>
Date: Thu, 21 Jan 2010 22:12:17 +0100
Subject: Apply group/user cleaning on saving ACLs FS#1859

---
 lib/plugins/acl/admin.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a3fb4636d..a7037047a 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -130,6 +130,13 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                 // re-add all rules
                 foreach((array) $_REQUEST['acl'] as $where => $opt){
                     foreach($opt as $who => $perm){
+                        if ($who[0]=='@') {
+                            if ($who!='@ALL') {
+                                $who = '@'.ltrim($auth->cleanGroup($who),'@');
+                            }
+                        } else {
+                            $who = $auth->cleanUser($who);
+                        }
                         $who = auth_nameencode($who,true);
                         $lines[] = "$where\t$who\t$perm\n";
                     }
-- 
cgit v1.2.3