R55279 - /trunk/calendar/inc/

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55279

URL: http://svn.stylite.de/viewvc/egroupware?rev=55279&view=rev
Log:
fix use of deprecated accounts::member and accounts::membership, should be members and memberships

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=55279&r1=55278&r2=55279&view=diff

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

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

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

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

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

•   		$members = $GLOBALS['egw']->accounts->members($user);
    		if (is_array($members))
    		{
    			foreach($members as $member)
  

@@ -408,7 +408,7 @@
}
else // for users we have to include all the memberships, to get the group-events
{

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

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

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

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

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

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=55279&r1=55278&r2=55279&view=diff

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

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

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

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

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

•   		$members = $GLOBALS['egw']->accounts->members($user);
    		if (is_array($members))
    		{
    			foreach($members as $member)
  

@@ -2100,7 +2100,7 @@
}
else // for users we have to include all the memberships, to get the group-events
{

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

•   		$memberships = $GLOBALS['egw']->accounts->memberships($user);
    		if (is_array($memberships))
    		{
    			foreach($memberships as $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=55279&r1=55278&r2=55279&view=diff

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

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

•   		foreach($GLOBALS['egw']->accounts->members($owner) as $member)
    		{
    			$member = $member['account_id'];
    			if (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$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=55279&r1=55278&r2=55279&view=diff

— trunk/calendar/inc/class.calendar_uiviews.inc.php (original)
+++ trunk/calendar/inc/class.calendar_uiviews.inc.php Sun Mar 6 15:58:36 2016
@@ -583,7 +583,7 @@
}
}
$content = array(‘view’ => array());

•   if ($weeks)
    {
    	$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
  

@@ -612,7 +612,7 @@
$search_params = $this->search_params;
$search_params[‘start’] = $week_start->format(‘ts’);
$search_params[‘end’] = $week_end->format(‘ts’);

•   	$content['view'][] = (array)$this->tagWholeDayOnTop($this->bo->search($search_params)) +
    	array(
    		'id' => $week_start->format('Ymd')
  

@@ -625,7 +625,7 @@

	// Get the actions
	$home->setElementAttribute('view','actions',$this->get_actions());

•   $home->exec(__METHOD__, $content);
  

  }

@@ -2200,7 +2200,7 @@
}
elseif ($enum_groups && $GLOBALS[‘egw’]->accounts->get_type($user) == ‘g’) // groups
{

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

•   		foreach((array) $GLOBALS['egw']->accounts->members($user) as $data)
    		{
    			$user = $data['account_id'];
    			if ($this->bo->check_perms(EGW_ACL_READ | EGW_ACL_FREEBUSY,0,$user))
  

---

---

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