X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fadmin%2Fhost.ml;h=4cec09ca97c9f4e417ff13a22ecefae5c225a1b2;hb=89e8d5757ca111d16ce3dfcc1ce4f2c00a119c85;hp=95056ab2d45771634f05456bdb3c0203d83d22bf;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/admin/host.ml b/scripts/admin/host.ml
index 95056ab..4cec09c 100644
--- a/scripts/admin/host.ml
+++ b/scripts/admin/host.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: host.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: host.ml,v 1.7 2004/10/21 19:54:29 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,14 +24,13 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
 open Cocanwiki_template
+open Cocanwiki_date
 
-let template = get_template "admin/host.html"
+let template = _get_template "admin/host.html"
 
-let run r (q : cgi) (dbh : Dbi.connection) _ _ =
+let run r (q : cgi) (dbh : Dbi.connection) _ _ _ =
   let hostid = int_of_string (q#param "hostid") in
 
   template#set "id" (string_of_int hostid);
@@ -78,21 +92,6 @@ let run r (q : cgi) (dbh : Dbi.connection) _ _ =
 			 | _ -> assert false) in
   template#table "hostnames" table;
 
-  (* Pull out any email notifications. *)
-  let sth = dbh#prepare_cached "select email, name from email_notify
-                                 where hostid = ?" in
-  sth#execute [`Int hostid];
-
-  let table = sth#map (function
-			   [`String email; `Null] ->
-			     [ "email", Template.VarString email;
-			       "name", Template.VarString "" ]
-			 | [ `String email; `String name] ->
-			     [ "email", Template.VarString email;
-			       "name", Template.VarString name ]
-			 | _ -> assert false) in
-  template#table "emails" table;
-
   q#template template
 
 let () =