nextcloud / server

build/rector.php

Indentation +69 added lines, -69 removed lines

@@ -18,73 +18,73 @@ 
 $nextcloudDir = dirname(__DIR__);
 
 class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface {
-	private array $namespacePrefixes = [
-		'OC',
-		'OCA',
-		'OCP',
-	];
-	private array $skippedClassNames = [
-		'Backend',
-		'Connection',
-		'Exception',
-		'IManager',
-		'IProvider',
-		'Manager',
-		'Plugin',
-		'Provider',
-	];
-	public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node) : bool {
-		if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) {
-			// Skip common class names to avoid confusion
-			return true;
-		}
-		foreach ($this->namespacePrefixes as $prefix) {
-			if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
-				// Import Nextcloud namespaces
-				return false;
-			}
-		}
-		// Skip everything else
-		return true;
-	}
+    private array $namespacePrefixes = [
+        'OC',
+        'OCA',
+        'OCP',
+    ];
+    private array $skippedClassNames = [
+        'Backend',
+        'Connection',
+        'Exception',
+        'IManager',
+        'IProvider',
+        'Manager',
+        'Plugin',
+        'Provider',
+    ];
+    public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node) : bool {
+        if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) {
+            // Skip common class names to avoid confusion
+            return true;
+        }
+        foreach ($this->namespacePrefixes as $prefix) {
+            if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
+                // Import Nextcloud namespaces
+                return false;
+            }
+        }
+        // Skip everything else
+        return true;
+    }
 }
 
 $config = RectorConfig::configure()
-	->withPaths([
-		$nextcloudDir . '/apps',
-		$nextcloudDir . '/core',
-		$nextcloudDir . '/ocs',
-		$nextcloudDir . '/ocs-provider',
-		$nextcloudDir . '/console.php',
-		$nextcloudDir . '/cron.php',
-		$nextcloudDir . '/index.php',
-		$nextcloudDir . '/occ',
-		$nextcloudDir . '/public.php',
-		$nextcloudDir . '/remote.php',
-		$nextcloudDir . '/status.php',
-		$nextcloudDir . '/version.php',
-		// $nextcloudDir . '/config',
-		// $nextcloudDir . '/lib',
-		// $nextcloudDir . '/tests',
-		// $nextcloudDir . '/themes',
-	])
-	->withSkip([
-		$nextcloudDir . '/apps/*/3rdparty/*',
-		$nextcloudDir . '/apps/*/build/stubs/*',
-		$nextcloudDir . '/apps/*/composer/*',
-		$nextcloudDir . '/apps/*/config/*',
-	])
-	// uncomment to reach your current PHP version
-	// ->withPhpSets()
-	->withImportNames(importShortClasses:false)
-	->withTypeCoverageLevel(0)
-	->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
-		'inline_public' => true,
-		'rename_property' => true,
-	])
-	->withSets([
-		NextcloudSets::NEXTCLOUD_25,
-	]);
+    ->withPaths([
+        $nextcloudDir . '/apps',
+        $nextcloudDir . '/core',
+        $nextcloudDir . '/ocs',
+        $nextcloudDir . '/ocs-provider',
+        $nextcloudDir . '/console.php',
+        $nextcloudDir . '/cron.php',
+        $nextcloudDir . '/index.php',
+        $nextcloudDir . '/occ',
+        $nextcloudDir . '/public.php',
+        $nextcloudDir . '/remote.php',
+        $nextcloudDir . '/status.php',
+        $nextcloudDir . '/version.php',
+        // $nextcloudDir . '/config',
+        // $nextcloudDir . '/lib',
+        // $nextcloudDir . '/tests',
+        // $nextcloudDir . '/themes',
+    ])
+    ->withSkip([
+        $nextcloudDir . '/apps/*/3rdparty/*',
+        $nextcloudDir . '/apps/*/build/stubs/*',
+        $nextcloudDir . '/apps/*/composer/*',
+        $nextcloudDir . '/apps/*/config/*',
+    ])
+    // uncomment to reach your current PHP version
+    // ->withPhpSets()
+    ->withImportNames(importShortClasses:false)
+    ->withTypeCoverageLevel(0)
+    ->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
+        'inline_public' => true,
+        'rename_property' => true,
+    ])
+    ->withSets([
+        NextcloudSets::NEXTCLOUD_25,
+    ]);
 
 $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
 
@@ -96,11 +96,11 @@ 
 $ignoredEntries = array_values($ignoredEntries);
 
 foreach ($ignoredEntries as $ignoredEntry) {
-	if (str_ends_with($ignoredEntry, '/')) {
-		$config->withSkip([$ignoredEntry . '*']);
-	} else {
-		$config->withSkip([$ignoredEntry . '/*']);
-	}
+    if (str_ends_with($ignoredEntry, '/')) {
+        $config->withSkip([$ignoredEntry . '*']);
+    } else {
+        $config->withSkip([$ignoredEntry . '/*']);
+    }
 }
 
 return $config;

Spacing +20 added lines, -20 removed lines

@@ -39,7 +39,7 @@ 
 			return true;
 		}
 		foreach ($this->namespacePrefixes as $prefix) {
-			if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) {
+			if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix.'\\')) {
 				// Import Nextcloud namespaces
 				return false;
 			}
@@ -51,28 +51,28 @@ 
 
 $config = RectorConfig::configure()
 	->withPaths([
-		$nextcloudDir . '/apps',
-		$nextcloudDir . '/core',
-		$nextcloudDir . '/ocs',
-		$nextcloudDir . '/ocs-provider',
-		$nextcloudDir . '/console.php',
-		$nextcloudDir . '/cron.php',
-		$nextcloudDir . '/index.php',
-		$nextcloudDir . '/occ',
-		$nextcloudDir . '/public.php',
-		$nextcloudDir . '/remote.php',
-		$nextcloudDir . '/status.php',
-		$nextcloudDir . '/version.php',
+		$nextcloudDir.'/apps',
+		$nextcloudDir.'/core',
+		$nextcloudDir.'/ocs',
+		$nextcloudDir.'/ocs-provider',
+		$nextcloudDir.'/console.php',
+		$nextcloudDir.'/cron.php',
+		$nextcloudDir.'/index.php',
+		$nextcloudDir.'/occ',
+		$nextcloudDir.'/public.php',
+		$nextcloudDir.'/remote.php',
+		$nextcloudDir.'/status.php',
+		$nextcloudDir.'/version.php',
 		// $nextcloudDir . '/config',
 		// $nextcloudDir . '/lib',
 		// $nextcloudDir . '/tests',
 		// $nextcloudDir . '/themes',
 	])
 	->withSkip([
-		$nextcloudDir . '/apps/*/3rdparty/*',
-		$nextcloudDir . '/apps/*/build/stubs/*',
-		$nextcloudDir . '/apps/*/composer/*',
-		$nextcloudDir . '/apps/*/config/*',
+		$nextcloudDir.'/apps/*/3rdparty/*',
+		$nextcloudDir.'/apps/*/build/stubs/*',
+		$nextcloudDir.'/apps/*/composer/*',
+		$nextcloudDir.'/apps/*/config/*',
 	])
 	// uncomment to reach your current PHP version
 	// ->withPhpSets()
