From b8faabb62f51d6a99c5a49b03d969db5f53d594a Mon Sep 17 00:00:00 2001 From: "sh.khmit" Date: Tue, 23 Oct 2012 18:16:42 +0200 Subject: Kazach language update --- lib/plugins/usermanager/lang/kk/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/kk/lang.php b/lib/plugins/usermanager/lang/kk/lang.php index dde5b9577..b1bbd39ec 100644 --- a/lib/plugins/usermanager/lang/kk/lang.php +++ b/lib/plugins/usermanager/lang/kk/lang.php @@ -4,3 +4,6 @@ * * @author Nurgozha Kaliaskarov astana08@gmail.com */ +$lang['user_id'] = 'Пайдаланушы'; +$lang['user_pass'] = 'Шартты белгi'; +$lang['user_mail'] = 'E-mail'; -- cgit v1.2.3 From 8036aaf2ed03c0233579841311fc9835e032e4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merc=C3=A8=20L=C3=B3pez?= Date: Tue, 23 Oct 2012 18:18:31 +0200 Subject: Spanish language update --- lib/plugins/usermanager/lang/es/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index b616857a2..521191701 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -22,6 +22,7 @@ * @author Oscar Ciudad * @author Ruben Figols * @author Gerardo Zamudio + * @author Mercè López mercelz@gmail.com */ $lang['menu'] = 'Administración de usuarios'; $lang['noauth'] = '(la autenticación de usuarios no está disponible)'; -- cgit v1.2.3 From 990578f7e4f53f6b079ceaf02dee9bd72aab1b77 Mon Sep 17 00:00:00 2001 From: AmirH Hassaneini Date: Tue, 23 Oct 2012 18:19:56 +0200 Subject: Persian language update --- lib/plugins/usermanager/lang/fa/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/fa/lang.php b/lib/plugins/usermanager/lang/fa/lang.php index 674013474..8176b776b 100644 --- a/lib/plugins/usermanager/lang/fa/lang.php +++ b/lib/plugins/usermanager/lang/fa/lang.php @@ -8,6 +8,7 @@ * @author Omid Mottaghi * @author Mohammad Reza Shoaei * @author Milad DZand + * @author AmirH Hassaneini */ $lang['menu'] = 'مدیریت کاربر'; $lang['noauth'] = '(معتبرسازی کاربر ممکن نیست)'; -- cgit v1.2.3 From d4b178ac520c38efe17d50446b8159a32ca8800c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= Date: Fri, 2 Nov 2012 15:22:45 +0100 Subject: Korean language update --- lib/plugins/usermanager/lang/ko/edit.txt | 2 +- lib/plugins/usermanager/lang/ko/lang.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/ko/edit.txt b/lib/plugins/usermanager/lang/ko/edit.txt index b8b13c5c8..ebb5bb002 100644 --- a/lib/plugins/usermanager/lang/ko/edit.txt +++ b/lib/plugins/usermanager/lang/ko/edit.txt @@ -1 +1 @@ -===== 사용자 정보 수정 ===== +===== 사용자 정보 편집 ===== diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index 3754fea90..58f9bf14a 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -35,14 +35,14 @@ $lang['summary'] = '찾은 사용자 %3$d 중 %1$d-%2$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'] = '다음'; $lang['last'] = '마지막'; -$lang['edit_usermissing'] = '선택된 사용자를 찾을 수 없습니다. 사용자 이름이 삭제되거나 변경됐을 수도 있습니다.'; +$lang['edit_usermissing'] = '선택된 사용자를 찾을 수 없습니다. 사용자 이름이 삭제되거나 바뀌었을 수도 있습니다.'; $lang['user_notify'] = '사용자에게 알림'; $lang['note_notify'] = '사용자에게 새로운 비밀번호를 준 경우에만 알림 이메일이 보내집니다.'; $lang['note_group'] = '새로운 사용자는 어떤 그룹도 설정하지 않은 경우에 기본 그룹(%s)에 추가됩니다.'; -- cgit v1.2.3 From 649ee76f050057709402fd3d70243ea537d72b27 Mon Sep 17 00:00:00 2001 From: Jakub Date: Mon, 12 Nov 2012 21:29:23 +0100 Subject: Czech language update --- lib/plugins/usermanager/lang/cs/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index 8351c190b..6de408e14 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -11,6 +11,7 @@ * @author Vojta Beran * @author zbynek.krivka@seznam.cz * @author Bohumir Zamecnik + * @author Jakub A. Těšínský (j@kub.cz) */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; -- cgit v1.2.3 From de78e4ef14515e4248d5f637558ec451e018799c Mon Sep 17 00:00:00 2001 From: Anael Mobilia Date: Mon, 12 Nov 2012 21:43:53 +0100 Subject: French language update --- lib/plugins/usermanager/lang/fr/edit.txt | 2 +- lib/plugins/usermanager/lang/fr/lang.php | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/fr/edit.txt b/lib/plugins/usermanager/lang/fr/edit.txt index ec193eb5a..e667989b4 100644 --- a/lib/plugins/usermanager/lang/fr/edit.txt +++ b/lib/plugins/usermanager/lang/fr/edit.txt @@ -1 +1 @@ -===== Modifier les informations d'un utilisateur ===== +===== Modifier l'utilisateur ===== diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index d84ff65c3..7e602d0ce 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -18,10 +18,11 @@ * @author skimpax@gmail.com * @author Yannick Aure * @author Olivier DUVAL + * @author Anael Mobilia */ $lang['menu'] = 'Gestion des utilisateurs'; -$lang['noauth'] = '(authentification utilisateur non disponible)'; -$lang['nosupport'] = '(gestion utilisateur non supportée)'; +$lang['noauth'] = '(authentification de l\'utilisateur non disponible)'; +$lang['nosupport'] = '(gestion de l\'utilisateur non supportée)'; $lang['badauth'] = 'mécanisme d\'authentification invalide'; $lang['user_id'] = 'Identifiant '; $lang['user_pass'] = 'Mot de passe '; @@ -40,20 +41,20 @@ $lang['search'] = 'Rechercher'; $lang['search_prompt'] = 'Effectuer la recherche'; $lang['clear'] = 'Réinitialiser la recherche'; $lang['filter'] = 'Filtre'; -$lang['summary'] = 'Affichage des utilisateurs %1$d-%2$d parmi %3$d trouvé(s). %4$d utilisateur(s) au total.'; -$lang['nonefound'] = 'Aucun utilisateur trouvé. %d utilisateur(s) au total.'; +$lang['summary'] = 'Affichage des utilisateurs %1$d-%2$d parmi %3$d trouvés. %4$d utilisateurs au total.'; +$lang['nonefound'] = 'Aucun utilisateur trouvé. %d utilisateurs au total.'; $lang['delete_ok'] = '%d utilisateurs effacés'; -$lang['delete_fail'] = '%d effacement échoué.'; +$lang['delete_fail'] = '%d effacements échoués.'; $lang['update_ok'] = 'Utilisateur mis à jour avec succès'; -$lang['update_fail'] = 'Échec de la mise à jour utilisateur'; -$lang['update_exists'] = 'Échec du changement de nom d\'utilisateur, le nom spécifié (%s) existe déjà (toutes les autres modifications seront effectuées).'; -$lang['start'] = 'Démarrage'; +$lang['update_fail'] = 'Échec lors de la mise à jour de l\'utilisateur'; +$lang['update_exists'] = 'Échec lors du changement du nom d\'utilisateur : le nom spécifié (%s) existe déjà (toutes les autres modifications seront effectuées).'; +$lang['start'] = 'Début'; $lang['prev'] = 'Précédent'; $lang['next'] = 'Suivant'; -$lang['last'] = 'Dernier'; +$lang['last'] = 'Fin'; $lang['edit_usermissing'] = 'Utilisateur sélectionné non trouvé, cet utilisateur a peut-être été supprimé ou modifié ailleurs.'; $lang['user_notify'] = 'Notifier l\'utilisateur '; -$lang['note_notify'] = 'Envoi de notification par courriel uniquement lorsqu\'un nouveau mot de passe est attribué à l\'utilisateur.'; +$lang['note_notify'] = 'Expédition de notification par courriel uniquement lorsque l\'utilisateur fourni un nouveau mot de passe.'; $lang['note_group'] = 'Les nouveaux utilisateurs seront ajoutés au groupe par défaut (%s) si aucun groupe n\'est spécifié.'; $lang['note_pass'] = 'Le mot de passe sera généré automatiquement si le champ est laissé vide et si la notification de l\'utilisateur est activée.'; $lang['add_ok'] = 'Utilisateur ajouté avec succès'; -- cgit v1.2.3 From 78f0e83246184ff6cb8679d086b0fa17ab508057 Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Fri, 23 Nov 2012 09:23:29 +0100 Subject: Galician language update --- lib/plugins/usermanager/lang/gl/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php index c9c633b39..fb965985f 100644 --- a/lib/plugins/usermanager/lang/gl/lang.php +++ b/lib/plugins/usermanager/lang/gl/lang.php @@ -4,6 +4,7 @@ * * @author Medúlio * @author Oscar M. Lage + * @author Leandro Regueiro */ $lang['menu'] = 'Xestor de Usuarios'; $lang['noauth'] = '(autenticación de usuarios non dispoñible)'; -- cgit v1.2.3 From 38479cbba628ee76a92ff5f3c974cfa8e6ce9e61 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 29 Nov 2012 16:06:43 +0100 Subject: some coding style improvements - removed some dead/unused code - fixed phpdoc - added typing on methods --- lib/plugins/usermanager/admin.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 30b65debb..cf8963e64 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -73,8 +73,6 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { * handle user request */ function handle() { - global $ID; - if (is_null($this->_auth)) return false; // extract the command and any specific parameters @@ -308,7 +306,6 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { function _htmlInputField($id, $name, $label, $value, $cando, $indent=0) { $class = $cando ? '' : ' class="disabled"'; - $disabled = $cando ? '' : ' disabled="disabled"'; echo str_pad('',$indent); if($name == 'userpass'){ @@ -549,7 +546,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { /** * retrieve & clean user data from the form * - * @return array(user, password, full name, email, array(groups)) + * @return array (user, password, full name, email, array(groups)) */ function _retrieveUser($clean=true) { global $auth; -- cgit v1.2.3 From 7eaa7703a43b9f22f12be04e8580a3f2515fb146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A5=E5=90=91=E5=B0=8F=E9=83=8E?= Date: Wed, 9 Jan 2013 20:30:03 +0100 Subject: Traditional Chinese language update --- lib/plugins/usermanager/lang/zh-tw/lang.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php index 23b4fdac6..1db35cc82 100644 --- a/lib/plugins/usermanager/lang/zh-tw/lang.php +++ b/lib/plugins/usermanager/lang/zh-tw/lang.php @@ -11,6 +11,7 @@ * @author Danny Lin * @author Shuo-Ting Jian * @author syaoranhinata@gmail.com + * @author Ichirou Uchiki */ $lang['menu'] = '帳號管理器'; $lang['noauth'] = '(帳號認證尚未開放)'; @@ -18,8 +19,8 @@ $lang['nosupport'] = '(尚不支援帳號管理)'; $lang['badauth'] = '錯誤的認證機制'; $lang['user_id'] = '帳號'; $lang['user_pass'] = '密碼'; -$lang['user_name'] = '真實姓名'; -$lang['user_mail'] = 'E-mail'; +$lang['user_name'] = '名稱'; +$lang['user_mail'] = '電郵'; $lang['user_groups'] = '群組'; $lang['field'] = '欄位'; $lang['value'] = '設定值'; @@ -36,10 +37,10 @@ $lang['filter'] = '篩選條件(Filter)'; $lang['summary'] = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。'; $lang['nonefound'] = '找不到帳號。共有 %d 個帳號。'; $lang['delete_ok'] = '已刪除 %d 個帳號'; -$lang['delete_fail'] = '%d 個帳號刪除失敗。'; +$lang['delete_fail'] = '%d 個帳號無法刪除。'; $lang['update_ok'] = '已更新該帳號'; -$lang['update_fail'] = '更新該帳號時失敗'; -$lang['update_exists'] = '變更帳號名稱 (%s) 失敗，因為有同名帳號存在（其他修改已套用）。'; +$lang['update_fail'] = '無法更新該帳號'; +$lang['update_exists'] = '無法變更帳號名稱 (%s) ，因為有同名帳號存在。其他修改則已套用。'; $lang['start'] = '開始'; $lang['prev'] = '上一頁'; $lang['next'] = '下一頁'; @@ -47,9 +48,9 @@ $lang['last'] = '最後一頁'; $lang['edit_usermissing'] = '找不到選取的帳號，可能已被刪除或改為其他名稱。'; $lang['user_notify'] = '通知使用者'; $lang['note_notify'] = '通知信只會在指定使用者新密碼時寄送。'; -$lang['note_group'] = '如果沒有指定群組，新使用者將會被加入到預設群組(%s)當中。'; +$lang['note_group'] = '如果沒有指定群組，新使用者將會列入至預設群組(%s)當中。'; $lang['note_pass'] = '如果沒有輸入這個欄位而且有勾選通知使用者，則會自動產生一組密碼。'; -$lang['add_ok'] = '新增使用者成功'; -$lang['add_fail'] = '新增使用者失敗'; +$lang['add_ok'] = '已新增使用者'; +$lang['add_fail'] = '無法新增使用者'; $lang['notify_ok'] = '通知信已寄出'; $lang['notify_fail'] = '通知信無法寄出'; -- cgit v1.2.3 From 187b13eb2e4f044659ad056a038b7aed65033579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B3pez=20Prat?= Date: Fri, 18 Jan 2013 10:07:50 +0100 Subject: Catalan language update --- lib/plugins/usermanager/lang/ca/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/ca/lang.php b/lib/plugins/usermanager/lang/ca/lang.php index 445556973..6debd73ca 100644 --- a/lib/plugins/usermanager/lang/ca/lang.php +++ b/lib/plugins/usermanager/lang/ca/lang.php @@ -6,6 +6,7 @@ * @author carles.bellver@gmail.com * @author carles.bellver@cent.uji.es * @author Carles Bellver + * @author daniel@6temes.cat */ $lang['menu'] = 'Gestió d\'usuaris'; $lang['noauth'] = '(l\'autenticació d\'usuaris no està disponible)'; -- cgit v1.2.3 From e6c4a8221e93692572a1e78b9319a94b5ba07a0c Mon Sep 17 00:00:00 2001 From: Erdem Date: Fri, 18 Jan 2013 10:08:48 +0100 Subject: Turkish language update --- lib/plugins/usermanager/lang/tr/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/tr/lang.php b/lib/plugins/usermanager/lang/tr/lang.php index b9c9cfc52..7ddb7dd5d 100644 --- a/lib/plugins/usermanager/lang/tr/lang.php +++ b/lib/plugins/usermanager/lang/tr/lang.php @@ -6,6 +6,7 @@ * @author Cihan Kahveci * @author Yavuz Selim * @author Caleb Maclennan + * @author farukerdemoncel@gmail.com */ $lang['menu'] = 'Kullanıcı Yönetimi'; $lang['noauth'] = '(kullanıcı onaylaması yoktur)'; -- cgit v1.2.3 From 957e84c6d04b3287613860d79d564d971531db98 Mon Sep 17 00:00:00 2001 From: Rodrigo Rega Date: Fri, 1 Feb 2013 09:37:45 +0100 Subject: Galician language update --- lib/plugins/usermanager/lang/gl/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/usermanager') 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 * @author Oscar M. Lage - * @author Leandro Regueiro + * @author Rodrigo Rega */ $lang['menu'] = 'Xestor de Usuarios'; $lang['noauth'] = '(autenticación de usuarios non dispoñible)'; -- cgit v1.2.3 From 58e982182a58f0728ae6d223fd65016aded52b46 Mon Sep 17 00:00:00 2001 From: Vasileios Karavasilis Date: Fri, 1 Feb 2013 15:41:02 +0100 Subject: Greek language update --- lib/plugins/usermanager/lang/el/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') 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 * @author George Petsagourakis * @author Petros Vidalis + * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com */ $lang['menu'] = 'Διαχείριση Χρηστών'; $lang['noauth'] = '(η είσοδος χρηστών δεν είναι δυνατή)'; -- cgit v1.2.3 From 5398a7b652eabdd0a20f154b97b60f89cad72f8c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 16 Feb 2013 19:57:01 +0100 Subject: fixed language file placeholders FS#2682 --- lib/plugins/usermanager/lang/ca-valencia/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/usermanager') 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'; -- cgit v1.2.3 From 00d58927261c5bed6f093ca4aa2064a18139a228 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Wed, 20 Feb 2013 20:26:05 +0100 Subject: Fix remaining missing $INPUT uses FS#2577 This adds $INPUT in all places where it was still missing and available. $INPUT is now also used in places where using $_REQUEST/... was okay in order to make the code consistent. --- lib/plugins/usermanager/admin.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index cf8963e64..01f4a4cdb 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,7 +354,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if ($this->_auth->canDo('modPass')){ if (empty($pass)){ - if(!empty($_REQUEST['usernotify'])){ + if($INPUT->has('usernotify')){ $pass = auth_pwgen(); } else { msg($this->lang['add_fail'], -1); @@ -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,7 +495,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } // generate password if left empty and notification is on - if(!empty($_REQUEST['usernotify']) && empty($newpass)){ + if($INPUT->has('usernotify') && empty($newpass)){ $newpass = auth_pwgen(); } @@ -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); } -- cgit v1.2.3