Split the 'page' template into two halves to enable pipelining. The

[cocanwiki.git] / scripts / edit_sitemenu.ml

diff --git a/scripts/edit_sitemenu.ml b/scripts/edit_sitemenu.ml
index 25997e8..c283178 100644 (file)
--- a/scripts/edit_sitemenu.ml
+++ b/scripts/edit_sitemenu.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_sitemenu.ml,v 1.1 2004/09/08 14:47:47 rich Exp $
+ * $Id: edit_sitemenu.ml,v 1.7 2004/11/03 11:15:45 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,14 +33,14 @@ open Cocanwiki_ok
 open Cocanwiki_emailnotify
 open Cocanwiki_strings
 
-let template = get_template "edit_sitemenu.html"
-
 (* We keep an "internal model" of the menu - see build_internal_model ()
  * below.
  *)
 type model_t = (string * string) list  (* label, url *)
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
+  let template = get_template dbh hostid "edit_sitemenu.html" in
+
   (* Workaround bugs in IE, specifically lack of support for <button>
    * elements.
    *)
@@ -258,9 +273,9 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
 
       let body = fun () -> "Site: http://" ^ hostname ^ "/\n\n" in
 
-      email_notify ~body ~subject dbh hostid;
+      email_notify ~body ~subject ~user dbh hostid;
 
-      let buttons = [ ok_button "/" ] in
+      let buttons = [ ok_button "/_bin/host_menu.cmo" ] in
       ok ~title:"Saved" ~buttons
         q "The site menu was saved."
     );
@@ -269,7 +284,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   in
 
   let cancel () =
-    q#redirect ("http://" ^ hostname ^ "/")
+    q#redirect ("http://" ^ hostname ^ "/_bin/host_menu.cmo")
   in
 
   (* This codes decides where we are in the current editing cycle.
@@ -284,11 +299,11 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   if q#param_true "inedit" then (
     if q#param_true "cancel" then (
       cancel ();
-      raise CgiExit
+      return ()
     );
     if q#param_true "save" then (
       let ok = try_save () in
-      if ok then raise CgiExit         (* ... else fall through *)
+      if ok then return ()             (* ... else fall through *)
     );
     continue_editing ()                        (* Processes the action, if any. *)
   ) else