X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=db576c822ead70d06612371326347035aa1c1482;hb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;hp=6c7bb75022c0675f9185ea08bd3f3bfd2b49c55f;hpb=afe5e5f759988c04d9b3bcee7cf75e2c15e1d1d5;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index 6c7bb75..db576c8 100644 --- a/scripts/page.ml +++ b/scripts/page.ml @@ -1,7 +1,22 @@ -(* COCANWIKI scripts. +(* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.3 2004/09/07 14:58:34 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *) open Apache @@ -16,9 +31,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,19 +38,31 @@ 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=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 - (* 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 + 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 version page page' = @@ -47,8 +71,6 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ = t#set "description" description; t#set "pageid" (string_of_int pageid); t#set "last_modified_date" (printable_date last_modified_date); - t#set "cocanwiki_package" Cocanwiki_version.package; - t#set "cocanwiki_version" Cocanwiki_version.version; if page <> page' then (* redirection *) ( t#set "page" page'; @@ -62,6 +84,14 @@ 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 "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 "select ordering, sectionname, content, divname @@ -72,14 +102,23 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ = let sections = sth#map - (function [`Int ordering; `String sectionname; `String content; + (function [`Int ordering; + (`Null | `String _) as sectionname; + `String content; (`Null | `String _) as divname] -> let divname, has_divname = match divname with `Null -> "", false | `String divname -> divname, true in + let sectionname, has_sectionname = + match sectionname with + `Null -> "", false + | `String sectionname -> sectionname, true in + let linkname = linkname_of_sectionname sectionname in [ "ordering", Template.VarString (string_of_int ordering); + "has_sectionname", Template.VarConditional has_sectionname; "sectionname", Template.VarString sectionname; + "linkname", Template.VarString linkname; "content", Template.VarString (Wikilib.xhtml_of_content dbh hostid content); @@ -97,6 +136,14 @@ 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); + q#template t in @@ -113,7 +160,15 @@ 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; + 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 @@ -186,16 +241,20 @@ 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 ( 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)->