5 files changed, 73 insertions, 73 deletions
diff --git a/phpBB/config.php b/phpBB/config.php
index c9d2fb10da..99d08332e3 100644
--- a/phpBB/config.php
+++ b/phpBB/config.php
@@ -70,8 +70,8 @@ $dbuser = "imanidiot";
 $dbpasswd = "imanidiotspassword";
 
 // DB table config
-
 $banlist_table = "phpbb_banlist";
+$categories_table = "phpbb_categories";
 $config_table = "phpbb_config";
 $disallow_table = "phpbb_disallow";
 $forum_access_table = "phpbb_forum_access";
diff --git a/phpBB/db.php b/phpBB/db.php
index d305ae3824..b9283d3350 100644
--- a/phpBB/db.php
+++ b/phpBB/db.php
@@ -23,31 +23,31 @@
 
 switch($dbms)
 {
- case 'mysql':
-   include('db/mysql.'.$phpEx);
-   break;
- case 'postgres':
-   include('db/postgres7.'.$phpEx);
-   break;
- case 'mssql':
-   include('db/mssql.'.$phpEx);
-      break;
- case 'oracle':
-   include('db/oracle.'.$phpEx);
-   break;
+	case 'mysql':
+		include('db/mysql.'.$phpEx);
+		break;
+	case 'postgres':
+		include('db/postgres7.'.$phpEx);
+		break;
+	case 'mssql':
+		include('db/mssql.'.$phpEx);
+		break;
+	case 'oracle':
+		include('db/oracle.'.$phpEx);
+		break;
 }
 
 // Make the database connection.
 $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false);
-if(!$db->db_connect_id) 
+if(!$db) 
 {
-   error_die($db, SQL_CONNECT);
+	error_die($db, SQL_CONNECT);
 }
 
 // Check if user is banned
 if(!auth("ip ban", $db, "", "", "", "", "", $REMOTE_ADDR, "", "", "")) 
 {
-   error_die($db, BANNED);
+	error_die($db, BANNED);
 }
 
 // Initalize these variables to keep them safe.
@@ -56,58 +56,58 @@ $logged_in = 0;
 $userdata = Array();
 
 // Setup forum wide options.
-$sql = "SELECT * FROM config WHERE selected = 1";
+$sql = "SELECT * FROM $config_table WHERE selected = 1";
 if(!$result = $db->sql_query($sql))
 {
-   error_die($db, QUERY_ERROR);
+	error_die($db, QUERY_ERROR);
 }
 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"];
-   $sys_lang = $default_lang;            
+	$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"];
+	$sys_lang = $default_lang;            
 }
 
 if(isset($HTTP_COOKIE_VARS[$session_cookie])) 
 {
-   $sessid = $HTTP_COOKIE_VARS[$session_cookie];
-   $userid = get_userid_from_session($sessid, $session_cookie_time, $REMOTE_ADDR, $db);
+	$sessid = $HTTP_COOKIE_VARS[$session_cookie];
+	$userid = get_userid_from_session($sessid, $session_cookie_time, $REMOTE_ADDR, $db);
 
-   if ($userid)
-     {
-	$user_logged_in = 1;
-	update_session_time($sessid, $db);
+	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(!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);
-	  }
-     }
+	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);
+		}
+	}
 }
 
 // Setup what template to use. Currently just use default
