Completed
Pull Request — master (#5231)
by Morris
16:38
created
apps/files_external/templates/settings.php 1 patch
Braces   +24 added lines, -6 removed lines patch added patch discarded remove patch
@@ -89,7 +89,10 @@  discard block
 block discarded – undo
89 89
 
90 90
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
91 91
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
92
-	<?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
92
+	<?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) {
93
+    print_unescaped(''.$_['dependencies'].'');
94
+}
95
+?>
93 96
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
94 97
 		<thead>
95 98
 			<tr>
@@ -98,7 +101,10 @@  discard block
 block discarded – undo
98 101
 				<th><?php p($l->t('External storage')); ?></th>
99 102
 				<th><?php p($l->t('Authentication')); ?></th>
100 103
 				<th><?php p($l->t('Configuration')); ?></th>
101
-				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
104
+				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
105
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
106
+}
107
+?>
102 108
 				<th>&nbsp;</th>
103 109
 				<th>&nbsp;</th>
104 110
 			</tr>
@@ -130,7 +136,10 @@  discard block
 block discarded – undo
130 136
 							});
131 137
 						?>
132 138
 						<?php foreach ($sortedBackends as $backend): ?>
133
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
139
+							<?php if ($backend->getDeprecateTo()) {
140
+    continue;
141
+}
142
+// ignore deprecated backends ?>
134 143
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
135 144
 						<?php endforeach; ?>
136 145
 					</select>
@@ -169,7 +178,10 @@  discard block
 block discarded – undo
169 178
 
170 179
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
171 180
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
172
-			value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
181
+			value="1" <?php if ($_['allowUserMounting'] == 'yes') {
182
+    print_unescaped(' checked="checked"');
183
+}
184
+?> />
173 185
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
174 186
 
175 187
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
@@ -182,8 +194,14 @@  discard block
 block discarded – undo
182 194
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
183 195
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
184 196
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
185
-				<?php else: ?>
186
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
197
+				<?php else {
198
+    : ?>
199
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
200
+}
201
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
202
+    print_unescaped(' checked="checked"');
203
+}
204
+?> />
187 205
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
188 206
 				<?php endif; ?>
189 207
 				<?php $i++; ?>
Please login to merge, or discard this patch.
lib/private/Settings/Personal/PersonalInfo.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 				$ln = array('code' => $lang, 'name' => $potentialName);
136 136
 			} elseif ($lang === 'en') {
137 137
 				$ln = ['code' => $lang, 'name' => 'English (US)'];
138
-			}else{//fallback to language code
138
+			} else{//fallback to language code
139 139
 				$ln=array('code'=>$lang, 'name'=>$lang);
140 140
 			}
141 141
 
Please login to merge, or discard this patch.
apps/files_sharing/templates/public.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,17 +72,23 @@
 block discarded – undo
72 72
 	<div id="preview">
73 73
 			<?php if (isset($_['folder'])): ?>
74 74
 				<?php print_unescaped($_['folder']); ?>
75
-			<?php else: ?>
75
+			<?php else {
76
+    : ?>
76 77
 				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
77 78
 					<div id="imgframe">
78
-						<video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
79
+						<video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']);
80
+}
81
+?>px; max-height: <?php p($_['previewMaxY']); ?>px">
79 82
 							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
80 83
 						</video>
81 84
 					</div>
82
-				<?php else: ?>
85
+				<?php else {
86
+    : ?>
83 87
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
84 88
 					<div id="imgframe"></div>
85
-				<?php endif; ?>
89
+				<?php endif;
90
+}
91
+?>
86 92
 				<div class="directDownload">
87 93
 					<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
88 94
 						<span class="icon icon-download"></span>
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 1 patch
Braces   +32 added lines, -11 removed lines patch added patch discarded remove patch
@@ -47,9 +47,12 @@  discard block
 block discarded – undo
47 47
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
48 48
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
49 49
 					[$_['usage'], $_['total_space']]));?>
50
-			<?php else: ?>
50
+			<?php else {
51
+    : ?>
51 52
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
52
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
53
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));
54
+}
55
+?>
53 56
 			<?php endif ?>
54 57
 		</p>
55 58
 	</div>
@@ -71,8 +74,11 @@  discard block
 block discarded – undo
71 74
 					<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
72 75
 					<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
73 76
 					<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
74
-				<?php else: ?>
75
-					<?php p($l->t('Picture provided by original account')); ?>
77
+				<?php else {
78
+    : ?>
79
+					<?php p($l->t('Picture provided by original account'));
80
+}
81
+?>
76 82
 				<?php endif; ?>
77 83
 			</div>
78 84
 
@@ -115,7 +121,10 @@  discard block
 block discarded – undo
115 121
 					<label for="email"><?php p($l->t('Email')); ?></label>
116 122
 					<span class="icon-password"/>
117 123
 				</h2>
118
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
124
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
125
+    p('hidden');
126
+}
127
+?>">
119 128
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
120 129
 				<?php
121 130
 					switch($_['emailVerification']) {
@@ -182,7 +191,10 @@  discard block
 block discarded – undo
182 191
 						<label for="website"><?php p($l->t('Website')); ?></label>
183 192
 						<span class="icon-password"/>
184 193
 					</h2>
185
-					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
194
+					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
195
+    p('hidden');
196
+}
197
+?>">
186 198
 						<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
187 199
 				<?php
188 200
 						switch($_['websiteVerification']) {
@@ -196,13 +208,16 @@  discard block
 block discarded – undo
196 208
 								p(image_path('core', 'actions/verify.svg'));
197 209
 						}
198 210
 						?>"
199
-							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
211
+							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
212
+    print_unescaped(' class="verify-action"') ?>
200 213
 						>
201 214
 						<div class="verification-dialog popovermenu bubble menu">
202 215
 							<div class="verification-dialog-content">
203 216
 								<p class="explainVerification"></p>
204 217
 								<p class="verificationCode"></p>
205
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
218
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
219
+}
220
+?></p>
206 221
 							</div>
207 222
 						</div>
208 223
 					</div>
@@ -219,7 +234,10 @@  discard block
 block discarded – undo
219 234
 						<label for="twitter"><?php p($l->t('Twitter')); ?></label>
220 235
 						<span class="icon-password"/>
221 236
 					</h2>
222
-					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
237
+					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
238
+    p('hidden');
239
+}
240
+?>">
223 241
 						<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
224 242
 				<?php
225 243
 						switch($_['twitterVerification']) {
@@ -233,13 +251,16 @@  discard block
 block discarded – undo
233 251
 								p(image_path('core', 'actions/verify.svg'));
234 252
 						}
235 253
 						?>"
236
-							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
254
+							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
255
+    print_unescaped(' class="verify-action"') ?>
237 256
 						>
238 257
 						<div class="verification-dialog popovermenu bubble menu">
239 258
 							<div class="verification-dialog-content">
240 259
 								<p class="explainVerification"></p>
241 260
 								<p class="verificationCode"></p>
242
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
261
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
262
+}
263
+?></p>
243 264
 							</div>
244 265
 						</div>
245 266
 					</div>
Please login to merge, or discard this patch.
settings/templates/personal.php 1 patch
Braces   +54 added lines, -16 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
 
@@ -96,7 +102,10 @@  discard block
 block discarded – undo
96 102
 				<label for="email"><?php p($l->t('Email')); ?></label>
97 103
 				<span class="icon-password"/>
98 104
 			</h2>
99
-			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
105
+			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
106
+    p('hidden');
107
+}
108
+?>">
100 109
 				<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
101 110
 				<?php
102 111
 				switch($_['emailVerification']) {
@@ -111,7 +120,12 @@  discard block
 block discarded – undo
111 120
 				}
112 121
 				?>">
113 122
 			</div>
114
-			<input type="email" name="email" id="email" value="<?php if(!$_['displayNameChangeSupported'] && empty($_['email'])) p($l->t('No email address set')); else p($_['email']); ?>"
123
+			<input type="email" name="email" id="email" value="<?php if(!$_['displayNameChangeSupported'] && empty($_['email'])) {
124
+    p($l->t('No email address set'));
125
+} else {
126
+    p($_['email']);
127
+}
128
+?>"
115 129
 				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
116 130
 				placeholder="<?php p($l->t('Your email address')) ?>"
117 131
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -132,7 +146,10 @@  discard block
 block discarded – undo
132 146
 				<label for="phone"><?php p($l->t('Phone number')); ?></label>
133 147
 				<span class="icon-password"/>
134 148
 			</h2>
135
-			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
149
+			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
150
+    print_unescaped('disabled="1"');
151
+}
152
+?>
136 153
 				   value="<?php p($_['phone']) ?>"
137 154
 				   placeholder="<?php p($l->t('Your phone number')); ?>"
138 155
 			       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -150,7 +167,10 @@  discard block
 block discarded – undo
150 167
 				<label for="address"><?php p($l->t('Address')); ?></label>
151 168
 				<span class="icon-password"/>
152 169
 			</h2>
153
-			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
170
+			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
171
+    print_unescaped('disabled="1"');
172
+}
173
+?>
154 174
 				   placeholder="<?php p($l->t('Your postal address')); ?>"
155 175
 				   value="<?php p($_['address']) ?>"
156 176
 				   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -169,7 +189,10 @@  discard block
 block discarded – undo
169 189
 				<span class="icon-password"/>
170 190
 			</h2>
171 191
 			<?php if($_['lookupServerUploadEnabled']) { ?>
172
-			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
192
+			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
193
+    p('hidden');
194
+}
195
+?>">
173 196
 				<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
174 197
 				<?php
175 198
 				switch($_['websiteVerification']) {
@@ -183,13 +206,16 @@  discard block
 block discarded – undo
183 206
 						p(image_path('core', 'actions/verify.svg'));
184 207
 				}
185 208
 				?>"
186
-				<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
209
+				<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
210
+    print_unescaped(' class="verify-action"') ?>
187 211
 				>
188 212
 				<div class="verification-dialog popovermenu bubble menu">
189 213
 					<div class="verification-dialog-content">
190 214
 						<p class="explainVerification"></p>
191 215
 						<p class="verificationCode"></p>
192
-						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
216
+						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
217
+}
218
+?></p>
193 219
 					</div>
194 220
 				</div>
195 221
 			</div>
@@ -197,7 +223,10 @@  discard block
 block discarded – undo
197 223
 			<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
198 224
 			       placeholder="<?php p($l->t('Link https://…')); ?>"
199 225
 			       autocomplete="on" autocapitalize="none" autocorrect="off"
200
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
226
+				   <?php if(!$_['lookupServerUploadEnabled']) {
227
+    print_unescaped('disabled="1"');
228
+}
229
+?>
201 230
 			/>
202 231
 			<span class="icon-checkmark hidden"/>
203 232
 			<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -214,7 +243,10 @@  discard block
 block discarded – undo
214 243
 				<span class="icon-password"/>
215 244
 			</h2>
216 245
 			<?php if($_['lookupServerUploadEnabled']) { ?>
217
-			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
246
+			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
247
+    p('hidden');
248
+}
249
+?>">
218 250
 				<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
219 251
 				<?php
220 252
 				switch($_['twitterVerification']) {
@@ -228,13 +260,16 @@  discard block
 block discarded – undo
228 260
 						p(image_path('core', 'actions/verify.svg'));
229 261
 				}
230 262
 				?>"
231
-				<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
263
+				<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
264
+    print_unescaped(' class="verify-action"') ?>
232 265
 				>
233 266
 				<div class="verification-dialog popovermenu bubble menu">
234 267
 					<div class="verification-dialog-content">
235 268
 						<p class="explainVerification"></p>
236 269
 						<p class="verificationCode"></p>
237
-						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
270
+						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
271
+}
272
+?></p>
238 273
 					</div>
239 274
 				</div>
240 275
 			</div>
@@ -242,7 +277,10 @@  discard block
 block discarded – undo
242 277
 			<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
243 278
 				   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
244 279
 				   autocomplete="on" autocapitalize="none" autocorrect="off"
245
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
280
+				   <?php if(!$_['lookupServerUploadEnabled']) {
281
+    print_unescaped('disabled="1"');
282
+}
283
+?>
246 284
 			/>
247 285
 			<span class="icon-checkmark hidden"/>
248 286
 			<?php if($_['lookupServerUploadEnabled']) { ?>
Please login to merge, or discard this patch.
apps/federatedfilesharing/templates/settings-admin.php 1 patch
Braces   +16 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,7 +15,10 @@  discard block
 block discarded – undo
15 15
 
16 16
 	<p>
17 17
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
18
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
18
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
19
+    print_unescaped('checked="checked"');
20
+}
21
+?> />
19 22
 		<label for="outgoingServer2serverShareEnabled">
20 23
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
21 24
 		</label>
@@ -23,21 +26,30 @@  discard block
 block discarded – undo
23 26
 
24 27
 	<p>
25 28
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
26
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
29
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
30
+    print_unescaped('checked="checked"');
31
+}
32
+?> />
27 33
 		<label for="incomingServer2serverShareEnabled">
