3 files changed, 47 insertions, 37 deletions
diff --git a/phpBB/functions/error.php b/phpBB/functions/error.php
index d8027e1fad..76acc188e5 100644
--- a/phpBB/functions/error.php
+++ b/phpBB/functions/error.php
@@ -22,9 +22,12 @@
  * 
  ***************************************************************************/ 
 
-function error_die($db, $error_code = "", $error_msg = "") 
+function error_die($error_code, $error_msg = "", $line = "", $file = "") 
 {
-	global $template, $phpEx, $default_lang;
+	global $db, $template, $phpEx, $default_lang;
+	global $table_bgcolor, $color1;
+	global $starttime, $phpbbversion;
+
 	if(!defined("HEADER_INC"))
 	{
 		if(!empty($default_lang))
@@ -46,41 +49,48 @@ function error_die($db, $error_code = "", $error_msg = "")
 				{
 					$error_msg = "An Error Occured";
 				}
-			break;
+				break;
+
 			case SQL_CONNECT:
 				$db_error = $db->sql_error();
-				$error_msg = "Error: phpBB could not connect to the database. Reason: " . $db_error["message"];
-			break;
+				$error_msg .= "<br />SQL connect error - " . $db_error["message"];
+				break;
+
 			case BANNED:
 				$error_msg = "You have been banned from this forum.";
-			break;
-			case QUERY_ERROR:
+				break;
+			
+			case SQL_QUERY:
 				$db_error = $db->sql_error();
-				$error_msg = "Error: phpBB could not query the database. Reason: " . $db_error["message"];
-			break;
+				$error_msg .= "<br />SQL query error - ".$db_error["message"];
+				break;
+			
 			case SESSION_CREATE:
 				$error_msg = "Error creating session. Could not log you in. Please go back and try again.";
-			break;
+				break;
+			
 			case NO_POSTS:
-				$error_msg = "There are no posts in this forum. Click on the 'Post New Topic' link on this page to post one.";
-			break;
+				$error_msg = "There are no posts in this forum. Click on the <b>Post New Topic</b> link on this page to post one.";
+				break;
+
 			case LOGIN_FAILED:
 				$error_msg = "Login Failed. You have specified an incorrect/inactive username or invalid password, please go back and try again.";
-			break;
+				break;
 		}
 	}
 	if(DEBUG)
 	{
-		//$error_msg .= "<br>Line number: ".__LINE__."<br>In File: ".__FILE__;
+		if($line != "" && $file != "")
+			$error_msg .= "<br /><br /><u>DEBUG INFO</u></br /><br>Line: ".$line."<br />File: ".$file;
 	}
+
 	$template->set_filenames(array("error_body" => "error_body.tpl"));
 	$template->assign_vars(array("ERROR_MESSAGE" => $error_msg));
 	$template->pparse("error_body");
+
 	include('includes/page_tail.'.$phpEx);
+
 	exit();
 }
-	
-		
-
 
 ?>
diff --git a/phpBB/functions/functions.php b/phpBB/functions/functions.php
index bc2fd5b670..86957f4a6f 100644
--- a/phpBB/functions/functions.php
+++ b/phpBB/functions/functions.php
@@ -85,7 +85,7 @@ function make_jumpbox($db)
 	if(!$q_categories = $db->sql_query($sql)) 
 	{
 		$db_error = $db->sql_error();
-		error_die($db, GENERAL_ERROR, "Couldn't obtain category list ".$db_error["message"]." : make_jumpbox");
+		error_die(SQL_QUERY, "Couldn't obtain category list.", __LINE__, __FILE__);
 	}
 
 	$total_categories = $db->sql_numrows();
@@ -100,7 +100,7 @@ function make_jumpbox($db)
 			ORDER BY cat_id, forum_order";
 		if(!$q_forums = $db->sql_query($sql))
 		{
-			error_die($db, QUERY_ERROR);
+			error_die(SQL_QUERY, "Couldn't obtain forums information.", __LINE__, __FILE__);
 		}
 		$total_forums = $db->sql_numrows($q_forums);
 		$forum_rows = $db->sql_fetchrowset($q_forums);
