-(* 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.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: edit_hostnames.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
open Cgi
open Printf
-open Merjisforwiki
-
open Cocanwiki
open Cocanwiki_ok
+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.