Completed
Pull Request — master (#3869)
by Björn
15:39
created
apps/federatedfilesharing/templates/settings-admin.php 1 patch
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.
settings/templates/personal.php 1 patch
Braces   +32 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,9 +31,12 @@  discard block
 block discarded – undo
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 33
 					[$_['usage'], $_['total_space']]));?>
34
-			<?php else: ?>
34
+			<?php else {
35
+    : ?>
35 36
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
36
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
37
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));
38
+}
39
+?>
37 40
 			<?php endif ?>
38 41
 		</p>
39 42
 	</div>
@@ -55,8 +58,11 @@  discard block
 block discarded – undo
55 58
 				<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
56 59
 				<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
57 60
 				<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
58
-			<?php else: ?>
59
-				<?php p($l->t('Picture provided by original account')); ?>
61
+			<?php else {
62
+    : ?>
63
+				<?php p($l->t('Picture provided by original account'));
64
+}
65
+?>
60 66
 			<?php endif; ?>
61 67
 		</div>
62 68
 
@@ -99,7 +105,10 @@  discard block
 block discarded – undo
99 105
 				<label for="email"><?php p($l->t('Email')); ?></label>
100 106
 				<span class="icon-password"/>
101 107
 			</h2>
102
-			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
108
+			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
109
+    p('hidden');
110
+}
111
+?>">
103 112
 				<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
104 113
 				<?php
105 114
 				switch($_['emailVerification']) {
@@ -166,7 +175,10 @@  discard block
 block discarded – undo
166 175
 				<label for="website"><?php p($l->t('Website')); ?></label>
167 176
 				<span class="icon-password"/>
168 177
 			</h2>
169
-			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
178
+			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
179
+    p('hidden');
180
+}
181
+?>">
170 182
 				<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
171 183
 				<?php
172 184
 				switch($_['websiteVerification']) {
@@ -180,13 +192,16 @@  discard block
 block discarded – undo
180 192
 						p(image_path('core', 'actions/verify.svg'));
181 193
 				}
182 194
 				?>"
183
-				<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
195
+				<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
196
+    print_unescaped(' class="verify-action"') ?>
184 197
 				>
185 198
 				<div class="verification-dialog popovermenu bubble menu">
186 199
 					<div class="verification-dialog-content">
187 200
 						<p class="explainVerification"></p>
188 201
 						<p class="verificationCode"></p>
189
-						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
202
+						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
203
+}
204
+?></p>
190 205
 					</div>
191 206
 				</div>
192 207
 			</div>
@@ -203,7 +218,10 @@  discard block
 block discarded – undo
203 218
 				<label for="twitter"><?php p($l->t('Twitter')); ?></label>
204 219
 				<span class="icon-password"/>
205 220
 			</h2>
206
-			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
221
+			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
222
+    p('hidden');
223
+}
224
+?>">
207 225
 				<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
208 226
 				<?php
209 227
 				switch($_['twitterVerification']) {
@@ -217,13 +235,16 @@  discard block
 block discarded – undo
217 235
 						p(image_path('core', 'actions/verify.svg'));
218 236
 				}
219 237
 				?>"
220
-				<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
238
+				<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
239
+    print_unescaped(' class="verify-action"') ?>
221 240
 				>
222 241
 				<div class="verification-dialog popovermenu bubble menu">
223 242
 					<div class="verification-dialog-content">
224 243
 						<p class="explainVerification"></p>
225 244
 						<p class="verificationCode"></p>
226
-						<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.'));
246
+}
247
+?></p>
227 248
 					</div>
228 249
 				</div>
229 250
 			</div>
Please login to merge, or discard this patch.