-(* 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.11 2006/03/27 19:10:29 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
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 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.
*)
ignore (String.find ua "MSIE"); (* Throws Invalid_string if not found. *)
true
with
- Not_found | String.Invalid_string -> false in
+ Not_found | Invalid_string -> false in
template#conditional "msie" msie;
(* Pull in the list of URLs in useful format. *)
- let sth = dbh#prepare_cached "select url, title from pages
- where hostid = ?
- and url is not null
- and url <> 'index'
- order by 2" in
- sth#execute [`Int hostid];
-
- let urls = sth#map (function [`String url; `String title] ->
- url, title
- | _ -> assert false) in
+ let urls = PGSQL(dbh)
+ "select url, title from pages
+ where hostid = $hostid
+ and url is not null
+ and url <> 'index'
+ order by 2" in
+ let urls = List.map (fun (url, title) -> Option.get url, title) urls in
(* Build the internal model from the parameters passed to the script. *)
let build_internal_model () =
* a model from it.
*)
let begin_editing () =
- let sth = dbh#prepare_cached "select label, url, ordering
- from sitemenu
- where hostid = ?
- order by ordering" in
- sth#execute [`Int hostid];
+ let rows =
+ PGSQL(dbh) "select label, url, ordering
+ from sitemenu
+ where hostid = $hostid
+ order by ordering" in
- let model = sth#map (function [`String label; `String url; _] ->
- label, url
- | _ -> assert false) in
+ let model = List.map (fun (label, url, _) -> label, url) rows in
model_to_template model template
in
if no_errors then (
(* No errors, so we can save the page ... *)
- let sth = dbh#prepare_cached "delete from sitemenu where hostid = ?" in
- sth#execute [`Int hostid];
-
- let sth = dbh#prepare_cached "insert into sitemenu (hostid, label, url,
- ordering) values (?, ?, ?, ?)" in
-
- List.iteri (fun i (label, url) ->
- let ordering = 10 * (i+1) in
- sth#execute [`Int hostid; `String label; `String url;
- `Int ordering]) model;
+ PGSQL(dbh) "delete from sitemenu where hostid = $hostid";
+ List.iteri (
+ fun i (label, url) ->
+ let ordering = Int32.of_int (10 * (i+1)) in
+ PGSQL(dbh)
+ "insert into sitemenu (hostid, label, url, ordering)
+ values ($hostid, $label, $url, $ordering)"
+ ) model;
(* Commit changes to the database. *)
- dbh#commit ();
+ PGOCaml.commit dbh;
(* Email notification, if anyone is listed for this host. *)
let subject = "The site menu has been edited" in
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."
+ dbh hostid q "The site menu was saved."
);
no_errors
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.
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
git.annexia.org / cocanwiki.git / blobdiff