28 34
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
29 35
 		</label><br/>
30 36
 	</p>
31 37
 	<p>
32 38
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
33
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
39
+			   value="1" <?php if ($_['lookupServerEnabled']) {
40
+    print_unescaped('checked="checked"');
41
+}
42
+?> />
34 43
 		<label for="lookupServerEnabled">
35 44
 			<?php p($l->t('Search global and public address book for users'));?>
36 45
 		</label><br/>
37 46
 	</p>
38 47
 	<p>
39 48
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
40
-			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
49
+			   value="1" <?php if ($_['lookupServerUploadEnabled']) {
50
+    print_unescaped('checked="checked"');
51
+}
52
+?> />
41 53
 		<label for="lookupServerUploadEnabled">
42 54
 			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
43 55
 		</label><br/>
Please login to merge, or discard this patch.
settings/templates/settings/admin/sharing.php 1 patch
Braces   +88 added lines, -22 removed lines patch added patch discarded remove patch
@@ -34,73 +34,139 @@
 block discarded – undo
34 34
         <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p>
35 35
 	<p id="enable">
36 36
 		<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
37
-			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
37
+			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') {
38
+    print_unescaped('checked="checked"');
39
+}
40
+?> />
38 41
 		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
39 42
 	</p>
40
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
43
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
44
+    p('hidden');
45
+}
46
+?>">
41 47
 		<input type="checkbox" name="shareapi_allow_links" id="allowLinks" class="checkbox"
42
-			   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
48
+			   value="1" <?php if ($_['allowLinks'] === 'yes') {
49
+    print_unescaped('checked="checked"');
50
+}
51
+?> />
43 52
 		<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
44 53
 	</p>
45 54
 
46
-	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
55
+	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') {
56
+    p('hidden');
57
+}
58
+?>">
47 59
 		<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox"
48
-			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
60
+			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') {
61
+    print_unescaped('checked="checked"');
62
+}
63
+?> />
49 64
 		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
50 65
 		<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
51
-			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') print_unescaped('checked="checked"'); ?> />
66
+			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') {
67
+    print_unescaped('checked="checked"');
68
+}
69
+?> />
52 70
 		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
53 71
 		<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
54
-			   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
72
+			   value="1" <?php if ($_['enforceLinkPassword']) {
73
+    print_unescaped('checked="checked"');
74
+}
75
+?> />
55 76
 		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
56 77
 
57 78
 		<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
58
-			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
79
+			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') {
80
+    print_unescaped('checked="checked"');
81
+}
82
+?> />
59 83
 		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
60 84
 
61 85
 	</p>
62
-	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
86
+	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
87
+    p('hidden');
88
+}
89
+?>">
63 90
 		<?php p($l->t( 'Expire after ' )); ?>
64 91
 		<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
65 92
 			   value='<?php p($_['shareExpireAfterNDays']) ?>' />
66 93
 		<?php p($l->t( 'days' )); ?>
67 94
 		<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
68
-			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
95
+			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') {
96
+    print_unescaped('checked="checked"');
97
+}
98
+?> />
69 99
 		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
70 100
 	</p>
71
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
101
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
102
+    p('hidden');
103
+}
104
+?>">
72 105
 		<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" class="checkbox"
73
-			   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
106
+			   value="1" <?php if ($_['allowResharing'] === 'yes') {
107
+    print_unescaped('checked="checked"');
108
+}
109
+?> />
74 110
 		<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
75 111
 	</p>
76
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
112
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
113
+    p('hidden');
114
+}
115
+?>">
77 116
 		<input type="checkbox" name="shareapi_allow_group_sharing" id="allowGroupSharing" class="checkbox"
78
-			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
117
+			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') {
118
+    print_unescaped('checked="checked"');
119
+}
120
+?> />
79 121
 		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
80 122
 	</p>
81
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
123
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
124
+    p('hidden');
125
+}
126
+?>">
82 127
 		<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox"
83
-			   value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
128
+			   value="1" <?php if ($_['onlyShareWithGroupMembers']) {
129
+    print_unescaped('checked="checked"');
130
+}
131
+?> />
84 132
 		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
85 133
 	</p>
86
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
134
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
135
+    p('hidden');
136
+}
137
+?>">
87 138
 		<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" class="checkbox"
