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

diff --git a/scripts/cocanwiki.ml b/scripts/cocanwiki.ml
index b504d57..ae07362 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.8 2004/09/20 15:34:36 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)
 
@@ -45,7 +46,7 @@ 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
 
 (* The "user object". *)
 type user_t = Anonymous			(* Not logged in. *)
@@ -60,6 +61,7 @@ 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
 
 (* The "host object". *)
 type host_t = { hostname : string;
@@ -144,16 +146,20 @@ 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
                   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 ] ->
 		  let perms =
 		    (if can_edit then [ CanEdit ] else []) @
-		    (if can_manage_users then [ CanManageUsers ] else []) in
+		    (if can_manage_users then [ CanManageUsers ] else []) @
+		    (if can_manage_contacts then [ CanManageContacts ] else [])
+		  in
 		  User (userid, name, perms)
 	      | _ -> assert false)
 	 with
@@ -183,3 +189,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