From 8eafbfcb7ac89e193ce01bf8d8eca870b3c17ddd Mon Sep 17 00:00:00 2001 From: Vojta Beran Date: Wed, 27 Apr 2011 21:55:54 +0200 Subject: Czech language update --- lib/plugins/acl/lang/cs/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php index 311b79ae9..7c1efbd4c 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -8,6 +8,7 @@ * @author tomas@valenta.cz * @author Marek Sacha * @author Lefty + * @author Vojta Beran */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; -- cgit v1.2.3 From 4f5cb4d5bc4b7b3b61cdf2d67981eaf514f63060 Mon Sep 17 00:00:00 2001 From: Choicky Chou Date: Sun, 1 May 2011 11:51:30 +0200 Subject: Chinese language update --- lib/plugins/acl/lang/zh/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 50b9d63af..581d08539 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -12,6 +12,7 @@ * @author lainme * @author caii * @author Hiphen Lee + * @author caii, patent agent in China */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; -- cgit v1.2.3 From 783bf9124fd1461b659c1774f6ec69fa180dc503 Mon Sep 17 00:00:00 2001 From: Marcelo Zunino Date: Tue, 3 May 2011 18:20:23 +0200 Subject: Spanish language update --- lib/plugins/acl/lang/es/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index e63448a00..096320af9 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -19,6 +19,7 @@ * @author Fernando J. Gómez * @author Victor Castelan * @author Mauro Javier Giamberardino + * @author emezeta */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; -- cgit v1.2.3 From defb7d5769d8bc3c0a23d08419571a19429d1fc6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 7 May 2011 23:11:00 +0100 Subject: fixed some missing config_cascade occurrences (FS#2235) --- lib/plugins/acl/admin.php | 70 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index c8b7b1e6e..ea4184ca3 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -72,7 +72,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { global $config_cascade; // fresh 1:1 copy without replacements - $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); + $AUTH_ACL = file($config_cascade['acl']['default']); // namespace given? @@ -711,7 +711,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $new_config = $acl_config.$new_acl; - return io_saveFile(DOKU_CONF.'acl.auth.php', $new_config); + return io_saveFile($config_cascade['acl']['default'], $new_config); } /** @@ -729,7 +729,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { // save all non!-matching $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT); - return io_saveFile(DOKU_CONF.'acl.auth.php', join('',$new_config)); + return io_saveFile($config_cascade['acl']['default'], join('',$new_config)); } /** @@ -801,40 +801,40 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ' '.NL; echo ' '.NL; if (!empty($this->specials)) { - echo ' '.NL; - foreach($this->specials as $ug){ - if($ug == $this->who){ - $sel = ' selected="selected"'; - $inlist = true; - }else{ - $sel = ''; - } - - if($ug{0} == '@'){ - echo ' '.NL; - }else{ - echo ' '.NL; - } - } - echo ' '.NL; + echo ' '.NL; + foreach($this->specials as $ug){ + if($ug == $this->who){ + $sel = ' selected="selected"'; + $inlist = true; + }else{ + $sel = ''; + } + + if($ug{0} == '@'){ + echo ' '.NL; + }else{ + echo ' '.NL; + } + } + echo ' '.NL; } if (!empty($this->usersgroups)) { - echo ' '.NL; - foreach($this->usersgroups as $ug){ - if($ug == $this->who){ - $sel = ' selected="selected"'; - $inlist = true; - }else{ - $sel = ''; - } - - if($ug{0} == '@'){ - echo ' '.NL; - }else{ - echo ' '.NL; - } - } - echo ' '.NL; + echo ' '.NL; + foreach($this->usersgroups as $ug){ + if($ug == $this->who){ + $sel = ' selected="selected"'; + $inlist = true; + }else{ + $sel = ''; + } + + if($ug{0} == '@'){ + echo ' '.NL; + }else{ + echo ' '.NL; + } + } + echo ' '.NL; } echo ''.NL; return $inlist; -- cgit v1.2.3