From 3fb8c5b916a9c8a80b1f8de50f817d6edca07cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 13:57:02 +0200
Subject: [PATCH] [NextgovBridge] code simplification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/NextgovBridge.php | 58 ++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php
index 9c5f9e39..f7e508e1 100644
--- a/bridges/NextgovBridge.php
+++ b/bridges/NextgovBridge.php
@@ -44,43 +44,39 @@ class NextgovBridge extends BridgeAbstract {
         }
 
         $category = $this->getInput('category');
-        if (empty($category))
-            $category = 'all';
-        if ($category !== preg_replace('/[^a-z-]+/', '', $category) || strlen($category > 32))
-            $this->returnClientError('Invalid "category" parameter.');
         $url = $this->getURI().'rss/'.$category.'/';
         $html = $this->getSimpleHTMLDOM($url) or $this->returnServerError('Could not request Nextgov: '.$url);
         $limit = 0;
 
         foreach ($html->find('item') as $element) {
-            if ($limit < 10) {
-
-                $article_url = ExtractFromDelimiters($element->innertext, '<link>', '</link>');
-                $article_author = ExtractFromDelimiters($element->innertext, 'dc/elements/1.1/">', '</dc:creator>');
-                $article_title = $element->find('title', 0)->plaintext;
-                $article_subtitle = $element->find('description', 0)->plaintext;
-                $article_timestamp = strtotime($element->find('pubDate', 0)->plaintext);
-                $article_thumbnail = ExtractFromDelimiters($element->innertext, '<media:content url="', '"');
-                $article = $this->getSimpleHTMLDOM($article_url) or $this->returnServerError('Could not request Nextgov: '.$article_url);
-
-                $contents = $article->find('div.wysiwyg', 0)->innertext;
-                $contents = StripWithDelimiters($contents, '<div class="ad-container">', '</div>');
-                $contents = StripWithDelimiters($contents, '<div', '</div>'); //ad outer div
-                $contents = StripWithDelimiters($contents, '<script', '</script>');
-                $contents = ($article_thumbnail == '' ? '' : '<p><img src="'.$article_thumbnail.'" /></p>')
-                    .'<p><b>'.$article_subtitle.'</b></p>'
-                    .trim($contents);
-
-                $item = array();
-                $item['uri'] = $article_url;
-                $item['title'] = $article_title;
-                $item['author'] = $article_author;
-                $item['timestamp'] = $article_timestamp;
-                $item['content'] = $contents;
-                $this->items[] = $item;
-                $limit++;
+            if ($limit >= 10) {
+                break;
             }
-        }
 
+            $article_url = ExtractFromDelimiters($element->innertext, '<link>', '</link>');
+            $article_author = ExtractFromDelimiters($element->innertext, 'dc/elements/1.1/">', '</dc:creator>');
+            $article_title = $element->find('title', 0)->plaintext;
+            $article_subtitle = $element->find('description', 0)->plaintext;
+            $article_timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+            $article_thumbnail = ExtractFromDelimiters($element->innertext, '<media:content url="', '"');
+            $article = $this->getSimpleHTMLDOM($article_url) or $this->returnServerError('Could not request Nextgov: '.$article_url);
+
+            $contents = $article->find('div.wysiwyg', 0)->innertext;
+            $contents = StripWithDelimiters($contents, '<div class="ad-container">', '</div>');
+            $contents = StripWithDelimiters($contents, '<div', '</div>'); //ad outer div
+            $contents = StripWithDelimiters($contents, '<script', '</script>');
+            $contents = ($article_thumbnail == '' ? '' : '<p><img src="'.$article_thumbnail.'" /></p>')
+                .'<p><b>'.$article_subtitle.'</b></p>'
+                .trim($contents);
+
+            $item = array();
+            $item['uri'] = $article_url;
+            $item['title'] = $article_title;
+            $item['author'] = $article_author;
+            $item['timestamp'] = $article_timestamp;
+            $item['content'] = $contents;
+            $this->items[] = $item;
+            $limit++;
+        }
     }
 }