nextcloud / server

lib/base.php

Indentation +991 added lines, -991 removed lines

@@ -62,997 +62,997 @@
  * OC_autoload!
  */
 class OC {
-	/**
-	 * Associative array for autoloading. classname => filename
-	 */
-	public static $CLASSPATH = array();
-	/**
-	 * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
-	 */
-	public static $SERVERROOT = '';
-	/**
-	 * the current request path relative to the Nextcloud root (e.g. files/index.php)
-	 */
-	private static $SUBURI = '';
-	/**
-	 * the Nextcloud root path for http requests (e.g. nextcloud/)
-	 */
-	public static $WEBROOT = '';
-	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
-	 * web path in 'url'
-	 */
-	public static $APPSROOTS = array();
-
-	/**
-	 * @var string
-	 */
-	public static $configDir;
-
-	/**
-	 * requested app
-	 */
-	public static $REQUESTEDAPP = '';
-
-	/**
-	 * check if Nextcloud runs in cli mode
-	 */
-	public static $CLI = false;
-
-	/**
-	 * @var \OC\Autoloader $loader
-	 */
-	public static $loader = null;
-
-	/** @var \Composer\Autoload\ClassLoader $composerAutoloader */
-	public static $composerAutoloader = null;
-
-	/**
-	 * @var \OC\Server
-	 */
-	public static $server = null;
-
-	/**
-	 * @var \OC\Config
-	 */
-	private static $config = null;
-
-	/**
-	 * @throws \RuntimeException when the 3rdparty directory is missing or
-	 * the app path list is empty or contains an invalid path
-	 */
-	public static function initPaths() {
-		if(defined('PHPUNIT_CONFIG_DIR')) {
-			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
-		} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
-			self::$configDir = OC::$SERVERROOT . '/tests/config/';
-		} elseif($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
-			self::$configDir = rtrim($dir, '/') . '/';
-		} else {
-			self::$configDir = OC::$SERVERROOT . '/config/';
-		}
-		self::$config = new \OC\Config(self::$configDir);
-
-		OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
-		/**
-		 * FIXME: The following lines are required because we can't yet instantiate
-		 *        \OC::$server->getRequest() since \OC::$server does not yet exist.
-		 */
-		$params = [
-			'server' => [
-				'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'],
-				'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'],
-			],
-		];
-		$fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig(self::$config)));
-		$scriptName = $fakeRequest->getScriptName();
-		if (substr($scriptName, -1) == '/') {
-			$scriptName .= 'index.php';
-			//make sure suburi follows the same rules as scriptName
-			if (substr(OC::$SUBURI, -9) != 'index.php') {
-				if (substr(OC::$SUBURI, -1) != '/') {
-					OC::$SUBURI = OC::$SUBURI . '/';
-				}
-				OC::$SUBURI = OC::$SUBURI . 'index.php';
-			}
-		}
-
-
-		if (OC::$CLI) {
-			OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-		} else {
-			if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
-				OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
-
-				if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
-					OC::$WEBROOT = '/' . OC::$WEBROOT;
-				}
-			} else {
-				// The scriptName is not ending with OC::$SUBURI
-				// This most likely means that we are calling from CLI.
-				// However some cron jobs still need to generate
-				// a web URL, so we use overwritewebroot as a fallback.
-				OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-			}
-
-			// Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
-			// slash which is required by URL generation.
-			if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI'] === \OC::$WEBROOT &&
-					substr($_SERVER['REQUEST_URI'], -1) !== '/') {
-				header('Location: '.\OC::$WEBROOT.'/');
-				exit();
-			}
-		}
-
-		// search the apps folder
-		$config_paths = self::$config->getValue('apps_paths', array());
-		if (!empty($config_paths)) {
-			foreach ($config_paths as $paths) {
-				if (isset($paths['url']) && isset($paths['path'])) {
-					$paths['url'] = rtrim($paths['url'], '/');
-					$paths['path'] = rtrim($paths['path'], '/');
-					OC::$APPSROOTS[] = $paths;
-				}
-			}
-		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
-			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
-		} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
-			OC::$APPSROOTS[] = array(
-				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
-				'url' => '/apps',
-				'writable' => true
-			);
-		}
-
-		if (empty(OC::$APPSROOTS)) {
-			throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
-				. ' or the folder above. You can also configure the location in the config.php file.');
-		}
-		$paths = array();
-		foreach (OC::$APPSROOTS as $path) {
-			$paths[] = $path['path'];
-			if (!is_dir($path['path'])) {
-				throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
-					. ' Nextcloud folder or the folder above. You can also configure the location in the'
-					. ' config.php file.', $path['path']));
-			}
-		}
-
-		// set the right include path
-		set_include_path(
-			implode(PATH_SEPARATOR, $paths)
-		);
-	}
-
-	public static function checkConfig() {
-		$l = \OC::$server->getL10N('lib');
-
-		// Create config if it does not already exist
-		$configFilePath = self::$configDir .'/config.php';
-		if(!file_exists($configFilePath)) {
-			@touch($configFilePath);
-		}
-
-		// Check if config is writable
-		$configFileWritable = is_writable($configFilePath);
-		if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
-			|| !$configFileWritable && \OCP\Util::needUpgrade()) {
-
-			$urlGenerator = \OC::$server->getURLGenerator();
-
-			if (self::$CLI) {
-				echo $l->t('Cannot write into "config" directory!')."\n";
-				echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
-				echo "\n";
-				echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ])."\n";
-				exit;
-			} else {
-				OC_Template::printErrorPage(
-					$l->t('Cannot write into "config" directory!'),
-					$l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s',
-					 [ $urlGenerator->linkToDocs('admin-dir_permissions') ])
-				);
-			}
-		}
-	}
-
-	public static function checkInstalled() {
-		if (defined('OC_CONSOLE')) {
-			return;
-		}
-		// Redirect to installer if not installed
-		if (!\OC::$server->getSystemConfig()->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
-			if (OC::$CLI) {
-				throw new Exception('Not installed');
-			} else {
-				$url = OC::$WEBROOT . '/index.php';
-				header('Location: ' . $url);
-			}
-			exit();
-		}
-	}
-
-	public static function checkMaintenanceMode() {
-		// Allow ajax update script to execute without being stopped
-		if (\OC::$server->getSystemConfig()->getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			header('Retry-After: 120');
-
-			// render error page
-			$template = new OC_Template('', 'update.user', 'guest');
-			OC_Util::addScript('maintenance-check');
-			OC_Util::addStyle('core', 'guest');
-			$template->printPage();
-			die();
-		}
-	}
-
-	/**
-	 * Prints the upgrade page
-	 *
-	 * @param \OC\SystemConfig $systemConfig
-	 */
-	private static function printUpgradePage(\OC\SystemConfig $systemConfig) {
-		$disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
-		$tooBig = false;
-		if (!$disableWebUpdater) {
-			$apps = \OC::$server->getAppManager();
-			if ($apps->isInstalled('user_ldap')) {
-				$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-
-				$result = $qb->selectAlias($qb->createFunction('COUNT(*)'), 'user_count')
-					->from('ldap_user_mapping')
-					->execute();
-				$row = $result->fetch();
-				$result->closeCursor();
-
-				$tooBig = ($row['user_count'] > 50);
-			}
-			if (!$tooBig && $apps->isInstalled('user_saml')) {
-				$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-
-				$result = $qb->selectAlias($qb->createFunction('COUNT(*)'), 'user_count')
-					->from('user_saml_users')
-					->execute();
-				$row = $result->fetch();
-				$result->closeCursor();
-
-				$tooBig = ($row['user_count'] > 50);
-			}
-			if (!$tooBig) {
-				// count users
-				$stats = \OC::$server->getUserManager()->countUsers();
-				$totalUsers = array_sum($stats);
-				$tooBig = ($totalUsers > 50);
-			}
-		}
-		$ignoreTooBigWarning = isset($_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup']) &&
-			$_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'] === 'IAmSuperSureToDoThis';
-
-		if ($disableWebUpdater || ($tooBig && !$ignoreTooBigWarning)) {
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			header('Retry-After: 120');
-
-			// render error page
-			$template = new OC_Template('', 'update.use-cli', 'guest');
-			$template->assign('productName', 'nextcloud'); // for now
-			$template->assign('version', OC_Util::getVersionString());
-			$template->assign('tooBig', $tooBig);
-
-			$template->printPage();
-			die();
-		}
-
-		// check whether this is a core update or apps update
-		$installedVersion = $systemConfig->getValue('version', '0.0.0');
-		$currentVersion = implode('.', \OCP\Util::getVersion());
-
-		// if not a core upgrade, then it's apps upgrade
-		$isAppsOnlyUpgrade = (version_compare($currentVersion, $installedVersion, '='));
-
-		$oldTheme = $systemConfig->getValue('theme');
-		$systemConfig->setValue('theme', '');
-		OC_Util::addScript('config'); // needed for web root
-		OC_Util::addScript('update');
-
-		/** @var \OC\App\AppManager $appManager */
-		$appManager = \OC::$server->getAppManager();
-
-		$tmpl = new OC_Template('', 'update.admin', 'guest');
-		$tmpl->assign('version', OC_Util::getVersionString());
-		$tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
-
-		// get third party apps
-		$ocVersion = \OCP\Util::getVersion();
-		$incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
-		$incompatibleShippedApps = [];
-		foreach ($incompatibleApps as $appInfo) {
-			if ($appManager->isShipped($appInfo['id'])) {
-				$incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
-			}
-		}
-
-		if (!empty($incompatibleShippedApps)) {
-			$l = \OC::$server->getL10N('core');
-			$hint = $l->t('The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]);
-			throw new \OC\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
-		}
-
-		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
-		$tmpl->assign('incompatibleAppsList', $incompatibleApps);
-		$tmpl->assign('productName', 'Nextcloud'); // for now
-		$tmpl->assign('oldTheme', $oldTheme);
-		$tmpl->printPage();
-	}
-
-	public static function initSession() {
-		// prevents javascript from accessing php session cookies
-		ini_set('session.cookie_httponly', true);
-
-		// set the cookie path to the Nextcloud directory
-		$cookie_path = OC::$WEBROOT ? : '/';
-		ini_set('session.cookie_path', $cookie_path);
-
-		// Let the session name be changed in the initSession Hook
-		$sessionName = OC_Util::getInstanceId();
-
-		try {
-			// Allow session apps to create a custom session object
-			$useCustomSession = false;
-			$session = self::$server->getSession();
-			OC_Hook::emit('OC', 'initSession', array('session' => &$session, 'sessionName' => &$sessionName, 'useCustomSession' => &$useCustomSession));
-			if (!$useCustomSession) {
-				// set the session name to the instance id - which is unique
-				$session = new \OC\Session\Internal($sessionName);
-			}
-
-			$cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
-			$session = $cryptoWrapper->wrapSession($session);
-			self::$server->setSession($session);
-
-			// if session can't be started break with http 500 error
-		} catch (Exception $e) {
-			\OCP\Util::logException('base', $e);
-			//show the user a detailed error page
-			OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-			OC_Template::printExceptionErrorPage($e);
-			die();
-		}
-
-		$sessionLifeTime = self::getSessionLifeTime();
-
-		// session timeout
-		if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
-			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), null, -1, self::$WEBROOT ? : '/');
-			}
-			\OC::$server->getUserSession()->logout();
-		}
-
-		$session->set('LAST_ACTIVITY', time());
-	}
-
-	/**
-	 * @return string
-	 */
-	private static function getSessionLifeTime() {
-		return \OC::$server->getConfig()->getSystemValue('session_lifetime', 60 * 60 * 24);
-	}
-
-	public static function loadAppClassPaths() {
-		foreach (OC_App::getEnabledApps() as $app) {
-			$appPath = OC_App::getAppPath($app);
-			if ($appPath === false) {
-				continue;
-			}
-
-			$file = $appPath . '/appinfo/classpath.php';
-			if (file_exists($file)) {
-				require_once $file;
-			}
-		}
-	}
-
-	/**
-	 * Try to set some values to the required Nextcloud default
-	 */
-	public static function setRequiredIniValues() {
-		@ini_set('default_charset', 'UTF-8');
-		@ini_set('gd.jpeg_ignore_warning', 1);
-	}
-
-	/**
-	 * Send the same site cookies
-	 */
-	private static function sendSameSiteCookies() {
-		$cookieParams = session_get_cookie_params();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
-
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
-
-		foreach($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
-
-	/**
-	 * Same Site cookie to further mitigate CSRF attacks. This cookie has to
-	 * be set in every request if cookies are sent to add a second level of
-	 * defense against CSRF.
-	 *
-	 * If the cookie is not sent this will set the cookie and reload the page.
-	 * We use an additional cookie since we want to protect logout CSRF and
-	 * also we can't directly interfere with PHP's session mechanism.
-	 */
-	private static function performSameSiteCookieProtection() {
-		$request = \OC::$server->getRequest();
-
-		// Some user agents are notorious and don't really properly follow HTTP
-		// specifications. For those, have an automated opt-out. Since the protection
-		// for remote.php is applied in base.php as starting point we need to opt out
-		// here.
-		$incompatibleUserAgents = [
-			// OS X Finder
-			'/^WebDAVFS/',
-		];
-		if($request->isUserAgent($incompatibleUserAgents)) {
-			return;
-		}
-
-		if(count($_COOKIE) > 0) {
-			$requestUri = $request->getScriptName();
-			$processingScript = explode('/', $requestUri);
-			$processingScript = $processingScript[count($processingScript)-1];
-
-			// index.php routes are handled in the middleware
-			if($processingScript === 'index.php') {
-				return;
-			}
-
-			// All other endpoints require the lax and the strict cookie
-			if(!$request->passesStrictCookieCheck()) {
-				self::sendSameSiteCookies();
-				// Debug mode gets access to the resources without strict cookie
-				// due to the fact that the SabreDAV browser also lives there.
-				if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
-					http_response_code(\OCP\AppFramework\Http::STATUS_SERVICE_UNAVAILABLE);
-					exit();
-				}
-			}
-		} elseif(!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
-			self::sendSameSiteCookies();
-		}
-	}
-
-	public static function init() {
-		// calculate the root directories
-		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
-
-		// register autoloader
-		$loaderStart = microtime(true);
-		require_once __DIR__ . '/autoloader.php';
-		self::$loader = new \OC\Autoloader([
-			OC::$SERVERROOT . '/lib/private/legacy',
-		]);
-		if (defined('PHPUNIT_RUN')) {
-			self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
-		}
-		spl_autoload_register(array(self::$loader, 'load'));
-		$loaderEnd = microtime(true);
-
-		self::$CLI = (php_sapi_name() == 'cli');
-
-		// Add default composer PSR-4 autoloader
-		self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
-
-		try {
-			self::initPaths();
-			// setup 3rdparty autoloader
-			$vendorAutoLoad = OC::$SERVERROOT. '/3rdparty/autoload.php';
-			if (!file_exists($vendorAutoLoad)) {
-				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
-			}
-			require_once $vendorAutoLoad;
-
-		} catch (\RuntimeException $e) {
-			if (!self::$CLI) {
-				$claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
-				$protocol = in_array($claimedProtocol, ['HTTP/1.0', 'HTTP/1.1', 'HTTP/2']) ? $claimedProtocol : 'HTTP/1.1';
-				header($protocol . ' ' . OC_Response::STATUS_SERVICE_UNAVAILABLE);
-			}
-			// we can't use the template error page here, because this needs the
-			// DI container which isn't available yet
-			print($e->getMessage());
-			exit();
-		}
-
-		// setup the basic server
-		self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
-		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
-		\OC::$server->getEventLogger()->start('boot', 'Initialize');
-
-		// Don't display errors and log them
-		error_reporting(E_ALL | E_STRICT);
-		@ini_set('display_errors', 0);
-		@ini_set('log_errors', 1);
-
-		if(!date_default_timezone_set('UTC')) {
-			throw new \RuntimeException('Could not set timezone to UTC');
-		};
-
-		//try to configure php to enable big file uploads.
-		//this doesn´t work always depending on the webserver and php configuration.
-		//Let´s try to overwrite some defaults anyway
-
-		//try to set the maximum execution time to 60min
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(3600);
-		}
-		@ini_set('max_execution_time', 3600);
-		@ini_set('max_input_time', 3600);
-
-		//try to set the maximum filesize to 10G
-		@ini_set('upload_max_filesize', '10G');
-		@ini_set('post_max_size', '10G');
-		@ini_set('file_uploads', '50');
-
-		self::setRequiredIniValues();
-		self::handleAuthHeaders();
-		self::registerAutoloaderCache();
-
-		// initialize intl fallback is necessary
-		\Patchwork\Utf8\Bootup::initIntl();
-		OC_Util::isSetLocaleWorking();
-
-		if (!defined('PHPUNIT_RUN')) {
-			OC\Log\ErrorHandler::setLogger(\OC::$server->getLogger());
-			$debug = \OC::$server->getConfig()->getSystemValue('debug', false);
-			OC\Log\ErrorHandler::register($debug);
-		}
-
-		\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
-		OC_App::loadApps(array('session'));
-		if (!self::$CLI) {
-			self::initSession();
-		}
-		\OC::$server->getEventLogger()->end('init_session');
-		self::checkConfig();
-		self::checkInstalled();
-
-		OC_Response::addSecurityHeaders();
-		if(self::$server->getRequest()->getServerProtocol() === 'https') {
-			ini_set('session.cookie_secure', true);
-		}
-
-		self::performSameSiteCookieProtection();
-
-		if (!defined('OC_CONSOLE')) {
-			$errors = OC_Util::checkServer(\OC::$server->getSystemConfig());
-			if (count($errors) > 0) {
-				if (self::$CLI) {
-					// Convert l10n string into regular string for usage in database
-					$staticErrors = [];
-					foreach ($errors as $error) {
-						echo $error['error'] . "\n";
-						echo $error['hint'] . "\n\n";
-						$staticErrors[] = [
-							'error' => (string)$error['error'],
-							'hint' => (string)$error['hint'],
-						];
-					}
-
-					try {
-						\OC::$server->getConfig()->setAppValue('core', 'cronErrors', json_encode($staticErrors));
-					} catch (\Exception $e) {
-						echo('Writing to database failed');
-					}
-					exit(1);
-				} else {
-					OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-					OC_Util::addStyle('guest');
-					OC_Template::printGuestPage('', 'error', array('errors' => $errors));
-					exit;
-				}
-			} elseif (self::$CLI && \OC::$server->getConfig()->getSystemValue('installed', false)) {
-				\OC::$server->getConfig()->deleteAppValue('core', 'cronErrors');
-			}
-		}
-		//try to set the session lifetime
-		$sessionLifeTime = self::getSessionLifeTime();
-		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
-
-		$systemConfig = \OC::$server->getSystemConfig();
-
-		// User and Groups
-		if (!$systemConfig->getValue("installed", false)) {
-			self::$server->getSession()->set('user_id', '');
-		}
-
-		OC_User::useBackend(new \OC\User\Database());
-		\OC::$server->getGroupManager()->addBackend(new \OC\Group\Database());
-
-		// Subscribe to the hook
-		\OCP\Util::connectHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			'\OC\User\Database',
-			'preLoginNameUsedAsUserName'
-		);
-
-		//setup extra user backends
-		if (!\OCP\Util::needUpgrade()) {
-			OC_User::setupBackends();
-		} else {
-			// Run upgrades in incognito mode
-			OC_User::setIncognitoMode(true);
-		}
-
-		self::registerCleanupHooks();
-		self::registerFilesystemHooks();
-		self::registerShareHooks();
-		self::registerEncryptionWrapper();
-		self::registerEncryptionHooks();
-		self::registerAccountHooks();
-		self::registerSettingsHooks();
-
-		$settings = new \OC\Settings\Application();
-		$settings->register();
-
-		//make sure temporary files are cleaned up
-		$tmpManager = \OC::$server->getTempManager();
-		register_shutdown_function(array($tmpManager, 'clean'));
-		$lockProvider = \OC::$server->getLockingProvider();
-		register_shutdown_function(array($lockProvider, 'releaseAll'));
-
-		// Check whether the sample configuration has been copied
-		if($systemConfig->getValue('copied_sample_config', false)) {
-			$l = \OC::$server->getL10N('lib');
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			OC_Template::printErrorPage(
-				$l->t('Sample configuration detected'),
-				$l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php')
-			);
-			return;
-		}
-
-		$request = \OC::$server->getRequest();
-		$host = $request->getInsecureServerHost();
-		/**
-		 * if the host passed in headers isn't trusted
-		 * FIXME: Should not be in here at all :see_no_evil:
-		 */
-		if (!OC::$CLI
-			// overwritehost is always trusted, workaround to not have to make
-			// \OC\AppFramework\Http\Request::getOverwriteHost public
-			&& self::$server->getConfig()->getSystemValue('overwritehost') === ''
-			&& !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host)
-			&& self::$server->getConfig()->getSystemValue('installed', false)
-		) {
-			// Allow access to CSS resources
-			$isScssRequest = false;
-			if(strpos($request->getPathInfo(), '/css/') === 0) {
-				$isScssRequest = true;
-			}
-
-			if (!$isScssRequest) {
-				header('HTTP/1.1 400 Bad Request');
-				header('Status: 400 Bad Request');
-
-				\OC::$server->getLogger()->warning(
-					'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
-					[
-						'app' => 'core',
-						'remoteAddress' => $request->getRemoteAddress(),
-						'host' => $host,
-					]
-				);
-
-				$tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
-				$tmpl->assign('domain', $host);
-				$tmpl->printPage();
-
-				exit();
-			}
-		}
-		\OC::$server->getEventLogger()->end('boot');
-	}
-
-	/**
-	 * register hooks for the cleanup of cache and bruteforce protection
-	 */
-	public static function registerCleanupHooks() {
-		//don't try to do this before we are properly setup
-		if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
-
-			// NOTE: This will be replaced to use OCP
-			$userSession = self::$server->getUserSession();
-			$userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
-				if (!defined('PHPUNIT_RUN')) {
-					// reset brute force delay for this IP address and username
-					$uid = \OC::$server->getUserSession()->getUser()->getUID();
-					$request = \OC::$server->getRequest();
-					$throttler = \OC::$server->getBruteForceThrottler();
-					$throttler->resetDelay($request->getRemoteAddress(), 'login', ['user' => $uid]);
-				}
-
-				try {
-					$cache = new \OC\Cache\File();
-					$cache->gc();
-				} catch (\OC\ServerNotAvailableException $e) {
-					// not a GC exception, pass it on
-					throw $e;
-				} catch (\OC\ForbiddenException $e) {
-					// filesystem blocked for this request, ignore
-				} catch (\Exception $e) {
-					// a GC exception should not prevent users from using OC,
-					// so log the exception
-					\OC::$server->getLogger()->warning('Exception when running cache gc: ' . $e->getMessage(), array('app' => 'core'));
-				}
-			});
-		}
-	}
-
-	public static function registerSettingsHooks() {
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_DISABLE, function($event) {
-			/** @var \OCP\App\ManagerEvent $event */
-			\OC::$server->getSettingsManager()->onAppDisabled($event->getAppID());
-		});
-		$dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_UPDATE, function($event) {
-			/** @var \OCP\App\ManagerEvent $event */
-			$jobList = \OC::$server->getJobList();
-			$job = 'OC\\Settings\\RemoveOrphaned';
-			if(!($jobList->has($job, null))) {
-				$jobList->add($job);
-			}
-		});
-	}
-
-	private static function registerEncryptionWrapper() {
-		$manager = self::$server->getEncryptionManager();
-		\OCP\Util::connectHook('OC_Filesystem', 'preSetup', $manager, 'setupStorage');
-	}
-
-	private static function registerEncryptionHooks() {
-		$enabled = self::$server->getEncryptionManager()->isEnabled();
-		if ($enabled) {
-			\OCP\Util::connectHook('OCP\Share', 'post_shared', 'OC\Encryption\HookManager', 'postShared');
-			\OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OC\Encryption\HookManager', 'postUnshared');
-			\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OC\Encryption\HookManager', 'postRename');
-			\OCP\Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 'OC\Encryption\HookManager', 'postRestore');
-		}
-	}
-
-	private static function registerAccountHooks() {
-		$hookHandler = new \OC\Accounts\Hooks(\OC::$server->getLogger());
-		\OCP\Util::connectHook('OC_User', 'changeUser', $hookHandler, 'changeUserHook');
-	}
-
-	/**
-	 * register hooks for the filesystem
-	 */
-	public static function registerFilesystemHooks() {
-		// Check for blacklisted files
-		OC_Hook::connect('OC_Filesystem', 'write', 'OC\Files\Filesystem', 'isBlacklisted');
-		OC_Hook::connect('OC_Filesystem', 'rename', 'OC\Files\Filesystem', 'isBlacklisted');
-	}
-
-	/**
-	 * register hooks for sharing
-	 */
-	public static function registerShareHooks() {
-		if (\OC::$server->getSystemConfig()->getValue('installed')) {
-			OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Share20\Hooks', 'post_deleteUser');
-			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share20\Hooks', 'post_removeFromGroup');
-			OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC\Share20\Hooks', 'post_deleteGroup');
-		}
-	}
-
-	protected static function registerAutoloaderCache() {
-		// The class loader takes an optional low-latency cache, which MUST be
-		// namespaced. The instanceid is used for namespacing, but might be
-		// unavailable at this point. Furthermore, it might not be possible to
-		// generate an instanceid via \OC_Util::getInstanceId() because the
-		// config file may not be writable. As such, we only register a class
-		// loader cache if instanceid is available without trying to create one.
-		$instanceId = \OC::$server->getSystemConfig()->getValue('instanceid', null);
-		if ($instanceId) {
-			try {
-				$memcacheFactory = \OC::$server->getMemCacheFactory();
-				self::$loader->setMemoryCache($memcacheFactory->createLocal('Autoloader'));
-			} catch (\Exception $ex) {
-			}
-		}
-	}
-
-	/**
-	 * Handle the request
-	 */
-	public static function handleRequest() {
-
-		\OC::$server->getEventLogger()->start('handle_request', 'Handle request');
-		$systemConfig = \OC::$server->getSystemConfig();
-		// load all the classpaths from the enabled apps so they are available
-		// in the routing files of each app
-		OC::loadAppClassPaths();
-
-		// Check if Nextcloud is installed or in maintenance (update) mode
-		if (!$systemConfig->getValue('installed', false)) {
-			\OC::$server->getSession()->clear();
-			$setupHelper = new OC\Setup(
-				$systemConfig,
-				\OC::$server->getIniWrapper(),
-				\OC::$server->getL10N('lib'),
-				\OC::$server->query(\OCP\Defaults::class),
-				\OC::$server->getLogger(),
-				\OC::$server->getSecureRandom(),
-				\OC::$server->query(\OC\Installer::class)
-			);
-			$controller = new OC\Core\Controller\SetupController($setupHelper);
-			$controller->run($_POST);
-			exit();
-		}
-
-		$request = \OC::$server->getRequest();
-		$requestPath = $request->getRawPathInfo();
-		if ($requestPath === '/heartbeat') {
-			return;
-		}
-		if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
-			self::checkMaintenanceMode();
-
-			if (\OCP\Util::needUpgrade()) {
-				if (function_exists('opcache_reset')) {
-					opcache_reset();
-				}
-				if (!$systemConfig->getValue('maintenance', false)) {
-					self::printUpgradePage($systemConfig);
-					exit();
-				}
-			}
-		}
-
-		// emergency app disabling
-		if ($requestPath === '/disableapp'
-			&& $request->getMethod() === 'POST'
-			&& ((array)$request->getParam('appid')) !== ''
-		) {
-			\OCP\JSON::callCheck();
-			\OCP\JSON::checkAdminUser();
-			$appIds = (array)$request->getParam('appid');
-			foreach($appIds as $appId) {
-				$appId = \OC_App::cleanAppId($appId);
-				\OC_App::disable($appId);
-			}
-			\OC_JSON::success();
-			exit();
-		}
-
-		// Always load authentication apps
-		OC_App::loadApps(['authentication']);
-
-		// Load minimum set of apps
-		if (!\OCP\Util::needUpgrade()
-			&& !$systemConfig->getValue('maintenance', false)) {
-			// For logged-in users: Load everything
-			if(\OC::$server->getUserSession()->isLoggedIn()) {
-				OC_App::loadApps();
-			} else {
-				// For guests: Load only filesystem and logging
-				OC_App::loadApps(array('filesystem', 'logging'));
-				self::handleLogin($request);
-			}
-		}
-
-		if (!self::$CLI) {
-			try {
-				if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
-					OC_App::loadApps(array('filesystem', 'logging'));
-					OC_App::loadApps();
-				}
-				OC_Util::setupFS();
-				OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
-				return;
-			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-				//header('HTTP/1.0 404 Not Found');
-			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
-				OC_Response::setStatus(405);
-				return;
-			}
-		}
-
-		// Handle WebDAV
-		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
-			// not allowed any more to prevent people
-			// mounting this root directly.
-			// Users need to mount remote.php/webdav instead.
-			header('HTTP/1.1 405 Method Not Allowed');
-			header('Status: 405 Method Not Allowed');
-			return;
-		}
-
-		// Someone is logged in
-		if (\OC::$server->getUserSession()->isLoggedIn()) {
-			OC_App::loadApps();
-			OC_User::setupBackends();
-			OC_Util::setupFS();
-			// FIXME
-			// Redirect to default application
-			OC_Util::redirectToDefaultPage();
-		} else {
-			// Not handled and not logged in
-			header('Location: '.\OC::$server->getURLGenerator()->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-	}
-
-	/**
-	 * Check login: apache auth, auth token, basic auth
-	 *
-	 * @param OCP\IRequest $request
-	 * @return boolean
-	 */
-	static function handleLogin(OCP\IRequest $request) {
-		$userSession = self::$server->getUserSession();
-		if (OC_User::handleApacheAuth()) {
-			return true;
-		}
-		if ($userSession->tryTokenLogin($request)) {
-			return true;
-		}
-		if (isset($_COOKIE['nc_username'])
-			&& isset($_COOKIE['nc_token'])
-			&& isset($_COOKIE['nc_session_id'])
-			&& $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
-			return true;
-		}
-		if ($userSession->tryBasicAuthLogin($request, \OC::$server->getBruteForceThrottler())) {
-			return true;
-		}
-		return false;
-	}
-
-	protected static function handleAuthHeaders() {
-		//copy http auth headers for apache+php-fcgid work around
-		if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
-			$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
-		}
-
-		// Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
-		$vars = array(
-			'HTTP_AUTHORIZATION', // apache+php-cgi work around
-			'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
-		);
-		foreach ($vars as $var) {
-			if (isset($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
-				list($name, $password) = explode(':', base64_decode($matches[1]), 2);
-				$_SERVER['PHP_AUTH_USER'] = $name;
-				$_SERVER['PHP_AUTH_PW'] = $password;
-				break;
-			}
-		}
-	}
+    /**
+     * Associative array for autoloading. classname => filename
+     */
+    public static $CLASSPATH = array();
+    /**
+     * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
+     */
+    public static $SERVERROOT = '';
+    /**
+     * the current request path relative to the Nextcloud root (e.g. files/index.php)
+     */
+    private static $SUBURI = '';
+    /**
+     * the Nextcloud root path for http requests (e.g. nextcloud/)
+     */
+    public static $WEBROOT = '';
+    /**
+     * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
+     * web path in 'url'
+     */
+    public static $APPSROOTS = array();
+
+    /**
+     * @var string
+     */
+    public static $configDir;
+
+    /**
+     * requested app
+     */
+    public static $REQUESTEDAPP = '';
+
+    /**
+     * check if Nextcloud runs in cli mode
+     */
+    public static $CLI = false;
+
+    /**
+     * @var \OC\Autoloader $loader
+     */
+    public static $loader = null;
+
+    /** @var \Composer\Autoload\ClassLoader $composerAutoloader */
+    public static $composerAutoloader = null;
+
+    /**
+     * @var \OC\Server
+     */
+    public static $server = null;
+
+    /**
+     * @var \OC\Config
+     */
+    private static $config = null;
+
+    /**
+     * @throws \RuntimeException when the 3rdparty directory is missing or
+     * the app path list is empty or contains an invalid path
+     */
+    public static function initPaths() {
+        if(defined('PHPUNIT_CONFIG_DIR')) {
+            self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
+        } elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
+            self::$configDir = OC::$SERVERROOT . '/tests/config/';
+        } elseif($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
+            self::$configDir = rtrim($dir, '/') . '/';
+        } else {
+            self::$configDir = OC::$SERVERROOT . '/config/';
+        }
+        self::$config = new \OC\Config(self::$configDir);
+
+        OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
+        /**
+         * FIXME: The following lines are required because we can't yet instantiate
+         *        \OC::$server->getRequest() since \OC::$server does not yet exist.
+         */
+        $params = [
+            'server' => [
+                'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'],
+                'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'],
+            ],
+        ];
+        $fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig(self::$config)));
+        $scriptName = $fakeRequest->getScriptName();
+        if (substr($scriptName, -1) == '/') {
+            $scriptName .= 'index.php';
+            //make sure suburi follows the same rules as scriptName
+            if (substr(OC::$SUBURI, -9) != 'index.php') {
+                if (substr(OC::$SUBURI, -1) != '/') {
+                    OC::$SUBURI = OC::$SUBURI . '/';
+                }
+                OC::$SUBURI = OC::$SUBURI . 'index.php';
+            }
+        }
+
+
+        if (OC::$CLI) {
+            OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+        } else {
+            if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
+                OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
+
+                if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
+                    OC::$WEBROOT = '/' . OC::$WEBROOT;
+                }
+            } else {
+                // The scriptName is not ending with OC::$SUBURI
+                // This most likely means that we are calling from CLI.
+                // However some cron jobs still need to generate
+                // a web URL, so we use overwritewebroot as a fallback.
+                OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+            }
+
+            // Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
+            // slash which is required by URL generation.
+            if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI'] === \OC::$WEBROOT &&
+                    substr($_SERVER['REQUEST_URI'], -1) !== '/') {
+                header('Location: '.\OC::$WEBROOT.'/');
+                exit();
+            }
+        }
+
+        // search the apps folder
+        $config_paths = self::$config->getValue('apps_paths', array());
+        if (!empty($config_paths)) {
+            foreach ($config_paths as $paths) {
+                if (isset($paths['url']) && isset($paths['path'])) {
+                    $paths['url'] = rtrim($paths['url'], '/');
+                    $paths['path'] = rtrim($paths['path'], '/');
+                    OC::$APPSROOTS[] = $paths;
+                }
+            }
+        } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+            OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
+        } elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+            OC::$APPSROOTS[] = array(
+                'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
+                'url' => '/apps',
+                'writable' => true
+            );
+        }
+
+        if (empty(OC::$APPSROOTS)) {
+            throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
+                . ' or the folder above. You can also configure the location in the config.php file.');
+        }
+        $paths = array();
+        foreach (OC::$APPSROOTS as $path) {
+            $paths[] = $path['path'];
+            if (!is_dir($path['path'])) {
+                throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
+                    . ' Nextcloud folder or the folder above. You can also configure the location in the'
+                    . ' config.php file.', $path['path']));
+            }
+        }
+
+        // set the right include path
+        set_include_path(
+            implode(PATH_SEPARATOR, $paths)
+        );
+    }
+
+    public static function checkConfig() {
+        $l = \OC::$server->getL10N('lib');
+
+        // Create config if it does not already exist
+        $configFilePath = self::$configDir .'/config.php';
+        if(!file_exists($configFilePath)) {
+            @touch($configFilePath);
+        }
+
+        // Check if config is writable
+        $configFileWritable = is_writable($configFilePath);
+        if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
+            || !$configFileWritable && \OCP\Util::needUpgrade()) {
+
+            $urlGenerator = \OC::$server->getURLGenerator();
+
+            if (self::$CLI) {
+                echo $l->t('Cannot write into "config" directory!')."\n";
+                echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
+                echo "\n";
+                echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ])."\n";
+                exit;
+            } else {
+                OC_Template::printErrorPage(
+                    $l->t('Cannot write into "config" directory!'),
+                    $l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s',
+                        [ $urlGenerator->linkToDocs('admin-dir_permissions') ])
+                );
+            }
+        }
+    }
+
+    public static function checkInstalled() {
+        if (defined('OC_CONSOLE')) {
+            return;
+        }
+        // Redirect to installer if not installed
+        if (!\OC::$server->getSystemConfig()->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
+            if (OC::$CLI) {
+                throw new Exception('Not installed');
+            } else {
+                $url = OC::$WEBROOT . '/index.php';
+                header('Location: ' . $url);
+            }
+            exit();
+        }
+    }
+
+    public static function checkMaintenanceMode() {
+        // Allow ajax update script to execute without being stopped
+        if (\OC::$server->getSystemConfig()->getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
+            // send http status 503
+            header('HTTP/1.1 503 Service Temporarily Unavailable');
+            header('Status: 503 Service Temporarily Unavailable');
+            header('Retry-After: 120');
+
+            // render error page
+            $template = new OC_Template('', 'update.user', 'guest');
+            OC_Util::addScript('maintenance-check');
+            OC_Util::addStyle('core', 'guest');
+            $template->printPage();
+            die();
+        }
+    }
+
+    /**
+     * Prints the upgrade page
+     *
+     * @param \OC\SystemConfig $systemConfig
+     */
+    private static function printUpgradePage(\OC\SystemConfig $systemConfig) {
+        $disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
+        $tooBig = false;
+        if (!$disableWebUpdater) {
+            $apps = \OC::$server->getAppManager();
+            if ($apps->isInstalled('user_ldap')) {
+                $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+
+                $result = $qb->selectAlias($qb->createFunction('COUNT(*)'), 'user_count')
+                    ->from('ldap_user_mapping')
+                    ->execute();
+                $row = $result->fetch();
+                $result->closeCursor();
+
+                $tooBig = ($row['user_count'] > 50);
+            }
+            if (!$tooBig && $apps->isInstalled('user_saml')) {
+                $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+
+                $result = $qb->selectAlias($qb->createFunction('COUNT(*)'), 'user_count')
+                    ->from('user_saml_users')
+                    ->execute();
+                $row = $result->fetch();
+                $result->closeCursor();
+
+                $tooBig = ($row['user_count'] > 50);
+            }
+            if (!$tooBig) {
+                // count users
+                $stats = \OC::$server->getUserManager()->countUsers();
+                $totalUsers = array_sum($stats);
+                $tooBig = ($totalUsers > 50);
+            }
+        }
+        $ignoreTooBigWarning = isset($_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup']) &&
+            $_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'] === 'IAmSuperSureToDoThis';
+
+        if ($disableWebUpdater || ($tooBig && !$ignoreTooBigWarning)) {
+            // send http status 503
+            header('HTTP/1.1 503 Service Temporarily Unavailable');
+            header('Status: 503 Service Temporarily Unavailable');
+            header('Retry-After: 120');
+
+            // render error page
+            $template = new OC_Template('', 'update.use-cli', 'guest');
+            $template->assign('productName', 'nextcloud'); // for now
+            $template->assign('version', OC_Util::getVersionString());
+            $template->assign('tooBig', $tooBig);
+
+            $template->printPage();
+            die();
+        }
+
+        // check whether this is a core update or apps update
+        $installedVersion = $systemConfig->getValue('version', '0.0.0');
+        $currentVersion = implode('.', \OCP\Util::getVersion());
+
+        // if not a core upgrade, then it's apps upgrade
+        $isAppsOnlyUpgrade = (version_compare($currentVersion, $installedVersion, '='));
+
+        $oldTheme = $systemConfig->getValue('theme');
+        $systemConfig->setValue('theme', '');
+        OC_Util::addScript('config'); // needed for web root
+        OC_Util::addScript('update');
+
+        /** @var \OC\App\AppManager $appManager */
+        $appManager = \OC::$server->getAppManager();
+
+        $tmpl = new OC_Template('', 'update.admin', 'guest');
+        $tmpl->assign('version', OC_Util::getVersionString());
+        $tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
+
+        // get third party apps
+        $ocVersion = \OCP\Util::getVersion();
+        $incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
+        $incompatibleShippedApps = [];
+        foreach ($incompatibleApps as $appInfo) {
+            if ($appManager->isShipped($appInfo['id'])) {
+                $incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
+            }
+        }
+
+        if (!empty($incompatibleShippedApps)) {
+            $l = \OC::$server->getL10N('core');
+            $hint = $l->t('The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]);
+            throw new \OC\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
+        }
+
+        $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
+        $tmpl->assign('incompatibleAppsList', $incompatibleApps);
+        $tmpl->assign('productName', 'Nextcloud'); // for now
+        $tmpl->assign('oldTheme', $oldTheme);
+        $tmpl->printPage();
+    }
+
+    public static function initSession() {
+        // prevents javascript from accessing php session cookies
+        ini_set('session.cookie_httponly', true);
+
+        // set the cookie path to the Nextcloud directory
+        $cookie_path = OC::$WEBROOT ? : '/';
+        ini_set('session.cookie_path', $cookie_path);
+
+        // Let the session name be changed in the initSession Hook
+        $sessionName = OC_Util::getInstanceId();
+
+        try {
+            // Allow session apps to create a custom session object
+            $useCustomSession = false;
+            $session = self::$server->getSession();
+            OC_Hook::emit('OC', 'initSession', array('session' => &$session, 'sessionName' => &$sessionName, 'useCustomSession' => &$useCustomSession));
+            if (!$useCustomSession) {
+                // set the session name to the instance id - which is unique
+                $session = new \OC\Session\Internal($sessionName);
+            }
+
+            $cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
+            $session = $cryptoWrapper->wrapSession($session);
+            self::$server->setSession($session);
+
+            // if session can't be started break with http 500 error
+        } catch (Exception $e) {
+            \OCP\Util::logException('base', $e);
+            //show the user a detailed error page
+            OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+            OC_Template::printExceptionErrorPage($e);
+            die();
+        }
+
+        $sessionLifeTime = self::getSessionLifeTime();
+
+        // session timeout
+        if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
+            if (isset($_COOKIE[session_name()])) {
+                setcookie(session_name(), null, -1, self::$WEBROOT ? : '/');
+            }
+            \OC::$server->getUserSession()->logout();
+        }
+
+        $session->set('LAST_ACTIVITY', time());
+    }
+
+    /**
+     * @return string
+     */
+    private static function getSessionLifeTime() {
+        return \OC::$server->getConfig()->getSystemValue('session_lifetime', 60 * 60 * 24);
+    }
+
+    public static function loadAppClassPaths() {
+        foreach (OC_App::getEnabledApps() as $app) {
+            $appPath = OC_App::getAppPath($app);
+            if ($appPath === false) {
+                continue;
+            }
+
+            $file = $appPath . '/appinfo/classpath.php';
+            if (file_exists($file)) {
+                require_once $file;
+            }
+        }
+    }
+
+    /**
+     * Try to set some values to the required Nextcloud default
+     */
+    public static function setRequiredIniValues() {
+        @ini_set('default_charset', 'UTF-8');
+        @ini_set('gd.jpeg_ignore_warning', 1);
+    }
+
+    /**
+     * Send the same site cookies
+     */
+    private static function sendSameSiteCookies() {
+        $cookieParams = session_get_cookie_params();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
+
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
+
+        foreach($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
+
+    /**
+     * Same Site cookie to further mitigate CSRF attacks. This cookie has to
+     * be set in every request if cookies are sent to add a second level of
+     * defense against CSRF.
+     *
+     * If the cookie is not sent this will set the cookie and reload the page.
+     * We use an additional cookie since we want to protect logout CSRF and
+     * also we can't directly interfere with PHP's session mechanism.
+     */
+    private static function performSameSiteCookieProtection() {
+        $request = \OC::$server->getRequest();
+
+        // Some user agents are notorious and don't really properly follow HTTP
+        // specifications. For those, have an automated opt-out. Since the protection
+        // for remote.php is applied in base.php as starting point we need to opt out
+        // here.
+        $incompatibleUserAgents = [
+            // OS X Finder
+            '/^WebDAVFS/',
+        ];
+        if($request->isUserAgent($incompatibleUserAgents)) {
+            return;
+        }
+
+        if(count($_COOKIE) > 0) {
+            $requestUri = $request->getScriptName();
+            $processingScript = explode('/', $requestUri);
+            $processingScript = $processingScript[count($processingScript)-1];
+
+            // index.php routes are handled in the middleware
+            if($processingScript === 'index.php') {
+                return;
+            }
+
+            // All other endpoints require the lax and the strict cookie
+            if(!$request->passesStrictCookieCheck()) {
+                self::sendSameSiteCookies();
+                // Debug mode gets access to the resources without strict cookie
+                // due to the fact that the SabreDAV browser also lives there.
+                if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
+                    http_response_code(\OCP\AppFramework\Http::STATUS_SERVICE_UNAVAILABLE);
+                    exit();
+                }
+            }
+        } elseif(!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
+            self::sendSameSiteCookies();
+        }
+    }
+
+    public static function init() {
+        // calculate the root directories
+        OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
+
+        // register autoloader
+        $loaderStart = microtime(true);
+        require_once __DIR__ . '/autoloader.php';
+        self::$loader = new \OC\Autoloader([
+            OC::$SERVERROOT . '/lib/private/legacy',
+        ]);
+        if (defined('PHPUNIT_RUN')) {
+            self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+        }
+        spl_autoload_register(array(self::$loader, 'load'));
+        $loaderEnd = microtime(true);
+
+        self::$CLI = (php_sapi_name() == 'cli');
+
+        // Add default composer PSR-4 autoloader
+        self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+
+        try {
+            self::initPaths();
+            // setup 3rdparty autoloader
+            $vendorAutoLoad = OC::$SERVERROOT. '/3rdparty/autoload.php';
+            if (!file_exists($vendorAutoLoad)) {
+                throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
+            }
+            require_once $vendorAutoLoad;
+
+        } catch (\RuntimeException $e) {
+            if (!self::$CLI) {
+                $claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
+                $protocol = in_array($claimedProtocol, ['HTTP/1.0', 'HTTP/1.1', 'HTTP/2']) ? $claimedProtocol : 'HTTP/1.1';
+                header($protocol . ' ' . OC_Response::STATUS_SERVICE_UNAVAILABLE);
+            }
+            // we can't use the template error page here, because this needs the
+            // DI container which isn't available yet
+            print($e->getMessage());
+            exit();
+        }
+
+        // setup the basic server
+        self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
+        \OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
+        \OC::$server->getEventLogger()->start('boot', 'Initialize');
+
+        // Don't display errors and log them
+        error_reporting(E_ALL | E_STRICT);
+        @ini_set('display_errors', 0);
+        @ini_set('log_errors', 1);
+
+        if(!date_default_timezone_set('UTC')) {
+            throw new \RuntimeException('Could not set timezone to UTC');
+        };
+
+        //try to configure php to enable big file uploads.
+        //this doesn´t work always depending on the webserver and php configuration.
+        //Let´s try to overwrite some defaults anyway
+
+        //try to set the maximum execution time to 60min
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(3600);
+        }
+        @ini_set('max_execution_time', 3600);
+        @ini_set('max_input_time', 3600);
+
+        //try to set the maximum filesize to 10G
+        @ini_set('upload_max_filesize', '10G');
+        @ini_set('post_max_size', '10G');
+        @ini_set('file_uploads', '50');
+
+        self::setRequiredIniValues();
+        self::handleAuthHeaders();
+        self::registerAutoloaderCache();
+
+        // initialize intl fallback is necessary
+        \Patchwork\Utf8\Bootup::initIntl();
+        OC_Util::isSetLocaleWorking();
+
+        if (!defined('PHPUNIT_RUN')) {
+            OC\Log\ErrorHandler::setLogger(\OC::$server->getLogger());
+            $debug = \OC::$server->getConfig()->getSystemValue('debug', false);
+            OC\Log\ErrorHandler::register($debug);
+        }
+
+        \OC::$server->getEventLogger()->start('init_session', 'Initialize session');
+        OC_App::loadApps(array('session'));
+        if (!self::$CLI) {
+            self::initSession();
+        }
+        \OC::$server->getEventLogger()->end('init_session');
+        self::checkConfig();
+        self::checkInstalled();
+
+        OC_Response::addSecurityHeaders();
+        if(self::$server->getRequest()->getServerProtocol() === 'https') {
+            ini_set('session.cookie_secure', true);
+        }
+
+        self::performSameSiteCookieProtection();
+
+        if (!defined('OC_CONSOLE')) {
+            $errors = OC_Util::checkServer(\OC::$server->getSystemConfig());
+            if (count($errors) > 0) {
+                if (self::$CLI) {
+                    // Convert l10n string into regular string for usage in database
+                    $staticErrors = [];
+                    foreach ($errors as $error) {
+                        echo $error['error'] . "\n";
+                        echo $error['hint'] . "\n\n";
+                        $staticErrors[] = [
+                            'error' => (string)$error['error'],
+                            'hint' => (string)$error['hint'],
+                        ];
+                    }
+
+                    try {
+                        \OC::$server->getConfig()->setAppValue('core', 'cronErrors', json_encode($staticErrors));
+                    } catch (\Exception $e) {
+                        echo('Writing to database failed');
+                    }
+                    exit(1);
+                } else {
+                    OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+                    OC_Util::addStyle('guest');
+                    OC_Template::printGuestPage('', 'error', array('errors' => $errors));
+                    exit;
+                }
+            } elseif (self::$CLI && \OC::$server->getConfig()->getSystemValue('installed', false)) {
+                \OC::$server->getConfig()->deleteAppValue('core', 'cronErrors');
+            }
+        }
+        //try to set the session lifetime
+        $sessionLifeTime = self::getSessionLifeTime();
+        @ini_set('gc_maxlifetime', (string)$sessionLifeTime);
+
+        $systemConfig = \OC::$server->getSystemConfig();
+
+        // User and Groups
+        if (!$systemConfig->getValue("installed", false)) {
+            self::$server->getSession()->set('user_id', '');
+        }
+
+        OC_User::useBackend(new \OC\User\Database());
+        \OC::$server->getGroupManager()->addBackend(new \OC\Group\Database());
+
+        // Subscribe to the hook
+        \OCP\Util::connectHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            '\OC\User\Database',
+            'preLoginNameUsedAsUserName'
+        );
+
+        //setup extra user backends
+        if (!\OCP\Util::needUpgrade()) {
+            OC_User::setupBackends();
+        } else {
+            // Run upgrades in incognito mode
+            OC_User::setIncognitoMode(true);
+        }
+
+        self::registerCleanupHooks();
+        self::registerFilesystemHooks();
+        self::registerShareHooks();
+        self::registerEncryptionWrapper();
+        self::registerEncryptionHooks();
+        self::registerAccountHooks();
+        self::registerSettingsHooks();
+
+        $settings = new \OC\Settings\Application();
+        $settings->register();
+
+        //make sure temporary files are cleaned up
+        $tmpManager = \OC::$server->getTempManager();
+        register_shutdown_function(array($tmpManager, 'clean'));
+        $lockProvider = \OC::$server->getLockingProvider();
+        register_shutdown_function(array($lockProvider, 'releaseAll'));
+
+        // Check whether the sample configuration has been copied
+        if($systemConfig->getValue('copied_sample_config', false)) {
+            $l = \OC::$server->getL10N('lib');
+            header('HTTP/1.1 503 Service Temporarily Unavailable');
+            header('Status: 503 Service Temporarily Unavailable');
+            OC_Template::printErrorPage(
+                $l->t('Sample configuration detected'),
+                $l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php')
+            );
+            return;
+        }
+
+        $request = \OC::$server->getRequest();
+        $host = $request->getInsecureServerHost();
+        /**
+         * if the host passed in headers isn't trusted
+         * FIXME: Should not be in here at all :see_no_evil:
+         */
+        if (!OC::$CLI
+            // overwritehost is always trusted, workaround to not have to make
+            // \OC\AppFramework\Http\Request::getOverwriteHost public
+            && self::$server->getConfig()->getSystemValue('overwritehost') === ''
+            && !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host)
+            && self::$server->getConfig()->getSystemValue('installed', false)
+        ) {
+            // Allow access to CSS resources
+            $isScssRequest = false;
+            if(strpos($request->getPathInfo(), '/css/') === 0) {
+                $isScssRequest = true;
+            }
+
+            if (!$isScssRequest) {
+                header('HTTP/1.1 400 Bad Request');
+                header('Status: 400 Bad Request');
+
+                \OC::$server->getLogger()->warning(
+                    'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
+                    [
+                        'app' => 'core',
+                        'remoteAddress' => $request->getRemoteAddress(),
+                        'host' => $host,
+                    ]
+                );
+
+                $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
+                $tmpl->assign('domain', $host);
+                $tmpl->printPage();
+
+                exit();
+            }
+        }
+        \OC::$server->getEventLogger()->end('boot');
+    }
+
+    /**
+     * register hooks for the cleanup of cache and bruteforce protection
+     */
+    public static function registerCleanupHooks() {
+        //don't try to do this before we are properly setup
+        if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
+
+            // NOTE: This will be replaced to use OCP
+            $userSession = self::$server->getUserSession();
+            $userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
+                if (!defined('PHPUNIT_RUN')) {
+                    // reset brute force delay for this IP address and username
+                    $uid = \OC::$server->getUserSession()->getUser()->getUID();
+                    $request = \OC::$server->getRequest();
+                    $throttler = \OC::$server->getBruteForceThrottler();
+                    $throttler->resetDelay($request->getRemoteAddress(), 'login', ['user' => $uid]);
+                }
+
+                try {
+                    $cache = new \OC\Cache\File();
+                    $cache->gc();
+                } catch (\OC\ServerNotAvailableException $e) {
+                    // not a GC exception, pass it on
+                    throw $e;
+                } catch (\OC\ForbiddenException $e) {
+                    // filesystem blocked for this request, ignore
+                } catch (\Exception $e) {
+                    // a GC exception should not prevent users from using OC,
+                    // so log the exception
+                    \OC::$server->getLogger()->warning('Exception when running cache gc: ' . $e->getMessage(), array('app' => 'core'));
+                }
+            });
+        }
+    }
+
+    public static function registerSettingsHooks() {
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_DISABLE, function($event) {
+            /** @var \OCP\App\ManagerEvent $event */
+            \OC::$server->getSettingsManager()->onAppDisabled($event->getAppID());
+        });
+        $dispatcher->addListener(OCP\App\ManagerEvent::EVENT_APP_UPDATE, function($event) {
+            /** @var \OCP\App\ManagerEvent $event */
+            $jobList = \OC::$server->getJobList();
+            $job = 'OC\\Settings\\RemoveOrphaned';
+            if(!($jobList->has($job, null))) {
+                $jobList->add($job);
+            }
+        });
+    }
+
+    private static function registerEncryptionWrapper() {
+        $manager = self::$server->getEncryptionManager();
+        \OCP\Util::connectHook('OC_Filesystem', 'preSetup', $manager, 'setupStorage');
+    }
+
+    private static function registerEncryptionHooks() {
+        $enabled = self::$server->getEncryptionManager()->isEnabled();
+        if ($enabled) {
+            \OCP\Util::connectHook('OCP\Share', 'post_shared', 'OC\Encryption\HookManager', 'postShared');
+            \OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OC\Encryption\HookManager', 'postUnshared');
+            \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OC\Encryption\HookManager', 'postRename');
+            \OCP\Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 'OC\Encryption\HookManager', 'postRestore');
+        }
+    }
+
+    private static function registerAccountHooks() {
+        $hookHandler = new \OC\Accounts\Hooks(\OC::$server->getLogger());
+        \OCP\Util::connectHook('OC_User', 'changeUser', $hookHandler, 'changeUserHook');
+    }
+
+    /**
+     * register hooks for the filesystem
+     */
+    public static function registerFilesystemHooks() {
+        // Check for blacklisted files
+        OC_Hook::connect('OC_Filesystem', 'write', 'OC\Files\Filesystem', 'isBlacklisted');
+        OC_Hook::connect('OC_Filesystem', 'rename', 'OC\Files\Filesystem', 'isBlacklisted');
+    }
+
+    /**
+     * register hooks for sharing
+     */
+    public static function registerShareHooks() {
+        if (\OC::$server->getSystemConfig()->getValue('installed')) {
+            OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Share20\Hooks', 'post_deleteUser');
+            OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share20\Hooks', 'post_removeFromGroup');
+            OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC\Share20\Hooks', 'post_deleteGroup');
+        }
+    }
+
+    protected static function registerAutoloaderCache() {
+        // The class loader takes an optional low-latency cache, which MUST be
+        // namespaced. The instanceid is used for namespacing, but might be
+        // unavailable at this point. Furthermore, it might not be possible to
+        // generate an instanceid via \OC_Util::getInstanceId() because the
+        // config file may not be writable. As such, we only register a class
+        // loader cache if instanceid is available without trying to create one.
+        $instanceId = \OC::$server->getSystemConfig()->getValue('instanceid', null);
+        if ($instanceId) {
+            try {
+                $memcacheFactory = \OC::$server->getMemCacheFactory();
+                self::$loader->setMemoryCache($memcacheFactory->createLocal('Autoloader'));
+            } catch (\Exception $ex) {
+            }
+        }
+    }
+
+    /**
+     * Handle the request
+     */
+    public static function handleRequest() {
+
+        \OC::$server->getEventLogger()->start('handle_request', 'Handle request');
+        $systemConfig = \OC::$server->getSystemConfig();
+        // load all the classpaths from the enabled apps so they are available
+        // in the routing files of each app
+        OC::loadAppClassPaths();
+
+        // Check if Nextcloud is installed or in maintenance (update) mode
+        if (!$systemConfig->getValue('installed', false)) {
+            \OC::$server->getSession()->clear();
+            $setupHelper = new OC\Setup(
+                $systemConfig,
+                \OC::$server->getIniWrapper(),
+                \OC::$server->getL10N('lib'),
+                \OC::$server->query(\OCP\Defaults::class),
+                \OC::$server->getLogger(),
+                \OC::$server->getSecureRandom(),
+                \OC::$server->query(\OC\Installer::class)
+            );
+            $controller = new OC\Core\Controller\SetupController($setupHelper);
+            $controller->run($_POST);
+            exit();
+        }
+
+        $request = \OC::$server->getRequest();
+        $requestPath = $request->getRawPathInfo();
+        if ($requestPath === '/heartbeat') {
+            return;
+        }
+        if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
+            self::checkMaintenanceMode();
+
+            if (\OCP\Util::needUpgrade()) {
+                if (function_exists('opcache_reset')) {
+                    opcache_reset();
+                }
+                if (!$systemConfig->getValue('maintenance', false)) {
+                    self::printUpgradePage($systemConfig);
+                    exit();
+                }
+            }
+        }
+
+        // emergency app disabling
+        if ($requestPath === '/disableapp'
+            && $request->getMethod() === 'POST'
+            && ((array)$request->getParam('appid')) !== ''
+        ) {
+            \OCP\JSON::callCheck();
+            \OCP\JSON::checkAdminUser();
+            $appIds = (array)$request->getParam('appid');
+            foreach($appIds as $appId) {
+                $appId = \OC_App::cleanAppId($appId);
+                \OC_App::disable($appId);
+            }
+            \OC_JSON::success();
+            exit();
+        }
+
+        // Always load authentication apps
+        OC_App::loadApps(['authentication']);
+
+        // Load minimum set of apps
+        if (!\OCP\Util::needUpgrade()
+            && !$systemConfig->getValue('maintenance', false)) {
+            // For logged-in users: Load everything
+            if(\OC::$server->getUserSession()->isLoggedIn()) {
+                OC_App::loadApps();
+            } else {
+                // For guests: Load only filesystem and logging
+                OC_App::loadApps(array('filesystem', 'logging'));
+                self::handleLogin($request);
+            }
+        }
+
+        if (!self::$CLI) {
+            try {
+                if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
+                    OC_App::loadApps(array('filesystem', 'logging'));
+                    OC_App::loadApps();
+                }
+                OC_Util::setupFS();
+                OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
+                return;
+            } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+                //header('HTTP/1.0 404 Not Found');
+            } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+                OC_Response::setStatus(405);
+                return;
+            }
+        }
+
+        // Handle WebDAV
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
+            // not allowed any more to prevent people
+            // mounting this root directly.
+            // Users need to mount remote.php/webdav instead.
+            header('HTTP/1.1 405 Method Not Allowed');
+            header('Status: 405 Method Not Allowed');
+            return;
+        }
+
+        // Someone is logged in
+        if (\OC::$server->getUserSession()->isLoggedIn()) {
+            OC_App::loadApps();
+            OC_User::setupBackends();
+            OC_Util::setupFS();
+            // FIXME
+            // Redirect to default application
+            OC_Util::redirectToDefaultPage();
+        } else {
+            // Not handled and not logged in
+            header('Location: '.\OC::$server->getURLGenerator()->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+    }
+
+    /**
+     * Check login: apache auth, auth token, basic auth
+     *
+     * @param OCP\IRequest $request
+     * @return boolean
+     */
+    static function handleLogin(OCP\IRequest $request) {
+        $userSession = self::$server->getUserSession();
+        if (OC_User::handleApacheAuth()) {
+            return true;
+        }
+        if ($userSession->tryTokenLogin($request)) {
+            return true;
+        }
+        if (isset($_COOKIE['nc_username'])
+            && isset($_COOKIE['nc_token'])
+            && isset($_COOKIE['nc_session_id'])
+            && $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
+            return true;
+        }
+        if ($userSession->tryBasicAuthLogin($request, \OC::$server->getBruteForceThrottler())) {
+            return true;
+        }
+        return false;
+    }
+
+    protected static function handleAuthHeaders() {
+        //copy http auth headers for apache+php-fcgid work around
+        if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
+            $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
+        }
+
+        // Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
+        $vars = array(
+            'HTTP_AUTHORIZATION', // apache+php-cgi work around
+            'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
+        );
+        foreach ($vars as $var) {
+            if (isset($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
+                list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+                $_SERVER['PHP_AUTH_USER'] = $name;
+                $_SERVER['PHP_AUTH_PW'] = $password;
+                break;
+            }
+        }
+    }
 }
 
 OC::init();

