X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcocanwiki.ml;h=96cef3718be0178058a70865a09cde59999db1fb;hb=3da6ded17ea2cca64328e5f3ea8903cd15103bc2;hp=842917b598115a8f81f5dcc186deea7ae3442291;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/cocanwiki.ml b/scripts/cocanwiki.ml
index 842917b..96cef37 100644
--- a/scripts/cocanwiki.ml
+++ b/scripts/cocanwiki.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: cocanwiki.ml,v 1.5 2004/09/09 09:35:33 rich Exp $
+ * $Id: cocanwiki.ml,v 1.10 2004/09/23 11:51:17 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
@@ -10,6 +25,7 @@ open Cgi
 open Printf
 
 open Cocanwiki_ok
+open Cocanwiki_strings
 
 module Pool = DbiPool (Dbi_postgres)
 
@@ -18,6 +34,41 @@ module Pool = DbiPool (Dbi_postgres)
  *)
 let _get_dbh r = Pool.get r "cocanwiki"
 
+(* Server-wide settings.
+ *
+ * These are stored in a single row in the database in the table
+ * 'server_settings'.  You must restart the server if you change
+ * this row.
+ *
+ * It's not possible to read these at server start-up time because the
+ * Apache server is still running as 'root' and will not normally be
+ * allowed to access the database.  We thus read them at the earliest
+ * opportunity, in a request context, and cache the results.
+ *)
+let server_settings_version =
+  let settings = ref None in
+  let get_settings (dbh : Dbi.connection) =
+    let sth = dbh#prepare "select version from server_settings" in
+    sth#execute [];
+    let s =
+      match sth#fetch1 () with
+	| [ `Int version ] -> version
+	| _ -> assert false in
+    sth#finish ();
+    settings := Some s;
+    s
+  in
+
+  let server_settings_version dbh =
+    let (version) =
+      match !settings with
+	  None -> get_settings dbh
+	| Some settings -> settings in
+    version
+  in
+
+  server_settings_version
+
 (* The [CgiExit] exception should be folded back into the base
  * mod_caml code at some point.  It just causes the 'run' function to
  * return at that point safely.  (XXX)
@@ -30,7 +81,8 @@ exception CgiExit
  * who can use the script.  For example:
  *   register_script ~restrict:[CanEdit ; CanManageUsers] run
  *)
-type permissions_t = CanEdit | CanManageUsers
+type permissions_t = CanEdit | CanManageUsers | CanManageContacts
+		   | CanManageSite | CanEditGlobalCSS
 
 (* The "user object". *)
 type user_t = Anonymous			(* Not logged in. *)
@@ -45,6 +97,9 @@ let test_permission edit_anon perm user =
 
 let can_edit edit_anon = test_permission edit_anon CanEdit
 let can_manage_users = test_permission false CanManageUsers
+let can_manage_contacts = test_permission false CanManageContacts
+let can_manage_site = test_permission false CanManageSite
+let can_edit_global_css = test_permission false CanEditGlobalCSS
 
 (* The "host object". *)
 type host_t = { hostname : string;
@@ -129,16 +184,30 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 
 	   let sth =
 	     dbh#prepare_cached
-	       "select u.id, u.name, u.can_edit, u.can_manage_users
+	       "select u.id, u.name, u.can_edit, u.can_manage_users,
+                       u.can_manage_contacts, u.can_manage_site,
+                       u.can_edit_global_css
                   from usercookies uc, users u
                  where uc.cookie = ? and uc.userid = u.id and u.hostid = ?" in
 	   sth#execute [`String cookie; `Int hostid];
 	   (match sth#fetch1 () with
 		[ `Int userid; `String name;
-		  `Bool can_edit; `Bool can_manage_users ] ->
+		  `Bool can_edit; `Bool can_manage_users;
+		  `Bool can_manage_contacts; `Bool can_manage_site;
+		  `Bool can_edit_global_css ] ->
+		  let perms = if can_edit then [ CanEdit ] else [] in
+		  let perms =
+		    if can_manage_users then CanManageUsers :: perms
+		    else perms in
+		  let perms =
+		    if can_manage_contacts then CanManageContacts :: perms
+		    else perms in
 		  let perms =
-		    (if can_edit then [ CanEdit ] else []) @
-		    (if can_manage_users then [ CanManageUsers ] else []) in
+		    if can_manage_site then CanManageSite :: perms
+		    else perms in
+		  let perms =
+		    if can_edit_global_css then CanEditGlobalCSS :: perms
+		    else perms in
 		  User (userid, name, perms)
 	      | _ -> assert false)
 	 with
@@ -154,7 +223,7 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 	   match restrict with
 	       [] -> true		(* empty list = no restrictions *)
 	     | rs ->
-		 List.fold_left ((||)) false
+		 List.fold_left (||) false
 		   (List.map (fun r -> test_permission edit_anon r user) rs) in
 
        if permitted then (
@@ -168,3 +237,15 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 	   ~title:"Access denied"
 	   q "You do not have permission to access this part of the site."
     )
+
+(* Convert a section name into something valid for use in <a name="...">
+ * XXX This breaks horribly for non-7-bit strings.
+ * XXX This is stuck here because we don't have a good place for it, and
+ * because it needs to be fixed for i18n compliance.
+ *)
+let linkname_of_sectionname str =
+  let str = String.copy str in
+  for i = 0 to String.length str - 1 do
+    if not (isalnum str.[i]) then str.[i] <- '_'
+  done;
+  str