@@ -89,7 +89,7 @@ 
 $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
 
 /* Ignore all files ignored by git */
-$ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg($nextcloudDir));
+$ignoredEntries = shell_exec('git status --porcelain --ignored '.escapeshellarg($nextcloudDir));
 $ignoredEntries = explode("\n", $ignoredEntries);
 $ignoredEntries = array_filter($ignoredEntries, static fn (string $line) => str_starts_with($line, '!! '));
 $ignoredEntries = array_map(static fn (string $line) => substr($line, 3), $ignoredEntries);
@@ -97,9 +97,9 @@ 
 
 foreach ($ignoredEntries as $ignoredEntry) {
 	if (str_ends_with($ignoredEntry, '/')) {
-		$config->withSkip([$ignoredEntry . '*']);
+		$config->withSkip([$ignoredEntry.'*']);
 	} else {
-		$config->withSkip([$ignoredEntry . '/*']);
+		$config->withSkip([$ignoredEntry.'/*']);
 	}
 }
 

remote.php

Indentation +113 added lines, -113 removed lines

@@ -28,47 +28,47 @@ 
 }
 
 function handleException(Exception|Error $e): void {
-	try {
-		$request = \OCP\Server::get(IRequest::class);
-		// in case the request content type is text/xml - we assume it's a WebDAV request
-		$isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
-		if ($isXmlContentType === 0) {
-			// fire up a simple server to properly process the exception
-			$server = new Server();
-			if (!($e instanceof RemoteException)) {
-				// we shall not log on RemoteException
-				$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OCP\Server::get(LoggerInterface::class)));
-			}
-			$server->on('beforeMethod:*', function () use ($e): void {
-				if ($e instanceof RemoteException) {
-					switch ($e->getCode()) {
-						case 503:
-							throw new ServiceUnavailable($e->getMessage());
-						case 404:
-							throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
-					}
-				}
-				$class = get_class($e);
-				$msg = $e->getMessage();
-				throw new ServiceUnavailable("$class: $msg");
-			});
-			$server->exec();
-		} else {
-			$statusCode = 500;
-			if ($e instanceof ServiceUnavailableException) {
-				$statusCode = 503;
-			}
-			if ($e instanceof RemoteException) {
-				// we shall not log on RemoteException
-				\OCP\Server::get(ITemplateManager::class)->printErrorPage($e->getMessage(), '', $e->getCode());
-			} else {
-				\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'remote','exception' => $e]);
-				\OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, $statusCode);
-			}
-		}
-	} catch (\Exception $e) {
-		\OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
-	}
+    try {
+        $request = \OCP\Server::get(IRequest::class);
+        // in case the request content type is text/xml - we assume it's a WebDAV request
+        $isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
+        if ($isXmlContentType === 0) {
+            // fire up a simple server to properly process the exception
+            $server = new Server();
+            if (!($e instanceof RemoteException)) {
+                // we shall not log on RemoteException
+                $server->addPlugin(new ExceptionLoggerPlugin('webdav', \OCP\Server::get(LoggerInterface::class)));
+            }
+            $server->on('beforeMethod:*', function () use ($e): void {
+                if ($e instanceof RemoteException) {
+                    switch ($e->getCode()) {
+                        case 503:
+                            throw new ServiceUnavailable($e->getMessage());
+                        case 404:
+                            throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
+                    }
+                }
+                $class = get_class($e);
+                $msg = $e->getMessage();
+                throw new ServiceUnavailable("$class: $msg");
+            });
+            $server->exec();
+        } else {
+            $statusCode = 500;
+            if ($e instanceof ServiceUnavailableException) {
+                $statusCode = 503;
+            }
+            if ($e instanceof RemoteException) {
+                // we shall not log on RemoteException
+                \OCP\Server::get(ITemplateManager::class)->printErrorPage($e->getMessage(), '', $e->getCode());
+            } else {
+                \OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'remote','exception' => $e]);
+                \OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, $statusCode);
+            }
+        }
+    } catch (\Exception $e) {
+        \OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
+    }
 }
 
 /**
@@ -76,81 +76,81 @@ 
  * @return string
  */
 function resolveService($service) {
-	$services = [
-		'webdav' => 'dav/appinfo/v1/webdav.php',
-		'dav' => 'dav/appinfo/v2/remote.php',
-		'caldav' => 'dav/appinfo/v1/caldav.php',
-		'calendar' => 'dav/appinfo/v1/caldav.php',
-		'carddav' => 'dav/appinfo/v1/carddav.php',
-		'contacts' => 'dav/appinfo/v1/carddav.php',
-		'files' => 'dav/appinfo/v1/webdav.php',
-		'direct' => 'dav/appinfo/v2/direct.php',
-	];
-	if (isset($services[$service])) {
-		return $services[$service];
-	}
-
-	return \OCP\Server::get(IConfig::class)->getAppValue('core', 'remote_' . $service);
+    $services = [
+        'webdav' => 'dav/appinfo/v1/webdav.php',
+        'dav' => 'dav/appinfo/v2/remote.php',
+        'caldav' => 'dav/appinfo/v1/caldav.php',
+        'calendar' => 'dav/appinfo/v1/caldav.php',
+        'carddav' => 'dav/appinfo/v1/carddav.php',
+        'contacts' => 'dav/appinfo/v1/carddav.php',
+        'files' => 'dav/appinfo/v1/webdav.php',
+        'direct' => 'dav/appinfo/v2/direct.php',
+    ];
+    if (isset($services[$service])) {
+        return $services[$service];
+    }
+
+    return \OCP\Server::get(IConfig::class)->getAppValue('core', 'remote_' . $service);
 }
 
 try {
-	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
-	// this policy with a softer one if debug mode is enabled.
-	header("Content-Security-Policy: default-src 'none';");
-
-	if (Util::needUpgrade()) {
-		// since the behavior of apps or remotes are unpredictable during
-		// an upgrade, return a 503 directly
-		throw new RemoteException('Service unavailable', 503);
-	}
-
-	$request = \OCP\Server::get(IRequest::class);
-	$pathInfo = $request->getPathInfo();
-	if ($pathInfo === false || $pathInfo === '') {
-		throw new RemoteException('Path not found', 404);
-	}
-	if (!$pos = strpos($pathInfo, '/', 1)) {
-		$pos = strlen($pathInfo);
-	}
-	$service = substr($pathInfo, 1, $pos - 1);
-
-	$file = resolveService($service);
-
-	if (is_null($file)) {
-		throw new RemoteException('Path not found', 404);
-	}
-
-	$file = ltrim($file, '/');
-
-	$parts = explode('/', $file, 2);
-	$app = $parts[0];
-
-	// Load all required applications
-	\OC::$REQUESTEDAPP = $app;
-	$appManager = \OCP\Server::get(IAppManager::class);
-	$appManager->loadApps(['authentication']);
-	$appManager->loadApps(['extended_authentication']);
-	$appManager->loadApps(['filesystem', 'logging']);
-
-	switch ($app) {
-		case 'core':
-			$file = OC::$SERVERROOT . '/' . $file;
-			break;
-		default:
-			if (!$appManager->isEnabledForUser($app)) {
-				throw new RemoteException('App not installed: ' . $app);
-			}
-			$appManager->loadApp($app);
-			$file = $appManager->getAppPath($app) . '/' . ($parts[1] ?? '');
-			break;
-	}
-	$baseuri = OC::$WEBROOT . '/remote.php/' . $service . '/';
-	require_once $file;
+    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
+    // this policy with a softer one if debug mode is enabled.
+    header("Content-Security-Policy: default-src 'none';");
+
+    if (Util::needUpgrade()) {
+        // since the behavior of apps or remotes are unpredictable during
+        // an upgrade, return a 503 directly
+        throw new RemoteException('Service unavailable', 503);
+    }
+
+    $request = \OCP\Server::get(IRequest::class);
+    $pathInfo = $request->getPathInfo();
+    if ($pathInfo === false || $pathInfo === '') {
+        throw new RemoteException('Path not found', 404);
+    }
+    if (!$pos = strpos($pathInfo, '/', 1)) {
+        $pos = strlen($pathInfo);
+    }
+    $service = substr($pathInfo, 1, $pos - 1);
+
+    $file = resolveService($service);
+
+    if (is_null($file)) {
+        throw new RemoteException('Path not found', 404);
+    }
+
+    $file = ltrim($file, '/');
+
+    $parts = explode('/', $file, 2);
+    $app = $parts[0];
+
+    // Load all required applications
+    \OC::$REQUESTEDAPP = $app;
+    $appManager = \OCP\Server::get(IAppManager::class);
+    $appManager->loadApps(['authentication']);
+    $appManager->loadApps(['extended_authentication']);
+    $appManager->loadApps(['filesystem', 'logging']);
+
+    switch ($app) {
+        case 'core':
+            $file = OC::$SERVERROOT . '/' . $file;
+            break;
+        default:
+            if (!$appManager->isEnabledForUser($app)) {
+                throw new RemoteException('App not installed: ' . $app);
+            }
+            $appManager->loadApp($app);
+            $file = $appManager->getAppPath($app) . '/' . ($parts[1] ?? '');
+            break;
+    }
+    $baseuri = OC::$WEBROOT . '/remote.php/' . $service . '/';
+    require_once $file;
 } catch (Exception $ex) {
-	handleException($ex);
+    handleException($ex);
 } catch (Error $e) {
-	handleException($e);
+    handleException($e);
 }

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
 use OCP\App\IAppManager;
