(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: create.ml,v 1.6 2004/09/20 10:56:47 rich Exp $
+ * $Id: create.ml,v 1.8 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
open Cocanwiki_emailnotify
open Cocanwiki_ok
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
(* Get the page title. *)
let title = q#param "title" in
| Wikilib.GenURL_TooShort | Wikilib.GenURL_BadURL ->
error ~back_button:true ~title:"Bad page name"
q "The page name supplied is too short or invalid.";
- raise CgiExit
+ return ()
| Wikilib.GenURL_Duplicate url ->
q#redirect ("http://" ^ hostname ^ "/" ^ url);
- raise CgiExit in
+ return () in
(* Description field must contain something. *)
let description = q#param "description" in
error ~back_button:true ~title:"Description field missing"
q "You must write a brief description for search engines and
directories.";
- raise CgiExit
+ return ()
);
(* Get the IP address of the user, if available. *)
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
+
(* Create the page. *)
let sth = dbh#prepare_cached "insert into pages (hostid, url, title,
- description, logged_ip)
- values (?, ?, ?, ?, ?)" in
+ description, logged_ip, logged_user)
+ values (?, ?, ?, ?, ?, ?)" in
sth#execute [`Int hostid; `String url; `String title; `String description;
- logged_ip];
+ logged_ip; logged_user];
let pageid = sth#serial "pages_id_seq" in