Spacing +57 added lines, -57 removed lines

@@ -122,14 +122,14 @@ 
 	 * the app path list is empty or contains an invalid path
 	 */
 	public static function initPaths() {
-		if(defined('PHPUNIT_CONFIG_DIR')) {
-			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
-		} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
-			self::$configDir = OC::$SERVERROOT . '/tests/config/';
-		} elseif($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
-			self::$configDir = rtrim($dir, '/') . '/';
+		if (defined('PHPUNIT_CONFIG_DIR')) {
+			self::$configDir = OC::$SERVERROOT.'/'.PHPUNIT_CONFIG_DIR.'/';
+		} elseif (defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT.'/tests/config/')) {
+			self::$configDir = OC::$SERVERROOT.'/tests/config/';
+		} elseif ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
+			self::$configDir = rtrim($dir, '/').'/';
 		} else {
-			self::$configDir = OC::$SERVERROOT . '/config/';
+			self::$configDir = OC::$SERVERROOT.'/config/';
 		}
 		self::$config = new \OC\Config(self::$configDir);
 
@@ -151,9 +151,9 @@ 
 			//make sure suburi follows the same rules as scriptName
 			if (substr(OC::$SUBURI, -9) != 'index.php') {
 				if (substr(OC::$SUBURI, -1) != '/') {
-					OC::$SUBURI = OC::$SUBURI . '/';
+					OC::$SUBURI = OC::$SUBURI.'/';
 				}
-				OC::$SUBURI = OC::$SUBURI . 'index.php';
+				OC::$SUBURI = OC::$SUBURI.'index.php';
 			}
 		}
 
