From 619782929c11102f75892758fd94772bc747dfb0 Mon Sep 17 00:00:00 2001 From: rich Date: Fri, 17 Sep 2004 15:15:50 +0000 Subject: [PATCH] Don't send an empty file if the uploaded file is not given. --- scripts/contact.ml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/contact.ml b/scripts/contact.ml index 753f695..a13f60e 100644 --- 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 . * Copyright (C) 2004 Merjis Ltd. - * $Id: contact.ml,v 1.1 2004/09/17 12:35:38 rich Exp $ + * $Id: contact.ml,v 1.2 2004/09/17 15:15:50 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 @@ -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 + (* 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 -- 1.8.3.1