Don't forget the date\!

[cocanwiki.git] / scripts / edit_host_settings_form.ml

diff --git a/scripts/edit_host_settings_form.ml b/scripts/edit_host_settings_form.ml
index 6b8e73c..0e52c49 100644 (file)
--- a/scripts/edit_host_settings_form.ml
+++ b/scripts/edit_host_settings_form.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: edit_host_settings_form.ml,v 1.7 2006/03/27 18:09:46 rich Exp $
+ * $Id: edit_host_settings_form.ml,v 1.10 2006/12/06 09:46:57 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
@@ -28,7 +28,7 @@ open Cocanwiki
 open Cocanwiki_template
 
 let run r (q : cgi) dbh hostid _ _ =
-  let template = get_template dbh hostid "edit_host_settings_form.html" in
+  let template = get_template r dbh hostid "edit_host_settings_form.html" in
 
   (* List of themes. *)
   let rows =
@@ -44,16 +44,19 @@ let run r (q : cgi) dbh hostid _ _ =
     PGSQL(dbh)
       "select canonical_hostname, edit_anon, create_account_anon, theme_css,
               feedback_email, mailing_list, search_box, navigation, view_anon,
-              brand, brand_tagline, brand_description
+              brand, brand_tagline, brand_description, ie_imagetoolbar_no,
+              global_noodp
          from hosts where id = $hostid" in
 
   let canonical_hostname, edit_anon, create_account_anon, theme_css,
       feedback_email, mailing_list, search_box, navigation, view_anon,
-      brand, brand_tagline, brand_description =
+      brand, brand_tagline, brand_description, ie_imagetoolbar_no,
+      global_noodp =
     match rows with
     | [canonical_hostname, edit_anon, create_account_anon, theme_css,
        feedback_email, mailing_list, search_box, navigation, view_anon,
-       brand, brand_tagline, brand_description] ->
+       brand, brand_tagline, brand_description, ie_imagetoolbar_no,
+       global_noodp ] ->
        let theme_css =
          match theme_css with Some s -> s | None -> "" in
        let feedback_email =
@@ -66,7 +69,8 @@ let run r (q : cgi) dbh hostid _ _ =
          match brand_description with Some s -> s | None -> "" in
        canonical_hostname, edit_anon, create_account_anon, theme_css,
        feedback_email, mailing_list, search_box, navigation, view_anon,
-       brand, brand_tagline, brand_description
+       brand, brand_tagline, brand_description, ie_imagetoolbar_no,
+       global_noodp
     | _ -> assert false in
 
   template#set "canonical_hostname" canonical_hostname;
@@ -75,6 +79,8 @@ let run r (q : cgi) dbh hostid _ _ =
   template#set "feedback_email" feedback_email;
   template#conditional "mailing_list" mailing_list;
   template#conditional "search_box" search_box;
+  template#conditional "ie_imagetoolbar_no" ie_imagetoolbar_no;
+  template#conditional "global_noodp" global_noodp;
   template#conditional "navigation" navigation;
   template#conditional "view_anon" view_anon;
   template#set "brand" brand;