R55281 - /trunk/calendar/inc/

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55281

URL: http://svn.stylite.de/viewvc/egroupware?rev=55281&view=rev
Log:
fix for different return values of accounts->member(s) / membership(s)

Modified:
trunk/calendar/inc/class.calendar_bo.inc.php
trunk/calendar/inc/class.calendar_boupdate.inc.php
trunk/calendar/inc/class.calendar_ui.inc.php
trunk/calendar/inc/class.calendar_uiviews.inc.php

Modified: trunk/calendar/inc/class.calendar_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_bo.inc.php?rev=55281&r1=55280&r2=55281&view=diff

— trunk/calendar/inc/class.calendar_bo.inc.php (original)
+++ trunk/calendar/inc/class.calendar_bo.inc.php Sun Mar 6 17:09:58 2016
@@ -337,11 +337,10 @@
foreach(array_keys($event[‘participants’]) as $uid)
{
if (is_numeric($uid) && $GLOBALS[‘egw’]->accounts->get_type($uid) == ‘g’ &&

•   		($members = $GLOBALS['egw']->accounts->members($uid)))
  

•   		($members = $GLOBALS['egw']->accounts->members($uid, true)))
    	{
    		foreach($members as $member)
    		{
  

•   			$member = $member['account_id'];
    			if (!isset($event['participants'][$member]))
    			{
    				$event['participants'][$member] = 'G';
  

@@ -392,30 +391,30 @@
{
if ($no_enum_groups) continue;

•   		$members = $GLOBALS['egw']->accounts->members($user);
  

•   		$members = $GLOBALS['egw']->accounts->members($user, true);
    		if (is_array($members))
    		{
    			foreach($members as $member)
    			{
    				// use only members which gave the user a read-grant
  

•   				if (!in_array($member['account_id'],$users) &&
  

•   					($ignore_acl || $this->check_perms(EGW_ACL_READ|($use_freebusy?EGW_ACL_FREEBUSY:0),0,$member['account_id'])))
  

•   				if (!in_array($member, $users) &&
  

•   					($ignore_acl || $this->check_perms(EGW_ACL_READ|($use_freebusy?EGW_ACL_FREEBUSY:0),0,$member)))
    				{
  

•   					$users[] = $member['account_id'];
  

•   					$users[] = $member;
    				}
    			}
    		}
    	}
    	else	// for users we have to include all the memberships, to get the group-events
    	{
  

•   		$memberships = $GLOBALS['egw']->accounts->memberships($user);
  

•   		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
    		if (is_array($memberships))
    		{
    			foreach($memberships as $group)
    			{
  

•   				if (!in_array($group['account_id'],$users))
  

•   				if (!in_array($group,$users))
    				{
  

•   					$users[] = $group['account_id'];
  

•   					$users[] = $group;
    				}
    			}
    		}
  

@@ -1693,13 +1692,13 @@
{
self::_list_cals_add($id,$users,$groups);
}

•   if (($memberships = $GLOBALS['egw']->accounts->memberships($user)))
  

•   {
  

•   	foreach($memberships as $group_info)
  

•   	{
  

•   		self::_list_cals_add($group_info['account_id'],$users,$groups);
  

•   		if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group_info['account_id'],EGW_ACL_READ,'calendar')))
  

•   if (($memberships = $GLOBALS['egw']->accounts->memberships($user, true)))
  

•   {
  

•   	foreach($memberships as $group)
  

•   	{
  

•   		self::_list_cals_add($group,$users,$groups);
  

•   		if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group,EGW_ACL_READ,'calendar')))
    		{
    			foreach($account_perms as $id)
    			{
  

Modified: trunk/calendar/inc/class.calendar_boupdate.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_boupdate.inc.php?rev=55281&r1=55280&r2=55281&view=diff

— trunk/calendar/inc/class.calendar_boupdate.inc.php (original)
+++ trunk/calendar/inc/class.calendar_boupdate.inc.php Sun Mar 6 17:09:58 2016
@@ -759,11 +759,10 @@
foreach($to_notify as $userid => $statusid)
{
if (is_numeric($userid) && $GLOBALS[‘egw’]->accounts->get_type($userid) == ‘g’ &&

•   		($members = $GLOBALS['egw']->accounts->members($userid)))
  

•   		($members = $GLOBALS['egw']->accounts->members($userid, true)))
    	{
    		foreach($members as $member)
    		{
  

•   			$member = $member['account_id'];
    			if (!isset($to_notify[$member]))
    			{
    				$to_notify[$member] = 'G';	// Group-invitation
  

@@ -2084,30 +2083,30 @@
// for groups we have to include the members
if ($GLOBALS[‘egw’]->accounts->get_type($user) == ‘g’)
{

•   		$members = $GLOBALS['egw']->accounts->members($user);
  

•   		$members = $GLOBALS['egw']->accounts->members($user, true);
    		if (is_array($members))
    		{
    			foreach($members as $member)
    			{
    				// use only members which gave the user a read-grant
  

•   				if (!in_array($member['account_id'],$users) &&
  

•   						$this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id']))
  

•   				if (!in_array($member, $users) &&
  

•   						$this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY, 0, $member))
    				{
  

•   					$users[] = $member['account_id'];
  

•   					$users[] = $member;
    				}
    			}
    		}
    	}
    	else	// for users we have to include all the memberships, to get the group-events
    	{
  

•   		$memberships = $GLOBALS['egw']->accounts->memberships($user);
  

•   		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
    		if (is_array($memberships))
    		{
    			foreach($memberships as $group)
    			{
  

•   				if (!in_array($group['account_id'],$users))
  

•   				if (!in_array($group, $users))
    				{
  

•   					$users[] = $group['account_id'];
  

•   					$users[] = $group;
    				}
    			}
    		}
  

Modified: trunk/calendar/inc/class.calendar_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_ui.inc.php?rev=55281&r1=55280&r2=55281&view=diff

— trunk/calendar/inc/class.calendar_ui.inc.php (original)
+++ trunk/calendar/inc/class.calendar_ui.inc.php Sun Mar 6 17:09:58 2016
@@ -186,9 +186,8 @@
$owner = trim($owner);
if (is_numeric($owner) && $GLOBALS[‘egw’]->accounts->get_type($owner) == ‘g’)
{

•   		foreach($GLOBALS['egw']->accounts->members($owner) as $member)
  

•   		{
  

•   			$member = $member['account_id'];
  

•   		foreach($GLOBALS['egw']->accounts->members($owner, true) as $member)
  

•   		{
    			if (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$member))
    			{
    				$no_access_group[$member] = $this->bo->participant_name($member);
  

Modified: trunk/calendar/inc/class.calendar_uiviews.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_uiviews.inc.php?rev=55281&r1=55280&r2=55281&view=diff

— trunk/calendar/inc/class.calendar_uiviews.inc.php (original)
+++ trunk/calendar/inc/class.calendar_uiviews.inc.php Sun Mar 6 17:09:58 2016
@@ -2200,9 +2200,8 @@
}
elseif ($enum_groups && $GLOBALS[‘egw’]->accounts->get_type($user) == ‘g’) // groups
{

•   		foreach((array) $GLOBALS['egw']->accounts->members($user) as $data)
  

•   		{
  

•   			$user = $data['account_id'];
  

•   		foreach((array) $GLOBALS['egw']->accounts->members($user, true) as $user)
  

•   		{
    			if ($this->bo->check_perms(EGW_ACL_READ | EGW_ACL_FREEBUSY,0,$user))
    			{
    				$users[$user] = $this->bo->participant_name($user);
  

---

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs