X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=db576c822ead70d06612371326347035aa1c1482;hb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;hp=366d34e759a6d7dbd33eabeebc1669e21b0ca177;hpb=9f9a92d2a7a26fd2413b5751f94af218d70e67d1;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index 366d34e..db576c8 100644
--- a/scripts/page.ml
+++ b/scripts/page.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: page.ml,v 1.14 2004/09/20 11:11:15 rich Exp $
+ * $Id: page.ml,v 1.18 2004/09/23 11:56:47 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
@@ -30,7 +30,6 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_ok
 open Cocanwiki_date
-open Cocanwiki_strings
 
 (* Maximum level of redirection. *)
 let max_redirect = 4
@@ -46,30 +45,23 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
   let page = q#param "page" in
   let page = if page = "" then "index" else page in
 
-  (* Host-specific CSS? *)
-  let sth = dbh#prepare_cached "select css is not null from hosts
-                                 where id = ?" in
+  (* Host-specific fields. *)
+  let sth = dbh#prepare_cached "select css is not null,
+                                       feedback_email is not null
+                                  from hosts where id = ?" in
   sth#execute [`Int hostid];
-  let has_host_css =
+  let has_host_css, has_feedback_email =
     match sth#fetch1 () with
-      | [ `Bool has_host_css ] -> has_host_css
+      | [ `Bool has_host_css; `Bool has_feedback_email ] ->
+	  has_host_css, has_feedback_email
       | _ -> assert false in
 
   (* Can the user edit?  Manage users?  etc. *)
   let can_edit = can_edit edit_anon user in
   let can_manage_users = can_manage_users user in
   let can_manage_contacts = can_manage_contacts user in
-
-  (* Convert a section name into something valid for use in <a name="...">
-   * XXX This breaks horribly for non-7-bit strings.
-   *)
-  let linkname_of_sectionname str =
-    let str = String.copy str in
-    for i = 0 to String.length str - 1 do
-      if not (isalnum str.[i]) then str.[i] <- '_'
-    done;
-    str
-  in
+  let can_manage_site = can_manage_site user in
+  let can_edit_global_css = can_edit_global_css user in
 
   (* This code generates ordinary pages. *)
   let make_page title description pageid last_modified_date has_page_css
@@ -92,9 +84,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
     t#conditional "has_host_css" has_host_css;
     t#conditional "has_page_css" has_page_css;
 
+    t#conditional "has_feedback_email" has_feedback_email;
+
     t#conditional "can_edit" can_edit;
     t#conditional "can_manage_users" can_manage_users;
     t#conditional "can_manage_contacts" can_manage_contacts;
+    t#conditional "can_manage_site" can_manage_site;
+    t#conditional "can_edit_global_css" can_edit_global_css;
 
     (* Pull out the sections in this page. *)
     let sth = dbh#prepare_cached
@@ -171,6 +167,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
     t#conditional "can_edit" can_edit;
     t#conditional "can_manage_users" can_manage_users;
     t#conditional "can_manage_contacts" can_manage_contacts;
+    t#conditional "can_manage_site" can_manage_site;
+    t#conditional "can_edit_global_css" can_edit_global_css;
 
     q#template t
   in
@@ -256,7 +254,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
       error ~title:"Too many redirections" ~back_button:true
         q ("Too many redirects between pages.  This may happen because " ^
 	   "of a cycle of redirections.");
-      raise CgiExit
+      return ()
     ) else
       match fetch_page page' version allow_redirect with
 	| FPOK (pageid, title, description, last_modified_date, has_page_css)->