diff --git a/phpBB/functions/sessions.php b/phpBB/functions/sessions.php
index 01b5e8b7be..b8a690af2a 100644
--- a/phpBB/functions/sessions.php
+++ b/phpBB/functions/sessions.php
@@ -48,7 +48,7 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
 	$result = $db->sql_query($sql);
 	if (!$result) 
 	{
-		error_die(QUERY_ERROR, "Couldn't obtain ban information.", __LINE__, __FILE__);
+		error_die(SQL_QUERY, "Couldn't obtain ban information.", __LINE__, __FILE__);
 	}
 	$ban_info = $db->sql_fetchrow($result);
 
@@ -87,11 +87,11 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
 			{
 				if(DEBUG)
 				{
-					error_die($db, GENERAL_ERROR, "Error creating new session : session_begin");
+					error_die(SQL_QUERY, "Error creating new session : session_begin", __LINE__, __FILE__);
 				}
 				else
 				{
-					error_die($db, SESSION_CREATE);
+					error_die(SESSION_CREATE);
 				}
 			}
 
@@ -142,11 +142,11 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 	{
 		if(DEBUG)
 		{
-			error_die($db, GENERAL_ERROR, "Error clearing sessions table : session_pagestart");
+			error_die(SQL_QUERY, "Error clearing sessions table : session_pagestart", __LINE__, __FILE__);
 		}
 		else
 		{
-			error_die($db, SESSION_CREATE);
+			error_die(SESSION_CREATE);
 		}
 	}
 	
@@ -168,11 +168,11 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 		{
 			if(DEBUG)
 			{
-				error_die($db, GENERAL_ERROR, "Error doing DB query userdata row fetch : session_pagestart");
+				error_die(SQL_QUERY, "Error doing DB query userdata row fetch : session_pagestart", __LINE__, __FILE__);
 			}
 			else
 			{
-				error_die($db, SESSION_CREATE);
+				error_die(SESSION_CREATE);
 			}
 		}
 		$userdata = $db->sql_fetchrow($result);
@@ -182,7 +182,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 		// 
 		if($userdata['ban_ip'] || $userdata['ban_userid'])
 		{
-			error_die($db, BANNED);
+			error_die(BANNED);
 		}
 	
 		//
@@ -216,11 +216,11 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 					{
 						if(DEBUG)
 						{
-							error_die($db, GENERAL_ERROR, "Error updating sessions table : session_pagestart");
+							error_die(SQL_QUERY, "Error updating sessions table : session_pagestart", __LINE__, __FILE__);
 						}
 						else
 						{
-							error_die($db, SESSION_CREATE);
+							error_die(SESSION_CREATE);
 						}
 					}
 					else
@@ -279,11 +279,11 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 		{
 			if(DEBUG)
 			{
-				error_die($db, GENERAL_ERROR, "Error creating ".$userdata['user_id']." session : session_pagestart");
+				error_die(SQL_QUERY, "Error creating ".$userdata['user_id']." session : session_pagestart", __LINE__, __FILE__);
 			}
 			else
 			{
-				error_die($db, SESSION_CREATE);
+				error_die(SESSION_CREATE);
 			}
 		}
 
@@ -300,11 +300,11 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 		{
 			if(DEBUG)
 			{
-				error_die($db, GENERAL_ERROR, "Error creating anonymous session : session_pagestart");
+				error_die(SQL_QUERY, "Error creating anonymous session : session_pagestart", __LINE__, __FILE__);
 			}
 			else
 			{
-				error_die($db, SESSION_CREATE);
+				error_die(SESSION_CREATE);
 			}
 		}
 		$userdata['session_logged_in'] = 0;
@@ -319,9 +319,10 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 // deleting the corresponding entry
 // in the sessions table
 //
-function session_end($db, $session_id, $user_id) 
+function session_end($session_id, $user_id) 
 {
 
+	global $db;
 	global $cookiename, $cookiedomain, $cookiepath, $cookiesecure, $cookielife;
 
 	$current_time = time();
@@ -334,12 +335,11 @@ function session_end($db, $session_id, $user_id)
 	{
 		if(DEBUG)
 		{
-			$db_error = $db->sql_error();
-			error_die($db, "Delete failed in end_user_session(). Reason: " . $db_error["message"]);
+			error_die(SQL_QUERY, "Couldn't delete user session : session_eng()", __LINE__, __FILE__);
 		}
 		else
 		{
-			error_die($db, SESSION_CREATE);
+			error_die(SESSION_CREATE);
 		}
 	}