From 9b864f22ffb017242eb721f9b3de4fc1094ba8bc Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Mon, 12 Aug 2013 16:05:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ko/lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 7c1e9a43d..2f1ba2311 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
- * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Anika Henke <anika@selfthinker.org>
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
-- 
cgit v1.2.3


From 3199997341e3c54459d4ab0505d6a820536d3335 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Tue, 13 Aug 2013 18:26:22 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ko/help.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index ba3dd6d9f..96aa80c10 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -5,4 +5,4 @@
 * 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
 * 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
 
-DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
+도쿠위키에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
-- 
cgit v1.2.3


From 25a7457ca09e648a58f9a5db5aa595253ce8a885 Mon Sep 17 00:00:00 2001
From: Saroj Dhakal <lotusnagarkot@gmail.com>
Date: Thu, 15 Aug 2013 05:36:08 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ne/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ne/lang.php b/lib/plugins/acl/lang/ne/lang.php
index 6a29a9fa8..5e6196a30 100644
--- a/lib/plugins/acl/lang/ne/lang.php
+++ b/lib/plugins/acl/lang/ne/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Nepali language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
  * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
-- 
cgit v1.2.3


From c92968d1297188120d60b9de773b7c19915bc088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederico=20Gon=C3=A7alves=20Guimar=C3=A3es?=
 <frederico@teia.bio.br>
Date: Thu, 15 Aug 2013 11:36:04 +0200
Subject: translation update

---
 lib/plugins/acl/lang/pt-br/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php
index c49b430f8..ef0ae6c8b 100644
--- a/lib/plugins/acl/lang/pt-br/lang.php
+++ b/lib/plugins/acl/lang/pt-br/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Brazilian Portuguese language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Luis Fernando Enciso <lfenciso@certto.com.br>
  * @author Alauton/Loug
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
-- 
cgit v1.2.3


From ab090718d52f2360b769f039b1bf5f496f23097f Mon Sep 17 00:00:00 2001
From: Felipe Castro <fefcas@yahoo.com.br>
Date: Thu, 15 Aug 2013 13:56:24 +0200
Subject: translation update

---
 lib/plugins/acl/lang/eo/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php
index de75c2dd7..a5f607341 100644
--- a/lib/plugins/acl/lang/eo/lang.php
+++ b/lib/plugins/acl/lang/eo/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Felipe Castro <fefcas@uol.com.br>
  * @author Felipo Kastro <fefcas@gmail.com>
  * @author Felipe Castro <fefcas@gmail.com>
-- 
cgit v1.2.3


From f0ee5aeb8e64276eee9beab496d611a28bb0a013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20K=C5=99ivka?= <krivka@fit.vutbr.cz>
Date: Thu, 15 Aug 2013 22:20:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/cs/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index a4e59287a..8031612f7 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
  * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
  * @author tomas@valenta.cz
-- 
cgit v1.2.3


From 68389009e322909ba9f85af41320c4886ca27309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Neves?= <drakferion@gmail.com>
Date: Fri, 16 Aug 2013 04:11:01 +0200
Subject: translation update

---
 lib/plugins/acl/lang/pt/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pt/lang.php b/lib/plugins/acl/lang/pt/lang.php
index d90bab624..4c2114d67 100644
--- a/lib/plugins/acl/lang/pt/lang.php
+++ b/lib/plugins/acl/lang/pt/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
-- 
cgit v1.2.3


From 9fb553c08c19ca0ce9d63813af849413410a0b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Pl=C3=B6ger?= <develop@dieploegers.de>
Date: Mon, 19 Aug 2013 13:35:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/de-informal/lang.php | 5 +++--
 1 file changed, 3 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 3487f4257..35df13dc0 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
-- 
cgit v1.2.3


From bcc165558b4d58baab4ccc85d9066f0c4ba7de2a Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Tue, 20 Aug 2013 23:05:58 +0200
Subject: translation update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index f042ab724..ff4740676 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -28,7 +28,7 @@ $lang['btn_select']            = 'Выбрать';
 $lang['p_user_id']             = 'Сейчас пользователь <b class="acluser">%s</b> имеет следующие права на доступ к странице <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'Сейчас пользователь <b class="acluser">%s</b> имеет следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Сейчас члены группы <b class="aclgroup">%s</b> имеют следующие права на доступ к странице <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns']            = 'Сейчас члены группы <b class="aclgroup">%s</b> cимеют следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Сейчас члены группы <b class="aclgroup">%s</b> имеют следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_choose_id']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к странице <b class="aclpage">%s</b>.';
 $lang['p_choose_ns']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к пространству имён <b class="aclns">%s</b>.';
 $lang['p_inherited']           = 'Замечание: эти права доступа не были заданы явно, а были унаследованы от других групп или пространств имён более высокого порядка.';
-- 
cgit v1.2.3


From b8983d3a45d16afc81d527fc2616f8c43bbf2c87 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 20 Aug 2013 21:18:30 -0700
Subject: Fix CodeSniffer violations

