COCANWIKI is now ~95% UTF-8 safe.

[cocanwiki.git] / scripts / invite_user.ml

diff --git a/scripts/invite_user.ml b/scripts/invite_user.ml
index 19bd170..f7ca741 100644 (file)
--- a/scripts/invite_user.ml
+++ b/scripts/invite_user.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: invite_user.ml,v 1.7 2006/03/28 13:20:00 rich Exp $
+ * $Id: invite_user.ml,v 1.9 2006/07/31 09:49:43 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
@@ -39,10 +39,8 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
   let emails = Pcre.split ~rex:split_re emails in
 
   (* This guy's got no friends ... *)
-  if emails = [] then (
+  if emails = [] then
     q#redirect ("http://" ^ hostname ^ "/");
-    return ()
-  );
 
   let userid, username, email = match user with
       User (userid, username, _, prefs) -> userid, username, prefs.email
@@ -51,10 +49,10 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
   let subject = username ^ " has invited you to join " ^ hostname in
 
   (* Get a suitable return address for the email. *)
-  let from =
+  let from_addr =
     match email with
-      | Some email -> email
-      | None -> "service@merjis.com" in
+      | Some email -> username, email
+      | None -> username, "service@merjis.com" in
 
   (* Add user accounts for these new users.  For users who are already
    * registered, we'll send reminder emails.
@@ -96,7 +94,14 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
         | _ -> assert false in
 
        (* Send the email. *)
-       Sendmail.send_mail ~subject ~to_addr:[email] ~from body
+       let to_addrs = [ "", email ] in
+       let content_type =
+        "text/plain", ["charset", Mimestring.mk_param "UTF-8"] in
+
+       let msg =
+        Netsendmail.compose ~subject
+          ~to_addrs ~from_addr ~content_type body in
+       Netsendmail.sendmail msg
     ) emails;
 
   (* Finish off. *)