@@ -165,7 +165,7 @@ 
 				OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
 
 				if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
-					OC::$WEBROOT = '/' . OC::$WEBROOT;
+					OC::$WEBROOT = '/'.OC::$WEBROOT;
 				}
 			} else {
 				// The scriptName is not ending with OC::$SUBURI
@@ -194,11 +194,11 @@ 
 					OC::$APPSROOTS[] = $paths;
 				}
 			}
-		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
-			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
-		} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+		} elseif (file_exists(OC::$SERVERROOT.'/apps')) {
+			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => true);
+		} elseif (file_exists(OC::$SERVERROOT.'/../apps')) {
 			OC::$APPSROOTS[] = array(
-				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
+				'path' => rtrim(dirname(OC::$SERVERROOT), '/').'/apps',
 				'url' => '/apps',
 				'writable' => true
 			);
@@ -228,8 +228,8 @@ 
 		$l = \OC::$server->getL10N('lib');
 
 		// Create config if it does not already exist
-		$configFilePath = self::$configDir .'/config.php';
-		if(!file_exists($configFilePath)) {
+		$configFilePath = self::$configDir.'/config.php';
+		if (!file_exists($configFilePath)) {
 			@touch($configFilePath);
 		}
 
@@ -244,13 +244,13 @@ 
 				echo $l->t('Cannot write into "config" directory!')."\n";
 				echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
 				echo "\n";
-				echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ])."\n";
+				echo $l->t('See %s', [$urlGenerator->linkToDocs('admin-dir_permissions')])."\n";
 				exit;
 			} else {
 				OC_Template::printErrorPage(
 					$l->t('Cannot write into "config" directory!'),
 					$l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s',
-					 [ $urlGenerator->linkToDocs('admin-dir_permissions') ])
+					 [$urlGenerator->linkToDocs('admin-dir_permissions')])
 				);
 			}
 		}
