Completed
Push — master ( 031add...ab3599 )
by Morris
40:08 queued 20:01
created
core/templates/loginflow/authpicker.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
32 32
 	<p class="info">
33 33
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
34
-								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
34
+								'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
35 35
 								\OCP\Util::sanitizeHTML($_['instanceName'])
36 36
 							])) ?>
37 37
 	</p>
@@ -58,6 +58,6 @@  discard block
 block discarded – undo
58 58
 	</fieldset>
59 59
 </div>
60 60
 
61
-<?php if(empty($_['oauthState'])): ?>
61
+<?php if (empty($_['oauthState'])): ?>
62 62
 <a id="app-token-login" class="warning" href="#"><?php p($l->t('Alternative log in using app token')) ?></a>
63 63
 <?php endif; ?>
Please login to merge, or discard this patch.
core/templates/loginflow/grant.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 	<h2><?php p($l->t('Account access')) ?></h2>
32 32
 	<p class="info">
33 33
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
34
-								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
34
+								'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
35 35
 								\OCP\Util::sanitizeHTML($_['instanceName'])
36 36
 							])) ?>
37 37
 	</p>
Please login to merge, or discard this patch.
core/templates/untrustedDomain.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,6 +8,6 @@
 block discarded – undo
8 8
 	</p>
9 9
 	<br />
10 10
 	<p>
11
-		<?php print_unescaped($l->t('Further information how to configure this can be found in the %1$sdocumentation%2$s.', ['<a href="' . $_['docUrl'] . '" target="blank">', '</a>'])); ?>
11
+		<?php print_unescaped($l->t('Further information how to configure this can be found in the %1$sdocumentation%2$s.', ['<a href="'.$_['docUrl'].'" target="blank">', '</a>'])); ?>
12 12
 	</p>
13 13
 </div>
Please login to merge, or discard this patch.
settings/templates/settings/admin/overview.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -28,39 +28,39 @@
 block discarded – undo
28 28
 ?>
29 29
 
30 30
 <div id="security-warning" class="section">
31
-	<h2><?php p($l->t('Security & setup warnings'));?></h2>
32
-	<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 linked documentation for more information.'));?></p>
31
+	<h2><?php p($l->t('Security & setup warnings')); ?></h2>
32
+	<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 linked documentation for more information.')); ?></p>
33 33
 
34 34
 	<div id="security-warning-state-ok" class="hidden">
35
-		<span class="icon icon-checkmark-white"></span><span class="message"><?php p($l->t('All checks passed.'));?></span>
35
+		<span class="icon icon-checkmark-white"></span><span class="message"><?php p($l->t('All checks passed.')); ?></span>
36 36
 	</div>
37 37
 	<div id="security-warning-state-failure" class="hidden">
38
-		<span class="icon icon-close-white"></span><span class="message"><?php p($l->t('There are some errors regarding your setup.'));?></span>
38
+		<span class="icon icon-close-white"></span><span class="message"><?php p($l->t('There are some errors regarding your setup.')); ?></span>
39 39
 	</div>
40 40
 	<div id="security-warning-state-warning" class="hidden">
41
-		<span class="icon icon-error-white"></span><span class="message"><?php p($l->t('There are some warnings regarding your setup.'));?></span>
41
+		<span class="icon icon-error-white"></span><span class="message"><?php p($l->t('There are some warnings regarding your setup.')); ?></span>
42 42
 	</div>
43 43
 	<div id="security-warning-state-loading">
44
-		<span class="icon loading"></span><span class="message"><?php p($l->t('Checking for system and security issues.'));?></span>
44
+		<span class="icon loading"></span><span class="message"><?php p($l->t('Checking for system and security issues.')); ?></span>
45 45
 	</div>
46 46
 
47
-	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
47
+	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
48 48
 		<ul class="errors hidden"></ul>
49 49
 		<ul class="warnings hidden"></ul>
50 50
 		<ul class="info hidden"></ul>
