From 4e5538cb78ceb8e93ae10ec9ad306547e6014972 Mon Sep 17 00:00:00 2001
From: James Atkinson <thefinn@users.sourceforge.net>
Date: Fri, 23 Feb 2001 23:39:42 +0000
Subject: Viewforum works, and error die outputs nice, templated, errors

git-svn-id: file:///svn/phpbb/trunk@37 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/functions/error.php     |  5 +++++
 phpBB/functions/functions.php | 50 +++++++++++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 19 deletions(-)

(limited to 'phpBB/functions')

diff --git a/phpBB/functions/error.php b/phpBB/functions/error.php
index 6b53da1838..f8182335f2 100644
--- a/phpBB/functions/error.php
+++ b/phpBB/functions/error.php
@@ -25,6 +25,11 @@
 function error_die($db, $error_code = "", $error_msg = "") 
 {
    global $template, $phpEx;
+
+   if(!$template->get("overall_header"))
+     {
+	include('page_header.'.$phpEx);
+     }
    if(!$error_msg)
    {
       switch($error_code)
diff --git a/phpBB/functions/functions.php b/phpBB/functions/functions.php
index 941ccd0e22..5d660f8db9 100644
--- a/phpBB/functions/functions.php
+++ b/phpBB/functions/functions.php
@@ -76,39 +76,51 @@ function get_newest_user($db)
 
 function make_jumpbox($db, $phpEx)
 {
-     
    $boxstring = "
        <FORM ACTION=\"viewforum.$phpEx\" METHOD=\"GET\">
+       Jump to:
        <SELECT NAME=\"forum_id\"><OPTION VALUE=\"-1\">Select Forum</OPTION>
        ";
    $sql = "SELECT cat_id, cat_title FROM ".CATEGORIES_TABLE." ORDER BY cat_order";
-   $result = $db->sql_query($sql);
-   if($total_cats = $db->sql_numrows($result))
+   if($result = $db->sql_query($sql))
      {
-	for($x = 0; $x < $total_cats; $x++)
+	if($total_cats = $db->sql_numrows($result))
 	  {
-	     $boxstring .= "<OPTION VALUE=\"-1\">&nbsp;</OPTION>\n";
-	     $boxstring .= "<OPTION VALUE=\"-1\">".stripslashes($cat_rows[$x]["cat_title"])."</OPTION>\n";
-	     $boxstring .= "<OPTION VALUE=\"-1\">----------------</OPTION>\n";
 	     $cat_rows = $db->sql_fetchrowset($result);
-	     $f_sql = "SELECT forum_name, forum_id FROM ".FORUMS_TABLE." 
-		       WHERE cat_id = ". $cat_rows[$x]["cat_id"] . " ORDER BY forum_id";
-	     if($f_result = $db->sql_query($f_sql))
+	     for($x = 0; $x < $total_cats; $x++)
 	       {
-		  if($total_forums = $db->sql_numrows($f_result)) {
-		     $f_rows = $db->sql_fetchrowset($f_result);
-		     for($y = 0; $y < $total_forums; $y++)
-		       {
-			  $name = stripslashes($f_rows[$y]["forum_name"]);
-			  $boxstring .=  "<OPTION VALUE=\"".$f_rows[$y]["forum_id"]."\">$name</OPTION>\n";
-		       }
-		  }
+		  $boxstring .= "<OPTION VALUE=\"-1\">&nbsp;</OPTION>\n";
+		  $boxstring .= "<OPTION VALUE=\"-1\">".stripslashes($cat_rows[$x]["cat_title"])."</OPTION>\n";
+		  $boxstring .= "<OPTION VALUE=\"-1\">----------------</OPTION>\n";
+
+		  $f_sql = "SELECT forum_name, forum_id FROM ".FORUMS_TABLE." 
+			    WHERE cat_id = ". $cat_rows[$x]["cat_id"] . " ORDER BY forum_id";
+		  if($f_result = $db->sql_query($f_sql))
+		    {
+		       if($total_forums = $db->sql_numrows($f_result)) 
+			 {
+			    $f_rows = $db->sql_fetchrowset($f_result);
+			    for($y = 0; $y < $total_forums; $y++)
+			      {
+				 $name = stripslashes($f_rows[$y]["forum_name"]);
+				 $boxstring .=  "<OPTION VALUE=\"".$f_rows[$y]["forum_id"]."\">$name</OPTION>\n";
+			      }
+			 }
+		    }
+		  else 
+		    {
+		       $boxstring .= "<option value=\"-1\">Error!</option>\n";
+		    }
 	       }
 	  }
+	else
+	  {
+	     $boxstring .= "<option value=\"-1\">No Forums to Jump to</option>\n";
+	  }
      }
    else
      {
-	$boxstring .= "<option value=\"-1\">No Forums to Jump to</option>\n";
+	$boxstring .= "<option value=\"-1\">Cat Error</option>\n";
      }
    $boxstring .=  "</SELECT>\n<br><INPUT TYPE=\"SUBMIT\" VALUE=\"Jump\"></FORM>";
    
-- 
cgit v1.2.1