git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a "name" field to the mailing list entries.
[cocanwiki.git]
/
scripts
/
contact.ml
diff --git
a/scripts/contact.ml
b/scripts/contact.ml
index
753f695
..
ba88f1d
100644
(file)
--- a/
scripts/contact.ml
+++ b/
scripts/contact.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.
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: contact.ml,v 1.
1 2004/09/17 12:35:38
rich Exp $
+ * $Id: contact.ml,v 1.
3 2004/09/23 11:56:47
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
@@
-36,7
+36,7
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
let fail msg =
error ~back_button:true ~title:"Bad form"
q (msg ^ " Please contact the owner of the site by email.");
let fail msg =
error ~back_button:true ~title:"Bad form"
q (msg ^ " Please contact the owner of the site by email.");
- r
aise CgiExit
+ r
eturn ()
in
(* Get the id field. *)
in
(* Get the id field. *)
@@
-95,6
+95,11
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
let names = uniq (List.sort compare names) in
let uploads = uniq (List.sort compare uploads) in
let names = uniq (List.sort compare names) in
let uploads = uniq (List.sort compare uploads) in
+ (* Some browsers send an empty file for empty uploads. Remove those. *)
+ let uploads =
+ let not_empty name = (q#upload name).upload_value <> "" in
+ List.filter not_empty uploads in
+
(* Get the IP address for logging purposes. *)
let ip =
try Connection.remote_ip (Request.connection r) with Not_found -> "" in
(* Get the IP address for logging purposes. *)
let ip =
try Connection.remote_ip (Request.connection r) with Not_found -> "" in