diff options
author | Satoshi Sahara <sahara.satoshi@gmail.com> | 2021-05-09 13:26:07 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-09 13:26:07 +0900 |
commit | 700ab9fdf1102a367a591bba2bc4a470ca345d2f (patch) | |
tree | 1e118d31fcf905132d7b3dc8aba2e21b4d1c0e5f /lib/plugins/authad | |
parent | 871895a75d164d6a6389dbba8ae132577a744de4 (diff) | |
parent | 55c2f8c9858c38a70d317809fbfbee6439c10291 (diff) | |
download | dokuwiki-700ab9fdf1102a367a591bba2bc4a470ca345d2f.tar.gz dokuwiki-700ab9fdf1102a367a591bba2bc4a470ca345d2f.zip |
Merge branch 'master' into revisionHandle3
Diffstat (limited to 'lib/plugins/authad')
-rw-r--r-- | lib/plugins/authad/adLDAP/classes/adLDAPUsers.php | 2 | ||||
-rw-r--r-- | lib/plugins/authad/lang/de-informal/settings.php | 2 | ||||
-rw-r--r-- | lib/plugins/authad/lang/sv/lang.php | 2 | ||||
-rw-r--r-- | lib/plugins/authad/lang/sv/settings.php | 7 | ||||
-rw-r--r-- | lib/plugins/authad/lang/tr/settings.php | 3 |
5 files changed, 13 insertions, 3 deletions
diff --git a/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php b/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php index 3b93de07c..d750f1088 100644 --- a/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php +++ b/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php @@ -519,7 +519,7 @@ class adLDAPUsers { { $password="\"".$password."\""; $encoded=""; - for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; } + for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password[$i]}\000"; } return $encoded; } diff --git a/lib/plugins/authad/lang/de-informal/settings.php b/lib/plugins/authad/lang/de-informal/settings.php index 4daa81d6f..b73b66801 100644 --- a/lib/plugins/authad/lang/de-informal/settings.php +++ b/lib/plugins/authad/lang/de-informal/settings.php @@ -3,6 +3,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * + * @author MaWi <drmaxxis@gmail.com> * @author Frank Loizzi <contact@software.bacal.de> * @author Matthias Schulte <dokuwiki@lupo49.de> * @author Volker Bödker <volker@boedker.de> @@ -24,3 +25,4 @@ $lang['expirywarn'] = 'Tage im Voraus um Benutzer über ablaufende Pa $lang['additional'] = 'Eine Komma-separierte Liste von zusätzlichen AD-Attributen, die von den Benutzerobjekten abgefragt werden. Wird von einigen Plugins benutzt.'; $lang['update_name'] = 'Nutzern erlauben ihren AD Anzeigenamen zu aktualisieren?'; $lang['update_mail'] = 'Nutzern erlauben ihre E-Mail-Adresse zu aktualisieren?'; +$lang['recursive_groups'] = 'Auflösen verschachtelter Gruppen für ihre jeweiligen Mitglieder (langsamer).'; diff --git a/lib/plugins/authad/lang/sv/lang.php b/lib/plugins/authad/lang/sv/lang.php index 8c6397552..35b6d0646 100644 --- a/lib/plugins/authad/lang/sv/lang.php +++ b/lib/plugins/authad/lang/sv/lang.php @@ -4,7 +4,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Tor Härnqvist <tor@harnqvist.se> - * @author Smorkster Andersson smorkster@gmail.com + * @author Smorkster Andersson <smorkster@gmail.com> */ $lang['domain'] = 'Inloggningsdomän'; $lang['authpwdexpire'] = 'Ditt lösenord kommer att bli ogiltigt om %d dagar, du bör ändra det snart.'; diff --git a/lib/plugins/authad/lang/sv/settings.php b/lib/plugins/authad/lang/sv/settings.php index 249eb33ac..385964861 100644 --- a/lib/plugins/authad/lang/sv/settings.php +++ b/lib/plugins/authad/lang/sv/settings.php @@ -3,14 +3,18 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * + * @author Patrik K Lundberg <patrik.kotiranta.lundberg@gmail.com> * @author Tor Härnqvist <tor@harnqvist.se> - * @author Smorkster Andersson smorkster@gmail.com + * @author Smorkster Andersson <smorkster@gmail.com> */ $lang['account_suffix'] = 'Ditt konto suffix. T.ex. <code>min.domän.org</code>'; $lang['base_dn'] = 'Din bas-DN. T ex <code>DC=min,DC=domän,DC=org</code>'; $lang['domain_controllers'] = 'En kommaseparerad lista av Domain controllers. T ex <code>srv1.domain.org,srv2.domain.org</code>'; +$lang['admin_username'] = 'Anpassad'; $lang['admin_password'] = 'Lösenord för användare ovan.'; $lang['sso'] = 'Ska Single-Sign-On via Kerberos eller NTLM användas?'; +$lang['sso_charset'] = 'Alla namespaces'; +$lang['real_primarygroup'] = 'Alla tider'; $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.'; $lang['debug'] = 'Visa utökad avlusningsinformation för fel?'; @@ -18,3 +22,4 @@ $lang['expirywarn'] = 'Antakl dagar i förväg att varna användare o $lang['additional'] = 'En komma-separerad lista på extra AT-attibut att hämta från användardata. Används av vissa plugin.'; $lang['update_name'] = 'Tillåt användare att uppdatera deras AD-visningsnamn?'; $lang['update_mail'] = 'Tillåt användare att uppdatera deras e-postadresser?'; +$lang['recursive_groups'] = 'Senaste veckan'; diff --git a/lib/plugins/authad/lang/tr/settings.php b/lib/plugins/authad/lang/tr/settings.php index 8dfc4622b..a07793ff2 100644 --- a/lib/plugins/authad/lang/tr/settings.php +++ b/lib/plugins/authad/lang/tr/settings.php @@ -3,10 +3,13 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * + * @author Eren <bosshyapma@protonmail.com> * @author Hakan <hakandursun2009@gmail.com> * @author mahir <mahirtakak@gmail.com> */ $lang['admin_password'] = 'Yukarıdaki kullanıcının şifresi.'; +$lang['use_ssl'] = 'SSL bağlantısı kullan? Eğer kullanılırsa aşağıdaki TLS\'i açma.'; +$lang['use_tls'] = 'TLS bağlantısı kullan? Eğer kullanılırsa yukarıdaki SSL\'i açma.'; $lang['debug'] = 'Hatalarda ek hata ayıklama çıktısı gösterilsin mi?'; $lang['update_name'] = 'Kullanıcıların AD görünen adlarını güncellemelerine izin verilsin mi?'; $lang['update_mail'] = 'Kullanıcıların e-posta adresini güncellemelerine izin verilsin mi?'; |