From e1393722557244bdfbc3d26a31f192d6bf1a3602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Sun, 28 Aug 2016 19:46:49 +0200
Subject: [PATCH] [FlickrExploreBridge] 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/FlickrExploreBridge.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php
index d407f769..58343f7c 100644
--- a/bridges/FlickrExploreBridge.php
+++ b/bridges/FlickrExploreBridge.php
@@ -3,11 +3,12 @@ class FlickrExploreBridge extends BridgeAbstract{
 
 	public $maintainer = "sebsauvage";
 	public $name = "Flickr Explore";
-	public $uri = "https://www.flickr.com/explore";
+	public $uri = "https://www.flickr.com/";
 	public $description = "Returns the latest interesting images from Flickr";
 
     public function collectData(){
-        $html = $this->getSimpleHTMLDOM('https://www.flickr.com/explore') or $this->returnServerError('Could not request Flickr.');
+        $html = $this->getSimpleHTMLDOM($this->uri.'explore')
+            or $this->returnServerError('Could not request Flickr.');
 
         foreach($html->find('.photo-list-photo-view') as $element) {
 						// Get the styles
@@ -21,10 +22,17 @@ class FlickrExploreBridge extends BridgeAbstract{
 						$imageID = reset($imageURIs);
 
 						// Get the image JSON via Flickr API
-                        $imageJSON = json_decode($this->getContents('https://api.flickr.com/services/rest/?method=flickr.photos.getInfo&api_key=103b574d49bd51f0e18bfe907da44a0f&photo_id='.$imageID.'&format=json&nojsoncallback=1')) or $this->returnServerError('Could not request Flickr.'); // FIXME: Request time too long...
+                        $imageJSON = json_decode($this->getContents(
+                            'https://api.flickr.com/services/rest/?'
+                            .'method=flickr.photos.getInfo&'
+                            .'api_key=103b574d49bd51f0e18bfe907da44a0f&'
+                            .'photo_id='.$imageID.'&'
+                            .'format=json&'
+                            .'nojsoncallback=1'
+                        )) or $this->returnServerError('Could not request Flickr.'); // FIXME: Request time too long...
 
             $item = array();
-            $item['uri'] = 'https://flickr.com/photo.gne?id='.$imageID;
+            $item['uri'] = $this->uri.'photo.gne?id='.$imageID;
             $item['content'] = '<a href="' . $item['uri'] . '"><img src="' . $imageURI . '" /></a>'; // FIXME: Filter javascript ?
             $item['title'] = $imageJSON->photo->title->_content;
             $this->items[] = $item;