(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki_emailnotify.ml,v 1.1 2004/10/21 11:42:05 rich Exp $
+ * $Id: cocanwiki_emailnotify.ml,v 1.6 2005/03/31 14:24:04 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
open Cgi
open Printf
+open Cocanwiki
+
(* This is where we coordinate email notification from various
* scripts which create or update the wiki.
*)
-let email_notify ~subject ~body (dbh : Dbi.connection) hostid =
- (* Is anyone listed for email notification at this host? *)
- let sth = dbh#prepare_cached "select email, name from email_notify
- where hostid = ?" in
- sth#execute [`Int hostid];
+let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid =
+ (* Get own userid, if we have it. Don't want to send email
+ * notification back to the person who changed the page. If
+ * we don't have a userid, set it to 0, because no real user can
+ * have userid = 0.
+ *
+ * Also get the user's email address.
+ *)
+ let own_userid, from =
+ match user with
+ | None
+ | Some Anonymous -> 0, None
+ | Some (User (userid, _, _, prefs)) -> userid, prefs.email in
+
+ (* Send a change email to everyone who hasn't opted out using
+ * their preferences. This behaviour replaces the old
+ * 'email_notify' table. Don't send email to invited accounts
+ * who have not yet confirmed.
+ *)
+ let sth = dbh#prepare_cached "select email, name
+ from users
+ where hostid = ? and id <> ? and email_notify
+ and email is not null
+ and invite is null" in
+ sth#execute [`Int hostid; `Int own_userid];
let to_addr = sth#map (function
| [`String email; `String name] ->
- name ^ " <" ^ email ^ ">"
- | [`String email; `Null] ->
- email
+ "\"" ^ name ^ "\" <" ^ email ^ ">"
| _ -> assert false) in
if to_addr <> [] then (
let subject = "Site notice: " ^ subject in
(* Send the email. *)
- Sendmail.send_mail ~subject ~to_addr ~body ()
+ Sendmail.send_mail ~subject ~to_addr ?from body
)