From 2bdcd295826dd0745631fafd6d24e876f68d1589 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 16 Jul 2013 10:42:31 +0000 Subject: [PATCH] pass acount_id to crackcheck, as it is required for crackcheck rule validation forbid_name --- phpgwapi/inc/class.auth.inc.php | 2 +- preferences/inc/class.bopassword.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.auth.inc.php b/phpgwapi/inc/class.auth.inc.php index 696987845a..33fa479249 100644 --- a/phpgwapi/inc/class.auth.inc.php +++ b/phpgwapi/inc/class.auth.inc.php @@ -226,7 +226,7 @@ class auth */ function change_password($old_passwd, $new_passwd, $account_id=0) { - if (($err = self::crackcheck($new_passwd))) + if (($err = self::crackcheck($new_passwd,null,null,null,$account_id))) { throw new egw_exception_wrong_userinput($err); } diff --git a/preferences/inc/class.bopassword.inc.php b/preferences/inc/class.bopassword.inc.php index 8ff2c9dd54..d1602b9b88 100644 --- a/preferences/inc/class.bopassword.inc.php +++ b/preferences/inc/class.bopassword.inc.php @@ -31,7 +31,7 @@ function changepass($old,$new) { - if (($ret = $GLOBALS['egw']->auth->change_password($old, $new))) + if (($ret = $GLOBALS['egw']->auth->change_password($old, $new, $GLOBALS['egw_info']['user']['account_id']))) { $GLOBALS['hook_values']['account_id'] = $GLOBALS['egw_info']['user']['account_id']; $GLOBALS['hook_values']['old_passwd'] = $old;