nextcloud / server

cron.php

Indentation +117 added lines, -117 removed lines

@@ -38,124 +38,124 @@
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
-
-	if (\OCP\Util::needUpgrade()) {
-		\OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
-		exit;
-	}
-	if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
-		\OCP\Util::writeLog('cron', 'We are in maintenance mode, skipping cron', \OCP\Util::DEBUG);
-		exit;
-	}
-
-	// load all apps to get all api routes properly setup
-	OC_App::loadApps();
-
-	\OC::$server->getSession()->close();
-
-	// initialize a dummy memory session
-	$session = new \OC\Session\Memory('');
-	$cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
-	$session = $cryptoWrapper->wrapSession($session);
-	\OC::$server->setSession($session);
-
-	$logger = \OC::$server->getLogger();
-	$config = \OC::$server->getConfig();
-
-	// Don't do anything if ownCloud has not been installed
-	if (!$config->getSystemValue('installed', false)) {
-		exit(0);
-	}
-
-	\OC::$server->getTempManager()->cleanOld();
-
-	// Exit if background jobs are disabled!
-	$appMode = \OCP\BackgroundJob::getExecutionType();
-	if ($appMode == 'none') {
-		if (OC::$CLI) {
-			echo 'Background Jobs are disabled!' . PHP_EOL;
-		} else {
-			OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
-		}
-		exit(1);
-	}
-
-	if (OC::$CLI) {
-		// set to run indefinitely if needed
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(0);
-		}
-
-		// the cron job must be executed with the right user
-		if (!function_exists('posix_getuid')) {
-			echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
-			exit(1);
-		}
-		$user = posix_getpwuid(posix_getuid());
-		$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
-		if ($user['name'] !== $configUser['name']) {
-			echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL;
-			echo "Current user: " . $user['name'] . PHP_EOL;
-			echo "Web server user: " . $configUser['name'] . PHP_EOL;
-			exit(1);
-		}
-
-		// We call ownCloud from the CLI (aka cron)
-		if ($appMode != 'cron') {
-			\OCP\BackgroundJob::setExecutionType('cron');
-		}
-
-		// Work
-		$jobList = \OC::$server->getJobList();
-
-		// We only ask for jobs for 14 minutes, because after 15 minutes the next
-		// system cron task should spawn.
-		$endTime = time() + 14 * 60;
-
-		$executedJobs = [];
-		while ($job = $jobList->getNext()) {
-			if (isset($executedJobs[$job->getId()])) {
-				$jobList->unlockJob($job);
-				break;
-			}
-
-			$job->execute($jobList, $logger);
-			// clean up after unclean jobs
-			\OC_Util::tearDownFS();
-
-			$jobList->setLastJob($job);
-			$executedJobs[$job->getId()] = true;
-			unset($job);
-
-			if (time() > $endTime) {
-				break;
-			}
-		}
-
-	} else {
-		// We call cron.php from some website
-		if ($appMode == 'cron') {
-			// Cron is cron :-P
-			OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
-		} else {
-			// Work and success :-)
-			$jobList = \OC::$server->getJobList();
-			$job = $jobList->getNext();
-			if ($job != null) {
-				$job->execute($jobList, $logger);
-				$jobList->setLastJob($job);
-			}
-			OC_JSON::success();
-		}
-	}
-
-	// Log the successful cron execution
-	\OC::$server->getConfig()->setAppValue('core', 'lastcron', time());
-	exit();
+    require_once __DIR__ . '/lib/base.php';
+
+    if (\OCP\Util::needUpgrade()) {
+        \OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
+        exit;
+    }
+    if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
+        \OCP\Util::writeLog('cron', 'We are in maintenance mode, skipping cron', \OCP\Util::DEBUG);
+        exit;
+    }
+
+    // load all apps to get all api routes properly setup
+    OC_App::loadApps();
+
+    \OC::$server->getSession()->close();
+
+    // initialize a dummy memory session
+    $session = new \OC\Session\Memory('');
+    $cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
+    $session = $cryptoWrapper->wrapSession($session);
+    \OC::$server->setSession($session);
+
+    $logger = \OC::$server->getLogger();
+    $config = \OC::$server->getConfig();
+
+    // Don't do anything if ownCloud has not been installed
+    if (!$config->getSystemValue('installed', false)) {
+        exit(0);
+    }
+
+    \OC::$server->getTempManager()->cleanOld();
+
+    // Exit if background jobs are disabled!
+    $appMode = \OCP\BackgroundJob::getExecutionType();
+    if ($appMode == 'none') {
+        if (OC::$CLI) {
+            echo 'Background Jobs are disabled!' . PHP_EOL;
+        } else {
+            OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
+        }
+        exit(1);
+    }
+
+    if (OC::$CLI) {
+        // set to run indefinitely if needed
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(0);
+        }
+
+        // the cron job must be executed with the right user
+        if (!function_exists('posix_getuid')) {
+            echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+            exit(1);
+        }
+        $user = posix_getpwuid(posix_getuid());
+        $configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+        if ($user['name'] !== $configUser['name']) {
+            echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL;
+            echo "Current user: " . $user['name'] . PHP_EOL;
+            echo "Web server user: " . $configUser['name'] . PHP_EOL;
+            exit(1);
+        }
+
+        // We call ownCloud from the CLI (aka cron)
+        if ($appMode != 'cron') {
+            \OCP\BackgroundJob::setExecutionType('cron');
+        }
+
+        // Work
+        $jobList = \OC::$server->getJobList();
+
+        // We only ask for jobs for 14 minutes, because after 15 minutes the next
+        // system cron task should spawn.
+        $endTime = time() + 14 * 60;
+
+        $executedJobs = [];
+        while ($job = $jobList->getNext()) {
+            if (isset($executedJobs[$job->getId()])) {
+                $jobList->unlockJob($job);
+                break;
+            }
+
+            $job->execute($jobList, $logger);
+            // clean up after unclean jobs
+            \OC_Util::tearDownFS();
+
+            $jobList->setLastJob($job);
+            $executedJobs[$job->getId()] = true;
+            unset($job);
+
+            if (time() > $endTime) {
+                break;
+            }
+        }
+
+    } else {
+        // We call cron.php from some website
+        if ($appMode == 'cron') {
+            // Cron is cron :-P
+            OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
+        } else {
+            // Work and success :-)
+            $jobList = \OC::$server->getJobList();
+            $job = $jobList->getNext();
+            if ($job != null) {
+                $job->execute($jobList, $logger);
+                $jobList->setLastJob($job);
+            }
+            OC_JSON::success();
+        }
+    }
+
+    // Log the successful cron execution
+    \OC::$server->getConfig()->setAppValue('core', 'lastcron', time());
+    exit();
 
 } catch (Exception $ex) {
-	\OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
+    \OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
 } catch (Error $ex) {
-	\OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
+    \OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
 }

