[eGroupWare-svn] r42924 - in /trunk/phpgwapi: inc/class.auth_ads.inc.php lang/egw_de.lang lang/egw_en.lang

[<ral...@us...>]

Author: ralfbecker
Date: Sat Jun 29 10:51:02 2013
New Revision: 42924

URL: http://svn.stylite.de/viewvc/egroupware?rev=42924&view=rev
Log:
* Admin/Preferences/ADS: give explicit error, that AD requires SSL or TLS to change passwords (not just failing with unspecific error)

Modified:
    trunk/phpgwapi/inc/class.auth_ads.inc.php
    trunk/phpgwapi/lang/egw_de.lang
    trunk/phpgwapi/lang/egw_en.lang

Modified: trunk/phpgwapi/inc/class.auth_ads.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.auth_ads.inc.php?rev=42924&r1=42923&r2=42924&view=diff
==============================================================================
--- trunk/phpgwapi/inc/class.auth_ads.inc.php (original)
+++ trunk/phpgwapi/inc/class.auth_ads.inc.php Sat Jun 29 10:51:02 2013
@@ -103,10 +103,15 @@
 	 */
 	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");
-			return false;		// Cant change passwd in ADS
+			error_log(__METHOD__."(\$old_passwd, \$new_passwd, $account_id) accounts_ads::get_adldap() returned false");
+			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')

Modified: trunk/phpgwapi/lang/egw_de.lang
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/lang/egw_de.lang?rev=42924&r1=42923&r2=42924&view=diff
==============================================================================
--- trunk/phpgwapi/lang/egw_de.lang (original)
+++ trunk/phpgwapi/lang/egw_de.lang Sat Jun 29 10:51:02 2013
@@ -40,6 +40,7 @@
 action when category is an email address	groupdav	de	Aktion wenn Kategorie eine E-Mail Adresse ist
 actions	common	de	Befehle
 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 %1 category for	common	de	%1 Kategorie hinzufügen für
 add category	common	de	Kategorie hinzufügen

Modified: trunk/phpgwapi/lang/egw_en.lang
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/lang/egw_en.lang?rev=42924&r1=42923&r2=42924&view=diff
==============================================================================
--- trunk/phpgwapi/lang/egw_en.lang (original)
+++ trunk/phpgwapi/lang/egw_en.lang Sat Jun 29 10:51:02 2013
@@ -40,6 +40,7 @@
 action when category is an email address	groupdav	en	Action when category is an EMail address
 actions	common	en	Actions
 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 %1 category for	common	en	Add %1 category for
 add category	common	en	Add category