(* 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.4 2004/11/01 12:57:53 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
let userid =
match user with
Anonymous -> assert false
- | User (userid, _, _) -> userid in
+ | User (userid, _, _, _) -> userid in
- (* Update the email notify field. *)
+ (* Update the preferences fields. *)
let sth =
dbh#prepare_cached "update users set email_notify = ?
where hostid = ? and id = ?" in
- sth#execute [`Bool email_notify; `Int hostid; `Int userid];
+ sth#execute [`Bool email_notify;
+ `Int hostid; `Int userid];
(* Have we changed the email address? *)
let confirm_needed =
(* 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
(* 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 " ^