Completed
Pull Request — master (#4540)
by Jan-Christoph
42:07 queued 30:43
created
apps/federatedfilesharing/templates/settings-admin.php 2 patches
Braces   +16 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,7 +12,10 @@  discard block
 block discarded – undo
12 12
 
13 13
 	<p>
14 14
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
15
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
15
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
16
+    print_unescaped('checked="checked"');
17
+}
18
+?> />
16 19
 		<label for="outgoingServer2serverShareEnabled">
17 20
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
18 21
 		</label>
@@ -20,21 +23,30 @@  discard block
 block discarded – undo
20 23
 
21 24
 	<p>
22 25
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
23
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
26
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
27
+    print_unescaped('checked="checked"');
28
+}
29
+?> />
24 30
 		<label for="incomingServer2serverShareEnabled">
25 31
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
26 32
 		</label><br/>
27 33
 	</p>
28 34
 	<p>
29 35
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
30
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
36
+			   value="1" <?php if ($_['lookupServerEnabled']) {
37
+    print_unescaped('checked="checked"');
38
+}
39
+?> />
31 40
 		<label for="lookupServerEnabled">
32 41
 			<?php p($l->t('Search global and public address book for users and let local users publish their data'));?>
33 42
 		</label><br/>
34 43
 	</p>
35 44
 	<p>
36 45
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
37
-			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
46
+			   value="1" <?php if ($_['lookupServerUploadEnabled']) {
47
+    print_unescaped('checked="checked"');
48
+}
49
+?> />
38 50
 		<label for="lookupServerUploadEnabled">
39 51
 			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
40 52
 		</label><br/>
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@  discard block
 block discarded – undo
5 5
 ?>
6 6
 
7 7
 <div id="fileSharingSettings" class="followupsection">
8
-	<h3><?php p($l->t('Federated Cloud Sharing'));?></h3>
8
+	<h3><?php p($l->t('Federated Cloud Sharing')); ?></h3>
9 9
 	<a target="_blank" rel="noreferrer" class="icon-info svg"
10
-		title="<?php p($l->t('Open documentation'));?>"
10
+		title="<?php p($l->t('Open documentation')); ?>"
11 11
 		href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
12 12
 	<p class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p>
13 13
 
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
16 16
 			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
17 17
 		<label for="outgoingServer2serverShareEnabled">
18
-			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
18
+			<?php p($l->t('Allow users on this server to send shares to other servers')); ?>
19 19
 		</label>
20 20
 	</p>
21 21
 
@@ -23,21 +23,21 @@  discard block
 block discarded – undo
23 23
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
24 24
 			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
25 25
 		<label for="incomingServer2serverShareEnabled">
26
-			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
26
+			<?php p($l->t('Allow users on this server to receive shares from other servers')); ?>
27 27
 		</label><br/>
28 28
 	</p>
29 29
 	<p>
30 30
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
31 31
 			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
32 32
 		<label for="lookupServerEnabled">
33
-			<?php p($l->t('Search global and public address book for users and let local users publish their data'));?>
33
+			<?php p($l->t('Search global and public address book for users and let local users publish their data')); ?>
34 34
 		</label><br/>
35 35
 	</p>
36 36
 	<p>
37 37
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
38 38
 			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
39 39
 		<label for="lookupServerUploadEnabled">
40
-			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
40
+			<?php p($l->t('Allow users to publish their data to a global and public address book')); ?>
41 41
 		</label><br/>
42 42
 	</p>
43 43
 
Please login to merge, or discard this patch.
apps/workflowengine/templates/admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 	<h2 class="inlineblock"><?php p($_['heading']); ?></h2>
27 27
 	<?php if (!empty($_['docs'])): ?>
28 28
 		<a target="_blank" rel="noreferrer" class="icon-info svg"
29
-		   title="<?php p($l->t('Open documentation'));?>"
29
+		   title="<?php p($l->t('Open documentation')); ?>"
30 30
 		   href="<?php p(link_to_docs($_['docs'])); ?>">
31 31
 		</a>
32 32
 	<?php endif; ?>
Please login to merge, or discard this patch.
apps/files_external/appinfo/app.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
 \OC_Mount_Config::$app->registerSettings();
39 39
 
40 40
 \OCA\Files\App::getNavigationManager()->add(function () {
41
-	$l = \OC::$server->getL10N('files_external');
42
-	return [
43
-		'id' => 'extstoragemounts',
44
-		'appname' => 'files_external',
45
-		'script' => 'list.php',
46
-		'order' => 30,
47
-		'name' => $l->t('External storages'),
48
-	];
41
+    $l = \OC::$server->getL10N('files_external');
42
+    return [
43
+        'id' => 'extstoragemounts',
44
+        'appname' => 'files_external',
45
+        'script' => 'list.php',
46
+        'order' => 30,
47
+        'name' => $l->t('External storages'),
48
+    ];
49 49
 });
50 50
 
51 51
 $mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter');
Please login to merge, or discard this patch.
settings/templates/personal.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -10,10 +10,10 @@  discard block
 block discarded – undo
