X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage_email_send.ml;fp=scripts%2Fpage_email_send.ml;h=ead17870e6cc801a0c0b6834909aee3e2bf16ae7;hb=3bbcd6cd55f445a3b8b54269237655570c89354b;hp=75e2745989f4acceaeea289b156442e4edfc482b;hpb=0b231fd67e1baed0cb500c83a4e97cc84b25423d;p=cocanwiki.git diff --git a/scripts/page_email_send.ml b/scripts/page_email_send.ml index 75e2745..ead1787 100644 --- a/scripts/page_email_send.ml +++ b/scripts/page_email_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: page_email_send.ml,v 1.7 2006/07/31 09:49:43 rich Exp $ + * $Id: page_email_send.ml,v 1.8 2006/12/06 09:46:57 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 @@ -30,14 +30,14 @@ open Cocanwiki_template open Cocanwiki_strings let run r (q : cgi) dbh hostid { hostname = hostname } _ = - let template = get_template dbh hostid "page_email_send.txt" in + let template = get_template r dbh hostid "page_email_send.txt" in let page = q#param "page" in let email = trim (q#param "email") in if email = "" then ( error ~title:"No email address" ~back_button:true - dbh hostid q "You must give an email address."; + r dbh hostid q "You must give an email address."; return () ); @@ -59,7 +59,7 @@ let run r (q : cgi) dbh hostid { hostname = hostname } _ = if registered then ( error ~title:"Email address already used" ~back_button:true - dbh hostid q + r dbh hostid q ("That email address is already used for notifications from this page. "^ "If you are not receiving updates for this page, then you will " ^ "need to confirm that address. If you continue to have problems " ^ @@ -100,7 +100,7 @@ let run r (q : cgi) dbh hostid { hostname = hostname } _ = (* Finish up. *) let buttons = [ ok_button ("/" ^ page) ] in ok ~buttons ~title:"Confirmation email sent" - dbh hostid q + r 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.")