X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit_sitemenu.ml;h=38cba43baaeec46de03f79d35010bfc9e4c81e18;hb=4a1e5fc5b42ca3e44ec10079aac57e6d9cd16879;hp=25997e8036fa50861f4fed6862fe758d32df02c7;hpb=d6978d316016d0c96753ace2a2e474c50bd40c42;p=cocanwiki.git

diff --git a/scripts/edit_sitemenu.ml b/scripts/edit_sitemenu.ml
index 25997e8..38cba43 100644
--- 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.5 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
@@ -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 } _ =
+  let template = get_template dbh hostid "edit_sitemenu.html" in
+
   (* Workaround bugs in IE, specifically lack of support for <button>
    * elements.
    *)
@@ -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