From 940dbfe468f779c7c88783a4cecb82c4dc97143b Mon Sep 17 00:00:00 2001 From: Gerrit Date: Sun, 26 Aug 2012 17:02:19 +0200 Subject: Dutch language update --- lib/plugins/usermanager/lang/nl/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index b00ab22e0..8f30ce3ea 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -13,6 +13,7 @@ * @author Timon Van Overveldt * @author Jeroen * @author Ricardo Guijt + * @author Gerrit */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; -- cgit v1.2.3 From ccde6bdb157feb12f49179992c01e6b5d0cc997c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A5=E5=90=91=E5=B0=8F=E9=83=8E?= Date: Fri, 7 Sep 2012 00:07:25 +0200 Subject: Traditional Chinese language update --- lib/plugins/usermanager/lang/zh-tw/intro.txt | 2 +- lib/plugins/usermanager/lang/zh-tw/lang.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/zh-tw/intro.txt b/lib/plugins/usermanager/lang/zh-tw/intro.txt index 8f9488d7d..32ccf6fad 100644 --- a/lib/plugins/usermanager/lang/zh-tw/intro.txt +++ b/lib/plugins/usermanager/lang/zh-tw/intro.txt @@ -1 +1 @@ -====== 帳號管理員 ====== +====== 帳號管理器 ====== diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php index 5cb20aae8..23b4fdac6 100644 --- a/lib/plugins/usermanager/lang/zh-tw/lang.php +++ b/lib/plugins/usermanager/lang/zh-tw/lang.php @@ -10,8 +10,9 @@ * @author Cheng-Wei Chien * @author Danny Lin * @author Shuo-Ting Jian + * @author syaoranhinata@gmail.com */ -$lang['menu'] = '帳號管理員'; +$lang['menu'] = '帳號管理器'; $lang['noauth'] = '(帳號認證尚未開放)'; $lang['nosupport'] = '(尚不支援帳號管理)'; $lang['badauth'] = '錯誤的認證機制'; @@ -35,8 +36,8 @@ $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['update_ok'] = '成功更新該帳號'; +$lang['delete_fail'] = '%d 個帳號刪除失敗。'; +$lang['update_ok'] = '已更新該帳號'; $lang['update_fail'] = '更新該帳號時失敗'; $lang['update_exists'] = '變更帳號名稱 (%s) 失敗，因為有同名帳號存在（其他修改已套用）。'; $lang['start'] = '開始'; -- cgit v1.2.3 From 0e65a4846cba3dee39cbd53b702a833788e6fec0 Mon Sep 17 00:00:00 2001 From: Gerardo Zamudio Date: Fri, 7 Sep 2012 00:14:27 +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 c12b77b3d..b616857a2 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -21,6 +21,7 @@ * @author emezeta * @author Oscar Ciudad * @author Ruben Figols + * @author Gerardo Zamudio */ $lang['menu'] = 'Administración de usuarios'; $lang['noauth'] = '(la autenticación de usuarios no está disponible)'; -- cgit v1.2.3 From 05be3a57144498a28e918684364813560623a898 Mon Sep 17 00:00:00 2001 From: Olivier Duval Date: Fri, 7 Sep 2012 12:22:53 +0200 Subject: French language update --- lib/plugins/usermanager/lang/fr/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 882312820..d84ff65c3 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -17,6 +17,7 @@ * @author schplurtz@laposte.net * @author skimpax@gmail.com * @author Yannick Aure + * @author Olivier DUVAL */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; -- cgit v1.2.3 From fbfbbe8a285a488c3feab53f47a9216fdd999a42 Mon Sep 17 00:00:00 2001 From: Hakan Sandell Date: Sat, 8 Sep 2012 15:06:21 +0200 Subject: Replacing $_REQUEST variables with $INPUT wrapper, usermanager plugin --- lib/plugins/usermanager/admin.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 2bb0a863d..30b65debb 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -553,12 +553,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { */ function _retrieveUser($clean=true) { global $auth; + global $INPUT; - $user[0] = ($clean) ? $auth->cleanUser($_REQUEST['userid']) : $_REQUEST['userid']; - $user[1] = $_REQUEST['userpass']; - $user[2] = $_REQUEST['username']; - $user[3] = $_REQUEST['usermail']; - $user[4] = explode(',',$_REQUEST['usergroups']); + $user[0] = ($clean) ? $auth->cleanUser($INPUT->str('userid')) : $INPUT->str('userid'); + $user[1] = $INPUT->str('userpass'); + $user[2] = $INPUT->str('username'); + $user[3] = $INPUT->str('usermail'); + $user[4] = explode(',',$INPUT->str('usergroups')); $user[4] = array_map('trim',$user[4]); if($clean) $user[4] = array_map(array($auth,'cleanGroup'),$user[4]); @@ -584,9 +585,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } function _retrieveFilter() { + global $INPUT; - $t_filter = $_REQUEST['filter']; - if (!is_array($t_filter)) return array(); + $t_filter = $INPUT->arr('filter'); // messy, but this way we ensure we aren't getting any additional crap from malicious users $filter = array(); -- cgit v1.2.3 From 8628c4fa004048e67f75cd638b6be0b26fe3132c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 9 Sep 2012 13:07:50 +0100 Subject: updated (and added missing) info.txt files --- lib/plugins/usermanager/plugin.info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt index 7ec5fafd5..b09e549bf 100644 --- a/lib/plugins/usermanager/plugin.info.txt +++ b/lib/plugins/usermanager/plugin.info.txt @@ -1,6 +1,6 @@ author Chris Smith email chris@jalakai.co.uk -date 2008-09-17 +date 2012-09-08 name User Manager -desc Manage users +desc Manage users url http://dokuwiki.org/plugin:usermanager -- cgit v1.2.3 From 0c2e484f96dbcda5e5d13f3d278a925f9a401fc7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 9 Sep 2012 13:31:39 +0100 Subject: added missing info.txt parameters, added plugin plugin's info.txt, adjusted old default template's description --- lib/plugins/usermanager/plugin.info.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt index b09e549bf..f4495bb19 100644 --- a/lib/plugins/usermanager/plugin.info.txt +++ b/lib/plugins/usermanager/plugin.info.txt @@ -1,3 +1,4 @@ +base usermanager author Chris Smith email chris@jalakai.co.uk date 2012-09-08 -- cgit v1.2.3 From b9eadad04203ceb9b25fba98db5b56780b75b44e Mon Sep 17 00:00:00 2001 From: Edmondo Di Tucci Date: Fri, 21 Sep 2012 12:48:08 +0200 Subject: Italian language update --- lib/plugins/usermanager/lang/it/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php index 1e948baab..0222ff1e4 100644 --- a/lib/plugins/usermanager/lang/it/lang.php +++ b/lib/plugins/usermanager/lang/it/lang.php @@ -13,6 +13,7 @@ * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta * @author Matteo Pasotti + * @author snarchio@gmail.com */ $lang['menu'] = 'Gestione Utenti'; $lang['noauth'] = '(autenticazione non disponibile)'; -- cgit v1.2.3 From 3046a46462b44f28b1e5b1b25240a8ac4a859020 Mon Sep 17 00:00:00 2001 From: Zigor Astarbe Date: Sun, 7 Oct 2012 09:46:58 +0200 Subject: Basque language update --- lib/plugins/usermanager/lang/eu/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/usermanager') diff --git a/lib/plugins/usermanager/lang/eu/lang.php b/lib/plugins/usermanager/lang/eu/lang.php index b6e04f7c4..5d3a01fc7 100644 --- a/lib/plugins/usermanager/lang/eu/lang.php +++ b/lib/plugins/usermanager/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi + * @author Zigor Astarbe */ $lang['menu'] = 'Erabiltzaile Kudeatzailea'; $lang['noauth'] = '(erabiltzaile kautotzea ez dago erabilgarri)'; -- cgit v1.2.3 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