(* 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.8 2004/09/21 13:01:16 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_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
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
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