summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b12987b)
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.
-cocanwiki (1.3.8-1) unstable; urgency=low
+cocanwiki (1.3.8-2) unstable; urgency=low
/* Stylesheet for COCANWIKI.
/* 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. */
*/
/* Based on the basic stylesheet. */
ul#recent_changes span.date {
display: block;
float: left;
ul#recent_changes span.date {
display: block;
float: left;
ul#history span.date {
display: block;
float: left;
ul#history span.date {
display: block;
float: left;
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* 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
*
* 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
*)
let hostid, hostname, canonical_hostname, edit_anon, view_anon =
let hostname = try Request.hostname r
*)
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 =
let hostname = String.lowercase hostname in
let sth =
| _ -> assert false)
with
Not_found ->
| _ -> 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;
(* Create the host object. *)
let host = { hostname = hostname;