X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fadmin%2Fedit_hostnames.ml;h=ece222a65ac548de2c585f76029d9d8837e7ec9e;hb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;hp=9123338a5ece9417ff95ab06329ea1bd07272826;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git diff --git a/scripts/admin/edit_hostnames.ml b/scripts/admin/edit_hostnames.ml index 9123338..ece222a 100644 --- a/scripts/admin/edit_hostnames.ml +++ b/scripts/admin/edit_hostnames.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: edit_hostnames.ml,v 1.5 2004/09/09 12:21:22 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 @@ -37,14 +37,14 @@ let run r (q : cgi) (dbh : Dbi.connection) _ host' _ = 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. @@ -80,10 +80,10 @@ let run r (q : cgi) (dbh : Dbi.connection) _ host' _ = (* 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