[Shuttlebb-svn] SF.net SVN: shuttlebb: [82] branch

[<aft...@us...>]

Revision: 82
          http://svn.sourceforge.net/shuttlebb/?rev=82&view=rev
Author:   afterlife69
Date:     2006-12-05 08:19:23 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
user handler is now working again

Modified Paths:
--------------
    branch/index.php
    branch/sources/class_user.php
    branch/template/Default/module_index.html

Removed Paths:
-------------
    branch/template/Default/cache/%%E2^E2A^E2AEC254%%module_index.html

Modified: branch/index.php
===================================================================
--- branch/index.php	2006-12-05 16:05:08 UTC (rev 81)
+++ branch/index.php	2006-12-05 16:19:23 UTC (rev 82)
@@ -107,8 +107,8 @@
 /**
  * Assign some important information to smarty
  */
-$template->assign('user', $user);
-$template->assign('session', $session);
+$template->assign('user', $user->data);
+$template->assign('session', $session->data);
 $template->assign('constants', array(
 	'guest_id'	=> UNREGISTERED,
 	'root_path'	=> ROOT_PATH,

Modified: branch/sources/class_user.php
===================================================================
--- branch/sources/class_user.php	2006-12-05 16:05:08 UTC (rev 81)
+++ branch/sources/class_user.php	2006-12-05 16:19:23 UTC (rev 82)
@@ -64,6 +64,9 @@
 				$this->login($sessiondata['user_id']);
 			}
 		}
+		
+		// Pull userdata
+		$this->data = $this->userdata($this->session->data['user_id']);
 
 		/*
 		// Pull userdata based on session
@@ -343,8 +346,8 @@
 	function userdata($user_id)
 	{
 		global $db;
-	
-		$result = $db->sql_query('SELECT * FROM ' . SESSIONS_TABLE . ' WHERE user_id = ' . (int) $user_id);
+
+		$result = $db->sql_query('SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . (int) $user_id);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
 		

Deleted: branch/template/Default/cache/%%E2^E2A^E2AEC254%%module_index.html
===================================================================
--- branch/template/Default/cache/%%E2^E2A^E2AEC254%%module_index.html	2006-12-05 16:05:08 UTC (rev 81)
+++ branch/template/Default/cache/%%E2^E2A^E2AEC254%%module_index.html	2006-12-05 16:19:23 UTC (rev 82)
@@ -1,8 +0,0 @@
-139
-a:4:{s:8:"template";a:1:{s:17:"module_index.html";b:1;}s:9:"timestamp";i:1165333881;s:7:"expires";i:1165337481;s:13:"cache_serials";a:0:{}}<!--
-/*
- * $Id$
- * $Date$
- * $Rev$
- */ -->
-	You are logged in!

Modified: branch/template/Default/module_index.html
===================================================================
--- branch/template/Default/module_index.html	2006-12-05 16:05:08 UTC (rev 81)
+++ branch/template/Default/module_index.html	2006-12-05 16:19:23 UTC (rev 82)
@@ -4,8 +4,9 @@
  * $Date$
  * $Rev$
  */ -->
-{if $user->user_id != $constants.guest_id }
-	You are logged in!
+{if isset($constants.guest_id) and $user.user_id != $constants.guest_id }
+	Hello {$user.username}, You are logged in!
 {else}
+
 	You are not logged in!
 {/if}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.