aboutsummaryrefslogtreecommitdiff
path: root/www/baikal/files
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2019-05-21 11:20:37 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2019-05-21 11:20:37 +0000
commit328df5f3ad535dc8f3ca7d47163d5673f44f8c01 (patch)
tree8fa0ae13a0363c3e432206af3c936fb92c6b686f /www/baikal/files
parentb8baf06ef5653898cfa239d6aa9973fbac27464e (diff)
downloadports-328df5f3ad535dc8f3ca7d47163d5673f44f8c01.tar.gz
ports-328df5f3ad535dc8f3ca7d47163d5673f44f8c01.zip
www/baikal: update to 0.5.3
Notes
Notes: svn path=/head/; revision=502215
Diffstat (limited to 'www/baikal/files')
-rw-r--r--www/baikal/files/patch-issue-71793
-rw-r--r--www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Plugin.php38
-rw-r--r--www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Filter_AddressData.php14
-rw-r--r--www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookQueryReport.php16
4 files changed, 0 insertions, 161 deletions
diff --git a/www/baikal/files/patch-issue-717 b/www/baikal/files/patch-issue-717
deleted file mode 100644
index 399718c9892a..000000000000
--- a/www/baikal/files/patch-issue-717
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git Core/Frameworks/Flake/Controller/Cli.php Core/Frameworks/Flake/Controller/Cli.php
-index 0fcd10c3..6430b1c3 100644
---- Core/Frameworks/Flake/Controller/Cli.php
-+++ Core/Frameworks/Flake/Controller/Cli.php
-@@ -39,9 +39,8 @@ function render() {
- }
-
- function execute() {
-- reset($this->aSequence);
-- while (list($sKey, ) = each($this->aSequence)) {
-- $this->aSequence[$sKey]["block"]->execute();
-+ foreach ($this->aSequence as $aStep) {
-+ $aStep["block"]->execute();
- }
- }
-
-diff --git Core/Frameworks/Flake/Core/Render/Container.php Core/Frameworks/Flake/Core/Render/Container.php
-index 5f0662cf..ae668151 100644
---- Core/Frameworks/Flake/Core/Render/Container.php
-+++ Core/Frameworks/Flake/Core/Render/Container.php
-@@ -58,23 +58,20 @@ function render() {
- }
-
- function execute() {
-- reset($this->aSequence);
-- while (list($sKey, ) = each($this->aSequence)) {
-- $this->aSequence[$sKey]["block"]->execute();
-+ foreach ($this->aSequence as $aStep) {
-+ $aStep["block"]->execute();
- }
- }
-
- protected function renderBlocks() {
- $aHtml = [];
-- reset($this->aSequence);
-- while (list($sKey, ) = each($this->aSequence)) {
-+ foreach ($this->aSequence as $sKey => $aStep) {
- $this->aSequence[$sKey]["rendu"] = $this->aSequence[$sKey]["block"]->render();
- }
-
- $aHtml = [];
-- reset($this->aBlocks);
-- while (list($sZone, ) = each($this->aBlocks)) {
-- $aHtml[$sZone] = implode("", $this->aBlocks[$sZone]);
-+ foreach ($this->aBlocks as $sZone => $aBlock) {
-+ $aHtml[$sZone] = implode("", $aBlock);
- }
-
- reset($aHtml);
-diff --git Core/Frameworks/Flake/Framework.php Core/Frameworks/Flake/Framework.php
-index adc5c781..50b9c12e 100644
---- Core/Frameworks/Flake/Framework.php
-+++ Core/Frameworks/Flake/Framework.php
-@@ -122,7 +122,7 @@ static function bootstrap() {
- if (isset($_COOKIE) && is_array($_COOKIE)) { $process[] = &$_COOKIE;}
- if (isset($_REQUEST) && is_array($_REQUEST)) { $process[] = &$_REQUEST;}
-
-- while (list($key, $val) = each($process)) {
-+ foreach ($process as $key => $val) {
- foreach ($val as $k => $v) {
- unset($process[$key][$k]);
- if (is_array($v)) {
-diff --git Core/Frameworks/Flake/Util/Router.php Core/Frameworks/Flake/Util/Router.php
-index 15462cb3..02b109d7 100644
---- Core/Frameworks/Flake/Util/Router.php
-+++ Core/Frameworks/Flake/Util/Router.php
-@@ -59,10 +59,9 @@ static function getRouteForController($sController) {
-
- $aRoutes = $GLOBALS["ROUTER"]::getRoutes();
-
-- reset($aRoutes);
-- while (list($sRoute, ) = each($aRoutes)) {
-- if (str_replace("\\Route", "\\Controller", $aRoutes[$sRoute]) === $sController) {
-- return $sRoute;
-+ foreach ($aRoutes as $sKey => $sRoute) {
-+ if (str_replace("\\Route", "\\Controller", $sRoute) === $sController) {
-+ return $sKey;
- }
- }
-
-diff --git Core/Frameworks/Flake/Util/Tools.php Core/Frameworks/Flake/Util/Tools.php
-index 21bf8502..ca371cc3 100644
---- Core/Frameworks/Flake/Util/Tools.php
-+++ Core/Frameworks/Flake/Util/Tools.php
-@@ -75,7 +75,7 @@ static function view_array($array_in) {
- if (is_array($array_in)) {
- $result = '<table border="1" cellpadding="1" cellspacing="0" bgcolor="white">';
- if (!count($array_in)) {$result .= '<tr><td><font face="Verdana,Arial" size="1"><b>' . htmlspecialchars("EMPTY!") . '</b></font></td></tr>';}
-- while (list($key, $val) = each($array_in)) {
-+ foreach ($array_in as $key => $val) {
- $result .= '<tr><td valign="top"><font face="Verdana,Arial" size="1">' . htmlspecialchars((string)$key) . '</font></td><td>';
- if (is_array($array_in[$key])) {
- $result .= \Flake\Util\Tools::view_array($array_in[$key]);
diff --git a/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Plugin.php b/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Plugin.php
deleted file mode 100644
index ac3822c8fd39..000000000000
--- a/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Plugin.php
+++ /dev/null
@@ -1,38 +0,0 @@
---- vendor/sabre/dav/lib/CardDAV/Plugin.php.orig 2017-04-13 09:06:24 UTC
-+++ vendor/sabre/dav/lib/CardDAV/Plugin.php
-@@ -450,7 +450,8 @@ class Plugin extends DAV\ServerPlugin {
-
- $props[200]['{' . self::NS_CARDDAV . '}address-data'] = $this->convertVCard(
- $props[200]['{' . self::NS_CARDDAV . '}address-data'],
-- $vcardType
-+ $vcardType,
-+ $report->addressDataProperties
- );
-
- }
-@@ -807,12 +808,24 @@ class Plugin extends DAV\ServerPlugin {
- * @param string $target
- * @return string
- */
-- protected function convertVCard($data, $target) {
-+ protected function convertVCard($data, $target, array $propertiesFilter = null) {
-
- if (is_resource($data)) {
- $data = stream_get_contents($data);
- }
- $input = VObject\Reader::read($data);
-+ if (!empty($propertiesFilter)) {
-+ $propertiesFilter = array_merge(['UID', 'VERSION', 'FN'], $propertiesFilter);
-+ $keys = array_unique(array_map(function($child) {
-+ return $child->name;
-+ }, $input->children()));
-+ $keys = array_diff($keys, $propertiesFilter);
-+ $str = "";
-+ foreach ($keys as $key) {
-+ unset($input->$key);
-+ }
-+ $data = $input->serialize();
-+ }
- $output = null;
- try {
-
diff --git a/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Filter_AddressData.php b/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Filter_AddressData.php
deleted file mode 100644
index 4d6968fe5fed..000000000000
--- a/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Filter_AddressData.php
+++ /dev/null
@@ -1,14 +0,0 @@
---- vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php.orig 2017-04-13 09:07:03 UTC
-+++ vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
-@@ -51,6 +51,10 @@ class AddressData implements XmlDeserial
- 'version' => $reader->getAttribute('version') ?: '3.0',
- ];
-
-+ $elems = (array)$reader->parseInnerTree();
-+ $result['addressDataProperties'] = array_map(function($element) {
-+ return $element['attributes']['name'];
-+ }, $elems);
-+
-- $reader->next();
- return $result;
-
diff --git a/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookQueryReport.php b/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookQueryReport.php
deleted file mode 100644
index cd9f4fa18955..000000000000
--- a/www/baikal/files/patch-vendor_sabre_dav_lib_CardDAV_Xml_Request_AddressBookQueryReport.php
+++ /dev/null
@@ -1,16 +0,0 @@
---- vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php.orig 2017-04-13 09:07:30 UTC
-+++ vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php
-@@ -29,6 +29,13 @@ class AddressBookQueryReport implements
- public $properties;
-
- /**
-+ * An array with requested vcard properties.
-+ *
-+ * @var array
-+ */
-+ public $addressDataProperties = [];
-+
-+ /**
- * List of property/component filters.
- *
- * This is an array with filters. Every item is a property filter. Every