diff options
| author | Adrian Lang <lang@cosmocode.de> | 2010-01-26 11:30:10 +0100 |
|---|---|---|
| committer | Adrian Lang <lang@cosmocode.de> | 2010-01-26 11:30:10 +0100 |
| commit | d3f4f410ba72f7d4ccd8a66ca2667902de30d496 (patch) | |
| tree | 4f62f256eaf312f61d60d7a30c15473bea7fc348 /lib/plugins/acl | |
| parent | 7d723f3d24511105ce37006f9439632c3d8f915e (diff) | |
| parent | 3c743051cd4555135bdbf55c27733a2281463b4c (diff) | |
| download | rpg-d3f4f410ba72f7d4ccd8a66ca2667902de30d496.tar.gz rpg-d3f4f410ba72f7d4ccd8a66ca2667902de30d496.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'lib/plugins/acl')
| -rw-r--r-- | lib/plugins/acl/admin.php | 7 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/he/lang.php | 1 |
2 files changed, 8 insertions, 0 deletions
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"; } 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'] = 'קבוצה'; |