Spacing +8 added lines, -8 removed lines

@@ -34,11 +34,11 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	if (\OCP\Util::needUpgrade()) {
 		\OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
@@ -74,7 +74,7 @@ 
 	$appMode = \OCP\BackgroundJob::getExecutionType();
 	if ($appMode == 'none') {
 		if (OC::$CLI) {
-			echo 'Background Jobs are disabled!' . PHP_EOL;
+			echo 'Background Jobs are disabled!'.PHP_EOL;
 		} else {
 			OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
 		}
@@ -89,15 +89,15 @@ 
 
 		// the cron job must be executed with the right user
 		if (!function_exists('posix_getuid')) {
-			echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+			echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php".PHP_EOL;
 			exit(1);
 		}
 		$user = posix_getpwuid(posix_getuid());
-		$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+		$configUser = posix_getpwuid(fileowner(OC::$configDir.'config.php'));
 		if ($user['name'] !== $configUser['name']) {
-			echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL;
-			echo "Current user: " . $user['name'] . PHP_EOL;
-			echo "Web server user: " . $configUser['name'] . PHP_EOL;
+			echo "Console has to be executed with the same user as the web server is operated".PHP_EOL;
+			echo "Current user: ".$user['name'].PHP_EOL;
+			echo "Web server user: ".$configUser['name'].PHP_EOL;
 			exit(1);
 		}
 

lib/versioncheck.php

Indentation +8 added lines, -8 removed lines

@@ -3,16 +3,16 @@
 // Show warning if a PHP version below 5.6.0 is used, this has to happen here
 // because base.php will already use 5.6 syntax.
 if (version_compare(PHP_VERSION, '5.6.0') === -1) {
-	http_response_code(500);
-	echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
-	exit(-1);
+    http_response_code(500);
+    echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
+    echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
+    exit(-1);
 }
 
 // Show warning if > PHP 7.2 is used as Nextcloud is not compatible with > PHP 7.2 for now
 if (version_compare(PHP_VERSION, '7.3.0') !== -1) {
-	http_response_code(500);
-	echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '.';
-	exit(-1);
+    http_response_code(500);
+    echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>';
+    echo 'You are currently running ' . PHP_VERSION . '.';
+    exit(-1);
 }

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 if (version_compare(PHP_VERSION, '5.6.0') === -1) {
 	http_response_code(500);
 	echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
+	echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.';
 	exit(-1);
 }
 
@@ -13,6 +13,6 @@ 
 if (version_compare(PHP_VERSION, '7.3.0') !== -1) {
 	http_response_code(500);
 	echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '.';
+	echo 'You are currently running '.PHP_VERSION.'.';
 	exit(-1);
 }

index.php

Indentation +45 added lines, -45 removed lines

@@ -32,61 +32,61 @@
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+    require_once __DIR__ . '/lib/base.php';
 
-	OC::handleRequest();
+    OC::handleRequest();
 
 } catch(\OC\ServiceUnavailableException $ex) {
-	\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
+    \OC::$server->getLogger()->logException($ex, array('app' => 'index'));
 
-	//show the user a detailed error page
-	OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-	OC_Template::printExceptionErrorPage($ex);
+    //show the user a detailed error page
+    OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+    OC_Template::printExceptionErrorPage($ex);
 } catch (\OC\HintException $ex) {
-	OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-	try {
-		OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
-	} catch (Exception $ex2) {
-		\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
-		\OC::$server->getLogger()->logException($ex2, array('app' => 'index'));
+    OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+    try {
+        OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
+    } catch (Exception $ex2) {
+        \OC::$server->getLogger()->logException($ex, array('app' => 'index'));
+        \OC::$server->getLogger()->logException($ex2, array('app' => 'index'));
 
-		//show the user a detailed error page
-		OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-		OC_Template::printExceptionErrorPage($ex);
-	}
+        //show the user a detailed error page
+        OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+        OC_Template::printExceptionErrorPage($ex);
+    }
 } catch (\OC\User\LoginException $ex) {
-	OC_Response::setStatus(OC_Response::STATUS_FORBIDDEN);
-	OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage());
+    OC_Response::setStatus(OC_Response::STATUS_FORBIDDEN);
+    OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage());
 } catch (Exception $ex) {
-	\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
+    \OC::$server->getLogger()->logException($ex, array('app' => 'index'));
 
-	//show the user a detailed error page
-	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	OC_Template::printExceptionErrorPage($ex);
+    //show the user a detailed error page
+    OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+    OC_Template::printExceptionErrorPage($ex);
 } catch (Error $ex) {
-	try {
-		\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
-	} catch (Error $e) {
+    try {
+        \OC::$server->getLogger()->logException($ex, array('app' => 'index'));
+    } catch (Error $e) {
 
-		$claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
-		$validProtocols = [
-			'HTTP/1.0',
-			'HTTP/1.1',
-			'HTTP/2',
-		];
-		$protocol = 'HTTP/1.1';
-		if(in_array($claimedProtocol, $validProtocols, true)) {
-			$protocol = $claimedProtocol;
-		}
-		header($protocol . ' 500 Internal Server Error');
-		header('Content-Type: text/plain; charset=utf-8');
-		print("Internal Server Error\n\n");
-		print("The server encountered an internal error and was unable to complete your request.\n");
-		print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
-		print("More details can be found in the webserver log.\n");
+        $claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
+        $validProtocols = [
+            'HTTP/1.0',
+            'HTTP/1.1',
+            'HTTP/2',
+        ];
+        $protocol = 'HTTP/1.1';
+        if(in_array($claimedProtocol, $validProtocols, true)) {
+            $protocol = $claimedProtocol;
+        }
+        header($protocol . ' 500 Internal Server Error');
+        header('Content-Type: text/plain; charset=utf-8');
+        print("Internal Server Error\n\n");
+        print("The server encountered an internal error and was unable to complete your request.\n");
+        print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
+        print("More details can be found in the webserver log.\n");
 
-		throw $e;
-	}
-	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	OC_Template::printExceptionErrorPage($ex);
+        throw $e;
+    }
+    OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+    OC_Template::printExceptionErrorPage($ex);
 }

