--- a/punbb/include/functions.php	Sun Apr 06 00:35:38 2008 -0400
+++ b/punbb/include/functions.php	Sun Jun 15 01:42:31 2008 -0400
@@ -90,7 +90,7 @@
 
 	// Check if there's a user matching $user and $password
 	$query = array(
-		'SELECT'	=> 'eu.username AS username_authoritative, u.*, u.username AS bla, g.*, o.logged, o.idle, o.csrf_token, o.prev_url',
+		'SELECT'	=> 'u.*, eu.username, eu.user_id as id, g.*, o.logged, o.idle, o.csrf_token, o.prev_url',
     'FROM'		=> $pun_db->prefix . 'users AS u',
 		'JOINS'		=> array(
       array(
@@ -116,8 +116,13 @@
 
 	($hook = get_hook('fn_qr_get_user')) ? eval($hook) : null;
 	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+  $count = $pun_db->num_rows($result);
+  if ( $count < 1 )
+  {
+    set_default_user();
+    return false;
+  }
 	$pun_user = $pun_db->fetch_assoc($result);
-  $pun_user['username'] =& $pun_user['username_authoritative'];
 
 	if (!$session->user_logged_in)
 		set_default_user();
@@ -517,6 +522,7 @@
 function generate_navlinks()
 {
 	global $pun_config, $lang_common, $pun_url, $pun_user;
+  global $db, $session, $paths, $template, $plugins; // Common objects
 
 	// Index should always be displayed
 	$links[] = '<li id="navindex"'.((PUN_PAGE == 'index') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['index']).'"><span>'.$lang_common['Index'].'</span></a></li>';
@@ -533,7 +539,7 @@
 			$links[] = '<li id="navsearch"'.((PUN_PAGE == 'search') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['search']).'"><span>'.$lang_common['Search'].'</span></a></li>';
 
 		$links[] = '<li id="navregister"'.((PUN_PAGE == 'register') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['register']).'"><span>'.$lang_common['Register'].'</span></a></li>';
-		$links[] = '<li id="navlogin"'.((PUN_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.pun_link($pun_url['login']).'"><span>'.$lang_common['Login'].'</span></a></li>';
+		$links[] = '<li id="navlogin"'.((PUN_PAGE == 'login') ? ' class="isactive"' : '').'><a href="'.makeUrlNS('Special', 'Login/' . $paths->fullpage).'" onclick="ajaxStartLogin(); return false;"><span>'.$lang_common['Login'].'</span></a></li>';
 	}
 	else
 	{
@@ -1832,7 +1838,7 @@
 function csrf_confirm_form()
 {
 	global $pun_db, $pun_url, $lang_common, $pun_config, $base_url, $pun_start, $tpl_main, $pun_user, $pun_page, $pun_updates;
-
+  
 	// User pressed the cancel button
 	if (isset($_POST['confirm_cancel']))
 		pun_redirect(htmlspecialchars($_POST['prev_url']), $lang_common['Cancel redirect']);