extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from nicorac/master

Browse Source 
Bug in free/busy request handling (master)
This commit is contained in:
Nathan Gray 2018-12-19 15:33:43 -07:00 committed by GitHub
commit a4872300b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -869,12 +869,11 @@ class calendar_groupdav extends Api\CalDAV\Handler
array_shift($content_type); array_shift($content_type);
foreach ($content_type as $attribute) foreach ($content_type as $attribute)
{ {
trim($attribute);
list($key, $value) = explode('=', $attribute); list($key, $value) = explode('=', $attribute);
switch (strtolower($key)) switch (strtolower(trim($key)))
{ {
case 'charset': case 'charset':
$charset = strtoupper(substr($value,1,-1)); $charset = strtoupper(trim($value));
} }
} }
} }
@ -1078,12 +1077,11 @@ class calendar_groupdav extends Api\CalDAV\Handler
array_shift($content_type); array_shift($content_type);
foreach ($content_type as $attribute) foreach ($content_type as $attribute)
{ {
trim($attribute);
list($key, $value) = explode('=', $attribute); list($key, $value) = explode('=', $attribute);
switch (strtolower($key)) switch (strtolower(trim($key)))
{ {
case 'charset': case 'charset':
$charset = strtoupper(substr($value,1,-1)); $charset = strtoupper(trim($value));
} }
} }
} }

4
calendar/inc/class.calendar_ical.inc.php
View File

@ -3300,9 +3300,9 @@ class calendar_ical extends calendar_boupdate
// sort by start datetime // sort by start datetime
uasort($events, function($a, $b) uasort($events, function($a, $b)
{ {
$diff = $a['start'] < $b['start']; $diff = $a['start'] - $b['start'];
return !$diff ? 0 : ($diff < 0 ? -1 : 1); return $diff == 0 ? 0 : ($diff < 0 ? -1 : 1);
}); });
$fbdata = array(); $fbdata = array();