1 files changed, 48 insertions, 31 deletions
diff --git a/error.php b/error.php
index 352291959..16b3a3173 100644
--- a/error.php
+++ b/error.php
@@ -1,35 +1,52 @@
-<H1>Oops, an error occured!</H1>
-<PRE>
-
 <?
- switch($REDIRECT_STATUS) {
-   case 500:
-    $message = "500 error - internal server error";
-    break;
-   case 404:
-    $message = "404 error - document not found";
-    break;
-   case 403:
-    $message = "403 error - access denied - forbidden";
-    break;
-   case 401:
-    $message = "401 error - authorization required";
-    break;
-   case 401:
-    $message = "400 error - bad request";
-    break;
-   default:
-    $message = "unknown error";
- }
 
- include "includes/config.inc";
- include "includes/database.inc"; 
- include "includes/watchdog.inc";
+function error_flood() {
+  global $site_email;
 
- watchdog("error", "message: `$message' - requested url: $REDIRECT_URL - referring url: $HTTP_REFERER");
-?>
+  print "WARNING: submission rate exceeded.  We detected too much data or events from your IP.  Please wait a few minutes and try again.  If you think this is not justified, please contact us at <A HREF=\"mailto:$site_email\">$site_email</A>.";
+} 
 
-<B>Processed output:</B><BR>
-  * <? echo $message; ?><BR>
-  * Return to the <A HREF="">main page</A>.
-</PRE>
+function error_httpd() {
+  global $REDIRECT_STATUS, $REDIRECT_URL, $HTTP_REFERER;
+
+  switch($REDIRECT_STATUS) {
+    case 500:
+      $message = "500 error - internal server error";
+      break;
+    case 404:
+      $message = "404 error - document not found";
+      break;
+    case 403:
+      $message = "403 error - access denied - forbidden";
+      break;
+    case 401:
+      $message = "401 error - authorization required";
+      break;
+    case 401:
+      $message = "400 error - bad request";
+      break;
+    default:
+      $message = "unknown error";
+  }
+
+  watchdog("error", "message: `$message' - requested url: $REDIRECT_URL - referring url: $HTTP_REFERER");
+ 
+  print "<PRE>\n";
+  print "<H1>Oops, an error occured!</H1>\n";
+  print "<B>Processed output:</B><BR>\n";
+  print "  * $message<BR>\n";
+  print "  * Return to the <A HREF=\"\">main page</A>.\n";
+  print "</PRE>\n";
+}
+
+include "includes/theme.inc";
+
+switch ($op) {
+  case "flood":
+    error_flood();    
+    break;
+  default:
+    error_httpd();
+}
+
+?>