10 10
 
11 11
 <div id="app-navigation">
12 12
 	<ul class="with-icon">
13
-	<?php foreach($_['forms'] as $form) {
13
+	<?php foreach ($_['forms'] as $form) {
14 14
 		if (isset($form['anchor'])) {
15
-			$anchor = '#' . $form['anchor'];
16
-			$class = 'nav-icon-' . $form['anchor'];
15
+			$anchor = '#'.$form['anchor'];
16
+			$class = 'nav-icon-'.$form['anchor'];
17 17
 			$sectionName = $form['section-name'];
18 18
 			print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
19 19
 			\OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
@@ -25,15 +25,15 @@  discard block
 block discarded – undo
25 25
 <div id="app-content">
26 26
 
27 27
 <div id="quota" class="section">
28
-	<div style="width:<?php p($_['usage_relative']);?>%"
29
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
28
+	<div style="width:<?php p($_['usage_relative']); ?>%"
29
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
30 30
 		<p id="quotatext">
31 31
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
32 32
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
33
-					[$_['usage'], $_['total_space']]));?>
33
+					[$_['usage'], $_['total_space']])); ?>
34 34
 			<?php else: ?>
35 35
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
36
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
36
+					[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
37 37
 			<?php endif ?>
38 38
 		</p>
39 39
 	</div>
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 			</div>
68 68
 		</div>
69 69
 		<span class="icon-checkmark hidden"/>
70
-		<?php if($_['lookupServerUploadEnabled']) { ?>
70
+		<?php if ($_['lookupServerUploadEnabled']) { ?>
71 71
 		<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
72 72
 		<?php } ?>
73 73
 	</form>
@@ -81,14 +81,14 @@  discard block
 block discarded – undo
81 81
 				<span class="icon-password"/>
82 82
 			</h2>
83 83
 			<input type="text" id="displayname" name="displayname"
84
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
84
+				<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
85 85
 				value="<?php p($_['displayName']) ?>"
86 86
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
87
-			<?php if(!$_['displayNameChangeSupported']) { ?>
88
-				<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
87
+			<?php if (!$_['displayNameChangeSupported']) { ?>
88
+				<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
89 89
 			<?php } ?>
90 90
 			<span class="icon-checkmark hidden"/>
91
-			<?php if($_['lookupServerUploadEnabled']) { ?>
91
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
92 92
 			<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
93 93
 			<?php } ?>
94 94
 		</form>
@@ -100,23 +100,23 @@  discard block
 block discarded – undo
100 100
 				<span class="icon-password"/>
101 101
 			</h2>
102 102
 			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
103
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
103
+				<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
104 104
 				placeholder="<?php p($l->t('Your email address')); ?>"
105 105
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
106
-			<?php if(!$_['displayNameChangeSupported']) { ?>
107
-				<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
106
+			<?php if (!$_['displayNameChangeSupported']) { ?>
107
+				<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
108 108
 			<?php } ?>
109
-			<?php if($_['displayNameChangeSupported']) { ?>
109
+			<?php if ($_['displayNameChangeSupported']) { ?>
110 110
 				<br />
111 111
 				<em><?php p($l->t('For password reset and notifications')); ?></em>
112 112
 			<?php } ?>
113 113
 			<span class="icon-checkmark hidden"/>
114
-			<?php if($_['lookupServerUploadEnabled']) { ?>
114
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
115 115
 			<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
116 116
 			<?php } ?>
117 117
 		</form>
118 118
 	</div>
119
-	<?php if($_['lookupServerUploadEnabled']) { ?>
119
+	<?php if ($_['lookupServerUploadEnabled']) { ?>
120 120
 	<div class="personal-settings-setting-box">
121 121
 		<form id="phoneform" class="section">
122 122
 			<h2>
@@ -185,19 +185,19 @@  discard block
 block discarded – undo
185 185
 </div>
186 186
 
187 187
 <?php
188
-if($_['passwordChangeSupported']) {
188
+if ($_['passwordChangeSupported']) {
189 189
 	script('jquery-showpassword');
190 190
 ?>
191 191
 <form id="passwordform" class="section">
192
-	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
192
+	<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
193 193
 	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
194 194
 	<br>
195 195
 	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
196 196
 	<input type="password" id="pass1" name="oldpassword"
197
-		placeholder="<?php p($l->t('Current password'));?>"
197
+		placeholder="<?php p($l->t('Current password')); ?>"
198 198
 		autocomplete="off" autocapitalize="none" autocorrect="off" />
199 199
 	<div class="personal-show-container">
200
-		<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
200
+		<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
201 201
 		<input type="password" id="pass2" name="newpassword"
202 202
 			placeholder="<?php p($l->t('New password')); ?>"
203 203
 			data-typetoggle="#personal-show"
@@ -213,44 +213,44 @@  discard block
 block discarded – undo
213 213
 
214 214
 <form id="language" class="section">
215 215
 	<h2>
216
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
216
+		<label for="languageinput"><?php p($l->t('Language')); ?></label>
217 217
 	</h2>
218
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
219
-		<option value="<?php p($_['activelanguage']['code']);?>">
220
-			<?php p($_['activelanguage']['name']);?>
218
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
219
+		<option value="<?php p($_['activelanguage']['code']); ?>">
220
+			<?php p($_['activelanguage']['name']); ?>
221 221
 		</option>
222
-		<?php foreach($_['commonlanguages'] as $language):?>
223
-			<option value="<?php p($language['code']);?>">
224
-				<?php p($language['name']);?>
222
+		<?php foreach ($_['commonlanguages'] as $language):?>
223
+			<option value="<?php p($language['code']); ?>">
224
+				<?php p($language['name']); ?>
225 225
 			</option>
226
-		<?php endforeach;?>
226
+		<?php endforeach; ?>
227 227
 		<optgroup label="––––––––––"></optgroup>
228
-		<?php foreach($_['languages'] as $language):?>
229
-			<option value="<?php p($language['code']);?>">
230
-				<?php p($language['name']);?>
228
+		<?php foreach ($_['languages'] as $language):?>
229
+			<option value="<?php p($language['code']); ?>">
230
+				<?php p($language['name']); ?>
231 231
 			</option>
232
-		<?php endforeach;?>
232
+		<?php endforeach; ?>
233 233
 	</select>
234 234
 	<a href="https://www.transifex.com/nextcloud/nextcloud/"
235 235
 		target="_blank" rel="noreferrer">
236
-		<em><?php p($l->t('Help translate'));?></em>
236
+		<em><?php p($l->t('Help translate')); ?></em>
237 237
 	</a>
238 238
 </form>
239 239
 
240 240
 
241 241
 <div id="clientsbox" class="section clientsbox">
242
-	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
242
+	<h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
243 243
 	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
244 244
 		<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
245
-			 alt="<?php p($l->t('Desktop client'));?>" />
245
+			 alt="<?php p($l->t('Desktop client')); ?>" />
246 246
 	</a>
247 247
 	<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
248 248
 		<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
249
-			 alt="<?php p($l->t('Android app'));?>" />
249
+			 alt="<?php p($l->t('Android app')); ?>" />
250 250
 	</a>
251 251
 	<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
252 252
 		<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
253
-			 alt="<?php p($l->t('iOS app'));?>" />
253
+			 alt="<?php p($l->t('iOS app')); ?>" />
254 254
 	</a>
255 255
 
256 256
 		<p>
@@ -266,19 +266,19 @@  discard block
 block discarded – undo
266 266
 				$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
267 267
 		</p>
268 268
 
269
-	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
270
-		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
269
+	<?php if (OC_APP::isEnabled('firstrunwizard')) {?>
270
+		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
271 271
 	<?php }?>
272 272
 </div>
273 273
 
274 274
 <div id="sessions" class="section">
275
-	<h2><?php p($l->t('Sessions'));?></h2>
276
-	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
275
+	<h2><?php p($l->t('Sessions')); ?></h2>
276
+	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.')); ?></span>
277 277
 	<table class="icon-loading">
278 278
 		<thead class="token-list-header">
279 279
 			<tr>
280
-				<th><?php p($l->t('Device'));?></th>
281
-				<th><?php p($l->t('Last activity'));?></th>
280
+				<th><?php p($l->t('Device')); ?></th>
281
+				<th><?php p($l->t('Last activity')); ?></th>
282 282
 				<th></th>
283 283
 			</tr>
284 284
 		</thead>
@@ -288,13 +288,13 @@  discard block
 block discarded – undo
288 288
 </div>
289 289
 
290 290
 <div id="apppasswords" class="section">
291
-	<h2><?php p($l->t('App passwords'));?></h2>
292
-	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
291
+	<h2><?php p($l->t('App passwords')); ?></h2>
292
+	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.')); ?></p>
293 293
 	<table class="icon-loading">
294 294
 		<thead class="hidden-when-empty">
295 295
 			<tr>
296
-				<th><?php p($l->t('Name'));?></th>
297
-				<th><?php p($l->t('Last activity'));?></th>
296
+				<th><?php p($l->t('Name')); ?></th>
297
+				<th><?php p($l->t('Last activity')); ?></th>
298 298
 				<th></th>
299 299
 			</tr>
300 300
 		</thead>
@@ -323,14 +323,14 @@  discard block
 block discarded – undo
323 323
 	</div>
324 324
 </div>
325 325
 
326
-<?php foreach($_['forms'] as $form) {
326
+<?php foreach ($_['forms'] as $form) {
327 327
 	if (isset($form['form'])) {?>
328
-	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
328
+	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
329 329
 	<?php }
330 330
 };?>
331 331
 
332 332
 <div class="section">
333
-	<h2><?php p($l->t('Version'));?></h2>
333
+	<h2><?php p($l->t('Version')); ?></h2>
334 334
 	<p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
335 335
 	<p><?php include('settings.development.notice.php'); ?></p>
336 336
 </div>
Please login to merge, or discard this patch.