More thorough inclusion of the page bug. This should mean the page bug appears just...

[cocanwiki.git] / scripts / edit_page_css.ml

diff --git a/scripts/edit_page_css.ml b/scripts/edit_page_css.ml
index bef37af..6937665 100644 (file)
--- a/scripts/edit_page_css.ml
+++ b/scripts/edit_page_css.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_page_css.ml,v 1.6 2004/09/09 09:35:33 rich Exp $
+ * $Id: edit_page_css.ml,v 1.18 2005/11/24 14:54:11 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
@@ -15,7 +30,7 @@ open Cocanwiki_diff
 open Cocanwiki_emailnotify
 open Cocanwiki_strings
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let page = q#param "page" in
   let css = q#param "css" in
 
@@ -26,6 +41,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
+
   (* Changing the CSS creates a new version of the page.  This enables
    * us to revert changes to the CSS easily.
    *)
@@ -42,7 +62,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       | _ -> assert false in
 
   let sth = dbh#prepare_cached
-             "set constraints pages_redirect_cn, sitemenu_url_cn deferred" in
+             "set constraints pages_redirect_cn, sitemenu_url_cn,
+                   page_emails_url_cn, links_from_cn, recently_visited_url_cn
+                   deferred" in
   sth#execute [];
 
   let sth = dbh#prepare_cached "update pages set url_deleted = url,
@@ -52,12 +74,12 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
   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 page; title; description;
-              creation_date; logged_ip; redirect; css ];
+              creation_date; logged_ip; logged_user; redirect; css ];
 
-  let pageid = sth#serial "pages_id_seq" in
+  let pageid = Int64.to_int (sth#serial "pages_id_seq") in
 
   let sth = dbh#prepare_cached "insert into contents (pageid, ordering,
                                        sectionname, content, divname)
@@ -77,16 +99,17 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     "Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^
     diff in
 
-  email_notify ~subject ~body dbh hostid;
+  email_notify ~subject ~body ~user dbh hostid;
 
   let buttons = [ ok_button ("/" ^ page);
-                 { StdPages.label = "Edit stylesheet again";
-                   StdPages.link = "/_bin/edit_page_css_form.cmo";
-                   StdPages.method_ = None;
-                   StdPages.params = [ "page", page ] } ] in
+                 { Template.StdPages.label = "Edit stylesheet again";
+                   Template.StdPages.link = "/_bin/edit_page_css_form.cmo";
+                   Template.StdPages.method_ = None;
+                   Template.StdPages.params = [ "page", page ] } ] in
   ok ~title:"Stylesheet changed" ~buttons
-    q ("The stylesheet was changed successfully.  " ^
-       "Note: You must RELOAD the page to see changes to stylesheets.")
+    dbh hostid q
+    ("The stylesheet was changed successfully.  " ^
+     "Note: You must RELOAD the page to see changes to stylesheets.")
 
 let () =
   register_script ~restrict:[CanEdit] run