Remove whitespace from end of lines to reduce the number of CodeSniffer
violations.
---
 lib/plugins/acl/remote.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 8f6dfbcd9..6d5201cf6 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -16,14 +16,14 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
             ),
         );
     }
-	
+
     function addAcl($scope, $user, $level){
-        $apa = plugin_load('admin', 'acl'); 
+        $apa = plugin_load('admin', 'acl');
         return $apa->_acl_add($scope, $user, $level);
     }
-	
+
     function delAcl($scope, $user){
-        $apa = plugin_load('admin', 'acl'); 
+        $apa = plugin_load('admin', 'acl');
         return $apa->_acl_del($scope, $user);
     }
 }
-- 
cgit v1.2.3


From 6c954d25e8444996a43caaca6b96040f02628dea Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Wed, 21 Aug 2013 09:50:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ko/help.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index 96aa80c10..9baeedbb9 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -5,4 +5,4 @@
 * 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
 * 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
 
-도쿠위키에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
+도쿠위키에서 접근 제어가 어떻게 동작되는지 알아보려면 [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
-- 
cgit v1.2.3


From f9f54ce2bb33d8bd5881929e1dea07520f704600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= <mateju@svn.gnome.org>
Date: Mon, 26 Aug 2013 23:31:40 +0200
Subject: translation update

---
 lib/plugins/acl/lang/sl/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php
index 44e45e491..303b18cff 100644
--- a/lib/plugins/acl/lang/sl/lang.php
+++ b/lib/plugins/acl/lang/sl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Slovenian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Dejan Levec <webphp@gmail.com>
  * @author Boštjan Seničar <senicar@gmail.com>
  * @author Gregor Skumavc (grega.skumavc@gmail.com)
-- 
cgit v1.2.3


From df2df443ae3c298d604bfc769fa173b02651ef7a Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Sun, 8 Sep 2013 19:05:58 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ru/help.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt
index 7807105a8..ecb2fe3d0 100644
--- a/lib/plugins/acl/lang/ru/help.txt
+++ b/lib/plugins/acl/lang/ru/help.txt
@@ -1,7 +1,8 @@
 === Краткая справка ===
 
-На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам своей вики.\\ 
-На панели слева отображены доступные пространства имён и страницы.\\ 
-Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.\\ 
-Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.\\ 
+На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам своей вики.
+  * На панели слева отображены доступные пространства имён и страницы.
+  * Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.
+  * Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.
+
 Прочтение  [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики».
-- 
cgit v1.2.3


From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 10 Sep 2013 22:17:43 -0700
Subject: Fix CodeSniffer whitespace violoations

Removed extraneous whitespace to eliminate errors reported by the
Squiz.WhiteSpace.SuperfluousWhitespace sniff.
---
 lib/plugins/acl/admin.php | 4 ----
 lib/plugins/acl/style.css | 2 --
 2 files changed, 6 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 50377da81..5ab73670d 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -61,7 +61,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         // fresh 1:1 copy without replacements
         $AUTH_ACL = file($config_cascade['acl']['default']);
 
-
         // namespace given?
         if($INPUT->str('ns') == '*'){
             $this->ns = '*';
@@ -386,7 +385,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             echo '<legend>'.$this->getLang('acl_mod').'</legend>';
         }
 
-
         echo $this->_html_checkboxes($current,empty($this->ns),'acl');
 
         if(is_null($current)){
@@ -686,7 +684,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             if($acl_level > AUTH_EDIT) $acl_level = AUTH_EDIT;
         }
 
-
         $new_acl = "$acl_scope\t$acl_user\t$acl_level\n";
 
         $new_config = $acl_config.$new_acl;
@@ -775,7 +772,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             $inlist = true;
         }
 
-
         echo '<select name="acl_t" class="edit">'.NL;
         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;
diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index d8f0b53f3..a53a03450 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -1,4 +1,3 @@
-
 #acl__tree {
     font-size: 90%;
     width: 25%;
@@ -138,4 +137,3 @@
 #acl_manager table tr:hover {
     background-color: __background_alt__;
 }
-
-- 
cgit v1.2.3


From 3daf9b20cab478b0c91d02f47cc3e0de195961ae Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Thu, 12 Sep 2013 14:16:01 +0200
Subject: translation update

---
 lib/plugins/acl/lang/ja/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ja/lang.php b/lib/plugins/acl/lang/ja/lang.php
index 0dd4d09c6..61fc1ea86 100644
--- a/lib/plugins/acl/lang/ja/lang.php
+++ b/lib/plugins/acl/lang/ja/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * japanese language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Davilin(Yuji Takenaka) <webmaster@davilin.com>
  * @author Yuji Takenaka <webmaster@davilin.com>
  * @author Ikuo Obataya <i.obataya@gmail.com>
-- 
cgit v1.2.3


