-(* 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_form.ml,v 1.4 2004/09/08 09:54:28 rich Exp $
+ * $Id: restore_form.ml,v 1.13 2006/03/28 16:24:08 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
open Cocanwiki_ok
open Cocanwiki_diff
-let template = get_template "restore_form.html"
+let run r (q : cgi) dbh hostid _ user =
+ let template = get_template dbh hostid "restore_form.html" in
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
(* Parameters. *)
let page = q#param "page" in
- let old_version = int_of_string (q#param "version") in
+ let old_version = Int32.of_string (q#param "version") in
template#set "page" page;
- template#set "version" (string_of_int old_version);
+ template#set "version" (Int32.to_string old_version);
(* Compute the diff between the latest version of this page and the
* page we're wanting to restore.
*)
- let sth = dbh#prepare_cached "select id from pages
- where hostid = ? and url = ?" in
- sth#execute [`Int hostid; `String page];
-
- let version = sth#fetch1int () in
+ let version = List.hd (
+ PGSQL(dbh)
+ "select id from pages
+ where hostid = $hostid and url = $page"
+ ) in
if version = old_version then (
error ~back_button:true ~title:"Restoring live version"
- q "You seem to be trying to restore the live version.";
- raise CgiExit
+ dbh hostid q "You seem to be trying to restore the live version.";
+ return ()
);
let diff, _ = get_diff dbh hostid page ~old_version ~version () in