X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit_page_css.ml;h=e71a195eda27b08c8acf867b843e44fb2b8474d0;hb=2b332786c6f216c5e2e72cc1596ba4c66b5aa2a4;hp=d348ce8e69d5afc2d14bf9436e4fa5e52a5f48e3;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/scripts/edit_page_css.ml b/scripts/edit_page_css.ml
index d348ce8..e71a195 100644
--- 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.1 2004/09/07 10:14:09 rich Exp $
+ * $Id: edit_page_css.ml,v 1.10 2004/09/28 10:56:39 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
@@ -9,14 +24,13 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_diff
 open Cocanwiki_emailnotify
+open Cocanwiki_strings
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, 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
 
@@ -27,6 +41,11 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, 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 +61,9 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname) _ =
 	  id, title, description, creation_date, redirect
       | _ -> assert false in
 
-  let sth = dbh#prepare_cached "set constraints pages_redirect_cn deferred" in
+  let sth = dbh#prepare_cached
+	      "set constraints pages_redirect_cn, sitemenu_url_cn,
+                   page_emails_url_cn, links_from_cn, links_to_cn deferred" in
   sth#execute [];
 
   let sth = dbh#prepare_cached "update pages set url_deleted = url,
@@ -52,10 +73,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, 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
 
@@ -89,4 +110,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname) _ =
        "Note: You must RELOAD the page to see changes to stylesheets.")
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run