From b8a07f6766d22cba6a4e1daf7d7dc547c04f54ac Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 17 Sep 2013 12:11:27 +0200
Subject: translation update

---
 lib/plugins/acl/lang/nl/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index e3a95e779..c3850a86a 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -19,6 +19,7 @@
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
  * @author Gerrit <klapinklapin@gmail.com>
+ * @author Gerrit Uitslag <klapinklapin@gmail.com>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
@@ -30,7 +31,7 @@ $lang['btn_select']            = 'Selecteer';
 $lang['p_user_id']             = 'Gebruiker <b class="acluser">%s</b> heeft momenteel de volgende bevoegdheden op pagina <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'Gebruiker <b class="acluser">%s</b> heeft momenteel de volgende bevoegdheden op namespace <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Leden van groep <b class="aclgroup">%s</b> hebben momenteel de volgende bevoegdheden op pagina <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns']            = 'Leden van groep <b class="aclgroup">%s</b>hebben momenteel de volgende bevoegdheden op namespace <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Leden van groep <b class="aclgroup">%s</b> hebben momenteel de volgende bevoegdheden in namespace <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_choose_id']           = 'Vul een <b>gebruiker of groep</b> in in het bovenstaande formulier om de bevoegdheden te bekijken of te bewerken voor de pagina <b class="aclpage">%s</b>.';
 $lang['p_choose_ns']           = 'Vul een <b>gebruiker of groep</b> in in het bovenstaande formulier om de bevoegdheden te bekijken of te bewerken voor de namespace <b class="aclns">%s</b>.';
 $lang['p_inherited']           = 'Let op: Deze permissies zijn niet expliciet ingesteld maar overerfd van andere groepen of hogere namespaces.';
-- 
cgit v1.2.3


From 0da02e4da30749eeeec74b09658d8aac595a4fb7 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Tue, 1 Oct 2013 23:45:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/sk/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/sk/lang.php b/lib/plugins/acl/lang/sk/lang.php
index 398f8c63d..51837d4b4 100644
--- a/lib/plugins/acl/lang/sk/lang.php
+++ b/lib/plugins/acl/lang/sk/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Slovak language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ondrej Vegh <ov@vsieti.sk>
  * @author Michal Mesko <michal.mesko@gmail.com>
  * @author exusik@gmail.com
-- 
cgit v1.2.3


From 844d8067502e44b64cfc7120b159fbb5f5f9b3e2 Mon Sep 17 00:00:00 2001
From: mehrdad <mehrdad.jafari.bojd@gmail.com>
Date: Fri, 4 Oct 2013 09:55:56 +0200
Subject: translation update

---
 lib/plugins/acl/lang/fa/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/fa/lang.php b/lib/plugins/acl/lang/fa/lang.php
index 7fe0f2c43..24bebaeaf 100644
--- a/lib/plugins/acl/lang/fa/lang.php
+++ b/lib/plugins/acl/lang/fa/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Persian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author behrad eslamifar <behrad_es@yahoo.com)
  * @author Mohsen Firoozmandan <info@mambolearn.com>
  * @author omidmr@gmail.com
-- 
cgit v1.2.3


From 30d21b979563135c12048a582ef5877368ef3d95 Mon Sep 17 00:00:00 2001
From: Serenity87HUN <anikototh87@gmail.com>
Date: Mon, 7 Oct 2013 15:16:34 +0200
Subject: translation update

---
 lib/plugins/acl/lang/hu/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php
index 9565eddc3..cc35243e1 100644
--- a/lib/plugins/acl/lang/hu/lang.php
+++ b/lib/plugins/acl/lang/hu/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Hungarian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Sandor TIHANYI <stihanyi+dw@gmail.com>
  * @author Siaynoq Mage <siaynoqmage@gmail.com>
  * @author schilling.janos@gmail.com
-- 
cgit v1.2.3


From 8265594d98708c1c993489099402d9ee27d2a289 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 14 Oct 2013 15:55:16 +0200
Subject: move ajax.php to action.php. Fixes FS#2233

