X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcreate.ml;h=4b4caa6d48041d5aebd152b09529b756272a3eb2;hb=d7665038dce2db6a6e2125418838b0eab98b4ecd;hp=a1d1d721437238c707f872f2a10cec2424f48757;hpb=4a1bf584fe7e2f731645378201d9cc087b2b846d;p=cocanwiki.git

diff --git a/scripts/create.ml b/scripts/create.ml
index a1d1d72..4b4caa6 100644
--- a/scripts/create.ml
+++ b/scripts/create.ml
@@ -1,7 +1,7 @@
 (* 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
@@ -30,7 +30,7 @@ open Cocanwiki
 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
 
@@ -40,10 +40,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       | 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
@@ -51,7 +51,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     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. *)
@@ -59,12 +59,17 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     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