extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-25 06:43:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed changed name for (attendee)status und (attendee)type

Browse Source
This commit is contained in:
Ralf Becker 2011-05-23 20:30:29 +00:00
parent c15ba47b5f
commit 24b454a3fb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_activesync.inc.php
View File

@ -673,7 +673,7 @@ return array(); // temporary disabling meeting requests from calendar
$role = 'REQ-PARTICIPANT'; $role = 'REQ-PARTICIPANT';
//debugLog("default status for $uid is status=$status, quantity=$quantitiy, role=$role"); //debugLog("default status for $uid is status=$status, quantity=$quantitiy, role=$role");
} }
if (isset($attendee->status) && ($s = array_search($attendee->status,self::$status2as))) if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
{ {
$status = $s; $status = $s;
} }
@ -682,8 +682,8 @@ return array(); // temporary disabling meeting requests from calendar
$role = 'CHAIR'; $role = 'CHAIR';
$chair_set = true; $chair_set = true;
} }
elseif (isset($attendee->type) && ($r = array_search($attendee->type,self::$role2as)) && elseif (isset($attendee->attendeetype) && ($r = array_search($attendee->attendeetype,self::$role2as)) &&
(int)self::$role2as[$role] != $attendee->type) // if old role gives same type, use old role, as we have a lot more roles then AS (int)self::$role2as[$role] != $attendee->attendeetype) // if old role gives same type, use old role, as we have a lot more roles then AS
{ {
$role = $r; $role = $r;
} }
@ -1014,8 +1014,8 @@ return array(); // temporary disabling meeting requests from calendar
// if ($uid == $account) continue; // if ($uid == $account) continue;
calendar_so::split_status($status, $quantity, $role); calendar_so::split_status($status, $quantity, $role);
$attendee = new SyncAttendee(); $attendee = new SyncAttendee();
$attendee->status = (int)self::$status2as[$status]; $attendee->attendeestatus = (int)self::$status2as[$status];
$attendee->type = (int)self::$role2as[$role]; $attendee->attendeetype = (int)self::$role2as[$role];
if (is_numeric($uid)) if (is_numeric($uid))
{ {
$attendee->name = $GLOBALS['egw']->accounts->id2name($uid,'account_fullname'); $attendee->name = $GLOBALS['egw']->accounts->id2name($uid,'account_fullname');