Global replace 'raise CgiExit' -> 'return ()' to match a future version of mod_caml.

[cocanwiki.git] / scripts / restore_form.ml

diff --git a/scripts/restore_form.ml b/scripts/restore_form.ml
index 050f6e8..8e18f45 100644 (file)
--- 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.1 2004/09/07 10:14:09 rich Exp $
+ * $Id: restore_form.ml,v 1.8 2004/09/23 11:56:47 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
@@ -9,15 +24,14 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
+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 _ _ =
+  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
@@ -37,7 +51,7 @@ 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
@@ -48,4 +62,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _) _ =
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run