Fixed to match ChriS's API changes to mod_caml.

[cocanwiki.git] / scripts / admin / edit_hostnames.ml

diff --git a/scripts/admin/edit_hostnames.ml b/scripts/admin/edit_hostnames.ml
index f572cb9..ece222a 100644 (file)
--- a/scripts/admin/edit_hostnames.ml
+++ b/scripts/admin/edit_hostnames.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_hostnames.ml,v 1.3 2004/09/07 14:58:34 rich Exp $
+ * $Id: edit_hostnames.ml,v 1.7 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
+ * 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
@@ -15,21 +30,21 @@ open Cocanwiki_strings
 
 let split_re = Pcre.regexp "[\\s,;]+"
 
-let run r (q : cgi) (dbh : Dbi.connection) host_stuff _ =
+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, _ = host_stuff in
+    let { hostname = hostname } = host' in
     q#redirect ("http://" ^ hostname ^ "/_bin/admin/host.cmo?hostid=" ^
                string_of_int hostid);
-    raise CgiExit
+    return ()
   );
 
   let canonical_hostname = q#param "canonical_hostname" in
   let hostnames = try q#param "hostnames" with Not_found -> "" in
 
   (* In theory we could verify characters in hostnames, and call
-   * error / raise CgiExit if the format is incorrect.  However
+   * error / return () if the format is incorrect.  However
    * it's probably best to assume the sysadmin knows what they're up to
    * here.  If this script is allowed to be accessed by untrusted users,
    * then this has security implications.
@@ -65,10 +80,10 @@ let run r (q : cgi) (dbh : Dbi.connection) host_stuff _ =
 
   (* Print confirmation page. *)
   let buttons = [
-    { StdPages.label = "OK";
-      StdPages.link = "/_bin/admin/host.cmo";
-      StdPages.method_ = None;
-      StdPages.params = [ "hostid", string_of_int hostid ] }
+    { Template.StdPages.label = "OK";
+      Template.StdPages.link = "/_bin/admin/host.cmo";
+      Template.StdPages.method_ = None;
+      Template.StdPages.params = [ "hostid", string_of_int hostid ] }
   ] in
 
   ok ~title:"Saved" ~buttons