nextcloud / server

lib/public/ILogger.php

Indentation +100 added lines, -100 removed lines

@@ -33,113 +33,113 @@
  * https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#3-psrlogloggerinterface
  */
 interface ILogger {
-	/**
-	 * System is unusable.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function emergency($message, array $context = array());
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function emergency($message, array $context = array());
 
-	/**
-	 * Action must be taken immediately.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function alert($message, array $context = array());
+    /**
+     * Action must be taken immediately.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function alert($message, array $context = array());
 
-	/**
-	 * Critical conditions.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function critical($message, array $context = array());
+    /**
+     * Critical conditions.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function critical($message, array $context = array());
 
-	/**
-	 * Runtime errors that do not require immediate action but should typically
-	 * be logged and monitored.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function error($message, array $context = array());
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function error($message, array $context = array());
 
-	/**
-	 * Exceptional occurrences that are not errors.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function warning($message, array $context = array());
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function warning($message, array $context = array());
 
-	/**
-	 * Normal but significant events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function notice($message, array $context = array());
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function notice($message, array $context = array());
 
-	/**
-	 * Interesting events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function info($message, array $context = array());
+    /**
+     * Interesting events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function info($message, array $context = array());
 
-	/**
-	 * Detailed debug information.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function debug($message, array $context = array());
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function debug($message, array $context = array());
 
-	/**
-	 * Logs with an arbitrary level.
-	 *
-	 * @param mixed $level
-	 * @param string $message
-	 * @param array $context
-	 * @return mixed
-	 * @since 7.0.0
-	 */
-	public function log($level, $message, array $context = array());
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     * @return mixed
+     * @since 7.0.0
+     */
+    public function log($level, $message, array $context = array());
 
-	/**
-	 * Logs an exception very detailed
-	 * An additional message can we written to the log by adding it to the
-	 * context.
-	 *
-	 * <code>
-	 * $logger->logException($ex, [
-	 *     'message' => 'Exception during background job execution'
-	 * ]);
-	 * </code>
-	 *
-	 * @param \Exception | \Throwable $exception
-	 * @param array $context
-	 * @return void
-	 * @since 8.2.0
-	 */
-	public function logException($exception, array $context = array());
+    /**
+     * Logs an exception very detailed
+     * An additional message can we written to the log by adding it to the
+     * context.
+     *
+     * <code>
+     * $logger->logException($ex, [
+     *     'message' => 'Exception during background job execution'
+     * ]);
+     * </code>
+     *
+     * @param \Exception | \Throwable $exception
+     * @param array $context
+     * @return void
+     * @since 8.2.0
+     */
+    public function logException($exception, array $context = array());
 }

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 job ran %s.", [$relative_time]));?>
@@ -172,10 +172,10 @@ 
 					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
 				</span>
 				<?php endif;
-			else: ?>
+            else: ?>
 				<span class="status error"></span>
 				<?php p($l->t("Background job didn’t run 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 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('Background jobs'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Background jobs')); ?></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 job ran %s.", [$relative_time]));?>
+					<span class="crondate" title="<?php p($absolute_time); ?>">
+					<?php p($l->t("Last job ran %s.", [$relative_time])); ?>
 				</span>
 				<?php else: ?>
 					<span class="status error"></span>
-					<span class="crondate" title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
+					<span class="crondate" title="<?php p($absolute_time); ?>">
+					<?php p($l->t("Last job execution ran %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 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>

Braces +8 added lines, -3 removed lines

@@ -166,15 +166,20 @@
 					<span class="crondate" title="<?php p($absolute_time);?>">
 					<?php p($l->t("Last job ran %s.", [$relative_time]));?>
 				</span>
-				<?php else: ?>
+				<?php else {
+    : ?>
 					<span class="status error"></span>
-					<span class="crondate" title="<?php p($absolute_time);?>">
+					<span class="crondate" title="<?php p($absolute_time);
+}
+?>">
 					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
 				</span>
 				<?php endif;
-			else: ?>
+			else {
+			    : ?>
 				<span class="status error"></span>
 				<?php p($l->t("Background job didn’t run yet!"));
+			}
 			endif; ?>
 		</p>
 	<?php endif; ?>