Simplify AppConfig->getValues()

This commit is contained in:
Robin Appelman 2014-06-01 14:14:30 +02:00
parent 91180bfef4
commit a4949f4b31
1 changed files with 9 additions and 19 deletions

View File

@ -251,28 +251,18 @@ class AppConfig implements \OCP\IAppConfig {
return false;
}
$fields = '`configvalue`';
$where = 'WHERE';
$params = array();
if ($app !== false) {
$fields .= ', `configkey`';
$where .= ' `appid` = ?';
$params[] = $app;
$key = 'configkey';
return $this->getAppValues($app);
} else {
$fields .= ', `appid`';
$where .= ' `configkey` = ?';
$params[] = $key;
$key = 'appid';
}
$query = 'SELECT ' . $fields . ' FROM `*PREFIX*appconfig` ' . $where;
$result = $this->conn->executeQuery($query, $params);
$query = 'SELECT `configvalue`, `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = ?';
$result = $this->conn->executeQuery($query, array($key));
$values = array();
while ($row = $result->fetch((\PDO::FETCH_ASSOC))) {
$values[$row[$key]] = $row['configvalue'];
}
$values = array();
while ($row = $result->fetch((\PDO::FETCH_ASSOC))) {
$values[$row['appid']] = $row['configvalue'];
}
return $values;
return $values;
}
}
}