git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a search box on every page, controlled by a global setting
[cocanwiki.git]
/
scripts
/
restore.ml
diff --git
a/scripts/restore.ml
b/scripts/restore.ml
index
167ac9e
..
471b8fc
100644
(file)
--- a/
scripts/restore.ml
+++ b/
scripts/restore.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: restore.ml,v 1.
7 2004/09/09 12:21:22
rich Exp $
+ * $Id: restore.ml,v 1.
9 2004/09/24 15:53:57
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
@@
-29,7
+29,7
@@
open Cocanwiki_ok
open Cocanwiki_diff
open Cocanwiki_emailnotify
open Cocanwiki_diff
open Cocanwiki_emailnotify
-let run r (q : cgi) (dbh : Dbi.connection) hostid {
hostname = hostname } _
=
+let run r (q : cgi) (dbh : Dbi.connection) hostid {
hostname = hostname} user
=
let version = int_of_string (q#param "version") in
let page = q#param "page" in
let version = int_of_string (q#param "version") in
let page = q#param "page" in
@@
-39,6
+39,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
+
(* Copy the old version of the page to be live. *)
let sth = dbh#prepare_cached "select title, description, creation_date,
redirect, css
(* Copy the old version of the page to be live. *)
let sth = dbh#prepare_cached "select title, description, creation_date,
redirect, css
@@
-55,7
+60,8
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
let sth =
dbh#prepare_cached
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 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,
@@
-65,10
+71,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