nextcloud / server

apps/updatenotification/lib/Notification/BackgroundJob.php

Indentation +228 added lines, -228 removed lines

@@ -36,232 +36,232 @@
 
 class BackgroundJob extends TimedJob {
 
-	protected $connectionNotifications = [3, 7, 14, 30];
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IManager */
-	protected $notificationManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IClientService */
-	protected $client;
-
-	/** @var Installer */
-	protected $installer;
-
-	/** @var string[] */
-	protected $users;
-
-	/**
-	 * NotificationBackgroundJob constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IManager $notificationManager
-	 * @param IGroupManager $groupManager
-	 * @param IAppManager $appManager
-	 * @param IClientService $client
-	 * @param Installer $installer
-	 */
-	public function __construct(IConfig $config, IManager $notificationManager, IGroupManager $groupManager, IAppManager $appManager, IClientService $client, Installer $installer) {
-		// Run once a day
-		$this->setInterval(60 * 60 * 24);
-
-		$this->config = $config;
-		$this->notificationManager = $notificationManager;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->client = $client;
-		$this->installer = $installer;
-	}
-
-	protected function run($argument) {
-		$this->checkCoreUpdate();
-		$this->checkAppUpdates();
-	}
-
-	/**
-	 * Check for ownCloud update
-	 */
-	protected function checkCoreUpdate() {
-		if (in_array($this->getChannel(), ['daily', 'git'], true)) {
-			// "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
-			return;
-		}
-
-		$updater = $this->createVersionCheck();
-
-		$status = $updater->check();
-		if ($status === false) {
-			$errors = 1 + (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
-			$this->config->setAppValue('updatenotification', 'update_check_errors', $errors);
-
-			if (in_array($errors, $this->connectionNotifications, true)) {
-				$this->sendErrorNotifications($errors);
-			}
-		} else if (is_array($status)) {
-			$this->config->setAppValue('updatenotification', 'update_check_errors', 0);
-			$this->clearErrorNotifications();
-
-			if (isset($status['version'])) {
-				$this->createNotifications('core', $status['version'], $status['versionstring']);
-			}
-		}
-	}
-
-	/**
-	 * Send a message to the admin when the update server could not be reached
-	 * @param int $numDays
-	 */
-	protected function sendErrorNotifications($numDays) {
-		$this->clearErrorNotifications();
-
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setDateTime(new \DateTime())
-				->setObject('updatenotification', 'error')
-				->setSubject('connection_error', ['days' => $numDays]);
-
-			foreach ($this->getUsersToNotify() as $uid) {
-				$notification->setUser($uid);
-				$this->notificationManager->notify($notification);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-	}
-
-	/**
-	 * Remove error notifications again
-	 */
-	protected function clearErrorNotifications() {
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setSubject('connection_error')
-				->setObject('updatenotification', 'error');
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * Check all installed apps for updates
-	 */
-	protected function checkAppUpdates() {
-		$apps = $this->appManager->getInstalledApps();
-		foreach ($apps as $app) {
-			$update = $this->isUpdateAvailable($app);
-			if ($update !== false) {
-				$this->createNotifications($app, $update);
-			}
-		}
-	}
-
-	/**
-	 * Create notifications for this app version
-	 *
-	 * @param string $app
-	 * @param string $version
-	 * @param string $visibleVersion
-	 */
-	protected function createNotifications($app, $version, $visibleVersion = '') {
-		$lastNotification = $this->config->getAppValue('updatenotification', $app, false);
-		if ($lastNotification === $version) {
-			// We already notified about this update
-			return;
-		} else if ($lastNotification !== false) {
-			// Delete old updates
-			$this->deleteOutdatedNotifications($app, $lastNotification);
-		}
-
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('updatenotification')
-			->setDateTime(new \DateTime())
-			->setObject($app, $version);
-
-		if ($visibleVersion !== '') {
-			$notification->setSubject('update_available', ['version' => $visibleVersion]);
-		} else {
-			$notification->setSubject('update_available');
-		}
-
-		foreach ($this->getUsersToNotify() as $uid) {
-			$notification->setUser($uid);
-			$this->notificationManager->notify($notification);
-		}
-
-		$this->config->setAppValue('updatenotification', $app, $version);
-	}
-
-	/**
-	 * @return string[]
-	 */
-	protected function getUsersToNotify() {
-		if ($this->users !== null) {
-			return $this->users;
-		}
-
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-		$this->users = [];
-		foreach ($notifyGroups as $group) {
-			$groupToNotify = $this->groupManager->get($group);
-			if ($groupToNotify instanceof IGroup) {
-				foreach ($groupToNotify->getUsers() as $user) {
-					$this->users[$user->getUID()] = true;
-				}
-			}
-		}
-
-		$this->users = array_keys($this->users);
-
-		return $this->users;
-	}
-
-	/**
-	 * Delete notifications for old updates
-	 *
-	 * @param string $app
-	 * @param string $version
-	 */
-	protected function deleteOutdatedNotifications($app, $version) {
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('updatenotification')
-			->setObject($app, $version);
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * @return VersionCheck
-	 */
-	protected function createVersionCheck() {
-		return new VersionCheck(
-			$this->client,
-			$this->config
-		);
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getChannel() {
-		return \OC_Util::getChannel();
-	}
-
-	/**
-	 * @param string $app
-	 * @return string|false
-	 */
-	protected function isUpdateAvailable($app) {
-		return $this->installer->isUpdateAvailable($app);
-	}
+    protected $connectionNotifications = [3, 7, 14, 30];
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IManager */
+    protected $notificationManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /** @var IClientService */
+    protected $client;
+
+    /** @var Installer */
+    protected $installer;
+
+    /** @var string[] */
+    protected $users;
+
+    /**
+     * NotificationBackgroundJob constructor.
+     *
+     * @param IConfig $config
+     * @param IManager $notificationManager
+     * @param IGroupManager $groupManager
+     * @param IAppManager $appManager
+     * @param IClientService $client
+     * @param Installer $installer
+     */
+    public function __construct(IConfig $config, IManager $notificationManager, IGroupManager $groupManager, IAppManager $appManager, IClientService $client, Installer $installer) {
+        // Run once a day
+        $this->setInterval(60 * 60 * 24);
+
+        $this->config = $config;
+        $this->notificationManager = $notificationManager;
+        $this->groupManager = $groupManager;
+        $this->appManager = $appManager;
+        $this->client = $client;
+        $this->installer = $installer;
+    }
+
+    protected function run($argument) {
+        $this->checkCoreUpdate();
+        $this->checkAppUpdates();
+    }
+
+    /**
+     * Check for ownCloud update
+     */
+    protected function checkCoreUpdate() {
+        if (in_array($this->getChannel(), ['daily', 'git'], true)) {
+            // "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
+            return;
+        }
+
+        $updater = $this->createVersionCheck();
+
+        $status = $updater->check();
+        if ($status === false) {
+            $errors = 1 + (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
+            $this->config->setAppValue('updatenotification', 'update_check_errors', $errors);
+
+            if (in_array($errors, $this->connectionNotifications, true)) {
+                $this->sendErrorNotifications($errors);
+            }
+        } else if (is_array($status)) {
+            $this->config->setAppValue('updatenotification', 'update_check_errors', 0);
+            $this->clearErrorNotifications();
+
+            if (isset($status['version'])) {
+                $this->createNotifications('core', $status['version'], $status['versionstring']);
+            }
+        }
+    }
+
+    /**
+     * Send a message to the admin when the update server could not be reached
+     * @param int $numDays
+     */
+    protected function sendErrorNotifications($numDays) {
+        $this->clearErrorNotifications();
+
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setDateTime(new \DateTime())
+                ->setObject('updatenotification', 'error')
+                ->setSubject('connection_error', ['days' => $numDays]);
+
+            foreach ($this->getUsersToNotify() as $uid) {
+                $notification->setUser($uid);
+                $this->notificationManager->notify($notification);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+    }
+
+    /**
+     * Remove error notifications again
+     */
+    protected function clearErrorNotifications() {
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setSubject('connection_error')
+                ->setObject('updatenotification', 'error');
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * Check all installed apps for updates
+     */
+    protected function checkAppUpdates() {
+        $apps = $this->appManager->getInstalledApps();
+        foreach ($apps as $app) {
+            $update = $this->isUpdateAvailable($app);
+            if ($update !== false) {
+                $this->createNotifications($app, $update);
+            }
+        }
+    }
+
+    /**
+     * Create notifications for this app version
+     *
+     * @param string $app
+     * @param string $version
+     * @param string $visibleVersion
+     */
+    protected function createNotifications($app, $version, $visibleVersion = '') {
+        $lastNotification = $this->config->getAppValue('updatenotification', $app, false);
+        if ($lastNotification === $version) {
+            // We already notified about this update
+            return;
+        } else if ($lastNotification !== false) {
+            // Delete old updates
+            $this->deleteOutdatedNotifications($app, $lastNotification);
+        }
+
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('updatenotification')
+            ->setDateTime(new \DateTime())
+            ->setObject($app, $version);
+
+        if ($visibleVersion !== '') {
+            $notification->setSubject('update_available', ['version' => $visibleVersion]);
+        } else {
+            $notification->setSubject('update_available');
+        }
+
+        foreach ($this->getUsersToNotify() as $uid) {
+            $notification->setUser($uid);
+            $this->notificationManager->notify($notification);
+        }
+
+        $this->config->setAppValue('updatenotification', $app, $version);
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getUsersToNotify() {
+        if ($this->users !== null) {
+            return $this->users;
+        }
+
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+        $this->users = [];
+        foreach ($notifyGroups as $group) {
+            $groupToNotify = $this->groupManager->get($group);
+            if ($groupToNotify instanceof IGroup) {
+                foreach ($groupToNotify->getUsers() as $user) {
+                    $this->users[$user->getUID()] = true;
+                }
+            }
+        }
+
+        $this->users = array_keys($this->users);
+
+        return $this->users;
+    }
+
+    /**
+     * Delete notifications for old updates
+     *
+     * @param string $app
+     * @param string $version
+     */
+    protected function deleteOutdatedNotifications($app, $version) {
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('updatenotification')
+            ->setObject($app, $version);
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * @return VersionCheck
+     */
+    protected function createVersionCheck() {
+        return new VersionCheck(
+            $this->client,
+            $this->config
+        );
+    }
+
+    /**
+     * @return string
+     */
+    protected function getChannel() {
+        return \OC_Util::getChannel();
+    }
+
+    /**
+     * @param string $app
+     * @return string|false
+     */
+    protected function isUpdateAvailable($app) {
+        return $this->installer->isUpdateAvailable($app);
+    }
 }

settings/Controller/AppSettingsController.php

Indentation +411 added lines, -411 removed lines

@@ -53,415 +53,415 @@
  * @package OC\Settings\Controller
  */
 class AppSettingsController extends Controller {
-	const CAT_ENABLED = 0;
-	const CAT_DISABLED = 1;
-	const CAT_ALL_INSTALLED = 2;
-	const CAT_APP_BUNDLES = 3;
-	const CAT_UPDATES = 4;
-
-	/** @var \OCP\IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var INavigationManager */
-	private $navigationManager;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var CategoryFetcher */
-	private $categoryFetcher;
-	/** @var AppFetcher */
-	private $appFetcher;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var BundleFetcher */
-	private $bundleFetcher;
-	/** @var Installer */
-	private $installer;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param INavigationManager $navigationManager
-	 * @param IAppManager $appManager
-	 * @param CategoryFetcher $categoryFetcher
-	 * @param AppFetcher $appFetcher
-	 * @param IFactory $l10nFactory
-	 * @param BundleFetcher $bundleFetcher
-	 * @param Installer $installer
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IL10N $l10n,
-								IConfig $config,
-								INavigationManager $navigationManager,
-								IAppManager $appManager,
-								CategoryFetcher $categoryFetcher,
-								AppFetcher $appFetcher,
-								IFactory $l10nFactory,
-								BundleFetcher $bundleFetcher,
-								Installer $installer) {
-		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->navigationManager = $navigationManager;
-		$this->appManager = $appManager;
-		$this->categoryFetcher = $categoryFetcher;
-		$this->appFetcher = $appFetcher;
-		$this->l10nFactory = $l10nFactory;
-		$this->bundleFetcher = $bundleFetcher;
-		$this->installer = $installer;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 *
-	 * @param string $category
-	 * @return TemplateResponse
-	 */
-	public function viewApps($category = '') {
-		if ($category === '') {
-			$category = 'installed';
-		}
-
-		$params = [];
-		$params['category'] = $category;
-		$params['appstoreEnabled'] = $this->config->getSystemValue('appstoreenabled', true) === true;
-		$this->navigationManager->setActiveEntry('core_apps');
-
-		$templateResponse = new TemplateResponse($this->appName, 'apps', $params, 'user');
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
-		$templateResponse->setContentSecurityPolicy($policy);
-
-		return $templateResponse;
-	}
-
-	private function getAllCategories() {
-		$currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
-
-		$updateCount = count($this->getAppsWithUpdates());
-		$formattedCategories = [
-			['id' => self::CAT_ALL_INSTALLED, 'ident' => 'installed', 'displayName' => (string)$this->l10n->t('Your apps')],
-			['id' => self::CAT_UPDATES, 'ident' => 'updates', 'displayName' => (string)$this->l10n->t('Updates'), 'counter' => $updateCount],
-			['id' => self::CAT_ENABLED, 'ident' => 'enabled', 'displayName' => (string)$this->l10n->t('Enabled apps')],
-			['id' => self::CAT_DISABLED, 'ident' => 'disabled', 'displayName' => (string)$this->l10n->t('Disabled apps')],
-			['id' => self::CAT_APP_BUNDLES, 'ident' => 'app-bundles', 'displayName' => (string)$this->l10n->t('App bundles')],
-		];
-		$categories = $this->categoryFetcher->get();
-		foreach($categories as $category) {
-			$formattedCategories[] = [
-				'id' => $category['id'],
-				'ident' => $category['id'],
-				'displayName' => isset($category['translations'][$currentLanguage]['name']) ? $category['translations'][$currentLanguage]['name'] : $category['translations']['en']['name'],
-			];
-		}
-
-		return $formattedCategories;
-	}
-
-	/**
-	 * Get all available categories
-	 *
-	 * @return JSONResponse
-	 */
-	public function listCategories() {
-		return new JSONResponse($this->getAllCategories());
-	}
-
-	/**
-	 * Get all apps for a category
-	 *
-	 * @param string $requestedCategory
-	 * @return array
-	 */
-	private function getAppsForCategory($requestedCategory) {
-		$versionParser = new VersionParser();
-		$formattedApps = [];
-		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
-			if (isset($app['isFeatured'])) {
-				$app['featured'] = $app['isFeatured'];
-			}
-
-			// Skip all apps not in the requested category
-			$isInCategory = false;
-			foreach($app['categories'] as $category) {
-				if($category === $requestedCategory) {
-					$isInCategory = true;
-				}
-			}
-			if(!$isInCategory) {
-				continue;
-			}
-
-			$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
-			$nextCloudVersionDependencies = [];
-			if($nextCloudVersion->getMinimumVersion() !== '') {
-				$nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
-			}
-			if($nextCloudVersion->getMaximumVersion() !== '') {
-				$nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
-			}
-			$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
-			$existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false;
-			$phpDependencies = [];
-			if($phpVersion->getMinimumVersion() !== '') {
-				$phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
-			}
-			if($phpVersion->getMaximumVersion() !== '') {
-				$phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
-			}
-			if(isset($app['releases'][0]['minIntSize'])) {
-				$phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
-			}
-			$authors = '';
-			foreach($app['authors'] as $key => $author) {
-				$authors .= $author['name'];
-				if($key !== count($app['authors']) - 1) {
-					$authors .= ', ';
-				}
-			}
-
-			$currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
-			$enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
-			$groups = null;
-			if($enabledValue !== 'no' && $enabledValue !== 'yes') {
-				$groups = $enabledValue;
-			}
-
-			$currentVersion = '';
-			if($this->appManager->isInstalled($app['id'])) {
-				$currentVersion = \OC_App::getAppVersion($app['id']);
-			} else {
-				$currentLanguage = $app['releases'][0]['version'];
-			}
-
-			$formattedApps[] = [
-				'id' => $app['id'],
-				'name' => isset($app['translations'][$currentLanguage]['name']) ? $app['translations'][$currentLanguage]['name'] : $app['translations']['en']['name'],
-				'description' => isset($app['translations'][$currentLanguage]['description']) ? $app['translations'][$currentLanguage]['description'] : $app['translations']['en']['description'],
-				'license' => $app['releases'][0]['licenses'],
-				'author' => $authors,
-				'shipped' => false,
-				'version' => $currentVersion,
-				'default_enable' => '',
-				'types' => [],
-				'documentation' => [
-					'admin' => $app['adminDocs'],
-					'user' => $app['userDocs'],
-					'developer' => $app['developerDocs']
-				],
-				'website' => $app['website'],
-				'bugs' => $app['issueTracker'],
-				'detailpage' => $app['website'],
-				'dependencies' => array_merge(
-					$nextCloudVersionDependencies,
-					$phpDependencies
-				),
-				'level' => ($app['featured'] === true) ? 200 : 100,
-				'missingMaxOwnCloudVersion' => false,
-				'missingMinOwnCloudVersion' => false,
-				'canInstall' => true,
-				'preview' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
-				'score' => $app['ratingOverall'],
-				'ratingNumOverall' => $app['ratingNumOverall'],
-				'ratingNumThresholdReached' => $app['ratingNumOverall'] > 5 ? true : false,
-				'removable' => $existsLocally,
-				'active' => $this->appManager->isEnabledForUser($app['id']),
-				'needsDownload' => !$existsLocally,
-				'groups' => $groups,
-				'fromAppStore' => true,
-			];
-
-
-			$newVersion = $this->installer->isUpdateAvailable($app['id']);
-			if($newVersion && $this->appManager->isInstalled($app['id'])) {
-				$formattedApps[count($formattedApps)-1]['update'] = $newVersion;
-			}
-		}
-
-		return $formattedApps;
-	}
-
-	private function getAppsWithUpdates() {
-		$appClass = new \OC_App();
-		$apps = $appClass->listAllApps();
-		foreach($apps as $key => $app) {
-			$newVersion = $this->installer->isUpdateAvailable($app['id']);
-			if($newVersion !== false) {
-				$apps[$key]['update'] = $newVersion;
-			} else {
-				unset($apps[$key]);
-			}
-		}
-		usort($apps, function ($a, $b) {
-			$a = (string)$a['name'];
-			$b = (string)$b['name'];
-			if ($a === $b) {
-				return 0;
-			}
-			return ($a < $b) ? -1 : 1;
-		});
-		return $apps;
-	}
-
-	/**
-	 * Get all available apps in a category
-	 *
-	 * @param string $category
-	 * @return JSONResponse
-	 */
-	public function listApps($category = '') {
-		$appClass = new \OC_App();
-
-		switch ($category) {
-			// installed apps
-			case 'installed':
-				$apps = $appClass->listAllApps();
-
-				foreach($apps as $key => $app) {
-					$newVersion = $this->installer->isUpdateAvailable($app['id']);
-					$apps[$key]['update'] = $newVersion;
-				}
-
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
-					if ($a === $b) {
-						return 0;
-					}
-					return ($a < $b) ? -1 : 1;
-				});
-				break;
-			// updates
-			case 'updates':
-				$apps = $this->getAppsWithUpdates();
-				break;
-			// enabled apps
-			case 'enabled':
-				$apps = $appClass->listAllApps();
-				$apps = array_filter($apps, function ($app) {
-					return $app['active'];
-				});
-
-				foreach($apps as $key => $app) {
-					$newVersion = $this->installer->isUpdateAvailable($app['id']);
-					$apps[$key]['update'] = $newVersion;
-				}
-
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
-					if ($a === $b) {
-						return 0;
-					}
-					return ($a < $b) ? -1 : 1;
-				});
-				break;
-			// disabled  apps
-			case 'disabled':
-				$apps = $appClass->listAllApps();
-				$apps = array_filter($apps, function ($app) {
-					return !$app['active'];
-				});
-
-				$apps = array_map(function ($app) {
-					$newVersion = $this->installer->isUpdateAvailable($app['id']);
-					if ($newVersion !== false) {
-						$app['update'] = $newVersion;
-					}
-					return $app;
-				}, $apps);
-
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
-					if ($a === $b) {
-						return 0;
-					}
-					return ($a < $b) ? -1 : 1;
-				});
-				break;
-			case 'app-bundles':
-				$bundles = $this->bundleFetcher->getBundles();
-				$apps = [];
-				foreach($bundles as $bundle) {
-					$newCategory = true;
-					$allApps = $appClass->listAllApps();
-					$categories = $this->getAllCategories();
-					foreach($categories as $singleCategory) {
-						$newApps = $this->getAppsForCategory($singleCategory['id']);
-						foreach($allApps as $app) {
-							foreach($newApps as $key => $newApp) {
-								if($app['id'] === $newApp['id']) {
-									unset($newApps[$key]);
-								}
-							}
-						}
-						$allApps = array_merge($allApps, $newApps);
-					}
-
-					foreach($bundle->getAppIdentifiers() as $identifier) {
-						foreach($allApps as $app) {
-							if($app['id'] === $identifier) {
-								if($newCategory) {
-									$app['newCategory'] = true;
-									$app['categoryName'] = $bundle->getName();
-								}
-								$app['bundleId'] = $bundle->getIdentifier();
-								$newCategory = false;
-								$apps[] = $app;
-								continue;
-							}
-						}
-					}
-				}
-				break;
-			default:
-				$apps = $this->getAppsForCategory($category);
-
-				// sort by score
-				usort($apps, function ($a, $b) {
-					$a = (int)$a['score'];
-					$b = (int)$b['score'];
-					if ($a === $b) {
-						return 0;
-					}
-					return ($a > $b) ? -1 : 1;
-				});
-				break;
-		}
-
-		// fix groups to be an array
-		$dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n);
-		$apps = array_map(function($app) use ($dependencyAnalyzer) {
-
-			// fix groups
-			$groups = array();
-			if (is_string($app['groups'])) {
-				$groups = json_decode($app['groups']);
-			}
-			$app['groups'] = $groups;
-			$app['canUnInstall'] = !$app['active'] && $app['removable'];
-
-			// fix licence vs license
-			if (isset($app['license']) && !isset($app['licence'])) {
-				$app['licence'] = $app['license'];
-			}
-
-			// analyse dependencies
-			$missing = $dependencyAnalyzer->analyze($app);
-			$app['canInstall'] = empty($missing);
-			$app['missingDependencies'] = $missing;
-
-			$app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['min-version']);
-			$app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['max-version']);
-
-			return $app;
-		}, $apps);
-
-		return new JSONResponse(['apps' => $apps, 'status' => 'success']);
-	}
+    const CAT_ENABLED = 0;
+    const CAT_DISABLED = 1;
+    const CAT_ALL_INSTALLED = 2;
+    const CAT_APP_BUNDLES = 3;
+    const CAT_UPDATES = 4;
+
+    /** @var \OCP\IL10N */
+    private $l10n;
+    /** @var IConfig */
+    private $config;
+    /** @var INavigationManager */
+    private $navigationManager;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var CategoryFetcher */
+    private $categoryFetcher;
+    /** @var AppFetcher */
+    private $appFetcher;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var BundleFetcher */
+    private $bundleFetcher;
+    /** @var Installer */
+    private $installer;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param INavigationManager $navigationManager
+     * @param IAppManager $appManager
+     * @param CategoryFetcher $categoryFetcher
+     * @param AppFetcher $appFetcher
+     * @param IFactory $l10nFactory
+     * @param BundleFetcher $bundleFetcher
+     * @param Installer $installer
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IConfig $config,
+                                INavigationManager $navigationManager,
+                                IAppManager $appManager,
+                                CategoryFetcher $categoryFetcher,
+                                AppFetcher $appFetcher,
+                                IFactory $l10nFactory,
+                                BundleFetcher $bundleFetcher,
+                                Installer $installer) {
+        parent::__construct($appName, $request);
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->navigationManager = $navigationManager;
+        $this->appManager = $appManager;
+        $this->categoryFetcher = $categoryFetcher;
+        $this->appFetcher = $appFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->bundleFetcher = $bundleFetcher;
+        $this->installer = $installer;
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @param string $category
+     * @return TemplateResponse
+     */
+    public function viewApps($category = '') {
+        if ($category === '') {
+            $category = 'installed';
+        }
+
+        $params = [];
+        $params['category'] = $category;
+        $params['appstoreEnabled'] = $this->config->getSystemValue('appstoreenabled', true) === true;
+        $this->navigationManager->setActiveEntry('core_apps');
+
+        $templateResponse = new TemplateResponse($this->appName, 'apps', $params, 'user');
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
+        $templateResponse->setContentSecurityPolicy($policy);
+
+        return $templateResponse;
+    }
+
+    private function getAllCategories() {
+        $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
+
+        $updateCount = count($this->getAppsWithUpdates());
+        $formattedCategories = [
+            ['id' => self::CAT_ALL_INSTALLED, 'ident' => 'installed', 'displayName' => (string)$this->l10n->t('Your apps')],
+            ['id' => self::CAT_UPDATES, 'ident' => 'updates', 'displayName' => (string)$this->l10n->t('Updates'), 'counter' => $updateCount],
+            ['id' => self::CAT_ENABLED, 'ident' => 'enabled', 'displayName' => (string)$this->l10n->t('Enabled apps')],
+            ['id' => self::CAT_DISABLED, 'ident' => 'disabled', 'displayName' => (string)$this->l10n->t('Disabled apps')],
+            ['id' => self::CAT_APP_BUNDLES, 'ident' => 'app-bundles', 'displayName' => (string)$this->l10n->t('App bundles')],
+        ];
+        $categories = $this->categoryFetcher->get();
+        foreach($categories as $category) {
+            $formattedCategories[] = [
+                'id' => $category['id'],
+                'ident' => $category['id'],
+                'displayName' => isset($category['translations'][$currentLanguage]['name']) ? $category['translations'][$currentLanguage]['name'] : $category['translations']['en']['name'],
+            ];
+        }
+
+        return $formattedCategories;
+    }
+
+    /**
+     * Get all available categories
+     *
+     * @return JSONResponse
+     */
+    public function listCategories() {
+        return new JSONResponse($this->getAllCategories());
+    }
+
+    /**
+     * Get all apps for a category
+     *
+     * @param string $requestedCategory
+     * @return array
+     */
+    private function getAppsForCategory($requestedCategory) {
+        $versionParser = new VersionParser();
+        $formattedApps = [];
+        $apps = $this->appFetcher->get();
+        foreach($apps as $app) {
+            if (isset($app['isFeatured'])) {
+                $app['featured'] = $app['isFeatured'];
+            }
+
+            // Skip all apps not in the requested category
+            $isInCategory = false;
+            foreach($app['categories'] as $category) {
+                if($category === $requestedCategory) {
+                    $isInCategory = true;
+                }
+            }
+            if(!$isInCategory) {
+                continue;
+            }
+
+            $nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
+            $nextCloudVersionDependencies = [];
+            if($nextCloudVersion->getMinimumVersion() !== '') {
+                $nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
+            }
+            if($nextCloudVersion->getMaximumVersion() !== '') {
+                $nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
+            }
+            $phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
+            $existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false;
+            $phpDependencies = [];
+            if($phpVersion->getMinimumVersion() !== '') {
+                $phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
+            }
+            if($phpVersion->getMaximumVersion() !== '') {
+                $phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
+            }
+            if(isset($app['releases'][0]['minIntSize'])) {
+                $phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
+            }
+            $authors = '';
+            foreach($app['authors'] as $key => $author) {
+                $authors .= $author['name'];
+                if($key !== count($app['authors']) - 1) {
+                    $authors .= ', ';
+                }
+            }
+
+            $currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
+            $enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
+            $groups = null;
+            if($enabledValue !== 'no' && $enabledValue !== 'yes') {
+                $groups = $enabledValue;
+            }
+
+            $currentVersion = '';
+            if($this->appManager->isInstalled($app['id'])) {
+                $currentVersion = \OC_App::getAppVersion($app['id']);
+            } else {
+                $currentLanguage = $app['releases'][0]['version'];
+            }
+
+            $formattedApps[] = [
+                'id' => $app['id'],
+                'name' => isset($app['translations'][$currentLanguage]['name']) ? $app['translations'][$currentLanguage]['name'] : $app['translations']['en']['name'],
+                'description' => isset($app['translations'][$currentLanguage]['description']) ? $app['translations'][$currentLanguage]['description'] : $app['translations']['en']['description'],
+                'license' => $app['releases'][0]['licenses'],
+                'author' => $authors,
+                'shipped' => false,
+                'version' => $currentVersion,
+                'default_enable' => '',
+                'types' => [],
+                'documentation' => [
+                    'admin' => $app['adminDocs'],
+                    'user' => $app['userDocs'],
+                    'developer' => $app['developerDocs']
+                ],
+                'website' => $app['website'],
+                'bugs' => $app['issueTracker'],
+                'detailpage' => $app['website'],
+                'dependencies' => array_merge(
+                    $nextCloudVersionDependencies,
+                    $phpDependencies
+                ),
+                'level' => ($app['featured'] === true) ? 200 : 100,
+                'missingMaxOwnCloudVersion' => false,
+                'missingMinOwnCloudVersion' => false,
+                'canInstall' => true,
+                'preview' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
+                'score' => $app['ratingOverall'],
+                'ratingNumOverall' => $app['ratingNumOverall'],
+                'ratingNumThresholdReached' => $app['ratingNumOverall'] > 5 ? true : false,
+                'removable' => $existsLocally,
+                'active' => $this->appManager->isEnabledForUser($app['id']),
+                'needsDownload' => !$existsLocally,
+                'groups' => $groups,
+                'fromAppStore' => true,
+            ];
+
+
+            $newVersion = $this->installer->isUpdateAvailable($app['id']);
+            if($newVersion && $this->appManager->isInstalled($app['id'])) {
+                $formattedApps[count($formattedApps)-1]['update'] = $newVersion;
+            }
+        }
+
+        return $formattedApps;
+    }
+
+    private function getAppsWithUpdates() {
+        $appClass = new \OC_App();
+        $apps = $appClass->listAllApps();
+        foreach($apps as $key => $app) {
+            $newVersion = $this->installer->isUpdateAvailable($app['id']);
+            if($newVersion !== false) {
+                $apps[$key]['update'] = $newVersion;
+            } else {
+                unset($apps[$key]);
+            }
+        }
+        usort($apps, function ($a, $b) {
+            $a = (string)$a['name'];
+            $b = (string)$b['name'];
+            if ($a === $b) {
+                return 0;
+            }
+            return ($a < $b) ? -1 : 1;
+        });
+        return $apps;
+    }
+
+    /**
+     * Get all available apps in a category
+     *
+     * @param string $category
+     * @return JSONResponse
+     */
+    public function listApps($category = '') {
+        $appClass = new \OC_App();
+
+        switch ($category) {
+            // installed apps
+            case 'installed':
+                $apps = $appClass->listAllApps();
+
+                foreach($apps as $key => $app) {
+                    $newVersion = $this->installer->isUpdateAvailable($app['id']);
+                    $apps[$key]['update'] = $newVersion;
+                }
+
+                usort($apps, function ($a, $b) {
+                    $a = (string)$a['name'];
+                    $b = (string)$b['name'];
+                    if ($a === $b) {
+                        return 0;
+                    }
+                    return ($a < $b) ? -1 : 1;
+                });
+                break;
+            // updates
+            case 'updates':
+                $apps = $this->getAppsWithUpdates();
+                break;
+            // enabled apps
+            case 'enabled':
+                $apps = $appClass->listAllApps();
+                $apps = array_filter($apps, function ($app) {
+                    return $app['active'];
+                });
+
+                foreach($apps as $key => $app) {
+                    $newVersion = $this->installer->isUpdateAvailable($app['id']);
+                    $apps[$key]['update'] = $newVersion;
+                }
+
+                usort($apps, function ($a, $b) {
+                    $a = (string)$a['name'];
+                    $b = (string)$b['name'];
+                    if ($a === $b) {
+                        return 0;
+                    }
+                    return ($a < $b) ? -1 : 1;
+                });
+                break;
+            // disabled  apps
+            case 'disabled':
+                $apps = $appClass->listAllApps();
+                $apps = array_filter($apps, function ($app) {
+                    return !$app['active'];
+                });
+
+                $apps = array_map(function ($app) {
+                    $newVersion = $this->installer->isUpdateAvailable($app['id']);
+                    if ($newVersion !== false) {
+                        $app['update'] = $newVersion;
+                    }
+                    return $app;
+                }, $apps);
+
+                usort($apps, function ($a, $b) {
+                    $a = (string)$a['name'];
+                    $b = (string)$b['name'];
+                    if ($a === $b) {
+                        return 0;
+                    }
+                    return ($a < $b) ? -1 : 1;
+                });
+                break;
+            case 'app-bundles':
+                $bundles = $this->bundleFetcher->getBundles();
+                $apps = [];
+                foreach($bundles as $bundle) {
+                    $newCategory = true;
+                    $allApps = $appClass->listAllApps();
+                    $categories = $this->getAllCategories();
+                    foreach($categories as $singleCategory) {
+                        $newApps = $this->getAppsForCategory($singleCategory['id']);
+                        foreach($allApps as $app) {
+                            foreach($newApps as $key => $newApp) {
+                                if($app['id'] === $newApp['id']) {
+                                    unset($newApps[$key]);
+                                }
+                            }
+                        }
+                        $allApps = array_merge($allApps, $newApps);
+                    }
+
+                    foreach($bundle->getAppIdentifiers() as $identifier) {
+                        foreach($allApps as $app) {
+                            if($app['id'] === $identifier) {
+                                if($newCategory) {
+                                    $app['newCategory'] = true;
+                                    $app['categoryName'] = $bundle->getName();
+                                }
+                                $app['bundleId'] = $bundle->getIdentifier();
+                                $newCategory = false;
+                                $apps[] = $app;
+                                continue;
+                            }
+                        }
+                    }
+                }
+                break;
+            default:
+                $apps = $this->getAppsForCategory($category);
+
+                // sort by score
+                usort($apps, function ($a, $b) {
+                    $a = (int)$a['score'];
+                    $b = (int)$b['score'];
+                    if ($a === $b) {
+                        return 0;
+                    }
+                    return ($a > $b) ? -1 : 1;
+                });
+                break;
+        }
+
+        // fix groups to be an array
+        $dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n);
+        $apps = array_map(function($app) use ($dependencyAnalyzer) {
+
+            // fix groups
+            $groups = array();
+            if (is_string($app['groups'])) {
+                $groups = json_decode($app['groups']);
+            }
+            $app['groups'] = $groups;
+            $app['canUnInstall'] = !$app['active'] && $app['removable'];
+
+            // fix licence vs license
+            if (isset($app['license']) && !isset($app['licence'])) {
+                $app['licence'] = $app['license'];
+            }
+
+            // analyse dependencies
+            $missing = $dependencyAnalyzer->analyze($app);
+            $app['canInstall'] = empty($missing);
+            $app['missingDependencies'] = $missing;
+
+            $app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['min-version']);
+            $app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['max-version']);
+
+            return $app;
+        }, $apps);
+
+        return new JSONResponse(['apps' => $apps, 'status' => 'success']);
+    }
 }