@@ -265,8 +265,8 @@ 
 			if (OC::$CLI) {
 				throw new Exception('Not installed');
 			} else {
-				$url = OC::$WEBROOT . '/index.php';
-				header('Location: ' . $url);
+				$url = OC::$WEBROOT.'/index.php';
+				header('Location: '.$url);
 			}
 			exit();
 		}
@@ -372,14 +372,14 @@ 
 		$incompatibleShippedApps = [];
 		foreach ($incompatibleApps as $appInfo) {
 			if ($appManager->isShipped($appInfo['id'])) {
-				$incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
+				$incompatibleShippedApps[] = $appInfo['name'].' ('.$appInfo['id'].')';
 			}
 		}
 
 		if (!empty($incompatibleShippedApps)) {
 			$l = \OC::$server->getL10N('core');
 			$hint = $l->t('The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]);
-			throw new \OC\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
+			throw new \OC\HintException('The files of the app '.implode(', ', $incompatibleShippedApps).' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
 		}
 
 		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
@@ -394,7 +394,7 @@ 
 		ini_set('session.cookie_httponly', true);
 
 		// set the cookie path to the Nextcloud directory
-		$cookie_path = OC::$WEBROOT ? : '/';
+		$cookie_path = OC::$WEBROOT ?: '/';
 		ini_set('session.cookie_path', $cookie_path);
 
 		// Let the session name be changed in the initSession Hook
@@ -428,7 +428,7 @@ 
 		// session timeout
 		if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
 			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), null, -1, self::$WEBROOT ? : '/');
