Added feature to drop the previous login into appsessions, this way developer can find out how long its been since they last logged in.

- Formating in sqlssl
- Fixed change_password() in sqlssl not being correct and based on older versions

phpgwapi/inc/class.auth_ldap.inc.php

@@ -26,6 +26,8 @@
   
 	class auth
 	{
+		var $previous_login = -1;
+
 		function authenticate($username, $passwd)
 		{
 			global $phpgw_info, $phpgw;
@@ -88,7 +90,10 @@
 		{
 			global $phpgw;
 
-			$account_id = get_account_id($account_id);
+			$db->query("select account_lastlogin from phpgw_accounts where account_id='$account_id'",__LINE__,__FILE__);
+			$db->next_record();
+			$this->previous_login = $db->f('account_lastlogin');
+
 			$now = time();
 
 			$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"

phpgwapi/inc/class.auth_mail.inc.php

@@ -25,6 +25,8 @@
 
 	class auth
 	{
+		var $previous_login = -1;
+
 		function authenticate($username, $passwd)
 		{
 			global $phpgw_info, $phpgw;
@@ -73,7 +75,9 @@
 		{
 			global $phpgw;
 
-			$account_id = get_account_id($account_id);
+			$db->query("select account_lastlogin from phpgw_accounts where account_id='$account_id'",__LINE__,__FILE__);
+			$db->next_record();
+			$this->previous_login = $db->f('account_lastlogin');
 
 			$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"
 				. "$ip', account_lastlogin='" . time()

phpgwapi/inc/class.auth_sql.inc.php

@@ -26,6 +26,8 @@
 
 	class auth
 	{
+		var $previous_login = -1;
+
 		function authenticate($username, $passwd)
 		{
 			global $phpgw_info, $phpgw;
@@ -35,9 +37,13 @@
 				. "account_pwd='" . md5($passwd) . "' AND account_status ='A'",__LINE__,__FILE__);
 			$db->next_record();
 
-			if ($db->f('account_lid')) {
+			if ($db->f('account_lid'))
+			{
+				$this->previous_login = $db->f('account_lastlogin');
 				return True;
-			} else {
+			}
+			else
+			{
 				return False;
 			}
 		}
@@ -65,8 +71,6 @@
 		{
 			global $phpgw;
 
-			$account_id = get_account_id($account_id);
-
 			$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"
 				. "$ip', account_lastlogin='" . time()
 				. "' where account_id='$account_id'",__LINE__,__FILE__);

phpgwapi/inc/class.auth_sqlssl.inc.php

@@ -25,46 +25,63 @@
 
 	class auth
 	{
+		var $previous_login = -1;
 
-    function authenticate($username, $passwd) {
+		function authenticate($username, $passwd)
+		{
 			global $phpgw_info, $phpgw, $HTTP_SERVER_VARS;
 
 			$db = $phpgw->db;
 
 			$local_debug = False;
 
-      if ($local_debug) {
+			if ($local_debug)
+			{
 				echo "<b>Debug SQL: uid - $username passwd - $passwd</b>";
 			}
 
 			# Apache + mod_ssl provide the data in the environment
 			# Certificate (chain) verification occurs inside mod_ssl
 			# see http://www.modssl.org/docs/2.8/ssl_howto.html#ToC6
-      if (!isset($HTTP_SERVER_VARS["SSL_CLIENT_S_DN"])) {
+			if (!isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN']))
+			{
 				# if we're not doing SSL authentication, behave like auth_sql
 				$db->query("SELECT * FROM phpgw_accounts WHERE account_lid = '$username' AND "
                . "account_pwd='" . md5($passwd) . "' AND account_status ='A'",__LINE__,__FILE__);
 				$db->next_record();
-       } else {
+			}
+			else
+			{
 				# use username only for authentication, ignore X.509 subject in $passwd for now
 				$db->query("SELECT * FROM phpgw_accounts WHERE account_lid = '$username' AND account_status ='A'",__LINE__,__FILE__);
 				$db->next_record();
 			}
 
-      if ($db->f("account_lid")) {
+			if ($db->f('account_lid'))
+			{
 				return True;
-      } else {
+			}
+			else
+			{
 				return False;
 			}
 		}
 
-    function change_password($old_passwd, $new_passwd) {
+		function change_password($old_passwd, $new_passwd, $account_id = '')
+		{
 			global $phpgw_info, $phpgw;
+
+			if (! $account_id)
+			{
+				$account_id = $phpgw_info['user']['account_id'];
+			}
+
 			$encrypted_passwd = md5($new_passwd);
-      $phpgw->db->query("update phpgw_accounts set account_pwd='" . md5($new_passwd) . "' "
+
-	                  . "where account_lid='" . $phpgw_info["user"]["userid"] . "'",__LINE__,__FILE__);
+			$phpgw->db->query("update phpgw_accounts set account_pwd='" . md5($new_passwd) . "',"
-      $phpgw->db->query("update phpgw_accounts set account_lastpwd_change='" . time() . "' where account_id='"
+				. "account_lastpwd_change='" . time() . "' where account_id='" . $account_id . "'",__LINE__,__FILE__);
-   			    	. $phpgw_info["user"]["account_id"] . "'",__LINE__,__FILE__);
+
+			$phpgw->session->appsession('password','phpgwapi',$new_passwd);
 
 			return $encrypted_passwd;
 		}
@@ -73,7 +90,9 @@
 		{
 			global $phpgw;
 
-      $account_id = get_account_id($account_id);
+			$db->query("select account_lastlogin from phpgw_accounts where account_id='$account_id'",__LINE__,__FILE__);
+			$db->next_record();
+			$this->previous_login = $db->f('account_lastlogin');
 
 			$phpgw->db->query("update phpgw_accounts set account_lastloginfrom='"
 				. "$ip', account_lastlogin='" . time()

phpgwapi/inc/class.sessions.inc.php

@@ -308,6 +308,7 @@
 			$phpgw->db->query("insert into phpgw_access_log values ('" . $this->sessionid . "','"
 								. "$login','" . $user_ip . "','$now','') ",__LINE__,__FILE__);
 
+			$this->appsession('account_previous_login','phpgwapi',$phpgw->auth->previous_login);
 			$phpgw->auth->update_lastlogin($this->account_id,$user_ip);
 
 			return $this->sessionid;