Completed
Pull Request — master (#6590)
by Thomas
15:31
created
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/encryption.php 1 patch
Braces   +16 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,7 +35,10 @@  discard block
 block discarded – undo
35 35
 	<p id="enable">
36 36
 		<input type="checkbox"
37 37
 			   id="enableEncryption" class="checkbox"
38
-			   value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> />
38
+			   value="1" <?php if ($_['encryptionEnabled']) {
39
+    print_unescaped('checked="checked" disabled="disabled"');
40
+}
41
+?> />
39 42
 		<label
40 43
 			for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
41 44
 	</p>
@@ -54,8 +57,14 @@  discard block
 block discarded – undo
54 57
 																										   value="<?php p($l->t("Enable encryption")); ?>" /></p>
55 58
 	</div>
56 59
 
57
-	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
58
-		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
60
+	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) {
61
+    p('hidden');
62
+}
63
+?>">
64
+		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) {
65
+    p('hidden');
66
+}
67
+?>">
59 68
 			<?php
60 69
 			if (empty($_['encryptionModules'])) {
61 70
 				p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
@@ -76,7 +85,10 @@  discard block
 block discarded – undo
76 85
 				</fieldset>
77 86
 			<?php } ?>
78 87
 		</div>
79
-		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
88
+		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) {
89
+    p('hidden');
90
+}
91
+?>">
80 92
 			<?php
81 93
 			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
82 94
 				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
Please login to merge, or discard this patch.
lib/private/Archive/ZIP.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$this->path=$source;
48 48
 		$this->zip=new \ZipArchive();
49 49
 		if($this->zip->open($source, \ZipArchive::CREATE)) {
50
-		}else{
50
+		} else{
51 51
 			\OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, \OCP\Util::WARN);
52 52
 		}
53 53
 	}
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	public function addFile($path, $source='') {
69 69
 		if($source and $source[0]=='/' and file_exists($source)) {
70 70
 			$result=$this->zip->addFile($source, $path);
71
-		}else{
71
+		} else{
72 72
 			$result=$this->zip->addFromString($path, $source);
73 73
 		}
74 74
 		if($result) {
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 	public function remove($path) {
178 178
 		if($this->fileExists($path.'/')) {
179 179
 			return $this->zip->deleteName($path.'/');
180
-		}else{
180
+		} else{
181 181
 			return $this->zip->deleteName($path);
182 182
 		}
183 183
 	}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 			//in the archive when the stream is closed
197 197
 			if(strrpos($path, '.')!==false) {
198 198
 				$ext=substr($path, strrpos($path, '.'));
199
-			}else{
199
+			} else{
200 200
 				$ext='';
201 201
 			}
202 202
 			$tmpFile=\OCP\Files::tmpFile($ext);
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	private function stripPath($path) {
226 226
 		if(!$path || $path[0]=='/') {
227 227
 			return substr($path, 1);
228
-		}else{
228
+		} else{
229 229
 			return $path;
230 230
 		}
231 231
 	}
Please login to merge, or discard this patch.
lib/private/L10N/L10NString.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,8 +61,7 @@
 block discarded – undo
61 61
 				$fn = $this->l10n->getPluralFormFunction();
62 62
 				$id = $fn($this->count);
63 63
 				$text = $translations[$this->text][$id];
64
-			}
65
-			else{
64
+			} else{
66 65
 				$text = $translations[$this->text];
67 66
 			}
68 67
 		}
Please login to merge, or discard this patch.
apps/updatenotification/templates/admin.php 1 patch
Braces   +12 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,10 +61,19 @@
 block discarded – undo
61 61
 	<p id="oca_updatenotification_groups">
62 62
 		<?php p($l->t('Notify members of the following groups about available updates:')); ?>
63 63
 		<input name="oca_updatenotification_groups_list" type="hidden" id="oca_updatenotification_groups_list" value="<?php p($_['notify_groups']) ?>" style="width: 400px"><br />
64
-		<em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) p('hidden'); ?>">
64
+		<em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) {
65
+    p('hidden');
66
+}
67
+?>">
65 68
 			<?php p($l->t('Only notification for app updates are available.')); ?>
66
-			<?php if ($currentChannel === 'daily') p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); ?>
67
-			<?php if ($currentChannel === 'git') p($l->t('The selected update channel does not support updates of the server.')); ?>
69
+			<?php if ($currentChannel === 'daily') {
70
+    p($l->t('The selected update channel makes dedicated notifications for the server obsolete.'));
71
+}
72
+?>
73
+			<?php if ($currentChannel === 'git') {
74
+    p($l->t('The selected update channel does not support updates of the server.'));
75
+}
76
+?>
68 77
 		</em>
69 78
 	</p>
70 79
 </form>
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 1 patch
Braces   +48 added lines, -15 removed lines patch added patch discarded remove patch
@@ -44,9 +44,12 @@  discard block
 block discarded – undo
44 44
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
45 45
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
46 46
 					[$_['usage'], $_['total_space']]));?>
47
-			<?php else: ?>
47
+			<?php else {
48
+    : ?>
48 49
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
49
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
50
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));
51
+}
52
+?>
50 53
 			<?php endif ?>
51 54
 		</p>
52 55
 	</div>
@@ -67,8 +70,11 @@  discard block
 block discarded – undo
67 70
 					<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
