Inspection of "Restructure server settings" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#9029)

by Jan-Christoph

created 2018-04-07 21:34 UTC

Status

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -30,11 +30,11 @@  discard block
 block discarded – undo
 	<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
-			$relative_time = relative_modified_date($_['lastcron']);
+            $relative_time = relative_modified_date($_['lastcron']);
 
-			$formatter = \OC::$server->getDateTimeFormatter();
-			$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
-			if (time() - $_['lastcron'] <= 3600): ?>
+            $formatter = \OC::$server->getDateTimeFormatter();
+            $absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
+            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]));?>
@@ -45,10 +45,10 @@  discard block
 block discarded – undo
 				<?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>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
 	   title="<?php p($l->t('Open documentation'));?>"
@@ -58,38 +58,38 @@  discard block
 block discarded – undo
 	<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>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 ?>
 
 <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>
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
 			$relative_time = relative_modified_date($_['lastcron']);
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
 			$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
 			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: ?>
@@ -51,10 +51,10 @@  discard block
 block discarded – undo
 		endif; ?>
 	</p>
 	<a target="_blank" rel="noreferrer noopener" 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") {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
 		}?>>
 		<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(

Please login to merge, or discard this patch.

		@@ -30,11 +30,11 @@ discard block
		block discarded – undo
30	30	<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
31	31	<p class="cronlog inlineblock">
32	32	<?php if ($_['lastcron'] !== false):
33		- $relative_time = relative_modified_date($_['lastcron']);
	33	+ $relative_time = relative_modified_date($_['lastcron']);
34	34
35		- $formatter = \OC::$server->getDateTimeFormatter();
36		- $absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
37		- if (time() - $_['lastcron'] <= 3600): ?>
	35	+ $formatter = \OC::$server->getDateTimeFormatter();
	36	+ $absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
	37	+ if (time() - $_['lastcron'] <= 3600): ?>
38	38	<span class="status success"></span>
39	39	<span class="crondate" title="<?php p($absolute_time);?>">
40	40	<?php p($l->t("Last job ran %s.", [$relative_time]));?>
		@@ -45,10 +45,10 @@ discard block
		block discarded – undo
45	45	<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
46	46	</span>
47	47	<?php endif;
48		- else: ?>
	48	+ else: ?>
49	49	<span class="status error"></span>
50	50	<?php p($l->t("Background job didn’t run yet!"));
51		- endif; ?>
	51	+ endif; ?>
52	52	</p>
53	53	<a target="_blank" rel="noreferrer noopener" class="icon-info"
54	54	title="<?php p($l->t('Open documentation'));?>"
		@@ -58,38 +58,38 @@ discard block
		block discarded – undo
58	58	<p>
59	59	<input type="radio" name="mode" value="ajax" class="radio"
60	60	id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
61		- print_unescaped('checked="checked"');
62		- } ?>>
	61	+ print_unescaped('checked="checked"');
	62	+ } ?>>
63	63	<label for="backgroundjobs_ajax">AJAX</label><br/>
64	64	<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
65	65	</p>
66	66	<p>
67	67	<input type="radio" name="mode" value="webcron" class="radio"
68	68	id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
69		- print_unescaped('checked="checked"');
70		- } ?>>
	69	+ print_unescaped('checked="checked"');
	70	+ } ?>>
71	71	<label for="backgroundjobs_webcron">Webcron</label><br/>
72	72	<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over HTTP.")); ?></em>
73	73	</p>
74	74	<p>
75	75	<input type="radio" name="mode" value="cron" class="radio"
76	76	id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
77		- print_unescaped('checked="checked"');
78		- }
79		- if (!$_['cli_based_cron_possible']) {
80		- print_unescaped('disabled');
81		- }?>>
	77	+ print_unescaped('checked="checked"');
	78	+ }
	79	+ if (!$_['cli_based_cron_possible']) {
	80	+ print_unescaped('disabled');
	81	+ }?>>
82	82	<label for="backgroundjobs_cron">Cron</label><br/>
83	83	<em><?php p($l->t("Use system cron service to call the cron.php file every 15 minutes.")); ?>
84	84	<?php if($_['cli_based_cron_possible']) {
85		- p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
86		- } else {
87		- print_unescaped(str_replace(
88		- ['{linkstart}', '{linkend}'],
89		- ['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
90		- $l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
91		- ));
92		- } ?></em>
	85	+ p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
	86	+ } else {
	87	+ print_unescaped(str_replace(
	88	+ ['{linkstart}', '{linkend}'],
	89	+ ['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
	90	+ $l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
	91	+ ));
	92	+ } ?></em>
93	93
94	94	</p>
95	95	</div>
96	96	\ No newline at end of file

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	?>
28	28
29	29	<div class="section" id="backgroundjobs">
30		- <h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
	30	+ <h2 class="inlineblock"><?php p($l->t('Background jobs')); ?></h2>
31	31	<p class="cronlog inlineblock">
32	32	<?php if ($_['lastcron'] !== false):
33	33	$relative_time = relative_modified_date($_['lastcron']);
		@@ -36,13 +36,13 @@ discard block
		block discarded – undo
36	36	$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
37	37	if (time() - $_['lastcron'] <= 3600): ?>
38	38	<span class="status success"></span>
39		- <span class="crondate" title="<?php p($absolute_time);?>">
40		- <?php p($l->t("Last job ran %s.", [$relative_time]));?>
	39	+ <span class="crondate" title="<?php p($absolute_time); ?>">
	40	+ <?php p($l->t("Last job ran %s.", [$relative_time])); ?>
41	41	</span>
42	42	<?php else: ?>
43	43	<span class="status error"></span>
44		- <span class="crondate" title="<?php p($absolute_time);?>">
45		- <?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
	44	+ <span class="crondate" title="<?php p($absolute_time); ?>">
	45	+ <?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time])); ?>
46	46	</span>
47	47	<?php endif;
48	48	else: ?>
		@@ -51,10 +51,10 @@ discard block
		block discarded – undo
51	51	endif; ?>
52	52	</p>
53	53	<a target="_blank" rel="noreferrer noopener" class="icon-info"
54		- title="<?php p($l->t('Open documentation'));?>"
	54	+ title="<?php p($l->t('Open documentation')); ?>"
55	55	href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
56	56
57		- <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>
	57	+ <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>
58	58	<p>
59	59	<input type="radio" name="mode" value="ajax" class="radio"
60	60	id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81	}?>>
82	82	<label for="backgroundjobs_cron">Cron</label><br/>
83	83	<em><?php p($l->t("Use system cron service to call the cron.php file every 15 minutes.")); ?>
84		- <?php if($_['cli_based_cron_possible']) {
	84	+ <?php if ($_['cli_based_cron_possible']) {
85	85	p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
86	86	} else {
87	87	print_unescaped(str_replace(

nextcloud / server

Pull Request — master (#9029)

Status

Category

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch