diff options
Diffstat (limited to 'lib/Fetcher/Fetcher.php')
| -rw-r--r-- | lib/Fetcher/Fetcher.php | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/lib/Fetcher/Fetcher.php b/lib/Fetcher/Fetcher.php index 81712ad2b..e78da0265 100644 --- a/lib/Fetcher/Fetcher.php +++ b/lib/Fetcher/Fetcher.php @@ -13,7 +13,6 @@ namespace OCA\News\Fetcher; - class Fetcher { @@ -38,36 +37,38 @@ class Fetcher /** * Fetch a feed from remote * - * @param string $url remote url of the feed - * @param boolean $getFavicon if the favicon should also be fetched, - * defaults to true - * @param string $lastModified a last modified value from an http header - * defaults to false. If lastModified - * matches the http header from the feed no - * results are fetched - * @param string $etag an etag from an http header. - * If lastModified matches the - * http header from the feed no - * results are fetched - * @param bool fullTextEnabled if true tells the fetcher to enhance the - * articles by fetching custom enhanced content - * @param string $basicAuthUser if given, basic auth is set for this feed - * @param string $basicAuthPassword if given, basic auth is set for this - * feed. Ignored if user is null or an - * empty string + * @param string $url remote url of the feed + * @param boolean $getFavicon if the favicon should also be fetched, defaults to true + * @param string $lastModified a last modified value from an http header defaults to false. + * If lastModified matches the http header from the feed no results are fetched + * @param string $etag an etag from an http header. + * If lastModified matches the http header from the feed no results are fetched + * @param bool $fullTextEnabled if true tells the fetcher to enhance the articles by fetching more content + * @param string $basicAuthUser if given, basic auth is set for this feed + * @param string $basicAuthPassword if given, basic auth is set for this feed. Ignored if user is empty + * * @throws FetcherException if simple pie fails * @return array an array containing the new feed and its items, first * element being the Feed and second element being an array of Items */ - public function fetch($url, $getFavicon=true, $lastModified=null, - $etag=null, $fullTextEnabled=false, - $basicAuthUser=null, $basicAuthPassword=null + public function fetch( + $url, + $getFavicon = true, + $lastModified = null, + $etag = null, + $fullTextEnabled = false, + $basicAuthUser = null, + $basicAuthPassword = null ) { - foreach($this->fetchers as $fetcher){ - if($fetcher->canHandle($url)) { + foreach ($this->fetchers as $fetcher) { + if ($fetcher->canHandle($url)) { return $fetcher->fetch( - $url, $getFavicon, $lastModified, $etag, - $fullTextEnabled, $basicAuthUser, + $url, + $getFavicon, + $lastModified, + $etag, + $fullTextEnabled, + $basicAuthUser, $basicAuthPassword ); } @@ -75,6 +76,4 @@ class Fetcher return [null, []]; } - - } |