diff options
112 files changed, 3813 insertions, 2338 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index 65c53725c..9ce7f366f 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -7,8 +7,8 @@ * * @author Alessandro Cosentino <cosenal@gmail.com> * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Alessandro Cosentino 2012 - * @copyright Bernhard Posselt 2012, 2014 + * @copyright 2012 Alessandro Cosentino + * @copyright 2012-2014 Bernhard Posselt */ namespace OCA\News\AppInfo; diff --git a/appinfo/routes.php b/appinfo/routes.php index 1f1e19517..7bf843cb2 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -7,8 +7,8 @@ * * @author Alessandro Cosentino <cosenal@gmail.com> * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Alessandro Cosentino 2012 - * @copyright Bernhard Posselt 2012, 2014 + * @copyright 2012 Alessandro Cosentino + * @copyright 2012-2014 Bernhard Posselt */ return ['routes' => [ diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 5abd0c5be..d633de743 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -5,10 +5,10 @@ * This file is licensed under the Affero General Public License version 3 or * later. See the COPYING file. * - * @author Alessandro Cosentino <cosenal@gmail.com> - * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Alessandro Cosentino 2012 - * @copyright Bernhard Posselt 2012, 2014 + * @author Alessandro Cosentino <cosenal@gmail.com> + * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @copyright 2012 Alessandro Cosentino + * @copyright 2012-2014 Bernhard Posselt */ namespace OCA\News\AppInfo; @@ -40,9 +40,11 @@ use OCA\News\Explore\RecommendedSites; use OCA\News\Utility\ProxyConfigParser; -class Application extends App { +class Application extends App +{ - public function __construct(array $urlParams=[]) { + public function __construct(array $urlParams=[]) + { parent::__construct('news', $urlParams); // files @@ -60,192 +62,245 @@ class Application extends App { /** * App config parser */ - /** @noinspection PhpParamsInspection */ - $this->registerService(AppConfig::class, function($c) { - $config = new AppConfig( - $c->query(INavigationManager::class), - $c->query(IURLGenerator::class), - $c->query(IJobList::class) - ); - - $config->loadConfig($c->query('info')); - - return $config; - }); + /** + * @noinspection PhpParamsInspection +*/ + $this->registerService( + AppConfig::class, function ($c) { + $config = new AppConfig( + $c->query(INavigationManager::class), + $c->query(IURLGenerator::class), + $c->query(IJobList::class) + |