-(* 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.7 2004/09/09 09:35:33 rich Exp $
+ * $Id: edit.ml,v 1.10 2004/09/21 13:01:15 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
* for each section. *)
}
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
let template = get_template dbh hostid "edit.html" in
let template_conflict = get_template dbh hostid "edit_conflict.html" in
"(ie. not to a page which is itself a redirect).")
);
- (* All sections have sectionnames? *)
- List.iter (function (sectionnames, _, _)
- when string_is_whitespace sectionnames ->
- add_error ("Every section must have a title.");
- | _ -> ())
- model.contents;
+ (* All sections after the first one have sectionnames? The first
+ * section ONLY is allowed to have an empty title.
+ *)
+ if model.contents <> [] then
+ List.iter (function (sectionnames, _, _)
+ when string_is_whitespace sectionnames ->
+ add_error
+ ("Every section except the first must have a title.");
+ | _ -> ())
+ (List.tl model.contents);
get_errors ()
in
| _ -> assert false in
(* Get the sections. *)
- let sth = dbh#prepare_cached "select sectionname, content,
+ let sth = dbh#prepare_cached "select coalesce (sectionname, ''),
+ content,
coalesce (divname, '')
from contents
where pageid = ?
try `String (Connection.remote_ip (Request.connection r))
with Not_found -> `Null in
+ let logged_user =
+ match user with
+ | User (id, _, _) -> `Int id
+ | _ -> `Null in
+
(* Get redirect. *)
let redirect = if model.redirect = "" then `Null
else `String model.redirect in
(* Create the new page. *)
let sth = dbh#prepare_cached "insert into pages (hostid, url, title,
description, creation_date, logged_ip,
- redirect, css)
- values (?, ?, ?, ?, ?, ?, ?, ?)" in
+ logged_user, redirect, css)
+ values (?, ?, ?, ?, ?, ?, ?, ?, ?)" in
sth#execute [`Int hostid; `String url; `String title;
`String model.description; creation_date; logged_ip;
- redirect; css];
+ logged_user; redirect; css];
(* New page ID <> old page ID model.id. *)
let pageid = sth#serial "pages_id_seq" in
let divname =
if string_is_whitespace divname then `Null
else `String divname in
+ let sectionname =
+ if string_is_whitespace sectionname then `Null
+ else `String sectionname in
incr ordering; let ordering = !ordering in
sth#execute [`Int pageid; `Int ordering;
- `String sectionname; divname;
+ sectionname; divname;
`String content])
model.contents;