From b78bf706e2ab1d34498beea00b7ecfda11944eee Mon Sep 17 00:00:00 2001 From: romain 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') 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 ae6cce187876439c77b53ebd2ae61976274f4a11 Mon Sep 17 00:00:00 2001 From: Matej Urban Date: Thu, 2 Feb 2012 20:49:20 +0100 Subject: Slovak language update --- lib/plugins/acl/lang/sl/help.txt | 10 +++++----- lib/plugins/acl/lang/sl/lang.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/sl/help.txt b/lib/plugins/acl/lang/sl/help.txt index eada41c29..ff096ae0e 100644 --- a/lib/plugins/acl/lang/sl/help.txt +++ b/lib/plugins/acl/lang/sl/help.txt @@ -1,11 +1,11 @@ -=== Hitra pomo === +=== Hitra pomoč === -Na tej strani je mogoe dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. +Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. Na veli strani so izpisani vsi imenski prostori in strani. -Na obrazcu zgoraj je mogoe pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. +Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. -V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoe hitro spreminjati ali brisati. +V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati. -Ve podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoe najti v [[doku>acl|uradni dokumentaciji ACL]]. +Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]]. diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php index 3fb391570..44e45e491 100644 --- a/lib/plugins/acl/lang/sl/lang.php +++ b/lib/plugins/acl/lang/sl/lang.php @@ -5,7 +5,7 @@ * @author Dejan Levec * @author Boštjan Seničar * @author Gregor Skumavc (grega.skumavc@gmail.com) - * @author Matej Urbančič (mateju@svn.gnome.org) + * @author Matej Urbančič (mateju@svn.gnome.org) */ $lang['admin_acl'] = 'Upravljanje dostopa'; $lang['acl_group'] = 'Skupina'; -- cgit v1.2.3 From c7b28ffda48d3e6e225940a74b00ee5011f45b4b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Feb 2012 13:26:50 +0000 Subject: added div.table around non-editable content as well (FS#1980) --- lib/plugins/acl/admin.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a6b0624bc..c3461b78b 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -597,6 +597,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; echo ''.NL; echo ''.NL; + echo '
'; echo ''; echo ''; echo ''; @@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''; echo ''; echo '
'.$this->getLang('where').'
'; + echo '
'; echo ''.NL; } -- cgit v1.2.3 From 5c0c6845e9d948437a54eb986c9f339dfc4b2c62 Mon Sep 17 00:00:00 2001 From: PCPA Date: Mon, 6 Feb 2012 23:39:40 +0100 Subject: Russian language update --- lib/plugins/acl/lang/ru/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 6d04dde21..15ba78ef6 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -15,6 +15,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['admin_acl'] = 'Управление списками контроля доступа'; $lang['acl_group'] = 'Группа'; -- cgit v1.2.3 From b2a1a44c2b1170a6fdbec637fa077c1469631511 Mon Sep 17 00:00:00 2001 From: Marius Olar Date: Tue, 7 Feb 2012 19:46:28 +0100 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index 6d63ad024..c278c918e 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; -- cgit v1.2.3 From a699035c4f7aa040cc4170401b2f9c48966eba5b Mon Sep 17 00:00:00 2001 From: Erial Krale Date: Wed, 15 Feb 2012 23:30:22 +0100 Subject: Korean language update --- lib/plugins/acl/lang/ko/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 6f4e991cb..6b1e77cf8 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -11,6 +11,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['admin_acl'] = '접근 제어 목록 관리'; $lang['acl_group'] = '그룹'; -- cgit v1.2.3 From 44dae8a743d9c3d83f22e6f38a1685c8326a3b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bohum=C3=ADr=20Z=C3=A1me=C4=8Dn=C3=ADk?= Date: Sun, 4 Mar 2012 17:49:09 +0100 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 cc1d97023..a1dce0369 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Lefty * @author Vojta Beran * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; -- cgit v1.2.3 From 96946cc94d3ecb3832e2a1ce35c49743e25329e1 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Wed, 21 Mar 2012 11:25:00 +0100 Subject: replaced $HTTP_RAW_POST_DATA with http_get_raw_post_data function --- lib/plugins/acl/ajax.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index 71a2eb03a..3a5d89c08 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -6,16 +6,17 @@ * @author Andreas Gohr */ -//fix for Opera XMLHttpRequests -if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ - parse_str($HTTP_RAW_POST_DATA, $_POST); -} - if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../'); require_once(DOKU_INC.'inc/init.php'); //close session session_write_close(); +//fix for Opera XMLHttpRequests +$postData = http_get_raw_post_data(); +if(!count($_POST) && !empty($postData)){ + parse_str($postData, $_POST); +} + if(!auth_isadmin()) die('for admins only'); if(!checkSecurityToken()) die('CRSF Attack'); -- cgit v1.2.3 From ee9b1ae4b3919f79050bb3c4478203d648810645 Mon Sep 17 00:00:00 2001 From: Taisuke Shimamoto Date: Fri, 23 Mar 2012 11:07:23 +0100 Subject: Japanese language update --- lib/plugins/acl/lang/ja/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ja/lang.php b/lib/plugins/acl/lang/ja/lang.php index 831fd2d5c..5bebb58a9 100644 --- a/lib/plugins/acl/lang/ja/lang.php +++ b/lib/plugins/acl/lang/ja/lang.php @@ -8,6 +8,7 @@ * @author Ikuo Obataya * @author Daniel Dupriest * @author Kazutaka Miyasaka + * @author Taisuke Shimamoto */ $lang['admin_acl'] = 'アクセスコントロール管理'; $lang['acl_group'] = 'グループ'; -- cgit v1.2.3 From 79504989f948613597d5516c9b31ba7e1529a303 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 9 Apr 2012 19:49:03 +0100 Subject: moved plugins' rtl.css to their style.css counterpart (part of FS#2185) --- lib/plugins/acl/rtl.css | 40 ---------------------------------------- lib/plugins/acl/style.css | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 40 deletions(-) delete mode 100644 lib/plugins/acl/rtl.css (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css deleted file mode 100644 index e79abe596..000000000 --- a/lib/plugins/acl/rtl.css +++ /dev/null @@ -1,40 +0,0 @@ -div#acl_manager div#acl__tree { - float: right; - text-align: right; -} - -div#acl_manager div#acl__tree li { - padding-left: 0em; - padding-right: 1em; -} - -div#acl_manager div#acl__tree ul img { - margin-left: 0.25em; - margin-right: 0em; -} - - -div#acl_manager div#acl__detail { - float: left; -} - -div#acl_manager .aclgroup { - background: transparent url(pix/group.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .acluser { - background: transparent url(pix/user.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclpage { - background: transparent url(pix/page.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclns { - background: transparent url(pix/ns.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index b7154aa78..2eee4f41c 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -8,6 +8,10 @@ div#acl_manager div#acl__tree { border: 1px solid __border__; text-align: left; } +[dir=rtl] div#acl_manager div#acl__tree { + float: right; + text-align: right; +} div#acl_manager div#acl__tree a.cur { background-color: __highlight__; @@ -24,11 +28,19 @@ div#acl_manager div#acl__tree li { padding-left: 1em; list-style-image: none; } +[dir=rtl] div#acl_manager div#acl__tree li { + padding-left: 0em; + padding-right: 1em; +} div#acl_manager div#acl__tree ul img { margin-right: 0.25em; cursor: pointer; } +[dir=rtl] div#acl_manager div#acl__tree ul img { + margin-left: 0.25em; + margin-right: 0em; +} div#acl_manager div#acl__detail { width: 73%; @@ -36,6 +48,9 @@ div#acl_manager div#acl__detail { float: right; overflow: auto; } +[dir=rtl] div#acl_manager div#acl__detail { + float: left; +} div#acl_manager div#acl__detail fieldset { width: 90%; @@ -56,21 +71,37 @@ div#acl_manager .aclgroup { background: transparent url(pix/group.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclgroup { + background: transparent url(pix/group.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .acluser { background: transparent url(pix/user.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .acluser { + background: transparent url(pix/user.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclpage { background: transparent url(pix/page.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclpage { + background: transparent url(pix/page.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclns { background: transparent url(pix/ns.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclns { + background: transparent url(pix/ns.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager label.disabled { color: __text_neu__!important; -- cgit v1.2.3 From 026b314868ee80aca644bf4107f78d8e8052b43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?= Date: Sun, 15 Apr 2012 12:47:43 +0200 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index c278c918e..4d093216b 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi * @author Marius OLAR * @author Marius Olar + * @author Emanuel-Emeric Andrași */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; -- cgit v1.2.3 From 14704953412e3710917a7595b4d1e9e6d0f6e7fe Mon Sep 17 00:00:00 2001 From: Yannick Aure Date: Fri, 27 Apr 2012 15:14:54 +0200 Subject: French language update --- lib/plugins/acl/lang/fr/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index a33a52bf0..7db8ae4ac 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -22,6 +22,7 @@ * @author Johan Guilbaud * @author schplurtz@laposte.net * @author skimpax@gmail.com + * @author Yannick Aure */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; -- cgit v1.2.3 From bdc67fe7b11d95a896a62142b9cf675bd5e51d94 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Fri, 27 Apr 2012 15:18:35 +0200 Subject: Esperanto language update --- lib/plugins/acl/lang/eo/help.txt | 4 ++-- lib/plugins/acl/lang/eo/lang.php | 24 +++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/eo/help.txt b/lib/plugins/acl/lang/eo/help.txt index cc3f63e5a..488e84a1b 100644 --- a/lib/plugins/acl/lang/eo/help.txt +++ b/lib/plugins/acl/lang/eo/help.txt @@ -6,6 +6,6 @@ La maldekstra panelo montras ĉiujn disponeblajn nomspacojn kaj paĝojn. La suba agordilo permesas al vi rigardi kaj modifi la rajtojn de elektita uzanto aŭ grupo. -En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montritaj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn. +En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montrataj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn. -Legado de la [[doku>acl|oficiala dokumentaro pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki. \ No newline at end of file +Legi la [[doku>acl|oficialan dokumentaron pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki. diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php index 72ce576ee..de75c2dd7 100644 --- a/lib/plugins/acl/lang/eo/lang.php +++ b/lib/plugins/acl/lang/eo/lang.php @@ -1,6 +1,6 @@ * @author Felipo Kastro @@ -8,9 +8,7 @@ * @author Robert Bogenschneider * @author Erik Pedersen * @author Erik Pedersen - * @author Robert Bogenschneider - * @author Robert BOGENSCHNEIDER - * @author Robert BOGENSCHNEIDER + * @author Robert Bogenschneider */ $lang['admin_acl'] = 'Administrado de Alirkontrola Listo (ACL)'; $lang['acl_group'] = 'Grupo'; @@ -19,13 +17,13 @@ $lang['acl_perms'] = 'Rajtoj por'; $lang['page'] = 'Paĝo'; $lang['namespace'] = 'Nomspaco'; $lang['btn_select'] = 'Elekti'; -$lang['p_user_id'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; -$lang['p_user_ns'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; -$lang['p_group_id'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; -$lang['p_group_ns'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; -$lang['p_choose_id'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la paĝo <b class="aclpage">%s</b>.'; -$lang['p_choose_ns'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la nomspaco <b class="aclns">%s</b>.'; -$lang['p_inherited'] = 'Rimarko: tiuj rajtoj ne estis rekte difinitaj, sed ili estis hereditaj el aliaj pli superaj grupoj aŭ nomspacoj.'; +$lang['p_user_id'] = 'Uzanto %s aktuale havas la jenajn rajtojn en la paĝo %s: %s.'; +$lang['p_user_ns'] = 'Uzanto %s aktuale havas la jenajn rajtojn en la nomspaco %s: %s.'; +$lang['p_group_id'] = 'Anoj de la grupo %s aktuale havas la jenajn rajtojn en la paĝo %s: %s.'; +$lang['p_group_ns'] = 'Anoj de la grupo %s aktuale havas la jenajn rajtojn en la nomspaco %s: %s.'; +$lang['p_choose_id'] = 'Bonvolu enmeti uzanton aŭ grupon en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la paĝo %s.'; +$lang['p_choose_ns'] = 'Bonvolu enmeti uzanton aŭ grupon en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la nomspaco %s.'; +$lang['p_inherited'] = 'Rimarko: tiuj rajtoj ne estas rekte difinitaj, sed ili herediĝas el aliaj pli supraj grupoj aŭ nomspacoj.'; $lang['p_isadmin'] = 'Rimarko: la elektita grupo aŭ uzanto ĉiam havas plenan rajtaron ĉar ĝi estas difinita kiel superuzanto.'; $lang['p_include'] = 'Plialtaj permesoj inkluzivas malpli altajn. La permesoj por Krei, Alŝuti kaj Forigi nur aplikeblas al nomspacoj, ne al paĝoj.'; $lang['current'] = 'Aktuala regularo ACL'; @@ -38,5 +36,5 @@ $lang['acl_perm2'] = 'Redakti'; $lang['acl_perm4'] = 'Krei'; $lang['acl_perm8'] = 'Alŝuti'; $lang['acl_perm16'] = 'Forigi'; -$lang['acl_new'] = 'Aldoni novan Enmetaĵon'; -$lang['acl_mod'] = 'Modifi Enmetaĵon'; +$lang['acl_new'] = 'Aldoni novan enmetaĵon'; +$lang['acl_mod'] = 'Modifi enmetaĵon'; -- cgit v1.2.3 From 9cf8b6e0e4b94473739d2b36a906a848b9410f7f Mon Sep 17 00:00:00 2001 From: Aoi Karasu Date: Tue, 12 Jun 2012 20:12:02 +0200 Subject: Polish langauge update --- lib/plugins/acl/lang/pl/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index 1b10b5232..bef2d2615 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author Grzegorz Widła * @author Łukasz Chmaj * @author Begina Felicysym + * @author Aoi Karasu */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; -- cgit v1.2.3 From 87a99fa3f2b3acb3a82613dda4b0cb402de7efe5 Mon Sep 17 00:00:00 2001 From: Matteo Pasotti Date: Tue, 12 Jun 2012 20:14:03 +0200 Subject: Italian language update --- lib/plugins/acl/lang/it/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php index f789b979f..a55a2c0f3 100644 --- a/lib/plugins/acl/lang/it/lang.php +++ b/lib/plugins/acl/lang/it/lang.php @@ -13,6 +13,7 @@ * @author robocap * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta + * @author Matteo Pasotti */ $lang['admin_acl'] = 'Gestione Lista Controllo Accessi (ACL)'; $lang['acl_group'] = 'Gruppo'; -- cgit v1.2.3 From b2a83e66e70296a7a38e7524050a7a4268cc36f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= Date: Wed, 13 Jun 2012 22:11:54 +0200 Subject: Korean language update --- lib/plugins/acl/lang/ko/help.txt | 10 +++++----- lib/plugins/acl/lang/ko/lang.php | 33 +++++++++++++++++---------------- 2 files changed, 22 insertions(+), 21 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt index 516198ee5..d022a0913 100644 --- a/lib/plugins/acl/lang/ko/help.txt +++ b/lib/plugins/acl/lang/ko/help.txt @@ -1,11 +1,11 @@ === 도움말: === -현재 페이지에서 위키 네임스페이스와 페이지에 대한 접근 권한을 추가하거나 삭제할 수 있습니다. +현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다. -왼쪽 영역을 선택가능한 네임스페이스들과 페이지 목록을 보여줍니다. +왼쪽 영역에는 선택 가능한 이름공간과 문서 목록을 보여줍니다. -위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 변경할 수 있습니다. +위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다. -아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나 변경할 수 있습니다. +아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나 바꿀 수 있습니다. -DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면 [[doku>acl|official documentation on ACL]] 읽기 바랍니다. \ No newline at end of file +DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면 [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다. \ No newline at end of file diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 6b1e77cf8..5465461fa 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -12,32 +12,33 @@ * @author SONG Younghwan * @author Seung-Chul Yoo * @author erial2@gmail.com + * @author Myeongjin */ $lang['admin_acl'] = '접근 제어 목록 관리'; $lang['acl_group'] = '그룹'; $lang['acl_user'] = '사용자'; $lang['acl_perms'] = '권한'; -$lang['page'] = '페이지'; -$lang['namespace'] = '네임스페이스'; +$lang['page'] = '문서'; +$lang['namespace'] = '이름공간'; $lang['btn_select'] = '선택'; -$lang['p_user_id'] = '사용자 %s는 현재 %s: %s 페이지 접근이 가능합니다.'; -$lang['p_user_ns'] = '사용자 %s는 현재 %s: %s 네임스페이스 접근이 가능합니다.'; -$lang['p_group_id'] = '그룹 %s 사용자는 현재 %s: %s 페이지 접근이 가능합니다.'; -$lang['p_group_ns'] = '그룹 %s 사용자는 현재 %s: %s 네임스페이스 접근이 가능합니다.'; -$lang['p_choose_id'] = '%s 페이지 접근 권한을 보거나 변경하려면 사용자나 그룹을 위 양식에 입력하기 바랍니다.'; -$lang['p_choose_ns'] = '%s 네임스페이스 접근 권한을 보거나 변경하려면 사용자나 그룹을 위 양식에 입력하기 바랍니다.'; -$lang['p_inherited'] = '주의: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 네임스페이스로 부터 가져왔습니다.'; -$lang['p_isadmin'] = '주의: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.'; -$lang['p_include'] = '더 높은 접근권한은 하위를 포함합니다. 페이지가 아닌 네임스페이스에는 생성, 업로드, 삭제 권한만 적용됩니다.'; -$lang['current'] = '현 ACL 규칙'; -$lang['where'] = '페이지/네임스페이스'; +$lang['p_user_id'] = '%s 사용자는 현재 %s: %s 문서 접근이 가능합니다.'; +$lang['p_user_ns'] = '%s 사용자는 현재 %s: %s 이름공간 접근이 가능합니다.'; +$lang['p_group_id'] = '%s 그룹 구성원은 현재 %s: %s 문서 접근이 가능합니다.'; +$lang['p_group_ns'] = '%s 그룹 구성원은 현재 %s: %s 이름공간 접근이 가능합니다.'; +$lang['p_choose_id'] = '%s 문서 접근 권한을 보거나 바꾸려면 사용자나 그룹을 위 양식에 입력하기 바랍니다.'; +$lang['p_choose_ns'] = '%s 이름공간 접근 권한을 보거나 바꾸려면 사용자나 그룹을 위 양식에 입력하기 바랍니다.'; +$lang['p_inherited'] = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 이름공간으로부터 가져왔습니다.'; +$lang['p_isadmin'] = '참고: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.'; +$lang['p_include'] = '더 높은 접근 권한은 하위를 포함합니다. 문서가 아닌 이름공간에는 만들기, 올리기, 삭제 권한만 적용됩니다.'; +$lang['current'] = '현재 ACL 규칙'; +$lang['where'] = '문서/이름공간'; $lang['who'] = '사용자/그룹'; $lang['perm'] = '접근 권한'; $lang['acl_perm0'] = '없음'; $lang['acl_perm1'] = '읽기'; -$lang['acl_perm2'] = '수정'; -$lang['acl_perm4'] = '생성'; -$lang['acl_perm8'] = '업로드'; +$lang['acl_perm2'] = '편집'; +$lang['acl_perm4'] = '만들기'; +$lang['acl_perm8'] = '올리기'; $lang['acl_perm16'] = '삭제'; $lang['acl_new'] = '새 항목 추가'; $lang['acl_mod'] = '선택 항목 변경'; -- cgit v1.2.3 From b16544225947102f664769aaeb02bd59a25fbaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= Date: Fri, 22 Jun 2012 09:56:20 +0200 Subject: Korean language update --- lib/plugins/acl/lang/ko/help.txt | 4 ++-- lib/plugins/acl/lang/ko/lang.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt index d022a0913..377636682 100644 --- a/lib/plugins/acl/lang/ko/help.txt +++ b/lib/plugins/acl/lang/ko/help.txt @@ -6,6 +6,6 @@ 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다. -아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나 바꿀 수 있습니다. +아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다. -DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면 [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다. \ No newline at end of file +DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면 [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다. \ No newline at end of file diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 5465461fa..c8e1ce5cc 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -27,7 +27,7 @@ $lang['p_group_id'] = '%s 그룹 구성원은 $lang['p_group_ns'] = '%s 그룹 구성원은 현재 %s: %s 이름공간 접근이 가능합니다.'; $lang['p_choose_id'] = '%s 문서 접근 권한을 보거나 바꾸려면 사용자나 그룹을 위 양식에 입력하기 바랍니다.'; $lang['p_choose_ns'] = '%s 이름공간 접근 권한을 보거나 바꾸려면 사용자나 그룹을 위 양식에 입력하기 바랍니다.'; -$lang['p_inherited'] = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 이름공간으로부터 가져왔습니다.'; +$lang['p_inherited'] = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹이나 상위 이름공간으로부터 가져왔습니다.'; $lang['p_isadmin'] = '참고: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.'; $lang['p_include'] = '더 높은 접근 권한은 하위를 포함합니다. 문서가 아닌 이름공간에는 만들기, 올리기, 삭제 권한만 적용됩니다.'; $lang['current'] = '현재 ACL 규칙'; -- cgit v1.2.3 From 1731f979e843c43888c2c26142db87b4801bd98e Mon Sep 17 00:00:00 2001 From: Nguyen The Hung Date: Fri, 22 Jun 2012 10:01:44 +0200 Subject: Vietnamese language update --- lib/plugins/acl/lang/vi/help.txt | 12 ++++++++++++ lib/plugins/acl/lang/vi/lang.php | 35 +++++++++++++++++++++++++++++------ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 lib/plugins/acl/lang/vi/help.txt (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/vi/help.txt b/lib/plugins/acl/lang/vi/help.txt new file mode 100644 index 000000000..23e258678 --- /dev/null +++ b/lib/plugins/acl/lang/vi/help.txt @@ -0,0 +1,12 @@ +=== Trợ giúp nhanh: === + +Trang này giúp bạn thêm hoặc xóa quyền được cấp cho 1 thư mục hoặc trang wiki của bạn. + +Của sổ bên trái hiển thị tất cả các thư mục và trang văn bản. + +Khung trên đây cho phép bạn xem và sửa quyền của một nhóm hoặc thành viên đã chọn. + +Bảng bên dưới hiển thị tất cả các quyền được cấp. Bạn có thể sửa hoặc hóa các quyền đó một cách nhanh chóng. + +Đọc [[doku>acl|tài liệu chính thức về ACL]] sẽ giúp bạn hiểu hơn về cách phân quyền ở DokuWiki. + diff --git a/lib/plugins/acl/lang/vi/lang.php b/lib/plugins/acl/lang/vi/lang.php index 6237f79ba..ddf764dca 100644 --- a/lib/plugins/acl/lang/vi/lang.php +++ b/lib/plugins/acl/lang/vi/lang.php @@ -3,19 +3,42 @@ * vietnamese language file * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author James Do + * @author NukeViet */ -$lang['admin_acl'] = 'Quản lý phép truy nhật {Access Control List}'; +$lang['admin_acl'] = 'Quản lý danh sách quyền truy cập'; $lang['acl_group'] = 'Nhóm'; -$lang['acl_user'] = 'Người'; -$lang['acl_perms'] = 'Phép truy nhập cho'; +$lang['acl_user'] = 'Thành viên'; +$lang['acl_perms'] = 'Cấp phép cho'; $lang['page'] = 'Trang'; -$lang['namespace'] = 'Không gian tên'; +$lang['namespace'] = 'Thư mục'; +$lang['btn_select'] = 'Chọn'; + +$lang['p_user_id'] = 'Thành viên %s hiện tại được cấp phép cho trang %s: %s.'; +$lang['p_user_ns'] = 'Thành viên %s hiện tại được cấp phép cho thư mục %s: %s.'; +$lang['p_group_id'] = 'Thành viên trong nhóm %s hiện tại được cấp phép cho trang %s: %s.'; +$lang['p_group_ns'] = 'Thành viên trong nhóm %s hiện tại được cấp phép cho thư mục %s: %s.'; + +$lang['p_choose_id'] = 'Hãy nhập tên thành viên hoặc nhóm vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho trang %s.'; +$lang['p_choose_ns'] = 'Hãy nhập tên thành viên hoặc nhóm vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho thư mục %s.'; + + +$lang['p_inherited'] = 'Ghi chú: Có những quyền không được thể hiện ở đây nhưng nó được cấp phép từ những nhóm hoặc thư mục cấp cao.'; +$lang['p_isadmin'] = 'Ghi chú: Nhóm hoặc thành viên này luôn được cấp đủ quyền vì họ là Quản trị tối cao'; +$lang['p_include'] = 'Một số quyền thấp được thể hiện ở mức cao hơn. Quyền tạo, tải lên và xóa chỉ dành cho thư mục, không dành cho trang.'; + +$lang['current'] = 'Danh sách quyền truy cập hiện tại'; +$lang['where'] = 'Trang/Thư mục'; +$lang['who'] = 'Thành viên/Nhóm'; +$lang['perm'] = 'Quyền'; + +$lang['acl_perm0'] = 'Không'; $lang['acl_perm1'] = 'Đọc'; -$lang['acl_perm2'] = 'Biên soạn'; +$lang['acl_perm2'] = 'Sửa'; $lang['acl_perm4'] = 'Tạo'; $lang['acl_perm8'] = 'Tải lên'; +$lang['acl_perm16'] = 'Xóa'; $lang['acl_new'] = 'Thêm mục mới'; +$lang['acl_mod'] = 'Sửa'; //Setup VIM: ex: et ts=2 : -- cgit v1.2.3 From 5e997714aaf42319f9ab4e2df2a4d1bbdabee0e8 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Sun, 1 Jul 2012 20:13:18 +0200 Subject: de/de-informal - language updates for acl and usermanager plugin (synchronize terms) --- lib/plugins/acl/lang/de-informal/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index 3f4b08c2a..05f7df037 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -5,11 +5,11 @@ * @author Alexander Fischer * @author Juergen Schwarzer * @author Marcel Metz - * @author Matthias Schulte + * @author Matthias Schulte * @author Christian Wichmann * @author Pierre Corell */ -$lang['admin_acl'] = 'Zugriffskontrollsystem Management'; +$lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; $lang['acl_user'] = 'Benutzer'; $lang['acl_perms'] = 'Rechte für'; -- cgit v1.2.3 From a0e07c159740157e1a0618d6df8312d747b86b58 Mon Sep 17 00:00:00 2001 From: Kiril LastName Date: Wed, 4 Jul 2012 12:35:50 +0300 Subject: updated: Bulgarian translation --- lib/plugins/acl/lang/bg/lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/bg/lang.php b/lib/plugins/acl/lang/bg/lang.php index e260be918..95201750e 100644 --- a/lib/plugins/acl/lang/bg/lang.php +++ b/lib/plugins/acl/lang/bg/lang.php @@ -20,9 +20,9 @@ $lang['p_group_id'] = 'Членовете на групата 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') 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 = '−'; + $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 .= ''.NL; } @@ -783,7 +783,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ' '.NL; echo ' '.NL; if (!empty($this->specials)) { - echo ' '.NL; + echo ' '.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 ' '.NL; } if (!empty($this->usersgroups)) { - echo ' '.NL; + echo ' '.NL; foreach($this->usersgroups as $ug){ if($ug == $this->who){ $sel = ' selected="selected"'; -- cgit v1.2.3 From cc01c067547239aad897eac3b3525d5437f7809b Mon Sep 17 00:00:00 2001 From: Milad D Date: Sun, 8 Jul 2012 20:35:25 +0200 Subject: Persian translation --- lib/plugins/acl/lang/fa/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/fa/lang.php b/lib/plugins/acl/lang/fa/lang.php index ed576c271..8b7d72f51 100644 --- a/lib/plugins/acl/lang/fa/lang.php +++ b/lib/plugins/acl/lang/fa/lang.php @@ -7,6 +7,7 @@ * @author omidmr@gmail.com * @author Omid Mottaghi * @author Mohammad Reza Shoaei + * @author Milad DZand */ $lang['admin_acl'] = 'مدیریت کنترل دسترسی‌ها'; $lang['acl_group'] = 'گروه'; -- cgit v1.2.3 From f4c788ee87e2a5de27fd70cd38490ef6d0cb7aa5 Mon Sep 17 00:00:00 2001 From: Mikael Lyngvig Date: Sun, 8 Jul 2012 20:37:06 +0200 Subject: danish language update --- lib/plugins/acl/lang/da/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php index f82098dee..4a9d11448 100644 --- a/lib/plugins/acl/lang/da/lang.php +++ b/lib/plugins/acl/lang/da/lang.php @@ -13,6 +13,7 @@ * @author Erik Bjørn Pedersen * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com + * @author Mikael Lyngvig */ $lang['admin_acl'] = 'Rettighedsadministration'; $lang['acl_group'] = 'Gruppe'; -- cgit v1.2.3 From 00c2d4a9d8fcb38b6a2294749b395d528952fde5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 20:51:59 +0100 Subject: fixed some RTL+IE7 bugs, mainly background icons and search form (FS#2569) --- lib/plugins/acl/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index 2eee4f41c..7044254a5 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -74,6 +74,7 @@ div#acl_manager .aclgroup { [dir=rtl] div#acl_manager .aclgroup { background: transparent url(pix/group.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .acluser { @@ -83,6 +84,7 @@ div#acl_manager .acluser { [dir=rtl] div#acl_manager .acluser { background: transparent url(pix/user.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .aclpage { @@ -92,6 +94,7 @@ div#acl_manager .aclpage { [dir=rtl] div#acl_manager .aclpage { background: transparent url(pix/page.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .aclns { @@ -101,6 +104,7 @@ div#acl_manager .aclns { [dir=rtl] div#acl_manager .aclns { background: transparent url(pix/ns.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager label.disabled { -- cgit v1.2.3 From 63e967bdfd6d3bd52960647f8490dfd9678353f9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 5 Aug 2012 13:04:35 +0100 Subject: html validity fixes (removed name and align in some plugins) --- lib/plugins/acl/admin.php | 10 +++++----- lib/plugins/acl/style.css | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a0d2e430e..64d6ff3ca 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -191,7 +191,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; echo '
'.NL; - echo '1)'.NL; + echo '1)'.NL; echo $this->getLang('p_include'); echo '
'; @@ -602,7 +602,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''; echo ''.$this->getLang('where').''; echo ''.$this->getLang('who').''; - echo ''.$this->getLang('perm').'1)'; + echo ''.$this->getLang('perm').'1)'; echo ''.$lang['btn_delete'].''; echo ''; foreach($this->acl as $where => $set){ @@ -630,7 +630,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo $this->_html_checkboxes($perm,$ispage,'acl['.$where.']['.$who.']'); echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -638,7 +638,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -746,7 +746,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } //build code - $ret .= '