X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frestore.ml;h=471b8fcd8d98e43909e093f5a2e4afc35f47c22e;hb=f303d3e2bc355bdca4147d21441d6a13d4748d1a;hp=c1a93d10ff44db71326d7f9a267ffb1ce6b8e11e;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/restore.ml b/scripts/restore.ml
index c1a93d1..471b8fc 100644
--- a/scripts/restore.ml
+++ b/scripts/restore.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* 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.6 2004/09/09 09:35:33 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -14,7 +29,7 @@ open Cocanwiki_ok
 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
 
@@ -24,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
 
+    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
@@ -40,7 +60,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
     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,
@@ -50,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,
-                                     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