X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flib%2Fcocanwiki.ml;h=38480bac7aa20b9450ef48c611bfda44d2a7e8bc;hb=5468846e2527f6a141f958b5002d85a043224cc8;hp=4f21cc0d46a216c185f83447571085b52a1ee160;hpb=b12987baecdd511bf8c46620839b4e6705182eb8;p=cocanwiki.git

diff --git a/scripts/lib/cocanwiki.ml b/scripts/lib/cocanwiki.ml
index 4f21cc0..38480ba 100644
--- a/scripts/lib/cocanwiki.ml
+++ b/scripts/lib/cocanwiki.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki.ml,v 1.3 2004/11/01 12:57:53 rich Exp $
+ * $Id: cocanwiki.ml,v 1.4 2004/11/10 16:52:04 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -104,7 +104,13 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 	*)
        let hostid, hostname, canonical_hostname, edit_anon, view_anon =
 	 let hostname = try Request.hostname r
-	 with Not_found -> failwith "No ``Host:'' header in request" in
+	 with Not_found ->
+	   error ~back_button:true
+	     ~title:"Browser problem" q
+	     ("Your browser didn't send a \"Host\" header as part of " ^
+	      "the HTTP request.  Unfortunately this web server cannot " ^
+	      "handle HTTP requests without a \"Host\" header.");
+	   return () in
 	 let hostname = String.lowercase hostname in
 
 	 let sth =
@@ -122,8 +128,13 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 	      | _ -> assert false)
 	 with
 	     Not_found ->
-	       failwith ("Hostname ``" ^ hostname ^ "'' not found in " ^
-			 "the hosts/hostnames tables in the database.") in
+	       error ~back_button:true
+	         ~title:"Unknown website" q
+	         ("No website called \"" ^ hostname ^ "\" can be found.  " ^
+		  "If you are the administrator of this site, check that " ^
+		  "the hostname is listed in the \"hostnames\" table " ^
+		  "in the database.");
+	       return () in
 
        (* Create the host object. *)
        let host = { hostname = hostname;