From b78bf706e2ab1d34498beea00b7ecfda11944eee Mon Sep 17 00:00:00 2001
From: romain <romain.coltel@gmail.com>
Date: Mon, 30 Jan 2012 19:58:55 +0100
Subject: Added support for the %GROUP% wildcard.

%GROUP% is the same as %USER% except it's done on each group a user is
in.
%USER% and %GROUP% cannot be mixed on an ACL line.
---
 lib/plugins/acl/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl/admin.php')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a6b0624bc..4d2be8dd0 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -84,7 +84,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             $this->who = '@'.ltrim($auth->cleanGroup($who),'@');
         }elseif($_REQUEST['acl_t'] == '__u__' && $who){
             $this->who = ltrim($who,'@');
-            if($this->who != '%USER%'){ #keep wildcard as is
+            if($this->who != '%USER%' && $this->who != '%GROUP%'){ #keep wildcard as is
                 $this->who = $auth->cleanUser($this->who);
             }
         }elseif($_REQUEST['acl_t'] &&
@@ -140,7 +140,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                             if ($who!='@ALL') {
                                 $who = '@'.ltrim($auth->cleanGroup($who),'@');
                             }
-                        } elseif ($who != '%USER%'){ #keep wildcard as is
+                        } elseif ($who != '%USER%' && $who != '%GROUP%'){ #keep wildcard as is
                             $who = $auth->cleanUser($who);
                         }
                         $who = auth_nameencode($who,true);
-- 
cgit v1.2.3


From e260f93b6cea05bc39bbd77b9db5bdc0c2c424bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 5 Jul 2012 22:58:24 +0100
Subject: xml compatibility fixes (mainly entities to unicode conversions)

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

(limited to 'lib/plugins/acl/admin.php')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 1f88c6ff9..a0d2e430e 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -507,7 +507,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         if($item['type']=='d'){
             if($item['open']){
                 $img   = DOKU_BASE.'lib/images/minus.gif';
-                $alt   = '&minus;';
+                $alt   = '−';
             }else{
                 $img   = DOKU_BASE.'lib/images/plus.gif';
                 $alt   = '+';
@@ -747,7 +747,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
             //build code
             $ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
-            $ret .= '<input '.buildAttributes($atts).' />&nbsp;';
+            $ret .= '<input '.buildAttributes($atts).' />&#160;';
             $ret .= $this->getLang('acl_perm'.$perm);
             $ret .= '</label>'.NL;
         }
@@ -783,7 +783,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '  <option value="__g__" class="aclgroup"'.$gsel.'>'.$this->getLang('acl_group').':</option>'.NL;
         echo '  <option value="__u__"  class="acluser"'.$usel.'>'.$this->getLang('acl_user').':</option>'.NL;
         if (!empty($this->specials)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->specials as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
@@ -801,7 +801,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             echo '  </optgroup>'.NL;
         }
         if (!empty($this->usersgroups)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->usersgroups as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
-- 
cgit v1.2.3