[Tikiwiki-cvs] tiki/lib userslib.php,1.240,1.241

[<lph...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30719/lib

Modified Files:
	userslib.php 
Log Message:
Fixing the first login for OpenID users.


Index: userslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/userslib.php,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- userslib.php	9 Sep 2007 18:03:45 -0000	1.240
+++ userslib.php	9 Sep 2007 18:26:34 -0000	1.241
@@ -1876,9 +1876,15 @@
 
 	// Generate a unique hash; this is also done below in set_user_fields()
 	if (empty($openid_url))
+	{
 		$hash = $this->hash_pass($pass);
+		$lastLogin = null;
+	}
 	else
+	{
 		$hash = '';
+		$lastLogin = time();
+	}
 		
 	if ($valid == 'n') {
 		$valid = $pass;
@@ -1894,8 +1900,8 @@
 	$new_email_confirm = $this->now;
 	$query = "insert into
 	    `users_users`(`login`, `password`, `email`, `provpass`,
-		    `registrationDate`, `hash`, `pass_confirm`, `email_confirm`, `created`, `valid`, `openid_url`)
-	    values(?,?,?,?,?,?,?,?,?,?,?)";
+		    `registrationDate`, `hash`, `pass_confirm`, `email_confirm`, `created`, `valid`, `openid_url`, `lastLogin`)
+	    values(?,?,?,?,?,?,?,?,?,?,?,?)";
 	$result = $this->query($query, array(
 		    $user,
 		    $pass,
@@ -1907,7 +1913,8 @@
 			(int) $new_email_confirm,
 		    (int) $this->now,
 			$valid,
-			$openid_url
+			$openid_url,
+			$lastLogin
 		    ));
 
 	$this->assign_user_to_group($user, 'Registered');