From 77f326e377865ee865483dd09eaec8e6e2db3a80 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Thu, 4 Aug 2016 12:02:27 +0200 Subject: [PATCH 1/2] [PlanetLibre] Change nested function to member function This fixes error "Using $this when not in object context" Nested functions are not part of the object and therefore don't have access to the object instance $this! --- bridges/PlanetLibreBridge.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php index cccda6dc..b65038ae 100644 --- a/bridges/PlanetLibreBridge.php +++ b/bridges/PlanetLibreBridge.php @@ -7,17 +7,17 @@ class PlanetLibreBridge extends BridgeAbstract{ $this->name = "PlanetLibre"; $this->uri = "http://www.planet-libre.org"; $this->description = "Returns the 5 newest posts from PlanetLibre (full text)"; - $this->update = "2014-05-26"; + $this->update = "2016-08-04"; } - public function collectData(array $param){ - function PlanetLibreExtractContent($url) { $html2 = $this->file_get_html($url); $text = $html2->find('div[class="post-text"]', 0)->innertext; return $text; } + + public function collectData(array $param){ $html = $this->file_get_html('http://www.planet-libre.org/') or $this->returnError('Could not request PlanetLibre.', 404); $limit = 0; foreach($html->find('div.post') as $element) { @@ -26,7 +26,7 @@ class PlanetLibreBridge extends BridgeAbstract{ $item->title = $element->find('h1', 0)->plaintext; $item->uri = $element->find('a', 0)->href; $item->timestamp = strtotime(str_replace('/', '-', $element->find('div[class="post-date"]', 0)->plaintext)); - $item->content = PlanetLibreExtractContent($item->uri); + $item->content = $this->PlanetLibreExtractContent($item->uri); $this->items[] = $item; $limit++; } From 2913f866848e7ca234256f47bfde39a04f9a2234 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Thu, 4 Aug 2016 12:04:29 +0200 Subject: [PATCH 2/2] [PlanetLibre] Fix indentation and remove empty lines --- bridges/PlanetLibreBridge.php | 63 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/bridges/PlanetLibreBridge.php b/bridges/PlanetLibreBridge.php index b65038ae..80a703b8 100644 --- a/bridges/PlanetLibreBridge.php +++ b/bridges/PlanetLibreBridge.php @@ -1,46 +1,43 @@ maintainer = "pit-fgfjiudghdf"; $this->name = "PlanetLibre"; $this->uri = "http://www.planet-libre.org"; $this->description = "Returns the 5 newest posts from PlanetLibre (full text)"; $this->update = "2016-08-04"; - } - function PlanetLibreExtractContent($url) { - $html2 = $this->file_get_html($url); - $text = $html2->find('div[class="post-text"]', 0)->innertext; - return $text; - } + function PlanetLibreExtractContent($url){ + $html2 = $this->file_get_html($url); + $text = $html2->find('div[class="post-text"]', 0)->innertext; + return $text; + } - public function collectData(array $param){ - $html = $this->file_get_html('http://www.planet-libre.org/') or $this->returnError('Could not request PlanetLibre.', 404); - $limit = 0; - foreach($html->find('div.post') as $element) { - if($limit < 5) { - $item = new \Item(); - $item->title = $element->find('h1', 0)->plaintext; - $item->uri = $element->find('a', 0)->href; - $item->timestamp = strtotime(str_replace('/', '-', $element->find('div[class="post-date"]', 0)->plaintext)); - $item->content = $this->PlanetLibreExtractContent($item->uri); - $this->items[] = $item; - $limit++; - } - } + public function collectData(array $param){ + $html = $this->file_get_html('http://www.planet-libre.org/') or $this->returnError('Could not request PlanetLibre.', 404); + $limit = 0; + foreach($html->find('div.post') as $element) { + if($limit < 5) { + $item = new \Item(); + $item->title = $element->find('h1', 0)->plaintext; + $item->uri = $element->find('a', 0)->href; + $item->timestamp = strtotime(str_replace('/', '-', $element->find('div[class="post-date"]', 0)->plaintext)); + $item->content = $this->PlanetLibreExtractContent($item->uri); + $this->items[] = $item; + $limit++; + } + } + } - } - public function getName(){ - return 'PlanetLibre'; - } - public function getURI(){ - return 'http://www.planet-libre.org/'; - } - public function getCacheDuration(){ - return 3600*2; // 1 hour - } + public function getName(){ + return 'PlanetLibre'; + } + public function getURI(){ + return 'http://www.planet-libre.org/'; + } + public function getCacheDuration(){ + return 3600*2; // 1 hour + } } -