51 51
 	</div>
52 52
 	<p id="postsetupchecks-hint" class="hidden">
53
-		<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?>
53
+		<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?>
54 54
 	</p>
55 55
 
56 56
 	<p class="extra-top-margin">
57
-		<?php print_unescaped($l->t('Check the security of your Nextcloud over <a target="_blank" rel="noreferrer noopener" href="%s">our security scan ↗</a>.', ['https://scan.nextcloud.com']));?>
57
+		<?php print_unescaped($l->t('Check the security of your Nextcloud over <a target="_blank" rel="noreferrer noopener" href="%s">our security scan ↗</a>.', ['https://scan.nextcloud.com'])); ?>
58 58
 	</p>
59 59
 
60 60
 </div>
61 61
 
62 62
 <div id="version" class="section">
63 63
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
64
-	<h2><?php p($l->t('Version'));?></h2>
64
+	<h2><?php p($l->t('Version')); ?></h2>
65 65
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
66 66
 </div>
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 					</div>
70 70
 				</div>
71 71
 				<span class="icon-checkmark hidden"></span>
72
-				<?php if($_['lookupServerUploadEnabled']) { ?>
72
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
73 73
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
74 74
 				<?php } ?>
75 75
 			</form>
@@ -87,14 +87,14 @@  discard block
 block discarded – undo
87 87
 					<p class="quotatext">
88 88
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
89 89
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
90
-								[$_['usage']]));?>
90
+								[$_['usage']])); ?>
91 91
 						<?php else: ?>
