merge master in branch

20 files changed, 55 insertions, 46 deletions

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index cf8963e64..445836a50 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -73,11 +73,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * handle user request
      */
     function handle() {
+        global $INPUT;
         if (is_null($this->_auth)) return false;
 
         // extract the command and any specific parameters
         // submit button name is of the form - fn[cmd][param(s)]
-        $fn   = $_REQUEST['fn'];
+        $fn   = $INPUT->param('fn');
 
         if (is_array($fn)) {
             $cmd = key($fn);
@@ -88,8 +89,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
 
         if ($cmd != "search") {
-          if (!empty($_REQUEST['start']))
-            $this->_start = $_REQUEST['start'];
+          $this->_start = $INPUT->int('start', 0);
           $this->_filter = $this->_retrieveFilter();
         }
 
@@ -345,6 +345,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
     function _addUser(){
+        global $INPUT;
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('addUser')) return false;
 
@@ -353,8 +354,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         if ($this->_auth->canDo('modPass')){
           if (empty($pass)){
-            if(!empty($_REQUEST['usernotify'])){
-              $pass = auth_pwgen();
+            if($INPUT->has('usernotify')){
+              $pass = auth_pwgen($user);
             } else {
               msg($this->lang['add_fail'], -1);
               return false;
@@ -393,7 +394,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
           msg($this->lang['add_ok'], 1);
 
-          if (!empty($_REQUEST['usernotify']) && $pass) {
+          if ($INPUT->has('usernotify') && $pass) {
             $this->_notifyUser($user,$pass);
           }
         } else {
@@ -407,13 +408,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * Delete user
      */
     function _deleteUser(){
-        global $conf;
+        global $conf, $INPUT;
 
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('delUser')) return false;
 
-        $selected = $_REQUEST['delete'];
-        if (!is_array($selected) || empty($selected)) return false;
+        $selected = $INPUT->arr('delete');
+        if (empty($selected)) return false;
         $selected = array_keys($selected);
 
         if(in_array($_SERVER['REMOTE_USER'], $selected)) {
@@ -463,13 +464,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * Modify user (modified user data has been recieved)
      */
     function _modifyUser(){
-        global $conf;
+        global $conf, $INPUT;
 
         if (!checkSecurityToken()) return false;
         if (!$this->_auth->canDo('UserMod')) return false;
 
         // get currently valid  user data
-        $olduser = cleanID(preg_replace('/.*:/','',$_REQUEST['userid_old']));
+        $olduser = cleanID(preg_replace('/.*:/','',$INPUT->str('userid_old')));
         $oldinfo = $this->_auth->getUserData($olduser);
 
         // get new user data subject to change
@@ -494,8 +495,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
 
         // generate password if left empty and notification is on
-        if(!empty($_REQUEST['usernotify']) && empty($newpass)){
-            $newpass = auth_pwgen();
+        if($INPUT->has('usernotify') && empty($newpass)){
+            $newpass = auth_pwgen($olduser);
         }
 
         if (!empty($newpass) && $this->_auth->canDo('modPass'))
@@ -510,7 +511,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) {
           msg($this->lang['update_ok'],1);
 
-          if (!empty($_REQUEST['usernotify']) && $newpass) {
+          if ($INPUT->has('usernotify') && $newpass) {
             $notify = empty($changes['user']) ? $olduser : $newuser;
             $this->_notifyUser($notify,$newpass);
           }
diff --git a/lib/plugins/usermanager/lang/ca-valencia/lang.php b/lib/plugins/usermanager/lang/ca-valencia/lang.php
index 5b0c628ed..c39c2f9b3 100644
--- a/lib/plugins/usermanager/lang/ca-valencia/lang.php
+++ b/lib/plugins/usermanager/lang/ca-valencia/lang.php
@@ -33,7 +33,7 @@ $lang['delete_ok']             = '%d usuaris borrats';
 $lang['delete_fail']           = 'Erro borrant %d.';
 $lang['update_ok']             = 'Usuari actualisat correctament';
 $lang['update_fail']           = 'Erro actualisant usuari';
-$lang['update_exists']         = 'Erro canviant el nom de l\'usuari, el nom d\'usuari que ha donat ya existix (els demés canvis s\'aplicaran).';
+$lang['update_exists']         = 'Erro canviant el nom de l\'usuari (%s), el nom d\'usuari que ha donat ya existix (els demés canvis s\'aplicaran).';
 $lang['start']                 = 'primera';
 $lang['prev']                  = 'anterior';
 $lang['next']                  = 'següent';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index 6de408e14..9fc3a5e75 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -12,6 +12,7 @@
  * @author zbynek.krivka@seznam.cz
  * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
  */
 $lang['menu']                  = 'Správa uživatelů';
 $lang['noauth']                = '(autentizace uživatelů není k dispozici)';
diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php
index e53781c77..791cfa74f 100644
--- a/lib/plugins/usermanager/lang/de-informal/lang.php
+++ b/lib/plugins/usermanager/lang/de-informal/lang.php
@@ -8,6 +8,8 @@
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
+ * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['menu']                  = 'Benutzerverwaltung';
 $lang['noauth']                = '(Benutzeranmeldung ist nicht verfügbar)';
diff --git a/lib/plugins/usermanager/lang/el/lang.php b/lib/plugins/usermanager/lang/el/lang.php
index 4b4d95379..da7c8fb0f 100644
--- a/lib/plugins/usermanager/lang/el/lang.php
+++ b/lib/plugins/usermanager/lang/el/lang.php
@@ -11,6 +11,7 @@
  * @author Konstantinos Koryllos <koryllos@gmail.com>
  * @author George Petsagourakis <petsagouris@gmail.com>
  * @author Petros Vidalis <pvidalis@gmail.com>
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
  */
 $lang['menu']                  = 'Διαχείριση Χρηστών';
 $lang['noauth']                = '(η είσοδος χρηστών δεν είναι δυνατή)';
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 7e602d0ce..40e878bbb 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -19,6 +19,7 @@
  * @author Yannick Aure <yannick.aure@gmail.com>
  * @author Olivier DUVAL <zorky00@gmail.com>
  * @author Anael Mobilia <contrib@anael.eu>
+ * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $lang['menu']                  = 'Gestion des utilisateurs';
 $lang['noauth']                = '(authentification de l\'utilisateur non disponible)';
diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php
index fb965985f..f3a7ef281 100644
--- a/lib/plugins/usermanager/lang/gl/lang.php
+++ b/lib/plugins/usermanager/lang/gl/lang.php
@@ -4,7 +4,7 @@
  *
  * @author Medúlio <medulio@ciberirmandade.org>
  * @author Oscar M. Lage <r0sk10@gmail.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Rodrigo Rega <rodrigorega@gmail.com>
  */
 $lang['menu']                  = 'Xestor de Usuarios';
 $lang['noauth']                = '(autenticación de usuarios non dispoñible)';
diff --git a/lib/plugins/usermanager/lang/ja/lang.php b/lib/plugins/usermanager/lang/ja/lang.php
index b5fd556dc..1510d1eb0 100644
--- a/lib/plugins/usermanager/lang/ja/lang.php
+++ b/lib/plugins/usermanager/lang/ja/lang.php
@@ -7,6 +7,7 @@
  * @author Daniel Dupriest <kououken@gmail.com>
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
  * @author Taisuke Shimamoto <dentostar@gmail.com>
+ * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  */
 $lang['menu']                  = 'ユーザー管理';
 $lang['noauth']                = '（ユーザー認証が無効です）';
@@ -41,10 +42,10 @@ $lang['prev']                  = '前へ';
 $lang['next']                  = '次へ';
 $lang['last']                  = '最後';
 $lang['edit_usermissing']      = '選択したユーザーは見つかりません。削除もしくは変更された可能性があります。';
-$lang['user_notify']           = '通知するユーザー';
-$lang['note_notify']           = 'ユーザーが新しいパスワードを設定した場合のみ、通知メールが送信されます。';
-$lang['note_group']            = 'グループを指定しない場合は、既定のグループ（%s）に登録されいます。';
-$lang['note_pass']             = 'パスワードを空欄とした場合は、パスワードを自動的に生成します。この場合、ユーザーへの通知が有効となります。';
+$lang['user_notify']           = 'ユーザーに通知する';
+$lang['note_notify']           = '通知メールは、ユーザーに新たなパスワードが設定された場合のみ送信されます。';
+$lang['note_group']            = 'グループを指定しない場合は、既定のグループ（%s）に配属されます。';
+$lang['note_pass']             = 'パスワードを空欄とした場合は、（”ユーザーに通知する”がチェックされていなくとも）自動生成したパスワードの通知がユーザー宛てに送信されます。';
 $lang['add_ok']                = 'ユーザーを登録しました';
 $lang['add_fail']              = 'ユーザーの登録に失敗しました';
 $lang['notify_ok']             = '通知メールを送信しました';
diff --git a/lib/plugins/usermanager/lang/ko/add.txt b/lib/plugins/usermanager/lang/ko/add.txt
index 578ba5636..845d8090a 100644
--- a/lib/plugins/usermanager/lang/ko/add.txt
+++ b/lib/plugins/usermanager/lang/ko/add.txt
@@ -1 +1 @@
-===== 사용자 추가 =====
+===== 사용자 추가 =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/delete.txt b/lib/plugins/usermanager/lang/ko/delete.txt
index 1e9c0ba73..52b8209a1 100644
--- a/lib/plugins/usermanager/lang/ko/delete.txt
+++ b/lib/plugins/usermanager/lang/ko/delete.txt
@@ -1 +1 @@
-===== 사용자 삭제 =====
+===== 사용자 삭제 =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/edit.txt b/lib/plugins/usermanager/lang/ko/edit.txt
index ebb5bb002..a938c5b2e 100644
--- a/lib/plugins/usermanager/lang/ko/edit.txt
+++ b/lib/plugins/usermanager/lang/ko/edit.txt
@@ -1 +1 @@
-===== 사용자 정보 편집 =====
+===== 사용자 정보 편집 =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/intro.txt b/lib/plugins/usermanager/lang/ko/intro.txt
index 8c8bfa5b9..d75680c71 100644
--- a/lib/plugins/usermanager/lang/ko/intro.txt
+++ b/lib/plugins/usermanager/lang/ko/intro.txt
@@ -1 +1 @@
-====== 사용자 관리 ======
+====== 사용자 관리 ======
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index 58f9bf14a..57bfbc4a2 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -1,19 +1,18 @@
 <?php
 /**
- * korean language file
+ * Korean language file
  *
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
- * @author SONG Younghwan <purluno@gmail.com>
- * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author Seung-Chul Yoo <dryoo@live.com>
  * @author erial2@gmail.com
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['menu']                  = '사용자 관리자';
-$lang['noauth']                = '(사용자 인증이 불가능합니다.)';
-$lang['nosupport']             = '(사용자 관리가 지원되지 않습니다.)';
-$lang['badauth']               = '잘못된 인증 메카니즘';
+$lang['noauth']                = '(사용자 인증이 불가능합니다)';
+$lang['nosupport']             = '(사용자 관리가 지원되지 않습니다)';
+$lang['badauth']               = '인증 메카니즘이 잘못되었습니다';
 $lang['user_id']               = '사용자';
 $lang['user_pass']             = '비밀번호';
 $lang['user_name']             = '실제 이름';
@@ -24,20 +23,20 @@ $lang['value']                 = '값';
 $lang['add']                   = '추가';
 $lang['delete']                = '삭제';
 $lang['delete_selected']       = '선택 삭제';
-$lang['edit']                  = '수정';
-$lang['edit_prompt']           = '이 사용자 수정';
+$lang['edit']                  = '편집';
+$lang['edit_prompt']           = '이 사용자 편집';
 $lang['modify']                = '바뀜 저장';
 $lang['search']                = '찾기';
 $lang['search_prompt']         = '찾기 실행';
 $lang['clear']                 = '찾기 필터 초기화';
 $lang['filter']                = '필터';
-$lang['summary']               = '찾은 사용자 %3$d 중 %1$d-%2$d 보기. 전체 사용자 %4$d명.';
-$lang['nonefound']             = '찾은 사용자가 없습니다. 전체 사용자 %d명.';
+$lang['summary']               = '찾은 사용자 %3$d 중 %1$d-%2$d을(를) 봅니다. 전체 사용자는 %4$d명입니다.';
+$lang['nonefound']             = '찾은 사용자가 없습니다. 전체 사용자는 %d명입니다.';
 $lang['delete_ok']             = '사용자 %d명이 삭제되었습니다';
 $lang['delete_fail']           = '사용자 %d명의 삭제가 실패했습니다.';
-$lang['update_ok']             = '사용자 정보를 성공적으로 바꾸었습니다.';
-$lang['update_fail']           = '사용자 정보를 바꾸는 데 실패했습니다.';
-$lang['update_exists']         = '사용자 이름을 바꾸기는 데 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)';
+$lang['update_ok']             = '사용자 정보를 성공적으로 바꾸었습니다';
+$lang['update_fail']           = '사용자 정보를 바꾸는 데 실패했습니다';
+$lang['update_exists']         = '사용자 이름을 바꾸는 데 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)';
 $lang['start']                 = '시작';
 $lang['prev']                  = '이전';
 $lang['next']                  = '다음';
@@ -47,7 +46,7 @@ $lang['user_notify']           = '사용자에게 알림';
 $lang['note_notify']           = '사용자에게 새로운 비밀번호를 준 경우에만 알림 이메일이 보내집니다.';
 $lang['note_group']            = '새로운 사용자는 어떤 그룹도 설정하지 않은 경우에 기본 그룹(%s)에 추가됩니다.';
 $lang['note_pass']             = '사용자 통지가 지정되어 있을 때 필드에 아무 값도 입력하지 않으면 비밀번호가 자동으로 만들어집니다.';
-$lang['add_ok']                = '사용자가 성공적으로 추가되었습니다.';
-$lang['add_fail']              = '사용자 추가가 실패했습니다.';
-$lang['notify_ok']             = '알림 이메일이 성공적으로 발송되었습니다. ';
-$lang['notify_fail']           = '알림 이메일 발송이 실패했습니다.';
+$lang['add_ok']                = '사용자를 성공적으로 추가했습니다';
+$lang['add_fail']              = '사용자 추가를 실패했습니다';
+$lang['notify_ok']             = '알림 이메일을 성공적으로 보냈습니다';
+$lang['notify_fail']           = '알림 이메일을 보낼 수 없습니다';
diff --git a/lib/plugins/usermanager/lang/ko/list.txt b/lib/plugins/usermanager/lang/ko/list.txt
index 93fa3d6f2..2a1b45bfb 100644
--- a/lib/plugins/usermanager/lang/ko/list.txt
+++ b/lib/plugins/usermanager/lang/ko/list.txt
@@ -1 +1 @@
-===== 사용자 목록 =====
+===== 사용자 목록 =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index 8f30ce3ea..e960e9a14 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -17,7 +17,7 @@
  */
 $lang['menu']                  = 'Gebruikersmanager';
 $lang['noauth']                = '(gebruikersauthenticatie niet beschikbaar)';
-$lang['nosupport']             = '(gebruikersmanagement niet ondersteund)';
+$lang['nosupport']             = '(gebruikersbeheer niet ondersteund)';
 $lang['badauth']               = 'ongeldige authenticatiemethode';
 $lang['user_id']               = 'Gebruiker';
 $lang['user_pass']             = 'Wachtwoord';
diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php
index 285231f35..637be8860 100644
--- a/lib/plugins/usermanager/lang/pt-br/lang.php
+++ b/lib/plugins/usermanager/lang/pt-br/lang.php
@@ -16,6 +16,7 @@
  * @author Sergio Motta sergio@cisne.com.br
  * @author Isaias Masiero Filho <masiero@masiero.org>
  * @author Balaco Baco <balacobaco@imap.cc>
+ * @author Victor Westmann <victor.westmann@gmail.com>
  */
 $lang['menu']                  = 'Gerenciamento de Usuários';
 $lang['noauth']                = '(o gerenciamento de usuários não está disponível)';
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index eb9f26be6..29cee6576 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -17,6 +17,7 @@
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
  * @author Johnny Utah <pcpa@cyberpunk.su>
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php
index bd747927e..f8b530d90 100644
--- a/lib/plugins/usermanager/lang/sv/lang.php
+++ b/lib/plugins/usermanager/lang/sv/lang.php
@@ -15,6 +15,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['menu']                  = 'Hantera användare';
 $lang['noauth']                = '(användarautentisering ej tillgänlig)';
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index 1db35cc82..980d974cc 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -33,7 +33,7 @@ $lang['modify']                = '儲存變更';
 $lang['search']                = '搜尋';
 $lang['search_prompt']         = '開始搜尋';
 $lang['clear']                 = '重設篩選條件';
-$lang['filter']                = '篩選條件(Filter)';
+$lang['filter']                = '篩選條件 (Filter)';
 $lang['summary']               = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。';
 $lang['nonefound']             = '找不到帳號。共有 %d 個帳號。';
 $lang['delete_ok']             = '已刪除 %d 個帳號';
@@ -49,7 +49,7 @@ $lang['edit_usermissing']      = '找不到選取的帳號，可能已被刪除�
 $lang['user_notify']           = '通知使用者';
 $lang['note_notify']           = '通知信只會在指定使用者新密碼時寄送。';
 $lang['note_group']            = '如果沒有指定群組，新使用者將會列入至預設群組(%s)當中。';
-$lang['note_pass']             = '如果沒有輸入這個欄位而且有勾選通知使用者，則會自動產生一組密碼。';
+$lang['note_pass']             = '如果勾選了通知使用者，而沒有輸入這個欄位，則會自動產生一組密碼。';
 $lang['add_ok']                = '已新增使用者';
 $lang['add_fail']              = '無法新增使用者';
 $lang['notify_ok']             = '通知信已寄出';
diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt
index f4495bb19..1f8c2282b 100644
--- a/lib/plugins/usermanager/plugin.info.txt
+++ b/lib/plugins/usermanager/plugin.info.txt
@@ -1,7 +1,7 @@
 base   usermanager
 author Chris Smith
 email  chris@jalakai.co.uk
-date   2012-09-08
+date   2013-02-20
 name   User Manager
 desc   Manage users
 url    http://dokuwiki.org/plugin:usermanager