diff --git a/phpBB/functions/auth.php b/phpBB/functions/auth.php
index beacb39262..5d82b404f9 100644
--- a/phpBB/functions/auth.php
+++ b/phpBB/functions/auth.php
@@ -46,11 +46,11 @@ function auth($type,
    switch($type) 
      {
       case 'ip ban':
-	$sql = "DELETE FROM banlist 
+	$sql = "DELETE FROM $banlist_table 
 		 WHERE (ban_end < ". mktime(date("H"), date("i"), date("s"), date("m"), date("d"), date("Y")).") 
 		 AND (ban_end > 0)";
 	$db->sql_query($sql);
-	$sql = "SELECT ban_ip FROM banlist";
+	$sql = "SELECT ban_ip FROM $banlist_table";
 	if($result = $db->sql_query($sql)) 
 	  {
 	     if($totalrows = $db->sql_numrows()) 
@@ -92,11 +92,11 @@ function auth($type,
 	return(TRUE);
 	break;
       case 'username ban':
-	$sql = "DELETE FROM banlist
+	$sql = "DELETE FROM $banlist_table
 		WHERE (ban_end < ". mktime(date("H"), date("i"), date("s"), date("m"), date("d"), date("Y")).")
 		AND (ban_end > 0)";
 	$db->sql_query($sql);
-	$sql = "SELECT ban_userid FROM banlist WHERE ban_userid = '$user_id'";
+	$sql = "SELECT ban_userid FROM $banlist_table WHERE ban_userid = '$user_id'";
 	if($result = $db->sql_query($sql)) 
 	  {
 	   if($db->sql_numrows())
@@ -124,7 +124,7 @@ function auth($type,
 function get_userdata_from_id($userid, $db) 
 {
    
-   $sql = "SELECT * FROM users WHERE user_id = $userid";
+   $sql = "SELECT * FROM $users_table WHERE user_id = $userid";
    if(!$result = $db->sql_query($sql)) 
      {
 	$userdata = array("error" => "1");
diff --git a/phpBB/functions/sessions.php b/phpBB/functions/sessions.php
index 60f2ae7015..bdee756f30 100644
--- a/phpBB/functions/sessions.php
+++ b/phpBB/functions/sessions.php
@@ -38,7 +38,7 @@ function new_session($userid, $remote_ip, $lifespan, $db)
    $currtime = (string) (time());
    $expirytime = (string) (time() - $lifespan);
    
-   $deleteSQL = "DELETE FROM sessions WHERE (start_time < $expirytime)";
+   $deleteSQL = "DELETE FROM $sessions_tables WHERE (start_time < $expirytime)";
    $delresult = $db->sql_query($deleteSQL);
    
    if (!$delresult) 
@@ -46,7 +46,7 @@ function new_session($userid, $remote_ip, $lifespan, $db)
 	error_die($db, SESSION_CREATE);
      }
    
-   $sql = "INSERT INTO sessions (sess_id, user_id, start_time, remote_ip) VALUES ($sessid, $userid, $currtime, '$remote_ip')";
+   $sql = "INSERT INTO $sessions_table (sess_id, user_id, start_time, remote_ip) VALUES ($sessid, $userid, $currtime, '$remote_ip')";
    
    $result = $db->sql_query($sql);
    
@@ -85,11 +85,11 @@ function set_session_cookie($sessid, $cookietime, $cookiename, $cookiepath, $coo
 function get_userid_from_session($sessid, $cookietime, $remote_ip, $db) 
 {
    $mintime = time() - $cookietime;
-   $sql = "SELECT user_id 
-	    FROM sessions 
-	    WHERE (sess_id = $sessid) 
-	      AND (start_time > $mintime) 
-	      AND (remote_ip = '$remote_ip')";
+	$sql = "SELECT user_id 
+			FROM $sessions_table 
+			WHERE (sess_id = $sessid)
+			AND (start_time > $mintime) 
+			AND (remote_ip = '$remote_ip')";
    $result = $db->sql_query($sql);
    if (!$result) 
      {
@@ -113,7 +113,7 @@ function update_session_time($sessid, $db)
 {
 
    $newtime = (string) time();
-   $sql = "UPDATE sessions SET start_time=$newtime WHERE (sess_id = $sessid)";
+   $sql = "UPDATE $sessions_table SET start_time=$newtime WHERE (sess_id = $sessid)";
    $result = $db->sql_query($sql);
    if (!$result) 
      {
@@ -126,7 +126,7 @@ function update_session_time($sessid, $db)
 
 function end_user_session($userid, $db) 
 {
-   $sql = "DELETE FROM sessions WHERE (user_id = $userid)";
+   $sql = "DELETE FROM $sessions_table WHERE (user_id = $userid)";
    $result = $db->sql_query($sql, $db);
    if (!$result) 
      {
diff --git a/phpBB/index.php b/phpBB/index.php
index 7ed32e597e..9669bf7f75 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -41,23 +41,23 @@ include('page_header.'.$phpEx);
 $template->set_block("body", "catrow", "cats");
 $template->set_block("catrow", "forumrow", "forums");
 
-$sql = "SELECT * FROM catagories ORDER BY cat_order";
+$sql = "SELECT * FROM $categories_table ORDER BY cat_order";
 if(!$result = $db->sql_query($sql)) 
 {
-   error_die($db, QUERY_ERROR);
+	error_die($db, QUERY_ERROR);
 }
 $total_rows = $db->sql_numrows();
 if($total_rows)
 {
-   $rows = $db->sql_fetchrowset($result);
-   for($x = 0; $x < $total_rows; $x++)
-     {
+	$rows = $db->sql_fetchrowset($result);
+	for($x = 0; $x < $total_rows; $x++)
+	{
 
-	$template->set_var(array("CAT_ID" => $rows[$x]["cat_id"],
+		$template->set_var(array("CAT_ID" => $rows[$x]["cat_id"],
 				 "PHP_SELF" => $PHP_SELF,
 				 "CAT_DESC" => stripslashes($rows[$x]["cat_title"])));
 
-	$sub_sql = "SELECT f.* FROM forums f WHERE f.cat_id = '".$rows[$x]["cat_id"]."' ORDER BY forum_id";
+	$sub_sql = "SELECT f.* FROM $forums_table f WHERE f.cat_id = '".$rows[$x]["cat_id"]."' ORDER BY forum_id";
 	if(!$sub_result = $db->sql_query($sub_sql))
 	  {
 	     error_die($db, QUERY_ERROR);