68 71
 					<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
69 72
 					<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
70
-				<?php else: ?>
71
-					<?php p($l->t('Picture provided by original account')); ?>
73
+				<?php else {
74
+    : ?>
75
+					<?php p($l->t('Picture provided by original account'));
76
+}
77
+?>
72 78
 				<?php endif; ?>
73 79
 			</div>
74 80
 
@@ -112,7 +118,10 @@  discard block
 block discarded – undo
112 118
 					<label for="email"><?php p($l->t('Email')); ?></label>
113 119
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
114 120
 				</h2>
115
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
121
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
122
+    p('hidden');
123
+}
124
+?>">
116 125
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
117 126
 				<?php
118 127
 					switch($_['emailVerification']) {
@@ -151,7 +160,10 @@  discard block
 block discarded – undo
151 160
 					<label for="phone"><?php p($l->t('Phone number')); ?></label>
152 161
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
153 162
 				</h2>
154
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
163
+				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
164
+    print_unescaped('disabled="1"');
165
+}
166
+?>
155 167
 					   value="<?php p($_['phone']) ?>"
156 168
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
157 169
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -169,7 +181,10 @@  discard block
 block discarded – undo
169 181
 					<label for="address"><?php p($l->t('Address')); ?></label>
170 182
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
171 183
 				</h2>
172
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
184
+				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
185
+    print_unescaped('disabled="1"');
186
+}
187
+?>
173 188
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
174 189
 					   value="<?php p($_['address']) ?>"
175 190
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -188,7 +203,10 @@  discard block
 block discarded – undo
188 203
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
189 204
 				</h2>
190 205
 				<?php if($_['lookupServerUploadEnabled']) { ?>
191
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
206
+				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
207
+    p('hidden');
208
+}
209
+?>">
192 210
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
193 211
 					<?php
194 212
 					switch($_['websiteVerification']) {
@@ -202,13 +220,16 @@  discard block
 block discarded – undo
202 220
 							p(image_path('core', 'actions/verify.svg'));
203 221
 					}
204 222
 					?>"
205
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
223
+					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
224
+    print_unescaped(' class="verify-action"') ?>
206 225
 					>
207 226
 					<div class="verification-dialog popovermenu bubble menu">
208 227
 						<div class="verification-dialog-content">
209 228
 							<p class="explainVerification"></p>
210 229
 							<p class="verificationCode"></p>
211
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
230
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
231
+}
232
+?></p>
212 233
 						</div>
213 234
 					</div>
214 235
 				</div>
@@ -216,7 +237,10 @@  discard block
 block discarded – undo
216 237
 				<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
217 238
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
218 239
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
219
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
240
+					   <?php if(!$_['lookupServerUploadEnabled']) {
241
+    print_unescaped('disabled="1"');
242
+}
243
+?>
220 244
 				/>
221 245
 				<span class="icon-checkmark hidden"></span>
222 246
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -233,7 +257,10 @@  discard block
 block discarded – undo
233 257
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
234 258
 				</h2>
235 259
 				<?php if($_['lookupServerUploadEnabled']) { ?>
236
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
260
+				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
261
+    p('hidden');
262
+}
263
+?>">
237 264
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
238 265
 					<?php
239 266
 					switch($_['twitterVerification']) {
@@ -247,13 +274,16 @@  discard block
 block discarded – undo
247 274
 							p(image_path('core', 'actions/verify.svg'));
248 275
 					}
249 276
 					?>"
250
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
277
+					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
278
+    print_unescaped(' class="verify-action"') ?>
251 279
 					>
252 280
 					<div class="verification-dialog popovermenu bubble menu">
253 281
 						<div class="verification-dialog-content">
254 282
 							<p class="explainVerification"></p>
255 283
 							<p class="verificationCode"></p>
256
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
284
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
285
+}
286
+?></p>
257 287
 						</div>
258 288
 					</div>
259 289
 				</div>
@@ -261,7 +291,10 @@  discard block
 block discarded – undo
261 291
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
262 292
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
263 293
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
264
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
294
+					   <?php if(!$_['lookupServerUploadEnabled']) {
295
+    print_unescaped('disabled="1"');
296
+}
297
+?>
265 298
 				/>
266 299
 				<span class="icon-checkmark hidden"></span>
267 300
 				<?php if($_['lookupServerUploadEnabled']) { ?>
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
@@ -165,15 +165,20 @@
 block discarded – undo
165 165
 				<span class="crondate" title="<?php p($absolute_time);?>">
166 166
 				<?php p($l->t("Last job ran %s.", [$relative_time]));?>
167 167
 			</span>
168
-			<?php else: ?>
168
+			<?php else {
169
+    : ?>
169 170
 				<span class="status error"></span>
170
-				<span class="crondate" title="<?php p($absolute_time);?>">
171
+				<span class="crondate" title="<?php p($absolute_time);
172
+}
173
+?>">
171 174
 				<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
172 175
 			</span>
173 176
 			<?php endif;
174
-		else: ?>
177
+		else {
178
+		    : ?>
175 179
 			<span class="status error"></span>
176 180
 			<?php p($l->t("Background job didn’t run yet!"));
181
+		}
177 182
 		endif; ?>
178 183
 	</p>
179 184
 	<a target="_blank" rel="noreferrer" class="icon-info"
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 or email address 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.