Completed
Push — master ( 2b895e...f396f8 )
by Lukas
28:37 queued 27:51
created
settings/templates/settings/admin/server.php 2 patches
Indentation   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -31,101 +31,101 @@  discard block
 block discarded – undo
31 31
 	<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 & Tricks section and the documentation for more information.'));?></p>
32 32
 	<ul>
33 33
 		<?php
34
-		// is php setup properly to query system environment variables like getenv('PATH')
35
-		if ($_['getenvServerNotWorking']) {
36
-			?>
34
+        // is php setup properly to query system environment variables like getenv('PATH')
35
+        if ($_['getenvServerNotWorking']) {
36
+            ?>
37 37
 			<li>
38 38
 				<?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>
39 39
 				<?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'))); ?>
40 40
 			</li>
41 41
 			<?php
42
-		}
42
+        }
43 43
 
44
-		// is read only config enabled
45
-		if ($_['readOnlyConfigEnabled']) {
46
-			?>
44
+        // is read only config enabled
45
+        if ($_['readOnlyConfigEnabled']) {
46
+            ?>
47 47
 			<li>
48 48
 				<?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.')); ?>
49 49
 			</li>
50 50
 			<?php
51
-		}
51
+        }
52 52
 
53
-		// Are doc blocks accessible?
54
-		if (!$_['isAnnotationsWorking']) {
55
-			?>
53
+        // Are doc blocks accessible?
54
+        if (!$_['isAnnotationsWorking']) {
55
+            ?>
56 56
 			<li>
57 57
 				<?php p($l->t('PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.')); ?><br>
58 58
 				<?php p($l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')); ?>
59 59
 			</li>
60 60
 			<?php
61
-		}
61
+        }
62 62
 
63
-		// Is the Transaction isolation level READ_COMMITTED?
64
-		if ($_['invalidTransactionIsolationLevel']) {
65
-			?>
63
+        // Is the Transaction isolation level READ_COMMITTED?
64
+        if ($_['invalidTransactionIsolationLevel']) {
65
+            ?>
66 66
 			<li>
67 67
 				<?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.')); ?>
68 68
 			</li>
69 69
 			<?php
70
-		}
70
+        }
71 71
 
72
-		// Warning if memcache is outdated
73
-		foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
74
-			?>
72
+        // Warning if memcache is outdated
73
+        foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
74
+            ?>
75 75
 			<li>
76 76
 				<?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version.', $data)); ?>
77 77
 			</li>
78 78
 			<?php
79
-		}
79
+        }
80 80
 
81
-		// if module fileinfo available?
82
-		if (!$_['has_fileinfo']) {
83
-			?>
81
+        // if module fileinfo available?
82
+        if (!$_['has_fileinfo']) {
83
+            ?>
84 84
 			<li>
85 85
 				<?php p($l->t('The PHP module \'fileinfo\' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection.')); ?>
86 86
 			</li>
87 87
 			<?php
88
-		}
88
+        }
89 89
 
90
-		// locking configured optimally?
91
-		if ($_['fileLockingType'] === 'none') {
92
-			?>
90
+        // locking configured optimally?
91
+        if ($_['fileLockingType'] === 'none') {
92
+            ?>
93 93
 			<li>
94 94
 				<?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'))); ?>
95 95
 			</li>
96 96
 			<?php
97
-		}
97
+        }
98 98
 
99
-		// is locale working ?
100
-		if (!$_['isLocaleWorking']) {
101
-			?>
99
+        // is locale working ?
100
+        if (!$_['isLocaleWorking']) {
101
+            ?>
102 102
 			<li>
103 103
 				<?php
104
-				$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';
105
-				p($l->t('System locale can not be set to a one which supports UTF-8.'));
106
-				?>
104
+                $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';
105
+                p($l->t('System locale can not be set to a one which supports UTF-8.'));
106
+                ?>
107 107
 				<br>
108 108
 				<?php
109
-				p($l->t('This means that there might be problems with certain characters in filenames.'));
110
-				?>
109
+                p($l->t('This means that there might be problems with certain characters in filenames.'));
110
+                ?>
111 111
 				<br>
112 112
 				<?php
113
-				p($l->t('It is strongly proposed to install the required packages on your system to support one of the following locales: %s.', [$locales]));
114
-				?>
113
+                p($l->t('It is strongly proposed to install the required packages on your system to support one of the following locales: %s.', [$locales]));
114
+                ?>
115 115
 			</li>
116 116
 			<?php
117
-		}
117
+        }
118 118
 