Spacing +52 added lines, -52 removed lines

@@ -143,14 +143,14 @@ 
 
 		$updateCount = count($this->getAppsWithUpdates());
 		$formattedCategories = [
-			['id' => self::CAT_ALL_INSTALLED, 'ident' => 'installed', 'displayName' => (string)$this->l10n->t('Your apps')],
-			['id' => self::CAT_UPDATES, 'ident' => 'updates', 'displayName' => (string)$this->l10n->t('Updates'), 'counter' => $updateCount],
-			['id' => self::CAT_ENABLED, 'ident' => 'enabled', 'displayName' => (string)$this->l10n->t('Enabled apps')],
-			['id' => self::CAT_DISABLED, 'ident' => 'disabled', 'displayName' => (string)$this->l10n->t('Disabled apps')],
-			['id' => self::CAT_APP_BUNDLES, 'ident' => 'app-bundles', 'displayName' => (string)$this->l10n->t('App bundles')],
+			['id' => self::CAT_ALL_INSTALLED, 'ident' => 'installed', 'displayName' => (string) $this->l10n->t('Your apps')],
+			['id' => self::CAT_UPDATES, 'ident' => 'updates', 'displayName' => (string) $this->l10n->t('Updates'), 'counter' => $updateCount],
+			['id' => self::CAT_ENABLED, 'ident' => 'enabled', 'displayName' => (string) $this->l10n->t('Enabled apps')],
+			['id' => self::CAT_DISABLED, 'ident' => 'disabled', 'displayName' => (string) $this->l10n->t('Disabled apps')],
+			['id' => self::CAT_APP_BUNDLES, 'ident' => 'app-bundles', 'displayName' => (string) $this->l10n->t('App bundles')],
 		];
 		$categories = $this->categoryFetcher->get();
