From: <nk...@us...> - 2007-09-09 19:11:13
|
Update of /cvsroot/tikiwiki/tiki/lib In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17208/lib Modified Files: userslib.php Log Message: [FIX] new openid accounts that need validation are not activated until validated. Index: userslib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/userslib.php,v retrieving revision 1.241 retrieving revision 1.242 diff -u -d -r1.241 -r1.242 --- userslib.php 9 Sep 2007 18:26:34 -0000 1.241 +++ userslib.php 9 Sep 2007 19:11:12 -0000 1.242 @@ -1869,21 +1869,21 @@ } function add_user($user, $pass, $email, $provpass = '',$pass_first_login=false, $valid=NULL, $openid_url=NULL) { - global $tikilib, $cachelib, $patterns, $email_due, $feature_clear_passwords; + global $tikilib, $cachelib, $patterns, $email_due, $feature_clear_passwords, $validateRegistration; if ($this->user_exists($user) || empty($user) || !preg_match($patterns['login'],$user)) return false; // Generate a unique hash; this is also done below in set_user_fields() + $lastLogin = null; if (empty($openid_url)) { $hash = $this->hash_pass($pass); - $lastLogin = null; } else { $hash = ''; - $lastLogin = time(); + if (!isset($validateRegistration) || $validateRegistration != 'y') $lastLogin = time(); } if ($valid == 'n') { |