@@ -27,7 +27,7 @@ 
 class RemoteException extends \Exception {
 }
 
-function handleException(Exception|Error $e): void {
+function handleException(Exception | Error $e): void {
 	try {
 		$request = \OCP\Server::get(IRequest::class);
 		// in case the request content type is text/xml - we assume it's a WebDAV request
@@ -39,7 +39,7 @@ 
 				// we shall not log on RemoteException
 				$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OCP\Server::get(LoggerInterface::class)));
 			}
-			$server->on('beforeMethod:*', function () use ($e): void {
+			$server->on('beforeMethod:*', function() use ($e): void {
 				if ($e instanceof RemoteException) {
 					switch ($e->getCode()) {
 						case 503:
@@ -62,7 +62,7 @@ 
 				// we shall not log on RemoteException
 				\OCP\Server::get(ITemplateManager::class)->printErrorPage($e->getMessage(), '', $e->getCode());
 			} else {
-				\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'remote','exception' => $e]);
+				\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'remote', 'exception' => $e]);
 				\OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, $statusCode);
 			}
 		}
@@ -90,11 +90,11 @@ 
 		return $services[$service];
 	}
 
-	return \OCP\Server::get(IConfig::class)->getAppValue('core', 'remote_' . $service);
+	return \OCP\Server::get(IConfig::class)->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
@@ -137,17 +137,17 @@ 
 
 	switch ($app) {
 		case 'core':
-			$file = OC::$SERVERROOT . '/' . $file;
+			$file = OC::$SERVERROOT.'/'.$file;
 			break;
 		default:
 			if (!$appManager->isEnabledForUser($app)) {
-				throw new RemoteException('App not installed: ' . $app);
+				throw new RemoteException('App not installed: '.$app);
 			}
 			$appManager->loadApp($app);
-			$file = $appManager->getAppPath($app) . '/' . ($parts[1] ?? '');
+			$file = $appManager->getAppPath($app).'/'.($parts[1] ?? '');
 			break;
 	}
