git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Asynchronous updates.
[cocanwiki.git]
/
scripts
/
edit_page_css.ml
diff --git
a/scripts/edit_page_css.ml
b/scripts/edit_page_css.ml
index
a37ec89
..
1ff9ad3
100644
(file)
--- a/
scripts/edit_page_css.ml
+++ b/
scripts/edit_page_css.ml
@@
-1,7
+1,7
@@
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* 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.
15 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
*
* 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
@@
-30,7
+30,7
@@
open Cocanwiki_diff
open Cocanwiki_emailnotify
open Cocanwiki_strings
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
let page = q#param "page" in
let css = q#param "css" in
@@
-41,6
+41,11
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
try `String (Connection.remote_ip (Request.connection r))
with Not_found -> `Null 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.
*)
(* Changing the CSS creates a new version of the page. This enables
* us to revert changes to the CSS easily.
*)
@@
-57,7
+62,9
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
| _ -> assert false in
let sth = dbh#prepare_cached
| _ -> 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,
sth#execute [];
let sth = dbh#prepare_cached "update pages set url_deleted = url,
@@
-67,10
+74,10
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
let sth = dbh#prepare_cached "insert into pages (hostid, url, title,
description, creation_date, logged_ip,
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;
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 pageid = sth#serial "pages_id_seq" in
@@
-92,7
+99,7
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
"Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^
diff 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";
let buttons = [ ok_button ("/" ^ page);
{ StdPages.label = "Edit stylesheet again";