diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-03-01 20:53:25 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-03-01 20:53:25 +0100 |
| commit | ee69a24a2dbe254f02357e082a1987ae401e1946 (patch) | |
| tree | febdf736d3c6d6df094ce1fbc085168664ecc17e /lib | |
| parent | eee3a90a5077ee894836c81a98b78263a8c8976f (diff) | |
| parent | 9e2e5fd594bb7c03aa3d7290b93930593accb03c (diff) | |
Merge pull request #1098 from Alkarex/HTTPS-enclosures
SimplePie force HTTPS for enclosures
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/SimplePie/SimplePie/Item.php | 1 | ||||
| -rw-r--r-- | lib/SimplePie/SimplePie/Sanitize.php | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/SimplePie/SimplePie/Item.php b/lib/SimplePie/SimplePie/Item.php index 27e93456e..19ba7c8f4 100644 --- a/lib/SimplePie/SimplePie/Item.php +++ b/lib/SimplePie/SimplePie/Item.php @@ -2877,6 +2877,7 @@ class SimplePie_Item $width = null; $url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0])); + $url = $this->feed->sanitize->https_url($url); //FreshRSS if (isset($enclosure[0]['attribs']['']['type'])) { $type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); diff --git a/lib/SimplePie/SimplePie/Sanitize.php b/lib/SimplePie/SimplePie/Sanitize.php index 09294344e..bdc601100 100644 --- a/lib/SimplePie/SimplePie/Sanitize.php +++ b/lib/SimplePie/SimplePie/Sanitize.php @@ -292,10 +292,6 @@ class SimplePie_Sanitize $node =& $this->https_domains; foreach ($segments as $segment) {//Explore the tree - if ($node === true) - { - return true; - } if (isset($node[$segment])) { $node =& $node[$segment]; @@ -305,14 +301,14 @@ class SimplePie_Sanitize break; } } - return false; + return $node === true; } /** * Force HTTPS for selected Web sites * FreshRSS */ - protected function https_url($url) + public function https_url($url) { return (strtolower(substr($url, 0, 7)) === 'http://') && $this->is_https_domain(parse_url($url, PHP_URL_HOST)) ? |