nextcloud / server

console.php

Spacing +16 added lines, -16 removed lines

@@ -32,7 +32,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OC\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -41,12 +41,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) {
@@ -54,39 +54,39 @@ 
 	}
 
 	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_getuid();
-	$configUser = fileowner(OC::$configDir . 'config.php');
+	$configUser = fileowner(OC::$configDir.'config.php');
 	if ($user !== $configUser) {
-		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-		echo "Current user id: " . $user . PHP_EOL;
-		echo "Owner id of config.php: " . $configUser . PHP_EOL;
-		echo "Try adding 'sudo -u #" . $configUser . "' to the beginning of the command (without the single quotes)" . PHP_EOL;
-		echo "If running with 'docker exec' try adding the option '-u " . $configUser . "' to the docker 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 id: ".$user.PHP_EOL;
+		echo "Owner id of config.php: ".$configUser.PHP_EOL;
+		echo "Try adding 'sudo -u #".$configUser."' to the beginning of the command (without the single quotes)".PHP_EOL;
+		echo "If running with 'docker exec' try adding the option '-u ".$configUser."' to the docker 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;
 	} elseif ($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(

cron.php

Spacing +8 added lines, -8 removed lines

@@ -36,10 +36,10 @@ 
  *
  */
 
-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()) {
 		\OC::$server->getLogger()->debug('Update required, skipping cron', ['app' => 'cron']);
@@ -75,7 +75,7 @@ 
 	$appMode = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax');
 	if ($appMode === 'none') {
 		if (OC::$CLI) {
-			echo 'Background Jobs are disabled!' . PHP_EOL;
+			echo 'Background Jobs are disabled!'.PHP_EOL;
 		} else {
 			OC_JSON::error(['data' => ['message' => 'Background jobs disabled!']]);
 		}
@@ -90,16 +90,16 @@ 
 
 		// 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_getuid();
-		$configUser = fileowner(OC::$configDir . 'config.php');
+		$configUser = fileowner(OC::$configDir.'config.php');
 		if ($user !== $configUser) {
-			echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-			echo "Current user id: " . $user . PHP_EOL;
-			echo "Owner id of config.php: " . $configUser . PHP_EOL;
+			echo "Console has to be executed with the user that owns the file config/config.php".PHP_EOL;
+			echo "Current user id: ".$user.PHP_EOL;
+			echo "Owner id of config.php: ".$configUser.PHP_EOL;
 			exit(1);
 		}