X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fhost_menu.ml;h=4a03afa039fbbcd6488137a800f830b07a8c3c0f;hb=844dcb8bb66df887e0d677359f0278f17934efad;hp=39f3143c21a08a25e75a3cbd4cb24bb815e13f2b;hpb=50f72e5597bef62747f462d26cae836c7c9ee6b9;p=cocanwiki.git

diff --git a/scripts/host_menu.ml b/scripts/host_menu.ml
index 39f3143..4a03afa 100644
--- a/scripts/host_menu.ml
+++ b/scripts/host_menu.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: host_menu.ml,v 1.2 2004/09/24 16:30:07 rich Exp $
+ * $Id: host_menu.ml,v 1.5 2004/10/10 16:14:43 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
@@ -35,21 +35,23 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
     dbh#prepare_cached
       "select h.canonical_hostname, h.css is not null, h.edit_anon,
               h.create_account_anon, h.theme_css is not null,
-              t.name, t.description, h.feedback_email, h.mailing_list
+              t.name, t.description, h.feedback_email, h.mailing_list,
+              h.search_box, h.navigation, h.view_anon
          from hosts h left outer join themes t on h.theme_css = t.theme_css
         where h.id = ?" in
   sth#execute [`Int hostid];
 
   let canonical_hostname, has_global_css, edit_anon, create_account_anon,
       has_theme_css, theme_name, theme_description, has_feedback_email,
-      feedback_email, mailing_list =
+      feedback_email, mailing_list, search_box, navigation, view_anon =
     match sth#fetch1 () with
 	[ `String canonical_hostname; `Bool has_global_css;
 	  `Bool edit_anon; `Bool create_account_anon; `Bool has_theme_css;
 	  (`String _ | `Null) as theme_name;
 	  (`String _ | `Null) as theme_description;
 	  (`String _ | `Null) as feedback_email;
-	  `Bool mailing_list ] ->
+	  `Bool mailing_list; `Bool search_box; `Bool navigation;
+	  `Bool view_anon ] ->
 	  let theme_name =
 	    match theme_name with `String s -> s | `Null -> "" in
 	  let theme_description =
@@ -60,7 +62,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
 	      | `Null -> "", false in
 	  canonical_hostname, has_global_css, edit_anon, create_account_anon,
 	  has_theme_css, theme_name, theme_description, has_feedback_email,
-	  feedback_email, mailing_list
+	  feedback_email, mailing_list, search_box, navigation, view_anon
       | _ -> assert false in
 
   template#set "canonical_hostname" canonical_hostname;
@@ -73,6 +75,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   template#conditional "has_feedback_email" has_feedback_email;
   template#set "feedback_email" feedback_email;
   template#conditional "mailing_list" mailing_list;
+  template#conditional "search_box" search_box;
+  template#conditional "navigation" navigation;
+  template#conditional "view_anon" view_anon;
 
   q#template template