+				setcookie(session_name(), null, -1, self::$WEBROOT ?: '/');
 			}
 			\OC::$server->getUserSession()->logout();
 		}
@@ -450,7 +450,7 @@ 
 				continue;
 			}
 
-			$file = $appPath . '/appinfo/classpath.php';
+			$file = $appPath.'/appinfo/classpath.php';
 			if (file_exists($file)) {
 				require_once $file;
 			}
@@ -478,14 +478,14 @@ 
 
 		// Append __Host to the cookie if it meets the requirements
 		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
 			$cookiePrefix = '__Host-';
 		}
 
-		foreach($policies as $policy) {
+		foreach ($policies as $policy) {
 			header(
 				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
 					$cookiePrefix,
 					$policy,
 					$cookieParams['path'],
@@ -516,31 +516,31 @@ 
 			// OS X Finder
 			'/^WebDAVFS/',
 		];
-		if($request->isUserAgent($incompatibleUserAgents)) {
+		if ($request->isUserAgent($incompatibleUserAgents)) {
 			return;
 		}
 
-		if(count($_COOKIE) > 0) {
+		if (count($_COOKIE) > 0) {
 			$requestUri = $request->getScriptName();
 			$processingScript = explode('/', $requestUri);
-			$processingScript = $processingScript[count($processingScript)-1];
+			$processingScript = $processingScript[count($processingScript) - 1];
 
 			// index.php routes are handled in the middleware
-			if($processingScript === 'index.php') {
+			if ($processingScript === 'index.php') {
 				return;
 			}
 
 			// All other endpoints require the lax and the strict cookie
-			if(!$request->passesStrictCookieCheck()) {
+			if (!$request->passesStrictCookieCheck()) {
 				self::sendSameSiteCookies();
 				// Debug mode gets access to the resources without strict cookie
 				// due to the fact that the SabreDAV browser also lives there.
-				if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
+				if (!\OC::$server->getConfig()->getSystemValue('debug', false)) {
 					http_response_code(\OCP\AppFramework\Http::STATUS_SERVICE_UNAVAILABLE);
 					exit();
 				}
 			}
-		} elseif(!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
+		} elseif (!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
 			self::sendSameSiteCookies();
 		}
 	}
@@ -551,12 +551,12 @@ 
 
 		// register autoloader
 		$loaderStart = microtime(true);
-		require_once __DIR__ . '/autoloader.php';
+		require_once __DIR__.'/autoloader.php';
 		self::$loader = new \OC\Autoloader([
-			OC::$SERVERROOT . '/lib/private/legacy',
+			OC::$SERVERROOT.'/lib/private/legacy',
 		]);
 		if (defined('PHPUNIT_RUN')) {
-			self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+			self::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
 		}
 		spl_autoload_register(array(self::$loader, 'load'));
 		$loaderEnd = microtime(true);
@@ -564,12 +564,12 @@ 
 		self::$CLI = (php_sapi_name() == 'cli');
 
 		// Add default composer PSR-4 autoloader
-		self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+		self::$composerAutoloader = require_once OC::$SERVERROOT.'/lib/composer/autoload.php';
 
 		try {
 			self::initPaths();
 			// setup 3rdparty autoloader
-			$vendorAutoLoad = OC::$SERVERROOT. '/3rdparty/autoload.php';
+			$vendorAutoLoad = OC::$SERVERROOT.'/3rdparty/autoload.php';
 			if (!file_exists($vendorAutoLoad)) {
 				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
 			}
@@ -579,7 +579,7 @@ 
 			if (!self::$CLI) {
 				$claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
 				$protocol = in_array($claimedProtocol, ['HTTP/1.0', 'HTTP/1.1', 'HTTP/2']) ? $claimedProtocol : 'HTTP/1.1';
-				header($protocol . ' ' . OC_Response::STATUS_SERVICE_UNAVAILABLE);
+				header($protocol.' '.OC_Response::STATUS_SERVICE_UNAVAILABLE);
 			}
 			// we can't use the template error page here, because this needs the
 			// DI container which isn't available yet
@@ -597,7 +597,7 @@ 
 		@ini_set('display_errors', 0);
 		@ini_set('log_errors', 1);
 
-		if(!date_default_timezone_set('UTC')) {
+		if (!date_default_timezone_set('UTC')) {
 			throw new \RuntimeException('Could not set timezone to UTC');
 		};
 
@@ -641,7 +641,7 @@ 
 		self::checkInstalled();
 
 		OC_Response::addSecurityHeaders();
-		if(self::$server->getRequest()->getServerProtocol() === 'https') {
+		if (self::$server->getRequest()->getServerProtocol() === 'https') {
 			ini_set('session.cookie_secure', true);
 		}
 
@@ -654,11 +654,11 @@ 
 					// Convert l10n string into regular string for usage in database
 					$staticErrors = [];
 					foreach ($errors as $error) {
-						echo $error['error'] . "\n";
-						echo $error['hint'] . "\n\n";
+						echo $error['error']."\n";
+						echo $error['hint']."\n\n";
 						$staticErrors[] = [
-							'error' => (string)$error['error'],
-							'hint' => (string)$error['hint'],
+							'error' => (string) $error['error'],
+							'hint' => (string) $error['hint'],
 						];
 					}
 
@@ -680,7 +680,7 @@ 
 		}
 		//try to set the session lifetime
 		$sessionLifeTime = self::getSessionLifeTime();
-		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
+		@ini_set('gc_maxlifetime', (string) $sessionLifeTime);
 
 		$systemConfig = \OC::$server->getSystemConfig();
 
@@ -726,7 +726,7 @@ 
 		register_shutdown_function(array($lockProvider, 'releaseAll'));
 
 		// Check whether the sample configuration has been copied
-		if($systemConfig->getValue('copied_sample_config', false)) {
+		if ($systemConfig->getValue('copied_sample_config', false)) {
 			$l = \OC::$server->getL10N('lib');
 			header('HTTP/1.1 503 Service Temporarily Unavailable');
 			header('Status: 503 Service Temporarily Unavailable');
@@ -752,7 +752,7 @@ 
 		) {
 			// Allow access to CSS resources
 			$isScssRequest = false;
-			if(strpos($request->getPathInfo(), '/css/') === 0) {
+			if (strpos($request->getPathInfo(), '/css/') === 0) {
 				$isScssRequest = true;
 			}
 
@@ -788,7 +788,7 @@ 
 
 			// NOTE: This will be replaced to use OCP
 			$userSession = self::$server->getUserSession();
-			$userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
+			$userSession->listen('\OC\User', 'postLogin', function() use ($userSession) {
 				if (!defined('PHPUNIT_RUN')) {
 					// reset brute force delay for this IP address and username
 					$uid = \OC::$server->getUserSession()->getUser()->getUID();
@@ -808,7 +808,7 @@ 
 				} catch (\Exception $e) {
 					// a GC exception should not prevent users from using OC,
 					// so log the exception
-					\OC::$server->getLogger()->warning('Exception when running cache gc: ' . $e->getMessage(), array('app' => 'core'));
+					\OC::$server->getLogger()->warning('Exception when running cache gc: '.$e->getMessage(), array('app' => 'core'));
 				}
 			});
 		}
@@ -824,7 +824,7 @@ 
 			/** @var \OCP\App\ManagerEvent $event */
 			$jobList = \OC::$server->getJobList();
 			$job = 'OC\\Settings\\RemoveOrphaned';
-			if(!($jobList->has($job, null))) {
+			if (!($jobList->has($job, null))) {
 				$jobList->add($job);
 			}
 		});
@@ -937,12 +937,12 @@ 
 		// emergency app disabling
 		if ($requestPath === '/disableapp'
 			&& $request->getMethod() === 'POST'
-			&& ((array)$request->getParam('appid')) !== ''
+			&& ((array) $request->getParam('appid')) !== ''
 		) {
 			\OCP\JSON::callCheck();
 			\OCP\JSON::checkAdminUser();
-			$appIds = (array)$request->getParam('appid');
-			foreach($appIds as $appId) {
+			$appIds = (array) $request->getParam('appid');
+			foreach ($appIds as $appId) {
 				$appId = \OC_App::cleanAppId($appId);
 				\OC_App::disable($appId);
 			}
@@ -957,7 +957,7 @@ 
 		if (!\OCP\Util::needUpgrade()
 			&& !$systemConfig->getValue('maintenance', false)) {
 			// For logged-in users: Load everything
-			if(\OC::$server->getUserSession()->isLoggedIn()) {
+			if (\OC::$server->getUserSession()->isLoggedIn()) {
 				OC_App::loadApps();
 			} else {
 				// For guests: Load only filesystem and logging

apps/dav/lib/Connector/Sabre/MaintenancePlugin.php

Indentation +48 added lines, -48 removed lines

@@ -33,58 +33,58 @@
 
 class MaintenancePlugin extends ServerPlugin {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var Server
+     */
+    private $server;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config = null) {
-		$this->config = $config;
-		if (is_null($config)) {
-			$this->config = \OC::$server->getConfig();
-		}
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config = null) {
+        $this->config = $config;
+        if (is_null($config)) {
+            $this->config = \OC::$server->getConfig();
+        }
+    }
 
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 1);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 1);
+    }
 
-	/**
-	 * This method is called before any HTTP method and returns http status code 503
-	 * in case the system is in maintenance mode.
-	 *
-	 * @throws ServiceUnavailable
-	 * @return bool
-	 */
-	public function checkMaintenanceMode() {
-		if ($this->config->getSystemValue('maintenance', false)) {
-			throw new ServiceUnavailable('System in maintenance mode.');
-		}
-		if (Util::needUpgrade()) {
-			throw new ServiceUnavailable('Upgrade needed');
-		}
+    /**
+     * This method is called before any HTTP method and returns http status code 503
+     * in case the system is in maintenance mode.
+     *
+     * @throws ServiceUnavailable
+     * @return bool
+     */
+    public function checkMaintenanceMode() {
+        if ($this->config->getSystemValue('maintenance', false)) {
+            throw new ServiceUnavailable('System in maintenance mode.');
+        }
+        if (Util::needUpgrade()) {
+            throw new ServiceUnavailable('Upgrade needed');
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

core/ajax/update.php

Indentation +181 added lines, -181 removed lines

@@ -31,7 +31,7 @@ 
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 
 require_once '../../lib/base.php';
@@ -45,191 +45,191 @@ 
 $eventSource->send('success', (string)$l->t('Preparing update'));
 
 class FeedBackHandler {
-	/** @var integer */
-	private $progressStateMax = 100;
-	/** @var integer */
-	private $progressStateStep = 0;
-	/** @var string */
-	private $currentStep;
-	/** @var \OCP\IEventSource */
-	private $eventSource;
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
-		$this->eventSource = $eventSource;
-		$this->l10n = $l10n;
-	}
-
-	public function handleRepairFeedback($event) {
-		if (!$event instanceof GenericEvent) {
-			return;
-		}
-
-		switch ($event->getSubject()) {
-			case '\OC\Repair::startProgress':
-				$this->progressStateMax = $event->getArgument(0);
-				$this->progressStateStep = 0;
-				$this->currentStep = $event->getArgument(1);
-				break;
-			case '\OC\Repair::advance':
-				$this->progressStateStep += $event->getArgument(0);
-				$desc = $event->getArgument(1);
-				if (empty($desc)) {
-					$desc = $this->currentStep;
-				}
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
-				break;
-			case '\OC\Repair::finishProgress':
-				$this->progressStateMax = $this->progressStateStep;
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
-				break;
-			case '\OC\Repair::step':
-				break;
-			case '\OC\Repair::info':
-				break;
-			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair warning: ') . $event->getArgument(0));
-				break;
-			case '\OC\Repair::error':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair error: ') . $event->getArgument(0));
-				break;
-		}
-	}
+    /** @var integer */
+    private $progressStateMax = 100;
+    /** @var integer */
+    private $progressStateStep = 0;
+    /** @var string */
+    private $currentStep;
+    /** @var \OCP\IEventSource */
+    private $eventSource;
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
+        $this->eventSource = $eventSource;
+        $this->l10n = $l10n;
+    }
+
+    public function handleRepairFeedback($event) {
+        if (!$event instanceof GenericEvent) {
+            return;
+        }
+
+        switch ($event->getSubject()) {
+            case '\OC\Repair::startProgress':
+                $this->progressStateMax = $event->getArgument(0);
+                $this->progressStateStep = 0;
+                $this->currentStep = $event->getArgument(1);
+                break;
+            case '\OC\Repair::advance':
+                $this->progressStateStep += $event->getArgument(0);
+                $desc = $event->getArgument(1);
+                if (empty($desc)) {
+                    $desc = $this->currentStep;
+                }
+                $this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
+                break;
+            case '\OC\Repair::finishProgress':
+                $this->progressStateMax = $this->progressStateStep;
+                $this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
+                break;
+            case '\OC\Repair::step':
+                break;
+            case '\OC\Repair::info':
+                break;
+            case '\OC\Repair::warning':
+                $this->eventSource->send('notice', (string)$this->l10n->t('Repair warning: ') . $event->getArgument(0));
+                break;
+            case '\OC\Repair::error':
+                $this->eventSource->send('notice', (string)$this->l10n->t('Repair error: ') . $event->getArgument(0));
+                break;
+        }
+    }
 }
 
 if (\OCP\Util::needUpgrade()) {
 
-	$config = \OC::$server->getSystemConfig();
-	if ($config->getValue('upgrade.disable-web', false)) {
-		$eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
-		$eventSource->close();
-		exit();
-	}
-
-	// if a user is currently logged in, their session must be ignored to
-	// avoid side effects
-	\OC_User::setIncognitoMode(true);
-
-	$logger = \OC::$server->getLogger();
-	$config = \OC::$server->getConfig();
-	$updater = new \OC\Updater(
-			$config,
-			\OC::$server->getIntegrityCodeChecker(),
-			$logger,
-			\OC::$server->query(\OC\Installer::class)
-	);
-	$incompatibleApps = [];
-	$disabledThirdPartyApps = [];
-
-	$dispatcher = \OC::$server->getEventDispatcher();
-	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$feedBack = new FeedBackHandler($eventSource, $l);
-	$dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
-
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updating database schema'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated database'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking updates of apps'));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version)));
-	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[]= $app;
-	});
-	$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use (&$disabledThirdPartyApps) {
-		$disabledThirdPartyApps[]= $app;
-	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
-		$eventSource->send('failure', $message);
-		$eventSource->close();
-		$config->setSystemValue('maintenance', false);
-	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Set log level to debug'));
-	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Reset log level'));
-	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Starting code integrity check'));
-	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Finished code integrity check'));
-	});
-
-	try {
-		$updater->upgrade();
-	} catch (\Exception $e) {
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
-		$eventSource->close();
-		exit();
-	}
-
-	$disabledApps = [];
-	foreach ($disabledThirdPartyApps as $app) {
-		$disabledApps[$app] = (string) $l->t('%s (3rdparty)', [$app]);
-	}
-	foreach ($incompatibleApps as $app) {
-		$disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
-	}
-
-	if (!empty($disabledApps)) {
-		$eventSource->send('notice',
-			(string)$l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
-	}
+    $config = \OC::$server->getSystemConfig();
+    if ($config->getValue('upgrade.disable-web', false)) {
+        $eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+        $eventSource->close();
+        exit();
+    }
+
+    // if a user is currently logged in, their session must be ignored to
+    // avoid side effects
+    \OC_User::setIncognitoMode(true);
+
+    $logger = \OC::$server->getLogger();
+    $config = \OC::$server->getConfig();
+    $updater = new \OC\Updater(
+            $config,
+            \OC::$server->getIntegrityCodeChecker(),
+            $logger,
+            \OC::$server->query(\OC\Installer::class)
+    );
+    $incompatibleApps = [];
+    $disabledThirdPartyApps = [];
+
+    $dispatcher = \OC::$server->getEventDispatcher();
+    $dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $feedBack = new FeedBackHandler($eventSource, $l);
+    $dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
+
+    $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updating database schema'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updated database'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked database schema update'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking updates of apps'));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version)));
+    });
+    $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
+        $incompatibleApps[]= $app;
+    });
+    $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use (&$disabledThirdPartyApps) {
+        $disabledThirdPartyApps[]= $app;
+    });
+    $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
+        $eventSource->send('failure', $message);
+        $eventSource->close();
+        $config->setSystemValue('maintenance', false);
+    });
+    $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Set log level to debug'));
+    });
+    $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Reset log level'));
+    });
+    $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Starting code integrity check'));
+    });
+    $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
+        $eventSource->send('success', (string)$l->t('Finished code integrity check'));
+    });
+
+    try {
+        $updater->upgrade();
+    } catch (\Exception $e) {
+        $eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+        $eventSource->close();
+        exit();
+    }
+
+    $disabledApps = [];
+    foreach ($disabledThirdPartyApps as $app) {
+        $disabledApps[$app] = (string) $l->t('%s (3rdparty)', [$app]);
+    }
+    foreach ($incompatibleApps as $app) {
+        $disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
+    }
+
+    if (!empty($disabledApps)) {
+        $eventSource->send('notice',
+            (string)$l->t('Following apps have been disabled: %s', [implode(', ', $disabledApps)]));
+    }
 } else {
-	$eventSource->send('notice', (string)$l->t('Already up to date'));
+    $eventSource->send('notice', (string)$l->t('Already up to date'));
 }
 
 $eventSource->send('done', '');

