steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.34, 1.35 freebusycache.class.php, 1.9, 1.10 freebusyldap.class.php, 1.4, 1.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv16955/kolab-resource-handlers/freebusy

Modified Files:
	freebusy.php freebusycache.class.php freebusyldap.class.php 
Log Message:
fixlets for allowing unauthorized fb download

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- freebusy.php	2 Dec 2004 23:25:53 -0000	1.34
+++ freebusy.php	15 Dec 2004 00:06:40 -0000	1.35
@@ -70,7 +70,7 @@
   $fb = $cache->load( $pfb, $ts2, $acl );
   if( $fb ) myLog("Found fb for $pfb", RM_LOG_DEBUG);
   else myLog("No fb found for $pfb", RM_LOG_DEBUG);
-  if( $req_extended ) {
+  if( $acl && $req_extended ) {
     $r = $cache->getRights( $acl, $imapuser, $imapgroups );
     if( !$fb || !array_key_exists( 'r', $r ) ) {
       $cache->extended = false; // HACK!

Index: freebusycache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- freebusycache.class.php	25 Nov 2004 12:08:41 -0000	1.9
+++ freebusycache.class.php	15 Dec 2004 00:06:40 -0000	1.10
@@ -219,6 +219,7 @@
 
   /** Returns an array with cyrus permission chars (lrsp...) as keys */
   function getRights( $acl, $uid, $groups ) {
+    if( !isset($uid) ) return false;
     if( is_array( $groups ) ) $uids = $groups;
     else $uids = array();
     for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];

Index: freebusyldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freebusyldap.class.php	21 Oct 2004 10:12:49 -0000	1.4
+++ freebusyldap.class.php	15 Dec 2004 00:06:40 -0000	1.5
@@ -61,6 +61,7 @@
   }
 
   function mailForUid( $uid ) {
+    if( !isset( $uid ) ) return false;
     $result = ldap_search( $this->connection, $this->base, '(&(objectClass=kolabInetOrgPerson)(uid='.$uid.'))',
 			   array( 'mail' ) );
     if( $result ) {