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/authad/auth.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index f651d87a1..6c49eafbb 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -71,6 +71,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { * Constructor */ public function __construct() { + global $INPUT; parent::__construct(); // we load the config early to modify it a bit here @@ -99,8 +100,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { // we need to simulate a login if(empty($_COOKIE[DOKU_COOKIE])) { - $_REQUEST['u'] = $_SERVER['REMOTE_USER']; - $_REQUEST['p'] = 'sso_only'; + $INPUT->set('u', $_SERVER['REMOTE_USER']); + $INPUT->set('p', 'sso_only'); } } -- cgit v1.2.3 From d00152be83dd30024aa5dd89b9ad9a70eb25d80f Mon Sep 17 00:00:00 2001 From: Lorenzo Radaelli Date: Sun, 24 Feb 2013 10:36:18 +0100 Subject: Italian language update --- lib/plugins/authad/lang/it/settings.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 lib/plugins/authad/lang/it/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php new file mode 100644 index 000000000..10ae72f87 --- /dev/null +++ b/lib/plugins/authad/lang/it/settings.php @@ -0,0 +1,5 @@ + Date: Sun, 24 Feb 2013 10:37:45 +0100 Subject: Simplified Chinese language update --- lib/plugins/authad/lang/zh/settings.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lib/plugins/authad/lang/zh/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php new file mode 100644 index 000000000..9fd3c4e35 --- /dev/null +++ b/lib/plugins/authad/lang/zh/settings.php @@ -0,0 +1,18 @@ + + */ +$lang['account_suffix'] = '您的账户后缀。例如 @my.domain.org'; +$lang['base_dn'] = '您的基本分辨名。例如 DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = '逗号分隔的域名控制器列表。例如 srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = '一个活动目录的特权用户，可以查看其他所有用户的数据。可选，但对某些活动例如发送订阅邮件是必须的。'; +$lang['ad_password'] = '上述用户的密码。'; +$lang['sso'] = '是否使用经由 Kerberos 和 NTLM 的 Single-Sign-On？'; +$lang['real_primarygroup'] = ' 是否解析真实的主要组，而不是假设为“域用户” (较慢)'; +$lang['use_ssl'] = '使用 SSL 连接？如果是，不要激活下面的 TLS。'; +$lang['use_tls'] = '使用 TLS 连接？如果是 ，不要激活上面的 SSL。'; +$lang['debug'] = '有错误时显示额外的调试信息？'; +$lang['expirywarn'] = '提前多少天警告用户密码即将到期。0 则禁用。'; +$lang['additional'] = '需要从用户数据中获取的额外 AD 属性的列表，以逗号分隔。用于某些插件。'; -- cgit v1.2.3 From 03583750eb3b0245839ba46c1b1fb25eac66f3a0 Mon Sep 17 00:00:00 2001 From: Kiril LastName Date: Wed, 6 Mar 2013 23:10:47 +0200 Subject: Bulgarian language update --- lib/plugins/authad/lang/bg/settings.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lib/plugins/authad/lang/bg/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/bg/settings.php b/lib/plugins/authad/lang/bg/settings.php new file mode 100644 index 000000000..d63331078 --- /dev/null +++ b/lib/plugins/authad/lang/bg/settings.php @@ -0,0 +1,18 @@ + + */ +$lang['account_suffix'] = 'Наставка на акаунта Ви. Например @някакъв.домейн.org'; +$lang['base_dn'] = 'Вашият основен DN. Например DC=моят,DC=домейн,DC=org'; +$lang['domain_controllers'] = 'Domain controller списък, разделете сървърите със запетая. Например сървър1.домейн.org,сървър2.домейн.org'; +$lang['ad_username'] = 'Привилегирован Active Directory потребител с достъп до данните на останалите потребители. Не е задължително, но е необходимо за някои функционалности като изпращането на имейл за абонаменти.'; +$lang['ad_password'] = 'Паролата на горния потребител.'; +$lang['sso'] = 'Да се ползва ли еднократно вписване чрез Kerberos или NTLM?'; +$lang['real_primarygroup'] = 'Да се извлича ли истинската група вместо да се предполага "Domain Users" (по-бавно)'; +$lang['use_ssl'] = 'Ползване на SSL свързаност? Не отбелязвайте TLS (по-долу) ако включите опцията.'; +$lang['use_tls'] = 'Ползване на TLS свързаност? Не отбелязвайте SSL (по-горе) ако включите опцията.'; +$lang['debug'] = 'Показване на допълнителна debug информация при грешка?'; +$lang['expirywarn'] = 'Предупреждаване на потребителите Х дни преди изтичане валидността на паролата им. Въведете 0 за изключване.'; +$lang['additional'] = 'Списък с допълнителни AD атрибути за извличане от потребителските данни (разделяйте ги със запетая). Ползва се от няколко приставки.'; \ No newline at end of file -- cgit v1.2.3 From 5b84f8e9c9749b424f3813f7126245330a7deb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A5=E5=90=91=E5=B0=8F=E9=83=8E?= Date: Mon, 11 Mar 2013 15:33:07 +0100 Subject: Traditional chinese language update --- lib/plugins/authad/lang/zh-tw/settings.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lib/plugins/authad/lang/zh-tw/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php new file mode 100644 index 000000000..e38a2c007 --- /dev/null +++ b/lib/plugins/authad/lang/zh-tw/settings.php @@ -0,0 +1,18 @@ +@my.domain.org'; +$lang['base_dn'] = '您的基本識別名。如： DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = '以逗號分隔的域名控制器列表。如： srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = 'Active Directory 的特權使用者，可以查看所有使用者的數據。(非必要，但對發送訂閱郵件等活動來說，這是必須的。)'; +$lang['ad_password'] = '上述使用者的密碼。'; +$lang['sso'] = '是否使用 Kerberos 或 NTLM 的單一登入系統 (Single-Sign-On)？'; +$lang['real_primarygroup'] = '是否視作真正的主要群組，而不是假設為網域使用者 (比較慢)'; +$lang['use_ssl'] = '使用 SSL 連接嗎？如果要使用，請不要啟用下方的 TLS。'; +$lang['use_tls'] = '使用 TLS 連接嗎？如果要使用，請不要啟用上方的 SSL。'; +$lang['debug'] = '有錯誤時，顯示額外除錯資訊嗎？'; +$lang['expirywarn'] = '提前多少天警告使用者密碼即將到期。輸入0表示停用。'; +$lang['additional'] = '從使用者數據中取得額外 AD 屬性列表，以供某些附加元件使用。列表以逗號分隔。'; -- cgit v1.2.3 From df60eba1d79b8a3e9a5dda87cb3466f0b7b9d454 Mon Sep 17 00:00:00 2001 From: Bruno Veilleux Date: Mon, 11 Mar 2013 15:34:55 +0100 Subject: French language update --- lib/plugins/authad/lang/fr/settings.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lib/plugins/authad/lang/fr/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php new file mode 100644 index 000000000..efbca89f9 --- /dev/null +++ b/lib/plugins/authad/lang/fr/settings.php @@ -0,0 +1,18 @@ + + */ +$lang['account_suffix'] = 'Le suffixe de votre compte. Ex.: @mon.domaine.org'; +$lang['base_dn'] = 'Votre nom de domaine de base. DC=mon,DC=domaine,DC=org'; +$lang['domain_controllers'] = 'Une liste de contrôleurs de domaine séparés par des virgules. Ex.: srv1.domaine.org,srv2.domaine.org'; +$lang['ad_username'] = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.'; +$lang['ad_password'] = 'Le mot de passe de l\'utilisateur ci-dessus.'; +$lang['sso'] = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?'; +$lang['real_primarygroup'] = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?'; +$lang['use_ssl'] = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.'; +$lang['use_tls'] = 'Utiliser une connexion TLS? Si utilisée, n\'activez pas SSL ci-dessus.'; +$lang['debug'] = 'Afficher des informations de débogage supplémentaires pour les erreurs?'; +$lang['expirywarn'] = 'Jours d\'avance pour l\'avertissement envoyé aux utilisateurs lorsque leur mot de passe va expirer. 0 pour désactiver.'; +$lang['additional'] = 'Une liste séparée par des virgules d\'attributs AD supplémentaires à récupérer dans les données utilisateur. Utilisée par certains modules.'; -- cgit v1.2.3 From 421bfa826519712385983d37cb67a4f69b918674 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Mon, 11 Mar 2013 15:37:25 +0100 Subject: Esperanto language update --- lib/plugins/authad/lang/eo/settings.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 lib/plugins/authad/lang/eo/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/eo/settings.php b/lib/plugins/authad/lang/eo/settings.php new file mode 100644 index 000000000..85a6abd98 --- /dev/null +++ b/lib/plugins/authad/lang/eo/settings.php @@ -0,0 +1,17 @@ +@mia.domajno.lando'; +$lang['base_dn'] = 'Via baza DN, ekz. DC=mia,DC=domajno,DC=lando'; +$lang['domain_controllers'] = 'Komodisigita listo de domajno-serviloj, ekz. srv1.domajno.lando,srv2.domajno.lando'; +$lang['ad_username'] = 'Privilegiita Aktiv-Dosieruja uzanto kun aliro al ĉiuj uzantaj datumoj. Libervole, sed necesa por iuj agadoj kiel sendi abonan retpoŝton.'; +$lang['ad_password'] = 'La pasvorto de tiu uzanto.'; +$lang['sso'] = 'Ĉu uzi Sola Aliro tra Kerberos aŭ NTLM?'; +$lang['real_primarygroup'] = 'Ĉu trovi la veran ĉefan grupon anstataŭ supozi "Domajnuzantoj" (pli malrapida)?'; +$lang['use_ssl'] = 'Ĉu uzi SSL-konekton? Se jes, ne aktivigu TLS sube.'; +$lang['use_tls'] = 'Ĉu uzi TLS-konekton? Se jes, ne aktivigu SSL supre.'; +$lang['debug'] = 'Ĉu montri aldonajn informojn dum eraroj?'; +$lang['expirywarn'] = 'Tagoj da antaŭaverto pri malvalidiĝonta pasvorto. 0 por malebligi.'; +$lang['additional'] = 'Komodisigita listo de aldonaj AD-atributoj por preni el uzantaj datumoj. Uzita de iuj kromaĵoj.'; -- cgit v1.2.3 From e20faad8330af3e6f2edbd6e8dc3f70c05305492 Mon Sep 17 00:00:00 2001 From: Victor Westmann Date: Sun, 24 Mar 2013 10:28:51 +0100 Subject: Brazilian Portuguese language update --- lib/plugins/authad/lang/pt-br/settings.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 lib/plugins/authad/lang/pt-br/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/pt-br/settings.php b/lib/plugins/authad/lang/pt-br/settings.php new file mode 100644 index 000000000..b8b1efd42 --- /dev/null +++ b/lib/plugins/authad/lang/pt-br/settings.php @@ -0,0 +1,16 @@ + + */ +$lang['account_suffix'] = 'Sufixo de sua conta. Eg. @meu.domínio.org'; +$lang['base_dn'] = 'Sua base DN. Eg. DC=meu,DC=domínio,DC=org'; +$lang['domain_controllers'] = 'Uma lista de controles de domínios separada por vírgulas. Eg. srv1.domínio.org,srv2.domínio.org'; +$lang['ad_password'] = 'A senha do usuário acima.'; +$lang['sso'] = 'Usar Single-Sign-On através do Kerberos ou NTLM?'; +$lang['use_ssl'] = 'Usar conexão SSL? Se usar, não habilitar TLS abaixo.'; +$lang['use_tls'] = 'Usar conexão TLS? se usar, não habilitar SSL acima.'; +$lang['debug'] = 'Mostrar saída adicional de depuração em mensagens de erros?'; +$lang['expirywarn'] = 'Dias com antecedência para avisar o usuário de uma senha que vai expirar. 0 para desabilitar.'; +$lang['additional'] = 'Uma lista separada de vírgulas de atributos adicionais AD para pegar dados de usuários. Usados por alguns plugins.'; -- cgit v1.2.3 From 14bc69e3e1db81c4d329a140cb0e095f0dcf9b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= Date: Sun, 24 Mar 2013 10:30:58 +0100 Subject: Korean language update --- lib/plugins/authad/lang/ko/settings.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 lib/plugins/authad/lang/ko/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/ko/settings.php b/lib/plugins/authad/lang/ko/settings.php new file mode 100644 index 000000000..31071e9a3 --- /dev/null +++ b/lib/plugins/authad/lang/ko/settings.php @@ -0,0 +1,14 @@ + + */ +$lang['account_suffix'] = '계정 접미어. 예를 들어 @my.domain.org'; +$lang['base_dn'] = '기본 DN. 예를 들어 DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = '도메인 컨트롤러의 쉼표로 구분한 목록입니다. 예를 들어 srv1.domain.org,srv2.domain.org'; +$lang['ad_password'] = '위 사용자의 비밀번호입니다.'; +$lang['sso'] = 'Kerberos나 NTLM을 통해 Single-Sign-On을 사용해야 합니까?'; +$lang['use_ssl'] = 'SSL 연결을 사용합니까? 사용한다면 아래 TLS을 활성화하지 마세요.'; +$lang['use_tls'] = 'TLS 연결을 사용합니까? 사용한다면 위 SSL을 활성화하지 마세요.'; +$lang['debug'] = '오류에 대한 추가적인 디버그 정보를 보이겠습니까?'; -- cgit v1.2.3 From f2b500f5e7be771601ea1b1bc110337883d7caf2 Mon Sep 17 00:00:00 2001 From: Frank Loizzi Date: Sun, 24 Mar 2013 10:32:26 +0100 Subject: German (informal) language update --- lib/plugins/authad/lang/de-informal/settings.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lib/plugins/authad/lang/de-informal/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php new file mode 100644 index 000000000..da33a2e98 --- /dev/null +++ b/lib/plugins/authad/lang/de-informal/settings.php @@ -0,0 +1,18 @@ + + */ +$lang['account_suffix'] = 'Ihre Kontoendung. Z.B. @my.domain.org'; +$lang['base_dn'] = 'Ihre base DN. Z.B. DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'Eine kommaseparierte Liste von Domänenkontrollern. Z.B. srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = 'Ein priviligierter Active Directory Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional aber benötigt für einige Aktionen wie das Senden von Mitglieder E-Mails.'; +$lang['ad_password'] = 'Das Passwort des obigen Benutzers.'; +$lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; +$lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; +$lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.'; +$lang['use_tls'] = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.'; +$lang['debug'] = 'Zusätzliche Debug-Informationen bei Fehlern anzeigen?'; +$lang['expirywarn'] = 'Tage im Voraus um Benutzer über ablaufende Passwörter zu informieren. 0 zum Ausschalten.'; +$lang['additional'] = 'Eine kommaseparierte Liste von zusätzlichen AD Attributen von den Benutzdedaten abrufen. Wird von einigen Plugins benutzt.'; -- cgit v1.2.3 From 939baf40725d16e0cd929a9dadbf12ae6b0412c6 Mon Sep 17 00:00:00 2001 From: senorandy Date: Tue, 26 Mar 2013 10:14:44 +0100 Subject: Update default.php Wihtout this, unable to fetch any AD info.. also allows SSO. --- lib/plugins/authad/conf/default.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php index 05d6c328e..9274db209 100644 --- a/lib/plugins/authad/conf/default.php +++ b/lib/plugins/authad/conf/default.php @@ -4,11 +4,11 @@ $conf['account_suffix'] = ''; $conf['base_dn'] = ''; $conf['domain_controllers'] = ''; $conf['sso'] = 0; -$conf['ad_username'] = ''; -$conf['ad_password'] = ''; +$conf['admin_username'] = ''; +$conf['admin_password'] = ''; $conf['real_primarygroup'] = 0; $conf['use_ssl'] = 0; $conf['use_tls'] = 0; $conf['debug'] = 0; $conf['expirywarn'] = 0; -$conf['additional'] = ''; \ No newline at end of file +$conf['additional'] = ''; -- cgit v1.2.3 From 0bb7340a11736568d7b537dfca36e52d5032c193 Mon Sep 17 00:00:00 2001 From: senorandy Date: Tue, 26 Mar 2013 10:15:31 +0100 Subject: Update metadata.php Without this unable to access AD info. Also allows SSO. --- lib/plugins/authad/conf/metadata.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/conf/metadata.php b/lib/plugins/authad/conf/metadata.php index dc251a108..fbc3f163c 100644 --- a/lib/plugins/authad/conf/metadata.php +++ b/lib/plugins/authad/conf/metadata.php @@ -4,11 +4,11 @@ $meta['account_suffix'] = array('string'); $meta['base_dn'] = array('string'); $meta['domain_controllers'] = array('string'); $meta['sso'] = array('onoff'); -$meta['ad_username'] = array('string'); -$meta['ad_password'] = array('password'); +$meta['admin_username'] = array('string'); +$meta['admin_password'] = array('password'); $meta['real_primarygroup'] = array('onoff'); $meta['use_ssl'] = array('onoff'); $meta['use_tls'] = array('onoff'); $meta['debug'] = array('onoff'); $meta['expirywarn'] = array('numeric', '_min'=>0); -$meta['additional'] = array('string'); \ No newline at end of file +$meta['additional'] = array('string'); -- cgit v1.2.3 From 3bca6c65969446444ec4e8945d670c815b6ba066 Mon Sep 17 00:00:00 2001 From: senorandy Date: Tue, 26 Mar 2013 10:16:05 +0100 Subject: Update settings.php --- lib/plugins/authad/lang/en/settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/en/settings.php b/lib/plugins/authad/lang/en/settings.php index 41176847a..7728d5ac4 100644 --- a/lib/plugins/authad/lang/en/settings.php +++ b/lib/plugins/authad/lang/en/settings.php @@ -3,12 +3,12 @@ $lang['account_suffix'] = 'Your account suffix. Eg. @my.domain.org'; $lang['base_dn'] = 'Your base DN. Eg. DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = 'A comma separated list of Domain controllers. Eg. srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.'; -$lang['ad_password'] = 'The password of the above user.'; +$lang['admin_username'] = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.'; +$lang['admin_password'] = 'The password of the above user.'; $lang['sso'] = 'Should Single-Sign-On via Kerberos or NTLM be used?'; $lang['real_primarygroup'] = 'Should the real primary group be resolved instead of assuming "Domain Users" (slower)'; $lang['use_ssl'] = 'Use SSL connection? If used, do not enable TLS below.'; $lang['use_tls'] = 'Use TLS connection? If used, do not enable SSL above.'; $lang['debug'] = 'Display additional debugging output on errors?'; $lang['expirywarn'] = 'Days in advance to warn user about expiring password. 0 to disable.'; -$lang['additional'] = 'A comma separated list of additional AD attributes to fetch from user data. Used by some plugins.'; \ No newline at end of file +$lang['additional'] = 'A comma separated list of additional AD attributes to fetch from user data. Used by some plugins.'; -- cgit v1.2.3 From f6af1fe63a13b2734d1b69817ec800c51e6def9c Mon Sep 17 00:00:00 2001 From: lupo49 Date: Sun, 31 Mar 2013 20:40:03 +0200 Subject: de/de-informal: language updates for the core, authldap, authmysql, authpgsql --- lib/plugins/authad/lang/de-informal/settings.php | 11 ++++++----- lib/plugins/authad/lang/de/settings.php | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 lib/plugins/authad/lang/de/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php index da33a2e98..f6ba679ff 100644 --- a/lib/plugins/authad/lang/de-informal/settings.php +++ b/lib/plugins/authad/lang/de-informal/settings.php @@ -3,11 +3,12 @@ * German (informal) language file * * @author Frank Loizzi + * @author Matthias Schulte */ -$lang['account_suffix'] = 'Ihre Kontoendung. Z.B. @my.domain.org'; -$lang['base_dn'] = 'Ihre base DN. Z.B. DC=my,DC=domain,DC=org'; -$lang['domain_controllers'] = 'Eine kommaseparierte Liste von Domänenkontrollern. Z.B. srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = 'Ein priviligierter Active Directory Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional aber benötigt für einige Aktionen wie das Senden von Mitglieder E-Mails.'; +$lang['account_suffix'] = 'Dein Account-Suffix. Z.B. @my.domain.org'; +$lang['base_dn'] = 'Dein Base-DN. Z.B. DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z.B. srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = 'Ein privilegierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; $lang['ad_password'] = 'Das Passwort des obigen Benutzers.'; $lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; $lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; @@ -15,4 +16,4 @@ $lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterha $lang['use_tls'] = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.'; $lang['debug'] = 'Zusätzliche Debug-Informationen bei Fehlern anzeigen?'; $lang['expirywarn'] = 'Tage im Voraus um Benutzer über ablaufende Passwörter zu informieren. 0 zum Ausschalten.'; -$lang['additional'] = 'Eine kommaseparierte Liste von zusätzlichen AD Attributen von den Benutzdedaten abrufen. Wird von einigen Plugins benutzt.'; +$lang['additional'] = 'Eine Komma-separierte Liste von zusätzlichen AD-Attributen, die von den Benutzerobjekten abgefragt werden. Wird von einigen Plugins benutzt.'; diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php new file mode 100644 index 000000000..38bccbf24 --- /dev/null +++ b/lib/plugins/authad/lang/de/settings.php @@ -0,0 +1,19 @@ + + * @author Matthias Schulte + */ +$lang['account_suffix'] = 'Ihr Account-Suffix. Z.B. @my.domain.org'; +$lang['base_dn'] = 'Ihre Base-DN. Z.B. DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z.B. srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = 'Ein priviligierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; +$lang['ad_password'] = 'Das Passwort des obigen Benutzers.'; +$lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; +$lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; +$lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.'; +$lang['use_tls'] = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.'; +$lang['debug'] = 'Zusätzliche Debug-Informationen bei Fehlern anzeigen?'; +$lang['expirywarn'] = 'Tage im Voraus um Benutzer über ablaufende Passwörter zu informieren. 0 zum Ausschalten.'; +$lang['additional'] = 'Eine Komma-separierte Liste von zusätzlichen AD-Attributen, die von den Benutzerobjekten abgefragt werden. Wird von einigen Plugins benutzt.'; -- cgit v1.2.3 From 8ee0487708ea528ade7e43e3688cfd14cf6a7582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= Date: Thu, 4 Apr 2013 20:43:19 +0200 Subject: Korean language update --- lib/plugins/authad/lang/ko/settings.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/ko/settings.php b/lib/plugins/authad/lang/ko/settings.php index 31071e9a3..6134bd657 100644 --- a/lib/plugins/authad/lang/ko/settings.php +++ b/lib/plugins/authad/lang/ko/settings.php @@ -6,9 +6,13 @@ */ $lang['account_suffix'] = '계정 접미어. 예를 들어 @my.domain.org'; $lang['base_dn'] = '기본 DN. 예를 들어 DC=my,DC=domain,DC=org'; -$lang['domain_controllers'] = '도메인 컨트롤러의 쉼표로 구분한 목록입니다. 예를 들어 srv1.domain.org,srv2.domain.org'; -$lang['ad_password'] = '위 사용자의 비밀번호입니다.'; +$lang['domain_controllers'] = '도메인 컨트롤러의 쉼표로 구분한 목록. 예를 들어 srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = '다른 모든 사용자의 데이터에 접근할 수 있는 권한이 있는 Active Directory 사용자. 선택적이지만 구독 메일을 보내는 등의 특정 작업에 필요합니다.'; +$lang['ad_password'] = '위 사용자의 비밀번호.'; $lang['sso'] = 'Kerberos나 NTLM을 통해 Single-Sign-On을 사용해야 합니까?'; +$lang['real_primarygroup'] = '실제 기본 그룹은 "도메인 사용자"를 가정하는 대신 해결될 것입니다 (느림)'; $lang['use_ssl'] = 'SSL 연결을 사용합니까? 사용한다면 아래 TLS을 활성화하지 마세요.'; $lang['use_tls'] = 'TLS 연결을 사용합니까? 사용한다면 위 SSL을 활성화하지 마세요.'; $lang['debug'] = '오류에 대한 추가적인 디버그 정보를 보이겠습니까?'; +$lang['expirywarn'] = '미리 비밀번호 만료를 사용자에게 경고할 날짜. 0일 경우 비활성화합니다.'; +$lang['additional'] = '사용자 데이터에서 가져올 추가적인 AD 속성의 쉼표로 구분한 목록. 일부 플러그인이 사용합니다.'; -- cgit v1.2.3 From ba04585eb6f5ff34f7bd452c14dad1e536693038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aivars=20Mi=C5=A1ka?= Date: Thu, 4 Apr 2013 20:46:28 +0200 Subject: Latvian language update --- lib/plugins/authad/lang/lv/settings.php | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lib/plugins/authad/lang/lv/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/lv/settings.php b/lib/plugins/authad/lang/lv/settings.php new file mode 100644 index 000000000..ced5dabf8 --- /dev/null +++ b/lib/plugins/authad/lang/lv/settings.php @@ -0,0 +1,6 @@ + + */ -- cgit v1.2.3 From 02ea0357f6a255b0f65c967112e6a6d9ec1fa116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Koot?= Date: Thu, 4 Apr 2013 20:48:39 +0200 Subject: Dutch language update --- lib/plugins/authad/lang/nl/settings.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 lib/plugins/authad/lang/nl/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/nl/settings.php b/lib/plugins/authad/lang/nl/settings.php new file mode 100644 index 000000000..e73cac75d --- /dev/null +++ b/lib/plugins/authad/lang/nl/settings.php @@ -0,0 +1,17 @@ +@mijn.domein.org'; +$lang['base_dn'] = 'Je basis DN. Bijv. DC=mijn,DC=domein,DC=org'; +$lang['domain_controllers'] = 'Eeen commagesepareerde lijst van domeinservers. Bijv. srv1.domein.org,srv2.domein.org'; +$lang['ad_username'] = 'Een geprivilegeerde Active Directory gebruiker die bij alle gebruikersgegevens kan komen. Optioneel, maar kan nodig zijn voor bepaalde acties, zoals het versturen van abonnementsmailtjes.'; +$lang['ad_password'] = 'Het wachtwoord van bovernvermelde gebruiker.'; +$lang['sso'] = 'Wordt voor Single-Sign-on Kerberos of NTLM gebruikt?'; +$lang['real_primarygroup'] = 'Moet de echte primaire groep worden opgezocht in plaats van het aannemen van "Domeingebruikers" (langzamer)'; +$lang['use_ssl'] = 'SSL verbinding gebruiken? Zo ja, gebruik dan TLS hieronder niet.'; +$lang['use_tls'] = 'TLS verbinding gebruiken? Zo ja, activeer dan niet de SSL verbinding hierboven.'; +$lang['debug'] = 'Aanvullende debug informatie tonen bij fouten?'; +$lang['expirywarn'] = 'Waarschuwingstermijn voor vervallen wachtwoord. 0 om te deactiveren.'; +$lang['additional'] = 'Commagesepareerde lijst van aanvullend uit AD op te halen attributen. Gebruikt door sommige plugins.'; -- cgit v1.2.3 From ba09710ad34bb383ae3526e84490a3d545f78866 Mon Sep 17 00:00:00 2001 From: Martin Terber Date: Mon, 15 Apr 2013 21:55:41 +0200 Subject: German language update --- lib/plugins/authad/lang/de/settings.php | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php index 38bccbf24..a1a99b6d6 100644 --- a/lib/plugins/authad/lang/de/settings.php +++ b/lib/plugins/authad/lang/de/settings.php @@ -1,19 +1,6 @@ - * @author Matthias Schulte + * @author Mateng Schimmerlos ) */ -$lang['account_suffix'] = 'Ihr Account-Suffix. Z.B. @my.domain.org'; -$lang['base_dn'] = 'Ihre Base-DN. Z.B. DC=my,DC=domain,DC=org'; -$lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z.B. srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = 'Ein priviligierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; -$lang['ad_password'] = 'Das Passwort des obigen Benutzers.'; -$lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; -$lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; -$lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.'; -$lang['use_tls'] = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.'; -$lang['debug'] = 'Zusätzliche Debug-Informationen bei Fehlern anzeigen?'; -$lang['expirywarn'] = 'Tage im Voraus um Benutzer über ablaufende Passwörter zu informieren. 0 zum Ausschalten.'; -$lang['additional'] = 'Eine Komma-separierte Liste von zusätzlichen AD-Attributen, die von den Benutzerobjekten abgefragt werden. Wird von einigen Plugins benutzt.'; -- cgit v1.2.3 From 4931ae526572ef290d7337eca9a37786c7108f59 Mon Sep 17 00:00:00 2001 From: Otto Vainio Date: Mon, 15 Apr 2013 21:56:46 +0200 Subject: Finnish language update --- lib/plugins/authad/lang/fi/settings.php | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lib/plugins/authad/lang/fi/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/fi/settings.php b/lib/plugins/authad/lang/fi/settings.php new file mode 100644 index 000000000..d3aa13e07 --- /dev/null +++ b/lib/plugins/authad/lang/fi/settings.php @@ -0,0 +1,6 @@ + + */ -- cgit v1.2.3 From 3002d731a466d09ce747cfbbe930444ee584f118 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 19 Apr 2013 10:25:36 +0200 Subject: adjusted authad language files for config option change --- lib/plugins/authad/auth.php | 4 ++-- lib/plugins/authad/lang/bg/settings.php | 4 ++-- lib/plugins/authad/lang/de-informal/settings.php | 4 ++-- lib/plugins/authad/lang/de/settings.php | 17 +++++++++++++++-- lib/plugins/authad/lang/en/settings.php | 4 ++-- lib/plugins/authad/lang/eo/settings.php | 4 ++-- lib/plugins/authad/lang/fr/settings.php | 4 ++-- lib/plugins/authad/lang/ko/settings.php | 4 ++-- lib/plugins/authad/lang/nl/settings.php | 4 ++-- lib/plugins/authad/lang/pt-br/settings.php | 2 +- lib/plugins/authad/lang/zh-tw/settings.php | 4 ++-- lib/plugins/authad/lang/zh/settings.php | 4 ++-- 12 files changed, 36 insertions(+), 23 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index 6c49eafbb..f7f350c3f 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -21,8 +21,8 @@ require_once(DOKU_PLUGIN.'authad/adLDAP/adLDAP.php'); * * //optional: * $conf['plugin']['authad']['sso'] = 1; - * $conf['plugin']['authad']['ad_username'] = 'root'; - * $conf['plugin']['authad']['ad_password'] = 'pass'; + * $conf['plugin']['authad']['admin_username'] = 'root'; + * $conf['plugin']['authad']['admin_password'] = 'pass'; * $conf['plugin']['authad']['real_primarygroup'] = 1; * $conf['plugin']['authad']['use_ssl'] = 1; * $conf['plugin']['authad']['use_tls'] = 1; diff --git a/lib/plugins/authad/lang/bg/settings.php b/lib/plugins/authad/lang/bg/settings.php index d63331078..877810c4e 100644 --- a/lib/plugins/authad/lang/bg/settings.php +++ b/lib/plugins/authad/lang/bg/settings.php @@ -7,8 +7,8 @@ $lang['account_suffix'] = 'Наставка на акаунта Ви. Например @някакъв.домейн.org'; $lang['base_dn'] = 'Вашият основен DN. Например DC=моят,DC=домейн,DC=org'; $lang['domain_controllers'] = 'Domain controller списък, разделете сървърите със запетая. Например сървър1.домейн.org,сървър2.домейн.org'; -$lang['ad_username'] = 'Привилегирован Active Directory потребител с достъп до данните на останалите потребители. Не е задължително, но е необходимо за някои функционалности като изпращането на имейл за абонаменти.'; -$lang['ad_password'] = 'Паролата на горния потребител.'; +$lang['admin_username'] = 'Привилегирован Active Directory потребител с достъп до данните на останалите потребители. Не е задължително, но е необходимо за някои функционалности като изпращането на имейл за абонаменти.'; +$lang['admin_password'] = 'Паролата на горния потребител.'; $lang['sso'] = 'Да се ползва ли еднократно вписване чрез Kerberos или NTLM?'; $lang['real_primarygroup'] = 'Да се извлича ли истинската група вместо да се предполага "Domain Users" (по-бавно)'; $lang['use_ssl'] = 'Ползване на SSL свързаност? Не отбелязвайте TLS (по-долу) ако включите опцията.'; diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php index f6ba679ff..4d0b93e5d 100644 --- a/lib/plugins/authad/lang/de-informal/settings.php +++ b/lib/plugins/authad/lang/de-informal/settings.php @@ -8,8 +8,8 @@ $lang['account_suffix'] = 'Dein Account-Suffix. Z.B. @my.domain.org'; $lang['base_dn'] = 'Dein Base-DN. Z.B. DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z.B. srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = 'Ein privilegierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; -$lang['ad_password'] = 'Das Passwort des obigen Benutzers.'; +$lang['admin_username'] = 'Ein privilegierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; +$lang['admin_password'] = 'Das Passwort des obigen Benutzers.'; $lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; $lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; $lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.'; diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php index a1a99b6d6..acfa7e574 100644 --- a/lib/plugins/authad/lang/de/settings.php +++ b/lib/plugins/authad/lang/de/settings.php @@ -1,6 +1,19 @@ ) + * @author Frank Loizzi + * @author Matthias Schulte */ +$lang['account_suffix'] = 'Ihr Account-Suffix. Z.B. @my.domain.org'; +$lang['base_dn'] = 'Ihr Base-DN. z.B. DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z.B. srv1.domain.org,srv2.domain.org'; +$lang['admin_username'] = 'Ein privilegierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; +$lang['admin_password'] = 'Das Passwort des obigen Benutzers.'; +$lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; +$lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; +$lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.'; +$lang['use_tls'] = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.'; +$lang['debug'] = 'Zusätzliche Debug-Informationen bei Fehlern anzeigen?'; +$lang['expirywarn'] = 'Tage im Voraus um Benutzer über ablaufende Passwörter zu informieren. 0 zum Ausschalten.'; +$lang['additional'] = 'Eine Komma-separierte Liste von zusätzlichen AD-Attributen, die von den Benutzerobjekten abgefragt werden. Wird von einigen Plugins benutzt.'; diff --git a/lib/plugins/authad/lang/en/settings.php b/lib/plugins/authad/lang/en/settings.php index 7728d5ac4..aff49550b 100644 --- a/lib/plugins/authad/lang/en/settings.php +++ b/lib/plugins/authad/lang/en/settings.php @@ -3,8 +3,8 @@ $lang['account_suffix'] = 'Your account suffix. Eg. @my.domain.org'; $lang['base_dn'] = 'Your base DN. Eg. DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = 'A comma separated list of Domain controllers. Eg. srv1.domain.org,srv2.domain.org'; -$lang['admin_username'] = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.'; -$lang['admin_password'] = 'The password of the above user.'; +$lang['admin_username'] = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.'; +$lang['admin_password'] = 'The password of the above user.'; $lang['sso'] = 'Should Single-Sign-On via Kerberos or NTLM be used?'; $lang['real_primarygroup'] = 'Should the real primary group be resolved instead of assuming "Domain Users" (slower)'; $lang['use_ssl'] = 'Use SSL connection? If used, do not enable TLS below.'; diff --git a/lib/plugins/authad/lang/eo/settings.php b/lib/plugins/authad/lang/eo/settings.php index 85a6abd98..8bd34b439 100644 --- a/lib/plugins/authad/lang/eo/settings.php +++ b/lib/plugins/authad/lang/eo/settings.php @@ -6,8 +6,8 @@ $lang['account_suffix'] = 'Via konto-aldonaĵo, ekz. @mia.domajno.lando'; $lang['base_dn'] = 'Via baza DN, ekz. DC=mia,DC=domajno,DC=lando'; $lang['domain_controllers'] = 'Komodisigita listo de domajno-serviloj, ekz. srv1.domajno.lando,srv2.domajno.lando'; -$lang['ad_username'] = 'Privilegiita Aktiv-Dosieruja uzanto kun aliro al ĉiuj uzantaj datumoj. Libervole, sed necesa por iuj agadoj kiel sendi abonan retpoŝton.'; -$lang['ad_password'] = 'La pasvorto de tiu uzanto.'; +$lang['admin_username'] = 'Privilegiita Aktiv-Dosieruja uzanto kun aliro al ĉiuj uzantaj datumoj. Libervole, sed necesa por iuj agadoj kiel sendi abonan retpoŝton.'; +$lang['admin_password'] = 'La pasvorto de tiu uzanto.'; $lang['sso'] = 'Ĉu uzi Sola Aliro tra Kerberos aŭ NTLM?'; $lang['real_primarygroup'] = 'Ĉu trovi la veran ĉefan grupon anstataŭ supozi "Domajnuzantoj" (pli malrapida)?'; $lang['use_ssl'] = 'Ĉu uzi SSL-konekton? Se jes, ne aktivigu TLS sube.'; diff --git a/lib/plugins/authad/lang/fr/settings.php b/lib/plugins/authad/lang/fr/settings.php index efbca89f9..5480a3d44 100644 --- a/lib/plugins/authad/lang/fr/settings.php +++ b/lib/plugins/authad/lang/fr/settings.php @@ -7,8 +7,8 @@ $lang['account_suffix'] = 'Le suffixe de votre compte. Ex.: @mon.domaine.org'; $lang['base_dn'] = 'Votre nom de domaine de base. DC=mon,DC=domaine,DC=org'; $lang['domain_controllers'] = 'Une liste de contrôleurs de domaine séparés par des virgules. Ex.: srv1.domaine.org,srv2.domaine.org'; -$lang['ad_username'] = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.'; -$lang['ad_password'] = 'Le mot de passe de l\'utilisateur ci-dessus.'; +$lang['admin_username'] = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.'; +$lang['admin_password'] = 'Le mot de passe de l\'utilisateur ci-dessus.'; $lang['sso'] = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?'; $lang['real_primarygroup'] = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?'; $lang['use_ssl'] = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.'; diff --git a/lib/plugins/authad/lang/ko/settings.php b/lib/plugins/authad/lang/ko/settings.php index 6134bd657..f2bf52681 100644 --- a/lib/plugins/authad/lang/ko/settings.php +++ b/lib/plugins/authad/lang/ko/settings.php @@ -7,8 +7,8 @@ $lang['account_suffix'] = '계정 접미어. 예를 들어 @my.domain.org'; $lang['base_dn'] = '기본 DN. 예를 들어 DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = '도메인 컨트롤러의 쉼표로 구분한 목록. 예를 들어 srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = '다른 모든 사용자의 데이터에 접근할 수 있는 권한이 있는 Active Directory 사용자. 선택적이지만 구독 메일을 보내는 등의 특정 작업에 필요합니다.'; -$lang['ad_password'] = '위 사용자의 비밀번호.'; +$lang['admin_username'] = '다른 모든 사용자의 데이터에 접근할 수 있는 권한이 있는 Active Directory 사용자. 선택적이지만 구독 메일을 보내는 등의 특정 작업에 필요합니다.'; +$lang['admin_password'] = '위 사용자의 비밀번호.'; $lang['sso'] = 'Kerberos나 NTLM을 통해 Single-Sign-On을 사용해야 합니까?'; $lang['real_primarygroup'] = '실제 기본 그룹은 "도메인 사용자"를 가정하는 대신 해결될 것입니다 (느림)'; $lang['use_ssl'] = 'SSL 연결을 사용합니까? 사용한다면 아래 TLS을 활성화하지 마세요.'; diff --git a/lib/plugins/authad/lang/nl/settings.php b/lib/plugins/authad/lang/nl/settings.php index e73cac75d..933566d18 100644 --- a/lib/plugins/authad/lang/nl/settings.php +++ b/lib/plugins/authad/lang/nl/settings.php @@ -6,8 +6,8 @@ $lang['account_suffix'] = 'Je account domeinnaam. Bijv @mijn.domein.org'; $lang['base_dn'] = 'Je basis DN. Bijv. DC=mijn,DC=domein,DC=org'; $lang['domain_controllers'] = 'Eeen commagesepareerde lijst van domeinservers. Bijv. srv1.domein.org,srv2.domein.org'; -$lang['ad_username'] = 'Een geprivilegeerde Active Directory gebruiker die bij alle gebruikersgegevens kan komen. Optioneel, maar kan nodig zijn voor bepaalde acties, zoals het versturen van abonnementsmailtjes.'; -$lang['ad_password'] = 'Het wachtwoord van bovernvermelde gebruiker.'; +$lang['admin_username'] = 'Een geprivilegeerde Active Directory gebruiker die bij alle gebruikersgegevens kan komen. Optioneel, maar kan nodig zijn voor bepaalde acties, zoals het versturen van abonnementsmailtjes.'; +$lang['admin_password'] = 'Het wachtwoord van bovernvermelde gebruiker.'; $lang['sso'] = 'Wordt voor Single-Sign-on Kerberos of NTLM gebruikt?'; $lang['real_primarygroup'] = 'Moet de echte primaire groep worden opgezocht in plaats van het aannemen van "Domeingebruikers" (langzamer)'; $lang['use_ssl'] = 'SSL verbinding gebruiken? Zo ja, gebruik dan TLS hieronder niet.'; diff --git a/lib/plugins/authad/lang/pt-br/settings.php b/lib/plugins/authad/lang/pt-br/settings.php index b8b1efd42..29f8db4ad 100644 --- a/lib/plugins/authad/lang/pt-br/settings.php +++ b/lib/plugins/authad/lang/pt-br/settings.php @@ -7,7 +7,7 @@ $lang['account_suffix'] = 'Sufixo de sua conta. Eg. @meu.domínio.org'; $lang['base_dn'] = 'Sua base DN. Eg. DC=meu,DC=domínio,DC=org'; $lang['domain_controllers'] = 'Uma lista de controles de domínios separada por vírgulas. Eg. srv1.domínio.org,srv2.domínio.org'; -$lang['ad_password'] = 'A senha do usuário acima.'; +$lang['admin_password'] = 'A senha do usuário acima.'; $lang['sso'] = 'Usar Single-Sign-On através do Kerberos ou NTLM?'; $lang['use_ssl'] = 'Usar conexão SSL? Se usar, não habilitar TLS abaixo.'; $lang['use_tls'] = 'Usar conexão TLS? se usar, não habilitar SSL acima.'; diff --git a/lib/plugins/authad/lang/zh-tw/settings.php b/lib/plugins/authad/lang/zh-tw/settings.php index e38a2c007..c46e5f96f 100644 --- a/lib/plugins/authad/lang/zh-tw/settings.php +++ b/lib/plugins/authad/lang/zh-tw/settings.php @@ -7,8 +7,8 @@ $lang['account_suffix'] = '您的帳號後綴。如： @my.domain.org'; $lang['base_dn'] = '您的基本識別名。如： DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = '以逗號分隔的域名控制器列表。如： srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = 'Active Directory 的特權使用者，可以查看所有使用者的數據。(非必要，但對發送訂閱郵件等活動來說，這是必須的。)'; -$lang['ad_password'] = '上述使用者的密碼。'; +$lang['admin_username'] = 'Active Directory 的特權使用者，可以查看所有使用者的數據。(非必要，但對發送訂閱郵件等活動來說，這是必須的。)'; +$lang['admin_password'] = '上述使用者的密碼。'; $lang['sso'] = '是否使用 Kerberos 或 NTLM 的單一登入系統 (Single-Sign-On)？'; $lang['real_primarygroup'] = '是否視作真正的主要群組，而不是假設為網域使用者 (比較慢)'; $lang['use_ssl'] = '使用 SSL 連接嗎？如果要使用，請不要啟用下方的 TLS。'; diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php index 9fd3c4e35..0ad8d4e4f 100644 --- a/lib/plugins/authad/lang/zh/settings.php +++ b/lib/plugins/authad/lang/zh/settings.php @@ -7,8 +7,8 @@ $lang['account_suffix'] = '您的账户后缀。例如 @my.domain.org'; $lang['base_dn'] = '您的基本分辨名。例如 DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = '逗号分隔的域名控制器列表。例如 srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = '一个活动目录的特权用户，可以查看其他所有用户的数据。可选，但对某些活动例如发送订阅邮件是必须的。'; -$lang['ad_password'] = '上述用户的密码。'; +$lang['admin_username'] = '一个活动目录的特权用户，可以查看其他所有用户的数据。可选，但对某些活动例如发送订阅邮件是必须的。'; +$lang['admin_password'] = '上述用户的密码。'; $lang['sso'] = '是否使用经由 Kerberos 和 NTLM 的 Single-Sign-On？'; $lang['real_primarygroup'] = ' 是否解析真实的主要组，而不是假设为“域用户” (较慢)'; $lang['use_ssl'] = '使用 SSL 连接？如果是，不要激活下面的 TLS。'; -- cgit v1.2.3 From bba10e63fd89accbcf180b64adbd26e32ffb1810 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Sun, 21 Apr 2013 21:24:28 +0200 Subject: Revert "German language update" This reverts commit ba09710ad34bb383ae3526e84490a3d545f78866. Conflicts: lib/plugins/authad/lang/de/settings.php --- lib/plugins/authad/lang/de/settings.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php index acfa7e574..650f9f362 100644 --- a/lib/plugins/authad/lang/de/settings.php +++ b/lib/plugins/authad/lang/de/settings.php @@ -5,11 +5,11 @@ * @author Frank Loizzi * @author Matthias Schulte */ -$lang['account_suffix'] = 'Ihr Account-Suffix. Z.B. @my.domain.org'; -$lang['base_dn'] = 'Ihr Base-DN. z.B. DC=my,DC=domain,DC=org'; -$lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z.B. srv1.domain.org,srv2.domain.org'; -$lang['admin_username'] = 'Ein privilegierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; -$lang['admin_password'] = 'Das Passwort des obigen Benutzers.'; +$lang['account_suffix'] = 'Ihr Account-Suffix. Z. B. @my.domain.org'; +$lang['base_dn'] = 'Ihr Base-DN. Z. B. DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z. B. srv1.domain.org,srv2.domain.org'; +$lang['ad_username'] = 'Ein priviligierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; +$lang['ad_password'] = 'Das Passwort des obigen Benutzers.'; $lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; $lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; $lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.'; -- cgit v1.2.3 From 1b228d28eda480cd189c68eadd1172c9409c6ef7 Mon Sep 17 00:00:00 2001 From: Klap-in Date: Sun, 21 Apr 2013 21:24:33 +0200 Subject: Rename ad_username to admin_username canDo getUsers to false when unavailable --- lib/plugins/authad/auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index f7f350c3f..5985cd18f 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -469,10 +469,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { $this->cando['modPass'] = false; } - if(isset($opts['ad_username']) && isset($opts['ad_password'])) { + if(isset($opts['admin_username']) && isset($opts['admin_password'])) { $this->cando['getUsers'] = true; } else { - $this->cando['getUsers'] = true; + $this->cando['getUsers'] = false; } return $opts; -- cgit v1.2.3 From eb12065057595644fb1dcd333930e0653c024049 Mon Sep 17 00:00:00 2001 From: Klap-in Date: Mon, 22 Apr 2013 20:46:05 +0200 Subject: fix ids in de lang of authAD --- lib/plugins/authad/lang/de/settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/de/settings.php b/lib/plugins/authad/lang/de/settings.php index 650f9f362..f4e86dedd 100644 --- a/lib/plugins/authad/lang/de/settings.php +++ b/lib/plugins/authad/lang/de/settings.php @@ -8,8 +8,8 @@ $lang['account_suffix'] = 'Ihr Account-Suffix. Z. B. @my.domain.org'; $lang['base_dn'] = 'Ihr Base-DN. Z. B. DC=my,DC=domain,DC=org'; $lang['domain_controllers'] = 'Eine Komma-separierte Liste von Domänen-Controllern. Z. B. srv1.domain.org,srv2.domain.org'; -$lang['ad_username'] = 'Ein priviligierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; -$lang['ad_password'] = 'Das Passwort des obigen Benutzers.'; +$lang['admin_username'] = 'Ein priviligierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.'; +$lang['admin_password'] = 'Das Passwort des obigen Benutzers.'; $lang['sso'] = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?'; $lang['real_primarygroup'] = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)'; $lang['use_ssl'] = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.'; -- cgit v1.2.3 From 87945c0e9622dca02b441749b7ed54cc67801475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= Date: Mon, 22 Apr 2013 21:50:17 +0200 Subject: Japanese language update --- lib/plugins/authad/lang/ja/settings.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 lib/plugins/authad/lang/ja/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/ja/settings.php b/lib/plugins/authad/lang/ja/settings.php new file mode 100644 index 000000000..576f0eeb5 --- /dev/null +++ b/lib/plugins/authad/lang/ja/settings.php @@ -0,0 +1,5 @@ + Date: Mon, 22 Apr 2013 22:03:13 +0200 Subject: fix expiry check for adLDAP version FS#2759 --- lib/plugins/authad/auth.php | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index 5985cd18f..95a25c5af 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -218,22 +218,24 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { // check expiry time if($info['expires'] && $this->conf['expirywarn']){ - $timeleft = $adldap->user()->passwordExpiry($user); // returns unixtime - $timeleft = round($timeleft/(24*60*60)); - $info['expiresin'] = $timeleft; - - // if this is the current user, warn him (once per request only) - if(($_SERVER['REMOTE_USER'] == $user) && - ($timeleft <= $this->conf['expirywarn']) && - !$this->msgshown - ) { - $msg = sprintf($lang['authpwdexpire'], $timeleft); - if($this->canDo('modPass')) { - $url = wl($ID, array('do'=> 'profile')); - $msg .= ' '.$lang['btn_profile'].''; + $expiry = $adldap->user()->passwordExpiry($user); + if(is_array($expiry)){ + $info['expiresat'] = $expiry['expiryts']; + $info['expiresin'] = round(($info['expiresat'] - time())/(24*60*60)); + + // if this is the current user, warn him (once per request only) + if(($_SERVER['REMOTE_USER'] == $user) && + ($info['expiresin'] <= $this->conf['expirywarn']) && + !$this->msgshown + ) { + $msg = sprintf($lang['authpwdexpire'], $info['expiresin']); + if($this->canDo('modPass')) { + $url = wl($ID, array('do'=> 'profile')); + $msg .= ' '.$lang['btn_profile'].''; + } + msg($msg); + $this->msgshown = true; } - msg($msg); - $this->msgshown = true; } } -- cgit v1.2.3 From 14642325892b50c3a95bead35efca7c5a6f16dc7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 25 Apr 2013 15:57:55 +0200 Subject: authad: don't request empty fields --- lib/plugins/authad/auth.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index 95a25c5af..d6455c751 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -172,6 +172,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { // add additional fields to read $fields = array_merge($fields, $this->conf['additional']); $fields = array_unique($fields); + $fields = array_filter($fields); //get info for given user $result = $adldap->user()->info($this->_userName($user), $fields); -- cgit v1.2.3 From 8257d713a47c1819c2c33ddd2b868eea62d9f6fc Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 25 Apr 2013 16:05:53 +0200 Subject: authad: added compatibility for old option names adLDAP renamed the ad_username and ad_password to admin_username admin_password recently. this makes our backend recognize the old settings --- lib/plugins/authad/auth.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index d6455c751..5d5f532b6 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -465,6 +465,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { $opts['domain_controllers'] = array_map('trim', $opts['domain_controllers']); $opts['domain_controllers'] = array_filter($opts['domain_controllers']); + // compatibility with old option name + if(empty($opts['admin_username']) && !empty($opts['ad_username'])) $opts['admin_username'] = $opts['ad_username']; + if(empty($opts['admin_password']) && !empty($opts['ad_password'])) $opts['admin_password'] = $opts['ad_password']; + // we can change the password if SSL is set if($opts['use_ssl'] || $opts['use_tls']) { $this->cando['modPass'] = true; @@ -472,7 +476,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { $this->cando['modPass'] = false; } - if(isset($opts['admin_username']) && isset($opts['admin_password'])) { + if(!empty($opts['admin_username']) && !empty($opts['admin_password'])) { $this->cando['getUsers'] = true; } else { $this->cando['getUsers'] = false; -- cgit v1.2.3 From a154806fb54c04841a42641bf5d66716d89c1554 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 25 Apr 2013 16:43:54 +0200 Subject: authad: capabilities depend on userdomain specific config --- lib/plugins/authad/auth.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index 5d5f532b6..b6b5dd268 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -110,6 +110,19 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { $this->cando['modMail'] = true; } + /** + * Load domain config on capability check + * + * @param string $cap + * @return bool + */ + public function canDo($cap) { + //capabilities depend on config, which may change depending on domain + $domain = $this->_userDomain($_SERVER['REMOTE_USER']); + $this->_loadServerConfig($domain); + return parent::canDo($cap); + } + /** * Check user+password [required auth function] * -- cgit v1.2.3 From 9199f1a464f80d9c6b8a996a508ba051e3223eac Mon Sep 17 00:00:00 2001 From: "Ivan I. Udovichenko" Date: Fri, 26 Apr 2013 14:32:47 +0200 Subject: Russian language update --- lib/plugins/authad/lang/ru/settings.php | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lib/plugins/authad/lang/ru/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php new file mode 100644 index 000000000..4c394080e --- /dev/null +++ b/lib/plugins/authad/lang/ru/settings.php @@ -0,0 +1,6 @@ + Date: Sun, 5 May 2013 20:03:01 +0200 Subject: Czech language update --- lib/plugins/authad/lang/cs/settings.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lib/plugins/authad/lang/cs/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/cs/settings.php b/lib/plugins/authad/lang/cs/settings.php new file mode 100644 index 000000000..71f83afda --- /dev/null +++ b/lib/plugins/authad/lang/cs/settings.php @@ -0,0 +1,18 @@ +@moje.domena.org'; +$lang['base_dn'] = 'Vaše doménové jméno DN. tj. DC=moje,DC=domena,DC=org'; +$lang['domain_controllers'] = 'Čárkou oddělenových kontrol=rů, tj. srv1.domena.org,srv2.domena.org'; +$lang['admin_username'] = 'Privilegovaný uživatel Active Directory s přístupem ke všem datům. Volitelně, ale nutné pro určité akce typu zasílání mailů.'; +$lang['admin_password'] = 'Heslo uživatele výše'; +$lang['sso'] = 'Chcete přihlašování Single-Sign-On pomocí jádra Kerberos nebo NTLM ( autentizační protokol obvyklý ve Windows)?'; +$lang['real_primarygroup'] = 'Má být zjištěna primární skupina namísto vyhodnocení hodnoty "doménoví uživatelé" (pomalejší)'; +$lang['use_ssl'] = 'Použít spojení SSL? Pokud ano, nevyužívejte TLS níže.'; +$lang['use_tls'] = 'Použít spojení TLS? Pokud ano, nevyužívejte SSL výše.'; +$lang['debug'] = 'Zobrazit dodatečné debugovací výstupy při chybách?'; +$lang['expirywarn'] = 'Dny mezi varováním o vyprčšení hesla uživatele a jeho vypršením. 0 znaší vypnuto.'; +$lang['additional'] = 'Čárkou oddělený seznam dodatečných atributů získávaných z uživatelských dat. Využito některými pluginy.'; -- cgit v1.2.3 From 8fb341d2133fef951e0a7bb959440b93d5ca2e4a Mon Sep 17 00:00:00 2001 From: Satoshi Sahara Date: Sun, 5 May 2013 20:04:04 +0200 Subject: Japanese language update --- lib/plugins/authad/lang/ja/settings.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/ja/settings.php b/lib/plugins/authad/lang/ja/settings.php index 576f0eeb5..fdc6fc434 100644 --- a/lib/plugins/authad/lang/ja/settings.php +++ b/lib/plugins/authad/lang/ja/settings.php @@ -2,4 +2,5 @@ /** * Japanese language file * + * @author Satoshi Sahara */ -- cgit v1.2.3 From 0e748a96cda77fa0131fc0b9601de54a41592ca7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 6 May 2013 12:25:27 +0100 Subject: updated dates in templates' and plugins' info.txt files --- 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 f02b5118c..996813bc5 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 2012-11-09 +date 2013-04-25 name Active Directory auth plugin desc Provides authentication against a Microsoft Active Directory url http://www.dokuwiki.org/plugin:authad -- cgit v1.2.3 From 12d195ab7189878b41dc4d211befafc79ae402a6 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 7 Jun 2013 12:48:07 +0200 Subject: treat empty AD credentials as NULL values FS#2781 --- lib/plugins/authad/auth.php | 5 +++++ lib/plugins/authad/conf/default.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index b6b5dd268..fcbd2eeef 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -489,6 +489,11 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { $this->cando['modPass'] = false; } + // adLDAP expects empty user/pass as NULL, we're less strict FS#2781 + if(empty($opts['admin_username'])) $opts['admin_username'] = null; + if(empty($opts['admin_password'])) $opts['admin_password'] = null; + + // user listing needs admin priviledges if(!empty($opts['admin_username']) && !empty($opts['admin_password'])) { $this->cando['getUsers'] = true; } else { diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php index 9274db209..f71202cfc 100644 --- a/lib/plugins/authad/conf/default.php +++ b/lib/plugins/authad/conf/default.php @@ -4,8 +4,8 @@ $conf['account_suffix'] = ''; $conf['base_dn'] = ''; $conf['domain_controllers'] = ''; $conf['sso'] = 0; -$conf['admin_username'] = ''; -$conf['admin_password'] = ''; +$conf['admin_username'] = ''; +$conf['admin_password'] = ''; $conf['real_primarygroup'] = 0; $conf['use_ssl'] = 0; $conf['use_tls'] = 0; -- cgit v1.2.3 From 81ee3b1c4ea669b4278fc1160162c686b82e559c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 16 Jun 2013 18:09:34 +0200 Subject: Swedish language update --- lib/plugins/authad/lang/sv/settings.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lib/plugins/authad/lang/sv/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/sv/settings.php b/lib/plugins/authad/lang/sv/settings.php new file mode 100644 index 000000000..b1eb1cb96 --- /dev/null +++ b/lib/plugins/authad/lang/sv/settings.php @@ -0,0 +1,11 @@ +min.domän.org'; +$lang['admin_password'] = 'Lösenord för användare ovan.'; +$lang['sso'] = 'Ska Single-Sign-On via Kerberos eller NTLM användas?'; +$lang['use_ssl'] = 'Använda SSL anslutning? Om använd, möjliggör inte TLS nedan.'; +$lang['use_tls'] = 'Använda TLS anslutning? Om använd, möjliggör inte SSL ovan.'; -- cgit v1.2.3 From b243b168571b08a674d34701cfbb7ac0a03239e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20B=C3=B6dker?= Date: Fri, 12 Jul 2013 17:04:41 +0200 Subject: Informal German language update --- lib/plugins/authad/lang/de-informal/settings.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php index 4d0b93e5d..a458617b8 100644 --- a/lib/plugins/authad/lang/de-informal/settings.php +++ b/lib/plugins/authad/lang/de-informal/settings.php @@ -4,6 +4,7 @@ * * @author Frank Loizzi * @author Matthias Schulte + * @author Volker Bödker */ $lang['account_suffix'] = 'Dein Account-Suffix. Z.B. @my.domain.org'; $lang['base_dn'] = 'Dein Base-DN. Z.B. DC=my,DC=domain,DC=org'; -- cgit v1.2.3 From dbd5b4caeac5f2f45d05da38f1a54282d972b3ce Mon Sep 17 00:00:00 2001 From: Victor Westmann Date: Fri, 12 Jul 2013 17:06:30 +0200 Subject: Brazilian Portuguese language update --- lib/plugins/authad/lang/pt-br/settings.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/pt-br/settings.php b/lib/plugins/authad/lang/pt-br/settings.php index 29f8db4ad..308d122dd 100644 --- a/lib/plugins/authad/lang/pt-br/settings.php +++ b/lib/plugins/authad/lang/pt-br/settings.php @@ -7,8 +7,10 @@ $lang['account_suffix'] = 'Sufixo de sua conta. Eg. @meu.domínio.org'; $lang['base_dn'] = 'Sua base DN. Eg. DC=meu,DC=domínio,DC=org'; $lang['domain_controllers'] = 'Uma lista de controles de domínios separada por vírgulas. Eg. srv1.domínio.org,srv2.domínio.org'; +$lang['admin_username'] = 'Um usuário com privilégios do Active Directory com acesso a todos os dados dos outros usuários. Opcional, mas necessário para certas ações como enviar emails de inscrição.'; $lang['admin_password'] = 'A senha do usuário acima.'; $lang['sso'] = 'Usar Single-Sign-On através do Kerberos ou NTLM?'; +$lang['real_primarygroup'] = 'Deverá o grupo real primário ser resolvido ao invés de assumir "Usuários de domínio" (mais lento) '; $lang['use_ssl'] = 'Usar conexão SSL? Se usar, não habilitar TLS abaixo.'; $lang['use_tls'] = 'Usar conexão TLS? se usar, não habilitar SSL acima.'; $lang['debug'] = 'Mostrar saída adicional de depuração em mensagens de erros?'; -- cgit v1.2.3 From 4b0e9be14f53973587becf18a79ad97e0b8ae195 Mon Sep 17 00:00:00 2001 From: Maciej Matejczuk Date: Sun, 28 Jul 2013 02:11:25 +0200 Subject: Polish language update --- lib/plugins/authad/lang/pl/settings.php | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 lib/plugins/authad/lang/pl/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php new file mode 100644 index 000000000..9113c0e51 --- /dev/null +++ b/lib/plugins/authad/lang/pl/settings.php @@ -0,0 +1,10 @@ +@my.domain.org'; +$lang['admin_password'] = 'Hasło dla powyższego użytkownika.'; +$lang['use_ssl'] = 'Użyć połączenie SSL? Jeśli tak to nie aktywuj TLS poniżej.'; +$lang['use_tls'] = 'Użyć połączenie TLS? Jeśli tak to nie aktywuj SSL powyżej.'; +$lang['expirywarn'] = 'Dni poprzedzających powiadomienie użytkownika o wygasającym haśle. 0 aby wyłączyć.'; -- cgit v1.2.3 From 22064dd98283bc61e1b444e45707c1c51230eb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Seb=C5=91k?= Date: Sun, 28 Jul 2013 02:12:20 +0200 Subject: Hungarian language update --- lib/plugins/authad/lang/hu/settings.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 lib/plugins/authad/lang/hu/settings.php (limited to 'lib/plugins/authad') diff --git a/lib/plugins/authad/lang/hu/settings.php b/lib/plugins/authad/lang/hu/settings.php new file mode 100644 index 000000000..c2cab410f --- /dev/null +++ b/lib/plugins/authad/lang/hu/settings.php @@ -0,0 +1,18 @@ + + */ +$lang['account_suffix'] = 'Felhasználói azonosító végződése, pl. @my.domain.org.'; +$lang['base_dn'] = 'Bázis DN, pl. DC=my,DC=domain,DC=org.'; +$lang['domain_controllers'] = 'Tartománykezelők listája vesszővel elválasztva, pl. srv1.domain.org,srv2.domain.org.'; +$lang['admin_username'] = 'Privilegizált AD felhasználó, aki az összes feéhasználó adatait elérheti. Elhagyható, de bizonyos funkciókhoz, például a feliratkozási e-mailek kiküldéséhez szükséges.'; +$lang['admin_password'] = 'Ehhez tartozó jelszó.'; +$lang['sso'] = 'Single-Sign-On Kerberos-szal vagy NTML használata?'; +$lang['real_primarygroup'] = 'A valódi elsődleges csoport feloldása a "Tartományfelhasználók" csoport használata helyett? (lassabb)'; +$lang['use_ssl'] = 'SSL használata? Ha használjuk, tiltsuk le a TLS-t!'; +$lang['use_tls'] = 'TLS használata? Ha használjuk, tiltsuk le az SSL-t!'; +$lang['debug'] = 'Debug-üzenetek megjelenítése?'; +$lang['expirywarn'] = 'Felhasználók értesítése ennyi nappal a jelszavuk lejárata előtt. 0 a funkció kikapcsolásához.'; +$lang['additional'] = 'Vesszővel elválasztott lista a további AD attribútumok lekéréshez. Néhány plugin használhatja.'; -- cgit v1.2.3