nextcloud / server

ocs/v1.php

Indentation +40 added lines, -40 removed lines

@@ -33,13 +33,13 @@ 
 require_once __DIR__ . '/../lib/base.php';
 
 if (\OCP\Util::needUpgrade()
-	|| \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
-	// since the behavior of apps or remotes are unpredictable during
-	// an upgrade, return a 503 directly
-	http_response_code(503);
-	$response = new \OC\OCS\Result(null, OC_Response::STATUS_SERVICE_UNAVAILABLE, 'Service unavailable');
-	OC_API::respond($response, OC_API::requestedFormat());
-	exit;
+    || \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
+    // since the behavior of apps or remotes are unpredictable during
+    // an upgrade, return a 503 directly
+    http_response_code(503);
+    $response = new \OC\OCS\Result(null, OC_Response::STATUS_SERVICE_UNAVAILABLE, 'Service unavailable');
+    OC_API::respond($response, OC_API::requestedFormat());
+    exit;
 }
 
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -50,57 +50,57 @@ 
  * We first try the old routes since the appframework triggers more login stuff.
  */
 try {
-	OC_App::loadApps(['session']);
-	OC_App::loadApps(['authentication']);
-	// load all apps to get all api routes properly setup
-	OC_App::loadApps();
+    OC_App::loadApps(['session']);
+    OC_App::loadApps(['authentication']);
+    // load all apps to get all api routes properly setup
+    OC_App::loadApps();
 
-	OC::$server->getRouter()->match('/ocs'.\OC::$server->getRequest()->getRawPathInfo());
+    OC::$server->getRouter()->match('/ocs'.\OC::$server->getRequest()->getRawPathInfo());
 
-	sleep(1);
-	OC::$server->getLogger()->info('This uses an old OCP\API::register construct. This will be removed in a future version of Nextcloud. Please migrate to the OCSController');
+    sleep(1);
+    OC::$server->getLogger()->info('This uses an old OCP\API::register construct. This will be removed in a future version of Nextcloud. Please migrate to the OCSController');
 
-	return;
+    return;
 } catch (ResourceNotFoundException $e) {
-	// Fall through the not found
+    // Fall through the not found
 } catch (MethodNotAllowedException $e) {
-	OC_API::setContentType();
-	http_response_code(405);
-	exit();
+    OC_API::setContentType();
+    http_response_code(405);
+    exit();
 } catch (Exception $ex) {
-	OC_API::respond($ex->getResult(), OC_API::requestedFormat());
-	exit();
+    OC_API::respond($ex->getResult(), OC_API::requestedFormat());
+    exit();
 }
 
 /*
  * Try the appframework routes
  */
 try {
-	if(!\OC::$server->getUserSession()->isLoggedIn()) {
-		OC::handleLogin(\OC::$server->getRequest());
-	}
-	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
+    if(!\OC::$server->getUserSession()->isLoggedIn()) {
+        OC::handleLogin(\OC::$server->getRequest());
+    }
+    OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
 } catch (ResourceNotFoundException $e) {
-	OC_API::setContentType();
+    OC_API::setContentType();
 
-	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	$txt='Invalid query, please check the syntax. API specifications are here:'
-		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
-	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
+    $format = \OC::$server->getRequest()->getParam('format', 'xml');
+    $txt='Invalid query, please check the syntax. API specifications are here:'
+        .' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
+    OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 } catch (MethodNotAllowedException $e) {
-	OC_API::setContentType();
-	http_response_code(405);
+    OC_API::setContentType();
+    http_response_code(405);
 } catch (\OC\OCS\Exception $ex) {
-	OC_API::respond($ex->getResult(), OC_API::requestedFormat());
+    OC_API::respond($ex->getResult(), OC_API::requestedFormat());
 } catch (\OC\User\LoginException $e) {
-	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_UNAUTHORISED, 'Unauthorised'));
+    OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_UNAUTHORISED, 'Unauthorised'));
 } catch (\Exception $e) {
-	\OC::$server->getLogger()->logException($e);
-	OC_API::setContentType();
+    \OC::$server->getLogger()->logException($e);
+    OC_API::setContentType();
 
-	$format = \OC::$server->getRequest()->getParam('format', 'xml');
-	$txt='Invalid query, please check the syntax. API specifications are here:'
-		.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
-	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
+    $format = \OC::$server->getRequest()->getParam('format', 'xml');
+    $txt='Invalid query, please check the syntax. API specifications are here:'
+        .' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
+    OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 }
 

