Support for NOODP flag, sitewide and per-page.

[cocanwiki.git] / scripts / host_menu.ml

diff --git a/scripts/host_menu.ml b/scripts/host_menu.ml
index 59909eb..736b4cd 100644 (file)
--- 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.11 2006/08/14 10:04:25 rich Exp $
+ * $Id: host_menu.ml,v 1.12 2006/08/14 11:36:50 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
@@ -52,7 +52,7 @@ let run r (q : cgi) dbh hostid host user =
                 h.search_box, h.navigation, h.view_anon,
                 h.brand, coalesce (h.brand_tagline, ''),
                 coalesce (h.brand_description, ''),
-                h.ie_imagetoolbar_no
+                h.ie_imagetoolbar_no, h.global_noodp
            from hosts h left outer join themes t on h.theme_css = t.theme_css
           where h.id = $hostid" in
 
@@ -60,14 +60,15 @@ let run r (q : cgi) dbh hostid host user =
       has_theme_css, theme_name, theme_description, has_feedback_email,
       feedback_email, mailing_list, search_box, navigation, view_anon,
       has_brand, brand, brand_tagline, brand_description,
-      ie_imagetoolbar_no =
+      ie_imagetoolbar_no, global_noodp =
       match rows with
        [ Some canonical_hostname, Some has_global_css,
          Some edit_anon, Some create_account_anon, Some has_theme_css,
          theme_name, theme_description,
          feedback_email,
          Some mailing_list, Some search_box, Some navigation, Some view_anon,
-         brand, brand_tagline, brand_description, Some ie_imagetoolbar_no ] ->
+         brand, brand_tagline, brand_description, Some ie_imagetoolbar_no,
+         Some global_noodp ] ->
          let theme_name =
            match theme_name with Some s -> s | None -> "" in
          let theme_description =
@@ -88,7 +89,7 @@ let run r (q : cgi) dbh hostid host user =
          has_theme_css, theme_name, theme_description, has_feedback_email,
          feedback_email, mailing_list, search_box, navigation, view_anon,
          has_brand, brand, brand_tagline, brand_description,
-         ie_imagetoolbar_no
+         ie_imagetoolbar_no, global_noodp
       | _ -> assert false in
 
     template#set "canonical_hostname" canonical_hostname;
@@ -103,6 +104,7 @@ let run r (q : cgi) dbh hostid host user =
     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#conditional "has_brand" has_brand;