1 files changed, 30 insertions, 25 deletions

diff --git a/remote.php b/remote.php
index e5d4c85db20..2cfd9d818c8 100644
--- a/remote.php
+++ b/remote.php
@@ -1,5 +1,9 @@
 <?php
 
+use OC\ServiceUnavailableException;
+use OCP\IConfig;
+use OCP\Util;
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +12,9 @@
 require_once __DIR__ . '/lib/versioncheck.php';
 
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
+use OCP\App\IAppManager;
+use OCP\IRequest;
+use OCP\Template\ITemplateManager;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Exception\ServiceUnavailable;
 use Sabre\DAV\Server;
@@ -17,15 +24,12 @@ use Sabre\DAV\Server;
  * Dummy exception class to be use locally to identify certain conditions
  * Will not be logged to avoid DoS
  */
-class RemoteException extends Exception {
+class RemoteException extends \Exception {
 }
 
-/**
- * @param Exception|Error $e
- */
-function handleException($e) {
+function handleException(Exception|Error $e): void {
 	try {
-		$request = \OC::$server->getRequest();
+		$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) {
@@ -33,9 +37,9 @@ function handleException($e) {
 			$server = new Server();
 			if (!($e instanceof RemoteException)) {
 				// we shall not log on RemoteException
-				$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->get(LoggerInterface::class)));
+				$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OCP\Server::get(LoggerInterface::class)));
 			}
-			$server->on('beforeMethod:*', function () use ($e) {
+			$server->on('beforeMethod:*', function () use ($e): void {
 				if ($e instanceof RemoteException) {
 					switch ($e->getCode()) {
 						case 503:
@@ -51,24 +55,24 @@ function handleException($e) {
 			$server->exec();
 		} else {
 			$statusCode = 500;
-			if ($e instanceof \OC\ServiceUnavailableException) {
+			if ($e instanceof ServiceUnavailableException) {
 				$statusCode = 503;
 			}
 			if ($e instanceof RemoteException) {
 				// we shall not log on RemoteException
-				OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
+				\OCP\Server::get(ITemplateManager::class)->printErrorPage($e->getMessage(), '', $e->getCode());
 			} else {
-				\OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'remote','exception' => $e]);
-				OC_Template::printExceptionErrorPage($e, $statusCode);
+				\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'remote','exception' => $e]);
+				\OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, $statusCode);
 			}
 		}
 	} catch (\Exception $e) {
-		OC_Template::printExceptionErrorPage($e, 500);
+		\OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
 	}
 }
 
 /**
- * @param $service
+ * @param string $service
  * @return string
  */
 function resolveService($service) {
@@ -86,7 +90,7 @@ function resolveService($service) {
 		return $services[$service];
 	}
 
-	return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+	return \OCP\Server::get(IConfig::class)->getAppValue('core', 'remote_' . $service);
 }
 
 try {
@@ -97,13 +101,13 @@ try {
 	// this policy with a softer one if debug mode is enabled.
 	header("Content-Security-Policy: default-src 'none';");
 
-	if (\OCP\Util::needUpgrade()) {
+	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 = \OC::$server->getRequest();
+	$request = \OCP\Server::get(IRequest::class);
 	$pathInfo = $request->getPathInfo();
 	if ($pathInfo === false || $pathInfo === '') {
 		throw new RemoteException('Path not found', 404);
@@ -126,23 +130,24 @@ try {
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(['authentication']);
-	OC_App::loadApps(['extended_authentication']);
-	OC_App::loadApps(['filesystem', 'logging']);
+	$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;
+			$file = OC::$SERVERROOT . '/' . $file;
 			break;
 		default:
-			if (!\OC::$server->getAppManager()->isInstalled($app)) {
+			if (!$appManager->isEnabledForUser($app)) {
 				throw new RemoteException('App not installed: ' . $app);
 			}
-			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
+			$appManager->loadApp($app);
+			$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);