X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit.ml;h=00d48abf5d84612ddddee2b3d55025fd491bb4e4;hb=867889b6d04b6381c74974e338672ee02d61920e;hp=effef45720f0cd4b7dd0ebef385b8045006f787d;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/edit.ml b/scripts/edit.ml
index effef45..00d48ab 100644
--- a/scripts/edit.ml
+++ b/scripts/edit.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.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
@@ -30,7 +45,7 @@ type model_t = {
 					 * 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
 
@@ -103,12 +118,16 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 		   "(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
@@ -232,7 +251,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 	| _ -> 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 = ?
@@ -389,6 +409,11 @@ 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
+
       (* Get redirect. *)
       let redirect = if model.redirect = "" then `Null
                      else `String model.redirect in
@@ -396,11 +421,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       (* 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
@@ -414,9 +439,12 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 		   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;