Fixed a few bugs in the previous check-in.

Updated deps.

diff --git a/scripts/.depend b/scripts/.depend
index 6f9188f..ae973c3 100644 (file)
--- a/scripts/.depend
+++ b/scripts/.depend
@@ -4,6 +4,8 @@ lib/cocanwiki_create_host.cmo: lib/cocanwiki_create_host.cmi
 lib/cocanwiki_create_host.cmx: lib/cocanwiki_create_host.cmi 
 lib/cocanwiki_diff.cmo: lib/cocanwiki_files.cmo 
 lib/cocanwiki_diff.cmx: lib/cocanwiki_files.cmx 
+lib/cocanwiki_emailnotify.cmo: lib/cocanwiki.cmo 
+lib/cocanwiki_emailnotify.cmx: lib/cocanwiki.cmx 
 lib/cocanwiki_ext_calendar.cmo: lib/cocanwiki.cmo lib/cocanwiki_date.cmo \
     lib/cocanwiki_strings.cmo lib/cocanwiki_template.cmi 
 lib/cocanwiki_ext_calendar.cmx: lib/cocanwiki.cmx lib/cocanwiki_date.cmx \
@@ -140,6 +142,8 @@ edit_user_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_date.cmo \
     lib/cocanwiki_template.cmi 
 edit_user_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_date.cmx \
     lib/cocanwiki_template.cmx 
+email_change.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo 
+email_change.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx 
 file.cmo: lib/cocanwiki.cmo 
 file.cmx: lib/cocanwiki.cmx 
 files.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
@@ -171,9 +175,9 @@ invite_user_confirm.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo \
 invite_user_confirm.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \
     lib/cocanwiki_strings.cmx lib/cocanwiki_template.cmx 
 invite_user_confirm_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo \
-    lib/cocanwiki_strings.cmo lib/cocanwiki_template.cmi 
+    lib/cocanwiki_template.cmi 
 invite_user_confirm_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \
-    lib/cocanwiki_strings.cmx lib/cocanwiki_template.cmx 
+    lib/cocanwiki_template.cmx 
 invite_user_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
 invite_user_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_template.cmx 
 largest_pages.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
@@ -304,6 +308,14 @@ upload_image.cmx: lib/cocanwiki.cmx lib/cocanwiki_emailnotify.cmx \
     lib/cocanwiki_images.cmx lib/cocanwiki_ok.cmx 
 upload_image_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
 upload_image_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_template.cmx 
+user_prefs.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo \
+    lib/cocanwiki_strings.cmo lib/cocanwiki_template.cmi 
+user_prefs.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \
+    lib/cocanwiki_strings.cmx lib/cocanwiki_template.cmx 
+user_prefs_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_date.cmo \
+    lib/cocanwiki_template.cmi 
+user_prefs_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_date.cmx \
+    lib/cocanwiki_template.cmx 
 users.cmo: lib/cocanwiki.cmo lib/cocanwiki_date.cmo \
     lib/cocanwiki_template.cmi 
 users.cmx: lib/cocanwiki.cmx lib/cocanwiki_date.cmx \
@@ -322,12 +334,6 @@ admin/create_host.cmx: lib/cocanwiki.cmx lib/cocanwiki_create_host.cmx \
     lib/cocanwiki_ok.cmx lib/cocanwiki_strings.cmx 
 admin/create_host_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
 admin/create_host_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_template.cmx 
-admin/edit_emails.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo \
-    lib/cocanwiki_strings.cmo 
-admin/edit_emails.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \
-    lib/cocanwiki_strings.cmx 
-admin/edit_emails_form.cmo: lib/cocanwiki.cmo lib/cocanwiki_template.cmi 
-admin/edit_emails_form.cmx: lib/cocanwiki.cmx lib/cocanwiki_template.cmx 
 admin/edit_host_css.cmo: lib/cocanwiki.cmo lib/cocanwiki_ok.cmo \
     lib/cocanwiki_strings.cmo 
 admin/edit_host_css.cmx: lib/cocanwiki.cmx lib/cocanwiki_ok.cmx \

diff --git a/scripts/user_prefs.ml b/scripts/user_prefs.ml
index 41d2f9d..3c1f713 100644 (file)
--- a/scripts/user_prefs.ml
+++ b/scripts/user_prefs.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: user_prefs.ml,v 1.1 2004/10/23 15:00:16 rich Exp $
+ * $Id: user_prefs.ml,v 1.2 2004/10/23 15:05:07 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
@@ -62,9 +62,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname=hostname} user =
       (* Is the new email address different from the one currently recorded
        * in the database?
        *)
-      let sth = dbh#prepare_cached "select ? = coalesce (email, '')
+      let sth = dbh#prepare_cached "select ? <> coalesce (email, '')
                                      from users where hostid = ? and id = ?" in
-      sth#execute [`Int hostid; `Int userid];
+      sth#execute [`String new_email; `Int hostid; `Int userid];
 
       let changed =
        match sth#fetch1 () with [ `Bool b ] -> b | _ -> assert false in
@@ -96,7 +96,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname=hostname} user =
   (* Commit and finish off. *)
   dbh#commit ();
 
-  ok ~title:"Preferences updated"
+  let buttons = [ ok_button "/_userprefs" ] in
+  ok ~title:"Preferences updated" ~buttons
     q ("Your user preferences were updated.  " ^
        if confirm_needed then
         ("Because you changed your email address, we have sent a " ^

diff --git a/templates/user_prefs_email_change.txt b/templates/user_prefs_email_change.txt
index 92bf7c3..4fbc01f 100644 (file)
--- a/templates/user_prefs_email_change.txt
+++ b/templates/user_prefs_email_change.txt
@@ -4,4 +4,4 @@ address at ::hostname::.
 To proceed with this change of email address, please verify by
 clicking on the link below:
 
-http://::hostname::/_email_change?key=::invite::
\ No newline at end of file
+http://::hostname::/_email_change?key=::key::
\ No newline at end of file