More thorough inclusion of the page bug. This should mean the page bug appears just...

[cocanwiki.git] / scripts / mailing_list_confirm.ml

diff --git a/scripts/mailing_list_confirm.ml b/scripts/mailing_list_confirm.ml
index 2f8ff0c..65e1b57 100644 (file)
--- a/scripts/mailing_list_confirm.ml
+++ b/scripts/mailing_list_confirm.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.
- * $Id: mailing_list_confirm.ml,v 1.1 2004/09/24 16:41:16 rich Exp $
+ * $Id: mailing_list_confirm.ml,v 1.4 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
@@ -35,13 +35,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
                                  where hostid = ? and pending = ?" in
   sth#execute [`Int hostid; `String pending];
 
-  let page =
+  let email =
     try
       sth#fetch1string ()
     with
        Not_found ->
          error ~close_button:true ~title:"Email already confirmed"
-           q "It looks like that email address has already been confirmed.";
+           dbh hostid q
+           "It looks like that email address has already been confirmed.";
          return () in
 
   (* Update the database. *)
@@ -52,10 +53,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   dbh#commit ();
 
   (* Confirmed. *)
-  let buttons = [ ok_button ("/" ^ page) ] in
+  let buttons = [ ok_button "/" ] in
   ok ~buttons ~title:"Confirmed"
-    q ("Your email address has been confirmed.  " ^
-       "You are now on our mailing list.")
+    dbh hostid q ("Your email address has been confirmed.  " ^
+                 "You are now on our mailing list.")
 
 let () =
-  register_script run
+  register_script ~restrict:[CanView] run