From 24c91ed78e64cb20b2ba08971d2c35979a2de856 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 20 May 2010 08:04:25 +0000
Subject: - Moved error.inc to /utils - Removed bugs.inc (content copied into
 main.inc)

---
 program/steps/error.inc       | 129 ------------------------------------------
 program/steps/utils/error.inc | 129 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+), 129 deletions(-)
 delete mode 100644 program/steps/error.inc
 create mode 100644 program/steps/utils/error.inc

(limited to 'program/steps')

diff --git a/program/steps/error.inc b/program/steps/error.inc
deleted file mode 100644
index f8bb8461d..000000000
--- a/program/steps/error.inc
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | program/steps/error.inc                                               |
- |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Display error message page                                          |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-
- $Id$
-
-*/
-
-
-// browser is not compatible with this application
-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
-<i>Supported browsers:</i><br />
-&raquo; &nbsp;Netscape 7+<br />
-&raquo; &nbsp;Microsoft Internet Explorer 6+<br />
-&raquo; &nbsp;Mozilla Firefox 1.0+<br />
-&raquo; &nbsp;Opera 8.0+<br />
-&raquo; &nbsp;Safari 1.2+<br />
-<br />
-&raquo; &nbsp;JavaScript enabled<br />
-&raquo; &nbsp;Support for XMLHTTPRequest<br />
-
-<p><i>Your configuration:</i><br />
-$user_agent</p>
-EOF;
-}
-
-// authorization error
-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) {
-  $__error_title = "REQUEST FAILED/FILE NOT FOUND";
-  $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
-  $__error_text  = <<<EOF
-The requested page was not found!<br />
-Please contact your server-administrator.
-
-<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 {
-  $__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. [%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>
-<p class="error-text">$__error_text</p>
-</div>
-EOF;
-
-if ($OUTPUT && $OUTPUT->template_exists('error')) {
-  $OUTPUT->reset();
-  $OUTPUT->send('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="skins/$__skin/common.css" />
-</head>
-<body>
-
-<table border="0" cellsapcing="0" cellpadding="0" width="100%" height="80%"><tr><td align="center">
-
-$__page_content
-
-</td></tr></table>
-
-</body>
-</html>
-EOF;
-
-exit;
-?>
diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
new file mode 100644
index 000000000..364c953e7
--- /dev/null
+++ b/program/steps/utils/error.inc
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/utils/error.inc                                         |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Display error message page                                          |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+
+// browser is not compatible with this application
+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
+<i>Supported browsers:</i><br />
+&raquo; &nbsp;Netscape 7+<br />
+&raquo; &nbsp;Microsoft Internet Explorer 6+<br />
+&raquo; &nbsp;Mozilla Firefox 1.0+<br />
+&raquo; &nbsp;Opera 8.0+<br />
+&raquo; &nbsp;Safari 1.2+<br />
+<br />
+&raquo; &nbsp;JavaScript enabled<br />
+&raquo; &nbsp;Support for XMLHTTPRequest<br />
+
+<p><i>Your configuration:</i><br />
+$user_agent</p>
+EOF;
+}
+
+// authorization error
+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) {
+  $__error_title = "REQUEST FAILED/FILE NOT FOUND";
+  $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+  $__error_text  = <<<EOF
+The requested page was not found!<br />
+Please contact your server-administrator.
+
+<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 {
+  $__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. [%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>
+<p class="error-text">$__error_text</p>
+</div>
+EOF;
+
+if ($OUTPUT && $OUTPUT->template_exists('error')) {
+  $OUTPUT->reset();
+  $OUTPUT->send('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="skins/$__skin/common.css" />
+</head>
+<body>
+
+<table border="0" cellsapcing="0" cellpadding="0" width="100%" height="80%"><tr><td align="center">
+
+$__page_content
+
+</td></tr></table>
+
+</body>
+</html>
+EOF;
+
+exit;
+?>
-- 
cgit v1.2.3