Spacing +5 added lines, -5 removed lines

@@ -28,15 +28,15 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	OC::handleRequest();
 
-} catch(\OC\ServiceUnavailableException $ex) {
+} catch (\OC\ServiceUnavailableException $ex) {
 	\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
 
 	//show the user a detailed error page
@@ -75,10 +75,10 @@ 
 			'HTTP/2',
 		];
 		$protocol = 'HTTP/1.1';
-		if(in_array($claimedProtocol, $validProtocols, true)) {
+		if (in_array($claimedProtocol, $validProtocols, true)) {
 			$protocol = $claimedProtocol;
 		}
-		header($protocol . ' 500 Internal Server Error');
+		header($protocol.' 500 Internal Server Error');
 		header('Content-Type: text/plain; charset=utf-8');
 		print("Internal Server Error\n\n");
 		print("The server encountered an internal error and was unable to complete your request.\n");

ocs/v1.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
  *
  */
 
-require_once __DIR__ . '/../lib/versioncheck.php';
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/base.php';
 
 if (\OCP\Util::needUpgrade()
 	|| \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
@@ -72,7 +72,7 @@ 
  * Try the appframework routes
  */
 try {
-	if(!\OC::$server->getUserSession()->isLoggedIn()) {
+	if (!\OC::$server->getUserSession()->isLoggedIn()) {
 		OC::handleLogin(\OC::$server->getRequest());
 	}
 	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
@@ -80,7 +80,7 @@ 
 	OC_API::setContentType();
 
 	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	$txt='Invalid query, please check the syntax. API specifications are here:'
+	$txt = 'Invalid query, please check the syntax. API specifications are here:'
 		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
 	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 } catch (MethodNotAllowedException $e) {
@@ -95,7 +95,7 @@ 
 	OC_API::setContentType();
 
 	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	$txt='Invalid query, please check the syntax. API specifications are here:'
+	$txt = 'Invalid query, please check the syntax. API specifications are here:'
 		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
 	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 }

ocs/providers.php

Spacing +4 added lines, -4 removed lines

@@ -23,18 +23,18 @@
  *
  */
 
-require_once __DIR__ . '/../lib/versioncheck.php';
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/base.php';
 
 header('Content-type: application/xml');
 
 $request = \OC::$server->getRequest();
 
-$url = $request->getServerProtocol() . '://' . substr($request->getServerHost() . $request->getRequestUri(), 0, -17).'ocs/v1.php/';
+$url = $request->getServerProtocol().'://'.substr($request->getServerHost().$request->getRequestUri(), 0, -17).'ocs/v1.php/';
 
 $writer = new XMLWriter();
 $writer->openURI('php://output');
-$writer->startDocument('1.0','UTF-8');
+$writer->startDocument('1.0', 'UTF-8');
 $writer->setIndent(true);
 $writer->startElement('providers');
 $writer->startElement('provider');

console.php

Indentation +43 added lines, -43 removed lines

@@ -38,58 +38,58 @@
 define('OC_CONSOLE', 1);
 
 function exceptionHandler($exception) {
-	echo "An unhandled exception has been thrown:" . PHP_EOL;
-	echo $exception;
-	exit(1);
+    echo "An unhandled exception has been thrown:" . PHP_EOL;
+    echo $exception;
+    exit(1);
 }
 try {
-	require_once __DIR__ . '/lib/base.php';
+    require_once __DIR__ . '/lib/base.php';
 
-	// set to run indefinitely if needed
-	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-		@set_time_limit(0);
-	}
+    // set to run indefinitely if needed
+    if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+        @set_time_limit(0);
+    }
 
-	if (!OC::$CLI) {
-		echo "This script can be run from the command line only" . PHP_EOL;
-		exit(1);
-	}
+    if (!OC::$CLI) {
+        echo "This script can be run from the command line only" . PHP_EOL;
+        exit(1);
+    }
 
-	set_exception_handler('exceptionHandler');
+    set_exception_handler('exceptionHandler');
 
-	if (!function_exists('posix_getuid')) {
-		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
-		exit(1);
-	}
-	$user = posix_getpwuid(posix_getuid());
-	$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
-	if ($user['name'] !== $configUser['name']) {
-		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-		echo "Current user: " . $user['name'] . PHP_EOL;
-		echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
-		echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
-		exit(1);
-	}
+    if (!function_exists('posix_getuid')) {
+        echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+        exit(1);
+    }
+    $user = posix_getpwuid(posix_getuid());
+    $configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+    if ($user['name'] !== $configUser['name']) {
+        echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
+        echo "Current user: " . $user['name'] . PHP_EOL;
+        echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
+        echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
+        exit(1);
+    }
 
-	$oldWorkingDir = getcwd();
-	if ($oldWorkingDir === false) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
-	} else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't change to Nextcloud root directory." . PHP_EOL;
-		exit(1);
-	}
+    $oldWorkingDir = getcwd();
+    if ($oldWorkingDir === false) {
+        echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
+        echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
+    } else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
+        echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
+        echo "Can't change to Nextcloud root directory." . PHP_EOL;
+        exit(1);
+    }
 