core/Command/Upgrade.php

Indentation +242 added lines, -242 removed lines

@@ -49,263 +49,263 @@
 
 class Upgrade extends Command {
 
-	const ERROR_SUCCESS = 0;
-	const ERROR_NOT_INSTALLED = 1;
-	const ERROR_MAINTENANCE_MODE = 2;
-	const ERROR_UP_TO_DATE = 0;
-	const ERROR_INVALID_ARGUMENTS = 4;
-	const ERROR_FAILURE = 5;
+    const ERROR_SUCCESS = 0;
+    const ERROR_NOT_INSTALLED = 1;
+    const ERROR_MAINTENANCE_MODE = 2;
+    const ERROR_UP_TO_DATE = 0;
+    const ERROR_INVALID_ARGUMENTS = 4;
+    const ERROR_FAILURE = 5;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param Installer $installer
-	 */
-	public function __construct(IConfig $config, ILogger $logger, Installer $installer) {
-		parent::__construct();
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->installer = $installer;
-	}
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param Installer $installer
+     */
+    public function __construct(IConfig $config, ILogger $logger, Installer $installer) {
+        parent::__construct();
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->installer = $installer;
+    }
 
-	protected function configure() {
-		$this
-			->setName('upgrade')
-			->setDescription('run upgrade routines after installation of a new release. The release has to be installed before.')
-			->addOption(
-				'--no-app-disable',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the disable of third party apps'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('upgrade')
+            ->setDescription('run upgrade routines after installation of a new release. The release has to be installed before.')
+            ->addOption(
+                '--no-app-disable',
+                null,
+                InputOption::VALUE_NONE,
+                'skips the disable of third party apps'
+            );
+    }
 
-	/**
-	 * Execute the upgrade command
-	 *
-	 * @param InputInterface $input input interface
-	 * @param OutputInterface $output output interface
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    /**
+     * Execute the upgrade command
+     *
+     * @param InputInterface $input input interface
+     * @param OutputInterface $output output interface
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		if(Util::needUpgrade()) {
-			if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-				// Prepend each line with a little timestamp
-				$timestampFormatter = new TimestampFormatter($this->config, $output->getFormatter());
-				$output->setFormatter($timestampFormatter);
-			}
+        if(Util::needUpgrade()) {
+            if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+                // Prepend each line with a little timestamp
+                $timestampFormatter = new TimestampFormatter($this->config, $output->getFormatter());
+                $output->setFormatter($timestampFormatter);
+            }
 
-			$self = $this;
-			$updater = new Updater(
-					$this->config,
-					\OC::$server->getIntegrityCodeChecker(),
-					$this->logger,
-					$this->installer
-			);
+            $self = $this;
+            $updater = new Updater(
+                    $this->config,
+                    \OC::$server->getIntegrityCodeChecker(),
+                    $this->logger,
+                    $this->installer
+            );
 
-			if ($input->getOption('no-app-disable')) {
-				$updater->setSkip3rdPartyAppsDisable(true);
-			}
-			$dispatcher = \OC::$server->getEventDispatcher();
-			$progress = new ProgressBar($output);
-			$progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%");
-			$listener = function($event) use ($progress, $output) {
-				if ($event instanceof GenericEvent) {
-					$message = $event->getSubject();
-					if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-						$output->writeln(' Checking table ' . $message);
-					} else {
-						if (strlen($message) > 60) {
-							$message = substr($message, 0, 57) . '...';
-						}
-						$progress->setMessage($message);
-						if ($event[0] === 1) {
-							$output->writeln('');
-							$progress->start($event[1]);
-						}
-						$progress->setProgress($event[0]);
-						if ($event[0] === $event[1]) {
-							$progress->setMessage('Done');
-							$progress->finish();
-							$output->writeln('');
-						}
-					}
-				}
-			};
-			$repairListener = function($event) use ($progress, $output) {
-				if (!$event instanceof GenericEvent) {
-					return;
-				}
-				switch ($event->getSubject()) {
-					case '\OC\Repair::startProgress':
-						$progress->setMessage('Starting ...');
-						$output->writeln($event->getArgument(1));
-						$output->writeln('');
-						$progress->start($event->getArgument(0));
-						break;
-					case '\OC\Repair::advance':
-						$desc = $event->getArgument(1);
-						if (!empty($desc)) {
-							$progress->setMessage($desc);
-						}
-						$progress->advance($event->getArgument(0));
+            if ($input->getOption('no-app-disable')) {
+                $updater->setSkip3rdPartyAppsDisable(true);
+            }
+            $dispatcher = \OC::$server->getEventDispatcher();
+            $progress = new ProgressBar($output);
+            $progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%");
+            $listener = function($event) use ($progress, $output) {
+                if ($event instanceof GenericEvent) {
+                    $message = $event->getSubject();
+                    if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+                        $output->writeln(' Checking table ' . $message);
+                    } else {
+                        if (strlen($message) > 60) {
+                            $message = substr($message, 0, 57) . '...';
+                        }
+                        $progress->setMessage($message);
+                        if ($event[0] === 1) {
+                            $output->writeln('');
+                            $progress->start($event[1]);
+                        }
+                        $progress->setProgress($event[0]);
+                        if ($event[0] === $event[1]) {
+                            $progress->setMessage('Done');
+                            $progress->finish();
+                            $output->writeln('');
+                        }
+                    }
+                }
+            };
+            $repairListener = function($event) use ($progress, $output) {
+                if (!$event instanceof GenericEvent) {
+                    return;
+                }
+                switch ($event->getSubject()) {
+                    case '\OC\Repair::startProgress':
+                        $progress->setMessage('Starting ...');
+                        $output->writeln($event->getArgument(1));
+                        $output->writeln('');
+                        $progress->start($event->getArgument(0));
+                        break;
+                    case '\OC\Repair::advance':
+                        $desc = $event->getArgument(1);
+                        if (!empty($desc)) {
+                            $progress->setMessage($desc);
+                        }
+                        $progress->advance($event->getArgument(0));
 
-						break;
-					case '\OC\Repair::finishProgress':
-						$progress->setMessage('Done');
-						$progress->finish();
-						$output->writeln('');
-						break;
-					case '\OC\Repair::step':
-						if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair step: ' . $event->getArgument(0) . '</info>');
-						}
-						break;
-					case '\OC\Repair::info':
-						if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair info: ' . $event->getArgument(0) . '</info>');
-						}
-						break;
-					case '\OC\Repair::warning':
-						$output->writeln('<error>Repair warning: ' . $event->getArgument(0) . '</error>');
-						break;
-					case '\OC\Repair::error':
-						$output->writeln('<error>Repair error: ' . $event->getArgument(0) . '</error>');
-						break;
-				}
-			};
+                        break;
+                    case '\OC\Repair::finishProgress':
+                        $progress->setMessage('Done');
+                        $progress->finish();
+                        $output->writeln('');
+                        break;
+                    case '\OC\Repair::step':
+                        if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+                            $output->writeln('<info>Repair step: ' . $event->getArgument(0) . '</info>');
+                        }
+                        break;
+                    case '\OC\Repair::info':
+                        if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+                            $output->writeln('<info>Repair info: ' . $event->getArgument(0) . '</info>');
+                        }
+                        break;
+                    case '\OC\Repair::warning':
+                        $output->writeln('<error>Repair warning: ' . $event->getArgument(0) . '</error>');
+                        break;
+                    case '\OC\Repair::error':
+                        $output->writeln('<error>Repair error: ' . $event->getArgument(0) . '</error>');
+                        break;
+                }
+            };
 
-			$dispatcher->addListener('\OC\DB\Migrator::executeSql', $listener);
-			$dispatcher->addListener('\OC\DB\Migrator::checkTable', $listener);
-			$dispatcher->addListener('\OC\Repair::startProgress', $repairListener);
-			$dispatcher->addListener('\OC\Repair::advance', $repairListener);
-			$dispatcher->addListener('\OC\Repair::finishProgress', $repairListener);
-			$dispatcher->addListener('\OC\Repair::step', $repairListener);
-			$dispatcher->addListener('\OC\Repair::info', $repairListener);
-			$dispatcher->addListener('\OC\Repair::warning', $repairListener);
-			$dispatcher->addListener('\OC\Repair::error', $repairListener);
+            $dispatcher->addListener('\OC\DB\Migrator::executeSql', $listener);
+            $dispatcher->addListener('\OC\DB\Migrator::checkTable', $listener);
+            $dispatcher->addListener('\OC\Repair::startProgress', $repairListener);
+            $dispatcher->addListener('\OC\Repair::advance', $repairListener);
+            $dispatcher->addListener('\OC\Repair::finishProgress', $repairListener);
+            $dispatcher->addListener('\OC\Repair::step', $repairListener);
+            $dispatcher->addListener('\OC\Repair::info', $repairListener);
+            $dispatcher->addListener('\OC\Repair::warning', $repairListener);
+            $dispatcher->addListener('\OC\Repair::error', $repairListener);
 			
 
-			$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) {
-				$output->writeln('<info>Turned on maintenance mode</info>');
-			});
-			$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use($output) {
-				$output->writeln('<info>Turned off maintenance mode</info>');
-			});
-			$updater->listen('\OC\Updater', 'maintenanceActive', function () use($output) {
-				$output->writeln('<info>Maintenance mode is kept active</info>');
-			});
-			$updater->listen('\OC\Updater', 'updateEnd',
-				function ($success) use($output, $self) {
-					if ($success) {
-						$message = "<info>Update successful</info>";
-					} else {
-						$message = "<error>Update failed</error>";
-					}
-					$output->writeln($message);
-				});
-			$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($output) {
-				$output->writeln('<info>Updating database schema</info>');
-			});
-			$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
-				$output->writeln('<info>Updated database</info>');
-			});
-			$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($output) {
-				$output->writeln('<info>Checking whether the database schema can be updated (this can take a long time depending on the database size)</info>');
-			});
-			$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use($output) {
-				$output->writeln('<info>Checked database schema update</info>');
-			});
-			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
-				$output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
-			});
-			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
-				$output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>');
-			});
-			$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($output) {
-				$output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
-			});
-			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) {
-				$output->writeln('<info>Update app ' . $app . ' from appstore</info>');
-			});
-			$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use($output) {
-				$output->writeln('<info>Checked for update of app "' . $app . '" in appstore </info>');
-			});
-			$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($output) {
-				$output->writeln('<info>Checking updates of apps</info>');
-			});
-			$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) {
-				$output->writeln("<info>Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)</info>");
-			});
-			$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) {
-				$output->writeln('<info>Checked database schema update for apps</info>');
-			});
-			$updater->listen('\OC\Updater', 'appUpgradeStarted', function ($app, $version) use ($output) {
-				$output->writeln("<info>Updating <$app> ...</info>");
-			});
-			$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) {
-				$output->writeln("<info>Updated <$app> to $version</info>");
-			});
-			$updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) {
-				$output->writeln("<error>$message</error>");
-			});
-			$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($output) {
-				$output->writeln("<info>Set log level to debug</info>");
-			});
-			$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($output) {
-				$output->writeln("<info>Reset log level</info>");
-			});
-			$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($output) {
-				$output->writeln("<info>Starting code integrity check...</info>");
-			});
-			$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($output) {
-				$output->writeln("<info>Finished code integrity check</info>");
-			});
+            $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) {
+                $output->writeln('<info>Turned on maintenance mode</info>');
+            });
+            $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use($output) {
+                $output->writeln('<info>Turned off maintenance mode</info>');
+            });
+            $updater->listen('\OC\Updater', 'maintenanceActive', function () use($output) {
+                $output->writeln('<info>Maintenance mode is kept active</info>');
+            });
+            $updater->listen('\OC\Updater', 'updateEnd',
+                function ($success) use($output, $self) {
+                    if ($success) {
+                        $message = "<info>Update successful</info>";
+                    } else {
+                        $message = "<error>Update failed</error>";
+                    }
+                    $output->writeln($message);
+                });
+            $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($output) {
+                $output->writeln('<info>Updating database schema</info>');
+            });
+            $updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
+                $output->writeln('<info>Updated database</info>');
+            });
+            $updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($output) {
+                $output->writeln('<info>Checking whether the database schema can be updated (this can take a long time depending on the database size)</info>');
+            });
+            $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use($output) {
+                $output->writeln('<info>Checked database schema update</info>');
+            });
+            $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
+                $output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
+            });
+            $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
+                $output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>');
+            });
+            $updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($output) {
+                $output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
+            });
+            $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) {
+                $output->writeln('<info>Update app ' . $app . ' from appstore</info>');
+            });
+            $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use($output) {
+                $output->writeln('<info>Checked for update of app "' . $app . '" in appstore </info>');
+            });
+            $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($output) {
+                $output->writeln('<info>Checking updates of apps</info>');
+            });
+            $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) {
+                $output->writeln("<info>Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)</info>");
+            });
+            $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) {
+                $output->writeln('<info>Checked database schema update for apps</info>');
+            });
+            $updater->listen('\OC\Updater', 'appUpgradeStarted', function ($app, $version) use ($output) {
+                $output->writeln("<info>Updating <$app> ...</info>");
+            });
+            $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) {
+                $output->writeln("<info>Updated <$app> to $version</info>");
+            });
+            $updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) {
+                $output->writeln("<error>$message</error>");
+            });
+            $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($output) {
+                $output->writeln("<info>Set log level to debug</info>");
+            });
+            $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($output) {
+                $output->writeln("<info>Reset log level</info>");
+            });
+            $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($output) {
+                $output->writeln("<info>Starting code integrity check...</info>");
+            });
+            $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($output) {
+                $output->writeln("<info>Finished code integrity check</info>");
+            });
 
-			$success = $updater->upgrade();
+            $success = $updater->upgrade();
 
-			$this->postUpgradeCheck($input, $output);
+            $this->postUpgradeCheck($input, $output);
 
-			if(!$success) {
-				return self::ERROR_FAILURE;
-			}
+            if(!$success) {
+                return self::ERROR_FAILURE;
+            }
 
-			return self::ERROR_SUCCESS;
-		} else if($this->config->getSystemValue('maintenance', false)) {
-			//Possible scenario: Nextcloud core is updated but an app failed
-			$output->writeln('<warning>Nextcloud is in maintenance mode</warning>');
-			$output->write('<comment>Maybe an upgrade is already in process. Please check the '
-				. 'logfile (data/nextcloud.log). If you want to re-run the '
-				. 'upgrade procedure, remove the "maintenance mode" from '
-				. 'config.php and call this script again.</comment>'
-				, true);
-			return self::ERROR_MAINTENANCE_MODE;
-		} else {
-			$output->writeln('<info>Nextcloud is already latest version</info>');
-			return self::ERROR_UP_TO_DATE;
-		}
-	}
+            return self::ERROR_SUCCESS;
+        } else if($this->config->getSystemValue('maintenance', false)) {
+            //Possible scenario: Nextcloud core is updated but an app failed
+            $output->writeln('<warning>Nextcloud is in maintenance mode</warning>');
+            $output->write('<comment>Maybe an upgrade is already in process. Please check the '
+                . 'logfile (data/nextcloud.log). If you want to re-run the '
+                . 'upgrade procedure, remove the "maintenance mode" from '
+                . 'config.php and call this script again.</comment>'
+                , true);
+            return self::ERROR_MAINTENANCE_MODE;
+        } else {
+            $output->writeln('<info>Nextcloud is already latest version</info>');
+            return self::ERROR_UP_TO_DATE;
+        }
+    }
 
-	/**
-	 * Perform a post upgrade check (specific to the command line tool)
-	 *
-	 * @param InputInterface $input input interface
-	 * @param OutputInterface $output output interface
-	 */
-	protected function postUpgradeCheck(InputInterface $input, OutputInterface $output) {
-		$trustedDomains = $this->config->getSystemValue('trusted_domains', array());
-		if (empty($trustedDomains)) {
-			$output->write(
-				'<warning>The setting "trusted_domains" could not be ' .
-				'set automatically by the upgrade script, ' .
-				'please set it manually</warning>'
-			);
-		}
-	}
+    /**
+     * Perform a post upgrade check (specific to the command line tool)
+     *
+     * @param InputInterface $input input interface
+     * @param OutputInterface $output output interface
+     */
+    protected function postUpgradeCheck(InputInterface $input, OutputInterface $output) {
+        $trustedDomains = $this->config->getSystemValue('trusted_domains', array());
+        if (empty($trustedDomains)) {
+            $output->write(
+                '<warning>The setting "trusted_domains" could not be ' .
+                'set automatically by the upgrade script, ' .
+                'please set it manually</warning>'
+            );
+        }
+    }
 }

Spacing +41 added lines, -41 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 
-		if(Util::needUpgrade()) {
+		if (Util::needUpgrade()) {
 			if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
 				// Prepend each line with a little timestamp
 				$timestampFormatter = new TimestampFormatter($this->config, $output->getFormatter());
@@ -119,10 +119,10 @@ 
 				if ($event instanceof GenericEvent) {
 					$message = $event->getSubject();
 					if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-						$output->writeln(' Checking table ' . $message);
+						$output->writeln(' Checking table '.$message);
 					} else {
 						if (strlen($message) > 60) {
-							$message = substr($message, 0, 57) . '...';
+							$message = substr($message, 0, 57).'...';
 						}
 						$progress->setMessage($message);
 						if ($event[0] === 1) {
@@ -163,20 +163,20 @@ 
 						$output->writeln('');
 						break;
 					case '\OC\Repair::step':
-						if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair step: ' . $event->getArgument(0) . '</info>');
+						if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+							$output->writeln('<info>Repair step: '.$event->getArgument(0).'</info>');
 						}
 						break;
 					case '\OC\Repair::info':
-						if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair info: ' . $event->getArgument(0) . '</info>');
+						if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+							$output->writeln('<info>Repair info: '.$event->getArgument(0).'</info>');
 						}
 						break;
 					case '\OC\Repair::warning':
-						$output->writeln('<error>Repair warning: ' . $event->getArgument(0) . '</error>');
+						$output->writeln('<error>Repair warning: '.$event->getArgument(0).'</error>');
 						break;
 					case '\OC\Repair::error':
-						$output->writeln('<error>Repair error: ' . $event->getArgument(0) . '</error>');
+						$output->writeln('<error>Repair error: '.$event->getArgument(0).'</error>');
 						break;
 				}
 			};
@@ -192,17 +192,17 @@ 
 			$dispatcher->addListener('\OC\Repair::error', $repairListener);
 			
 
-			$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) {
+			$updater->listen('\OC\Updater', 'maintenanceEnabled', function() use($output) {
 				$output->writeln('<info>Turned on maintenance mode</info>');
 			});
-			$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use($output) {
+			$updater->listen('\OC\Updater', 'maintenanceDisabled', function() use($output) {
 				$output->writeln('<info>Turned off maintenance mode</info>');
 			});
-			$updater->listen('\OC\Updater', 'maintenanceActive', function () use($output) {
+			$updater->listen('\OC\Updater', 'maintenanceActive', function() use($output) {
 				$output->writeln('<info>Maintenance mode is kept active</info>');
 			});
 			$updater->listen('\OC\Updater', 'updateEnd',
-				function ($success) use($output, $self) {
+				function($success) use($output, $self) {
 					if ($success) {
 						$message = "<info>Update successful</info>";
 					} else {
@@ -210,61 +210,61 @@ 
 					}
 					$output->writeln($message);
 				});
-			$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbUpgradeBefore', function() use($output) {
 				$output->writeln('<info>Updating database schema</info>');
 			});
-			$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbUpgrade', function() use($output) {
 				$output->writeln('<info>Updated database</info>');
 			});
-			$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function() use($output) {
 				$output->writeln('<info>Checking whether the database schema can be updated (this can take a long time depending on the database size)</info>');
 			});