-		foreach($categories as $category) {
+		foreach ($categories as $category) {
 			$formattedCategories[] = [
 				'id' => $category['id'],
 				'ident' => $category['id'],
@@ -180,46 +180,46 @@ 
 		$versionParser = new VersionParser();
 		$formattedApps = [];
 		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			if (isset($app['isFeatured'])) {
 				$app['featured'] = $app['isFeatured'];
 			}
 
 			// Skip all apps not in the requested category
 			$isInCategory = false;
-			foreach($app['categories'] as $category) {
-				if($category === $requestedCategory) {
+			foreach ($app['categories'] as $category) {
+				if ($category === $requestedCategory) {
 					$isInCategory = true;
 				}
 			}
-			if(!$isInCategory) {
+			if (!$isInCategory) {
 				continue;
 			}
 
 			$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
 			$nextCloudVersionDependencies = [];
-			if($nextCloudVersion->getMinimumVersion() !== '') {
+			if ($nextCloudVersion->getMinimumVersion() !== '') {
 				$nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
 			}
-			if($nextCloudVersion->getMaximumVersion() !== '') {
+			if ($nextCloudVersion->getMaximumVersion() !== '') {
 				$nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
 			}
 			$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
 			$existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false;
 			$phpDependencies = [];
-			if($phpVersion->getMinimumVersion() !== '') {
+			if ($phpVersion->getMinimumVersion() !== '') {
 				$phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
 			}
-			if($phpVersion->getMaximumVersion() !== '') {
+			if ($phpVersion->getMaximumVersion() !== '') {
 				$phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
 			}
-			if(isset($app['releases'][0]['minIntSize'])) {
+			if (isset($app['releases'][0]['minIntSize'])) {
 				$phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
 			}
 			$authors = '';
-			foreach($app['authors'] as $key => $author) {
+			foreach ($app['authors'] as $key => $author) {
 				$authors .= $author['name'];
-				if($key !== count($app['authors']) - 1) {
+				if ($key !== count($app['authors']) - 1) {
 					$authors .= ', ';
 				}
 			}
@@ -227,12 +227,12 @@ 
 			$currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
 			$enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
 			$groups = null;
-			if($enabledValue !== 'no' && $enabledValue !== 'yes') {
+			if ($enabledValue !== 'no' && $enabledValue !== 'yes') {
 				$groups = $enabledValue;
 			}
 
 			$currentVersion = '';
-			if($this->appManager->isInstalled($app['id'])) {
+			if ($this->appManager->isInstalled($app['id'])) {
 				$currentVersion = \OC_App::getAppVersion($app['id']);
 			} else {
 				$currentLanguage = $app['releases'][0]['version'];
@@ -277,8 +277,8 @@ 
 
 
 			$newVersion = $this->installer->isUpdateAvailable($app['id']);
-			if($newVersion && $this->appManager->isInstalled($app['id'])) {
-				$formattedApps[count($formattedApps)-1]['update'] = $newVersion;
+			if ($newVersion && $this->appManager->isInstalled($app['id'])) {
+				$formattedApps[count($formattedApps) - 1]['update'] = $newVersion;
 			}
 		}
 
@@ -288,17 +288,17 @@ 
 	private function getAppsWithUpdates() {
 		$appClass = new \OC_App();
 		$apps = $appClass->listAllApps();
-		foreach($apps as $key => $app) {
+		foreach ($apps as $key => $app) {
 			$newVersion = $this->installer->isUpdateAvailable($app['id']);
-			if($newVersion !== false) {
+			if ($newVersion !== false) {
 				$apps[$key]['update'] = $newVersion;
 			} else {
 				unset($apps[$key]);
 			}
 		}
-		usort($apps, function ($a, $b) {
-			$a = (string)$a['name'];
-			$b = (string)$b['name'];
+		usort($apps, function($a, $b) {
+			$a = (string) $a['name'];
+			$b = (string) $b['name'];
 			if ($a === $b) {
 				return 0;
 			}
@@ -321,14 +321,14 @@ 
 			case 'installed':
 				$apps = $appClass->listAllApps();
 
-				foreach($apps as $key => $app) {
+				foreach ($apps as $key => $app) {
 					$newVersion = $this->installer->isUpdateAvailable($app['id']);
 					$apps[$key]['update'] = $newVersion;
 				}
 
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
+				usort($apps, function($a, $b) {
+					$a = (string) $a['name'];
+					$b = (string) $b['name'];
 					if ($a === $b) {
 						return 0;
 					}
@@ -342,18 +342,18 @@ 
 			// enabled apps
 			case 'enabled':
 				$apps = $appClass->listAllApps();
-				$apps = array_filter($apps, function ($app) {
+				$apps = array_filter($apps, function($app) {
 					return $app['active'];
 				});
 
-				foreach($apps as $key => $app) {
+				foreach ($apps as $key => $app) {
 					$newVersion = $this->installer->isUpdateAvailable($app['id']);
 					$apps[$key]['update'] = $newVersion;
 				}
 
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
+				usort($apps, function($a, $b) {
+					$a = (string) $a['name'];
+					$b = (string) $b['name'];
 					if ($a === $b) {
 						return 0;
 					}
@@ -363,11 +363,11 @@ 
 			// disabled  apps
 			case 'disabled':
 				$apps = $appClass->listAllApps();
-				$apps = array_filter($apps, function ($app) {
+				$apps = array_filter($apps, function($app) {
 					return !$app['active'];
 				});
 
-				$apps = array_map(function ($app) {
+				$apps = array_map(function($app) {
 					$newVersion = $this->installer->isUpdateAvailable($app['id']);
 					if ($newVersion !== false) {
 						$app['update'] = $newVersion;
@@ -375,9 +375,9 @@ 
 					return $app;
 				}, $apps);
 
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
+				usort($apps, function($a, $b) {
+					$a = (string) $a['name'];
+					$b = (string) $b['name'];
 					if ($a === $b) {
 						return 0;
 					}
@@ -387,15 +387,15 @@ 
 			case 'app-bundles':
 				$bundles = $this->bundleFetcher->getBundles();
 				$apps = [];
-				foreach($bundles as $bundle) {
+				foreach ($bundles as $bundle) {
 					$newCategory = true;
 					$allApps = $appClass->listAllApps();
 					$categories = $this->getAllCategories();
-					foreach($categories as $singleCategory) {
+					foreach ($categories as $singleCategory) {
 						$newApps = $this->getAppsForCategory($singleCategory['id']);
-						foreach($allApps as $app) {
-							foreach($newApps as $key => $newApp) {
-								if($app['id'] === $newApp['id']) {
+						foreach ($allApps as $app) {
+							foreach ($newApps as $key => $newApp) {
+								if ($app['id'] === $newApp['id']) {
 									unset($newApps[$key]);
 								}
 							}
@@ -403,10 +403,10 @@ 
 						$allApps = array_merge($allApps, $newApps);
 					}
 
-					foreach($bundle->getAppIdentifiers() as $identifier) {
-						foreach($allApps as $app) {
-							if($app['id'] === $identifier) {
-								if($newCategory) {
+					foreach ($bundle->getAppIdentifiers() as $identifier) {
+						foreach ($allApps as $app) {
+							if ($app['id'] === $identifier) {
+								if ($newCategory) {
 									$app['newCategory'] = true;
 									$app['categoryName'] = $bundle->getName();
 								}
@@ -423,9 +423,9 @@ 
 				$apps = $this->getAppsForCategory($category);
 
 				// sort by score
-				usort($apps, function ($a, $b) {
-					$a = (int)$a['score'];
-					$b = (int)$b['score'];
+				usort($apps, function($a, $b) {
+					$a = (int) $a['score'];
+					$b = (int) $b['score'];
 					if ($a === $b) {
 						return 0;
 					}

settings/ajax/updateapp.php

Indentation +13 added lines, -13 removed lines

@@ -29,10 +29,10 @@ 
 OCP\JSON::callCheck();
 
 if (!array_key_exists('appid', $_POST)) {
-	OCP\JSON::error(array(
-		'message' => 'No AppId given!'
-	));
-	return;
+    OCP\JSON::error(array(
+        'message' => 'No AppId given!'
+    ));
+    return;
 }
 
 $appId = (string)$_POST['appid'];
@@ -41,18 +41,18 @@ 
 $config = \OC::$server->getConfig();
 $config->setSystemValue('maintenance', true);
 try {
-	$installer = \OC::$server->query(Installer::class);
-	$result = $installer->updateAppstoreApp($appId);
-	$config->setSystemValue('maintenance', false);
+    $installer = \OC::$server->query(Installer::class);
+    $result = $installer->updateAppstoreApp($appId);
+    $config->setSystemValue('maintenance', false);
 } catch(Exception $ex) {
-	$config->setSystemValue('maintenance', false);
-	OC_JSON::error(array('data' => array( 'message' => $ex->getMessage() )));
-	return;
+    $config->setSystemValue('maintenance', false);
+    OC_JSON::error(array('data' => array( 'message' => $ex->getMessage() )));
+    return;
 }
 
 if($result !== false) {
-	OC_JSON::success(array('data' => array('appid' => $appId)));
+    OC_JSON::success(array('data' => array('appid' => $appId)));
 } else {
-	$l = \OC::$server->getL10N('settings');
-	OC_JSON::error(array('data' => array( 'message' => $l->t("Couldn't update app.") )));
+    $l = \OC::$server->getL10N('settings');
+    OC_JSON::error(array('data' => array( 'message' => $l->t("Couldn't update app.") )));
 }

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 	return;
 }
 
-$appId = (string)$_POST['appid'];
+$appId = (string) $_POST['appid'];
 $appId = OC_App::cleanAppId($appId);
 
 $config = \OC::$server->getConfig();
@@ -44,15 +44,15 @@ 
 	$installer = \OC::$server->query(Installer::class);
 	$result = $installer->updateAppstoreApp($appId);
 	$config->setSystemValue('maintenance', false);
-} catch(Exception $ex) {
+} catch (Exception $ex) {
 	$config->setSystemValue('maintenance', false);
-	OC_JSON::error(array('data' => array( 'message' => $ex->getMessage() )));
+	OC_JSON::error(array('data' => array('message' => $ex->getMessage())));
 	return;
 }
 
-if($result !== false) {
+if ($result !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appId)));
 } else {
 	$l = \OC::$server->getL10N('settings');
-	OC_JSON::error(array('data' => array( 'message' => $l->t("Couldn't update app.") )));
+	OC_JSON::error(array('data' => array('message' => $l->t("Couldn't update app."))));
 }

core/register_command.php

Indentation +95 added lines, -95 removed lines

@@ -44,122 +44,122 @@
 $application->add(new OC\Core\Command\App\CheckCode($infoParser));
 $application->add(new OC\Core\Command\L10n\CreateJs());
 $application->add(new \OC\Core\Command\Integrity\SignApp(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
-		\OC::$server->getURLGenerator()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
+        \OC::$server->getURLGenerator()
 ));
 $application->add(new \OC\Core\Command\Integrity\SignCore(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckApp(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckCore(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
-	$application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Install());
-	$application->add(new OC\Core\Command\App\GetPath());
-	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Install());
+    $application->add(new OC\Core\Command\App\GetPath());
+    $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
 
-	$application->add(new OC\Core\Command\TwoFactorAuth\Enable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
-	$application->add(new OC\Core\Command\TwoFactorAuth\Disable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
 
-	$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
-	$application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
+    $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
 
-	$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
-	$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
-	$application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
+    $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
+    $application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
-	$application->add(new OC\Core\Command\Encryption\DecryptAll(
-		\OC::$server->getEncryptionManager(),
-		\OC::$server->getAppManager(),
-		\OC::$server->getConfig(),
-		new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
-		new \Symfony\Component\Console\Helper\QuestionHelper())
-	);
+    $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
+    $application->add(new OC\Core\Command\Encryption\DecryptAll(
+        \OC::$server->getEncryptionManager(),
+        \OC::$server->getAppManager(),
+        \OC::$server->getConfig(),
+        new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
+        new \Symfony\Component\Console\Helper\QuestionHelper())
+    );
 
-	$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
 
-	$view = new \OC\Files\View();
-	$util = new \OC\Encryption\Util(
-		$view,
-		\OC::$server->getUserManager(),
-		\OC::$server->getGroupManager(),
-		\OC::$server->getConfig()
-	);
-	$application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
-			$view,
-			\OC::$server->getUserManager(),
-			\OC::$server->getConfig(),
-			$util,
-			new \Symfony\Component\Console\Helper\QuestionHelper()
-		)
-	);
-	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
+    $view = new \OC\Files\View();
+    $util = new \OC\Encryption\Util(
+        $view,
+        \OC::$server->getUserManager(),
+        \OC::$server->getGroupManager(),
+        \OC::$server->getConfig()
+    );
+    $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
+            $view,
+            \OC::$server->getUserManager(),
+            \OC::$server->getConfig(),
+            $util,
+            new \Symfony\Component\Console\Helper\QuestionHelper()
+        )
+    );
+    $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
 
-	$application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
-	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
-	$application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
+    $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
+    $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
+    $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
 
-	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(Installer::class)));
-	$application->add(new OC\Core\Command\Maintenance\Repair(
-		new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
-		\OC::$server->getEventDispatcher(), \OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(Installer::class)));
+    $application->add(new OC\Core\Command\Maintenance\Repair(
+        new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
+        \OC::$server->getEventDispatcher(), \OC::$server->getAppManager()));
 
-	$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 
-	$application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 
-	$application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
-	$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
-	$application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
+    $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
+    $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
+    $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
 } else {
-	$application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
 }

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 (OC::checkUpgrade(false)) {
 
-	$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/Maintenance/Install.php

Indentation +158 added lines, -158 removed lines

@@ -43,162 +43,162 @@
 
 class Install extends Command {
 
-	/**
-	 * @var SystemConfig
-	 */
-	private $config;
-
-	public function __construct(SystemConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:install')
-			->setDescription('install Nextcloud')
-			->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
-			->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
-			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
-			->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
-			->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
-			->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
-			->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null)
-			->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
-			->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
-			->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
-			->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		// validate the environment
-		$server = \OC::$server;
-		$setupHelper = new Setup(
-			$this->config,
-			$server->getIniWrapper(),
-			$server->getL10N('lib'),
-			$server->query(Defaults::class),
-			$server->getLogger(),
-			$server->getSecureRandom(),
-			\OC::$server->query(Installer::class)
-		);
-		$sysInfo = $setupHelper->getSystemInfo(true);
-		$errors = $sysInfo['errors'];
-		if (count($errors) > 0) {
-			$this->printErrors($output, $errors);
-
-			// ignore the OS X setup warning
-			if(count($errors) !== 1 ||
-				(string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
-				return 1;
-			}
-		}
-
-		// validate user input
-		$options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
-
-		// perform installation
-		$errors = $setupHelper->install($options);
-		if (count($errors) > 0) {
-			$this->printErrors($output, $errors);
-			return 1;
-		}
-		$output->writeln("Nextcloud was successfully installed");
-		return 0;
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param string[] $supportedDatabases
-	 * @return array
-	 */
-	protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
-		$db = strtolower($input->getOption('database'));
-
-		if (!in_array($db, $supportedDatabases)) {
-			throw new InvalidArgumentException("Database <$db> is not supported.");
-		}
-
-		$dbUser = $input->getOption('database-user');
-		$dbPass = $input->getOption('database-pass');
-		$dbName = $input->getOption('database-name');
-		$dbPort = $input->getOption('database-port');
-		if ($db === 'oci') {
-			// an empty hostname needs to be read from the raw parameters
-			$dbHost = $input->getParameterOption('--database-host', '');
-		} else {
-			$dbHost = $input->getOption('database-host');
-		}
-		$dbTablePrefix = 'oc_';
-		if ($input->hasParameterOption('--database-table-prefix')) {
-			$dbTablePrefix = (string) $input->getOption('database-table-prefix');
-			$dbTablePrefix = trim($dbTablePrefix);
-		}
-		if ($input->hasParameterOption('--database-pass')) {
-			$dbPass = (string) $input->getOption('database-pass');
-		}
-		$adminLogin = $input->getOption('admin-user');
-		$adminPassword = $input->getOption('admin-pass');
-		$dataDir = $input->getOption('data-dir');
-
-		if ($db !== 'sqlite') {
-			if (is_null($dbUser)) {
-				throw new InvalidArgumentException("Database user not provided.");
-			}
-			if (is_null($dbName)) {
-				throw new InvalidArgumentException("Database name not provided.");
-			}
-			if (is_null($dbPass)) {
-				/** @var QuestionHelper $helper */
-				$helper = $this->getHelper('question');
-				$question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
-				$question->setHidden(true);
-				$question->setHiddenFallback(false);
-				$dbPass = $helper->ask($input, $output, $question);
-			}
-		}
-
-		if (is_null($adminPassword)) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
-			$question->setHidden(true);
-			$question->setHiddenFallback(false);
-			$adminPassword = $helper->ask($input, $output, $question);
-		}
-
-		$options = [
-			'dbtype' => $db,
-			'dbuser' => $dbUser,
-			'dbpass' => $dbPass,
-			'dbname' => $dbName,
-			'dbhost' => $dbHost,
-			'dbport' => $dbPort,
-			'dbtableprefix' => $dbTablePrefix,
-			'adminlogin' => $adminLogin,
-			'adminpass' => $adminPassword,
-			'directory' => $dataDir
-		];
-		if ($db === 'oci') {
-			$options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
-		}
-		return $options;
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 * @param $errors
-	 */
-	protected function printErrors(OutputInterface $output, $errors) {
-		foreach ($errors as $error) {
-			if (is_array($error)) {
-				$output->writeln('<error>' . (string)$error['error'] . '</error>');
-				$output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
-			} else {
-				$output->writeln('<error>' . (string)$error . '</error>');
-			}
-		}
-	}
+    /**
+     * @var SystemConfig
+     */
+    private $config;
+
+    public function __construct(SystemConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:install')
+            ->setDescription('install Nextcloud')
+            ->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
+            ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
+            ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
+            ->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
+            ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
+            ->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
+            ->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null)
+            ->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
+            ->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
+            ->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
+            ->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+
+        // validate the environment
+        $server = \OC::$server;
+        $setupHelper = new Setup(
+            $this->config,
+            $server->getIniWrapper(),
+            $server->getL10N('lib'),
+            $server->query(Defaults::class),
+            $server->getLogger(),
+            $server->getSecureRandom(),
+            \OC::$server->query(Installer::class)
+        );
+        $sysInfo = $setupHelper->getSystemInfo(true);
+        $errors = $sysInfo['errors'];
+        if (count($errors) > 0) {
+            $this->printErrors($output, $errors);
+
+            // ignore the OS X setup warning
+            if(count($errors) !== 1 ||
+                (string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
+                return 1;
+            }
+        }
+
+        // validate user input
+        $options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
+
+        // perform installation
+        $errors = $setupHelper->install($options);
+        if (count($errors) > 0) {
+            $this->printErrors($output, $errors);
+            return 1;
+        }
+        $output->writeln("Nextcloud was successfully installed");
+        return 0;
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param string[] $supportedDatabases
+     * @return array
+     */
+    protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
+        $db = strtolower($input->getOption('database'));
+
+        if (!in_array($db, $supportedDatabases)) {
+            throw new InvalidArgumentException("Database <$db> is not supported.");
+        }
+
+        $dbUser = $input->getOption('database-user');
+        $dbPass = $input->getOption('database-pass');
+        $dbName = $input->getOption('database-name');
+        $dbPort = $input->getOption('database-port');
+        if ($db === 'oci') {
+            // an empty hostname needs to be read from the raw parameters
+            $dbHost = $input->getParameterOption('--database-host', '');
+        } else {
+            $dbHost = $input->getOption('database-host');
+        }
+        $dbTablePrefix = 'oc_';
+        if ($input->hasParameterOption('--database-table-prefix')) {
+            $dbTablePrefix = (string) $input->getOption('database-table-prefix');
+            $dbTablePrefix = trim($dbTablePrefix);
+        }
+        if ($input->hasParameterOption('--database-pass')) {
+            $dbPass = (string) $input->getOption('database-pass');
+        }
+        $adminLogin = $input->getOption('admin-user');
+        $adminPassword = $input->getOption('admin-pass');
+        $dataDir = $input->getOption('data-dir');
+
+        if ($db !== 'sqlite') {
+            if (is_null($dbUser)) {
+                throw new InvalidArgumentException("Database user not provided.");
+            }
+            if (is_null($dbName)) {
+                throw new InvalidArgumentException("Database name not provided.");
+            }
+            if (is_null($dbPass)) {
+                /** @var QuestionHelper $helper */
+                $helper = $this->getHelper('question');
+                $question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
+                $question->setHidden(true);
+                $question->setHiddenFallback(false);
+                $dbPass = $helper->ask($input, $output, $question);
+            }
+        }
+
+        if (is_null($adminPassword)) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $adminPassword = $helper->ask($input, $output, $question);
+        }
+
+        $options = [
+            'dbtype' => $db,
+            'dbuser' => $dbUser,
+            'dbpass' => $dbPass,
+            'dbname' => $dbName,
+            'dbhost' => $dbHost,
+            'dbport' => $dbPort,
+            'dbtableprefix' => $dbTablePrefix,
+            'adminlogin' => $adminLogin,
+            'adminpass' => $adminPassword,
+            'directory' => $dataDir
+        ];
+        if ($db === 'oci') {
+            $options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
+        }
+        return $options;
+    }
+
+    /**
+     * @param OutputInterface $output
+     * @param $errors
+     */
+    protected function printErrors(OutputInterface $output, $errors) {
+        foreach ($errors as $error) {
+            if (is_array($error)) {
+                $output->writeln('<error>' . (string)$error['error'] . '</error>');
+                $output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
+            } else {
+                $output->writeln('<error>' . (string)$error . '</error>');
+            }
+        }
+    }
 }

core/Command/App/Install.php

Indentation +32 added lines, -32 removed lines

@@ -30,42 +30,42 @@
 
 class Install extends Command {
 
-	protected function configure() {
-		$this
-			->setName('app:install')
-			->setDescription('install an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'install the specified app'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('app:install')
+            ->setDescription('install an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'install the specified app'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appId = $input->getArgument('app-id');
 
-		if (\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' already installed');
-			return 1;
-		}
+        if (\OC_App::getAppPath($appId)) {
+            $output->writeln($appId . ' already installed');
+            return 1;
+        }
 
-		try {
-			$installer = \OC::$server->query(Installer::class);
-			$installer->downloadApp($appId);
-			$result = $installer->installApp($appId);
-		} catch(\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
+        try {
+            $installer = \OC::$server->query(Installer::class);
+            $installer->downloadApp($appId);
+            $result = $installer->installApp($appId);
+        } catch(\Exception $e) {
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
 
-		if($result === false) {
-			$output->writeln($appId . ' couldn\'t be installed');
-			return 1;
-		}
+        if($result === false) {
+            $output->writeln($appId . ' couldn\'t be installed');
+            return 1;
+        }
 
-		$output->writeln($appId . ' installed');
+        $output->writeln($appId . ' installed');
 
-		return 0;
-	}
+        return 0;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
 		$appId = $input->getArgument('app-id');
 
 		if (\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' already installed');
+			$output->writeln($appId.' already installed');
 			return 1;
 		}
 
@@ -54,17 +54,17 @@ 
 			$installer = \OC::$server->query(Installer::class);
 			$installer->downloadApp($appId);
 			$result = $installer->installApp($appId);
-		} catch(\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+		} catch (\Exception $e) {
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 
-		if($result === false) {
-			$output->writeln($appId . ' couldn\'t be installed');
+		if ($result === false) {
+			$output->writeln($appId.' couldn\'t be installed');
 			return 1;
 		}
 
-		$output->writeln($appId . ' installed');
+		$output->writeln($appId.' installed');
 
 		return 0;
 	}

core/Command/Upgrade.php

Indentation +242 added lines, -242 removed lines

@@ -48,263 +48,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(\OC::checkUpgrade(false)) {
-			if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-				// Prepend each line with a little timestamp
-				$timestampFormatter = new TimestampFormatter($this->config, $output->getFormatter());
-				$output->setFormatter($timestampFormatter);
-			}
+        if(\OC::checkUpgrade(false)) {
+            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>'
+            );
+        }
+    }
 }

lib/base.php

Indentation +996 added lines, -996 removed lines

@@ -62,1002 +62,1002 @@
  * 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 && self::checkUpgrade(false)) {
-
-			$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();
-		}
-	}
-
-	/**
-	 * Checks if the version requires an update and shows
-	 * @param bool $showTemplate Whether an update screen should get shown
-	 * @return bool|void
-	 */
-	public static function checkUpgrade($showTemplate = true) {
-		if (\OCP\Util::needUpgrade()) {
-			if (function_exists('opcache_reset')) {
-				opcache_reset();
-			}
-			$systemConfig = \OC::$server->getSystemConfig();
-			if ($showTemplate && !$systemConfig->getValue('maintenance', false)) {
-				self::printUpgradePage();
-				exit();
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Prints the upgrade page
-	 */
-	private static function printUpgradePage() {
-		$systemConfig = \OC::$server->getSystemConfig();
-
-		$disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
-		$tooBig = false;
-		if (!$disableWebUpdater) {
-			$apps = \OC::$server->getAppManager();
-			$tooBig = false;
-			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 (!self::checkUpgrade(false)) {
-			OC_User::setupBackends();
-		} else {
-			// Run upgrades in incognito mode
-			OC_User::setIncognitoMode(true);
-		}
-
-		self::registerCacheHooks();
-		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 cache
-	 */
-	public static function registerCacheHooks() {
-		//don't try to do this before we are properly setup
-		if (\OC::$server->getSystemConfig()->getValue('installed', false) && !self::checkUpgrade(false)) {
-
-			// NOTE: This will be replaced to use OCP
-			$userSession = self::$server->getUserSession();
-			$userSession->listen('\OC\User', 'postLogin', function () {
-				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(
-				\OC::$server->getSystemConfig(),
-				\OC::$server->getIniWrapper(),
-				\OC::$server->getL10N('lib'),
-				\OC::$server->query(\OCP\Defaults::class),
-				\OC::$server->getLogger(),
-				\OC::$server->getSecureRandom(),
-				\OC::$server->query(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();
-			self::checkUpgrade();
-		}
-
-		// 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 (!self::checkUpgrade(false)
-			&& !$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) && !self::checkUpgrade(false)) {
-					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 && self::checkUpgrade(false)) {
+
+            $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();
+        }
+    }
+
+    /**
+     * Checks if the version requires an update and shows
+     * @param bool $showTemplate Whether an update screen should get shown
+     * @return bool|void
+     */
+    public static function checkUpgrade($showTemplate = true) {
+        if (\OCP\Util::needUpgrade()) {
+            if (function_exists('opcache_reset')) {
+                opcache_reset();
+            }
+            $systemConfig = \OC::$server->getSystemConfig();
+            if ($showTemplate && !$systemConfig->getValue('maintenance', false)) {
+                self::printUpgradePage();
+                exit();
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Prints the upgrade page
+     */
+    private static function printUpgradePage() {
+        $systemConfig = \OC::$server->getSystemConfig();
+
+        $disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
+        $tooBig = false;
+        if (!$disableWebUpdater) {
+            $apps = \OC::$server->getAppManager();
+            $tooBig = false;
+            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 (!self::checkUpgrade(false)) {
+            OC_User::setupBackends();
+        } else {
+            // Run upgrades in incognito mode
+            OC_User::setIncognitoMode(true);
+        }
+
+        self::registerCacheHooks();
+        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 cache
+     */
+    public static function registerCacheHooks() {
+        //don't try to do this before we are properly setup
+        if (\OC::$server->getSystemConfig()->getValue('installed', false) && !self::checkUpgrade(false)) {
+
+            // NOTE: This will be replaced to use OCP
+            $userSession = self::$server->getUserSession();
+            $userSession->listen('\OC\User', 'postLogin', function () {
+                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(
+                \OC::$server->getSystemConfig(),
+                \OC::$server->getIniWrapper(),
+                \OC::$server->getL10N('lib'),
+                \OC::$server->query(\OCP\Defaults::class),
+                \OC::$server->getLogger(),
+                \OC::$server->getSecureRandom(),
+                \OC::$server->query(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();
+            self::checkUpgrade();
+        }
+
+        // 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 (!self::checkUpgrade(false)
+            && !$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) && !self::checkUpgrade(false)) {
+                    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();