diff options
author | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2018-03-18 02:13:05 +0100 |
---|---|---|
committer | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2018-03-18 02:15:29 +0100 |
commit | c80837a9e6a1d5049a03fbb608b2b650c1b0f92d (patch) | |
tree | 360fb2685c74cdac0e714a44c813dbc8efe92028 /vendor/sabre/vobject/lib | |
parent | 0009f7f05133a74bbe3206a5b4d0223ba9dea4bc (diff) | |
download | volse-hubzilla-c80837a9e6a1d5049a03fbb608b2b650c1b0f92d.tar.gz volse-hubzilla-c80837a9e6a1d5049a03fbb608b2b650c1b0f92d.tar.bz2 volse-hubzilla-c80837a9e6a1d5049a03fbb608b2b650c1b0f92d.zip |
:arrow_up: Update libraries.
michelf/php-markdown (1.7.0 => 1.8.0)
ezyang/htmlpurifier (v4.9.3 => v4.10.0)
commerceguys/intl (v0.7.4 => v0.7.5)
sabre/http (4.2.3 => v4.2.4)
sabre/vobject (4.1.3 => 4.1.5)
Diffstat (limited to 'vendor/sabre/vobject/lib')
-rw-r--r-- | vendor/sabre/vobject/lib/ITip/Broker.php | 20 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/Parser/MimeDir.php | 8 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/Property.php | 5 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/Property/Text.php | 5 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/Recur/RRuleIterator.php | 6 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/Version.php | 2 | ||||
-rw-r--r-- | vendor/sabre/vobject/lib/timezonedata/php-bc.php | 1 |
7 files changed, 29 insertions, 18 deletions
diff --git a/vendor/sabre/vobject/lib/ITip/Broker.php b/vendor/sabre/vobject/lib/ITip/Broker.php index effa74317..b9a30611b 100644 --- a/vendor/sabre/vobject/lib/ITip/Broker.php +++ b/vendor/sabre/vobject/lib/ITip/Broker.php @@ -849,6 +849,7 @@ class Broker { $exdate = []; foreach ($calendar->VEVENT as $vevent) { + $rrule = []; if (is_null($uid)) { $uid = $vevent->UID->getValue(); @@ -889,6 +890,18 @@ class Broker { } sort($exdate); } + if (isset($vevent->RRULE)) { + foreach ($vevent->select('RRULE') as $rr) { + foreach ($rr->getParts() as $key => $val) { + // ignore default values (https://github.com/sabre-io/vobject/issues/126) + if ($key === 'INTERVAL' && $val == 1) { + continue; + } + $rrule[] = "$key=$val"; + } + } + sort($rrule); + } if (isset($vevent->STATUS)) { $status = strtoupper($vevent->STATUS->getValue()); } @@ -953,19 +966,16 @@ class Broker { $significantChangeHash .= $prop . ':'; if ($prop === 'EXDATE') { - $significantChangeHash .= implode(',', $exdate) . ';'; - + } elseif ($prop === 'RRULE') { + $significantChangeHash .= implode(',', $rrule) . ';'; } else { - foreach ($propertyValues as $val) { $significantChangeHash .= $val->getValue() . ';'; } - } } } - } $significantChangeHash = md5($significantChangeHash); diff --git a/vendor/sabre/vobject/lib/Parser/MimeDir.php b/vendor/sabre/vobject/lib/Parser/MimeDir.php index fa75a1a3b..78e5bf385 100644 --- a/vendor/sabre/vobject/lib/Parser/MimeDir.php +++ b/vendor/sabre/vobject/lib/Parser/MimeDir.php @@ -464,13 +464,13 @@ class MimeDir extends Parser { // vCard 2.1 allows the character set to be specified per property. $charset = (string)$propObj['CHARSET']; } - switch ($charset) { - case 'UTF-8' : + switch (strtolower($charset)) { + case 'utf-8' : break; - case 'ISO-8859-1' : + case 'iso-8859-1' : $property['value'] = utf8_encode($property['value']); break; - case 'Windows-1252' : + case 'windows-1252' : $property['value'] = mb_convert_encoding($property['value'], 'UTF-8', $charset); break; default : diff --git a/vendor/sabre/vobject/lib/Property.php b/vendor/sabre/vobject/lib/Property.php index 1aaa3ed58..96855f1f7 100644 --- a/vendor/sabre/vobject/lib/Property.php +++ b/vendor/sabre/vobject/lib/Property.php @@ -249,8 +249,9 @@ abstract class Property extends Node { $out = ''; while (strlen($str) > 0) { if (strlen($str) > 75) { - $out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n"; - $str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8'); + $part = mb_strcut($str, 0, 75, 'utf-8'); + $out .= $part . "\r\n"; + $str = ' ' . substr($str, strlen($part)); } else { $out .= $str . "\r\n"; $str = ''; diff --git a/vendor/sabre/vobject/lib/Property/Text.php b/vendor/sabre/vobject/lib/Property/Text.php index 476dcde4d..bb7ab34ee 100644 --- a/vendor/sabre/vobject/lib/Property/Text.php +++ b/vendor/sabre/vobject/lib/Property/Text.php @@ -275,8 +275,9 @@ class Text extends Property { $out = ''; while (strlen($str) > 0) { if (strlen($str) > 75) { - $out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n"; - $str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8'); + $part = mb_strcut($str, 0, 75, 'utf-8'); + $out .= $part . "\r\n"; + $str = ' ' . substr($str, strlen($part)); } else { $out .= $str . "\r\n"; $str = ''; diff --git a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php index 20f34ef42..dbea1155d 100644 --- a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php +++ b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php @@ -592,11 +592,11 @@ class RRuleIterator implements Iterator { // loop through all YearDay and Days to check all the combinations foreach ($this->byYearDay as $byYearDay) { $date = clone $this->currentDate; - $date->setDate($currentYear, 1, 1); + $date = $date->setDate($currentYear, 1, 1); if ($byYearDay > 0) { - $date->add(new \DateInterval('P' . $byYearDay . 'D')); + $date = $date->add(new \DateInterval('P' . $byYearDay . 'D')); } else { - $date->sub(new \DateInterval('P' . abs($byYearDay) . 'D')); + $date = $date->sub(new \DateInterval('P' . abs($byYearDay) . 'D')); } if ($date > $this->currentDate && in_array($date->format('N'), $dayOffsets)) { diff --git a/vendor/sabre/vobject/lib/Version.php b/vendor/sabre/vobject/lib/Version.php index 24c51a604..67e8a4037 100644 --- a/vendor/sabre/vobject/lib/Version.php +++ b/vendor/sabre/vobject/lib/Version.php @@ -14,6 +14,6 @@ class Version { /** * Full version number. */ - const VERSION = '4.1.3'; + const VERSION = '4.1.5'; } diff --git a/vendor/sabre/vobject/lib/timezonedata/php-bc.php b/vendor/sabre/vobject/lib/timezonedata/php-bc.php index 906ccb0e4..83f38f507 100644 --- a/vendor/sabre/vobject/lib/timezonedata/php-bc.php +++ b/vendor/sabre/vobject/lib/timezonedata/php-bc.php @@ -68,7 +68,6 @@ return [ 'Brazil/West', 'Canada/Atlantic', 'Canada/Central', - 'Canada/East-Saskatchewan', 'Canada/Eastern', 'Canada/Mountain', 'Canada/Newfoundland', |