(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: edit_page_css.ml,v 1.7 2004/09/09 12:21:22 rich Exp $
+ * $Id: edit_page_css.ml,v 1.14 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
open Cocanwiki_emailnotify
open Cocanwiki_strings
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
let page = q#param "page" in
let css = q#param "css" in
try `String (Connection.remote_ip (Request.connection r))
with Not_found -> `Null in
+ let logged_user =
+ match user with
+ | User (id, _, _, _) -> `Int id
+ | _ -> `Null in
+
(* Changing the CSS creates a new version of the page. This enables
* us to revert changes to the CSS easily.
*)
| _ -> assert false in
let sth = dbh#prepare_cached
- "set constraints pages_redirect_cn, sitemenu_url_cn deferred" in
+ "set constraints pages_redirect_cn, sitemenu_url_cn,
+ page_emails_url_cn, links_from_cn, recently_visited_url_cn
+ deferred" in
sth#execute [];
let sth = dbh#prepare_cached "update pages set url_deleted = url,
let sth = dbh#prepare_cached "insert into pages (hostid, url, title,
description, creation_date, logged_ip,
- redirect, css)
- values (?, ?, ?, ?, ?, ?, ?, ?)" in
+ logged_user, redirect, css)
+ values (?, ?, ?, ?, ?, ?, ?, ?, ?)" in
sth#execute [`Int hostid; `String page; title; description;
- creation_date; logged_ip; redirect; css ];
+ creation_date; logged_ip; logged_user; redirect; css ];
let pageid = sth#serial "pages_id_seq" in
let subject = "CSS for page " ^ page ^ " has been modified" in
let body = fun () ->
let diff, _ =
- get_diff dbh hostid page ~version:pageid ~old_version:oldpageid () in
+ get_diff dbh hostid ~user page
+ ~version:pageid ~old_version:oldpageid () in
"Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^
diff in
- email_notify ~subject ~body dbh hostid;
+ email_notify ~subject ~body ~user dbh hostid;
let buttons = [ ok_button ("/" ^ page);
{ StdPages.label = "Edit stylesheet again";