92 92
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
93
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
93
+								[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
94 94
 						<?php endif ?>
95 95
 					</p>
96 96
 				</div>
97
-				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
97
+				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
98 98
 			</div>
99 99
 		</div>
100 100
 	</div>
@@ -111,15 +111,15 @@  discard block
 block discarded – undo
111 111
 					</div>
112 112
 				</h3>
113 113
 				<input type="text" id="displayname" name="displayname"
114
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
114
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
115 115
 					   value="<?php p($_['displayName']) ?>"
116 116
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
117
-				<?php if(!$_['displayNameChangeSupported']) { ?>
118
-					<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
117
+				<?php if (!$_['displayNameChangeSupported']) { ?>
118
+					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
119 119
 				<?php } ?>
120 120
 				<span class="icon-checkmark hidden"></span>
121 121
 				<span class="icon-error hidden" ></span>
122
-				<?php if($_['lookupServerUploadEnabled']) { ?>
122
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
123 123
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
124 124
 				<?php } ?>
125 125
 			</form>
@@ -134,10 +134,10 @@  discard block
 block discarded – undo
134 134
 						</span>
135 135
 					</div>
136 136
 				</h3>
137
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
137
+				<div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>">
138 138
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
139 139
 				<?php
140
-					switch($_['emailVerification']) {
140
+					switch ($_['emailVerification']) {
141 141
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
142 142
 							p(image_path('core', 'actions/verifying.svg'));
143 143
 							break;
@@ -150,18 +150,18 @@  discard block
 block discarded – undo
150 150
 					?>">
151 151
 				</div>
152 152
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
153
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
153
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
154 154
 					   placeholder="<?php p($l->t('Your email address')); ?>"
155 155
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
156 156
 			   	<span class="icon-checkmark hidden"></span>
157 157
 				<span class="icon-error hidden" ></span>
158
-				<?php if(!$_['displayNameChangeSupported']) { ?>
159
-					<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
158
+				<?php if (!$_['displayNameChangeSupported']) { ?>
159
+					<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
160 160
 				<?php } ?>
161
-				<?php if($_['displayNameChangeSupported']) { ?>
161
+				<?php if ($_['displayNameChangeSupported']) { ?>
162 162
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
163 163
 				<?php } ?>
164
-				<?php if($_['lookupServerUploadEnabled']) { ?>
164
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
165 165
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
166 166
 				<?php } ?>
167 167
 			</form>
@@ -177,12 +177,12 @@  discard block
 block discarded – undo
177 177
 						</span>
178 178
 					</div>
179 179
 				</h3>
180
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
180
+				<input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
181 181
 					   value="<?php p($_['phone']) ?>"
182 182
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
183 183
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
184 184
 				<span class="icon-checkmark hidden"></span>
185
-				<?php if($_['lookupServerUploadEnabled']) { ?>
185
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
186 186
 				<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
187 187
 				<?php } ?>
188 188
 			</form>
@@ -199,12 +199,12 @@  discard block
 block discarded – undo
199 199
 						</span>
200 200
 					</div>
201 201
 				</h3>
202
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
202
+				<input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
203 203
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
204 204
 					   value="<?php p($_['address']) ?>"
205 205
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
206 206
 				<span class="icon-checkmark hidden"></span>
207
-				<?php if($_['lookupServerUploadEnabled']) { ?>
207
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
208 208
 				<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
209 209
 				<?php } ?>
210 210
 			</form>
@@ -221,11 +221,11 @@  discard block
 block discarded – undo
221 221
 						</span>
222 222
 					</div>
223 223
 				</h3>
224
-				<?php if($_['lookupServerUploadEnabled']) { ?>
225
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
224
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
225
+				<div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>">
226 226
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
227 227
 					<?php
228
-					switch($_['websiteVerification']) {
228
+					switch ($_['websiteVerification']) {
229 229
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
230 230
 							p(image_path('core', 'actions/verifying.svg'));
231 231
 							break;
@@ -236,13 +236,13 @@  discard block
 block discarded – undo
236 236
 							p(image_path('core', 'actions/verify.svg'));
237 237
 					}
238 238
 					?>"
239
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
239
+					<?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
240 240
 					>
241 241
 					<div class="verification-dialog popovermenu bubble menu">
242 242
 						<div class="verification-dialog-content">
243 243
 							<p class="explainVerification"></p>
244 244
 							<p class="verificationCode"></p>
245
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
245
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
246 246
 						</div>
247 247
 					</div>
248 248
 				</div>
@@ -250,10 +250,10 @@  discard block
 block discarded – undo
250 250
 				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
251 251
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
252 252
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
253
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
253
+					   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
254 254
 				/>
255 255
 				<span class="icon-checkmark hidden"></span>
256
-				<?php if($_['lookupServerUploadEnabled']) { ?>
256
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
257 257
 				<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
258 258
 				<?php } ?>
259 259
 			</form>
@@ -270,11 +270,11 @@  discard block
 block discarded – undo
270 270
 						</span>
271 271
 					</div>
272 272
 				</h3>
273
-				<?php if($_['lookupServerUploadEnabled']) { ?>
274
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
273
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
274
+				<div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>">
275 275
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
276 276
 					<?php
277
-					switch($_['twitterVerification']) {
277
+					switch ($_['twitterVerification']) {
278 278
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
279 279
 							p(image_path('core', 'actions/verifying.svg'));
280 280
 							break;
@@ -285,13 +285,13 @@  discard block
 block discarded – undo
285 285
 							p(image_path('core', 'actions/verify.svg'));
286 286
 					}
287 287
 					?>"
288
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
288
+					<?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
289 289
 					>
290 290
 					<div class="verification-dialog popovermenu bubble menu">
291 291
 						<div class="verification-dialog-content">
292 292
 							<p class="explainVerification"></p>
293 293
 							<p class="verificationCode"></p>
294
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
294
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
295 295
 						</div>
296 296
 					</div>
297 297
 				</div>
@@ -299,10 +299,10 @@  discard block
 block discarded – undo
299 299
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
300 300
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
301 301
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
302
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
302
+					   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
303 303
 				/>
304 304
 				<span class="icon-checkmark hidden"></span>
305
-				<?php if($_['lookupServerUploadEnabled']) { ?>
305
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
306 306
 				<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
307 307
 				<?php } ?>
308 308
 			</form>
@@ -315,27 +315,27 @@  discard block
 block discarded – undo
315 315
 			<?php if (isset($_['activelanguage'])) { ?>
316 316
 				<form id="language" class="section">
317 317
 					<h3>
318
-						<label for="languageinput"><?php p($l->t('Language'));?></label>
318
+						<label for="languageinput"><?php p($l->t('Language')); ?></label>
319 319
 					</h3>
320
-					<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
321
-						<option value="<?php p($_['activelanguage']['code']);?>">
322
-							<?php p($_['activelanguage']['name']);?>
320
+					<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
321
+						<option value="<?php p($_['activelanguage']['code']); ?>">
322
+							<?php p($_['activelanguage']['name']); ?>
323 323
 						</option>
324
-						<?php foreach($_['commonlanguages'] as $language):?>
325
-							<option value="<?php p($language['code']);?>">
326
-								<?php p($language['name']);?>
324
+						<?php foreach ($_['commonlanguages'] as $language):?>
325
+							<option value="<?php p($language['code']); ?>">
326
+								<?php p($language['name']); ?>
327 327
 							</option>
328
-						<?php endforeach;?>
328
+						<?php endforeach; ?>
329 329
 						<optgroup label="––––––––––"></optgroup>
330
-						<?php foreach($_['languages'] as $language):?>
331
-							<option value="<?php p($language['code']);?>">
332
-								<?php p($language['name']);?>
330
+						<?php foreach ($_['languages'] as $language):?>
331
+							<option value="<?php p($language['code']); ?>">
332
+								<?php p($language['name']); ?>
333 333
 							</option>
334
-						<?php endforeach;?>
334
+						<?php endforeach; ?>
335 335
 					</select>
336 336
 					<a href="https://www.transifex.com/nextcloud/nextcloud/"
337 337
 					   target="_blank" rel="noreferrer noopener">
338
-						<em><?php p($l->t('Help translate'));?></em>
338
+						<em><?php p($l->t('Help translate')); ?></em>
339 339
 					</a>
340 340
 				</form>
341 341
 			<?php } ?>
@@ -344,27 +344,27 @@  discard block
 block discarded – undo
344 344
 			<?php if (isset($_['activelocale'])) { ?>
345 345
 				<form id="locale" class="section">
346 346
 					<h3>
347
-						<label for="localeinput"><?php p($l->t('Locale'));?></label>
347
+						<label for="localeinput"><?php p($l->t('Locale')); ?></label>
348 348
 					</h3>
349
-					<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale'));?>">
350
-						<option value="<?php p($_['activelocale']['code']);?>">
351
-							<?php p($_['activelocale']['name']);?>
349
+					<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale')); ?>">
350
+						<option value="<?php p($_['activelocale']['code']); ?>">
351
+							<?php p($_['activelocale']['name']); ?>
352 352
 						</option>
353 353
 						<optgroup label="––––––––––"></optgroup>
354
-						<?php foreach($_['localesForLanguage'] as $locale):?>
355
-							<option value="<?php p($locale['code']);?>">
356
-								<?php p($locale['name']);?>
354
+						<?php foreach ($_['localesForLanguage'] as $locale):?>
355
+							<option value="<?php p($locale['code']); ?>">
356
+								<?php p($locale['name']); ?>
357 357
 							</option>
358
-						<?php endforeach;?>
358
+						<?php endforeach; ?>
359 359
 						<optgroup label="––––––––––"></optgroup>
360
-						<option value="<?php p($_['activelocale']['code']);?>">
361
-							<?php p($_['activelocale']['name']);?>
360
+						<option value="<?php p($_['activelocale']['code']); ?>">
361
+							<?php p($_['activelocale']['name']); ?>
362 362
 						</option>
363
-						<?php foreach($_['locales'] as $locale):?>
364
-							<option value="<?php p($locale['code']);?>">
365
-								<?php p($locale['name']);?>
363
+						<?php foreach ($_['locales'] as $locale):?>
364
+							<option value="<?php p($locale['code']); ?>">
365
+								<?php p($locale['name']); ?>
366 366
 							</option>
367
-						<?php endforeach;?>
367
+						<?php endforeach; ?>
368 368
 					</select>
369 369
 					<div id="localeexample" class="personal-info icon-timezone">
370 370
 						<p>
Please login to merge, or discard this patch.
settings/Controller/CheckSetupController.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 						'www.edri.org',
137 137
 			];
138 138
 
139
-		foreach($siteArray as $site) {
139
+		foreach ($siteArray as $site) {
140 140
 			if ($this->isSiteReachable($site)) {
141 141
 				return true;
142 142
 			}
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
 	* @return bool
150 150
 	*/
151 151
 	private function isSiteReachable($sitename) {
152
-		$httpSiteName = 'http://' . $sitename . '/';
153
-		$httpsSiteName = 'https://' . $sitename . '/';
152
+		$httpSiteName = 'http://'.$sitename.'/';
153
+		$httpsSiteName = 'https://'.$sitename.'/';
154 154
 
155 155
 		try {
156 156
 			$client = $this->clientService->newClient();
@@ -207,40 +207,40 @@  discard block
 block discarded – undo
207 207
 		// Don't run check when:
208 208
 		// 1. Server has `has_internet_connection` set to false
209 209
 		// 2. AppStore AND S2S is disabled
210
-		if(!$this->config->getSystemValue('has_internet_connection', true)) {
210
+		if (!$this->config->getSystemValue('has_internet_connection', true)) {
211 211
 			return '';
212 212
 		}
213
-		if(!$this->config->getSystemValue('appstoreenabled', true)
213
+		if (!$this->config->getSystemValue('appstoreenabled', true)
214 214
 			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
215 215
 			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
216 216
 			return '';
217 217
 		}
218 218
 
219 219
 		$versionString = $this->getCurlVersion();
220
-		if(isset($versionString['ssl_version'])) {
220
+		if (isset($versionString['ssl_version'])) {
221 221
 			$versionString = $versionString['ssl_version'];
222 222
 		} else {
223 223
 			return '';
224 224
 		}
225 225
 
226
-		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
227
-		if(!$this->config->getSystemValue('appstoreenabled', true)) {
228
-			$features = (string)$this->l10n->t('Federated Cloud Sharing');
226
+		$features = (string) $this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
227
+		if (!$this->config->getSystemValue('appstoreenabled', true)) {
228
+			$features = (string) $this->l10n->t('Federated Cloud Sharing');
229 229
 		}
230 230
 
231 231
 		// Check if at least OpenSSL after 1.01d or 1.0.2b
232
-		if(strpos($versionString, 'OpenSSL/') === 0) {
232
+		if (strpos($versionString, 'OpenSSL/') === 0) {
233 233
 			$majorVersion = substr($versionString, 8, 5);
234 234
 			$patchRelease = substr($versionString, 13, 6);
235 235
 
236
-			if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
236
+			if (($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
237 237
 				($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
238 238
 				return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['OpenSSL', $versionString, $features]);
239 239
 			}
240 240
 		}
241 241
 
242 242
 		// Check if NSS and perform heuristic check
243
-		if(strpos($versionString, 'NSS/') === 0) {
243
+		if (strpos($versionString, 'NSS/') === 0) {
244 244
 			try {
245 245
 				$firstClient = $this->clientService->newClient();
246 246
 				$firstClient->get('https://nextcloud.com/');
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 				$secondClient = $this->clientService->newClient();
249 249
 				$secondClient->get('https://nextcloud.com/');
250 250
 			} catch (ClientException $e) {
251
-				if($e->getResponse()->getStatusCode() === 400) {
251
+				if ($e->getResponse()->getStatusCode() === 400) {
252 252
 					return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]);
253 253
 				}
254 254
 			}
@@ -343,13 +343,13 @@  discard block
 block discarded – undo
343 343
 	 * @return DataResponse
344 344
 	 */
345 345
 	public function getFailedIntegrityCheckFiles() {
346
-		if(!$this->checker->isCodeCheckEnforced()) {
346
+		if (!$this->checker->isCodeCheckEnforced()) {
347 347
 			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
348 348
 		}
349 349
 
350 350
 		$completeResults = $this->checker->getResults();
351 351
 
352
-		if(!empty($completeResults)) {
352
+		if (!empty($completeResults)) {
353 353
 			$formattedTextResponse = 'Technical information
354 354
 =====================
355 355
 The following list covers which files have failed the integrity check. Please read
@@ -359,12 +359,12 @@  discard block
 block discarded – undo
359 359
 Results
360 360
 =======
361 361
 ';
362
-			foreach($completeResults as $context => $contextResult) {
362
+			foreach ($completeResults as $context => $contextResult) {
363 363
 				$formattedTextResponse .= "- $context\n";
364 364
 
365
-				foreach($contextResult as $category => $result) {
365
+				foreach ($contextResult as $category => $result) {
366 366
 					$formattedTextResponse .= "\t- $category\n";
367
-					if($category !== 'EXCEPTION') {
367
+					if ($category !== 'EXCEPTION') {
368 368
 						foreach ($result as $key => $results) {
369 369
 							$formattedTextResponse .= "\t\t- $key\n";
370 370
 						}
@@ -405,27 +405,27 @@  discard block
 block discarded – undo
405 405
 	protected function isOpcacheProperlySetup() {
406 406
 		$iniWrapper = new IniGetWrapper();
407 407
 
408
-		if(!$iniWrapper->getBool('opcache.enable')) {
408
+		if (!$iniWrapper->getBool('opcache.enable')) {
409 409
 			return false;
410 410
 		}
411 411
 
412
-		if(!$iniWrapper->getBool('opcache.save_comments')) {
412
+		if (!$iniWrapper->getBool('opcache.save_comments')) {
413 413
 			return false;
414 414
 		}
415 415
 
416
-		if(!$iniWrapper->getBool('opcache.enable_cli')) {
416
+		if (!$iniWrapper->getBool('opcache.enable_cli')) {
417 417
 			return false;
418 418
 		}
419 419
 
420
-		if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
420
+		if ($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
421 421
 			return false;
422 422
 		}
423 423
 
424
-		if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
424
+		if ($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
425 425
 			return false;
426 426
 		}
427 427
 
428
-		if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
428
+		if ($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
429 429
 			return false;
430 430
 		}
431 431
 
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 	protected function getSuggestedOverwriteCliURL(): string {
502 502
 		$suggestedOverwriteCliUrl = '';
503 503
 		if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
504
-			$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
504
+			$suggestedOverwriteCliUrl = $this->request->getServerProtocol().'://'.$this->request->getInsecureServerHost().\OC::$WEBROOT;
505 505
 			if (!$this->config->getSystemValue('config_is_read_only', false)) {
506 506
 				// Set the overwrite URL when it was not set yet.
507 507
 				$this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 		return [
517 517
 			'diffInSeconds' => time() - $lastCronRun,
518 518
 			'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun),
519
-			'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs',
519
+			'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']).'#backgroundjobs',
520 520
 		];
521 521
 	}
522 522
 
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 
575 575
 		foreach ($appsDir as $fileInfo) {
576 576
 			if ($fileInfo->isDir() && !$fileInfo->isDot()) {
577
-				$absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
577
+				$absAppPath = $appsPath.DIRECTORY_SEPARATOR.$fileInfo->getFilename();
578 578
 				$appDirUser = fileowner($absAppPath);
579 579
 				if ($appDirUser !== $currentUser) {
580 580
 					$appDirsWithDifferentOwner[] = $absAppPath;
Please login to merge, or discard this patch.