nextcloud / server

apps/federatedfilesharing/templates/settings-admin.php

Braces +16 added lines, -4 removed lines

@@ -11,7 +11,10 @@ 
 		href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
 	<p>
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="outgoingServer2serverShareEnabled">
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
 		</label>
@@ -19,21 +22,30 @@ 
 
 	<p>
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="incomingServer2serverShareEnabled">
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
 		</label><br/>
 	</p>
 	<p>
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['lookupServerEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="lookupServerEnabled">
 			<?php p($l->t('Search global and public address book for users and let local users publish their data'));?>
 		</label><br/>
 	</p>
 	<p>
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
-			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['lookupServerUploadEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="lookupServerUploadEnabled">
 			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
 		</label><br/>

settings/templates/admin/server.php

Indentation +68 added lines, -68 removed lines

@@ -31,101 +31,101 @@ 
 	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.'));?></p>
 	<ul>
 		<?php
-		// is php setup properly to query system environment variables like getenv('PATH')
-		if ($_['getenvServerNotWorking']) {
-			?>
+        // is php setup properly to query system environment variables like getenv('PATH')
+        if ($_['getenvServerNotWorking']) {
+            ?>
 			<li>
 				<?php p($l->t('php does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
 				<?php print_unescaped($l->t('Please check the <a target="_blank" rel="noreferrer" href="%s">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// is read only config enabled
-		if ($_['readOnlyConfigEnabled']) {
-			?>
+        // is read only config enabled
+        if ($_['readOnlyConfigEnabled']) {
+            ?>
 			<li>
 				<?php p($l->t('The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// Are doc blocks accessible?
-		if (!$_['isAnnotationsWorking']) {
-			?>
+        // Are doc blocks accessible?
+        if (!$_['isAnnotationsWorking']) {
+            ?>
 			<li>
 				<?php p($l->t('PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.')); ?><br>
 				<?php p($l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// Is the Transaction isolation level READ_COMMITTED?
-		if ($_['invalidTransactionIsolationLevel']) {
-			?>
+        // Is the Transaction isolation level READ_COMMITTED?
+        if ($_['invalidTransactionIsolationLevel']) {
+            ?>
 			<li>
 				<?php p($l->t('Your database does not run with "READ COMMITTED" transaction isolation level. This can cause problems when multiple actions are executed in parallel.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// Warning if memcache is outdated
-		foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
-			?>
+        // Warning if memcache is outdated
+        foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
+            ?>
 			<li>
 				<?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.', $data)); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// if module fileinfo available?
-		if (!$_['has_fileinfo']) {
-			?>
+        // if module fileinfo available?
+        if (!$_['has_fileinfo']) {
+            ?>
 			<li>
 				<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with MIME type detection.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// locking configured optimally?
-		if ($_['fileLockingType'] === 'none') {
-			?>
+        // locking configured optimally?
+        if ($_['fileLockingType'] === 'none') {
+            ?>
 			<li>
 				<?php print_unescaped($l->t('Transactional file locking is disabled, this might lead to issues with race conditions. Enable \'filelocking.enabled\' in config.php to avoid these problems. See the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a> for more information.', link_to_docs('admin-transactional-locking'))); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// is locale working ?
-		if (!$_['isLocaleWorking']) {
-			?>
+        // is locale working ?
+        if (!$_['isLocaleWorking']) {
+            ?>
 			<li>
 				<?php
-				$locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8';
-				p($l->t('System locale can not be set to a one which supports UTF-8.'));
-				?>
+                $locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8';
+                p($l->t('System locale can not be set to a one which supports UTF-8.'));
+                ?>
 				<br>
 				<?php
-				p($l->t('This means that there might be problems with certain characters in file names.'));
-				?>
+                p($l->t('This means that there might be problems with certain characters in file names.'));
+                ?>
 				<br>
 				<?php
-				p($l->t('We strongly suggest installing the required packages on your system to support one of the following locales: %s.', [$locales]));
-				?>
+                p($l->t('We strongly suggest installing the required packages on your system to support one of the following locales: %s.', [$locales]));
+                ?>
 			</li>
 			<?php
-		}
+        }
 
-		if ($_['suggestedOverwriteCliUrl']) {
-			?>
+        if ($_['suggestedOverwriteCliUrl']) {
+            ?>
 			<li>
 				<?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?>
 			</li>
 			<?php
-		}
+        }
 
-		if ($_['cronErrors']) {
-			?>
+        if ($_['cronErrors']) {
+            ?>
 			<li>
 				<?php p($l->t('It was not possible to execute the cronjob via CLI. The following technical errors have appeared:')); ?>
 				<br>
@@ -136,8 +136,8 @@ 
 				</ol>
 			</li>
 			<?php
-		}
-		?>
+        }
+        ?>
 	</ul>
 
 	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
@@ -159,9 +159,9 @@ 
 	<?php if ($_['cron_log']): ?>
 		<p class="cronlog inlineblock">
 			<?php if ($_['lastcron'] !== false):
-				$relative_time = relative_modified_date($_['lastcron']);
-				$absolute_time = OC_Util::formatDate($_['lastcron']);
-				if (time() - $_['lastcron'] <= 3600): ?>
+                $relative_time = relative_modified_date($_['lastcron']);
+                $absolute_time = OC_Util::formatDate($_['lastcron']);
+                if (time() - $_['lastcron'] <= 3600): ?>
 					<span class="status success"></span>
 					<span class="crondate" title="<?php p($absolute_time);?>">
 					<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
@@ -172,10 +172,10 @@ 
 					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
 				</span>
 				<?php endif;
-			else: ?>
+            else: ?>
 				<span class="status error"></span>
 				<?php p($l->t("Cron was not executed yet!"));
-			endif; ?>
+            endif; ?>
 		</p>
 	<?php endif; ?>
 	<a target="_blank" rel="noreferrer" class="icon-info"
@@ -186,38 +186,38 @@ 
 	<p>
 		<input type="radio" name="mode" value="ajax" class="radio"
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
-			print_unescaped('checked="checked"');
-		} ?>>
+            print_unescaped('checked="checked"');
+        } ?>>
 		<label for="backgroundjobs_ajax">AJAX</label><br/>
 		<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
 	</p>
 	<p>
 		<input type="radio" name="mode" value="webcron" class="radio"
 			   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
-			print_unescaped('checked="checked"');
-		} ?>>
+            print_unescaped('checked="checked"');
+        } ?>>
 		<label for="backgroundjobs_webcron">Webcron</label><br/>
 		<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over http.")); ?></em>
 	</p>
 	<p>
 		<input type="radio" name="mode" value="cron" class="radio"
 			   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
-			print_unescaped('checked="checked"');
-		}
-		if (!$_['cli_based_cron_possible']) {
-			print_unescaped('disabled');
-		}?>>
+            print_unescaped('checked="checked"');
+        }
+        if (!$_['cli_based_cron_possible']) {
+            print_unescaped('disabled');
+        }?>>
 		<label for="backgroundjobs_cron">Cron</label><br/>
 		<em><?php p($l->t("Use system's cron service to call the cron.php file every 15 minutes.")); ?>
 			<?php if($_['cli_based_cron_possible']) {
-				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
-			} else {
-				print_unescaped(str_replace(
-					['{linkstart}', '{linkend}'],
-					['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
-					$l->t('To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details.')
-				));
-		} ?></em>
+                p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
+            } else {
+                print_unescaped(str_replace(
+                    ['{linkstart}', '{linkend}'],
+                    ['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
+                    $l->t('To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details.')
+                ));
+        } ?></em>
 
 	</p>
 </div>

Spacing +15 added lines, -15 removed lines

@@ -27,8 +27,8 @@ 
 ?>
 
 <div id="security-warning" class="section">
-	<h2><?php p($l->t('Security & setup warnings'));?></h2>
-	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.'));?></p>
+	<h2><?php p($l->t('Security & setup warnings')); ?></h2>
+	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.')); ?></p>
 	<ul>
 		<?php
 		// is php setup properly to query system environment variables like getenv('PATH')
@@ -130,7 +130,7 @@ 
 				<?php p($l->t('It was not possible to execute the cronjob via CLI. The following technical errors have appeared:')); ?>
 				<br>
 				<ol>
-					<?php foreach(json_decode($_['cronErrors']) as $error) { if(isset($error->error)) {?>
+					<?php foreach (json_decode($_['cronErrors']) as $error) { if (isset($error->error)) {?>
 						<li><?php p($error->error) ?> <?php p($error->hint) ?></li>
 					<?php }};?>
 				</ol>
@@ -140,22 +140,22 @@ 
 		?>
 	</ul>
 
-	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
+	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
 		<div class="loading"></div>
 		<ul class="errors hidden"></ul>
 		<ul class="warnings hidden"></ul>
 		<ul class="info hidden"></ul>
 		<p class="hint hidden">
-			<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?>
+			<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?>
 		</p>
 	</div>
 	<div id="security-warning-state">
-		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.'));?></span>
+		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.')); ?></span>
 	</div>
 </div>
 
 <div class="section" id="backgroundjobs">
-	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Cron')); ?></h2>
 	<?php if ($_['cron_log']): ?>
 		<p class="cronlog inlineblock">
 			<?php if ($_['lastcron'] !== false):
@@ -163,13 +163,13 @@ 
 				$absolute_time = OC_Util::formatDate($_['lastcron']);
 				if (time() - $_['lastcron'] <= 3600): ?>
 					<span class="status success"></span>
-					<span class="crondate" title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
+					<span class="crondate" title="<?php p($absolute_time); ?>">
+					<?php p($l->t("Last cron job execution: %s.", [$relative_time])); ?>
 				</span>
 				<?php else: ?>
 					<span class="status error"></span>
-					<span class="crondate" title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
+					<span class="crondate" title="<?php p($absolute_time); ?>">
+					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time])); ?>
 				</span>
 				<?php endif;
 			else: ?>
@@ -179,10 +179,10 @@ 
 		</p>
 	<?php endif; ?>
 	<a target="_blank" rel="noreferrer" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
 
-	<p class="settings-hint"><?php p($l->t('For optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
+	<p class="settings-hint"><?php p($l->t('For optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.')); ?></p>
 	<p>
 		<input type="radio" name="mode" value="ajax" class="radio"
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -209,7 +209,7 @@ 
 		}?>>
 		<label for="backgroundjobs_cron">Cron</label><br/>
 		<em><?php p($l->t("Use system's cron service to call the cron.php file every 15 minutes.")); ?>
-			<?php if($_['cli_based_cron_possible']) {
+			<?php if ($_['cli_based_cron_possible']) {
 				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
 			} else {
 				print_unescaped(str_replace(
@@ -224,6 +224,6 @@ 
 
 <div class="section">
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
-	<h2><?php p($l->t('Version'));?></h2>
+	<h2><?php p($l->t('Version')); ?></h2>
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
 </div>

settings/templates/admin/tipstricks.php

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<p class="settings-hint"><?php p($l->t('There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information.')); ?></p>
 	<ul>
 		<?php
-		// SQLite database performance issue
-		if ($_['databaseOverload']) {
-			?>
+        // SQLite database performance issue
+        if ($_['databaseOverload']) {
+            ?>
 			<li>
 				<?php p($l->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend.')); ?><br>
 				<?php p($l->t('This is particularly recommended when using the desktop client for file synchronisation.')); ?><br>

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
 ?>
 
 <div class="section" id="admin-tips">
-	<h2><?php p($l->t('Tips & tricks'));?></h2>
+	<h2><?php p($l->t('Tips & tricks')); ?></h2>
 	<p class="settings-hint"><?php p($l->t('There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information.')); ?></p>
 	<ul>
 		<?php
@@ -37,15 +37,15 @@ 
 			<li>
 				<?php p($l->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend.')); ?><br>
 				<?php p($l->t('This is particularly recommended when using the desktop client for file synchronisation.')); ?><br>
-				<?php print_unescaped($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\', or see the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a>.', link_to_docs('admin-db-conversion') )); ?>
+				<?php print_unescaped($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\', or see the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a>.', link_to_docs('admin-db-conversion'))); ?>
 			</li>
 		<?php } ?>
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-backup')); ?>"><?php p($l->t('How to do backups'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-monitoring')); ?>"><?php p($l->t('Advanced monitoring'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-performance')); ?>"><?php p($l->t('Performance tuning'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-config')); ?>"><?php p($l->t('Improving the config.php'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('developer-theming')); ?>"><?php p($l->t('Theming'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer" href="https://scan.nextcloud.com"><?php p($l->t('Check the security of your Nextcloud over our security scan'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-security')); ?>"><?php p($l->t('Hardening and security guidance'));?> ↗</a></li>
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-backup')); ?>"><?php p($l->t('How to do backups')); ?> ↗</a></li>
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-monitoring')); ?>"><?php p($l->t('Advanced monitoring')); ?> ↗</a></li>
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-performance')); ?>"><?php p($l->t('Performance tuning')); ?> ↗</a></li>
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-config')); ?>"><?php p($l->t('Improving the config.php')); ?> ↗</a></li>
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('developer-theming')); ?>"><?php p($l->t('Theming')); ?> ↗</a></li>
+		<li><a target="_blank" rel="noreferrer" href="https://scan.nextcloud.com"><?php p($l->t('Check the security of your Nextcloud over our security scan')); ?> ↗</a></li>
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-security')); ?>"><?php p($l->t('Hardening and security guidance')); ?> ↗</a></li>
 	</ul>
 </div>

apps/federation/templates/settings-admin.php

Spacing +6 added lines, -6 removed lines

@@ -11,19 +11,19 @@
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if ($_['autoAddServers']) p('checked'); ?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 
 	<ul id="listOfTrustedServers">
-		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
+		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>
 			<li id="<?php p($trustedServer['id']); ?>">
-				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
+				<?php if ((int) $trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+				} elseif (
+					(int) $trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+					(int) $trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
 				) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>

Braces +4 added lines, -1 removed lines

@@ -11,7 +11,10 @@
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) {
+    p('checked');
+}
+?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 

apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php

Indentation +86 added lines, -86 removed lines

@@ -31,90 +31,90 @@
 
 class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param CalDavBackend $calDavBackend
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $db,
-								CalDavBackend $calDavBackend,
-								ILogger $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->timeFactory = $timeFactory;
-	}
-
-	public function run($arguments) {
-		$offset = $arguments['offset'];
-		$stopAt = $arguments['stopAt'];
-
-		$this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
-
-		$offset = $this->buildIndex($offset, $stopAt);
-
-		if ($offset >= $stopAt) {
-			$this->logger->info('Building calendar index done');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
-		}
-	}
-
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex($offset, $stopAt) {
-		$startTime = $this->timeFactory->getTime();
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'calendarid', 'objecturi', 'calendardata'])
-			->from('calendarobjects')
-			->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
-			->orderBy('id', 'ASC');
-
-		$stmt = $query->execute();
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$offset = $row['id'];
-
-			$calendarData = $row['calendardata'];
-			if (is_resource($calendarData)) {
-				$calendarData = stream_get_contents($calendarData);
-			}
-
-			$this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
-
-			if (($this->timeFactory->getTime() - $startTime) > 15) {
-				return $offset;
-			}
-		}
-
-		return $stopAt;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * @param IDBConnection $db
+     * @param CalDavBackend $calDavBackend
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $db,
+                                CalDavBackend $calDavBackend,
+                                ILogger $logger,
+                                IJobList $jobList,
+                                ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->calDavBackend = $calDavBackend;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->timeFactory = $timeFactory;
+    }
+
+    public function run($arguments) {
+        $offset = $arguments['offset'];
+        $stopAt = $arguments['stopAt'];
+
+        $this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
+
+        $offset = $this->buildIndex($offset, $stopAt);
+
+        if ($offset >= $stopAt) {
+            $this->logger->info('Building calendar index done');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+        }
+    }
+
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex($offset, $stopAt) {
+        $startTime = $this->timeFactory->getTime();
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'calendarid', 'objecturi', 'calendardata'])
+            ->from('calendarobjects')
+            ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
+            ->orderBy('id', 'ASC');
+
+        $stmt = $query->execute();
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $offset = $row['id'];
+
+            $calendarData = $row['calendardata'];
+            if (is_resource($calendarData)) {
+                $calendarData = stream_get_contents($calendarData);
+            }
+
+            $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
+
+            if (($this->timeFactory->getTime() - $startTime) > 15) {
+                return $offset;
+            }
+        }
+
+        return $stopAt;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 		$offset = $arguments['offset'];
 		$stopAt = $arguments['stopAt'];
 
-		$this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
+		$this->logger->info('Building calendar index ('.$offset.'/'.$stopAt.')');
 
 		$offset = $this->buildIndex($offset, $stopAt);
 
@@ -80,7 +80,7 @@ 
 				'offset' => $offset,
 				'stopAt' => $stopAt
 			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+			$this->logger->info('New building calendar index job scheduled with offset '.$offset);
 		}
 	}
 
@@ -100,7 +100,7 @@ 
 			->orderBy('id', 'ASC');
 
 		$stmt = $query->execute();
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 			$offset = $row['id'];
 
 			$calendarData = $row['calendardata'];

apps/dav/lib/Migration/BuildCalendarSearchIndex.php

Indentation +45 added lines, -45 removed lines

@@ -30,57 +30,57 @@
 
 class BuildCalendarSearchIndex implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IDBConnection $db
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db,
-								IJobList $jobList,
-								IConfig $config) {
-		$this->db = $db;
-		$this->jobList = $jobList;
-		$this->config = $config;
-	}
+    /**
+     * @param IDBConnection $db
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db,
+                                IJobList $jobList,
+                                IConfig $config) {
+        $this->db = $db;
+        $this->jobList = $jobList;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Registering building of calendar search index as background job';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Registering building of calendar search index as background job';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('dav', 'buildCalendarSearchIndex') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('dav', 'buildCalendarSearchIndex') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
 
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->createFunction('MAX(id)'))
-			->from('calendarobjects');
-		$maxId = (int)$query->execute()->fetchColumn();
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->createFunction('MAX(id)'))
+            ->from('calendarobjects');
+        $maxId = (int)$query->execute()->fetchColumn();
 
-		$output->info('Add background job');
-		$this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [
-			'offset' => 0,
-			'stopAt' => $maxId
-		]);
+        $output->info('Add background job');
+        $this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [
+            'offset' => 0,
+            'stopAt' => $maxId
+        ]);
 
-		// if all were done, no need to redo the repair during next upgrade
-		$this->config->setAppValue('dav', 'buildCalendarSearchIndex', 'yes');
-	}
+        // if all were done, no need to redo the repair during next upgrade
+        $this->config->setAppValue('dav', 'buildCalendarSearchIndex', 'yes');
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 		$query = $this->db->getQueryBuilder();
 		$query->select($query->createFunction('MAX(id)'))
 			->from('calendarobjects');
-		$maxId = (int)$query->execute()->fetchColumn();
+		$maxId = (int) $query->execute()->fetchColumn();
 
 		$output->info('Add background job');
 		$this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [

apps/dav/lib/CalDAV/Search/SearchPlugin.php

Indentation +131 added lines, -131 removed lines

@@ -25,135 +25,135 @@
 use OCA\DAV\CalDAV\CalendarHome;
 
 class SearchPlugin extends ServerPlugin {
-	const NS_Nextcloud = 'http://nextcloud.com/ns';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		// May have to be changed to be detected
-		return ['nc-calendar-search'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'nc-calendar-search';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$server->on('report', [$this, 'report']);
-
-		$server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
-			'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport';
-	}
-
-	/**
-	 * This functions handles REPORT requests specific to CalDAV
-	 *
-	 * @param string $reportName
-	 * @param mixed $report
-	 * @param mixed $path
-	 * @return bool
-	 */
-	public function report($reportName, $report, $path) {
-		switch ($reportName) {
-			case '{' . self::NS_Nextcloud . '}calendar-search':
-				$this->server->transactionType = 'report-nc-calendar-search';
-				$this->calendarSearch($report);
-				return false;
-		}
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 * Note that you still need to subscribe to the 'report' event to actually
-	 * implement them
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		$node = $this->server->tree->getNodeForPath($uri);
-
-		$reports = [];
-		if ($node instanceof CalendarHome) {
-			$reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
-		}
-
-		return $reports;
-	}
-
-	/**
-	 * This function handles the calendar-query REPORT
-	 *
-	 * This report is used by clients to request calendar objects based on
-	 * complex conditions.
-	 *
-	 * @param Xml\Request\CalendarSearchReport $report
-	 * @return void
-	 */
-	private function calendarSearch($report) {
-		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-		$depth = $this->server->getHTTPDepth(2);
-
-		// The default result is an empty array
-		$result = [];
-
-		// If we're dealing with the calendar home, the calendar home itself is
-		// responsible for the calendar-query
-		if ($node instanceof CalendarHome && $depth == 2) {
-
-			$nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
-
-			foreach ($nodePaths as $path) {
-				list($properties) = $this->server->getPropertiesForPath(
-					$this->server->getRequestUri() . '/' . $path,
-					$report->properties);
-				$result[] = $properties;
-			}
-		}
-
-		$prefer = $this->server->getHTTPPrefer();
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type',
-			'application/xml; charset=utf-8');
-		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-		$this->server->httpResponse->setBody(
-			$this->server->generateMultiStatus($result,
-				$prefer['return'] === 'minimal'));
-	}
+    const NS_Nextcloud = 'http://nextcloud.com/ns';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        // May have to be changed to be detected
+        return ['nc-calendar-search'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'nc-calendar-search';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $server->on('report', [$this, 'report']);
+
+        $server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
+            'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport';
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV
+     *
+     * @param string $reportName
+     * @param mixed $report
+     * @param mixed $path
+     * @return bool
+     */
+    public function report($reportName, $report, $path) {
+        switch ($reportName) {
+            case '{' . self::NS_Nextcloud . '}calendar-search':
+                $this->server->transactionType = 'report-nc-calendar-search';
+                $this->calendarSearch($report);
+                return false;
+        }
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        $reports = [];
+        if ($node instanceof CalendarHome) {
+            $reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
+        }
+
+        return $reports;
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     *
+     * @param Xml\Request\CalendarSearchReport $report
+     * @return void
+     */
+    private function calendarSearch($report) {
+        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+        $depth = $this->server->getHTTPDepth(2);
+
+        // The default result is an empty array
+        $result = [];
+
+        // If we're dealing with the calendar home, the calendar home itself is
+        // responsible for the calendar-query
+        if ($node instanceof CalendarHome && $depth == 2) {
+
+            $nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
+
+            foreach ($nodePaths as $path) {
+                list($properties) = $this->server->getPropertiesForPath(
+                    $this->server->getRequestUri() . '/' . $path,
+                    $report->properties);
+                $result[] = $properties;
+            }
+        }
+
+        $prefer = $this->server->getHTTPPrefer();
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type',
+            'application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+        $this->server->httpResponse->setBody(
+            $this->server->generateMultiStatus($result,
+                $prefer['return'] === 'minimal'));
+    }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
 
 		$server->on('report', [$this, 'report']);
 
-		$server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
+		$server->xml->elementMap['{'.self::NS_Nextcloud.'}calendar-search'] =
 			'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport';
 	}
 
@@ -88,7 +88,7 @@ 
 	 */
 	public function report($reportName, $report, $path) {
 		switch ($reportName) {
-			case '{' . self::NS_Nextcloud . '}calendar-search':
+			case '{'.self::NS_Nextcloud.'}calendar-search':
 				$this->server->transactionType = 'report-nc-calendar-search';
 				$this->calendarSearch($report);
 				return false;
@@ -110,7 +110,7 @@ 
 
 		$reports = [];
 		if ($node instanceof CalendarHome) {
-			$reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
+			$reports[] = '{'.self::NS_Nextcloud.'}calendar-search';
 		}
 
 		return $reports;
@@ -140,7 +140,7 @@ 
 
 			foreach ($nodePaths as $path) {
 				list($properties) = $this->server->getPropertiesForPath(
-					$this->server->getRequestUri() . '/' . $path,
+					$this->server->getRequestUri().'/'.$path,
 					$report->properties);
 				$result[] = $properties;
 			}

apps/sharebymail/templates/settings-admin.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 	<p class="settings-hint"><?php p($l->t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?></p>
 
 	<p>
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if ($_['sendPasswordMail']) p('checked'); ?> />
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
-		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) p('checked'); ?> />
+		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if ($_['enforcePasswordProtection']) p('checked'); ?> />
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
 	</p>
 

Braces +8 added lines, -2 removed lines

@@ -11,9 +11,15 @@
 	<p class="settings-hint"><?php p($l->t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?></p>
 
 	<p>
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) {
+    p('checked');
+}
+?> />
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
-		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) p('checked'); ?> />
+		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) {
+    p('checked');
+}
+?> />
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
 	</p>
 

settings/templates/admin/additional-mail.php

Spacing +5 added lines, -5 removed lines

@@ -52,9 +52,9 @@ 
 
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
-		<h2><?php p($l->t('Email server'));?></h2>
+		<h2><?php p($l->t('Email server')); ?></h2>
 		<a target="_blank" rel="noreferrer" class="icon-info"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
 		<p class="settings-hint"><?php p($l->t('It is important to set up this server to be able to send emails, like for password reset and notifications.')); ?></p>
 		<p><span id="mail_settings_msg" class="msg"></span></p>
@@ -68,7 +68,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
@@ -83,7 +83,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 		</p>
 
@@ -104,7 +104,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"