-	if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
-		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
-	}
+    if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
+        echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
+    }
 
-	$application = new Application(\OC::$server->getConfig(), \OC::$server->getEventDispatcher(), \OC::$server->getRequest(), \OC::$server->getLogger());
-	$application->loadCommands(new ArgvInput(), new ConsoleOutput());
-	$application->run();
+    $application = new Application(\OC::$server->getConfig(), \OC::$server->getEventDispatcher(), \OC::$server->getRequest(), \OC::$server->getLogger());
+    $application->loadCommands(new ArgvInput(), new ConsoleOutput());
+    $application->run();
 } catch (Exception $ex) {
-	exceptionHandler($ex);
+    exceptionHandler($ex);
 } catch (Error $ex) {
-	exceptionHandler($ex);
+    exceptionHandler($ex);
 }

Spacing +15 added lines, -15 removed lines

@@ -29,7 +29,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OC\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -38,12 +38,12 @@ 
 define('OC_CONSOLE', 1);
 
 function exceptionHandler($exception) {
-	echo "An unhandled exception has been thrown:" . PHP_EOL;
+	echo "An unhandled exception has been thrown:".PHP_EOL;
 	echo $exception;
 	exit(1);
 }
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// set to run indefinitely if needed
 	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@@ -51,38 +51,38 @@ 
 	}
 
 	if (!OC::$CLI) {
-		echo "This script can be run from the command line only" . PHP_EOL;
+		echo "This script can be run from the command line only".PHP_EOL;
 		exit(1);
 	}
 
 	set_exception_handler('exceptionHandler');
 
 	if (!function_exists('posix_getuid')) {
-		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php".PHP_EOL;
 		exit(1);
 	}
 	$user = posix_getpwuid(posix_getuid());
