Basic contact form implemented (no user interface for it yet, however).

[cocanwiki.git] / scripts / edit.ml

diff --git a/scripts/edit.ml b/scripts/edit.ml
index c00c79d..47ab1fc 100644 (file)
--- a/scripts/edit.ml
+++ b/scripts/edit.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: edit.ml,v 1.3 2004/09/07 14:58:34 rich Exp $
+ * $Id: edit.ml,v 1.8 2004/09/09 12:21:22 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
@@ -18,9 +33,6 @@ open Cocanwiki_emailnotify
 open Cocanwiki_diff
 open Cocanwiki_strings
 
-let template = get_template "edit.html"
-let template_conflict = get_template "edit_conflict.html"
-
 (* We keep an "internal model" of the page - see build_internal_model ()
  * below.
  *)
@@ -33,7 +45,10 @@ type model_t = {
                                         * for each section. *)
 }
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+  let template = get_template dbh hostid "edit.html" in
+  let template_conflict = get_template dbh hostid "edit_conflict.html" in
+
   (* Workaround bugs in IE, specifically lack of support for <button>
    * elements.
    *)
@@ -369,7 +384,8 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
        * temporarily fail on the next UPDATE.
        *)
       let sth =
-       dbh#prepare_cached "set constraints pages_redirect_cn deferred" in
+       dbh#prepare_cached
+         "set constraints pages_redirect_cn, sitemenu_url_cn deferred" in
       sth#execute [];
 
       (* Mark the old page as deleted.  NB. There is a small race
@@ -479,4 +495,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run