X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fadmin%2Fedit_hostnames.ml;h=1fe9e622e713bd8ee14b5b90c72fcc44eec71191;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=bff0fa85af6fadec353a8984ddd5aecfb954c269;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/admin/edit_hostnames.ml b/scripts/admin/edit_hostnames.ml
index bff0fa8..1fe9e62 100644
--- 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.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: edit_hostnames.ml,v 1.10 2006/03/28 16:24:08 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,28 +24,27 @@ open Registry
 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 hostid = int_of_string (q#param "hostid") in
+let run r (q : cgi) dbh _ host' _ =
+  let hostid = Int32.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
+		  Int32.to_string hostid);
+    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.
@@ -47,33 +61,29 @@ let run r (q : cgi) (dbh : Dbi.connection) host_stuff _ =
   let hostnames = List.filter ((<>) "") hostnames in
 
   (* Update the database. *)
-  let sth = dbh#prepare_cached
-	      "set constraints \"hosts_hostname_cn\" deferred" in
-  sth#execute [];
-  let sth = dbh#prepare_cached "update hosts set canonical_hostname = ?
-                                 where id = ?" in
-  sth#execute [`String canonical_hostname; `Int hostid];
-  let sth = dbh#prepare_cached "delete from hostnames where hostid = ?" in
-  sth#execute [`Int hostid];
-  let sth = dbh#prepare_cached "insert into hostnames (hostid, name)
-                                values (?, ?)" in
-  sth#execute [`Int hostid; `String canonical_hostname];
-  List.iter (fun name ->
-	       sth#execute [`Int hostid; `String name]) hostnames;
+  PGSQL(dbh) "set constraints \"hosts_hostname_cn\" deferred";
+  PGSQL(dbh) "update hosts set canonical_hostname = $canonical_hostname
+               where id = $hostid";
+  PGSQL(dbh) "delete from hostnames where hostid = $hostid";
+  List.iter (
+    fun name ->
+      PGSQL(dbh) "insert into hostnames (hostid, name)
+                  values ($hostid, $name)";
+  ) hostnames;
 
   (* Commit to the database. *)
-  dbh#commit ();
+  PGOCaml.commit dbh;
 
   (* 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", Int32.to_string hostid ] }
   ] in
 
   ok ~title:"Saved" ~buttons
-    q "Hostnames updated."
+    dbh (-1l) q "Hostnames updated."
 
 let () =
   register_script run