X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fadmin%2Fedit_emails.ml;h=a1d0cc658628a29d00946c3b832100efff6f96d3;hb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;hp=732dee05b202ba66ec96d62a2d7854cbef9c5183;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/scripts/admin/edit_emails.ml b/scripts/admin/edit_emails.ml
index 732dee0..a1d0cc6 100644
--- a/scripts/admin/edit_emails.ml
+++ b/scripts/admin/edit_emails.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: edit_emails.ml,v 1.1 2004/09/07 10:14:10 rich Exp $
+ * $Id: edit_emails.ml,v 1.6 2004/09/23 11:56:47 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -9,22 +24,21 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
 open Cocanwiki_ok
+open Cocanwiki_strings
 
 let split_re = Pcre.regexp "[\\r\\n,;]+"
 let email_re = Pcre.regexp "(.*)<(.*)>"
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid_hostname _ =
+let run r (q : cgi) (dbh : Dbi.connection) _ host' _ =
   let hostid = int_of_string (q#param "hostid") in
 
   if q#param_true "cancel" then (
-    let _, hostname = hostid_hostname in
+    let { hostname = hostname } = host' in
     q#redirect ("http://" ^ hostname ^ "/_bin/admin/host.cmo?hostid=" ^
 		string_of_int hostid);
-    raise CgiExit
+    return ()
   );
 
   let emails = try q#param "emails" with Not_found -> "" in