From 05216d9c39846e853cd9f06c8f53c88fabec5e52 Mon Sep 17 00:00:00 2001 From: Damien Calesse Date: Fri, 30 Jan 2015 18:12:28 +0100 Subject: [PATCH 1/4] Update DilbertBridge --- bridges/DilbertBridge.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php index a80d8de3..eb094ccb 100644 --- a/bridges/DilbertBridge.php +++ b/bridges/DilbertBridge.php @@ -1,7 +1,7 @@ returnError('Could not request Dilbert.', 404); - - foreach($html->find('div.STR_Image') as $element) { + + foreach($html->find('section.comic-item') as $element) { + $comic = $element->find('img', 0); + $item = new Item(); - $href = $element->find('a',0)->href; - $item->uri = 'http://dilbert.com' . $href; - $content = str_replace('src="/', 'src="http://dilbert.com/',$element->innertext); - $content = str_replace('href="/', 'href="http://dilbert.com/',$content); - $item->content = $content; - $time = strtotime(substr($href, (strrpos($href, "/", -10) + 1), 10)); - $item->title = date("d/m/Y", $time); - $item->timestamp = $time; + $item->uri = $element->find('a',0)->href; + $item->content = '' . $comic->alt . ''; + $item->title = $comic->alt; + $item->timestamp = strtotime($element->find('h3', 0)->plaintext); $this->items[] = $item; } } From a3d5a1efea186705a242bddf7e6a3afe6dbbee1d Mon Sep 17 00:00:00 2001 From: Damien Calesse Date: Fri, 30 Jan 2015 18:14:53 +0100 Subject: [PATCH 2/4] Update DilbertBridge Date --- bridges/DilbertBridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php index eb094ccb..8e867a2e 100644 --- a/bridges/DilbertBridge.php +++ b/bridges/DilbertBridge.php @@ -4,7 +4,7 @@ * @name Dilbert Daily Strip * @homepage http://dilbert.com/strips/ * @description The Unofficial Dilbert Daily Comic Strip -* @update 16/10/2013 +* @update 30/01/2015 * initial maintainer: superbaillot.net */ class DilbertBridge extends BridgeAbstract{ From 1a64a21d50a084d99874785d5953dda19036799f Mon Sep 17 00:00:00 2001 From: Damien Calesse Date: Fri, 30 Jan 2015 18:20:19 +0100 Subject: [PATCH 3/4] Et voila --- bridges/DilbertBridge.php | 1 + 1 file changed, 1 insertion(+) diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php index 8e867a2e..d56986c2 100644 --- a/bridges/DilbertBridge.php +++ b/bridges/DilbertBridge.php @@ -6,6 +6,7 @@ * @description The Unofficial Dilbert Daily Comic Strip * @update 30/01/2015 * initial maintainer: superbaillot.net +* @maintainer kranack */ class DilbertBridge extends BridgeAbstract{ From f7a7acfde4c0364438d40370578dff662037f90c Mon Sep 17 00:00:00 2001 From: Damien Calesse Date: Fri, 30 Jan 2015 18:32:06 +0100 Subject: [PATCH 4/4] Update MemoLinux --- bridges/MemoLinuxBridge.php | 57 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/bridges/MemoLinuxBridge.php b/bridges/MemoLinuxBridge.php index 11e3270a..7da5ba0f 100644 --- a/bridges/MemoLinuxBridge.php +++ b/bridges/MemoLinuxBridge.php @@ -4,40 +4,41 @@ * @homepage http://memo-linux.com/ * @description Returns the 10 newest posts from MemoLinux (full text) * @maintainer qwertygc -* @update 2014-07-07 +* @update 2015-01-30 */ class MemoLinuxBridge extends BridgeAbstract{ public function collectData(array $param){ - function StripCDATA($string) { - $string = str_replace('', '', $string); - return $string; - } - function ExtractContent($url) { - $html2 = file_get_html($url); - $text = $html2->find('div.post-content', 0)->innertext; - $text = preg_replace('@]*?>.*?@si', '', $text); - $text = preg_replace('@]*?>.*?@si', '', $text); - $text = preg_replace("/returnError('Could not request MemoLinux.', 404); - $limit = 0; + function StripCDATA($string) { + $string = str_replace('', '', $string); + return $string; + } - foreach($html->find('item') as $element) { - if($limit < 10) { - $item = new \Item(); - $item->title = StripCDATA($element->find('title', 0)->innertext); - $item->uri = StripCDATA($element->find('guid', 0)->plaintext); - $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); - $item->content = ExtractContent($item->uri); - $this->items[] = $item; - $limit++; - } - } - + function ExtractContent($url) { + $html2 = file_get_html($url); + $text = $html2->find('div.entry-content', 0)->innertext; + $text = preg_replace('@]*?>.*?@si', '', $text); + $text = preg_replace('@]*?>.*?@si', '', $text); + $text = preg_replace("/returnError('Could not request MemoLinux.', 404); + $limit = 0; + + foreach($html->find('item') as $element) { + if($limit < 10) { + $item = new \Item(); + $item->title = StripCDATA($element->find('title', 0)->innertext); + $item->uri = StripCDATA($element->find('guid', 0)->plaintext); + $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); + $item->content = ExtractContent($item->uri); + $this->items[] = $item; + $limit++; + } + } } public function getName(){