119
-		if ($_['suggestedOverwriteCliUrl']) {
120
-			?>
119
+        if ($_['suggestedOverwriteCliUrl']) {
120
+            ?>
121 121
 			<li>
122 122
 				<?php p($l->t('If your installation is not installed at 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'])); ?>
123 123
 			</li>
124 124
 			<?php
125
-		}
125
+        }
126 126
 
127
-		if ($_['cronErrors']) {
128
-			?>
127
+        if ($_['cronErrors']) {
128
+            ?>
129 129
 			<li>
130 130
 				<?php p($l->t('It was not possible to execute the cron job via CLI. The following technical errors have appeared:')); ?>
131 131
 				<br>
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 				</ol>
137 137
 			</li>
138 138
 			<?php
139
-		}
140
-		?>
139
+        }
140
+        ?>
141 141
 	</ul>
142 142
 
143 143
 	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
 	<?php if ($_['cron_log']): ?>
160 160
 		<p class="cronlog inlineblock">
161 161
 			<?php if ($_['lastcron'] !== false):
162
-				$relative_time = relative_modified_date($_['lastcron']);
163
-				$absolute_time = OC_Util::formatDate($_['lastcron']);
164
-				if (time() - $_['lastcron'] <= 3600): ?>
162
+                $relative_time = relative_modified_date($_['lastcron']);
163
+                $absolute_time = OC_Util::formatDate($_['lastcron']);
164
+                if (time() - $_['lastcron'] <= 3600): ?>
165 165
 					<span class="status success"></span>
166 166
 					<span class="crondate" title="<?php p($absolute_time);?>">
167 167
 					<?php p($l->t("Last job ran %s.", [$relative_time]));?>
@@ -172,10 +172,10 @@  discard block
 block discarded – undo
172 172
 					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
173 173
 				</span>
174 174
 				<?php endif;
175
-			else: ?>
175
+            else: ?>
176 176
 				<span class="status error"></span>
177 177
 				<?php p($l->t("Background job didn’t run yet!"));
178
-			endif; ?>
178
+            endif; ?>
179 179
 		</p>
180 180
 	<?php endif; ?>
181 181
 	<a target="_blank" rel="noreferrer" class="icon-info"
@@ -186,38 +186,38 @@  discard block
 block discarded – undo
186 186
 	<p>
187 187
 		<input type="radio" name="mode" value="ajax" class="radio"
188 188
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
189
-			print_unescaped('checked="checked"');
190
-		} ?>>
189
+            print_unescaped('checked="checked"');
190
+        } ?>>
191 191
 		<label for="backgroundjobs_ajax">AJAX</label><br/>
192 192
 		<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
193 193
 	</p>
194 194
 	<p>
195 195
 		<input type="radio" name="mode" value="webcron" class="radio"
196 196
 			   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
197
-			print_unescaped('checked="checked"');
198
-		} ?>>
197
+            print_unescaped('checked="checked"');
198
+        } ?>>
199 199
 		<label for="backgroundjobs_webcron">Webcron</label><br/>
200 200
 		<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over HTTP.")); ?></em>
201 201
 	</p>
202 202
 	<p>
203 203
 		<input type="radio" name="mode" value="cron" class="radio"
204 204
 			   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
205
-			print_unescaped('checked="checked"');
206
-		}
207
-		if (!$_['cli_based_cron_possible']) {
208
-			print_unescaped('disabled');
209
-		}?>>
205
+            print_unescaped('checked="checked"');
206
+        }
207
+        if (!$_['cli_based_cron_possible']) {
208
+            print_unescaped('disabled');
209
+        }?>>
210 210
 		<label for="backgroundjobs_cron">Cron</label><br/>
211 211
 		<em><?php p($l->t("Use system cron service to call the cron.php file every 15 minutes.")); ?>
