Bugtracker #4468, #4469 - error handler XHTML fixes, support error 400, slight restructuring

2025-04-22 05:31:58 +02:00 · 2008-07-25 20:12:44 +00:00 · 2008-07-25 20:12:44 +00:00 · aaa0284fc2
commit aaa0284fc2
parent 85339ec550
2 changed files with 67 additions and 49 deletions
--- a/e107_languages/English/lan_error.php
+++ b/e107_languages/English/lan_error.php
@ -4,8 +4,8 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_error.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-01-05 09:41:23 $
+|     $Revision: 1.4 $
+|     $Date: 2008-07-25 20:12:31 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@ -48,5 +48,11 @@ define("LAN_ERROR_32", "To complete the upgrade, copy the following text into yo
 define("LAN_ERROR_33", "Processing error! Normally, I would redirect to the home page.");
 define("LAN_ERROR_34", "Unknown error! Please inform the site administrator you saw this:");

+define('LAN_ERROR_35', 'Error 400 - Bad Request');
+define('LAN_ERROR_36', 'There is a formatting error in the web page you are trying to access.');
+define('LAN_ERROR_37', 'Error Icon');
+define('LAN_ERROR_38', '');
+define('LAN_ERROR_39', '');
+

 ?>
--- a/error.php
+++ b/error.php
@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/error.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2007-08-14 19:27:22 $
+|     $Revision: 1.6 $
+|     $Date: 2008-07-25 20:12:31 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@ -21,65 +21,77 @@ define("ERR_PAGE_ACTIVE",'error');

 require_once("class2.php");

-if(!e_QUERY || (e_QUERY != 401 && e_QUERY != 403 && e_QUERY != 404 && e_QUERY != 500))
-{
-	if (E107_DEBUG_LEVEL)
-	{
-		echo LAN_ERROR_33."<br/><pre>\n";
-		print_r($_SERVER);
-		print_r($_REQUEST);
-		echo "\n</pre>\n";
-	} else {		
-		echo "<script type='text/javascript'>document.location.href='index.php'</script>\n";
-		header("location: ".e_HTTP."index.php");
-		exit;
-	}
-}
-
-require_once(HEADERF);
-
+if (!defined('PAGE_NAME')) define('PAGE_NAME','Unknown page');
+$errorHeader = '';
+$errorText = '';
+$errorNumber = 999;
 $errFrom = $_SERVER['HTTP_REFERER'];
 $errTo = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+$errorQuery = htmlentities($_SERVER['QUERY_STRING']);
 $base_path = e_HTTP;
+if (is_numeric(e_QUERY)) $errorNumber = e_QUERY;

-switch(e_QUERY) {
-	case 401:
-	header("HTTP/1.1 401 Unauthorized");
-	$text = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='Error Icon'> ".LAN_ERROR_1."</div><br /><div class='installh'>".LAN_ERROR_2."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
+switch($errorNumber) 
+{
+  case 400 :
+	$errorHeader = "HTTP/1.1 400 Bad Request";
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_35."</div><br /><div class='installh'>".LAN_ERROR_36."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
+		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
+    break;
+  case 401:
+	$errorHeader = "HTTP/1.1 401 Unauthorized";
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_1."</div><br /><div class='installh'>".LAN_ERROR_2."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
+		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
 	break;
-
-	case 403:
-	header("HTTP/1.1 403 Forbidden");
-	$text = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='Error Icon'> ".LAN_ERROR_4."</div><br /><div class='installh'>".LAN_ERROR_5."</div><br /><div class='smalltext'>".LAN_ERROR_6."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
+  case 403:
+	$errorHeader = "HTTP/1.1 403 Forbidden";
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_4."</div><br /><div class='installh'>".LAN_ERROR_5."</div><br /><div class='smalltext'>".LAN_ERROR_6."</div>
+		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
 	break;
-
-	case 404:
-	header("HTTP/1.1 404 Not Found");
-	$text = "<h3><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='Error Icon'> ".LAN_ERROR_7."</h3><br />".LAN_ERROR_21."<br /><br />".LAN_ERROR_23."<b>{$errTo}</b>".LAN_ERROR_24."<br /><br />";
+  case 404:
+	$errorHeader = "HTTP/1.1 404 Not Found";
+	$errorText = "<h3><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_7."</h3><br />".LAN_ERROR_21."<br /><br />".LAN_ERROR_23."<b>{$errTo}</b>".LAN_ERROR_24."<br /><br />";

 	if (strlen($errFrom)) $text .= LAN_ERROR_9." ( <a href='{$errFrom}' rel='external'>{$errFrom}</a> ) -- ".LAN_ERROR_19."<br />";


-	$text .= "<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a><br />";
-	$text .= "<a href='{$base_path}search.php'>".LAN_ERROR_22."</a></p>";
+	$errorText .= "<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a><br />";
+	$errorText .= "<a href='{$base_path}search.php'>".LAN_ERROR_22."</a>";
 	break;
-
-
-	case 500:
-	header("HTTP/1.1 500 Internal Server Error");
-	$text = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='Error Icon'> ".LAN_ERROR_10."</div><br /><div class='installh'>".LAN_ERROR_11."</div><br /><div class='smalltext'>".LAN_ERROR_12."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
+  case 500:
+	$errorHeader = "HTTP/1.1 500 Internal Server Error";
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_10."</div><br /><div class='installh'>".LAN_ERROR_11."</div><br /><div class='smalltext'>".LAN_ERROR_12."</div>
+		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
 	break;
-	$text = "<div class='installe'>".LAN_ERROR_13." (".$_SERVER['QUERY_STRING'].")</div><br /><div class='installh'>".LAN_ERROR_14."</div><br /><div class='smalltext'>".LAN_ERROR_15."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
+  case 999:
+	if (E107_DEBUG_LEVEL)
+	{
+	  echo LAN_ERROR_33."<br/><pre>\n";
+	  print_r($_SERVER);
+	  print_r($_REQUEST);
+	  echo "\n</pre>\n";
+	}
+	else
+	{
+	  echo "<script type='text/javascript'>document.location.href='index.php'</script>\n";
+	  header("location: ".e_HTTP."index.php");
+	  exit;
+	}
+    break;

-	default:
-	$text = LAN_ERROR_34." e_QUERY = '".e_QUERY."'<br/><a href='{$base_path}index.php'>".LAN_ERROR_20."</a>";
-	break;
+  default :
+	$errorText = "<div class='installe'>".LAN_ERROR_13." (".$errorQuery.")</div><br /><div class='installh'>".LAN_ERROR_14."</div><br /><div class='smalltext'>".LAN_ERROR_15."</div>
+		<br /><div class='installh'><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
+
+//	default:
+//	$errorText = LAN_ERROR_34." e_QUERY = '".e_QUERY."'<br/><a href='{$base_path}index.php'>".LAN_ERROR_20."</a>";
+//	break;
 }

-$ns->tablerender(PAGE_NAME, $text);
+if ($errorHeader) header($errorHeader);
+
+require_once(HEADERF);
+
+$ns->tablerender(PAGE_NAME, $errorText);
 require_once(FOOTERF);
 ?>