cvs: bugtracker /includes session.php user.php /template/generic/user verify.php

bcarlyon Fri Aug 15 11:41:46 2008 UTC Modified files: /bugtracker/includes session.php user.php /bugtracker/template/generic/user verify.php Log: Fixed a missing host ref for create account emailing Fixed a bug where you verify -> login -> return is verify page and your cant reverify, so its destroys your session http://cvs.php.net/viewvc.cgi/bugtracker/includes/session.php?r1=1.7&r2=1.8&diff_format=u Index: bugtracker/includes/session.php diff -u bugtracker/includes/session.php:1.7 bugtracker/includes/session.php:1.8 --- bugtracker/includes/session.php:1.7 Wed Aug 13 22:33:33 2008 +++ bugtracker/includes/session.php Fri Aug 15 11:41:46 2008 @@ -37,7 +37,7 @@ * @author Barry Carlyon <bcarlyon@php.net> * @copyright 2008-2008 Barry Carlyon * @license http://www.opensource.org/licenses/bsd-license.php BSD License -* @version CVS: $Id: session.php,v 1.7 2008/08/13 22:33:33 bcarlyon Exp $ +* @version CVS: $Id: session.php,v 1.8 2008/08/15 11:41:46 bcarlyon Exp $ * @link http://gsoc.barrycarlyon.servegame.org/ */ @@ -58,7 +58,8 @@ $later = time() - (15 * 60); $query = 'DELETE FROM ' . SESSION_TABLE . ' WHERE UNIX_TIMESTAMP(last_active) < \'' . $later . '\''; $db->get_data($query); - trace($db->affected_rows . ' Killed Sessions'); + if ($db->affected_rows) + trace($db->affected_rows . ' Killed Sessions'); $this->ip_address = $_SERVER['REMOTE_ADDR']; http://cvs.php.net/viewvc.cgi/bugtracker/includes/user.php?r1=1.21&r2=1.22&diff_format=u Index: bugtracker/includes/user.php diff -u bugtracker/includes/user.php:1.21 bugtracker/includes/user.php:1.22 --- bugtracker/includes/user.php:1.21 Wed Aug 13 22:33:33 2008 +++ bugtracker/includes/user.php Fri Aug 15 11:41:46 2008 @@ -37,7 +37,7 @@ * @author Barry Carlyon <bcarlyon@php.net> * @copyright 2008-2008 Barry Carlyon * @license http://www.opensource.org/licenses/bsd-license.php BSD License -* @version CVS: $Id: user.php,v 1.21 2008/08/13 22:33:33 bcarlyon Exp $ +* @version CVS: $Id: user.php,v 1.22 2008/08/15 11:41:46 bcarlyon Exp $ * @link http://gsoc.barrycarlyon.servegame.org/ */ @@ -208,7 +208,7 @@ return; } function register($user_data) { - global $db,$email; + global $db,$email,$cookie; //this will create a user, BUT WILL NOT CHECK IT EXISTS FIRST //assumes done prior to calling this function http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/user/verify.php?r1=1.10&r2=1.11&diff_format=u Index: bugtracker/template/generic/user/verify.php diff -u bugtracker/template/generic/user/verify.php:1.10 bugtracker/template/generic/user/verify.php:1.11 --- bugtracker/template/generic/user/verify.php:1.10 Wed Aug 13 22:33:34 2008 +++ bugtracker/template/generic/user/verify.php Fri Aug 15 11:41:46 2008 @@ -37,7 +37,7 @@ * @author Barry Carlyon <bcarlyon@php.net> * @copyright 2008-2008 Barry Carlyon * @license http://www.opensource.org/licenses/bsd-license.php BSD License -* @version CVS: $Id: verify.php,v 1.10 2008/08/13 22:33:34 bcarlyon Exp $ +* @version CVS: $Id: verify.php,v 1.11 2008/08/15 11:41:46 bcarlyon Exp $ * @link http://gsoc.barrycarlyon.servegame.org/ */ @@ -57,6 +57,10 @@ $template->page_title .= 'Verify'; $template->content_title = 'Verify'; +if ($user->logged_in) { + header("Location: /"); +} + if ($email && $tehkey) { //we have everything we need to go for verify