From 46d7b32640f91b1cee88dbced608b0ba4b44d224 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Wed, 21 Mar 2001 23:25:03 +0000
Subject: Changes related to session code updates

git-svn-id: file:///svn/phpbb/trunk@122 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/common.php | 74 ++++++++++++++++++--------------------------------------
 1 file changed, 23 insertions(+), 51 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 96ef85220d..1c2668e750 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -43,68 +43,40 @@ $userdata = Array();
 
 // Setup forum wide options.
 // This is also the first DB query/connect
-$sql = "SELECT * FROM ".CONFIG_TABLE." WHERE selected = 1";
+$sql = "SELECT *
+	FROM ".CONFIG_TABLE."
+	WHERE selected = 1";
 if(!$result = $db->sql_query($sql))
 {
 	error_die($db, SQL_CONNECT);
 }
 else  
 {
-	$config = $db->sql_fetchrowset($result);
-	$sitename = stripslashes($config[0]["sitename"]);
-	$allow_html = $config[0]["allow_html"];
-	$allow_bbcode = $config[0]["allow_bbcode"];
-	$allow_sig = $config[0]["allow_sig"];
-	$allow_namechange = $config[0]["allow_namechange"];
-	$posts_per_page = $config[0]["posts_per_page"];
-	$hot_threshold = $config[0]["hot_threshold"];
-	$topics_per_page = $config[0]["topics_per_page"];
-	$override_user_themes = $config[0]["override_themes"];
-	$email_sig = stripslashes($config[0]["email_sig"]);
-	$email_from = $config[0]["email_from"];
-	$default_lang = $config[0]["default_lang"];
-	$require_activation = $config[0]["require_activation"];
-	$sys_timezone = $config[0]["system_timezone"];
+	$config = $db->sql_fetchrow($result);
+	$sitename = stripslashes($config["sitename"]);
+	$allow_html = $config["allow_html"];
+	$allow_bbcode = $config["allow_bbcode"];
+	$allow_sig = $config["allow_sig"];
+	$allow_namechange = $config["allow_namechange"];
+	$posts_per_page = $config["posts_per_page"];
+	$hot_threshold = $config["hot_threshold"];
+	$topics_per_page = $config["topics_per_page"];
+	$override_user_themes = $config["override_themes"];
+	$email_sig = stripslashes($config["email_sig"]);
+	$email_from = $config["email_from"];
+	$default_lang = $config["default_lang"];
+	$require_activation = $config["require_activation"];
+	$sys_timezone = $config["system_timezone"];
 	$sys_lang = $default_lang;            
 }
 
 include('language/lang_'.$default_lang.'.'.$phpEx);
 
-// Check if user is banned
-if(!auth("ip ban", $db, "", $user_ip))
-{
-	error_die($db, BANNED);
-}
-
-if(isset($HTTP_COOKIE_VARS[$session_cookie])) 
-{
-	$sessid = $HTTP_COOKIE_VARS[$session_cookie];
-	$userid = get_userid_from_session($sessid, $session_cookie_time, $user_ip, $db);
+//
+// Initialise session stuff 
+// See file for more details ...
+//
 
-	if ($userid)
-	{
-		$user_logged_in = 1;
-		update_session_time($sessid, $db);
-	
-		if(!auth("username ban", $db, $userid))
-		{
-			error_die($db, BANNED);
-		}
-		$userdata = get_userdata_from_id($userid, $db);
-	}
-}            
-
-// If the user isn't logged in check if they have a user ID cookie.
-if (!$user_logged_in)
-{
-	if(isset($HTTP_COOKIE_VARS[$cookie_name]))
-	{
-		$userdata = get_userdata_from_id($HTTP_COOKIE_VARS["$cookie_name"], $db);
-		if(!auth("username ban", $db, $userdata["user_id"]))
-		{
-			error_die($db, BANNED);
-		}
-	}
-}
+$userdata = session_pagestart($db, $user_ip, $session_length);
 
 ?>
-- 
cgit v1.2.1