From 2046a6546c8ed62b9a7b33305b6201458f2f8291 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 12 Mar 2014 15:38:28 +0000 Subject: Allow user info to be retrieved without groups Some parts of dokuwiki (e.g. recent changes, old revisions) can requests lots of user info (to provide editor names) without requiring any group information. This change also implements caching of user info by authmysql & authpgsql plugins to avoid repeated querying of the DB to retrieve the same user information. --- lib/plugins/authad/auth.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index 0860e5756..a3119dda6 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -177,9 +177,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { * * @author James Van Lommel * @param string $user + * @param bool $requireGroups (optional) - ignored, groups are always supplied by this plugin * @return array */ - public function getUserData($user) { + public function getUserData($user, $requireGroups=true) { global $conf; global $lang; global $ID; -- cgit v1.2.3 From 227a9832a9d65a12d88704e2bf18db63dae1ad57 Mon Sep 17 00:00:00 2001 From: lainme Date: Tue, 13 May 2014 06:36:05 +0200 Subject: translation update --- lib/plugins/authad/lang/zh/lang.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authad/lang/zh/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/zh/lang.php b/lib/plugins/authad/lang/zh/lang.php new file mode 100644 index 000000000..2a05aa168 --- /dev/null +++ b/lib/plugins/authad/lang/zh/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = '登录域'; -- cgit v1.2.3 From 1b4623e76a474977d730f37c3c54ff1cf66489ac Mon Sep 17 00:00:00 2001 From: Mati Date: Wed, 14 May 2014 07:45:56 +0200 Subject: translation update --- lib/plugins/authad/lang/pl/settings.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php index 4e397fc98..91cadca6f 100644 --- a/lib/plugins/authad/lang/pl/settings.php +++ b/lib/plugins/authad/lang/pl/settings.php @@ -5,6 +5,7 @@ * * @author Tomasz Bosak * @author Paweł Jan Czochański + * @author Mati */ $lang['account_suffix'] = 'Przyrostek twojej nazwy konta np. @my.domain.org'; $lang['base_dn'] = 'Twoje bazowe DN. Na przykład: DC=my,DC=domain,DC=org'; -- cgit v1.2.3 From f88adfe0b3b6ae718cb4a99c6f8363042c7b0b6e Mon Sep 17 00:00:00 2001 From: PzF_X Date: Sun, 18 May 2014 13:56:03 +0200 Subject: translation update --- lib/plugins/authad/lang/ja/lang.php | 8 ++++++++ lib/plugins/authad/lang/ja/settings.php | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 lib/plugins/authad/lang/ja/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/ja/lang.php b/lib/plugins/authad/lang/ja/lang.php new file mode 100644 index 000000000..b40aa5da3 --- /dev/null +++ b/lib/plugins/authad/lang/ja/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'ログオン時のドメイン'; diff --git a/lib/plugins/authad/lang/ja/settings.php b/lib/plugins/authad/lang/ja/settings.php index f308249ef..118e8348c 100644 --- a/lib/plugins/authad/lang/ja/settings.php +++ b/lib/plugins/authad/lang/ja/settings.php @@ -5,6 +5,7 @@ * * @author Satoshi Sahara * @author Hideaki SAWADA + * @author PzF_X */ $lang['account_suffix'] = 'アカウントの接尾語。例：@my.domain.org'; $lang['base_dn'] = 'ベースDN。例：DC=my,DC=domain,DC=org'; @@ -12,6 +13,7 @@ $lang['domain_controllers'] = 'ドメインコントローラのカンマ区 $lang['admin_username'] = '全ユーザーデータへのアクセス権のある特権Active Directoryユーザー。任意ですが、メール通知の登録等の特定の動作に必要。'; $lang['admin_password'] = '上記ユーザーのパスワード'; $lang['sso'] = 'Kerberos か NTLM を使ったシングルサインオン（SSO）をしますか？'; +$lang['sso_charset'] = 'サーバーは空のUTF-8かLatin-1でKerberosかNTLMユーザネームを送信します。iconv拡張モジュールが必要です。'; $lang['real_primarygroup'] = '"Domain Users" を仮定する代わりに本当のプライマリグループを解決する（低速）'; $lang['use_ssl'] = 'SSL接続を使用しますか？使用した場合、下のSSLを有効にしないでください。'; $lang['use_tls'] = 'TLS接続を使用しますか？使用した場合、上のSSLを有効にしないでください。'; -- cgit v1.2.3 From 776b1195ea652eae3a1c5f206d5fe07f3cc2cc67 Mon Sep 17 00:00:00 2001 From: Marton Sebok Date: Tue, 20 May 2014 17:06:16 +0200 Subject: translation update --- lib/plugins/authad/lang/hu/lang.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authad/lang/hu/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/hu/lang.php b/lib/plugins/authad/lang/hu/lang.php new file mode 100644 index 000000000..7bb6084b0 --- /dev/null +++ b/lib/plugins/authad/lang/hu/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'Bejelentkezési tartomány'; -- cgit v1.2.3 From 5883ebc392a1e20e73055568ea00ad07a50caaba Mon Sep 17 00:00:00 2001 From: Murilo Date: Thu, 29 May 2014 22:05:58 +0200 Subject: translation update --- lib/plugins/authad/lang/pt/settings.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php index 45eff5e96..ef0f8f6d2 100644 --- a/lib/plugins/authad/lang/pt/settings.php +++ b/lib/plugins/authad/lang/pt/settings.php @@ -4,7 +4,9 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author André Neves + * @author Murilo */ +$lang['account_suffix'] = 'O sufixo da sua conta. Por exemplo, @my.domain.org'; $lang['admin_password'] = 'A senha para o utilizador acima.'; $lang['sso'] = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?'; $lang['use_ssl'] = 'Usar ligação SSL? Se usada, não ative TLS abaixo.'; -- cgit v1.2.3 From 3dc402767b9058811762f67a7a3a21d50e81a65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aivars=20Mi=C5=A1ka?= Date: Fri, 30 May 2014 08:30:58 +0200 Subject: translation update --- lib/plugins/authad/lang/lv/lang.php | 8 ++++++++ lib/plugins/authad/lang/lv/settings.php | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 lib/plugins/authad/lang/lv/lang.php create mode 100644 lib/plugins/authad/lang/lv/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/lv/lang.php b/lib/plugins/authad/lang/lv/lang.php new file mode 100644 index 000000000..74becf756 --- /dev/null +++ b/lib/plugins/authad/lang/lv/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'Iežurnālēšanās domēns'; diff --git a/lib/plugins/authad/lang/lv/settings.php b/lib/plugins/authad/lang/lv/settings.php new file mode 100644 index 000000000..e32e91452 --- /dev/null +++ b/lib/plugins/authad/lang/lv/settings.php @@ -0,0 +1,8 @@ + + */ +$lang['domain_controllers'] = 'Ar komatiem atdalīts domēna kontroleru saraksts. Piemēram, srv1.domain.org,srv2.domain.org'; -- cgit v1.2.3 From 6ff0365539729e7e6804d89e887c20052140cae5 Mon Sep 17 00:00:00 2001 From: Paulo Silva Date: Fri, 30 May 2014 12:06:24 +0200 Subject: translation update --- lib/plugins/authad/lang/pt/lang.php | 8 ++++++++ lib/plugins/authad/lang/pt/settings.php | 3 +++ 2 files changed, 11 insertions(+) create mode 100644 lib/plugins/authad/lang/pt/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/pt/lang.php b/lib/plugins/authad/lang/pt/lang.php new file mode 100644 index 000000000..f307bc901 --- /dev/null +++ b/lib/plugins/authad/lang/pt/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'Domínio de Início de Sessão'; diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php index ef0f8f6d2..dc60d7259 100644 --- a/lib/plugins/authad/lang/pt/settings.php +++ b/lib/plugins/authad/lang/pt/settings.php @@ -5,8 +5,11 @@ * * @author André Neves * @author Murilo + * @author Paulo Silva */ $lang['account_suffix'] = 'O sufixo da sua conta. Por exemplo, @my.domain.org'; +$lang['domain_controllers'] = 'Uma lista separada por vírgulas de Controladores de Domínio (AD DC). Ex.: srv1.domain.org,srv2.domain.org'; +$lang['admin_username'] = 'Um utilizador com privilégios na Active Directory que tenha acesso aos dados de todos os outros utilizadores. Opcional, mas necessário para certas ações como enviar emails de subscrição.'; $lang['admin_password'] = 'A senha para o utilizador acima.'; $lang['sso'] = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?'; $lang['use_ssl'] = 'Usar ligação SSL? Se usada, não ative TLS abaixo.'; -- cgit v1.2.3 From e1f856bac8f154dbb5a51c739630e38115fbbe0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aivars=20Mi=C5=A1ka?= Date: Tue, 10 Jun 2014 16:51:41 +0200 Subject: translation update --- lib/plugins/authad/lang/lv/settings.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/lv/settings.php b/lib/plugins/authad/lang/lv/settings.php index e32e91452..5272d27d0 100644 --- a/lib/plugins/authad/lang/lv/settings.php +++ b/lib/plugins/authad/lang/lv/settings.php @@ -5,4 +5,7 @@ * * @author Aivars Miška */ +$lang['account_suffix'] = 'Jūsu konta sufikss. Piemēram, @my.domain.org'; $lang['domain_controllers'] = 'Ar komatiem atdalīts domēna kontroleru saraksts. Piemēram, srv1.domain.org,srv2.domain.org'; +$lang['admin_password'] = 'Minētā lietotāja parole.'; +$lang['expirywarn'] = 'Cik dienas iepriekš brīdināt lietotāju par paroles termiņa beigām. Ierakstīt 0, lai atspējotu.'; -- cgit v1.2.3 From 19accab588843292613a1e12b22b773f07b511ba Mon Sep 17 00:00:00 2001 From: Davor Turkalj Date: Thu, 10 Jul 2014 13:46:11 +0200 Subject: translation update --- lib/plugins/authad/lang/hr/lang.php | 8 ++++++++ lib/plugins/authad/lang/hr/settings.php | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 lib/plugins/authad/lang/hr/lang.php create mode 100644 lib/plugins/authad/lang/hr/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/hr/lang.php b/lib/plugins/authad/lang/hr/lang.php new file mode 100644 index 000000000..f750c91b5 --- /dev/null +++ b/lib/plugins/authad/lang/hr/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'Domena za prijavu'; diff --git a/lib/plugins/authad/lang/hr/settings.php b/lib/plugins/authad/lang/hr/settings.php new file mode 100644 index 000000000..a024b10b7 --- /dev/null +++ b/lib/plugins/authad/lang/hr/settings.php @@ -0,0 +1,20 @@ + + */ +$lang['account_suffix'] = 'Vaš sufiks korisničkog imena. Npr. @my.domain.org'; +$lang['base_dn'] = 'Vaš bazni DN. Npr. DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'Zarezom odvojena lista domenskih kontrolera. Npr. srv1.domain.org,srv2.domain.org'; +$lang['admin_username'] = 'Privilegirani korisnik Active Directory-a s pristupom svim korisničkim podacima. Opcionalno, ali potrebno za određene akcije kao što je slanje pretplatničkih poruka.'; +$lang['admin_password'] = 'Lozinka gore navedenoga korisnika.'; +$lang['sso'] = 'Da li će Single-Sign-On prijava biti korištena preko Kerberosa ili NTLM-a?'; +$lang['sso_charset'] = 'Znakovni set koji će se koristiti Kerberos ili NTLM pri slanju imena korisnika. Prazno za UTF-8 ili latin-1. Zahtjeva iconv ekstenziju.'; +$lang['real_primarygroup'] = 'Da li da se razluči stvarna primarna grupa umjesto pretpostavke da je to "Domain Users" (sporije !).'; +$lang['use_ssl'] = 'Koristi SSL vezu? Ako da, dolje ne koristi TLS!'; +$lang['use_tls'] = 'Koristi TLS vezu? Ako da, gore ne koristi SSL!'; +$lang['debug'] = 'Prikaži dodatni debug ispis u slučaju greške? '; +$lang['expirywarn'] = 'Upozori korisnike o isteku lozinke ovoliko dana. 0 za onemogućavanje. '; +$lang['additional'] = 'Zarezom odvojena lista dodatnih AD atributa koji se dohvaćaju iz korisničkih podataka. Koristi se u nekim dodatcima (plugin).'; -- cgit v1.2.3 From 75112fc56c5237220d4fe1b104317f62eda8a561 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 2 Aug 2014 12:19:38 +0100 Subject: updated dates in info.txt of various plugins and template --- lib/plugins/authad/plugin.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt index 8774fcf3c..dc0629189 100644 --- a/lib/plugins/authad/plugin.info.txt +++ b/lib/plugins/authad/plugin.info.txt @@ -1,7 +1,7 @@ base authad author Andreas Gohr email andi@splitbrain.org -date 2014-02-14 +date 2014-04-03 name Active Directory Auth Plugin desc Provides user authentication against a Microsoft Active Directory url http://www.dokuwiki.org/plugin:authad -- cgit v1.2.3 From 682adb32603ee80c53e533a0c0dbde18ade4a8fc Mon Sep 17 00:00:00 2001 From: Hamid Date: Mon, 18 Aug 2014 00:11:29 +0200 Subject: translation update --- lib/plugins/authad/lang/fa/lang.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authad/lang/fa/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/fa/lang.php b/lib/plugins/authad/lang/fa/lang.php new file mode 100644 index 000000000..1ea73cfdb --- /dev/null +++ b/lib/plugins/authad/lang/fa/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'دامنه‌ی ورود'; -- cgit v1.2.3 From 1349d49f50efbb15c0d6fff1f9d2a0e85b9d2df0 Mon Sep 17 00:00:00 2001 From: Felipe Castro Date: Wed, 27 Aug 2014 14:21:01 +0200 Subject: translation update --- lib/plugins/authad/lang/pt-br/lang.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authad/lang/pt-br/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/pt-br/lang.php b/lib/plugins/authad/lang/pt-br/lang.php new file mode 100644 index 000000000..5fa963d4e --- /dev/null +++ b/lib/plugins/authad/lang/pt-br/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'Domínio de "Logon"'; -- cgit v1.2.3 From 505d947e52392dcc03b5d45fb8c441288d1258e0 Mon Sep 17 00:00:00 2001 From: June-Hao Hou Date: Sat, 13 Sep 2014 10:26:06 +0200 Subject: translation update --- lib/plugins/authad/lang/zh-tw/lang.php | 8 ++++++++ lib/plugins/authad/lang/zh-tw/settings.php | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 lib/plugins/authad/lang/zh-tw/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/zh-tw/lang.php b/lib/plugins/authad/lang/zh-tw/lang.php new file mode 100644 index 000000000..6ad0947a2 --- /dev/null +++ b/lib/plugins/authad/lang/zh-tw/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = '登入網域'; diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php index bd5d9413a..42cd8c96b 100644 --- a/lib/plugins/authad/lang/zh-tw/settings.php +++ b/lib/plugins/authad/lang/zh-tw/settings.php @@ -4,6 +4,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author syaoranhinata@gmail.com + * @author June-Hao Hou */ $lang['account_suffix'] = '您的帳號後綴。如： @my.domain.org'; $lang['base_dn'] = '您的基本識別名。如： DC=my,DC=domain,DC=org'; @@ -11,6 +12,7 @@ $lang['domain_controllers'] = '以逗號分隔的域名控制器列表。如 $lang['admin_username'] = 'Active Directory 的特權使用者，可以查看所有使用者的數據。(非必要，但對發送訂閱郵件等活動來說，這是必須的。)'; $lang['admin_password'] = '上述使用者的密碼。'; $lang['sso'] = '是否使用 Kerberos 或 NTLM 的單一登入系統 (Single-Sign-On)？'; +$lang['sso_charset'] = '你的網站伺服器傳遞 Kerberos 或 NTML 帳號名稱所用的語系編碼。空白表示 UTF-8 或 latin-1。此設定需要用到 iconv 套件。'; $lang['real_primarygroup'] = '是否視作真正的主要群組，而不是假設為網域使用者 (比較慢)'; $lang['use_ssl'] = '使用 SSL 連接嗎？如果要使用，請不要啟用下方的 TLS。'; $lang['use_tls'] = '使用 TLS 連接嗎？如果要使用，請不要啟用上方的 SSL。'; -- cgit v1.2.3 From 2c99198de3e2c36f9df1cd8897770ced395e3b8a Mon Sep 17 00:00:00 2001 From: Jaroslav Lichtblau Date: Sat, 20 Sep 2014 11:21:00 +0200 Subject: translation update --- lib/plugins/authad/lang/cs/lang.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authad/lang/cs/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/cs/lang.php b/lib/plugins/authad/lang/cs/lang.php new file mode 100644 index 000000000..8119d208a --- /dev/null +++ b/lib/plugins/authad/lang/cs/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'Přihlašovací doména'; -- cgit v1.2.3 From 7ce0a39ec99d93aee3df09ad19d53d6804e27c1c Mon Sep 17 00:00:00 2001 From: Mohamed Belhsine Date: Mon, 22 Sep 2014 15:01:29 +0200 Subject: translation update --- lib/plugins/authad/lang/ar/lang.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authad/lang/ar/lang.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/ar/lang.php b/lib/plugins/authad/lang/ar/lang.php new file mode 100644 index 000000000..e0ba7681a --- /dev/null +++ b/lib/plugins/authad/lang/ar/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'مجال تسجيل الدخول'; -- cgit v1.2.3