212 212
 			<?php if($_['cli_based_cron_possible']) {
213
-				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
214
-			} else {
215
-				print_unescaped(str_replace(
216
-					['{linkstart}', '{linkend}'],
217
-					['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
218
-					$l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
219
-				));
220
-		} ?></em>
213
+                p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
214
+            } else {
215
+                print_unescaped(str_replace(
216
+                    ['{linkstart}', '{linkend}'],
217
+                    ['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
218
+                    $l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
219
+                ));
220
+        } ?></em>
221 221
 
222 222
 	</p>
223 223
 </div>
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 ?>
28 28
 
29 29
 <div id="security-warning" class="section">
30
-	<h2><?php p($l->t('Security & setup warnings'));?></h2>
31
-	<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 & Tricks section and the documentation for more information.'));?></p>
30
+	<h2><?php p($l->t('Security & setup warnings')); ?></h2>
31
+	<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 & Tricks section and the documentation for more information.')); ?></p>
32 32
 	<ul>
33 33
 		<?php
34 34
 		// is php setup properly to query system environment variables like getenv('PATH')
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 				<?php p($l->t('It was not possible to execute the cron job via CLI. The following technical errors have appeared:')); ?>
131 131
 				<br>
132 132
 				<ol>
133
-					<?php foreach(json_decode($_['cronErrors']) as $error) { if(isset($error->error)) {?>
133
+					<?php foreach (json_decode($_['cronErrors']) as $error) { if (isset($error->error)) {?>
134 134
 						<li><?php p($error->error) ?> <?php p($error->hint) ?></li>
135 135
 					<?php }};?>
136 136
 				</ol>
@@ -140,22 +140,22 @@  discard block
 block discarded – undo
140 140
 		?>
141 141
 	</ul>
142 142
 
143
-	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
143
+	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
144 144
 		<div class="loading"></div>
145 145
 		<ul class="errors hidden"></ul>
146 146
 		<ul class="warnings hidden"></ul>
147 147
 		<ul class="info hidden"></ul>
148 148
 		<p class="hint hidden">
149
-			<?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'])] )); ?>
149
+			<?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'])])); ?>
150 150
 		</p>
151 151
 	</div>
152 152
 	<div id="security-warning-state">
153
-		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.'));?></span>
153
+		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.')); ?></span>
154 154
 	</div>
155 155
 </div>
156 156
 
157 157
 <div class="section" id="backgroundjobs">
158
-	<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
158
+	<h2 class="inlineblock"><?php p($l->t('Background jobs')); ?></h2>
159 159
 	<?php if ($_['cron_log']): ?>
160 160
 		<p class="cronlog inlineblock">
161 161
 			<?php if ($_['lastcron'] !== false):
@@ -163,13 +163,13 @@  discard block
 block discarded – undo
163 163
 				$absolute_time = OC_Util::formatDate($_['lastcron']);
164 164
 				if (time() - $_['lastcron'] <= 3600): ?>
165 165
 					<span class="status success"></span>
166
-					<span class="crondate" title="<?php p($absolute_time);?>">
167
-					<?php p($l->t("Last job ran %s.", [$relative_time]));?>
166
+					<span class="crondate" title="<?php p($absolute_time); ?>">
167
+					<?php p($l->t("Last job ran %s.", [$relative_time])); ?>
168 168
 				</span>
169 169
 				<?php else: ?>
170 170
 					<span class="status error"></span>
171
-					<span class="crondate" title="<?php p($absolute_time);?>">
172
-					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
171
+					<span class="crondate" title="<?php p($absolute_time); ?>">
172
+					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time])); ?>
173 173
 				</span>
174 174
 				<?php endif;
175 175
 			else: ?>
@@ -179,10 +179,10 @@  discard block
 block discarded – undo
179 179
 		</p>
180 180
 	<?php endif; ?>
181 181
 	<a target="_blank" rel="noreferrer" class="icon-info"
182
-	   title="<?php p($l->t('Open documentation'));?>"
182
+	   title="<?php p($l->t('Open documentation')); ?>"
183 183
 	   href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
184 184
 
185
-	<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>
185
+	<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>
186 186
 	<p>
187 187
 		<input type="radio" name="mode" value="ajax" class="radio"
188 188
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 		}?>>
210 210
 		<label for="backgroundjobs_cron">Cron</label><br/>
211 211
 		<em><?php p($l->t("Use system cron service to call the cron.php file every 15 minutes.")); ?>
212
-			<?php if($_['cli_based_cron_possible']) {
212
+			<?php if ($_['cli_based_cron_possible']) {
213 213
 				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
214 214
 			} else {
215 215
 				print_unescaped(str_replace(
@@ -224,6 +224,6 @@  discard block
 block discarded – undo
224 224
 
225 225
 <div class="section">
226 226
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
227
-	<h2><?php p($l->t('Version'));?></h2>
227
+	<h2><?php p($l->t('Version')); ?></h2>
228 228
 	<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>
229 229
 </div>
Please login to merge, or discard this patch.