status.php

Indentation +24 added lines, -24 removed lines

@@ -33,32 +33,32 @@
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+    require_once __DIR__ . '/lib/base.php';
 
-	$systemConfig = \OC::$server->getSystemConfig();
+    $systemConfig = \OC::$server->getSystemConfig();
 
-	$installed = (bool) $systemConfig->getValue('installed', false);
-	$maintenance = (bool) $systemConfig->getValue('maintenance', false);
-	# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
-	# for description and defaults
-	$defaults = new \OCP\Defaults();
-	$values=array(
-		'installed'=>$installed,
-		'maintenance' => $maintenance,
-		'needsDbUpgrade' => \OCP\Util::needUpgrade(),
-		'version'=>implode('.', \OCP\Util::getVersion()),
-		'versionstring'=>OC_Util::getVersionString(),
-		'edition'=> '',
-		'productname'=>$defaults->getName());
-	if (OC::$CLI) {
-		print_r($values);
-	} else {
-		header('Access-Control-Allow-Origin: *');
-		header('Content-Type: application/json');
-		echo json_encode($values);
-	}
+    $installed = (bool) $systemConfig->getValue('installed', false);
+    $maintenance = (bool) $systemConfig->getValue('maintenance', false);
+    # see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
+    # for description and defaults
+    $defaults = new \OCP\Defaults();
+    $values=array(
+        'installed'=>$installed,
+        'maintenance' => $maintenance,
+        'needsDbUpgrade' => \OCP\Util::needUpgrade(),
+        'version'=>implode('.', \OCP\Util::getVersion()),
+        'versionstring'=>OC_Util::getVersionString(),
+        'edition'=> '',
+        'productname'=>$defaults->getName());
+    if (OC::$CLI) {
+        print_r($values);
+    } else {
+        header('Access-Control-Allow-Origin: *');
+        header('Content-Type: application/json');
+        echo json_encode($values);
+    }
 
 } catch (Exception $ex) {
-	http_response_code(500);
-	\OC::$server->getLogger()->logException($ex, ['app' => 'remote']);
+    http_response_code(500);
+    \OC::$server->getLogger()->logException($ex, ['app' => 'remote']);
 }

apps/files/ajax/list.php

Indentation +56 added lines, -56 removed lines

@@ -36,72 +36,72 @@
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 
 try {
-	$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
-	if (!$dirInfo || !$dirInfo->getType() === 'dir') {
-		http_response_code(404);
-		exit();
-	}
+    $dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
+    if (!$dirInfo || !$dirInfo->getType() === 'dir') {
+        http_response_code(404);
+        exit();
+    }
 
-	$data = array();
-	$baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir=';
+    $data = array();
+    $baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir=';
 
-	$permissions = $dirInfo->getPermissions();
+    $permissions = $dirInfo->getPermissions();
 
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
-	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
-	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
+    $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+    $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
+    $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 
-	$files = [];
-	// Clean up duplicates from array
-	if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
-		$mimetypeFilters = array_unique($mimetypeFilters);
+    $files = [];
+    // Clean up duplicates from array
+    if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
+        $mimetypeFilters = array_unique($mimetypeFilters);
 
-		if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
-			// append folder filter to be able to browse folders
-			$mimetypeFilters[] = 'httpd/unix-directory';
-		}
+        if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
+            // append folder filter to be able to browse folders
+            $mimetypeFilters[] = 'httpd/unix-directory';
+        }
 
