X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fmailing_list_send.ml;h=35c50d292ea3f26e0a396ffd939be055335de397;hb=e828b148d6338765d7f5ca8f10567d5d9ef00548;hp=623cfff98b37aa5913dcabc57b68c63cb8340e1b;hpb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;p=cocanwiki.git diff --git a/scripts/mailing_list_send.ml b/scripts/mailing_list_send.ml index 623cfff..35c50d2 100644 --- a/scripts/mailing_list_send.ml +++ b/scripts/mailing_list_send.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: mailing_list_send.ml,v 1.5 2005/03/31 14:24:04 rich Exp $ + * $Id: mailing_list_send.ml,v 1.6 2005/11/24 14:54:12 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 @@ -37,7 +37,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = if email = "" then ( error ~title:"No email address" ~back_button:true - q "You must give an email address."; + dbh hostid q "You must give an email address."; return () ); @@ -57,7 +57,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = if registered then ( error ~title:"Email address already used" ~back_button:true - q + dbh hostid q ("That email address is already on our mailing list. "^ "If you are not receiving mailing list messages, then you will " ^ "need to confirm that address. If you continue to have problems " ^ @@ -92,9 +92,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = (* Finish up. *) let buttons = [ ok_button "/" ] in ok ~buttons ~title:"Confirmation email sent" - q ("Please check your email now. You have been sent a confirmation " ^ - "email so we can verify the email address is yours. Click on the " ^ - "first link in that email to confirm.") + dbh hostid q + ("Please check your email now. You have been sent a confirmation " ^ + "email so we can verify the email address is yours. Click on the " ^ + "first link in that email to confirm.") let () = register_script ~restrict:[CanView] run