X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frestore_form.ml;h=4e9552af86b3e56e22c2998562a25b00014a2053;hb=c5f822d1ca81042a8c0be2955668b0abebf1b11c;hp=41e7c4a4994fc2f22d5e0fbd78e990b627eb676b;hpb=ca4d4140c5ab4b351dd5483337cf61e8e9fa94e6;p=cocanwiki.git

diff --git a/scripts/restore_form.ml b/scripts/restore_form.ml
index 41e7c4a..4e9552a 100644
--- a/scripts/restore_form.ml
+++ b/scripts/restore_form.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_form.ml,v 1.4 2004/09/08 09:54:28 rich Exp $
+ * $Id: restore_form.ml,v 1.9 2004/10/30 10:16:10 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,9 +29,9 @@ open Cocanwiki_template
 open Cocanwiki_ok
 open Cocanwiki_diff
 
-let template = get_template "restore_form.html"
+let run r (q : cgi) (dbh : Dbi.connection) 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
@@ -36,10 +51,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
   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
+    return ()
   );
 
-  let diff, _ = get_diff dbh hostid page ~old_version ~version () in
+  let diff, _ = get_diff dbh hostid ~user page ~old_version ~version () in
 
   (* Display the diff. *)
   template#set "diff" diff;