From 3e541e57563e748ed0d51b167fbc900a142bc9bb Mon Sep 17 00:00:00 2001 From: Paul de Rosanbo Date: Thu, 21 Jan 2016 12:14:14 +0100 Subject: [PATCH 1/6] strings are encoded twice in UTF-8 --- bridges/ParuVenduImmoBridge.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php index a9c38ea4..3764bd4e 100644 --- a/bridges/ParuVenduImmoBridge.php +++ b/bridges/ParuVenduImmoBridge.php @@ -90,9 +90,9 @@ class ParuVenduImmoBridge extends BridgeAbstract list($href) = explode('#', $element->href); $item = new \Item(); - $item->uri = $this->getURI().$href; - $item->title = $element->title; - $item->content = $img.$desc.$price; + $item->uri = utf8_decode($this->getURI().$href); + $item->title = utf8_decode($element->title); + $item->content = utf8_decode($img.$desc.$price); $this->items[] = $item; } From 9df02824918cea14e3c5fcae3fa327da474f7723 Mon Sep 17 00:00:00 2001 From: Paul de Rosanbo Date: Thu, 21 Jan 2016 12:21:30 +0100 Subject: [PATCH 2/6] Revert "strings are encoded twice in UTF-8" This reverts commit 993f37616d73725745ab0098081149d566e7f3bb. --- bridges/ParuVenduImmoBridge.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php index 3764bd4e..a9c38ea4 100644 --- a/bridges/ParuVenduImmoBridge.php +++ b/bridges/ParuVenduImmoBridge.php @@ -90,9 +90,9 @@ class ParuVenduImmoBridge extends BridgeAbstract list($href) = explode('#', $element->href); $item = new \Item(); - $item->uri = utf8_decode($this->getURI().$href); - $item->title = utf8_decode($element->title); - $item->content = utf8_decode($img.$desc.$price); + $item->uri = $this->getURI().$href; + $item->title = $element->title; + $item->content = $img.$desc.$price; $this->items[] = $item; } From 7a20a7546f375ab84bfe797ea2bcbb3f62f33da5 Mon Sep 17 00:00:00 2001 From: Paul de Rosanbo Date: Sun, 11 Sep 2016 13:21:44 +0200 Subject: [PATCH 3/6] Fix the wildcard condition in the whitelist test --- lib/Bridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Bridge.php b/lib/Bridge.php index 4c76640a..f479abf0 100644 --- a/lib/Bridge.php +++ b/lib/Bridge.php @@ -96,7 +96,7 @@ EOD; || in_array($name . '.php', $whitelist) || in_array($name . 'Bridge', $whitelist) // DEPRECATED || in_array($name . 'Bridge.php', $whitelist) // DEPRECATED - || count($whitelist) === 1 and trim($whitelist[0]) === '*'){ + || (count($whitelist) === 1 and trim($whitelist[0]) === '*')) { return true; } else { return false; From 2c79c5baaf45a75ebf81d21ab73267ce5a115e0b Mon Sep 17 00:00:00 2001 From: Paul de Rosanbo Date: Thu, 21 Jan 2016 12:14:14 +0100 Subject: [PATCH 4/6] strings are encoded twice in UTF-8 --- bridges/ParuVenduImmoBridge.php | 1 + 1 file changed, 1 insertion(+) diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php index e791c7af..b176f21e 100644 --- a/bridges/ParuVenduImmoBridge.php +++ b/bridges/ParuVenduImmoBridge.php @@ -52,6 +52,7 @@ class ParuVenduImmoBridge extends BridgeAbstract $item['uri'] = self::URI.$href; $item['title'] = $element->title; $item['content'] = $img.$desc.$price; + $this->items[] = $item; } From e89f0a5d6fb7a91cfca7446f9f1df11a4015d0e5 Mon Sep 17 00:00:00 2001 From: Paul de Rosanbo Date: Thu, 21 Jan 2016 12:21:30 +0100 Subject: [PATCH 5/6] Revert "strings are encoded twice in UTF-8" This reverts commit 993f37616d73725745ab0098081149d566e7f3bb. --- bridges/ParuVenduImmoBridge.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bridges/ParuVenduImmoBridge.php b/bridges/ParuVenduImmoBridge.php index b176f21e..1d13ee78 100644 --- a/bridges/ParuVenduImmoBridge.php +++ b/bridges/ParuVenduImmoBridge.php @@ -48,10 +48,11 @@ class ParuVenduImmoBridge extends BridgeAbstract list($href) = explode('#', $element->href); - $item = array(); - $item['uri'] = self::URI.$href; - $item['title'] = $element->title; - $item['content'] = $img.$desc.$price; + + $item = new \Item(); + $item->uri = $this->getURI().$href; + $item->title = $element->title; + $item->content = $img.$desc.$price; $this->items[] = $item; From c9ee2053f1413b63953eda8301098da5fae73db2 Mon Sep 17 00:00:00 2001 From: Paul de Rosanbo Date: Sun, 11 Sep 2016 13:21:44 +0200 Subject: [PATCH 6/6] Fix the wildcard condition in the whitelist test --- lib/Bridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Bridge.php b/lib/Bridge.php index 4c76640a..f479abf0 100644 --- a/lib/Bridge.php +++ b/lib/Bridge.php @@ -96,7 +96,7 @@ EOD; || in_array($name . '.php', $whitelist) || in_array($name . 'Bridge', $whitelist) // DEPRECATED || in_array($name . 'Bridge.php', $whitelist) // DEPRECATED - || count($whitelist) === 1 and trim($whitelist[0]) === '*'){ + || (count($whitelist) === 1 and trim($whitelist[0]) === '*')) { return true; } else { return false;