[Shuttlebb-svn] SF.net SVN: shuttlebb: [69] branch/sources/class_user.php

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

Revision: 69
          http://svn.sourceforge.net/shuttlebb/?rev=69&view=rev
Author:   afterlife69
Date:     2006-12-03 19:31:14 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
user now accepts session as a parameter instead of global.

Modified Paths:
--------------
    branch/sources/class_user.php

Modified: branch/sources/class_user.php
===================================================================
--- branch/sources/class_user.php	2006-12-04 03:22:06 UTC (rev 68)
+++ branch/sources/class_user.php	2006-12-04 03:31:14 UTC (rev 69)
@@ -37,12 +37,20 @@
 	 * @param integer $page_id
 	 * @return object
 	 */
-	function user ( $page_id )
+	function user ( $session )
 	{
-		global $session, $db, $tpl, $_GET, $config, $lng, $_COOKIE, $auth;
+		global $db;
+		global $config;
+		global $_COOKIE;
+		global $_GET;
 		
-		// Init session object
-		$session = new session ( $page_id );
+		// Handle the session object
+		$this->session = ( is_object ( $session ) ) ? $session : false;
+		if ( ! $this->session )
+		{
+			global $session;
+			$this->session = $session = new session();
+		}
 
 		// Handle autologins
 		$session_key = ( is_string ( $_COOKIE['_autologin'] ) ) ? $db->sql_escape($_COOKIE['_autologin']) : false;
@@ -184,7 +192,8 @@
 	 */
 	function ban($user_id, $ban_type, $ban_data, $ban_reason, $ban_time)
 	{
-		global $db, $auth, $session;
+		global $db;
+		global $auth;
 
 		$result = $db->sql_query('SELECT * FROM ' . BAN_TABLE . ' 
 			WHERE ban_type = \'' . $db->sql_escape($ban_type) . '\' 
@@ -196,7 +205,7 @@
 			return false;
 		}
 		
-		if ( $session->ip == $ban_data && $ban_type == 'ip' )
+		if ( $this->session->ip == $ban_data && $ban_type == 'ip' )
 		{
 			$db->sql_freeresult($result);
 			return false;
@@ -264,17 +273,17 @@
 	 */
 	function login($user_id, $autologin = false)
 	{
-		global $db, $session;
+		global $db;
 
 		$result = $db->sql_query('SELECT * FROM ' . SESSIONS_TABLE . ' WHERE user_id = ' . (int) $user_id);
 		while ( $row = $db->sql_fetchrow($result) )
 		{
-			$session->purge($row['session_id']);
+			$this->session->purge($row['session_id']);
 		}
 
 		$db->sql_freeresult($result);
 
-		$db->sql_update(SESSION_TABLE, array('user_id' => $user_id), false, true, 'session_id = \'' . $db->sql_escape($session->sid) . '\'');
+		$db->sql_update(SESSION_TABLE, array('user_id' => $user_id), false, true, 'session_id = \'' . $db->sql_escape($this->session->sid) . '\'');
 
 		if ( $autologin )
 		{
@@ -296,14 +305,14 @@
 	 */
 	function logout()
 	{
-		global $db, $session;
+		global $db;
 
-		if ( $session->data['user_id'] != UNREGISTERED )
+		if ( $this->session->data['user_id'] != UNREGISTERED )
 		{
-			$db->sql_query('DELETE FROM ' . SESSIONS_KEY_TABLE . ' WHERE user_id = ' . (int) $session->data['user_id']);
+			$db->sql_query('DELETE FROM ' . SESSIONS_KEY_TABLE . ' WHERE user_id = ' . (int) $this->session->data['user_id']);
 		}
 		
-		return $db->sql_update(SESSIONS_TABLE, array('user_id' => 0), false, false, 'session_id = \'' . $db->sql_escape($session->sid) . '\'')	
+		return $db->sql_update(SESSIONS_TABLE, array('user_id' => UNREGISTERED), false, false, 'session_id = \'' . $db->sql_escape($this->session->sid) . '\'')	
 	}
 	
 	/**
@@ -314,9 +323,9 @@
 	 */
 	function check_ban($user_id = '')
 	{
-		global $db, $session;
+		global $db;
 
-		$result = $db->sql_query('SELECT * FROM ' . BAN_TABLE . ' WHERE (user_id = "' . (int) $user_id . '" OR user_ip = "' . $db->sql_escape($session->ip) . '")');
+		$result = $db->sql_query('SELECT * FROM ' . BAN_TABLE . ' WHERE (user_id = "' . (int) $user_id . '" OR user_ip = "' . $db->sql_escape($this->session->ip) . '")');
 
 		if ( $db->sql_fetchrow ( $result ) )
 		{


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