extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Admin/Preferences/ADS: give explicit error, that AD requires SSL or TLS to change passwords (not just failing with unspecific error)

Browse Source
This commit is contained in:
Ralf Becker 2013-06-29 08:51:02 +00:00
parent 5e0c017129
commit 8325352e88
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/inc/class.auth_ads.inc.php
View File

@ -103,10 +103,15 @@ class auth_ads implements auth_backend
*/ */
function change_password($old_passwd, $new_passwd, $account_id=0) function change_password($old_passwd, $new_passwd, $account_id=0)
{ {
if (!($adldap = accounts_ads::get_adldap()) || !($adldap->getUseSSL() || $adldap->getUseTLS())) if (!($adldap = accounts_ads::get_adldap()))
{ {
error_log(__METHOD__."('$old_passwd', '$new_passwd', $account_id) adldap=".array2string($adldap)." returning false"); error_log(__METHOD__."(\$old_passwd, \$new_passwd, $account_id) accounts_ads::get_adldap() returned false");
return false; // Cant change passwd in ADS return false;
}
if (!($adldap->getUseSSL() || $adldap->getUseTLS()))
{
throw new egw_exception(lang('Failed to change password. Please contact your administrator.').' '.lang('Active directory requires SSL or TLS to change passwords!'));
} }
if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login') if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')

1
phpgwapi/lang/egw_de.lang
View File

@ -40,6 +40,7 @@ action common de Aktion
action when category is an email address groupdav de Aktion wenn Kategorie eine E-Mail Adresse ist action when category is an email address groupdav de Aktion wenn Kategorie eine E-Mail Adresse ist
actions common de Befehle actions common de Befehle
active common de Aktiv active common de Aktiv
active directory requires ssl or tls to change passwords! common de Active Directory benötigt eine SSL oder TLS Verbindung um Passwörter zu ändern!
add common de Hinzufügen add common de Hinzufügen
add %1 category for common de %1 Kategorie hinzufügen für add %1 category for common de %1 Kategorie hinzufügen für
add category common de Kategorie hinzufügen add category common de Kategorie hinzufügen

1
phpgwapi/lang/egw_en.lang
View File

@ -40,6 +40,7 @@ action common en Action
action when category is an email address groupdav en Action when category is an EMail address action when category is an email address groupdav en Action when category is an EMail address
actions common en Actions actions common en Actions
active common en Active active common en Active
active directory requires ssl or tls to change passwords! common en Active directory requires SSL or TLS to change passwords!
add common en Add add common en Add
add %1 category for common en Add %1 category for add %1 category for common en Add %1 category for
add category common en Add category add category common en Add category