mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-23 07:52:07 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
e107steved
2008-07-25 20:12:44 +00:00
parent 85339ec550
commit aaa0284fc2
2 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_languages/English/lan_error.php
View File

@@ -4,8 +4,8 @@
| e107 website system - Language File. | e107 website system - Language File.
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_error.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_error.php,v $
| $Revision: 1.3 $ | $Revision: 1.4 $
| $Date: 2008-01-05 09:41:23 $ | $Date: 2008-07-25 20:12:31 $
| $Author: e107steved $ | $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_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_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', '');
?> ?>

106
error.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/error.php,v $ | $Source: /cvs_backup/e107_0.8/error.php,v $
| $Revision: 1.5 $ | $Revision: 1.6 $
| $Date: 2007-08-14 19:27:22 $ | $Date: 2008-07-25 20:12:31 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -21,65 +21,77 @@ define("ERR_PAGE_ACTIVE",'error');
require_once("class2.php"); require_once("class2.php");
if(!e_QUERY || (e_QUERY != 401 && e_QUERY != 403 && e_QUERY != 404 && e_QUERY != 500)) if (!defined('PAGE_NAME')) define('PAGE_NAME','Unknown page');
{ $errorHeader = '';
if (E107_DEBUG_LEVEL) $errorText = '';
{ $errorNumber = 999;
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);
$errFrom = $_SERVER['HTTP_REFERER']; $errFrom = $_SERVER['HTTP_REFERER'];
$errTo = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; $errTo = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
$errorQuery = htmlentities($_SERVER['QUERY_STRING']);
$base_path = e_HTTP; $base_path = e_HTTP;
if (is_numeric(e_QUERY)) $errorNumber = e_QUERY;
switch(e_QUERY) { switch($errorNumber)
case 401: {
header("HTTP/1.1 401 Unauthorized"); case 400 :
$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> $errorHeader = "HTTP/1.1 400 Bad Request";
<br /><div class='installh'>".LAN_ERROR_2."<a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>"; $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; break;
case 403:
case 403: $errorHeader = "HTTP/1.1 403 Forbidden";
header("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>
$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."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
<br /><div class='installh'>".LAN_ERROR_2."<a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
break; break;
case 404:
case 404: $errorHeader = "HTTP/1.1 404 Not Found";
header("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 />";
$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 />";
if (strlen($errFrom)) $text .= LAN_ERROR_9." ( <a href='{$errFrom}' rel='external'>{$errFrom}</a> ) -- ".LAN_ERROR_19."<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 />"; $errorText .= "<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 .= "<a href='{$base_path}search.php'>".LAN_ERROR_22."</a>";
break; break;
case 500:
$errorHeader = "HTTP/1.1 500 Internal Server Error";
case 500: $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>
header("HTTP/1.1 500 Internal Server Error"); <br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
$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>";
break; 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> case 999:
<br /><div class='installh'>".LAN_ERROR_2."<a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>"; 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: default :
$text = LAN_ERROR_34." e_QUERY = '".e_QUERY."'<br/><a href='{$base_path}index.php'>".LAN_ERROR_20."</a>"; $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>
break; <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); require_once(FOOTERF);
?> ?>