---
 lib/plugins/acl/action.php | 92 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/plugins/acl/script.js  |  9 +++--
 2 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 lib/plugins/acl/action.php

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
new file mode 100644
index 000000000..92a93865c
--- /dev/null
+++ b/lib/plugins/acl/action.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * AJAX call handler for ACL plugin
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Register handler
+ */
+class action_plugin_acl extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller DokuWiki's event controller object
+     * @return void
+     */
+    public function register(Doku_Event_Handler &$controller) {
+
+        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax_call_acl');
+
+    }
+
+    /**
+     * AJAX call handler for ACL plugin
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  empty
+     * @return void
+     */
+
+    public function handle_ajax_call_acl(Doku_Event &$event, $param) {
+        if ($event->data !== 'plugin_acl') {
+            return;
+        }
+        $event->stopPropagation();
+        $event->preventDefault();
+
+
+        //close session
+        session_write_close();
+
+        global $conf;
+        global $ID;
+        global $INPUT;
+
+        //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');
+
+        $ID    = getID();
+
+        /** @var $acl admin_plugin_acl */
+        $acl = plugin_load('admin','acl');
+        $acl->handle();
+
+        $ajax = $INPUT->str('ajax');
+        header('Content-Type: text/html; charset=utf-8');
+
+        if($ajax == 'info'){
+            $acl->_html_info();
+        }elseif($ajax == 'tree'){
+
+            $dir = $conf['datadir'];
+            $ns  = $INPUT->str('ns');
+            if($ns == '*'){
+                $ns ='';
+            }
+            $ns  = cleanID($ns);
+            $lvl = count(explode(':',$ns));
+            $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+            $data = $acl->_get_tree($ns,$ns);
+
+            foreach(array_keys($data) as $item){
+                $data[$item]['level'] = $lvl+1;
+            }
+            echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'),
+                                array($acl, '_html_li_acl'));
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index 0abb80d67..58598b1e0 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -25,9 +25,10 @@ var dw_acl = {
                            var $frm = jQuery('#acl__detail form');
 
                            jQuery.post(
-                               DOKU_BASE + 'lib/plugins/acl/ajax.php',
+                               DOKU_BASE + 'lib/exe/ajax.php',
                                jQuery.extend(dw_acl.parseatt($clicky.parent().find('a')[0].search),
-                                             {ajax: 'tree',
+                                             {call: 'plugin_acl',
+                                              ajax: 'tree',
                                               current_ns: $frm.find('input[name=ns]').val(),
                                               current_id: $frm.find('input[name=id]').val()}),
                                show_sublist,
@@ -64,8 +65,8 @@ var dw_acl = {
             .attr('role', 'alert')
             .html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="..." />')
             .load(
-                DOKU_BASE + 'lib/plugins/acl/ajax.php',
-                jQuery('#acl__detail form').serialize() + '&ajax=info'
+                DOKU_BASE + 'lib/exe/ajax.php',
+                jQuery('#acl__detail form').serialize() + '&call=plugin_acl&ajax=info'
             );
         return false;
     },
-- 
cgit v1.2.3


From d4e2226677c742531e589ebd2b45fdd4553322ad Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 14 Oct 2013 15:56:52 +0200
Subject: remove unused variable

---
 lib/plugins/acl/action.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 92a93865c..373d6cbb0 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -71,7 +71,6 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             $acl->_html_info();
         }elseif($ajax == 'tree'){
 
-            $dir = $conf['datadir'];
             $ns  = $INPUT->str('ns');
             if($ns == '*'){
                 $ns ='';
-- 
cgit v1.2.3


From 219fe1dcb7250b332a77278fd31f20e5da10846c Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 14 Oct 2013 16:00:45 +0200
Subject: Code reformatting and remove unused global conf

---
 lib/plugins/acl/action.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 373d6cbb0..01842250e 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -30,62 +30,62 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
      * AJAX call handler for ACL plugin
      *
      * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  empty
+     * @param mixed $param  empty
      * @return void
      */
 
     public function handle_ajax_call_acl(Doku_Event &$event, $param) {
-        if ($event->data !== 'plugin_acl') {
+        if($event->data !== 'plugin_acl') {
             return;
         }
         $event->stopPropagation();
         $event->preventDefault();
 
-
         //close session
         session_write_close();
 
-        global $conf;
         global $ID;
         global $INPUT;
 
         //fix for Opera XMLHttpRequests
         $postData = http_get_raw_post_data();
-        if(!count($_POST) && !empty($postData)){
+        if(!count($_POST) && !empty($postData)) {
             parse_str($postData, $_POST);
         }
 
         if(!auth_isadmin()) die('for admins only');
         if(!checkSecurityToken()) die('CRSF Attack');
 
-        $ID    = getID();
+        $ID = getID();
 
         /** @var $acl admin_plugin_acl */
-        $acl = plugin_load('admin','acl');
+        $acl = plugin_load('admin', 'acl');
         $acl->handle();
 
         $ajax = $INPUT->str('ajax');
         header('Content-Type: text/html; charset=utf-8');
 
-        if($ajax == 'info'){
+        if($ajax == 'info') {
             $acl->_html_info();
-        }elseif($ajax == 'tree'){
+        } elseif($ajax == 'tree') {
 
-            $ns  = $INPUT->str('ns');
-            if($ns == '*'){
-                $ns ='';
+            $ns = $INPUT->str('ns');
+            if($ns == '*') {
+                $ns = '';
             }
-            $ns  = cleanID($ns);
-            $lvl = count(explode(':',$ns));
-            $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+            $ns = cleanID($ns);
+            $lvl = count(explode(':', $ns));
+            $ns = utf8_encodeFN(str_replace(':', '/', $ns));
 
-            $data = $acl->_get_tree($ns,$ns);
+            $data = $acl->_get_tree($ns, $ns);
 
-            foreach(array_keys($data) as $item){
-                $data[$item]['level'] = $lvl+1;
+            foreach(array_keys($data) as $item) {
+                $data[$item]['level'] = $lvl + 1;
             }
-            echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'),
-                                array($acl, '_html_li_acl'));
+            echo html_buildlist(
+                $data, 'acl', array($acl, '_html_list_acl'),
+                array($acl, '_html_li_acl')
+            );
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 07be12a51cc4c7850e57b25c6c1bd86ca0004a00 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 14 Oct 2013 16:04:31 +0200
Subject: acl ajax: replace die() by return

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 01842250e..bac518fcd 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -53,8 +53,8 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             parse_str($postData, $_POST);
         }
 
-        if(!auth_isadmin()) die('for admins only');
-        if(!checkSecurityToken()) die('CRSF Attack');
+        if(!auth_isadmin()) return;
+        if(!checkSecurityToken()) return;
 
         $ID = getID();
 
-- 
cgit v1.2.3


From 00dd0e7e7ab5bc29658e4be85336841af70b6b97 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 14 Oct 2013 16:12:01 +0200
Subject: acl ajax: add messages to returns

---
 lib/plugins/acl/action.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index bac518fcd..6111aca42 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -53,8 +53,14 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             parse_str($postData, $_POST);
         }
 
-        if(!auth_isadmin()) return;
-        if(!checkSecurityToken()) return;
+        if(!auth_isadmin()) {
+            echo 'for admins only';
+            return;
+        }
+        if(!checkSecurityToken()) {
+            echo 'CRSF Attack';
+            return;
+        }
 
         $ID = getID();
 
-- 
cgit v1.2.3


From 7b4ce9b0b6af9a1faa35049f96663febad344302 Mon Sep 17 00:00:00 2001
From: Soren Birk <soer9648@hotmail.com>
Date: Thu, 17 Oct 2013 13:30:54 +0200
Subject: translation update

---
 lib/plugins/acl/lang/da/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php
index 4a9d11448..2558795fd 100644
--- a/lib/plugins/acl/lang/da/lang.php
+++ b/lib/plugins/acl/lang/da/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Danish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author koeppe <koeppe@kazur.dk>
  * @author Jon Bendtsen <bendtsen@diku.dk>
  * @author Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
-- 
cgit v1.2.3


From e979d184ca6fbad44ae1f33610c80b80d106e067 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 20 Oct 2013 21:51:13 +0200
Subject: remove no longer used ajax.php

---
 lib/plugins/acl/ajax.php | 57 ------------------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 lib/plugins/acl/ajax.php

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
deleted file mode 100644
index 10e18af97..000000000
--- a/lib/plugins/acl/ajax.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * AJAX call handler for ACL plugin
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Andreas Gohr <andi@splitbrain.org>
- */
-
-if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
-require_once(DOKU_INC.'inc/init.php');
-//close session
-session_write_close();
-
-global $conf;
-global $ID;
-global $INPUT;
-
-//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');
-
-$ID    = getID();
-
-/** @var $acl admin_plugin_acl */
-$acl = plugin_load('admin','acl');
-$acl->handle();
-
-$ajax = $INPUT->str('ajax');
-header('Content-Type: text/html; charset=utf-8');
-
-if($ajax == 'info'){
-    $acl->_html_info();
-}elseif($ajax == 'tree'){
-
-    $dir = $conf['datadir'];
-    $ns  = $INPUT->str('ns');
-    if($ns == '*'){
-        $ns ='';
-    }
-    $ns  = cleanID($ns);
-    $lvl = count(explode(':',$ns));
-    $ns  = utf8_encodeFN(str_replace(':','/',$ns));
-
-    $data = $acl->_get_tree($ns,$ns);
-
-    foreach(array_keys($data) as $item){
-        $data[$item]['level'] = $lvl+1;
-    }
-    echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'),
-                        array($acl, '_html_li_acl'));
-}
-
-- 
cgit v1.2.3


From 4d13d89c45c088d6070c4e2da6d5b702f13c77ab Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 20 Oct 2013 21:52:19 +0200
Subject: remove obsolete opera handling and session closing

---
 lib/plugins/acl/action.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 6111aca42..5e186fb61 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -41,18 +41,9 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
         $event->stopPropagation();
         $event->preventDefault();
 
-        //close session
-        session_write_close();
-
         global $ID;
         global $INPUT;
 
-        //fix for Opera XMLHttpRequests
-        $postData = http_get_raw_post_data();
-        if(!count($_POST) && !empty($postData)) {
-            parse_str($postData, $_POST);
-        }
-
         if(!auth_isadmin()) {
             echo 'for admins only';
             return;
@@ -94,4 +85,4 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
             );
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From e4e504c4188ebbe344ed3b6b316137e99f98f642 Mon Sep 17 00:00:00 2001
From: Roy Zahor <roy.zahor@gmail.com>
Date: Mon, 21 Oct 2013 14:30:49 +0200
Subject: translation update

---
 lib/plugins/acl/lang/he/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/he/lang.php b/lib/plugins/acl/lang/he/lang.php
index 91025f4b8..6716081eb 100644
--- a/lib/plugins/acl/lang/he/lang.php
+++ b/lib/plugins/acl/lang/he/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * hebrew language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author DoK <kamberd@yahoo.com>
  * @author Dotan Kamber <kamberd@yahoo.com>
  * @author Moshe Kaplan <mokplan@gmail.com>
-- 
cgit v1.2.3


From 21c3090a76ebde3117ae1dcb9f503fe3a61c1c02 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 21 Oct 2013 23:32:15 +0100
Subject: replace \s, \S with [ \t], [^ \t] in regexs used with acls

---
 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 5ab73670d..b24981d91 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -554,7 +554,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             $line = trim(preg_replace('/#.*$/','',$line)); //ignore comments
             if(!$line) continue;
 
-            $acl = preg_split('/\s+/',$line);
+            $acl = preg_split('/[ \t]+/',$line);
             //0 is pagename, 1 is user, 2 is acl
 
             $acl[1] = rawurldecode($acl[1]);
@@ -701,7 +701,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         $acl_config = file($config_cascade['acl']['default']);
         $acl_user = auth_nameencode($acl_user,true);
 
-        $acl_pattern = '^'.preg_quote($acl_scope,'/').'\s+'.$acl_user.'\s+[0-8].*$';
+        $acl_pattern = '^'.preg_quote($acl_scope,'/').'[ \t]+'.$acl_user.'[ \t]+[0-8].*$';
 
         // save all non!-matching
         $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT);
-- 
cgit v1.2.3


From af2e0360182d7eae880fe2d8804044043e5b8b46 Mon Sep 17 00:00:00 2001
From: Mustafa Aslan <maslan@hotmail.com>
Date: Tue, 22 Oct 2013 14:25:48 +0200
Subject: translation update

---
 lib/plugins/acl/lang/tr/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/tr/lang.php b/lib/plugins/acl/lang/tr/lang.php
index 629ca546b..a9699a5f9 100644
--- a/lib/plugins/acl/lang/tr/lang.php
+++ b/lib/plugins/acl/lang/tr/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * turkish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Selim Farsakoğlu <farsakogluselim@yahoo.de>
  * @author Aydın Coşkuner <aydinweb@gmail.com>
  * @author Cihan Kahveci <kahvecicihan@gmail.com>
-- 
cgit v1.2.3


From 269e961b5d395674d18eb2bd82814b2620c05c19 Mon Sep 17 00:00:00 2001
From: Remon <no@email.local>
Date: Fri, 25 Oct 2013 14:00:59 +0200
Subject: translation update

---
 lib/plugins/acl/lang/nl/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index c3850a86a..abb81ae06 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -20,6 +20,7 @@
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
  * @author Gerrit <klapinklapin@gmail.com>
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
+ * @author Remon <no@email.local>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
@@ -38,7 +39,7 @@ $lang['p_inherited']           = 'Let op: Deze permissies zijn niet expliciet in
 $lang['p_isadmin']             = 'Let op: De geselecteerde groep of gebruiker heeft altijd volledige toegangsrechten omdat hij als superuser geconfigureerd is.';
 $lang['p_include']             = 'Hogere permissies bevatten ook de lagere. Aanmaken, uploaden en verwijderen gelden alleen voor namespaces, niet voor pagina\'s.';
 $lang['current']               = 'Huidige ACL regels';
-$lang['where']                 = 'Pagina/namespace';
+$lang['where']                 = 'Pagina/Namespace';
 $lang['who']                   = 'Gebruiker/Groep';
 $lang['perm']                  = 'Bevoegdheden';
 $lang['acl_perm0']             = 'Geen';
-- 
cgit v1.2.3


From e82704a003f35c4e6b6b94746e9c408b22d7d229 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 28 Oct 2013 20:04:59 +0100
Subject: fixed strict violation in ACL plugin

---
 lib/plugins/acl/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php
index 5e186fb61..a7226f598 100644
--- a/lib/plugins/acl/action.php
+++ b/lib/plugins/acl/action.php
@@ -20,7 +20,7 @@ class action_plugin_acl extends DokuWiki_Action_Plugin {
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
      */
-    public function register(Doku_Event_Handler &$controller) {
+    public function register(Doku_Event_Handler $controller) {
 
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax_call_acl');
 
-- 
cgit v1.2.3


From 32f6505fe52f99f50966e08334b7a07d2fbedc07 Mon Sep 17 00:00:00 2001
From: Ahmad Abd-Elghany <tolpa1@gmail.com>
Date: Mon, 28 Oct 2013 21:30:55 +0100
Subject: translation update

---
 lib/plugins/acl/lang/ar/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php
index 7c05b721c..4e44dab5f 100644
--- a/lib/plugins/acl/lang/ar/lang.php
+++ b/lib/plugins/acl/lang/ar/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Arabic language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Mostafa Hussein <mostafa@gmail.com>
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
-- 
cgit v1.2.3


From 5381a7ee4e6527c7d6d6af67134ef92ba97f8745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 13 Nov 2013 22:52:40 +0200
Subject: remove 'infos' misspelling

http://english.stackexchange.com/questions/117552/why-does-information-not-have-a-plural-form
---
 lib/plugins/acl/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index b24981d91..6c7c28ff6 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -345,7 +345,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * Print infos and editor
+     * Print info and editor
      */
     function _html_info(){
         global $ID;
-- 
cgit v1.2.3


From 853aa1550199223a46b55e9563790b9ef6a1d234 Mon Sep 17 00:00:00 2001
From: Rami Lehti <rammer@ipi.fi>
Date: Sun, 24 Nov 2013 11:38:46 +0100
Subject: translation update

---
 lib/plugins/acl/lang/fi/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/fi/lang.php b/lib/plugins/acl/lang/fi/lang.php
index 4f145e0f6..50224dfb4 100644
--- a/lib/plugins/acl/lang/fi/lang.php
+++ b/lib/plugins/acl/lang/fi/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Finnish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author otto@valjakko.net
  * @author Otto Vainio <otto@valjakko.net>
  * @author Teemu Mattila <ghcsystems@gmail.com>
-- 
cgit v1.2.3


From 94070874cc8d8702821161dbaa291e8b2d043ad3 Mon Sep 17 00:00:00 2001
From: Thomas Juberg <Thomas.Juberg@Gmail.com>
Date: Sun, 24 Nov 2013 18:02:23 +0100
Subject: translation update

---
 lib/plugins/acl/lang/no/lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php
index 09d71937a..82cdd5eef 100644
--- a/lib/plugins/acl/lang/no/lang.php
+++ b/lib/plugins/acl/lang/no/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Norwegian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Reidar Mosvold <Reidar.Mosvold@hit.no>
  * @author Jorge Barrera Grandon <jorge@digitalwolves.org>
  * @author Thomas Nygreen <nygreen@gmail.com>
@@ -10,7 +10,7 @@
  * @author Torkill Bruland <torkar-b@online.no>
  * @author Rune M. Andersen <rune.andersen@gmail.com>
  * @author Jakob Vad Nielsen (me@jakobnielsen.net)
- * @author Kjell Tore Næsgaard  <kjell.t.nasgaard@ntnu.no>
+ * @author Kjell Tore Næsgaard <kjell.t.nasgaard@ntnu.no>
  * @author Knut Staring <knutst@gmail.com>
  * @author Lisa Ditlefsen <lisa@vervesearch.com>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
-- 
cgit v1.2.3


From 8d6ec7dd27c536bbaf7d7c0c4f5f99ae20860f3b Mon Sep 17 00:00:00 2001
From: Tomasz Bosak <bosak.tomasz@gmail.com>
Date: Sun, 24 Nov 2013 18:03:51 +0100
Subject: translation update

---
 lib/plugins/acl/lang/pl/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index bef2d2615..42ce7fdaf 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * polish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Grzegorz Żur <grzegorz.zur@gmail.com>
  * @author Mariusz Kujawski <marinespl@gmail.com>
  * @author Maciej Kurczewski <pipijajko@gmail.com>
-- 
cgit v1.2.3


From ffe35fe919de6c9f52316dd272e6e22c4bde8d81 Mon Sep 17 00:00:00 2001
From: Garam <rowain8@gmail.com>
Date: Mon, 25 Nov 2013 20:50:59 +0100
Subject: translation update

---
 lib/plugins/acl/lang/ko/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 2f1ba2311..37cec307c 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -12,6 +12,7 @@
  * @author Seung-Chul Yoo <dryoo@live.com>
  * @author erial2@gmail.com
  * @author Myeongjin <aranet100@gmail.com>
+ * @author Garam <rowain8@gmail.com>
  */
 $lang['admin_acl']             = '접근 제어 목록 관리';
 $lang['acl_group']             = '그룹';
@@ -27,7 +28,7 @@ $lang['p_group_ns']            = '<b class="aclgroup">%s</b> 그룹 구성원은
 $lang['p_choose_id']           = '<b class="aclpage">%s</b> 문서 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하세요.';
 $lang['p_choose_ns']           = '<b class="aclns">%s</b> 이름공간 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하세요.';
 $lang['p_inherited']           = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹이나 상위 이름공간으로부터 가져왔습니다.';
-$lang['p_isadmin']             = '참고: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.';
+$lang['p_isadmin']             = '참고: 슈퍼 사용자로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.';
 $lang['p_include']             = '더 높은 접근 권한은 하위를 포함합니다. 문서가 아닌 이름공간에는 만들기, 올리기, 삭제 권한만 적용됩니다.';
 $lang['current']               = '현재 ACL 규칙';
 $lang['where']                 = '문서/이름공간';
@@ -38,6 +39,6 @@ $lang['acl_perm1']             = '읽기';
 $lang['acl_perm2']             = '편집';
 $lang['acl_perm4']             = '만들기';
 $lang['acl_perm8']             = '올리기';
-$lang['acl_perm16']            = '삭제';
+$lang['acl_perm16']            = '지우기';
 $lang['acl_new']               = '새 항목 추가';
 $lang['acl_mod']               = '항목 수정';
-- 
cgit v1.2.3


From 2c01be2ff65c7adeb4e34cd2a507c910e84b79b7 Mon Sep 17 00:00:00 2001
From: zamroni <therons@ymail.com>
Date: Tue, 3 Dec 2013 06:45:45 +0100
Subject: translation update

---
 lib/plugins/acl/lang/id/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/id/lang.php b/lib/plugins/acl/lang/id/lang.php
index 650637635..6f619c5ec 100644
--- a/lib/plugins/acl/lang/id/lang.php
+++ b/lib/plugins/acl/lang/id/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Indonesian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author mubaidillah <mubaidillah@gmail.com>
  * @author Yustinus Waruwu <juswaruwu@gmail.com>
  */
-- 
cgit v1.2.3


From 6593db4300a3db6d88c9b09df725ecc8589e99b6 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 7 Dec 2013 02:01:38 +0100
Subject: translation update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 37cec307c..34b93a9f4 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -39,6 +39,6 @@ $lang['acl_perm1']             = '읽기';
 $lang['acl_perm2']             = '편집';
 $lang['acl_perm4']             = '만들기';
 $lang['acl_perm8']             = '올리기';
-$lang['acl_perm16']            = '지우기';
+$lang['acl_perm16']            = '삭제';
 $lang['acl_new']               = '새 항목 추가';
 $lang['acl_mod']               = '항목 수정';
-- 
cgit v1.2.3


From eced6aea8250c3ba249da06ddb4c6d985a55a6be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C6=B0=C6=A1ng=20V=C4=83n=20Ho=C3=A0ng?=
 <duongvanhoang1962@quan10.net>
Date: Thu, 19 Dec 2013 08:05:50 +0100
Subject: translation update

---
 lib/plugins/acl/lang/vi/lang.php | 71 ++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 40 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/vi/lang.php b/lib/plugins/acl/lang/vi/lang.php
index ddf764dca..4fc3388ff 100644
--- a/lib/plugins/acl/lang/vi/lang.php
+++ b/lib/plugins/acl/lang/vi/lang.php
@@ -1,44 +1,35 @@
 <?php
+
 /**
- * vietnamese language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     NukeViet <admin@nukeviet.vn>
+ * 
+ * @author NukeViet <admin@nukeviet.vn>
  */
-
-$lang['admin_acl']  = 'Quản lý danh sách quyền truy cập';
-$lang['acl_group']  = 'Nhóm';
-$lang['acl_user']   = 'Thành viên';
-$lang['acl_perms']  = 'Cấp phép cho';
-$lang['page']       = 'Trang';
-$lang['namespace']  = 'Thư mục';
-
-$lang['btn_select']  = 'Chọn';
-
-$lang['p_user_id']    = 'Thành viên <b class="acluser">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_user_ns']    = 'Thành viên <b class="acluser">%s</b>  hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_group_id']   = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns']   = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.';
-
-$lang['p_choose_id']  = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho trang <b class="aclpage">%s</b>.';
-$lang['p_choose_ns']  = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho thư mục <b class="aclns">%s</b>.';
-
-
-$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']  = '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 :
+$lang['admin_acl']             = 'Quản lý danh sách quyền truy cập';
+$lang['acl_group']             = 'Nhóm';
+$lang['acl_user']              = 'Thành viên';
+$lang['acl_perms']             = 'Cấp phép cho';
+$lang['page']                  = 'Trang';
+$lang['namespace']             = 'Thư mục';
+$lang['btn_select']            = 'Chọn';
+$lang['p_user_id']             = 'Thành viên <b class="acluser">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Thành viên <b class="acluser">%s</b>  hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho trang <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho thư mục <b class="aclns">%s</b>.';
+$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']             = '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';
-- 
cgit v1.2.3


From b21beefdfa477fe0e5810051462f134b3f0e99a9 Mon Sep 17 00:00:00 2001
From: Ivan Peltekov <ivan.peltekov@abv.bg>
Date: Tue, 31 Dec 2013 05:26:40 +0100
Subject: translation update

---
 lib/plugins/acl/lang/bg/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 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 95201750e..14e7d311c 100644
--- a/lib/plugins/acl/lang/bg/lang.php
+++ b/lib/plugins/acl/lang/bg/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * bulgarian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
  * @author Viktor Usunov <usun0v@mail.bg>
  * @author Kiril <neohidra@gmail.com>
-- 
cgit v1.2.3