-	$baseuri = OC::$WEBROOT . '/remote.php/' . $service . '/';
+	$baseuri = OC::$WEBROOT.'/remote.php/'.$service.'/';
 	require_once $file;
 } catch (Exception $ex) {
 	handleException($ex);

public.php

Indentation +74 added lines, -74 removed lines

@@ -21,83 +21,83 @@
 use Psr\Log\LoggerInterface;
 
 function resolveService(string $service): string {
-	$services = [
-		'webdav' => 'dav/appinfo/v1/publicwebdav.php',
-		'dav' => 'dav/appinfo/v2/publicremote.php',
-	];
-	if (isset($services[$service])) {
-		return $services[$service];
-	}
-
-	return Server::get(IConfig::class)->getAppValue('core', 'remote_' . $service);
+    $services = [
+        'webdav' => 'dav/appinfo/v1/publicwebdav.php',
+        'dav' => 'dav/appinfo/v2/publicremote.php',
+    ];
+    if (isset($services[$service])) {
+        return $services[$service];
+    }
+
+    return Server::get(IConfig::class)->getAppValue('core', 'remote_' . $service);
 }
 
 try {
-	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
-	// this policy with a softer one if debug mode is enabled.
-	header("Content-Security-Policy: default-src 'none';");
-
-	// Check if Nextcloud is in maintenance mode
-	if (Util::needUpgrade()) {
-		// since the behavior of apps or remotes are unpredictable during
-		// an upgrade, return a 503 directly
-		throw new \Exception('Service unavailable', 503);
-	}
-
-	$request = Server::get(IRequest::class);
-	$pathInfo = $request->getPathInfo();
-	if ($pathInfo === false || $pathInfo === '') {
-		throw new \Exception('Path not found', 404);
-	}
-
-	// Extract the service from the path
-	if (!$pos = strpos($pathInfo, '/', 1)) {
-		$pos = strlen($pathInfo);
-	}
-	$service = substr($pathInfo, 1, $pos - 1);
-
-	// Resolve the service to a file
-	$file = resolveService($service);
-	if (!$file) {
-		throw new \Exception('Path not found', 404);
-	}
-
-	// Extract the app from the service file
-	$file = ltrim($file, '/');
-	$parts = explode('/', $file, 2);
-	$app = $parts[0];
-
-	// Load all required applications
-	$appManager = Server::get(IAppManager::class);
-	\OC::$REQUESTEDAPP = $app;
-	$appManager->loadApps(['authentication']);
-	$appManager->loadApps(['extended_authentication']);
-	$appManager->loadApps(['filesystem', 'logging']);
-
-	// Check if the app is enabled
-	if (!$appManager->isEnabledForUser($app)) {
-		throw new \Exception('App not installed: ' . $app);
-	}
-
-	// Load the app
-	$appManager->loadApp($app);
-	OC_User::setIncognitoMode(true);
-
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
-	require_once $file;
+    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
+    // this policy with a softer one if debug mode is enabled.
+    header("Content-Security-Policy: default-src 'none';");
+
+    // Check if Nextcloud is in maintenance mode
+    if (Util::needUpgrade()) {
+        // since the behavior of apps or remotes are unpredictable during
+        // an upgrade, return a 503 directly
+        throw new \Exception('Service unavailable', 503);
+    }
+
+    $request = Server::get(IRequest::class);
+    $pathInfo = $request->getPathInfo();
+    if ($pathInfo === false || $pathInfo === '') {
+        throw new \Exception('Path not found', 404);
+    }
+
+    // Extract the service from the path
+    if (!$pos = strpos($pathInfo, '/', 1)) {
+        $pos = strlen($pathInfo);
+    }
+    $service = substr($pathInfo, 1, $pos - 1);
+
+    // Resolve the service to a file
+    $file = resolveService($service);
+    if (!$file) {
+        throw new \Exception('Path not found', 404);
+    }
+
+    // Extract the app from the service file
+    $file = ltrim($file, '/');
+    $parts = explode('/', $file, 2);
+    $app = $parts[0];
+
+    // Load all required applications
+    $appManager = Server::get(IAppManager::class);
+    \OC::$REQUESTEDAPP = $app;
+    $appManager->loadApps(['authentication']);
+    $appManager->loadApps(['extended_authentication']);
+    $appManager->loadApps(['filesystem', 'logging']);
+
+    // Check if the app is enabled
+    if (!$appManager->isEnabledForUser($app)) {
+        throw new \Exception('App not installed: ' . $app);
+    }
+
+    // Load the app
+    $appManager->loadApp($app);
+    OC_User::setIncognitoMode(true);
+
+    $baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+    require_once $file;
 } catch (Exception $ex) {
-	$status = 500;
-	if ($ex instanceof ServiceUnavailableException) {
-		$status = 503;
-	}
-	//show the user a detailed error page
-	Server::get(LoggerInterface::class)->error($ex->getMessage(), ['app' => 'public', 'exception' => $ex]);
-	Server::get(ITemplateManager::class)->printExceptionErrorPage($ex, $status);
+    $status = 500;
+    if ($ex instanceof ServiceUnavailableException) {
+        $status = 503;
+    }
+    //show the user a detailed error page
+    Server::get(LoggerInterface::class)->error($ex->getMessage(), ['app' => 'public', 'exception' => $ex]);
+    Server::get(ITemplateManager::class)->printExceptionErrorPage($ex, $status);
 } catch (Error $ex) {
-	//show the user a detailed error page
-	Server::get(LoggerInterface::class)->error($ex->getMessage(), ['app' => 'public', 'exception' => $ex]);
-	Server::get(ITemplateManager::class)->printExceptionErrorPage($ex, 500);
+    //show the user a detailed error page
+    Server::get(LoggerInterface::class)->error($ex->getMessage(), ['app' => 'public', 'exception' => $ex]);
+    Server::get(ITemplateManager::class)->printExceptionErrorPage($ex, 500);
 }

cron.php

Indentation +221 added lines, -221 removed lines

@@ -26,10 +26,10 @@ 
 use Psr\Log\LoggerInterface;
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+    require_once __DIR__ . '/lib/base.php';
 
-	if (isset($argv[1]) && ($argv[1] === '-h' || $argv[1] === '--help')) {
-		echo 'Description:
+    if (isset($argv[1]) && ($argv[1] === '-h' || $argv[1] === '--help')) {
+        echo 'Description:
   Run the background job routine
 
 Usage:
@@ -42,224 +42,224 @@ 
 Options:
   -h, --help                 Display this help message
   -v, --verbose              Output more information' . PHP_EOL;
-		exit(0);
-	}
-
-	if (Util::needUpgrade()) {
-		Server::get(LoggerInterface::class)->debug('Update required, skipping cron', ['app' => 'cron']);
-		exit;
-	}
-
-	$config = Server::get(IConfig::class);
-
-	if ($config->getSystemValueBool('maintenance', false)) {
-		Server::get(LoggerInterface::class)->debug('We are in maintenance mode, skipping cron', ['app' => 'cron']);
-		exit;
-	}
-
-	// Don't do anything if Nextcloud has not been installed
-	if (!$config->getSystemValueBool('installed', false)) {
-		exit(0);
-	}
-
-	// load all apps to get all api routes properly setup
-	Server::get(IAppManager::class)->loadApps();
-	Server::get(ISession::class)->close();
-
-	$verbose = isset($argv[1]) && ($argv[1] === '-v' || $argv[1] === '--verbose');
-
-	// initialize a dummy memory session
-	$session = new Memory();
-	$cryptoWrapper = Server::get(CryptoWrapper::class);
-	$session = $cryptoWrapper->wrapSession($session);
-	\OC::$server->setSession($session);
-
-	$logger = Server::get(LoggerInterface::class);
-	$appConfig = Server::get(IAppConfig::class);
-	$tempManager = Server::get(ITempManager::class);
-
-	$tempManager->cleanOld();
-
-	// Exit if background jobs are disabled!
-	$appMode = $appConfig->getValueString('core', 'backgroundjobs_mode', 'ajax');
-	if ($appMode === 'none') {
-		if (OC::$CLI) {
-			echo 'Background Jobs are disabled!' . PHP_EOL;
-		} else {
-			OC_JSON::error(['data' => ['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 https://www.php.net/manual/en/book.posix.php' . PHP_EOL;
-			exit(1);
-		}
-
-		$user = posix_getuid();
-		$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;
-			exit(1);
-		}
-
-
-		// We call Nextcloud from the CLI (aka cron)
-		if ($appMode !== 'cron') {
-			$appConfig->setValueString('core', 'backgroundjobs_mode', 'cron');
-		}
-
-		// a specific job class list can optionally be given as argument
-		$jobClasses = array_slice($argv, $verbose ? 2 : 1);
-		$jobClasses = empty($jobClasses) ? null : $jobClasses;
-
-		// Low-load hours
-		$onlyTimeSensitive = false;
-		$startHour = $config->getSystemValueInt('maintenance_window_start', 100);
-		if ($jobClasses === null && $startHour <= 23) {
-			$date = new \DateTime('now', new \DateTimeZone('UTC'));
-			$currentHour = (int)$date->format('G');
-			$endHour = $startHour + 4;
-
-			if ($startHour <= 20) {
-				// Start time: 01:00
-				// End time: 05:00
-				// Only run sensitive tasks when it's before the start or after the end
-				$onlyTimeSensitive = $currentHour < $startHour || $currentHour > $endHour;
-			} else {
-				// Start time: 23:00
-				// End time: 03:00
-				$endHour -= 24; // Correct the end time from 27:00 to 03:00
-				// Only run sensitive tasks when it's after the end and before the start
-				$onlyTimeSensitive = $currentHour > $endHour && $currentHour < $startHour;
-			}
-		}
-
-		// Work
-		$jobList = Server::get(IJobList::class);
-
-		// We only ask for jobs for 14 minutes, because after 5 minutes the next
-		// system cron task should spawn and we want to have at most three
-		// cron jobs running in parallel.
-		$endTime = time() + 14 * 60;
-
-		$executedJobs = [];
-
-		while ($job = $jobList->getNext($onlyTimeSensitive, $jobClasses)) {
-			if (isset($executedJobs[$job->getId()])) {
-				$jobList->unlockJob($job);
-				break;
-			}
-
-			$jobDetails = get_class($job) . ' (id: ' . $job->getId() . ', arguments: ' . json_encode($job->getArgument()) . ')';
-			$logger->debug('CLI cron call has selected job ' . $jobDetails, ['app' => 'cron']);
-
-			$timeBefore = time();
-			$memoryBefore = memory_get_usage();
-			$memoryPeakBefore = memory_get_peak_usage();
-
-			if ($verbose) {
-				echo 'Starting job ' . $jobDetails . PHP_EOL;
-			}
-
-			/** @psalm-suppress DeprecatedMethod Calling execute until it is removed, then will switch to start */
-			$job->execute($jobList);
-
-			$timeAfter = time();
-			$memoryAfter = memory_get_usage();
-			$memoryPeakAfter = memory_get_peak_usage();
-
-			$cronInterval = 5 * 60;
-			$timeSpent = $timeAfter - $timeBefore;
-			if ($timeSpent > $cronInterval) {
-				$logLevel = match (true) {
-					$timeSpent > $cronInterval * 128 => ILogger::FATAL,
-					$timeSpent > $cronInterval * 64 => ILogger::ERROR,
-					$timeSpent > $cronInterval * 16 => ILogger::WARN,
-					$timeSpent > $cronInterval * 8 => ILogger::INFO,
-					default => ILogger::DEBUG,
-				};
-				$logger->log(
-					$logLevel,
-					'Background job ' . $jobDetails . ' ran for ' . $timeSpent . ' seconds',
-					['app' => 'cron']
-				);
-			}
-
-			if ($memoryAfter - $memoryBefore > 50_000_000) {
-				$message = 'Used memory grew by more than 50 MB when executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryAfter) . ' (before: ' . Util::humanFileSize($memoryBefore) . ')';
-				$logger->warning($message, ['app' => 'cron']);
-				if ($verbose) {
-					echo $message . PHP_EOL;
-				}
-			}
-			if ($memoryPeakAfter > 300_000_000 && $memoryPeakBefore <= 300_000_000) {
-				$message = 'Cron job used more than 300 MB of ram after executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryPeakAfter) . ' (before: ' . Util::humanFileSize($memoryPeakBefore) . ')';
-				$logger->warning($message, ['app' => 'cron']);
-				if ($verbose) {
-					echo $message . PHP_EOL;
-				}
-			}
-
-			// clean up after unclean jobs
-			Server::get(SetupManager::class)->tearDown();
-			$tempManager->clean();
-
-			if ($verbose) {
-				echo 'Job ' . $jobDetails . ' done in ' . ($timeAfter - $timeBefore) . ' seconds' . PHP_EOL;
-			}
-
-			$jobList->setLastJob($job);
-			$executedJobs[$job->getId()] = true;
-			unset($job);
-
-			if ($timeAfter > $endTime) {
-				break;
-			}
-		}
-	} else {
-		// We call cron.php from some website
-		if ($appMode === 'cron') {
-			// Cron is cron :-P
-			OC_JSON::error(['data' => ['message' => 'Backgroundjobs are using system cron!']]);
-		} else {
-			// Work and success :-)
-			$jobList = Server::get(IJobList::class);
-			$job = $jobList->getNext();
-			if ($job != null) {
-				$logger->debug('WebCron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']);
-				/** @psalm-suppress DeprecatedMethod Calling execute until it is removed, then will switch to start */
-				$job->execute($jobList);
-				$jobList->setLastJob($job);
-			}
-			OC_JSON::success();
-		}
-	}
-
-	// Log the successful cron execution
-	$appConfig->setValueInt('core', 'lastcron', time());
-	exit();
+        exit(0);
+    }
+
+    if (Util::needUpgrade()) {
+        Server::get(LoggerInterface::class)->debug('Update required, skipping cron', ['app' => 'cron']);
+        exit;
+    }
+
+    $config = Server::get(IConfig::class);
+
+    if ($config->getSystemValueBool('maintenance', false)) {
+        Server::get(LoggerInterface::class)->debug('We are in maintenance mode, skipping cron', ['app' => 'cron']);
+        exit;
+    }
+
+    // Don't do anything if Nextcloud has not been installed
+    if (!$config->getSystemValueBool('installed', false)) {
+        exit(0);
+    }
+
+    // load all apps to get all api routes properly setup
+    Server::get(IAppManager::class)->loadApps();
+    Server::get(ISession::class)->close();
+
+    $verbose = isset($argv[1]) && ($argv[1] === '-v' || $argv[1] === '--verbose');
+
+    // initialize a dummy memory session
+    $session = new Memory();
+    $cryptoWrapper = Server::get(CryptoWrapper::class);
+    $session = $cryptoWrapper->wrapSession($session);
+    \OC::$server->setSession($session);
+
+    $logger = Server::get(LoggerInterface::class);
+    $appConfig = Server::get(IAppConfig::class);
+    $tempManager = Server::get(ITempManager::class);
+
+    $tempManager->cleanOld();
+
+    // Exit if background jobs are disabled!
+    $appMode = $appConfig->getValueString('core', 'backgroundjobs_mode', 'ajax');
+    if ($appMode === 'none') {
+        if (OC::$CLI) {
+            echo 'Background Jobs are disabled!' . PHP_EOL;
+        } else {
+            OC_JSON::error(['data' => ['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 https://www.php.net/manual/en/book.posix.php' . PHP_EOL;
+            exit(1);
+        }
+
+        $user = posix_getuid();
+        $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;
+            exit(1);
+        }
+
+
+        // We call Nextcloud from the CLI (aka cron)
+        if ($appMode !== 'cron') {
+            $appConfig->setValueString('core', 'backgroundjobs_mode', 'cron');
+        }
+
+        // a specific job class list can optionally be given as argument
+        $jobClasses = array_slice($argv, $verbose ? 2 : 1);
+        $jobClasses = empty($jobClasses) ? null : $jobClasses;
+
+        // Low-load hours
+        $onlyTimeSensitive = false;
+        $startHour = $config->getSystemValueInt('maintenance_window_start', 100);
+        if ($jobClasses === null && $startHour <= 23) {
+            $date = new \DateTime('now', new \DateTimeZone('UTC'));
+            $currentHour = (int)$date->format('G');
+            $endHour = $startHour + 4;
+
+            if ($startHour <= 20) {
+                // Start time: 01:00
+                // End time: 05:00
+                // Only run sensitive tasks when it's before the start or after the end
+                $onlyTimeSensitive = $currentHour < $startHour || $currentHour > $endHour;
+            } else {
+                // Start time: 23:00
+                // End time: 03:00
+                $endHour -= 24; // Correct the end time from 27:00 to 03:00
+                // Only run sensitive tasks when it's after the end and before the start
+                $onlyTimeSensitive = $currentHour > $endHour && $currentHour < $startHour;
+            }
+        }
+
+        // Work
+        $jobList = Server::get(IJobList::class);
+
+        // We only ask for jobs for 14 minutes, because after 5 minutes the next
+        // system cron task should spawn and we want to have at most three
+        // cron jobs running in parallel.
+        $endTime = time() + 14 * 60;
+
+        $executedJobs = [];
+
+        while ($job = $jobList->getNext($onlyTimeSensitive, $jobClasses)) {
+            if (isset($executedJobs[$job->getId()])) {
+                $jobList->unlockJob($job);
+                break;
+            }
+
+            $jobDetails = get_class($job) . ' (id: ' . $job->getId() . ', arguments: ' . json_encode($job->getArgument()) . ')';
+            $logger->debug('CLI cron call has selected job ' . $jobDetails, ['app' => 'cron']);
+
+            $timeBefore = time();
+            $memoryBefore = memory_get_usage();
+            $memoryPeakBefore = memory_get_peak_usage();
+
+            if ($verbose) {
+                echo 'Starting job ' . $jobDetails . PHP_EOL;
+            }
+
+            /** @psalm-suppress DeprecatedMethod Calling execute until it is removed, then will switch to start */
+            $job->execute($jobList);
+
+            $timeAfter = time();
+            $memoryAfter = memory_get_usage();
+            $memoryPeakAfter = memory_get_peak_usage();
+
+            $cronInterval = 5 * 60;
+            $timeSpent = $timeAfter - $timeBefore;
+            if ($timeSpent > $cronInterval) {
+                $logLevel = match (true) {
+                    $timeSpent > $cronInterval * 128 => ILogger::FATAL,
+                    $timeSpent > $cronInterval * 64 => ILogger::ERROR,
+                    $timeSpent > $cronInterval * 16 => ILogger::WARN,
+                    $timeSpent > $cronInterval * 8 => ILogger::INFO,
+                    default => ILogger::DEBUG,
+                };
+                $logger->log(
+                    $logLevel,
+                    'Background job ' . $jobDetails . ' ran for ' . $timeSpent . ' seconds',
+                    ['app' => 'cron']
+                );
+            }
+
+            if ($memoryAfter - $memoryBefore > 50_000_000) {
+                $message = 'Used memory grew by more than 50 MB when executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryAfter) . ' (before: ' . Util::humanFileSize($memoryBefore) . ')';
+                $logger->warning($message, ['app' => 'cron']);
+                if ($verbose) {
+                    echo $message . PHP_EOL;
+                }
+            }
+            if ($memoryPeakAfter > 300_000_000 && $memoryPeakBefore <= 300_000_000) {
+                $message = 'Cron job used more than 300 MB of ram after executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryPeakAfter) . ' (before: ' . Util::humanFileSize($memoryPeakBefore) . ')';
+                $logger->warning($message, ['app' => 'cron']);
+                if ($verbose) {
+                    echo $message . PHP_EOL;
+                }
+            }
+
+            // clean up after unclean jobs
+            Server::get(SetupManager::class)->tearDown();
+            $tempManager->clean();
+
+            if ($verbose) {
+                echo 'Job ' . $jobDetails . ' done in ' . ($timeAfter - $timeBefore) . ' seconds' . PHP_EOL;
+            }
+
+            $jobList->setLastJob($job);
+            $executedJobs[$job->getId()] = true;
+            unset($job);
+
+            if ($timeAfter > $endTime) {
+                break;
+            }
+        }
+    } else {
+        // We call cron.php from some website
+        if ($appMode === 'cron') {
+            // Cron is cron :-P
+            OC_JSON::error(['data' => ['message' => 'Backgroundjobs are using system cron!']]);
+        } else {
+            // Work and success :-)
+            $jobList = Server::get(IJobList::class);
+            $job = $jobList->getNext();
+            if ($job != null) {
+                $logger->debug('WebCron call has selected job with ID ' . strval($job->getId()), ['app' => 'cron']);
+                /** @psalm-suppress DeprecatedMethod Calling execute until it is removed, then will switch to start */
+                $job->execute($jobList);
+                $jobList->setLastJob($job);
+            }
+            OC_JSON::success();
+        }
+    }
+
+    // Log the successful cron execution
+    $appConfig->setValueInt('core', 'lastcron', time());
+    exit();
 } catch (Exception $ex) {
-	Server::get(LoggerInterface::class)->error(
-		$ex->getMessage(),
-		['app' => 'cron', 'exception' => $ex]
-	);
-	echo $ex . PHP_EOL;
-	exit(1);
+    Server::get(LoggerInterface::class)->error(
+        $ex->getMessage(),
+        ['app' => 'cron', 'exception' => $ex]
+    );
+    echo $ex . PHP_EOL;
+    exit(1);
 } catch (Error $ex) {
-	Server::get(LoggerInterface::class)->error(
-		$ex->getMessage(),
-		['app' => 'cron', 'exception' => $ex]
-	);
-	echo $ex . PHP_EOL;
-	exit(1);
+    Server::get(LoggerInterface::class)->error(
+        $ex->getMessage(),
+        ['app' => 'cron', 'exception' => $ex]
+    );
+    echo $ex . PHP_EOL;
+    exit(1);
 }

ocs/v1.php

Indentation +33 added lines, -33 removed lines

@@ -29,11 +29,11 @@ 
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
 if (Util::needUpgrade()
-	|| Server::get(IConfig::class)->getSystemValueBool('maintenance')) {
-	// since the behavior of apps or remotes are unpredictable during
-	// an upgrade, return a 503 directly
-	ApiHelper::respond(503, 'Service unavailable', ['X-Nextcloud-Maintenance-Mode' => '1'], 503);
-	exit;
+    || Server::get(IConfig::class)->getSystemValueBool('maintenance')) {
+    // since the behavior of apps or remotes are unpredictable during
+    // an upgrade, return a 503 directly
+    ApiHelper::respond(503, 'Service unavailable', ['X-Nextcloud-Maintenance-Mode' => '1'], 503);
+    exit;
 }
 
 
@@ -41,41 +41,41 @@ 
  * Try the appframework routes
  */
 try {
-	OC_App::loadApps(['session']);
-	OC_App::loadApps(['authentication']);
-	OC_App::loadApps(['extended_authentication']);
+    OC_App::loadApps(['session']);
+    OC_App::loadApps(['authentication']);
+    OC_App::loadApps(['extended_authentication']);
 
-	// load all apps to get all api routes properly setup
-	// FIXME: this should ideally appear after handleLogin but will cause
-	// side effects in existing apps
-	OC_App::loadApps();
+    // load all apps to get all api routes properly setup
+    // FIXME: this should ideally appear after handleLogin but will cause
+    // side effects in existing apps
+    OC_App::loadApps();
 
-	if (!Server::get(IUserSession::class)->isLoggedIn()) {
-		OC::handleLogin(Server::get(IRequest::class));
-	}
+    if (!Server::get(IUserSession::class)->isLoggedIn()) {
+        OC::handleLogin(Server::get(IRequest::class));
+    }
 
-	Server::get(Router::class)->match('/ocsapp' . Server::get(IRequest::class)->getRawPathInfo());
+    Server::get(Router::class)->match('/ocsapp' . Server::get(IRequest::class)->getRawPathInfo());
 } catch (MaxDelayReached $ex) {
-	ApiHelper::respond(Http::STATUS_TOO_MANY_REQUESTS, $ex->getMessage());
+    ApiHelper::respond(Http::STATUS_TOO_MANY_REQUESTS, $ex->getMessage());
 } catch (ResourceNotFoundException $e) {
-	$txt = 'Invalid query, please check the syntax. API specifications are here:'
-		. ' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.' . "\n";
-	ApiHelper::respond(OCSController::RESPOND_NOT_FOUND, $txt);
+    $txt = 'Invalid query, please check the syntax. API specifications are here:'
+        . ' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.' . "\n";
+    ApiHelper::respond(OCSController::RESPOND_NOT_FOUND, $txt);
 } catch (MethodNotAllowedException $e) {
-	ApiHelper::setContentType();
-	http_response_code(405);
+    ApiHelper::setContentType();
+    http_response_code(405);
 } catch (LoginException $e) {
-	ApiHelper::respond(OCSController::RESPOND_UNAUTHORISED, 'Unauthorised');
+    ApiHelper::respond(OCSController::RESPOND_UNAUTHORISED, 'Unauthorised');
 } catch (\Exception $e) {
-	Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+    Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
 
-	$txt = 'Internal Server Error' . "\n";
-	try {
-		if (Server::get(SystemConfig::class)->getValue('debug', false)) {
-			$txt .= $e->getMessage();
-		}
-	} catch (\Throwable $e) {
-		// Just to be save
-	}
-	ApiHelper::respond(OCSController::RESPOND_SERVER_ERROR, $txt);
+    $txt = 'Internal Server Error' . "\n";
+    try {
+        if (Server::get(SystemConfig::class)->getValue('debug', false)) {
+            $txt .= $e->getMessage();
+        }
+    } catch (\Throwable $e) {
+        // Just to be save
+    }
+    ApiHelper::respond(OCSController::RESPOND_SERVER_ERROR, $txt);
 }

Spacing +5 added lines, -5 removed lines

@@ -16,8 +16,8 @@ 
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-require_once __DIR__ . '/../lib/versioncheck.php';
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/base.php';
 
 use OC\OCS\ApiHelper;
 use OCP\AppFramework\Http;
@@ -54,12 +54,12 @@ 
 		OC::handleLogin(Server::get(IRequest::class));
 	}
 
-	Server::get(Router::class)->match('/ocsapp' . Server::get(IRequest::class)->getRawPathInfo());
+	Server::get(Router::class)->match('/ocsapp'.Server::get(IRequest::class)->getRawPathInfo());
 } catch (MaxDelayReached $ex) {
 	ApiHelper::respond(Http::STATUS_TOO_MANY_REQUESTS, $ex->getMessage());
 } catch (ResourceNotFoundException $e) {
 	$txt = 'Invalid query, please check the syntax. API specifications are here:'
-		. ' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.' . "\n";
+		. ' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
 	ApiHelper::respond(OCSController::RESPOND_NOT_FOUND, $txt);
 } catch (MethodNotAllowedException $e) {
 	ApiHelper::setContentType();
@@ -69,7 +69,7 @@ 
 } catch (\Exception $e) {
 	Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
 
-	$txt = 'Internal Server Error' . "\n";
+	$txt = 'Internal Server Error'."\n";
 	try {
 		if (Server::get(SystemConfig::class)->getValue('debug', false)) {
 			$txt .= $e->getMessage();

ocs/providers.php

Spacing +3 added lines, -3 removed lines

@@ -8,14 +8,14 @@
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-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 = Server::get(IRequest::class);
 
-$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');

console.php

Indentation +82 added lines, -82 removed lines

@@ -23,90 +23,90 @@
 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';
-
-	// 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);
-	}
-
-	$config = Server::get(IConfig::class);
-	set_exception_handler('exceptionHandler');
-
-	if (!function_exists('posix_getuid')) {
-		echo 'The posix extensions are required - see https://www.php.net/manual/en/book.posix.php' . PHP_EOL;
-		exit(1);
-	}
-
-	$user = posix_getuid();
-	$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;
-		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;
-	} 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;
-		exit(1);
-	}
-
-	if (!(function_exists('pcntl_signal') && function_exists('pcntl_signal_dispatch')) && !in_array('--no-warnings', $argv)) {
-		echo 'The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php' . PHP_EOL;
-		echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini." . PHP_EOL;
-	}
-
-	$eventLogger = Server::get(IEventLogger::class);
-	$eventLogger->start('console:build_application', 'Build Application instance and load commands');
-
-	$application = Server::get(Application::class);
-	/* base.php will have removed eventual debug options from argv in $_SERVER */
-	$argv = $_SERVER['argv'];
-	$input = new ArgvInput($argv);
-	$application->loadCommands($input, new ConsoleOutput());
-
-	$eventLogger->end('console:build_application');
-	$eventLogger->start('console:run', 'Run the command');
-
-	$application->setAutoExit(false);
-	$exitCode = $application->run($input);
-
-	$eventLogger->end('console:run');
-
-	$profiler = Server::get(IProfiler::class);
-	if ($profiler->isEnabled()) {
-		$eventLogger->end('runtime');
-		$profile = $profiler->collect(Server::get(IRequest::class), new Response());
-		$profile->setMethod('occ');
-		$profile->setUrl(implode(' ', $argv));
-		$profiler->saveProfile($profile);
-	}
-
-	if ($exitCode > 255) {
-		$exitCode = 255;
-	}
-
-	exit($exitCode);
+    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);
+    }
+
+    if (!OC::$CLI) {
+        echo 'This script can be run from the command line only' . PHP_EOL;
+        exit(1);
+    }
+
+    $config = Server::get(IConfig::class);
+    set_exception_handler('exceptionHandler');
+
+    if (!function_exists('posix_getuid')) {
+        echo 'The posix extensions are required - see https://www.php.net/manual/en/book.posix.php' . PHP_EOL;
+        exit(1);
+    }
+
+    $user = posix_getuid();
+    $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;
+        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;
+    } 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;
+        exit(1);
+    }
+
+    if (!(function_exists('pcntl_signal') && function_exists('pcntl_signal_dispatch')) && !in_array('--no-warnings', $argv)) {
+        echo 'The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php' . PHP_EOL;
+        echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini." . PHP_EOL;
+    }
+
+    $eventLogger = Server::get(IEventLogger::class);
+    $eventLogger->start('console:build_application', 'Build Application instance and load commands');
+
+    $application = Server::get(Application::class);
+    /* base.php will have removed eventual debug options from argv in $_SERVER */
+    $argv = $_SERVER['argv'];
+    $input = new ArgvInput($argv);
+    $application->loadCommands($input, new ConsoleOutput());
+
+    $eventLogger->end('console:build_application');
+    $eventLogger->start('console:run', 'Run the command');
+
+    $application->setAutoExit(false);
+    $exitCode = $application->run($input);
+
+    $eventLogger->end('console:run');
+
+    $profiler = Server::get(IProfiler::class);
+    if ($profiler->isEnabled()) {
+        $eventLogger->end('runtime');
+        $profile = $profiler->collect(Server::get(IRequest::class), new Response());
+        $profile->setMethod('occ');
+        $profile->setUrl(implode(' ', $argv));
+        $profiler->saveProfile($profile);
+    }
+
+    if ($exitCode > 255) {
+        $exitCode = 255;
+    }
+
+    exit($exitCode);
 } catch (Exception $ex) {
-	exceptionHandler($ex);
+    exceptionHandler($ex);
 } catch (Error $ex) {
-	exceptionHandler($ex);
+    exceptionHandler($ex);
 }

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OC\Console\Application;
 use OCP\AppFramework\Http\Response;
@@ -23,12 +23,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) {
@@ -36,7 +36,7 @@ 
 	}
 
 	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);
 	}
 
@@ -44,34 +44,34 @@ 
 	set_exception_handler('exceptionHandler');
 
 	if (!function_exists('posix_getuid')) {
-		echo 'The posix extensions are required - see https://www.php.net/manual/en/book.posix.php' . PHP_EOL;
+		echo 'The posix extensions are required - see https://www.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') && function_exists('pcntl_signal_dispatch')) && !in_array('--no-warnings', $argv)) {
-		echo 'The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php' . PHP_EOL;
-		echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini." . PHP_EOL;
+		echo 'The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php'.PHP_EOL;
+		echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini.".PHP_EOL;
 	}
 
 	$eventLogger = Server::get(IEventLogger::class);