(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki.ml,v 1.8 2004/09/20 15:34:36 rich Exp $
+ * $Id: cocanwiki.ml,v 1.12 2004/09/23 15:16:21 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
*)
exception CgiExit
+let return () = raise CgiExit
+
(* Permissions and restrictions.
*
* Use the optional ~restrict parameter to register_script to restrict
* register_script ~restrict:[CanEdit ; CanManageUsers] run
*)
type permissions_t = CanEdit | CanManageUsers | CanManageContacts
+ | CanManageSite | CanEditGlobalCSS
(* The "user object". *)
type user_t = Anonymous (* Not logged in. *)
let can_edit edit_anon = test_permission edit_anon CanEdit
let can_manage_users = test_permission false CanManageUsers
let can_manage_contacts = test_permission false CanManageContacts
+let can_manage_site = test_permission false CanManageSite
+let can_edit_global_css = test_permission false CanEditGlobalCSS
(* The "host object". *)
type host_t = { hostname : string;
let sth =
dbh#prepare_cached
"select u.id, u.name, u.can_edit, u.can_manage_users,
- u.can_manage_contacts
+ u.can_manage_contacts, u.can_manage_site,
+ u.can_edit_global_css
from usercookies uc, users u
where uc.cookie = ? and uc.userid = u.id and u.hostid = ?" in
sth#execute [`String cookie; `Int hostid];
(match sth#fetch1 () with
[ `Int userid; `String name;
`Bool can_edit; `Bool can_manage_users;
- `Bool can_manage_contacts ] ->
+ `Bool can_manage_contacts; `Bool can_manage_site;
+ `Bool can_edit_global_css ] ->
+ let perms = if can_edit then [ CanEdit ] else [] in
+ let perms =
+ if can_manage_users then CanManageUsers :: perms
+ else perms in
+ let perms =
+ if can_manage_contacts then CanManageContacts :: perms
+ else perms in
+ let perms =
+ if can_manage_site then CanManageSite :: perms
+ else perms in
let perms =
- (if can_edit then [ CanEdit ] else []) @
- (if can_manage_users then [ CanManageUsers ] else []) @
- (if can_manage_contacts then [ CanManageContacts ] else [])
- in
+ if can_edit_global_css then CanEditGlobalCSS :: perms
+ else perms in
User (userid, name, perms)
| _ -> assert false)
with
match restrict with
[] -> true (* empty list = no restrictions *)
| rs ->
- List.fold_left ((||)) false
+ List.fold_left (||) false
(List.map (fun r -> test_permission edit_anon r user) rs) in
if permitted then (