-	$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+	$configUser = posix_getpwuid(fileowner(OC::$configDir.'config.php'));
 	if ($user['name'] !== $configUser['name']) {
-		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-		echo "Current user: " . $user['name'] . PHP_EOL;
-		echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
-		echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
+		echo "Console has to be executed with the user that owns the file config/config.php".PHP_EOL;
+		echo "Current user: ".$user['name'].PHP_EOL;
+		echo "Owner of config.php: ".$configUser['name'].PHP_EOL;
+		echo "Try adding 'sudo -u ".$configUser['name']." ' to the beginning of the command (without the single quotes)".PHP_EOL;
 		exit(1);
 	}
 
 	$oldWorkingDir = getcwd();
 	if ($oldWorkingDir === false) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact.".PHP_EOL;
 	} else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't change to Nextcloud root directory." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't change to Nextcloud root directory.".PHP_EOL;
 		exit(1);
 	}
 
 	if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
-		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
+		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php".PHP_EOL;
 	}
 
 	$application = new Application(\OC::$server->getConfig(), \OC::$server->getEventDispatcher(), \OC::$server->getRequest(), \OC::$server->getLogger());

status.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	$systemConfig = \OC::$server->getSystemConfig();
 
@@ -42,7 +42,7 @@ 
 	# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
 	# for description and defaults
 	$defaults = new \OCP\Defaults();
