From a7c66aa628d9e8a9b2581efefe145bf8c76a948a Mon Sep 17 00:00:00 2001
From: jengo <jengo@alumni.egroupware.org>
Date: Tue, 17 Apr 2001 17:49:13 +0000
Subject: [PATCH] Fixed appsessions not being updated durring a password change

---
 phpgwapi/inc/class.auth_ldap.inc.php |  1 +
 phpgwapi/inc/class.auth_sql.inc.php  | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/phpgwapi/inc/class.auth_ldap.inc.php b/phpgwapi/inc/class.auth_ldap.inc.php
index 34d2b170d2..5398a13f47 100644
--- a/phpgwapi/inc/class.auth_ldap.inc.php
+++ b/phpgwapi/inc/class.auth_ldap.inc.php
@@ -78,6 +78,7 @@
 			{
 				return false;
 			}
+			$phpgw->session->appsession('password','phpgwapi',$new_passwd);
 	
 			return $encrypted_passwd;
 		}
diff --git a/phpgwapi/inc/class.auth_sql.inc.php b/phpgwapi/inc/class.auth_sql.inc.php
index 4fe7b04c0d..f09a2d8cac 100644
--- a/phpgwapi/inc/class.auth_sql.inc.php
+++ b/phpgwapi/inc/class.auth_sql.inc.php
@@ -42,17 +42,21 @@
 			}
 		}
 
-		function change_password($old_passwd, $new_passwd, $_accountid="")
+		function change_password($old_passwd, $new_passwd, $account_id = '')
 		{
 			global $phpgw_info, $phpgw;
 
-			$encrypted_passwd = md5($new_passwd);
-			$_account_id = get_account_id($_accountid);
+			if (! $account_id)
+			{
+				$account_id = $phpgw_info['user']['account_id'];
+			}
 
-			$phpgw->db->query("update phpgw_accounts set account_pwd='" . md5($new_passwd) . "' "
-				. "where account_id='" . $_account_id . "'",__LINE__,__FILE__);
-			$phpgw->db->query("update phpgw_accounts set account_lastpwd_change='" . time() . "' where account_id='"
-				. $_account_id . "'",__LINE__,__FILE__);
+			$encrypted_passwd = md5($new_passwd);
+
+			$phpgw->db->query("update phpgw_accounts set account_pwd='" . md5($new_passwd) . "',"
+				. "account_lastpwd_change='" . time() . "' where account_id='" . $account_id . "'",__LINE__,__FILE__);
+
+			$phpgw->session->appsession('password','phpgwapi',$new_passwd);
 
 			return $encrypted_passwd;
 		}