(* 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.2 2004/10/30 10:16:10 rich Exp $
+ * $Id: cocanwiki.ml,v 1.3 2004/11/01 12:57:53 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
type prefs_t = {
email : string option; (* Email address. *)
email_notify : bool; (* Email notification. *)
- diff_sidebyside : bool; (* Shows diffs side-by-side. *)
}
(* The "user object". *)
"select u.id, u.name, u.can_edit, u.can_manage_users,
u.can_manage_contacts, u.can_manage_site,
u.can_edit_global_css, u.can_import_mail,
- u.email, u.email_notify, u.diff_sidebyside
+ u.email, u.email_notify
from usercookies uc, users u
where uc.cookie = ? and uc.userid = u.id and u.hostid = ?" in
sth#execute [`String cookie; `Int hostid];
`Bool can_edit; `Bool can_manage_users;
`Bool can_manage_contacts; `Bool can_manage_site;
`Bool can_edit_global_css; `Bool can_import_mail;
- (`Null | `String _) as email; `Bool email_notify;
- `Bool diff_sidebyside ] ->
+ (`Null | `String _) as email; `Bool email_notify ] ->
(* Every logged in user can view. *)
let perms = [CanView] in
let perms =
`Null -> None
| `String email -> Some email in
let prefs = { email = email;
- email_notify = email_notify;
- diff_sidebyside = diff_sidebyside } in
+ email_notify = email_notify; } in
User (userid, name, perms, prefs)
| _ -> assert false)
with