diff options
Diffstat (limited to 'appinfo')
-rw-r--r-- | appinfo/app.json | 49 | ||||
-rw-r--r-- | appinfo/app.php | 1 | ||||
-rw-r--r-- | appinfo/application.php | 17 | ||||
-rw-r--r-- | appinfo/info.xml | 55 |
4 files changed, 56 insertions, 66 deletions
diff --git a/appinfo/app.json b/appinfo/app.json deleted file mode 100644 index c2c3489d1..000000000 --- a/appinfo/app.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "News", - "id": "news", - "description": "An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory", - "licence": "AGPL", - "version": "4.2.1", - "authors": [ - { - "name": "Bernhard Posselt", - "email": "dev@bernhard-posselt.com" - }, - { - "name": "Alessandro Cosentino", - "email": "cosenal@gmail.com" - }, - { - "name": "Jan-Christoph Borchardt", - "email": "hey@jancborchardt.net" - } - ], - "homepage": "https://github.com/owncloud/news", - "bugs": "https://github.com/owncloud/news/issues", - "repository": { - "type": "git", - "url": "https://github.com/owncloud/news.git" - }, - "navigation": {}, - "documentation": { - "user": "https://github.com/owncloud/news/wiki#user-documentation", - "admin": "https://github.com/owncloud/news#readme", - "developer": "https://github.com/owncloud/news/wiki" - }, - "jobs": ["OCA\\News\\Cron\\Updater"], - "hooks": { - "OC_User::pre_deleteUser": "OCA\\News\\Hooks\\User::deleteUser" - }, - "admin": true, - "categories": ["Multimedia"], - "dependencies": { - "databases": ["pgsql", "sqlite3", "mysql"], - "php": ">=5.4", - "owncloud": ">=7.0.3", - "libs": { - "curl": "*", - "libxml": ">=2.7.8", - "SimpleXML": "*" - } - } -}
\ No newline at end of file diff --git a/appinfo/app.php b/appinfo/app.php index 2809795fb..66c0ef166 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -27,4 +27,3 @@ $container = new Application(); $config = $container->getAppConfig(); $config->registerAll(); -$config->testDependencies();
\ No newline at end of file diff --git a/appinfo/application.php b/appinfo/application.php index e4972d8fc..ccaae0f09 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -265,25 +265,12 @@ class Application extends App { * App config parser */ $container->registerService('AppConfig', function($c) { - // order extensions in name => version - $loadedExtensions = get_loaded_extensions(); - $extensions = []; - foreach ($loadedExtensions as $extension) { - $extensions[$extension] = phpversion($extension); - } - - $extensions['libxml'] = LIBXML_DOTTED_VERSION; - $config = new AppConfig( $c->query('ServerContainer')->getNavigationManager(), - $c->query('URLGenerator'), - phpversion(), - implode('.', Util::getVersion()), - $extensions, - $c->query('DatabaseType') + $c->query('URLGenerator') ); - $config->loadConfig(__DIR__ . '/app.json'); + $config->loadConfig(__DIR__ . '/info.xml'); return $config; }); diff --git a/appinfo/info.xml b/appinfo/info.xml index 3ccb782b2..f082b7be5 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,10 +1,63 @@ <?xml version="1.0"?> <info> + <!-- metadata --> <id>news</id> <name>News</name> <description>An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory</description> + <author>Bernhard Posselt, Alessandro Cosentino, Jan-Christoph Borchardt</author> + <categories> + <category>Multimedia</category> + </categories> <licence>AGPL</licence> <version>4.2.1</version> + + <!-- resources --> + <documentation> + <user>https://github.com/owncloud/news/wiki#user-documentation</user> + <admin>https://github.com/owncloud/news#readme</admin> + <developer>https://github.com/owncloud/news/wiki#developer-documentation</developer> + </documentation> + <homepage>https://github.com/owncloud/news</homepage> + <bugs>https://github.com/owncloud/news/issues</bugs> + <repository type="git">https://github.com/owncloud/news.git</repository> + + <!-- dependencies --> <requiremin>7.0.3</requiremin> - <author>Bernhard Posselt, Alessandro Cosentino, Jan-Christoph Borchardt</author> + <php version=">=5.4" /> + <databases> + <database>pgsql</database> + <database>sqlite3</database> + <database>mysql</database> + </databases> + <libs> + <lib version=">=2.7.8">libxml</lib> + <lib>curl</lib> + <lib>SimpleXML</lib> + </libs> + + <!-- navigation --> + <navigation> + <id>news</id> + <route>news.page.index</route> + <order>10</order> + <icon>app.svg</icon> + <name>News</name> + </navigation> + + <!-- admin --> + <admin>admin/admin</admin> + + <!-- cron jobs --> + <cron> + <job>OCA\News\Cron\Updater</job> + </cron> + + <!-- hooks --> + <hooks> + <hook> + <channel>OC_User::pre_deleteUser</channel> + <subscriber>OCA\News\Hooks\User::deleteUser</subscriber> + </hook> + </hooks> + </info> |