-		// create filelist with mimetype filter - as getFiles only supports on
-		// mimetype filter at once we will filter this folder for each
-		// mimetypeFilter
-		foreach ($mimetypeFilters as $mimetypeFilter) {
-			$files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
-		}
+        // create filelist with mimetype filter - as getFiles only supports on
+        // mimetype filter at once we will filter this folder for each
+        // mimetypeFilter
+        foreach ($mimetypeFilters as $mimetypeFilter) {
+            $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
+        }
 
-		// sort the files accordingly
-		$files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
-	} else {
-		// create file list without mimetype filter
-		$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
-	}
+        // sort the files accordingly
+        $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
+    } else {
+        // create file list without mimetype filter
+        $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
+    }
 
-	$data['directory'] = $dir;
-	$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
-	$data['permissions'] = $permissions;
+    $data['directory'] = $dir;
+    $data['files'] = \OCA\Files\Helper::formatFileInfos($files);
+    $data['permissions'] = $permissions;
 
-	\OC_JSON::success(array('data' => $data));
+    \OC_JSON::success(array('data' => $data));
 } catch (\OCP\Files\StorageNotAvailableException $e) {
-	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
-	\OC_JSON::error([
-		'data' => [
-			'exception' => StorageNotAvailableException::class,
-			'message' => $l->t('Storage is temporarily not available')
-		]
-	]);
+    \OC::$server->getLogger()->logException($e, ['app' => 'files']);
+    \OC_JSON::error([
+        'data' => [
+            'exception' => StorageNotAvailableException::class,
+            'message' => $l->t('Storage is temporarily not available')
+        ]
+    ]);
 } catch (\OCP\Files\StorageInvalidException $e) {
-	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
-	\OC_JSON::error(array(
-		'data' => array(
-			'exception' => StorageInvalidException::class,
-			'message' => $l->t('Storage invalid')
-		)
-	));
+    \OC::$server->getLogger()->logException($e, ['app' => 'files']);
+    \OC_JSON::error(array(
+        'data' => array(
+            'exception' => StorageInvalidException::class,
+            'message' => $l->t('Storage invalid')
+        )
+    ));
 } catch (\Exception $e) {
-	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
-	\OC_JSON::error(array(
-		'data' => array(
-			'exception' => \Exception::class,
-			'message' => $l->t('Unknown error')
-		)
-	));
+    \OC::$server->getLogger()->logException($e, ['app' => 'files']);
+    \OC_JSON::error(array(
+        'data' => array(
+            'exception' => \Exception::class,
+            'message' => $l->t('Unknown error')
+        )
+    ));
 }

apps/files_sharing/public.php

Indentation +10 added lines, -10 removed lines

@@ -28,15 +28,15 @@
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 if($token !== '') {
-	$protocol = \OC::$server->getRequest()->getHttpProtocol();
-	if ($protocol == 'HTTP/1.0') {
-		http_response_code(302);
-	} else {
-		http_response_code(307);
-	}
-	header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
+    $protocol = \OC::$server->getRequest()->getHttpProtocol();
+    if ($protocol == 'HTTP/1.0') {
+        http_response_code(302);
+    } else {
+        http_response_code(307);
+    }
+    header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
-	http_response_code(404);
-	$tmpl = new OCP\Template('', '404', 'guest');
-	print_unescaped($tmpl->fetchPage());
+    http_response_code(404);
+    $tmpl = new OCP\Template('', '404', 'guest');
+    print_unescaped($tmpl->fetchPage());
 }

Spacing +2 added lines, -2 removed lines

