githubFork/roundcubemail.git

			@@ -5,7 +5,7 @@
			\| program/steps/error.inc \|
			\| \|
			\| This file is part of the RoundCube Webmail client \|
			\| Copyright (C) 2005, RoundCube Dev. - Switzerland \|
			\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -21,8 +21,7 @@


			// browser is not compatible with this application
			if ($ERROR_CODE==409)
			{
			if ($ERROR_CODE==409) {
			$user_agent = $GLOBALS['HTTP_SERVER_VARS']['HTTP_USER_AGENT'];
			$__error_title = 'Your browser does not suit the requirements for this application';
			$__error_text = <<<EOF
			@@ -39,19 +38,17 @@
			<p><i>Your configuration:</i><br />
			$user_agent</p>
			EOF;
			}
			}

			// authorization error
			else if ($ERROR_CODE==401)
			{
			else if ($ERROR_CODE==401) {
			$__error_title = "AUTHORIZATION FAILED";
			$__error_text = "Could not verify that you are authorized to access this service!<br />\n".
			"Please contact your server-administrator.";
			}
			}

			// failed request (wrong step in URL)
			else if ($ERROR_CODE==404)
			{
			else if ($ERROR_CODE==404) {
			$__error_title = "REQUEST FAILED/FILE NOT FOUND";
			$request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
			$__error_text = <<<EOF
			@@ -61,24 +58,40 @@
			<p><i>Failed request:</i><br />
			http://$request_url</p>
			EOF;
			}
			}

			// database connection error
			else if ($ERROR_CODE==601)
			{
			$__error_title = "CONFIGURATION ERROR";
			$__error_text = nl2br($ERROR_MESSAGE) . "<br />Please read the INSTALL instructions!";
			}

			// database connection error
			else if ($ERROR_CODE==603) {
			$__error_title = "DATABASE ERROR: CONNECTION FAILED!";
			$__error_text = "Unable to connect to the database!<br />Please contact your server-administrator.";
			}

			// system error
			else
			{
			else {
			$__error_title = "SERVICE CURRENTLY NOT AVAILABLE!";
			$__error_text = "Please contact your server-administrator.";

			if (($CONFIG['debug_level'] & 4) && $ERROR_MESSAGE)
			$__error_text = $ERROR_MESSAGE;
			else
			$__error_text = sprintf('Error No. [0x%04X]', $ERROR_CODE);
			}
			$__error_text = sprintf('Error No. [%s]', $ERROR_CODE);
			}


			// Ajax request
			if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) {
			header("HTTP/1.0 $ERROR_CODE $__error_title");
			die;
			}

			// compose page content

			$__page_content = <<<EOF
			<div>
			<h3 class="error-title">$__error_title</h3>
			@@ -86,22 +99,19 @@
			</div>
			EOF;

			if ($OUTPUT && $OUTPUT->template_exists('error')) {
			$OUTPUT->reset();
			$OUTPUT->send('error');
			}


			if (template_exists('error'))
			{
			$OUTPUT->scripts = array();
			$OUTPUT->script_files = array();
			parse_template('error');
			}

			$__skin = $CONFIG->skin ? $CONFIG->skin : 'default';

			// print system error page
			print <<<EOF
			<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
			<html xmlns="http://www.w3.org/1999/xhtml"><head>
			<title>RoundCube\|Mail : ERROR $ERROR_CODE</title>
			<link rel="stylesheet" type="text/css" href="program/style.css" />
			<link rel="stylesheet" type="text/css" href="skins/$__skin/common.css" />
			</head>
			<body>

			@@ -115,4 +125,5 @@
			</html>
			EOF;

			?>
			exit;
			?>