88
-			   value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
139
+			   value="1" <?php if ($_['shareExcludeGroups']) {
140
+    print_unescaped('checked="checked"');
141
+}
142
+?> />
89 143
 		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
90 144
 	</p>
91
-	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
145
+	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') {
146
+    p('hidden');
147
+}
148
+?>">
92 149
 		<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
93 150
 		<br />
94 151
 		<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
95 152
 	</p>
96
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
153
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
154
+    p('hidden');
155
+}
156
+?>">
97 157
 		<input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration" class="checkbox"
98
-			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> />
158
+			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') {
159
+    print_unescaped('checked="checked"');
160
+}
161
+?> />
99 162
 		<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered.'));?></label><br />
100 163
 	</p>
101 164
 	<p>
102 165
 		<input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"
103
-			<?php if ($_['publicShareDisclaimerText'] !== null) print_unescaped('checked="checked"'); ?> />
166
+			<?php if ($_['publicShareDisclaimerText'] !== null) {
167
+    print_unescaped('checked="checked"');
168
+}
169
+?> />
104 170
 		<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)'));?></label>
105 171
 		<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
106 172
 		<br/>
Please login to merge, or discard this patch.
settings/templates/settings/admin/additional-mail.php 1 patch
Braces   +24 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,11 +72,17 @@  discard block
 block discarded – undo
72 72
 			</select>
73 73
 
74 74
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
75
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
75
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
76
+    print_unescaped(' class="hidden"');
77
+}
78
+?>>
76 79
 				<?php p($l->t('Encryption')); ?>
77 80
 			</label>
78 81
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
79
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
82
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
83
+    print_unescaped(' class="hidden"');
84
+}
85
+?>>
80 86
 				<?php foreach ($mail_smtpsecure as $secure => $name):
81 87
 					$selected = '';
82 88
 					if ($secure == $_['mail_smtpsecure']):
@@ -95,7 +101,10 @@  discard block
 block discarded – undo
95 101
 				   value="<?php p($_['mail_domain']) ?>" />
96 102
 		</p>
97 103
 
98
-		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
104
+		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') {
105
+    print_unescaped(' class="hidden"');
106
+}
107
+?>>
99 108
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
100 109
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype'>
101 110
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
@@ -108,11 +117,17 @@  discard block
 block discarded – undo
108 117
 			</select>
109 118
 
110 119
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
111
-				<?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
120
+				<?php if ($_['mail_smtpauth']) {
121
+    print_unescaped('checked="checked"');
122
+}
123
+?> />
112 124
 			<label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label>
113 125
 		</p>
114 126
 
115
-		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
127
+		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') {
128
+    print_unescaped(' class="hidden"');
129
+}
130
+?>>
116 131
 			<label for="mail_smtphost"><?php p($l->t('Server address')); ?></label>
117 132
 			<input type="text" name="mail_smtphost" id="mail_smtphost" placeholder="smtp.example.com"
118 133
 				   value="<?php p($_['mail_smtphost']) ?>" />
@@ -122,7 +137,10 @@  discard block
 block discarded – undo
122 137
 		</p>
123 138
 	</form>
124 139
 	<form class="mail_settings" id="mail_credentials_settings">
125
-		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
140
+		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') {
141
+    print_unescaped(' class="hidden"');
142
+}
143
+?>>
126 144
 			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
127 145
 			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
128 146
 				   value="<?php p($_['mail_smtpname']) ?>" />
Please login to merge, or discard this patch.
settings/templates/settings/admin/server.php 1 patch
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -166,15 +166,20 @@
 block discarded – undo
166 166
 					<span class="crondate" title="<?php p($absolute_time);?>">
167 167
 					<?php p($l->t("Last job ran %s.", [$relative_time]));?>
168 168
 				</span>
169
-				<?php else: ?>
169
+				<?php else {
170
+    : ?>
170 171
 					<span class="status error"></span>
171
-					<span class="crondate" title="<?php p($absolute_time);?>">
172
+					<span class="crondate" title="<?php p($absolute_time);
173
+}
174
+?>">
172 175
 					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
173 176
 				</span>
174 177
 				<?php endif;
175
-			else: ?>
178
+			else {
179
+			    : ?>
176 180
 				<span class="status error"></span>
177 181
 				<?php p($l->t("Background job didn’t run yet!"));
182
+			}
178 183
 			endif; ?>
179 184
 		</p>
180 185
 	<?php endif; ?>
Please login to merge, or discard this patch.