-			$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function() use($output) {
 				$output->writeln('<info>Checked database schema update</info>');
 			});
-			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
-				$output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
+			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function($app) use($output) {
+				$output->writeln('<comment>Disabled incompatible app: '.$app.'</comment>');
 			});
-			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
-				$output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>');
+			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function($app) use ($output) {
+				$output->writeln('<comment>Disabled 3rd-party app: '.$app.'</comment>');
 			});
-			$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($output) {
-				$output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
+			$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function($app) use($output) {
+				$output->writeln('<info>Checking for update of app '.$app.' in appstore</info>');
 			});
-			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) {
-				$output->writeln('<info>Update app ' . $app . ' from appstore</info>');
+			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function($app) use($output) {
+				$output->writeln('<info>Update app '.$app.' from appstore</info>');
 			});
-			$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use($output) {
-				$output->writeln('<info>Checked for update of app "' . $app . '" in appstore </info>');
+			$updater->listen('\OC\Updater', 'checkAppStoreApp', function($app) use($output) {
+				$output->writeln('<info>Checked for update of app "'.$app.'" in appstore </info>');
 			});
-			$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function() use ($output) {
 				$output->writeln('<info>Checking updates of apps</info>');
 			});
-			$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) {
+			$updater->listen('\OC\Updater', 'appSimulateUpdate', function($app) use ($output) {
 				$output->writeln("<info>Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)</info>");
 			});
-			$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgradeCheck', function() use ($output) {
 				$output->writeln('<info>Checked database schema update for apps</info>');
 			});