-	$values=array(
+	$values = array(
 		'installed'=>$installed,
 		'maintenance' => $maintenance,
 		'needsDbUpgrade' => \OCP\Util::needUpgrade(),

public.php

Indentation +50 added lines, -50 removed lines

@@ -32,64 +32,64 @@
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
-	if (\OCP\Util::needUpgrade()) {
-		// since the behavior of apps or remotes are unpredictable during
-		// an upgrade, return a 503 directly
-		OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-		OC_Template::printErrorPage('Service unavailable');
-		exit;
-	}
+    require_once __DIR__ . '/lib/base.php';
+    if (\OCP\Util::needUpgrade()) {
+        // since the behavior of apps or remotes are unpredictable during
+        // an upgrade, return a 503 directly
+        OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+        OC_Template::printErrorPage('Service unavailable');
+        exit;
+    }
 
-	OC::checkMaintenanceMode();
-	$request = \OC::$server->getRequest();
-	$pathInfo = $request->getPathInfo();
+    OC::checkMaintenanceMode();
+    $request = \OC::$server->getRequest();
+    $pathInfo = $request->getPathInfo();
 
-	if (!$pathInfo && $request->getParam('service', '') === '') {
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	} elseif ($request->getParam('service', '')) {
-		$service = $request->getParam('service', '');
-	} else {
-		$pathInfo = trim($pathInfo, '/');
-		list($service) = explode('/', $pathInfo);
-	}
-	$file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service));
-	if ($file === null) {
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
+    if (!$pathInfo && $request->getParam('service', '') === '') {
+        header('HTTP/1.0 404 Not Found');
+        exit;
+    } elseif ($request->getParam('service', '')) {
+        $service = $request->getParam('service', '');
+    } else {
+        $pathInfo = trim($pathInfo, '/');
+        list($service) = explode('/', $pathInfo);
+    }
+    $file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service));
+    if ($file === null) {
+        header('HTTP/1.0 404 Not Found');
+        exit;
+    }
 
-	$parts = explode('/', $file, 2);
-	$app = $parts[0];
+    $parts = explode('/', $file, 2);
+    $app = $parts[0];
 
-	// Load all required applications
-	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(array('authentication'));
-	OC_App::loadApps(array('filesystem', 'logging'));
+    // Load all required applications
+    \OC::$REQUESTEDAPP = $app;
+    OC_App::loadApps(array('authentication'));
+    OC_App::loadApps(array('filesystem', 'logging'));
 
-	if (!\OC::$server->getAppManager()->isInstalled($app)) {
-		throw new Exception('App not installed: ' . $app);
-	}
-	OC_App::loadApp($app);
-	OC_User::setIncognitoMode(true);
+    if (!\OC::$server->getAppManager()->isInstalled($app)) {
+        throw new Exception('App not installed: ' . $app);
+    }
+    OC_App::loadApp($app);
+    OC_User::setIncognitoMode(true);
 
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+    $baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
 
-	require_once OC_App::getAppPath($app) . '/' . $parts[1];
+    require_once OC_App::getAppPath($app) . '/' . $parts[1];
 
 } catch (Exception $ex) {
-	if ($ex instanceof \OC\ServiceUnavailableException) {
-		OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-	} else {
-		OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	}
-	//show the user a detailed error page
-	\OC::$server->getLogger()->logException($ex, ['app' => 'public']);
-	OC_Template::printExceptionErrorPage($ex);
+    if ($ex instanceof \OC\ServiceUnavailableException) {
+        OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+    } else {
+        OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+    }
+    //show the user a detailed error page
+    \OC::$server->getLogger()->logException($ex, ['app' => 'public']);
+    OC_Template::printExceptionErrorPage($ex);
 } catch (Error $ex) {
-	//show the user a detailed error page
-	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	\OC::$server->getLogger()->logException($ex, ['app' => 'public']);
-	OC_Template::printExceptionErrorPage($ex);
+    //show the user a detailed error page
+    OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+    \OC::$server->getLogger()->logException($ex, ['app' => 'public']);
+    OC_Template::printExceptionErrorPage($ex);
 }

