Revision: 20945
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20945
Author: Caeies
Date: 2010-01-13 18:24:52 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Fix a typo
Modified Paths:
--------------
modules/phpgwapi/trunk/inc/auth/class.auth_ldap.inc.php
modules/phpgwapi/trunk/inc/auth/class.auth_sql.inc.php
Modified: modules/phpgwapi/trunk/inc/auth/class.auth_ldap.inc.php
===================================================================
--- modules/phpgwapi/trunk/inc/auth/class.auth_ldap.inc.php 2010-01-09
11:56:12 UTC (rev 20944)
+++ modules/phpgwapi/trunk/inc/auth/class.auth_ldap.inc.php 2010-01-13
18:24:52 UTC (rev 20945)
@@ -138,7 +138,7 @@
}
// Generate the search DN
- $search = $this->_generate_dn($this->userid_search_dn,
'', $account_id);
+ $search = $this->_generate_dn($this->userid_search_dn,
'', $_account_id);
$ds = $GLOBALS['phpgw']->common->ldapConnect();
$sri = ldap_search($ds,
$GLOBALS['phpgw_info']['server']['ldap_context'], $search, array('dn') );
@@ -151,7 +151,7 @@
$dn = $allValues[0]['dn'];
- $entry['userpassword'] =
$this->generate_hash($new_password);
+ $entry['userpassword'] =
$this->generate_hash($new_passwd);
if ( isset($allValues[0]['shadowlastchange']) )
{
$entry['shadowLastChange'] = date('U') /
phpgwapi_datetime::SECONDS_IN_DAY;
Modified: modules/phpgwapi/trunk/inc/auth/class.auth_sql.inc.php
===================================================================
--- modules/phpgwapi/trunk/inc/auth/class.auth_sql.inc.php 2010-01-09
11:56:12 UTC (rev 20944)
+++ modules/phpgwapi/trunk/inc/auth/class.auth_sql.inc.php 2010-01-13
18:24:52 UTC (rev 20945)
@@ -92,7 +92,7 @@
}
}
- $hash = $this->generate_hash($new_password);
+ $hash = $this->generate_hash($new_passwd);
$hash_safe =
$GLOBALS['phpgw']->db->db_addslashes($hash); // just to be safe :)
$now = time();
_______________________________________________
phpGroupWare-cvs mailing list
phpGroupWare-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs
