nextcloud / server

core/templates/installation.php

Indentation +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 script('core', [
-	'dist/install'
+    'dist/install'
 ]);
 ?>
 <input type='hidden' id='hasMySQL' value='<?php p($_['hasMySQL']) ?>'>
@@ -29,9 +29,9 @@ 
 		<legend><strong><?php p($l->t('Security warning'));?></strong></legend>
 		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
 		<?php print_unescaped($l->t(
-			'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.',
-			[link_to_docs('admin-install')]
-		)); ?></p>
+            'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.',
+            [link_to_docs('admin-install')]
+        )); ?></p>
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
@@ -75,7 +75,7 @@ 
 	<?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?>
+            $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?>
 		<legend><?php p($l->t('Configure the database')); ?></legend>
 		<div id="selectDbType">
 		<?php foreach($_['databases'] as $type => $label): ?>

Spacing +22 added lines, -22 removed lines

@@ -9,12 +9,12 @@ 
 <input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'>
 <form action="index.php" method="post">
 <input type="hidden" name="install" value="true">
-	<?php if(count($_['errors']) > 0): ?>
+	<?php if (count($_['errors']) > 0): ?>
 	<fieldset class="warning">
-		<legend><strong><?php p($l->t('Error'));?></strong></legend>
-		<?php foreach($_['errors'] as $err): ?>
+		<legend><strong><?php p($l->t('Error')); ?></strong></legend>
+		<?php foreach ($_['errors'] as $err): ?>
 		<p>
-			<?php if(is_array($err)):?>
+			<?php if (is_array($err)):?>
 				<?php p($err['error']); ?>
 				<span class='hint'><?php p($err['hint']); ?></span>
 			<?php else: ?>
@@ -24,10 +24,10 @@ 
 		<?php endforeach; ?>
 	</fieldset>
 	<?php endif; ?>
-	<?php if(!$_['htaccessWorking']): ?>
+	<?php if (!$_['htaccessWorking']): ?>
 	<fieldset class="warning">
-		<legend><strong><?php p($l->t('Security warning'));?></strong></legend>
-		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
+		<legend><strong><?php p($l->t('Security warning')); ?></strong></legend>
+		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.')); ?><br>
 		<?php print_unescaped($l->t(
 			'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.',
 			[link_to_docs('admin-install')]
@@ -54,13 +54,13 @@ 
 		</p>
 	</fieldset>
 
-	<?php if(!$_['directoryIsSet'] or !$_['dbIsSet'] or count($_['errors']) > 0): ?>
+	<?php if (!$_['directoryIsSet'] or !$_['dbIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id="advancedHeader">
 		<legend><a id="showAdvanced" tabindex="0" href="#"><?php p($l->t('Storage & database')); ?><img src="<?php print_unescaped(image_path('', 'actions/caret-white.svg')); ?>" /></a></legend>
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['directoryIsSet'] or count($_['errors']) > 0): ?>
+	<?php if (!$_['directoryIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id="datadirField">
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t('Data folder')); ?></label>
@@ -72,14 +72,14 @@ 
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?>
+	<?php if (!$_['dbIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?>
+		<?php if ($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
+			$hasOtherDB = true; else $hasOtherDB = false; //other than SQLite?>
 		<legend><?php p($l->t('Configure the database')); ?></legend>
 		<div id="selectDbType">
-		<?php foreach($_['databases'] as $type => $label): ?>
-		<?php if(count($_['databases']) === 1): ?>
+		<?php foreach ($_['databases'] as $type => $label): ?>
+		<?php if (count($_['databases']) === 1): ?>
 		<p class="info">
 			<?php p($l->t('Only %s is available.', [$label])); ?>
 			<?php p($l->t('Install and activate additional PHP modules to choose other database types.')); ?><br>
@@ -96,7 +96,7 @@ 
 		</div>
 	</fieldset>
 
-		<?php if($hasOtherDB): ?>
+		<?php if ($hasOtherDB): ?>
 		<fieldset id='databaseField'>
 		<div id="use_other_db">
 			<p class="grouptop">
@@ -123,7 +123,7 @@ 
 					autocomplete="off" autocapitalize="none" autocorrect="off"
 					pattern="[0-9a-zA-Z$_-]+">
 			</p>
-			<?php if($_['hasOracle']): ?>
+			<?php if ($_['hasOracle']): ?>
 			<div id="use_oracle_db">
 				<p class="groupmiddle">
 					<label for="dbtablespace" class="infield"><?php p($l->t('Database tablespace')); ?></label>
@@ -149,11 +149,11 @@ 
 		<?php endif; ?>
 	<?php endif; ?>
 
-	<?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?>
+	<?php if (!$_['dbIsSet'] or count($_['errors']) > 0): ?>
 		<fieldset id="sqliteInformation" class="warning">
-			<legend><?php p($l->t('Performance warning'));?></legend>
-			<p><?php p($l->t('You chose SQLite as database.'));?></p>
-			<p><?php p($l->t('SQLite should only be used for minimal and development instances. For production we recommend a different database backend.'));?></p>
+			<legend><?php p($l->t('Performance warning')); ?></legend>
+			<p><?php p($l->t('You chose SQLite as database.')); ?></p>
+			<p><?php p($l->t('SQLite should only be used for minimal and development instances. For production we recommend a different database backend.')); ?></p>
 			<p><?php p($l->t('If you use clients for file syncing, the use of SQLite is highly discouraged.')); ?></p>
 		</fieldset>
 	<?php endif ?>
@@ -174,7 +174,7 @@ 
 
 	<p class="info">
 		<span class="icon-info-white"></span>
-		<?php p($l->t('Need help?'));?>
-		<a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation'));?> ↗</a>
+		<?php p($l->t('Need help?')); ?>
+		<a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation')); ?> ↗</a>
 	</p>
 </form>

Braces +16 added lines, -6 removed lines

@@ -17,8 +17,11 @@ 
 			<?php if(is_array($err)):?>
 				<?php p($err['error']); ?>
 				<span class='hint'><?php p($err['hint']); ?></span>
-			<?php else: ?>
-				<?php p($err); ?>
+			<?php else {
+    : ?>
+				<?php p($err);
+}
+?>
 			<?php endif; ?>
 		</p>
 		<?php endforeach; ?>
@@ -74,8 +77,12 @@ 
 
 	<?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?>
+		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) {
+			$hasOtherDB = true;
+} else {
+			    $hasOtherDB =false;
+			}
+			//other than SQLite?>
 		<legend><?php p($l->t('Configure the database')); ?></legend>
 		<div id="selectDbType">
 		<?php foreach($_['databases'] as $type => $label): ?>
@@ -87,11 +94,14 @@ 
 				<?php p($l->t('For more details check out the documentation.')); ?> ↗</a>
 		</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
-		<?php else: ?>
+		<?php else {
+    : ?>
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
 			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
 		<label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php endforeach; ?>
 		</div>
 	</fieldset>

core/templates/layout.guest.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 		<?php include 'layout.noscript.warning.php'; ?>
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
 			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
@@ -37,7 +37,7 @@ 
 								<h1 class="hidden-visually">
 									<?php p($theme->getName()); ?>
 								</h1>
-								<?php if(\OC::$server->getConfig()->getSystemValue('installed', false)
+								<?php if (\OC::$server->getConfig()->getSystemValue('installed', false)
 									&& \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
 									<img src="<?php p($theme->getLogo()); ?>"/>
 								<?php endif; ?>

core/templates/layout.user.php

Spacing +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
 		<meta charset="utf-8">
 		<title>
 			<?php
-				p(!empty($_['application'])?$_['application'].' - ':'');
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
 				p($theme->getTitle());
 			?>
 		</title>
@@ -15,7 +15,7 @@ 
 		<?php } ?>
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
 		<meta name="mobile-web-app-capable" content="yes">
 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -26,7 +26,7 @@ 
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 	<?php include 'layout.noscript.warning.php'; ?>
 
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
@@ -45,7 +45,7 @@ 
 					id="nextcloud">
 					<div class="logo logo-icon">
 						<h1 class="hidden-visually">
-							<?php p($theme->getName()); ?> <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
+							<?php p($theme->getName()); ?> <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
 						</h1>
 					</div>
 				</a>
@@ -60,7 +60,7 @@ 
 										<?php if ($_['themingInvertMenu']) { ?>
 										<defs><filter id="invertMenuMain-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs>
 										<?php } ?>
-										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
+										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
 									</svg>
 								<span>
 									<?php p($entry['name']); ?>
@@ -81,14 +81,14 @@ 
 					<div id="navigation" style="display: none;"  aria-label="<?php p($l->t('More apps menu')); ?>">
 						<div id="apps">
 							<ul>
-								<?php foreach($_['navigation'] as $entry): ?>
+								<?php foreach ($_['navigation'] as $entry): ?>
 									<li data-id="<?php p($entry['id']); ?>">
 									<a href="<?php print_unescaped($entry['href']); ?>"
-										<?php if($entry['active']): ?> class="active"<?php endif; ?>
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>
 										aria-label="<?php p($entry['name']); ?>">
 										<svg width="16" height="16" viewBox="0 0 16 16" alt="">
 											<defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
-											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
+											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
 										</svg>
 										<span><?php p($entry['name']); ?></span>
 									</a>
@@ -104,43 +104,43 @@ 
 			<div class="header-right">
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
 					<label for="searchbox" class="hidden-visually">
-						<?php p($l->t('Search'));?>
+						<?php p($l->t('Search')); ?>
 					</label>
 					<input id="searchbox" type="search" name="query"
 						value="" required class="hidden icon-search-white icon-search-force-white"
 						autocomplete="off">
-					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
+					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search')); ?></span></button>
 				</form>
 				<div id="contactsmenu">
 					<div class="icon-contacts menutoggle" tabindex="0" role="button"
 					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
-						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
+						<span class="hidden-visually"><?php p($l->t('Contacts')); ?></span>
 					</div>
 					<div id="contactsmenu-menu" class="menu"
-						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
+						aria-label="<?php p($l->t('Contacts menu')); ?>"></div>
 				</div>
 				<div id="settings">
 					<div id="expand" tabindex="0" role="button" class="menutoggle"
-						aria-label="<?php p($l->t('Settings'));?>"
+						aria-label="<?php p($l->t('Settings')); ?>"
 						aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
 							<?php if ($_['userAvatarSet']): ?>
 								<img alt="" width="32" height="32"
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
-								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
+								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']])); ?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']])); ?> 4x"
 								>
 							<?php endif; ?>
 						</div>
 						<div id="expandDisplayName" class="icon-settings-white"></div>
 					</div>
 					<nav class="settings-menu" id="expanddiv" style="display:none;"
-						aria-label="<?php p($l->t('Settings menu'));?>">
+						aria-label="<?php p($l->t('Settings menu')); ?>">
 					<ul>
-					<?php foreach($_['settingsnavigation'] as $entry):?>
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
 						<li data-id="<?php p($entry['id']); ?>">
 							<a href="<?php print_unescaped($entry['href']); ?>"
-								<?php if($entry["active"]): ?> class="active"<?php endif; ?>>
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
 								<?php p($entry['name']) ?>
 							</a>
 						</li>

core/templates/403.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 // @codeCoverageIgnoreStart
-if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
+if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
 	require_once '../../lib/base.php';
 
 	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
 	exit;
 }
 // @codeCoverageIgnoreEnd
@@ -12,6 +12,6 @@ 
 <ul>
 	<li class='error'>
 		<?php p($l->t('Access forbidden')); ?><br>
-		<p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p>
+		<p class='hint'><?php if (isset($_['message'])) p($_['message'])?></p>
 	</li>
 </ul>

core/Command/Encryption/DecryptAll.php

Indentation +152 added lines, -152 removed lines

@@ -42,156 +42,156 @@
 
 class DecryptAll extends Command {
 
-	/** @var IManager */
-	protected $encryptionManager;
-
-	/** @var  IAppManager */
-	protected $appManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var  QuestionHelper */
-	protected $questionHelper;
-
-	/** @var bool */
-	protected $wasTrashbinEnabled;
-
-	/** @var  bool */
-	protected $wasMaintenanceModeEnabled;
-
-	/** @var \OC\Encryption\DecryptAll */
-	protected $decryptAll;
-
-	/**
-	 * @param IManager $encryptionManager
-	 * @param IAppManager $appManager
-	 * @param IConfig $config
-	 * @param \OC\Encryption\DecryptAll $decryptAll
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(
-		IManager $encryptionManager,
-		IAppManager $appManager,
-		IConfig $config,
-		\OC\Encryption\DecryptAll $decryptAll,
-		QuestionHelper $questionHelper
-	) {
-		parent::__construct();
-
-		$this->appManager = $appManager;
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-		$this->decryptAll = $decryptAll;
-		$this->questionHelper = $questionHelper;
-	}
-
-	/**
-	 * Set maintenance mode and disable the trashbin app
-	 */
-	protected function forceMaintenanceAndTrashbin() {
-		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
-		$this->wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance');
-		$this->config->setSystemValue('maintenance', true);
-		$this->appManager->disableApp('files_trashbin');
-	}
-
-	/**
-	 * Reset the maintenance mode and re-enable the trashbin app
-	 */
-	protected function resetMaintenanceAndTrashbin() {
-		$this->config->setSystemValue('maintenance', $this->wasMaintenanceModeEnabled);
-		if ($this->wasTrashbinEnabled) {
-			$this->appManager->enableApp('files_trashbin');
-		}
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this->setName('encryption:decrypt-all');
-		$this->setDescription('Disable server-side encryption and decrypt all files');
-		$this->setHelp(
-			'This will disable server-side encryption and decrypt all files for '
-			. 'all users if it is supported by your encryption module. '
-			. 'Please make sure that no user access his files during this process!'
-		);
-		$this->addArgument(
-			'user',
-			InputArgument::OPTIONAL,
-			'user for which you want to decrypt all files (optional)',
-			''
-		);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if (!$input->isInteractive()) {
-			$output->writeln('Invalid TTY.');
-			$output->writeln('If you are trying to execute the command in a Docker ');
-			$output->writeln("container, do not forget to execute 'docker exec' with");
-			$output->writeln("the '-i' and '-t' options.");
-			$output->writeln('');
-			return;
-		}
-
-		$isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
-		if ($isMaintenanceModeEnabled) {
-			$output->writeln("Maintenance mode must be disabled when starting decryption,");
-			$output->writeln("in order to load the relevant encryption modules correctly.");
-			$output->writeln("Your instance will automatically be put to maintenance mode");
-			$output->writeln("during the actual decryption of the files.");
-			return;
-		}
-
-		try {
-			if ($this->encryptionManager->isEnabled() === true) {
-				$output->write('Disable server side encryption... ');
-				$this->config->setAppValue('core', 'encryption_enabled', 'no');
-				$output->writeln('done.');
-			} else {
-				$output->writeln('Server side encryption not enabled. Nothing to do.');
-				return;
-			}
-
-			$uid = $input->getArgument('user');
-			if ($uid === '') {
-				$message = 'your Nextcloud';
-			} else {
-				$message = "$uid's account";
-			}
-
-			$output->writeln("\n");
-			$output->writeln("You are about to start to decrypt all files stored in $message.");
-			$output->writeln('It will depend on the encryption module and your setup if this is possible.');
-			$output->writeln('Depending on the number and size of your files this can take some time');
-			$output->writeln('Please make sure that no user access his files during this process!');
-			$output->writeln('');
-			$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->forceMaintenanceAndTrashbin();
-				$user = $input->getArgument('user');
-				$result = $this->decryptAll->decryptAll($input, $output, $user);
-				if ($result === false) {
-					$output->writeln(' aborted.');
-					$output->writeln('Server side encryption remains enabled');
-					$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-				} else if ($uid !== '') {
-					$output->writeln('Server side encryption remains enabled');
-					$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-				}
-				$this->resetMaintenanceAndTrashbin();
-			} else {
-				$output->write('Enable server side encryption... ');
-				$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-				$output->writeln('done.');
-				$output->writeln('aborted');
-			}
-		} catch (\Exception $e) {
-			// enable server side encryption again if something went wrong
-			$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-			$this->resetMaintenanceAndTrashbin();
-			throw $e;
-		}
-
-	}
+    /** @var IManager */
+    protected $encryptionManager;
+
+    /** @var  IAppManager */
+    protected $appManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var  QuestionHelper */
+    protected $questionHelper;
+
+    /** @var bool */
+    protected $wasTrashbinEnabled;
+
+    /** @var  bool */
+    protected $wasMaintenanceModeEnabled;
+
+    /** @var \OC\Encryption\DecryptAll */
+    protected $decryptAll;
+
+    /**
+     * @param IManager $encryptionManager
+     * @param IAppManager $appManager
+     * @param IConfig $config
+     * @param \OC\Encryption\DecryptAll $decryptAll
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(
+        IManager $encryptionManager,
+        IAppManager $appManager,
+        IConfig $config,
+        \OC\Encryption\DecryptAll $decryptAll,
+        QuestionHelper $questionHelper
+    ) {
+        parent::__construct();
+
+        $this->appManager = $appManager;
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+        $this->decryptAll = $decryptAll;
+        $this->questionHelper = $questionHelper;
+    }
+
+    /**
+     * Set maintenance mode and disable the trashbin app
+     */
+    protected function forceMaintenanceAndTrashbin() {
+        $this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
+        $this->wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance');
+        $this->config->setSystemValue('maintenance', true);
+        $this->appManager->disableApp('files_trashbin');
+    }
+
+    /**
+     * Reset the maintenance mode and re-enable the trashbin app
+     */
+    protected function resetMaintenanceAndTrashbin() {
+        $this->config->setSystemValue('maintenance', $this->wasMaintenanceModeEnabled);
+        if ($this->wasTrashbinEnabled) {
+            $this->appManager->enableApp('files_trashbin');
+        }
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this->setName('encryption:decrypt-all');
+        $this->setDescription('Disable server-side encryption and decrypt all files');
+        $this->setHelp(
+            'This will disable server-side encryption and decrypt all files for '
+            . 'all users if it is supported by your encryption module. '
+            . 'Please make sure that no user access his files during this process!'
+        );
+        $this->addArgument(
+            'user',
+            InputArgument::OPTIONAL,
+            'user for which you want to decrypt all files (optional)',
+            ''
+        );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if (!$input->isInteractive()) {
+            $output->writeln('Invalid TTY.');
+            $output->writeln('If you are trying to execute the command in a Docker ');
+            $output->writeln("container, do not forget to execute 'docker exec' with");
+            $output->writeln("the '-i' and '-t' options.");
+            $output->writeln('');
+            return;
+        }
+
+        $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
+        if ($isMaintenanceModeEnabled) {
+            $output->writeln("Maintenance mode must be disabled when starting decryption,");
+            $output->writeln("in order to load the relevant encryption modules correctly.");
+            $output->writeln("Your instance will automatically be put to maintenance mode");
+            $output->writeln("during the actual decryption of the files.");
+            return;
+        }
+
+        try {
+            if ($this->encryptionManager->isEnabled() === true) {
+                $output->write('Disable server side encryption... ');
+                $this->config->setAppValue('core', 'encryption_enabled', 'no');
+                $output->writeln('done.');
+            } else {
+                $output->writeln('Server side encryption not enabled. Nothing to do.');
+                return;
+            }
+
+            $uid = $input->getArgument('user');
+            if ($uid === '') {
+                $message = 'your Nextcloud';
+            } else {
+                $message = "$uid's account";
+            }
+
+            $output->writeln("\n");
+            $output->writeln("You are about to start to decrypt all files stored in $message.");
+            $output->writeln('It will depend on the encryption module and your setup if this is possible.');
+            $output->writeln('Depending on the number and size of your files this can take some time');
+            $output->writeln('Please make sure that no user access his files during this process!');
+            $output->writeln('');
+            $question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->forceMaintenanceAndTrashbin();
+                $user = $input->getArgument('user');
+                $result = $this->decryptAll->decryptAll($input, $output, $user);
+                if ($result === false) {
+                    $output->writeln(' aborted.');
+                    $output->writeln('Server side encryption remains enabled');
+                    $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+                } else if ($uid !== '') {
+                    $output->writeln('Server side encryption remains enabled');
+                    $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+                }
+                $this->resetMaintenanceAndTrashbin();
+            } else {
+                $output->write('Enable server side encryption... ');
+                $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+                $output->writeln('done.');
+                $output->writeln('aborted');
+            }
+        } catch (\Exception $e) {
+            // enable server side encryption again if something went wrong
+            $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+            $this->resetMaintenanceAndTrashbin();
+            throw $e;
+        }
+
+    }
 }

core/Command/Encryption/EncryptAll.php

Indentation +105 added lines, -105 removed lines

@@ -37,110 +37,110 @@
 
 class EncryptAll extends Command {
 
-	/** @var IManager */
-	protected $encryptionManager;
-
-	/** @var  IAppManager */
-	protected $appManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var  QuestionHelper */
-	protected $questionHelper;
-
-	/** @var bool */
-	protected $wasTrashbinEnabled;
-
-	/** @var  bool */
-	protected $wasMaintenanceModeEnabled;
-
-	/**
-	 * @param IManager $encryptionManager
-	 * @param IAppManager $appManager
-	 * @param IConfig $config
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(
-		IManager $encryptionManager,
-		IAppManager $appManager,
-		IConfig $config,
-		QuestionHelper $questionHelper
-	) {
-		parent::__construct();
-		$this->appManager = $appManager;
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-		$this->questionHelper = $questionHelper;
-	}
-
-	/**
-	 * Set maintenance mode and disable the trashbin app
-	 */
-	protected function forceMaintenanceAndTrashbin() {
-		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
-		$this->wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance');
-		$this->config->setSystemValue('maintenance', true);
-		$this->appManager->disableApp('files_trashbin');
-	}
-
-	/**
-	 * Reset the maintenance mode and re-enable the trashbin app
-	 */
-	protected function resetMaintenanceAndTrashbin() {
-		$this->config->setSystemValue('maintenance', $this->wasMaintenanceModeEnabled);
-		if ($this->wasTrashbinEnabled) {
-			$this->appManager->enableApp('files_trashbin');
-		}
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this->setName('encryption:encrypt-all');
-		$this->setDescription('Encrypt all files for all users');
-		$this->setHelp(
-			'This will encrypt all files for all users. '
-			. 'Please make sure that no user access his files during this process!'
-		);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if (!$input->isInteractive()) {
-			$output->writeln('Invalid TTY.');
-			$output->writeln('If you are trying to execute the command in a Docker ');
-			$output->writeln("container, do not forget to execute 'docker exec' with");
-			$output->writeln("the '-i' and '-t' options.");
-			$output->writeln('');
-			return;
-		}
-
-		if ($this->encryptionManager->isEnabled() === false) {
-			throw new \Exception('Server side encryption is not enabled');
-		}
-
-		$output->writeln("\n");
-		$output->writeln('You are about to encrypt all files stored in your Nextcloud installation.');
-		$output->writeln('Depending on the number of available files, and their size, this may take quite some time.');
-		$output->writeln('Please ensure that no user accesses their files during this time!');
-		$output->writeln('Note: The encryption module you use determines which files get encrypted.');
-		$output->writeln('');
-		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
-		if ($this->questionHelper->ask($input, $output, $question)) {
-			$this->forceMaintenanceAndTrashbin();
-
-			try {
-				$defaultModule = $this->encryptionManager->getEncryptionModule();
-				$defaultModule->encryptAll($input, $output);
-			} catch (\Exception $ex) {
-				$this->resetMaintenanceAndTrashbin();
-				throw $ex;
-			}
-
-			$this->resetMaintenanceAndTrashbin();
-		} else {
-			$output->writeln('aborted');
-		}
-	}
+    /** @var IManager */
+    protected $encryptionManager;
+
+    /** @var  IAppManager */
+    protected $appManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var  QuestionHelper */
+    protected $questionHelper;
+
+    /** @var bool */
+    protected $wasTrashbinEnabled;
+
+    /** @var  bool */
+    protected $wasMaintenanceModeEnabled;
+
+    /**
+     * @param IManager $encryptionManager
+     * @param IAppManager $appManager
+     * @param IConfig $config
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(
+        IManager $encryptionManager,
+        IAppManager $appManager,
+        IConfig $config,
+        QuestionHelper $questionHelper
+    ) {
+        parent::__construct();
+        $this->appManager = $appManager;
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+        $this->questionHelper = $questionHelper;
+    }
+
+    /**
+     * Set maintenance mode and disable the trashbin app
+     */
+    protected function forceMaintenanceAndTrashbin() {
+        $this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
+        $this->wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance');
+        $this->config->setSystemValue('maintenance', true);
+        $this->appManager->disableApp('files_trashbin');
+    }
+
+    /**
+     * Reset the maintenance mode and re-enable the trashbin app
+     */
+    protected function resetMaintenanceAndTrashbin() {
+        $this->config->setSystemValue('maintenance', $this->wasMaintenanceModeEnabled);
+        if ($this->wasTrashbinEnabled) {
+            $this->appManager->enableApp('files_trashbin');
+        }
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this->setName('encryption:encrypt-all');
+        $this->setDescription('Encrypt all files for all users');
+        $this->setHelp(
+            'This will encrypt all files for all users. '
+            . 'Please make sure that no user access his files during this process!'
+        );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if (!$input->isInteractive()) {
+            $output->writeln('Invalid TTY.');
+            $output->writeln('If you are trying to execute the command in a Docker ');
+            $output->writeln("container, do not forget to execute 'docker exec' with");
+            $output->writeln("the '-i' and '-t' options.");
+            $output->writeln('');
+            return;
+        }
+
+        if ($this->encryptionManager->isEnabled() === false) {
+            throw new \Exception('Server side encryption is not enabled');
+        }
+
+        $output->writeln("\n");
+        $output->writeln('You are about to encrypt all files stored in your Nextcloud installation.');
+        $output->writeln('Depending on the number of available files, and their size, this may take quite some time.');
+        $output->writeln('Please ensure that no user accesses their files during this time!');
+        $output->writeln('Note: The encryption module you use determines which files get encrypted.');
+        $output->writeln('');
+        $question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+        if ($this->questionHelper->ask($input, $output, $question)) {
+            $this->forceMaintenanceAndTrashbin();
+
+            try {
+                $defaultModule = $this->encryptionManager->getEncryptionModule();
+                $defaultModule->encryptAll($input, $output);
+            } catch (\Exception $ex) {
+                $this->resetMaintenanceAndTrashbin();
+                throw $ex;
+            }
+
+            $this->resetMaintenanceAndTrashbin();
+        } else {
+            $output->writeln('aborted');
+        }
+    }
 
 }

core/Command/TwoFactorAuth/State.php

Indentation +70 added lines, -70 removed lines

@@ -34,75 +34,75 @@
 
 class State extends Base {
 
-	/** @var IRegistry */
-	private $registry;
-
-	public function __construct(IRegistry $registry, IUserManager $userManager) {
-		parent::__construct('twofactorauth:state');
-
-		$this->registry = $registry;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this->setName('twofactorauth:state');
-		$this->setDescription('Get the two-factor authentication (2FA) state of a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return 1;
-		}
-
-		$providerStates = $this->registry->getProviderStates($user);
-		$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
-		list($enabled, $disabled) = $filtered;
-
-		if (!empty($enabled)) {
-			$output->writeln("Two-factor authentication is enabled for user $uid");
-		} else {
-			$output->writeln("Two-factor authentication is not enabled for user $uid");
-		}
-
-		$output->writeln("");
-		$this->printProviders("Enabled providers", $enabled, $output);
-		$this->printProviders("Disabled providers", $disabled, $output);
-
-		return 0;
-	}
-
-	private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
-		$enabled = [];
-		$disabled = [];
-
-		foreach ($providerStates as $providerId => $isEnabled) {
-			if ($isEnabled) {
-				$enabled[] = $providerId;
-			} else {
-				$disabled[] = $providerId;
-			}
-		}
-
-		return [$enabled, $disabled];
-	}
-
-	private function printProviders(string $title, array $providers,
-									OutputInterface $output) {
-		if (empty($providers)) {
-			// Ignore and don't print anything
-			return;
-		}
-
-		$output->writeln($title . ":");
-		foreach ($providers as $provider) {
-			$output->writeln("- " . $provider);
-		}
-	}
+    /** @var IRegistry */
+    private $registry;
+
+    public function __construct(IRegistry $registry, IUserManager $userManager) {
+        parent::__construct('twofactorauth:state');
+
+        $this->registry = $registry;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this->setName('twofactorauth:state');
+        $this->setDescription('Get the two-factor authentication (2FA) state of a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return 1;
+        }
+
+        $providerStates = $this->registry->getProviderStates($user);
+        $filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
+        list($enabled, $disabled) = $filtered;
+
+        if (!empty($enabled)) {
+            $output->writeln("Two-factor authentication is enabled for user $uid");
+        } else {
+            $output->writeln("Two-factor authentication is not enabled for user $uid");
+        }
+
+        $output->writeln("");
+        $this->printProviders("Enabled providers", $enabled, $output);
+        $this->printProviders("Disabled providers", $disabled, $output);
+
+        return 0;
+    }
+
+    private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
+        $enabled = [];
+        $disabled = [];
+
+        foreach ($providerStates as $providerId => $isEnabled) {
+            if ($isEnabled) {
+                $enabled[] = $providerId;
+            } else {
+                $disabled[] = $providerId;
+            }
+        }
+
+        return [$enabled, $disabled];
+    }
+
+    private function printProviders(string $title, array $providers,
+                                    OutputInterface $output) {
+        if (empty($providers)) {
+            // Ignore and don't print anything
+            return;
+        }
+
+        $output->writeln($title . ":");
+        foreach ($providers as $provider) {
+            $output->writeln("- " . $provider);
+        }
+    }
 
 }

core/Command/Background/Base.php

Indentation +31 added lines, -31 removed lines

@@ -39,39 +39,39 @@
 abstract class Base extends Command {
 
 
-	abstract protected function getMode();
+    abstract protected function getMode();
 
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$mode = $this->getMode();
-		$this
-			->setName("background:$mode")
-			->setDescription("Use $mode to run background jobs");
-	}
+    protected function configure() {
+        $mode = $this->getMode();
+        $this
+            ->setName("background:$mode")
+            ->setDescription("Use $mode to run background jobs");
+    }
 
-	/**
-	 * Executing this command will set the background job mode for owncloud.
-	 * The mode to set is specified by the concrete sub class by implementing the
-	 * getMode() function.
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mode = $this->getMode();
-		$this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
-		$output->writeln("Set mode for background jobs to '$mode'");
-	}
+    /**
+     * Executing this command will set the background job mode for owncloud.
+     * The mode to set is specified by the concrete sub class by implementing the
+     * getMode() function.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mode = $this->getMode();
+        $this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
+        $output->writeln("Set mode for background jobs to '$mode'");
+    }
 }

core/Controller/SetupController.php

Indentation +113 added lines, -113 removed lines

@@ -36,117 +36,117 @@
 use OCP\ILogger;
 
 class SetupController {
-	/** @var Setup */
-	protected $setupHelper;
-	/** @var string */
-	private $autoConfigFile;
-
-	/**
-	 * @param Setup $setupHelper
-	 */
-	function __construct(Setup $setupHelper) {
-		$this->autoConfigFile = \OC::$configDir.'autoconfig.php';
-		$this->setupHelper = $setupHelper;
-	}
-
-	/**
-	 * @param $post
-	 */
-	public function run($post) {
-		// Check for autosetup:
-		$post = $this->loadAutoConfig($post);
-		$opts = $this->setupHelper->getSystemInfo();
-
-		// convert 'abcpassword' to 'abcpass'
-		if (isset($post['adminpassword'])) {
-			$post['adminpass'] = $post['adminpassword'];
-		}
-		if (isset($post['dbpassword'])) {
-			$post['dbpass'] = $post['dbpassword'];
-		}
-
-		if (!is_file(\OC::$configDir.'/CAN_INSTALL')) {
-			$this->displaySetupForbidden();
-			return;
-		}
-
-		if(isset($post['install']) and $post['install']=='true') {
-			// We have to launch the installation process :
-			$e = $this->setupHelper->install($post);
-			$errors = ['errors' => $e];
-
-			if(count($e) > 0) {
-				$options = array_merge($opts, $post, $errors);
-				$this->display($options);
-			} else {
-				$this->finishSetup(isset($post['install-recommended-apps']));
-			}
-		} else {
-			$options = array_merge($opts, $post);
-			$this->display($options);
-		}
-	}
-
-	private function displaySetupForbidden() {
-		\OC_Template::printGuestPage('', 'installation_forbidden');
-	}
-
-	public function display($post) {
-		$defaults = [
-			'adminlogin' => '',
-			'adminpass' => '',
-			'dbuser' => '',
-			'dbpass' => '',
-			'dbname' => '',
-			'dbtablespace' => '',
-			'dbhost' => 'localhost',
-			'dbtype' => '',
-		];
-		$parameters = array_merge($defaults, $post);
-
-		\OC_Util::addScript('setup');
-		\OC_Template::printGuestPage('', 'installation', $parameters);
-	}
-
-	private function finishSetup(bool $installRecommended) {
-		if(file_exists($this->autoConfigFile)) {
-			unlink($this->autoConfigFile);
-		}
-		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
-
-		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
-			if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
-				\OC_Template::printGuestPage('', 'installation_incomplete');
-			}
-		}
-
-		if ($installRecommended) {
-			$urlGenerator = \OC::$server->getURLGenerator();
-			$location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
-			header('Location: ' . $location);
-			exit();
-		}
-		\OC_Util::redirectToDefaultPage();
-	}
-
-	public function loadAutoConfig($post) {
-		if(file_exists($this->autoConfigFile)) {
-			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
-			$AUTOCONFIG = [];
-			include $this->autoConfigFile;
-			$post = array_merge($post, $AUTOCONFIG);
-		}
-
-		$dbIsSet = isset($post['dbtype']);
-		$directoryIsSet = isset($post['directory']);
-		$adminAccountIsSet = isset($post['adminlogin']);
-
-		if ($dbIsSet and $directoryIsSet and $adminAccountIsSet) {
-			$post['install'] = 'true';
-		}
-		$post['dbIsSet'] = $dbIsSet;
-		$post['directoryIsSet'] = $directoryIsSet;
-
-		return $post;
-	}
+    /** @var Setup */
+    protected $setupHelper;
+    /** @var string */
+    private $autoConfigFile;
+
+    /**
+     * @param Setup $setupHelper
+     */
+    function __construct(Setup $setupHelper) {
+        $this->autoConfigFile = \OC::$configDir.'autoconfig.php';
+        $this->setupHelper = $setupHelper;
+    }
+
+    /**
+     * @param $post
+     */
+    public function run($post) {
+        // Check for autosetup:
+        $post = $this->loadAutoConfig($post);
+        $opts = $this->setupHelper->getSystemInfo();
+
+        // convert 'abcpassword' to 'abcpass'
+        if (isset($post['adminpassword'])) {
+            $post['adminpass'] = $post['adminpassword'];
+        }
+        if (isset($post['dbpassword'])) {
+            $post['dbpass'] = $post['dbpassword'];
+        }
+
+        if (!is_file(\OC::$configDir.'/CAN_INSTALL')) {
+            $this->displaySetupForbidden();
+            return;
+        }
+
+        if(isset($post['install']) and $post['install']=='true') {
+            // We have to launch the installation process :
+            $e = $this->setupHelper->install($post);
+            $errors = ['errors' => $e];
+
+            if(count($e) > 0) {
+                $options = array_merge($opts, $post, $errors);
+                $this->display($options);
+            } else {
+                $this->finishSetup(isset($post['install-recommended-apps']));
+            }
+        } else {
+            $options = array_merge($opts, $post);
+            $this->display($options);
+        }
+    }
+
+    private function displaySetupForbidden() {
+        \OC_Template::printGuestPage('', 'installation_forbidden');
+    }
+
+    public function display($post) {
+        $defaults = [
+            'adminlogin' => '',
+            'adminpass' => '',
+            'dbuser' => '',
+            'dbpass' => '',
+            'dbname' => '',
+            'dbtablespace' => '',
+            'dbhost' => 'localhost',
+            'dbtype' => '',
+        ];
+        $parameters = array_merge($defaults, $post);
+
+        \OC_Util::addScript('setup');
+        \OC_Template::printGuestPage('', 'installation', $parameters);
+    }
+
+    private function finishSetup(bool $installRecommended) {
+        if(file_exists($this->autoConfigFile)) {
+            unlink($this->autoConfigFile);
+        }
+        \OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
+
+        if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
+            if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
+                \OC_Template::printGuestPage('', 'installation_incomplete');
+            }
+        }
+
+        if ($installRecommended) {
+            $urlGenerator = \OC::$server->getURLGenerator();
+            $location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
+            header('Location: ' . $location);
+            exit();
+        }
+        \OC_Util::redirectToDefaultPage();
+    }
+
+    public function loadAutoConfig($post) {
+        if(file_exists($this->autoConfigFile)) {
+            \OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
+            $AUTOCONFIG = [];
+            include $this->autoConfigFile;
+            $post = array_merge($post, $AUTOCONFIG);
+        }
+
+        $dbIsSet = isset($post['dbtype']);
+        $directoryIsSet = isset($post['directory']);
+        $adminAccountIsSet = isset($post['adminlogin']);
+
+        if ($dbIsSet and $directoryIsSet and $adminAccountIsSet) {
+            $post['install'] = 'true';
+        }
+        $post['dbIsSet'] = $dbIsSet;
+        $post['directoryIsSet'] = $directoryIsSet;
+
+        return $post;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -70,12 +70,12 @@ 
 			return;
 		}
 
-		if(isset($post['install']) and $post['install']=='true') {
+		if (isset($post['install']) and $post['install'] == 'true') {
 			// We have to launch the installation process :
 			$e = $this->setupHelper->install($post);
 			$errors = ['errors' => $e];
 
-			if(count($e) > 0) {
+			if (count($e) > 0) {
 				$options = array_merge($opts, $post, $errors);
 				$this->display($options);
 			} else {
@@ -109,7 +109,7 @@ 
 	}
 
 	private function finishSetup(bool $installRecommended) {
-		if(file_exists($this->autoConfigFile)) {
+		if (file_exists($this->autoConfigFile)) {
 			unlink($this->autoConfigFile);
 		}
 		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
@@ -123,14 +123,14 @@ 
 		if ($installRecommended) {
 			$urlGenerator = \OC::$server->getURLGenerator();
 			$location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
-			header('Location: ' . $location);
+			header('Location: '.$location);
 			exit();
 		}
 		\OC_Util::redirectToDefaultPage();
 	}
 
 	public function loadAutoConfig($post) {
-		if(file_exists($this->autoConfigFile)) {
+		if (file_exists($this->autoConfigFile)) {
 			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
 			$AUTOCONFIG = [];
 			include $this->autoConfigFile;