Spacing +6 added lines, -6 removed lines

@@ -28,11 +28,11 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 	if (\OCP\Util::needUpgrade()) {
 		// since the behavior of apps or remotes are unpredictable during
 		// an upgrade, return a 503 directly
@@ -54,7 +54,7 @@ 
 		$pathInfo = trim($pathInfo, '/');
 		list($service) = explode('/', $pathInfo);
 	}
-	$file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service));
+	$file = \OC::$server->getConfig()->getAppValue('core', 'public_'.strip_tags($service));
 	if ($file === null) {
 		header('HTTP/1.0 404 Not Found');
 		exit;
@@ -69,14 +69,14 @@ 
 	OC_App::loadApps(array('filesystem', 'logging'));
 
 	if (!\OC::$server->getAppManager()->isInstalled($app)) {
-		throw new Exception('App not installed: ' . $app);
+		throw new Exception('App not installed: '.$app);
 	}
 	OC_App::loadApp($app);
 	OC_User::setIncognitoMode(true);
 
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+	$baseuri = OC::$WEBROOT.'/public.php/'.$service.'/';
 
-	require_once OC_App::getAppPath($app) . '/' . $parts[1];
+	require_once OC_App::getAppPath($app).'/'.$parts[1];
 
 } catch (Exception $ex) {
 	if ($ex instanceof \OC\ServiceUnavailableException) {

remote.php

Spacing +14 added lines, -14 removed lines

@@ -28,7 +28,7 @@ 
  *
  */
 
-require_once __DIR__ . '/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/versioncheck.php';
 
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
 use Sabre\DAV\Exception\ServiceUnavailable;
@@ -56,7 +56,7 @@ 
 			// we shall not log on RemoteException
 			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
 		}
-		$server->on('beforeMethod', function () use ($e) {
+		$server->on('beforeMethod', function() use ($e) {
 			if ($e instanceof RemoteException) {
 				switch ($e->getCode()) {
 					case OC_Response::STATUS_SERVICE_UNAVAILABLE:
@@ -72,7 +72,7 @@ 
 		$server->exec();
 	} else {
 		$statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
+		if ($e instanceof \OC\ServiceUnavailableException) {
 			$statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
 		}
 		if ($e instanceof RemoteException) {
@@ -105,11 +105,11 @@ 
 		return $services[$service];
 	}
 
-	return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+	return \OC::$server->getConfig()->getAppValue('core', 'remote_'.$service);
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// All resources served via the DAV endpoint should have the strictest possible
 	// policy. Exempted from this is the SabreDAV browser plugin which overwrites
@@ -130,18 +130,18 @@ 
 	if (!$pos = strpos($pathInfo, '/', 1)) {
 		$pos = strlen($pathInfo);
 	}
-	$service=substr($pathInfo, 1, $pos-1);
+	$service = substr($pathInfo, 1, $pos - 1);
 
 	$file = resolveService($service);
 
-	if(is_null($file)) {
+	if (is_null($file)) {
 		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
 	}
 
-	$file=ltrim($file, '/');
+	$file = ltrim($file, '/');
 
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+	$parts = explode('/', $file, 2);
+	$app = $parts[0];
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
@@ -150,17 +150,17 @@ 
 
 	switch ($app) {
 		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
+			$file = OC::$SERVERROOT.'/'.$file;
 			break;
 		default:
 			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
+				throw new RemoteException('App not installed: '.$app);
 			}
 			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
+			$file = OC_App::getAppPath($app).'/'.$parts[1];
 			break;
 	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	$baseuri = OC::$WEBROOT.'/remote.php/'.$service.'/';
 	require_once $file;
 
 } catch (Exception $ex) {