@@ -27,14 +27,14 @@
 $token = isset($_GET['t']) ? $_GET['t'] : '';
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
-if($token !== '') {
+if ($token !== '') {
 	$protocol = \OC::$server->getRequest()->getHttpProtocol();
 	if ($protocol == 'HTTP/1.0') {
 		http_response_code(302);
 	} else {
 		http_response_code(307);
 	}
-	header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
+	header('Location: '.$urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
 	http_response_code(404);
 	$tmpl = new OCP\Template('', '404', 'guest');

apps/files_versions/download.php

Indentation +6 added lines, -6 removed lines

@@ -32,13 +32,13 @@
 $revision=(int)$_GET['revision'];
 
 try {
-	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
+    list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
 } catch(\OCP\Files\NotFoundException $e) {
-	http_response_code(404);
-	$tmpl = new OCP\Template('', '404', 'guest');
-	$tmpl->assign('file', '');
-	$tmpl->printPage();
-	exit();
+    http_response_code(404);
+    $tmpl = new OCP\Template('', '404', 'guest');
+    $tmpl->assign('file', '');
+    $tmpl->printPage();
+    exit();
 }
 
 $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision;

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
 \OC_JSON::checkLoggedIn();
 
 $file = $_GET['file'];
-$revision=(int)$_GET['revision'];
+$revision = (int) $_GET['revision'];
 
 try {
 	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
-} catch(\OCP\Files\NotFoundException $e) {
+} catch (\OCP\Files\NotFoundException $e) {
 	http_response_code(404);
 	$tmpl = new OCP\Template('', '404', 'guest');
 	$tmpl->assign('file', '');
@@ -49,7 +49,7 @@ 
 
 header('Content-Type:'.$ftype);
 \OC_Response::setContentDispositionHeader(basename($filename), 'attachment');
-header('Pragma: public');// enable caching in IE
+header('Pragma: public'); // enable caching in IE
 header('Expires: 0');
 header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 \OC_Response::setContentLengthHeader($view->filesize($versionName));

apps/files_trashbin/ajax/list.php

Indentation +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@
 
 // make filelist
 try {
-	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
+    $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
 } catch (Exception $e) {
-	http_response_code(404);
-	exit();
+    http_response_code(404);
+    exit();
 }
 
 $encodedDir = \OCP\Util::encodePath($dir);

public.php

Indentation +47 added lines, -47 removed lines

@@ -32,61 +32,61 @@
 
 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_Template::printErrorPage('Service unavailable', '', 503);
-		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_Template::printErrorPage('Service unavailable', '', 503);
+        exit;
+    }
 
-	OC::checkMaintenanceMode();
-	$request = \OC::$server->getRequest();
-	$pathInfo = $request->getPathInfo();
+    OC::checkMaintenanceMode();
+    $request = \OC::$server->getRequest();
+    $pathInfo = $request->getPathInfo();
 
-	if (!$pathInfo && $request->getParam('service', '') === '') {
-		http_response_code(404);
-		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) {
-		http_response_code(404);
-		exit;
-	}
+    if (!$pathInfo && $request->getParam('service', '') === '') {
+        http_response_code(404);
+        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) {
+        http_response_code(404);
+        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) {
-	$status = 500;
-	if ($ex instanceof \OC\ServiceUnavailableException) {
-		$status = 503;
-	}
-	//show the user a detailed error page
-	\OC::$server->getLogger()->logException($ex, ['app' => 'public']);
-	OC_Template::printExceptionErrorPage($ex, $status);
+    $status = 500;
+    if ($ex instanceof \OC\ServiceUnavailableException) {
+        $status = 503;
+    }
+    //show the user a detailed error page
+    \OC::$server->getLogger()->logException($ex, ['app' => 'public']);
+    OC_Template::printExceptionErrorPage($ex, $status);
 } catch (Error $ex) {
-	//show the user a detailed error page
-	\OC::$server->getLogger()->logException($ex, ['app' => 'public']);
-	OC_Template::printExceptionErrorPage($ex, 500);
+    //show the user a detailed error page
+    \OC::$server->getLogger()->logException($ex, ['app' => 'public']);
+    OC_Template::printExceptionErrorPage($ex, 500);
 }

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
@@ -53,7 +53,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) {
 		http_response_code(404);
 		exit;
@@ -68,14 +68,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) {
 	$status = 500;

index.php

Indentation +29 added lines, -29 removed lines

@@ -37,44 +37,44 @@
 
 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_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) {
-		\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
-		\OC::$server->getLogger()->logException($ex2, array('app' => 'index'));
+    try {
+        OC_Template::printErrorPage($ex->getMessage(), $ex->getHint(), 503);
+    } 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_Template::printExceptionErrorPage($ex, 500);
-	}
+        //show the user a detailed error page
+        OC_Template::printExceptionErrorPage($ex, 500);
+    }
 } catch (\OC\User\LoginException $ex) {
-	OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage(), 403);
+    OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage(), 403);
 } 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_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, array('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, array('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 $e;
-	}
-	OC_Template::printExceptionErrorPage($ex, 500);
+        throw $e;
+    }
+    OC_Template::printExceptionErrorPage($ex, 500);
 }

