X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=aa66aeddfdd9b4a995832f0eed5ed9dcf093e61c;hb=be6c7d6de3a92bc850a84ca4c234836b8e166fb9;hp=3657919e65846c7d7a7d112503c18fa013ec9bc6;hpb=7130fa13b57c8f83e30781ad9030f8759a0dedbe;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index 3657919..aa66aed 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.33 2004/10/17 19:43:19 rich Exp $ + * $Id: page.ml,v 1.41 2005/11/23 11:05:54 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,7 +35,8 @@ open Cocanwiki_server_settings open Cocanwiki_links type fp_status = FPOK of int * string * string * Dbi.datetime * bool - | FPRedirect of string + | FPInternalRedirect of string + | FPExternalRedirect of string | FPNotFound (* Referer strings which help us decide if the user came from @@ -53,35 +54,43 @@ let split_qs_re = Pcre.regexp "\\?" let xhtml_re = Pcre.regexp "<.*?>|[^<>]+" let run r (q : cgi) (dbh : Dbi.connection) hostid - ({ edit_anon = edit_anon; - view_anon = view_anon } as host) + ({ edit_anon = edit_anon; view_anon = view_anon } as host) user = let page = q#param "page" in let page = if page = "" then "index" else page in + (* The main "page" template is split in two to improve the speed of + * delivery of the page. The very first part ("page_header.html") + * contains the page , crucially including all the links to the + * stylesheets. We send this first and flush it out to the client so + * that the client can begin requesting stylesheets, background images + * and so on. After this we compose the main page ("page.html") and + * send it out second. + *) + + let template_page_header = + get_template ~page dbh hostid "page_header.html" in let template_page = get_template ~page dbh hostid "page.html" in + + (* This is the simpler template for 404 pages. *) 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, - mailing_list, search_box, navigation + mailing_list, navigation from hosts where id = ?" in sth#execute [`Int hostid]; - let has_host_css, has_feedback_email, mailing_list, search_box, navigation = + let has_host_css, has_feedback_email, mailing_list, navigation = match sth#fetch1 () with | [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list; - `Bool search_box; `Bool navigation ] -> - has_host_css, has_feedback_email, mailing_list, search_box, - navigation + `Bool navigation ] -> + has_host_css, has_feedback_email, mailing_list, 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 @@ -175,38 +184,56 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid let make_page title description pageid last_modified_date has_page_css version page page' extension = let t = template_page in + let th = template_page_header in t#set "title" title; + th#set "title" title; t#set "last_modified_date" last_modified_date; (match description with - None -> t#conditional "has_description" false + None -> th#conditional "has_description" false | Some description -> - t#conditional "has_description" true; - t#set "description" description); + th#conditional "has_description" true; + th#set "description" description); if page <> page' then (* redirection *) ( t#set "page" page'; + th#set "page" page'; t#set "original_page" page; (* XXX title - get it from database *) t#conditional "redirected" true ) else ( t#set "page" page; + th#set "page" page; t#conditional "redirected" false ); - t#conditional "has_host_css" has_host_css; - t#conditional "has_page_css" has_page_css; + th#conditional "has_host_css" has_host_css; + th#conditional "has_page_css" has_page_css; + + (* Are we showing an old version of the page? If so, warn. *) + (match version with + None -> + t#conditional "is_old_version" false; + th#conditional "is_old_version" false + | Some pageid -> + t#conditional "is_old_version" true; + th#conditional "is_old_version" true; + t#set "old_version" (string_of_int pageid); + th#set "old_version" (string_of_int pageid)); + + (* At this point, we can print out the header and flush it back to + * the user, allowing the browser to start fetching stylesheets + * and background images while we compose the page. + *) + q#header (); + print_string r th#to_string; + Request.rflush r; t#conditional "has_feedback_email" has_feedback_email; t#conditional "mailing_list" mailing_list; - t#conditional "search_box" search_box; t#conditional "navigation" navigation; 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. *) @@ -263,26 +290,18 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid t#table "sections" sections; - (* Are we showing an old version of the page? If so, warn. *) - (match version with - None -> - t#conditional "is_old_version" false - | Some pageid -> - 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, _) -> + | User (_, username, _, _) -> t#conditional "user_logged_in" true; t#set "username" username); (* If logged in, we want to update the recently_visited table. *) if pageid <> None then ( match user with - | User (userid, _, _) -> + | User (userid, _, _, _) -> let sth = dbh#prepare_cached "delete from recently_visited where hostid = ? and userid = ? and url = ?" in @@ -306,7 +325,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid 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. *) @@ -360,12 +379,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid let xhtml = highlight_search_terms xhtml search_terms "search_term" in (* 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. *) - q#template t + ignore (print_string r t#to_string) in (* This code generates 404 pages. *) @@ -383,14 +401,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 @@ -401,30 +413,29 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid * (2) Page is a redirect (fetches the name of the redirect page). * (3) Page not found in database, could be template or 404 error. *) - (* XXX Should do a case-insensitive matching of URLs, and if the URL differs - * in case only should redirect to the lowercase version. - *) let fetch_page page version allow_redirect = match version with | None -> if allow_redirect then ( let sth = dbh#prepare_cached - "select redirect, id, title, description, last_modified_date, - css is not null - from pages where hostid = ? and url = ?" in + "select url, redirect, id, title, description, + last_modified_date, css is not null + from pages where hostid = ? and lower (url) = lower (?)" in sth#execute [`Int hostid; `String page]; (try (match sth#fetch1 () with - | [ `Null; `Int id; `String title; `String description; - `Timestamp last_modified_date; `Bool has_page_css ] -> - FPOK (id, title, description, last_modified_date, - has_page_css) - | `String redirect :: _ -> - FPRedirect redirect - | _ -> assert false) + | `String page' :: _ when page <> page' -> (* different case *) + FPExternalRedirect page' + | [ _; `Null; `Int id; `String title; `String description; + `Timestamp last_modified_date; `Bool has_page_css ] -> + FPOK (id, title, description, last_modified_date, + has_page_css) + | _ :: `String redirect :: _ -> + FPInternalRedirect redirect + | xs -> failwith (Dbi.sdebug xs)) with - Not_found -> FPNotFound) + Not_found -> FPNotFound) ) else (* redirects not allowed ... *) ( let sth = dbh#prepare_cached @@ -434,11 +445,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid sth#execute [`Int hostid; `String page]; (try (match sth#fetch1 () with - | [ `Int id; `String title; `String description; - `Timestamp last_modified_date; `Bool has_page_css ] -> - FPOK (id, title, description, last_modified_date, - has_page_css) - | _ -> assert false) + | [ `Int id; `String title; `String description; + `Timestamp last_modified_date; `Bool has_page_css ] -> + FPOK (id, title, description, last_modified_date, + has_page_css) + | xs -> failwith (Dbi.sdebug xs)) with Not_found -> FPNotFound) ) @@ -454,11 +465,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid `String page; `String page]; (try (match sth#fetch1 () with - | [ `Int id; `String title; `String description; - `Timestamp last_modified_date; `Bool has_page_css ] -> - FPOK (id, title, description, last_modified_date, - has_page_css) - | _ -> assert false) + | [ `Int id; `String title; `String description; + `Timestamp last_modified_date; `Bool has_page_css ] -> + FPOK (id, title, description, last_modified_date, + has_page_css) + | xs -> failwith (Dbi.sdebug xs)) with Not_found -> FPNotFound) in @@ -486,8 +497,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid make_page title (Some description) (Some pageid) (printable_date last_modified_date) has_page_css version page page' extension - | FPRedirect page' -> + | FPInternalRedirect page' -> loop page' (i+1) + | FPExternalRedirect page' -> + (* This normally happens when a user has request an uppercase + * page name. We redirect to the true (lowercase) version. + *) + q#redirect ("http://" ^ host.hostname ^ "/" ^ page'); + return () | FPNotFound -> (* Might be a templated page with no content in it. *) let extension = get_extension page' in