From 5468846e2527f6a141f958b5002d85a043224cc8 Mon Sep 17 00:00:00 2001
From: rich <rich>
Date: Wed, 10 Nov 2004 16:52:04 +0000
Subject: [PATCH] On recent changes / history pages, makes the left hand (date)
 column a smidgen wider to avoid the staircase effect when the date happens to
 be too long.

Explanatory error message when the Host header is missing or the
hostname is not found in the database.

Bumped version for release.
---
 debian/changelog         |  2 +-
 html/_css/standard.css   |  6 +++---
 scripts/lib/cocanwiki.ml | 19 +++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f272cd4..5db9b92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.3.8-1) unstable; urgency=low
+cocanwiki (1.3.8-2) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/html/_css/standard.css b/html/_css/standard.css
index 527e899..7e99195 100644
--- a/html/_css/standard.css
+++ b/html/_css/standard.css
@@ -1,5 +1,5 @@
 /* Stylesheet for COCANWIKI.
- * $Id: standard.css,v 1.26 2004/11/03 13:36:44 rich Exp $
+ * $Id: standard.css,v 1.27 2004/11/10 16:52:04 rich Exp $
  */
 
 /* Based on the basic stylesheet. */
@@ -265,7 +265,7 @@ ul#recent_changes {
 ul#recent_changes span.date {
   display: block;
   float: left;
-  width: 8.5em;
+  width: 9em;
 }
 
 /* History list. */
@@ -278,7 +278,7 @@ ul#history {
 ul#history span.date {
   display: block;
   float: left;
-  width: 8.5em;
+  width: 9em;
 }
 
 /* Forms. */
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;
-- 
1.8.3.1