nextcloud / server

index.php

Indentation +45 added lines, -45 removed lines

@@ -32,59 +32,59 @@
 require_once __DIR__ . '/lib/versioncheck.php';
 
 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, ['app' => 'index']);
+    \OC::$server->getLogger()->logException($ex, ['app' => 'index']);
 
-	//show the user a detailed error page
-	OC_Template::printExceptionErrorPage($ex, 503);
+    //show the user a detailed error page
+    OC_Template::printExceptionErrorPage($ex, 503);
 } catch (\OC\HintException $ex) {
-	try {
-		OC_Template::printErrorPage($ex->getMessage(), $ex->getHint(), 503);
-	} catch (Exception $ex2) {
-		try {
-			\OC::$server->getLogger()->logException($ex, ['app' => 'index']);
-			\OC::$server->getLogger()->logException($ex2, ['app' => 'index']);
-		} catch (Throwable $e) {
-			// no way to log it properly - but to avoid a white page of death we try harder and ignore this one here
-		}
+    try {
+        OC_Template::printErrorPage($ex->getMessage(), $ex->getHint(), 503);
+    } catch (Exception $ex2) {
+        try {
+            \OC::$server->getLogger()->logException($ex, ['app' => 'index']);
+            \OC::$server->getLogger()->logException($ex2, ['app' => 'index']);
+        } catch (Throwable $e) {
+            // no way to log it properly - but to avoid a white page of death we try harder and ignore this one here
+        }
 
-		//show the user a detailed error page
-		OC_Template::printExceptionErrorPage($ex, 500);
-	}
+        //show the user a detailed error page
+        OC_Template::printExceptionErrorPage($ex, 500);
+    }
 } catch (\OC\User\LoginException $ex) {
-	$request = \OC::$server->getRequest();
-	/**
-	 * Routes with the @CORS annotation and other API endpoints should
-	 * not return a webpage, so we only print the error page when html is accepted,
-	 * otherwise we reply with a JSON array like the SecurityMiddleware would do.
-	 */
-	if (stripos($request->getHeader('Accept'),'html') === false) {
-		http_response_code(401);
-		header('Content-Type: application/json; charset=utf-8');
-		echo json_encode(['message' => $ex->getMessage()]);
-		exit();
-	}
-	OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage(), 401);
+    $request = \OC::$server->getRequest();
+    /**
+     * Routes with the @CORS annotation and other API endpoints should
+     * not return a webpage, so we only print the error page when html is accepted,
+     * otherwise we reply with a JSON array like the SecurityMiddleware would do.
+     */
+    if (stripos($request->getHeader('Accept'),'html') === false) {
+        http_response_code(401);
+        header('Content-Type: application/json; charset=utf-8');
+        echo json_encode(['message' => $ex->getMessage()]);
+        exit();
+    }
+    OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage(), 401);
 } catch (Exception $ex) {
-	\OC::$server->getLogger()->logException($ex, ['app' => 'index']);
+    \OC::$server->getLogger()->logException($ex, ['app' => 'index']);
 
-	//show the user a detailed error page
-	OC_Template::printExceptionErrorPage($ex, 500);
+    //show the user a detailed error page
+    OC_Template::printExceptionErrorPage($ex, 500);
 } catch (Error $ex) {
-	try {
-		\OC::$server->getLogger()->logException($ex, ['app' => 'index']);
-	} catch (Error $e) {
-		http_response_code(500);
-		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");
+    try {
+        \OC::$server->getLogger()->logException($ex, ['app' => 'index']);
+    } catch (Error $e) {
+        http_response_code(500);
+        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 $ex;
-	}
-	OC_Template::printExceptionErrorPage($ex, 500);
+        throw $ex;
+    }
+    OC_Template::printExceptionErrorPage($ex, 500);
 }

Spacing +3 added lines, -3 removed lines

@@ -29,10 +29,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';
 
 	OC::handleRequest();
 } catch (\OC\ServiceUnavailableException $ex) {
@@ -61,7 +61,7 @@ 
 	 * not return a webpage, so we only print the error page when html is accepted,
 	 * otherwise we reply with a JSON array like the SecurityMiddleware would do.
 	 */
-	if (stripos($request->getHeader('Accept'),'html') === false) {
+	if (stripos($request->getHeader('Accept'), 'html') === false) {
 		http_response_code(401);
 		header('Content-Type: application/json; charset=utf-8');
 		echo json_encode(['message' => $ex->getMessage()]);