clean up usage of DatabaseSetupException and catch Exceptions in entrypoints

This commit is contained in:
Jörn Friedrich Dreyer
2013-06-10 13:45:19 +02:00
parent c0bdbd9d81
commit 8dc6bdd96b
7 changed files with 173 additions and 134 deletions
+15 -8
View File
@@ -23,13 +23,20 @@
$RUNTIME_NOAPPS = true; //no apps, yet
require_once 'lib/base.php';
try {
if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
$values=array(
'installed'=>$installed,
'version'=>implode('.', OC_Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(),
'edition'=>OC_Util::getEditionString());
require_once 'lib/base.php';
echo(json_encode($values));
if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
$values=array(
'installed'=>$installed,
'version'=>implode('.', OC_Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(),
'edition'=>OC_Util::getEditionString());
echo(json_encode($values));
} catch (Exception $ex) {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
}