summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-02 22:11:14 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-02 22:11:14 +0200
commit32cab8ed69e3d197108ca24533c42aeb292215ba (patch)
treec2b00bb1f1a58b8319e39a7a68eadbb94436cb70 /config
parente215a595ed5991ce4c25763b7e2eafd440d65478 (diff)
also validate database types
Diffstat (limited to 'config')
-rw-r--r--config/appconfig.php21
1 files changed, 15 insertions, 6 deletions
diff --git a/config/appconfig.php b/config/appconfig.php
index 1a2367c4b..44932f693 100644
--- a/config/appconfig.php
+++ b/config/appconfig.php
@@ -161,12 +161,22 @@ class AppConfig {
* @throws \OCA\News\DependencyException if one version is not satisfied
*/
public function testDependencies() {
+ $msg = '';
+
+ // test databases
+ if(array_key_exists('databases', $this->config)) {
+ if(!in_array($this->databaseType, $this->config['databases'])) {
+ $msg .= 'Database ' . $this->databaseType . ' not supported.' .
+ 'App is only compatible with ' .
+ implode(', ', $this->config['databases']);
+ }
+ }
+
+ // test dependencies
if(array_key_exists('dependencies', $this->config)) {
$deps = $this->config['dependencies'];
- $msg = '';
-
if(array_key_exists('php', $deps)) {
$msg .= $this->requireVersion($this->phpVersion, $deps['php'],
'PHP');
@@ -198,11 +208,10 @@ class AppConfig {
}
}
}
+ }
- if($msg !== '') {
- throw new DependencyException($msg);
- }
-
+ if($msg !== '') {
+ throw new DependencyException($msg);
}
}