Spacing +3 added lines, -3 removed lines

@@ -33,15 +33,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

remote.php

Indentation +107 added lines, -107 removed lines

@@ -46,43 +46,43 @@ 
  * @param Exception|Error $e
  */
 function handleException($e) {
-	$request = \OC::$server->getRequest();
-	// 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', \OC::$server->getLogger()));
-		}
-		$server->on('beforeMethod', function () use ($e) {
-			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 \OC\ServiceUnavailableException ) {
-			$statusCode = 503;
-		}
-		if ($e instanceof RemoteException) {
-			// we shall not log on RemoteException
-			OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
-		} else {
-			\OC::$server->getLogger()->logException($e, ['app' => 'remote']);
-			OC_Template::printExceptionErrorPage($e, $statusCode);
-		}
-	}
+    $request = \OC::$server->getRequest();
+    // 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', \OC::$server->getLogger()));
+        }
+        $server->on('beforeMethod', function () use ($e) {
+            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 \OC\ServiceUnavailableException ) {
+            $statusCode = 503;
+        }
+        if ($e instanceof RemoteException) {
+            // we shall not log on RemoteException
+            OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
+        } else {
+            \OC::$server->getLogger()->logException($e, ['app' => 'remote']);
+            OC_Template::printExceptionErrorPage($e, $statusCode);
+        }
+    }
 }
 
 /**
@@ -90,80 +90,80 @@ 
  * @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 \OC::$server->getConfig()->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 \OC::$server->getConfig()->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 (\OCP\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();
-	$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;
-	OC_App::loadApps(array('authentication'));
-	OC_App::loadApps(array('filesystem', 'logging'));
-
-	switch ($app) {
-		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
-			break;
-		default:
-			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
-			}
-			OC_App::loadApp($app);
-			$file = OC_App::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 (\OCP\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();
+    $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;
+    OC_App::loadApps(array('authentication'));
+    OC_App::loadApps(array('filesystem', 'logging'));
+
+    switch ($app) {
+        case 'core':
+            $file =  OC::$SERVERROOT .'/'. $file;
+            break;
+        default:
+            if (!\OC::$server->getAppManager()->isInstalled($app)) {
+                throw new RemoteException('App not installed: ' . $app);
+            }
+            OC_App::loadApp($app);
+            $file = OC_App::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 +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 503:
@@ -72,7 +72,7 @@ 
 		$server->exec();
 	} else {
 		$statusCode = 500;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
+		if ($e instanceof \OC\ServiceUnavailableException) {
 			$statusCode = 503;
 		}
 		if ($e instanceof RemoteException) {
@@ -104,11 +104,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
@@ -129,18 +129,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', 404);
 	}
 
-	$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;
@@ -149,17 +149,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) {