X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frestore.ml;h=ed7f383771ee59caa7cc66c5b785357ec415a456;hb=0d913c7fee349ac0d46a9f9ce31977b2e5c545af;hp=c8f9d3fce8233ae25bedec398b50dd408eb37c10;hpb=afe5e5f759988c04d9b3bcee7cf75e2c15e1d1d5;p=cocanwiki.git diff --git a/scripts/restore.ml b/scripts/restore.ml index c8f9d3f..ed7f383 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 . * Copyright (C) 2004 Merjis Ltd. - * $Id: restore.ml,v 1.3 2004/09/07 14:58:34 rich Exp $ + * $Id: restore.ml,v 1.16 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 + * 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, _) _ = +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, _) _ = 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 @@ -39,7 +59,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ = | _ -> assert false in let sth = - dbh#prepare_cached "set constraints pages_redirect_cn deferred" in + dbh#prepare_cached + "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, @@ -49,10 +72,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, 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 @@ -64,6 +87,9 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ = where pageid = ?" in sth#execute [`Int pageid; `Int version]; + (* Keep the links table in synch. *) + Cocanwiki_links.update_links_for_page dbh hostid page; + dbh#commit (); (* Email notify. *) @@ -74,7 +100,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ = "Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^ diff in - email_notify ~body ~subject dbh hostid; + email_notify ~body ~subject ~user dbh hostid; (* Done. *) let buttons = [ ok_button ("/" ^ page) ] in @@ -84,4 +110,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ = q#redirect ("http://" ^ hostname ^ "/" ^ page) let () = - register_script run + register_script ~restrict:[CanEdit] run