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

[cocanwiki.git] / scripts / create_form.ml

diff --git a/scripts/create_form.ml b/scripts/create_form.ml
index 124be21..990cfc0 100644 (file)
--- a/scripts/create_form.ml
+++ b/scripts/create_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: create_form.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: create_form.ml,v 1.7 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
@@ -15,9 +30,9 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_ok
 
-let template = get_template "create_form.html"
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+  let template = get_template dbh hostid "create_form.html" in
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   (* Get the page title. *)
   let title = q#param "title" in
 
@@ -27,10 +42,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
       | Wikilib.GenURL_TooShort | Wikilib.GenURL_BadURL ->
          error ~back_button:true ~title:"Bad page name"
            q "The page name supplied is too short or invalid.";
-         raise CgiExit
+         return ()
       | Wikilib.GenURL_Duplicate url ->
          q#redirect ("http://" ^ hostname ^ "/" ^ url);
-         raise CgiExit in
+         return () in
 
   (* Show the form. *)
   template#set "title" title;
@@ -38,4 +53,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run