X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcocanwiki.ml;h=b504d5754c814dc2ce144f7ad1b53eb3d2903788;hb=619782929c11102f75892758fd94772bc747dfb0;hp=cfe43f72d3538c6eb1ee2811470ed862dbee3548;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/cocanwiki.ml b/scripts/cocanwiki.ml
index cfe43f7..b504d57 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.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: cocanwiki.ml,v 1.6 2004/09/09 12:21:22 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,20 +24,10 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki_ok
 
 module Pool = DbiPool (Dbi_postgres)
 
-(* Generate a printable datestamp for pages. *)
-let printable_date (date, _) =
-  sprintf "%d %s %04d" date.Dbi.day (short_month date.Dbi.month) date.Dbi.year
-
-let printable_date_time (date, time) =
-  sprintf "%d %s %04d %02d:%02d" date.Dbi.day (short_month date.Dbi.month)
-    date.Dbi.year time.Dbi.hour time.Dbi.min
-
 (* This function is used to grab a database handle.  It's used in a couple
  * of very special places, and is not for general consumption.
  *)
@@ -56,8 +61,29 @@ 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
 
-(* Our wrapper around the standard [register_script] function. *)
-let register_script ?(restrict = []) run =
+(* The "host object". *)
+type host_t = { hostname : string;
+		edit_anon : bool; }
+
+(* Our wrapper around the standard [register_script] function.
+ *
+ * The optional ~restrict and ~anonymous parameters work as follows:
+ *
+ * By default (neither parameter given), anonymous or logged-in users
+ * at any level are permitted to run the script.
+ *
+ * If ~anonymous:false then a user must be logged in to use the script.
+ *
+ * If ~restrict contains a list of permissions (eg. CanEdit, etc.) then
+ * the user must have the ability to do AT LEAST ONE of those actions.
+ * (Note that this does not necessarily imply that the user must be
+ * logged in, because in some circumstances even anonymous users have
+ * the CanEdit permission - very typical for a wiki).
+ *
+ * If ~anonymous:false and ~restrict is given then the user must be
+ * logged in AND have the ability to do AT LEAST ONE of those actions.
+ *)
+let register_script ?(restrict = []) ?(anonymous = true) run =
   (* Actually register the script with the real [Registry] module. *)
   register_script
     (fun r ->
@@ -89,6 +115,9 @@ let register_script ?(restrict = []) run =
 	       failwith ("Hostname ``" ^ hostname ^ "'' not found in " ^
 			 "the hosts/hostnames tables in the database.") in
 
+       (* Create the host object. *)
+       let host = { hostname = hostname; edit_anon = edit_anon; } in
+
        (* Look for the user's cookie, and determine from this the user
 	* object.
 	*)
@@ -135,16 +164,18 @@ let register_script ?(restrict = []) run =
 	* the user has sufficient permission to run this script.
 	*)
        let permitted =
-	 match restrict with
-	     [] -> true			(* empty list = no restrictions *)
-	   | rs ->
-	       List.fold_left ((||)) false
-		 (List.map (fun r -> test_permission edit_anon r user) rs) in
+	 if not anonymous && user = Anonymous then false
+	 else
+	   match restrict with
+	       [] -> true		(* empty list = no restrictions *)
+	     | rs ->
+		 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, hostname, edit_anon) user
+	   run r q dbh hostid host user
 	 with
 	     CgiExit -> ()
        ) else