X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcreate_form.ml;h=990cfc0317b1835e04615464088fae1d1d8f074d;hb=2b332786c6f216c5e2e72cc1596ba4c66b5aa2a4;hp=63360216bc91ddd910ceebb4657165c76893c7fc;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/scripts/create_form.ml b/scripts/create_form.ml
index 6336021..990cfc0 100644
--- 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.1 2004/09/07 10:14:09 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
@@ -12,11 +27,12 @@ open Printf
 open ExtString
 
 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
 
@@ -26,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;
@@ -37,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