Fixed up a few stupid mistakes from that last check-in.

diff --git a/cocanwiki.sql b/cocanwiki.sql
index f6e4385..212e74e 100644 (file)
--- a/cocanwiki.sql
+++ b/cocanwiki.sql
@@ -509,7 +509,7 @@ CREATE TABLE mailing_lists (
 --
 
 REVOKE ALL ON TABLE mailing_lists FROM PUBLIC;
-GRANT SELECT ON TABLE mailing_lists TO "www-data";
+GRANT ALL ON TABLE mailing_lists TO "www-data";
 
 
 SET SESSION AUTHORIZATION 'rich';

diff --git a/scripts/mailing_list_confirm.ml b/scripts/mailing_list_confirm.ml
index 2f8ff0c..4c181ce 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.2 2004/09/24 16:45:02 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,7 +35,7 @@ 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
@@ -52,7 +52,7 @@ 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.")

diff --git a/scripts/mailing_list_send.ml b/scripts/mailing_list_send.ml
index ce239cc..6fcbfcc 100644 (file)
--- 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 <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: mailing_list_send.ml,v 1.1 2004/09/24 16:41:16 rich Exp $
+ * $Id: mailing_list_send.ml,v 1.2 2004/09/24 16:45:02 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
@@ -88,7 +88,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   Sendmail.send_mail ~subject ~body ~to_addr:[email] ();
 
   (* Finish up. *)
-  let buttons = [ ok_button ("/" ^ page) ] in
+  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 " ^