X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcocanwiki.ml;h=037c65451a1ae5274c781abbacea9eba07d1af5b;hb=232d52d33fe530971f81b57bbc8b024fb259c4fd;hp=b504d5754c814dc2ce144f7ad1b53eb3d2903788;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/cocanwiki.ml b/scripts/cocanwiki.ml
index b504d57..037c654 100644
--- a/scripts/cocanwiki.ml
+++ b/scripts/cocanwiki.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: cocanwiki.ml,v 1.6 2004/09/09 12:21:22 rich Exp $
+ * $Id: cocanwiki.ml,v 1.13 2004/09/27 12:37:54 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
@@ -25,6 +25,7 @@ open Cgi
 open Printf
 
 open Cocanwiki_ok
+open Cocanwiki_strings
 
 module Pool = DbiPool (Dbi_postgres)
 
@@ -33,19 +34,14 @@ module Pool = DbiPool (Dbi_postgres)
  *)
 let _get_dbh r = Pool.get r "cocanwiki"
 
-(* 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)
- *)
-exception CgiExit
-
 (* Permissions and restrictions.
  *
  * Use the optional ~restrict parameter to register_script to restrict
  * 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. *)
@@ -60,6 +56,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;
@@ -144,16 +143,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_manage_site then CanManageSite :: perms
+		    else perms in
 		  let perms =
-		    (if can_edit then [ CanEdit ] else []) @
-		    (if can_manage_users then [ CanManageUsers ] else []) in
+		    if can_edit_global_css then CanEditGlobalCSS :: perms
+		    else perms in
 		  User (userid, name, perms)
 	      | _ -> assert false)
 	 with
@@ -169,17 +182,26 @@ 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 (
 	 (* Call the actual CGI script. *)
-	 try
-	   run r q dbh hostid host user
-	 with
-	     CgiExit -> ()
+	 run r q dbh hostid host user
        ) else
 	 error ~back_button:true
 	   ~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