[Pkg-owncloud-commits] [owncloud] 83/153: adding try/catch + switch to config object as provided by the server container

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 6929549dadb8807ba1d8b54352c87ac3f10d0c12
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon May 19 15:26:57 2014 +0200

    adding try/catch + switch to config object as provided by the server container
---
 console.php | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/console.php b/console.php
index dd2c102..55bae7a 100644
--- a/console.php
+++ b/console.php
@@ -8,29 +8,34 @@
 
 use Symfony\Component\Console\Application;
 
-require_once 'lib/base.php';
+try {
+	require_once 'lib/base.php';
 
-// Don't do anything if ownCloud has not been installed yet
-if (!OC_Config::getValue('installed', false)) {
-	echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
-	exit(0);
-}
+	// Don't do anything if ownCloud has not been installed yet
+	if (!\OC::$server->getConfig()->getSystemValue('installed', false)) {
+		echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
+		exit(0);
+	}
 
-if (!OC::$CLI) {
-	echo "This script can be run from the command line only" . PHP_EOL;
-	exit(0);
-}
+	if (!OC::$CLI) {
+		echo "This script can be run from the command line only" . PHP_EOL;
+		exit(0);
+	}
 
-// load all apps to get all api routes properly setup
-OC_App::loadApps();
+	// load all apps to get all api routes properly setup
+	OC_App::loadApps();
 
-$defaults = new OC_Defaults;
-$application = new Application($defaults->getName(), \OC_Util::getVersionString());
-require_once 'core/register_command.php';
-foreach(OC_App::getAllApps() as $app) {
-	$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
-	if(file_exists($file)) {
-		require $file;
+	$defaults = new OC_Defaults;
+	$application = new Application($defaults->getName(), \OC_Util::getVersionString());
+	require_once 'core/register_command.php';
+	foreach(OC_App::getAllApps() as $app) {
+		$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
+		if(file_exists($file)) {
+			require $file;
+		}
 	}
+	$application->run();
+} catch (Exception $ex) {
+	echo "An unhandled exception has been thrown:" . PHP_EOL;
+	echo $ex;
 }
-$application->run();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git