X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=38eb595d6b27f211335e9a101fd12afcb8152159;hb=754ca8ffd4430d8a7e00c3b6d1f45af3e379c313;hp=6c7bb75022c0675f9185ea08bd3f3bfd2b49c55f;hpb=afe5e5f759988c04d9b3bcee7cf75e2c15e1d1d5;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index 6c7bb75..38eb595 100644
--- a/scripts/page.ml
+++ b/scripts/page.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI scripts.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: page.ml,v 1.3 2004/09/07 14:58:34 rich Exp $
+ * $Id: page.ml,v 1.8 2004/09/08 15:46:53 rich Exp $
  *)
 
 open Apache
@@ -16,9 +16,6 @@ open Cocanwiki_template
 open Cocanwiki_ok
 open Cocanwiki_date
 
-let template_page = get_template "page.html"
-let template_404  = get_template "page_404.html"
-
 (* Maximum level of redirection. *)
 let max_redirect = 4
 
@@ -26,7 +23,10 @@ type fp_status = FPOK of int * string * string * Dbi.datetime * bool
 	       | FPRedirect of string
 	       | FPNotFound
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, edit_anon) user =
+  let template_page = get_template dbh hostid "page.html" in
+  let template_404  = get_template dbh hostid "page_404.html" in
+
   let page = q#param "page" in
   let page = if page = "" then "index" else page in
 
@@ -39,6 +39,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
       | [ `Bool has_host_css ] -> has_host_css
       | _ -> assert false in
 
+  (* Can the user edit?  Manage users? *)
+  let can_edit = can_edit edit_anon user in
+  let can_manage_users = can_manage_users user in
+
   (* This code generates ordinary pages. *)
   let make_page title description pageid last_modified_date has_page_css
       version page page' =
@@ -62,6 +66,9 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
     t#conditional "has_host_css" has_host_css;
     t#conditional "has_page_css" has_page_css;
 
+    t#conditional "can_edit" can_edit;
+    t#conditional "can_manage_users" can_manage_users;
+
     (* Pull out the sections in this page. *)
     let sth = dbh#prepare_cached
 		"select ordering, sectionname, content, divname
@@ -97,6 +104,26 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
 	   t#conditional "is_old_version" true;
 	   t#set "old_version" (string_of_int pageid));
 
+    (* Login status. *)
+    (match user with
+	 Anonymous ->
+	   t#conditional "user_logged_in" false
+       | User (_, username, _) ->
+	   t#conditional "user_logged_in" true;
+	   t#set "username" username);
+
+    (* Site menu. *)
+    let sth = dbh#prepare_cached "select url, label, ordering from sitemenu
+                                   where hostid = ? order by ordering" in
+    sth#execute [`Int hostid];
+
+    let table = sth#map (function [`String url; `String label; _] ->
+			   [ "url", Template.VarString url;
+			     "label", Template.VarString label ]
+			   | _ -> assert false) in
+
+    t#table "sitemenu" table;
+
     q#template t
   in
 
@@ -113,7 +140,24 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
              ('a'..'z' | 'A'..'Z' | '0'..'9') as c -> c
            | _ -> ' ') page in
 
-    template_404#set "search_terms" search_terms;
+    t#set "search_terms" search_terms;
+
+    t#conditional "has_host_css" has_host_css;
+
+    t#conditional "can_edit" can_edit;
+    t#conditional "can_manage_users" can_manage_users;
+
+    (* Site menu. *)
+    let sth = dbh#prepare_cached "select url, label, ordering from sitemenu
+                                   where hostid = ? order by ordering" in
+    sth#execute [`Int hostid];
+
+    let table = sth#map (function [`String url; `String label; _] ->
+			   [ "url", Template.VarString url;
+			     "label", Template.VarString label ]
+			   | _ -> assert false) in
+
+    t#table "sitemenu" table;
 
     q#template t
   in
@@ -186,9 +230,13 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
   in
 
   (* Here we deal with the complex business of redirects and versions. *)
-  let allow_redirect = not (q#param_true "no_redirect") in
-  let version =
-    try Some (int_of_string (q#param "version")) with Not_found -> None in
+  (* Only allow the no_redirect and version syntax for editors. *)
+  let allow_redirect, version =
+    if can_edit then (
+      not (q#param_true "no_redirect"),
+      try Some (int_of_string (q#param "version")) with Not_found -> None
+    ) else
+      (true, None) in
 
   let rec loop page' i =
     if i > max_redirect then (