-			$updater->listen('\OC\Updater', 'appUpgradeStarted', function ($app, $version) use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgradeStarted', function($app, $version) use ($output) {
 				$output->writeln("<info>Updating <$app> ...</info>");
 			});
-			$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgrade', function($app, $version) use ($output) {
 				$output->writeln("<info>Updated <$app> to $version</info>");
 			});
-			$updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) {
+			$updater->listen('\OC\Updater', 'failure', function($message) use($output, $self) {
 				$output->writeln("<error>$message</error>");
 			});
-			$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($output) {
+			$updater->listen('\OC\Updater', 'setDebugLogLevel', function($logLevel, $logLevelName) use($output) {
 				$output->writeln("<info>Set log level to debug</info>");
 			});
-			$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($output) {
+			$updater->listen('\OC\Updater', 'resetLogLevel', function($logLevel, $logLevelName) use($output) {
 				$output->writeln("<info>Reset log level</info>");
 			});
-			$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($output) {
+			$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function() use($output) {
 				$output->writeln("<info>Starting code integrity check...</info>");
 			});
-			$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($output) {
+			$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use($output) {
 				$output->writeln("<info>Finished code integrity check</info>");
 			});
 
@@ -272,12 +272,12 @@ 
 
 			$this->postUpgradeCheck($input, $output);
 
-			if(!$success) {
+			if (!$success) {
 				return self::ERROR_FAILURE;
 			}
 
 			return self::ERROR_SUCCESS;
-		} else if($this->config->getSystemValue('maintenance', false)) {
+		} else if ($this->config->getSystemValue('maintenance', false)) {
 			//Possible scenario: Nextcloud core is updated but an app failed
 			$output->writeln('<warning>Nextcloud is in maintenance mode</warning>');
 			$output->write('<comment>Maybe an upgrade is already in process. Please check the '
@@ -302,8 +302,8 @@ 
 		$trustedDomains = $this->config->getSystemValue('trusted_domains', array());
 		if (empty($trustedDomains)) {
 			$output->write(
-				'<warning>The setting "trusted_domains" could not be ' .
-				'set automatically by the upgrade script, ' .
+				'<warning>The setting "trusted_domains" could not be '.
+				'set automatically by the upgrade script, '.
 				'please set it manually</warning>'
 			);
 		}