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 6a02a23..6937665 100644 (file)
--- a/scripts/edit_page_css.ml
+++ b/scripts/edit_page_css.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: edit_page_css.ml,v 1.11 2004/10/07 11:36:46 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
@@ -43,7 +43,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
 
   let logged_user =
     match user with
-      | User (id, _, _) -> `Int id
+      | User (id, _, _, _) -> `Int id
       | _ -> `Null in
 
   (* Changing the CSS creates a new version of the page.  This enables
@@ -63,7 +63,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
 
   let sth = dbh#prepare_cached
              "set constraints pages_redirect_cn, sitemenu_url_cn,
-                   page_emails_url_cn, links_from_cn deferred" in
+                   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,
@@ -78,7 +79,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   sth#execute [`Int hostid; `String page; title; description;
               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)
@@ -98,16 +99,17 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
     "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