X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=67ac47c3589889e5e831dc460393b19c4984b1cb;hb=6ad484dd47c27fd54c2f26fb931ba125bae9abc6;hp=9a4e8da5679136b51dd25a91c55cab1c152ed0bb;hpb=5b036c1119e5871a8996c98639cd861ea7d93e75;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index 9a4e8da..67ac47c 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 . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.28 2004/10/10 16:14:43 rich Exp $ + * $Id: page.ml,v 1.37 2004/10/30 10:16:10 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 @@ -25,6 +25,7 @@ open Cgi open Printf open ExtString +open ExtList open Cocanwiki open Cocanwiki_template @@ -55,12 +56,12 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid ({ edit_anon = edit_anon; view_anon = view_anon } as host) 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 + let template_page = get_template ~page dbh hostid "page.html" in + let template_404 = get_template dbh hostid "page_404.html" in + (* Host-specific fields. *) let sth = dbh#prepare_cached "select css is not null, feedback_email is not null, @@ -75,12 +76,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid navigation | _ -> assert false in - (* Can the user edit? Manage users? etc. *) + (* User permissions. *) let can_edit = can_edit host user in let can_manage_users = can_manage_users host user in - let can_manage_contacts = can_manage_contacts host user in - let can_manage_site = can_manage_site host user in - let can_edit_global_css = can_edit_global_css host user in (* Do we have a stats page set up? *) let has_stats = server_settings_stats_page dbh <> None in @@ -202,10 +200,6 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid 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; - t#conditional "has_stats" has_stats; (* Pull out the sections in this page. *) @@ -274,39 +268,43 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid (match user with Anonymous -> t#conditional "user_logged_in" false - | User (_, username, _) -> + | User (_, username, _, _) -> t#conditional "user_logged_in" true; t#set "username" username); (* If logged in, we want to update the recently_visited table. *) - (match user with - | User (userid, _, _) -> - let sth = dbh#prepare_cached "delete from recently_visited - where hostid = ? and userid = ? - and url = ?" in - sth#execute [`Int hostid; `Int userid; `String page']; - let sth = dbh#prepare_cached - "insert into recently_visited (hostid, userid, url) - values (?, ?, ?)" in - sth#execute [`Int hostid; `Int userid; `String page']; - dbh#commit () - | _ -> ()); + if pageid <> None then ( + match user with + | User (userid, _, _, _) -> + let sth = dbh#prepare_cached "delete from recently_visited + where hostid = ? and userid = ? + and url = ?" in + sth#execute [`Int hostid; `Int userid; `String page']; + let sth = dbh#prepare_cached + "insert into recently_visited (hostid, userid, url) + values (?, ?, ?)" in + sth#execute [`Int hostid; `Int userid; `String page']; + dbh#commit () + | _ -> () + ); (* Navigation links. *) if navigation then ( - let max_links = 15 in (* Show no more links than this. *) + let max_links = 18 in (* Show no more links than this. *) (* What links here. *) let wlh = what_links_here dbh hostid page' in + let wlh = List.take max_links wlh in let wlh_urls = List.map fst wlh in (* Just the URLs ... *) let rv = match user with - | User (userid, _, _) -> + | User (userid, _, _, _) -> (* Recently visited URLs, but don't repeat any from the 'what * links here' section, and don't link to self. *) let not_urls = page' :: wlh_urls in + let limit = max_links - List.length wlh_urls in let qs = Dbi.placeholders (List.length not_urls) in let sth = dbh#prepare_cached @@ -319,7 +317,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid limit ?") in let args = List.map (fun s -> `String s) not_urls in sth#execute - ([`Int hostid; `Int userid] @ args @ [`Int max_links]); + ([`Int hostid; `Int userid] @ args @ [`Int limit]); sth#map (function [`String url; `String title; _] -> url, title @@ -331,9 +329,16 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid "title", Template.VarString title ] in let table = List.map f wlh in t#table "what_links_here" table; + t#conditional "has_what_links_here" (wlh <> []); let table = List.map f rv in t#table "recently_visited" table; + t#conditional "has_recently_visited" (rv <> []); + + (* If both lists are empty (ie. an empty navigation box would + * appear), then disable navigation altogether. + *) + if wlh = [] && rv = [] then t#conditional "navigation" false ); (* If we are coming from a search engine then we want to highlight @@ -349,7 +354,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid (* Deliver the page. *) q#header (); - print_string r xhtml + ignore (print_string r xhtml) with Not_found -> (* No referer / no search terms / not a search engine referer. *) @@ -372,13 +377,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid 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; - 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; - t#conditional "has_stats" has_stats; q#template t