Completed
Pull Request — master (#4478)
by Jan-Christoph
36:12 queued 19:11
created
apps/federatedfilesharing/templates/settings-admin.php 1 patch
Braces   +16 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,7 +11,10 @@  discard block
 block discarded – undo
11 11
 		href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
12 12
 	<p>
13 13
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
14
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
14
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
15
+    print_unescaped('checked="checked"');
16
+}
17
+?> />
15 18
 		<label for="outgoingServer2serverShareEnabled">
16 19
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
17 20
 		</label>
@@ -19,21 +22,30 @@  discard block
 block discarded – undo
19 22
 
20 23
 	<p>
21 24
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
22
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
25
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
26
+    print_unescaped('checked="checked"');
27
+}
28
+?> />
23 29
 		<label for="incomingServer2serverShareEnabled">
24 30
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
25 31
 		</label><br/>
26 32
 	</p>
27 33
 	<p>
28 34
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
29
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
35
+			   value="1" <?php if ($_['lookupServerEnabled']) {
36
+    print_unescaped('checked="checked"');
37
+}
38
+?> />
30 39
 		<label for="lookupServerEnabled">
31 40
 			<?php p($l->t('Search global and public address book for users and let local users publish their data'));?>
32 41
 		</label><br/>
33 42
 	</p>
34 43
 	<p>
35 44
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
36
-			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
45
+			   value="1" <?php if ($_['lookupServerUploadEnabled']) {
46
+    print_unescaped('checked="checked"');
47
+}
48
+?> />
37 49
 		<label for="lookupServerUploadEnabled">
38 50
 			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
39 51
 		</label><br/>
Please login to merge, or discard this patch.
apps/sharebymail/templates/settings-admin.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@
 block discarded – undo
11 11
 	<p class="settings-hint"><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></p>
12 12
 
13 13
 	<p>
14
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
14
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if ($_['sendPasswordMail']) p('checked'); ?> />
15 15
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
16
-		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) p('checked'); ?> />
16
+		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if ($_['enforcePasswordProtection']) p('checked'); ?> />
17 17
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
18 18
 	</p>
19 19
 
Please login to merge, or discard this patch.
Braces   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,9 +11,15 @@
 block discarded – undo
11 11
 	<p class="settings-hint"><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></p>
12 12
 
13 13
 	<p>
14
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
14
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) {
15
+    p('checked');
16
+}
17
+?> />
15 18
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
16
-		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) p('checked'); ?> />
19
+		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if($_['enforcePasswordProtection']) {
20
+    p('checked');
21
+}
22
+?> />
17 23
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
18 24
 	</p>
19 25
 
Please login to merge, or discard this patch.
settings/templates/admin/additional-mail.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 
53 53
 <div class="section" id="mail_general_settings">
54 54
 	<form id="mail_general_settings_form" class="mail_settings">
55
-		<h2><?php p($l->t('Email server'));?></h2>
55
+		<h2><?php p($l->t('Email server')); ?></h2>
56 56
 		<a target="_blank" rel="noreferrer" class="icon-info"
57
-		   title="<?php p($l->t('Open documentation'));?>"
57
+		   title="<?php p($l->t('Open documentation')); ?>"
58 58
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
59 59
 		<p class="settings-hint"><?php p($l->t('It is important to setup this server to be able to send emails. This is for example used to send out notification.')); ?></p>
60 60
 		<p><span id="mail_settings_msg" class="msg"></span></p>
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 						$selected = 'selected="selected"';
69 69
 					endif; ?>
70 70
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
71
-				<?php endforeach;?>
71
+				<?php endforeach; ?>
72 72
 			</select>
73 73
 
74 74
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 						$selected = 'selected="selected"';
84 84
 					endif; ?>
85 85
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
86
-				<?php endforeach;?>
86
+				<?php endforeach; ?>
87 87
 			</select>
88 88
 		</p>
89 89
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 						$selected = 'selected="selected"';
105 105
 					endif; ?>
106 106
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
107
-				<?php endforeach;?>
107
+				<?php endforeach; ?>
108 108
 			</select>
109 109
 
110 110
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
Please login to merge, or discard this patch.
settings/templates/admin/sharing.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -27,81 +27,81 @@
 block discarded – undo
27 27
 ?>
28 28
 
29 29
 <div class="section" id="shareAPI">
30
-	<h2><?php p($l->t('Sharing'));?></h2>
30
+	<h2><?php p($l->t('Sharing')); ?></h2>
31 31
 	<a target="_blank" rel="noreferrer" class="icon-info"
32
-	   title="<?php p($l->t('Open documentation'));?>"
32
+	   title="<?php p($l->t('Open documentation')); ?>"
33 33
 	   href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
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>
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 37
 			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
38
-		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
38
+		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API')); ?></label><br/>
39 39
 	</p>
40
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
40
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
41 41
 		<input type="checkbox" name="shareapi_allow_links" id="allowLinks" class="checkbox"
42 42
 			   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
43
-		<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
43
+		<label for="allowLinks"><?php p($l->t('Allow users to share via link')); ?></label><br/>
44 44
 	</p>
45 45
 
46 46
 	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
47 47
 		<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox"
48 48
 			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
49
-		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
49
+		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads')); ?></label><br/>
50 50
 		<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
51 51
 			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') print_unescaped('checked="checked"'); ?> />
52
-		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
52
+		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password')); ?></label><br/>
53 53
 		<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
54 54
 			   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
55
-		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
55
+		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection')); ?></label><br/>
56 56
 
57 57
 		<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
58 58
 			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
59
-		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
59
+		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date')); ?></label><br/>
60 60
 
61 61
 	</p>
62
-	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
63
-		<?php p($l->t( 'Expire after ' )); ?>
62
+	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
63
+		<?php p($l->t('Expire after ')); ?>
64 64
 		<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
65 65
 			   value='<?php p($_['shareExpireAfterNDays']) ?>' />
66
-		<?php p($l->t( 'days' )); ?>
66
+		<?php p($l->t('days')); ?>
67 67
 		<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
68 68
 			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
69
-		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
69
+		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date')); ?></label><br/>
70 70
 	</p>
71
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
71
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
72 72
 		<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" class="checkbox"
73 73
 			   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
74
-		<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
74
+		<label for="allowResharing"><?php p($l->t('Allow resharing')); ?></label><br/>
75 75
 	</p>
76
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
76
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
77 77
 		<input type="checkbox" name="shareapi_allow_group_sharing" id="allowGroupSharing" class="checkbox"
78 78
 			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
79
-		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
79
+		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups')); ?></label><br />
80 80
 	</p>
81
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
81
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
82 82
 		<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox"
83 83
 			   value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
84
-		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
84
+		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups')); ?></label><br/>
85 85
 	</p>
86
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
86
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
87 87
 		<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" class="checkbox"
88 88
 			   value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
89
-		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
89
+		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing')); ?></label><br/>
90 90
 	</p>
91 91
 	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
92 92
 		<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
93 93
 		<br />
94 94
 		<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
95 95
 	</p>
96
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
96
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
97 97
 		<input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration" class="checkbox"
98 98
 			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> />
99
-		<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 />
99
+		<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 100
 	</p>
101 101
 	<p>
102 102
 		<input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"
103 103
 			<?php if ($_['publicShareDisclaimerText'] !== null) print_unescaped('checked="checked"'); ?> />
104
-		<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>
104
+		<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 105
 		<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
106 106
 		<br/>
107 107
 		<textarea placeholder="<?php p($l->t('This text will be shown on the public link upload page when the file list is hidden.')) ?>" id="publicShareDisclaimerText" <?php if ($_['publicShareDisclaimerText'] === null) { print_unescaped('class="hidden"'); } ?>><?php p($_['publicShareDisclaimerText']) ?></textarea>
Please login to merge, or discard this 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/admin/encryption.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 <div class="section" id='encryptionAPI'>
30 30
 	<h2><?php p($l->t('Server-side encryption')); ?></h2>
31 31
 	<a target="_blank" rel="noreferrer" class="icon-info"
32
-	   title="<?php p($l->t('Open documentation'));?>"
32
+	   title="<?php p($l->t('Open documentation')); ?>"
33 33
 	   href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
34 34
 	<p class="settings-hint"><?php p($l->t('Server-side encryption makes is possible to encrypt files that are uploaded to this server. This comes with limitation like a performance penalty. Enable only if needed.')); ?></p>
35 35
 	<p id="enable">
Please login to merge, or discard this patch.
settings/templates/admin/server.php 2 patches
Indentation   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -31,101 +31,101 @@  discard block
 block discarded – undo
31 31
 	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.'));?></p>
32 32
 	<ul>
33 33
 		<?php
34
-		// is php setup properly to query system environment variables like getenv('PATH')
35
-		if ($_['getenvServerNotWorking']) {
36
-			?>
34
+        // is php setup properly to query system environment variables like getenv('PATH')
35
+        if ($_['getenvServerNotWorking']) {
36
+            ?>
37 37
 			<li>
38 38
 				<?php p($l->t('php does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
39 39
 				<?php print_unescaped($l->t('Please check the <a target="_blank" rel="noreferrer" href="%s">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
40 40
 			</li>
41 41
 			<?php
42
-		}
42
+        }
43 43
 
44
-		// is read only config enabled
45
-		if ($_['readOnlyConfigEnabled']) {
46
-			?>
44
+        // is read only config enabled
45
+        if ($_['readOnlyConfigEnabled']) {
46
+            ?>
47 47
 			<li>
48 48
 				<?php p($l->t('The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.')); ?>
49 49
 			</li>
50 50
 			<?php
51
-		}
51
+        }
52 52
 
53
-		// Are doc blocks accessible?
54
-		if (!$_['isAnnotationsWorking']) {
55
-			?>
53
+        // Are doc blocks accessible?
54
+        if (!$_['isAnnotationsWorking']) {
55
+            ?>
56 56
 			<li>
57 57
 				<?php p($l->t('PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.')); ?><br>
58 58
 				<?php p($l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')); ?>
59 59
 			</li>
60 60
 			<?php
61
-		}
61
+        }
62 62
 
63
-		// Is the Transaction isolation level READ_COMMITTED?
64
-		if ($_['invalidTransactionIsolationLevel']) {
65
-			?>
63
+        // Is the Transaction isolation level READ_COMMITTED?
64
+        if ($_['invalidTransactionIsolationLevel']) {
65
+            ?>
66 66
 			<li>
67 67
 				<?php p($l->t('Your database does not run with "READ COMMITTED" transaction isolation level. This can cause problems when multiple actions are executed in parallel.')); ?>
68 68
 			</li>
69 69
 			<?php
70
-		}
70
+        }
71 71
 
72
-		// Warning if memcache is outdated
73
-		foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
74
-			?>
72
+        // Warning if memcache is outdated
73
+        foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
74
+            ?>
75 75
 			<li>
76 76
 				<?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.', $data)); ?>
77 77
 			</li>
78 78
 			<?php
79
-		}
79
+        }
80 80
 
81
-		// if module fileinfo available?
82
-		if (!$_['has_fileinfo']) {
83
-			?>
81
+        // if module fileinfo available?
82
+        if (!$_['has_fileinfo']) {
83
+            ?>
84 84
 			<li>
85 85
 				<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with MIME type detection.')); ?>
86 86
 			</li>
87 87
 			<?php
88
-		}
88
+        }
89 89
 
90
-		// locking configured optimally?
91
-		if ($_['fileLockingType'] === 'none') {
92
-			?>
90
+        // locking configured optimally?
91
+        if ($_['fileLockingType'] === 'none') {
92
+            ?>
93 93
 			<li>
94 94
 				<?php print_unescaped($l->t('Transactional file locking is disabled, this might lead to issues with race conditions. Enable \'filelocking.enabled\' in config.php to avoid these problems. See the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a> for more information.', link_to_docs('admin-transactional-locking'))); ?>
95 95
 			</li>
96 96
 			<?php
97
-		}
97
+        }
98 98
 
99
-		// is locale working ?
100
-		if (!$_['isLocaleWorking']) {
101
-			?>
99
+        // is locale working ?
100
+        if (!$_['isLocaleWorking']) {
101
+            ?>
102 102
 			<li>
103 103
 				<?php
104
-				$locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8';
105
-				p($l->t('System locale can not be set to a one which supports UTF-8.'));
106
-				?>
104
+                $locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8';
105
+                p($l->t('System locale can not be set to a one which supports UTF-8.'));
106
+                ?>
107 107
 				<br>
108 108
 				<?php
109
-				p($l->t('This means that there might be problems with certain characters in file names.'));
110
-				?>
109
+                p($l->t('This means that there might be problems with certain characters in file names.'));
110
+                ?>
111 111
 				<br>
112 112
 				<?php
113
-				p($l->t('We strongly suggest installing the required packages on your system to support one of the following locales: %s.', [$locales]));
114
-				?>
113
+                p($l->t('We strongly suggest installing the required packages on your system to support one of the following locales: %s.', [$locales]));
114
+                ?>
115 115
 			</li>
116 116
 			<?php
117
-		}
117
+        }
118 118
 
119
-		if ($_['suggestedOverwriteCliUrl']) {
120
-			?>
119
+        if ($_['suggestedOverwriteCliUrl']) {
120
+            ?>
121 121
 			<li>
122 122
 				<?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?>
123 123
 			</li>
124 124
 			<?php
125
-		}
125
+        }
126 126
 
127
-		if ($_['cronErrors']) {
128
-			?>
127
+        if ($_['cronErrors']) {
128
+            ?>
129 129
 			<li>
130 130
 				<?php p($l->t('It was not possible to execute the cronjob via CLI. The following technical errors have appeared:')); ?>
131 131
 				<br>
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 				</ol>
137 137
 			</li>
138 138
 			<?php
139
-		}
140
-		?>
139
+        }
140
+        ?>
141 141
 	</ul>
142 142
 
143 143
 	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
 	<?php if ($_['cron_log']): ?>
160 160
 		<p class="cronlog inlineblock">
161 161
 			<?php if ($_['lastcron'] !== false):
162
-				$relative_time = relative_modified_date($_['lastcron']);
163
-				$absolute_time = OC_Util::formatDate($_['lastcron']);
164
-				if (time() - $_['lastcron'] <= 3600): ?>
162
+                $relative_time = relative_modified_date($_['lastcron']);
163
+                $absolute_time = OC_Util::formatDate($_['lastcron']);
164
+                if (time() - $_['lastcron'] <= 3600): ?>
165 165
 					<span class="status success"></span>
166 166
 					<span class="crondate" title="<?php p($absolute_time);?>">
167 167
 					<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
@@ -172,10 +172,10 @@  discard block
 block discarded – undo
172 172
 					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
173 173
 				</span>
174 174
 				<?php endif;
175
-			else: ?>
175
+            else: ?>
176 176
 				<span class="status error"></span>
177 177
 				<?php p($l->t("Cron was not executed yet!"));
178
-			endif; ?>
178
+            endif; ?>
179 179
 		</p>
180 180
 	<?php endif; ?>
181 181
 	<a target="_blank" rel="noreferrer" class="icon-info"
@@ -186,38 +186,38 @@  discard block
 block discarded – undo
186 186
 	<p>
187 187
 		<input type="radio" name="mode" value="ajax" class="radio"
188 188
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
189
-			print_unescaped('checked="checked"');
190
-		} ?>>
189
+            print_unescaped('checked="checked"');
190
+        } ?>>
191 191
 		<label for="backgroundjobs_ajax">AJAX</label><br/>
192 192
 		<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
193 193
 	</p>
194 194
 	<p>
195 195
 		<input type="radio" name="mode" value="webcron" class="radio"
196 196
 			   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
197
-			print_unescaped('checked="checked"');
198
-		} ?>>
197
+            print_unescaped('checked="checked"');
198
+        } ?>>
199 199
 		<label for="backgroundjobs_webcron">Webcron</label><br/>
200 200
 		<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over http.")); ?></em>
201 201
 	</p>
202 202
 	<p>
203 203
 		<input type="radio" name="mode" value="cron" class="radio"
204 204
 			   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
205
-			print_unescaped('checked="checked"');
206
-		}
207
-		if (!$_['cli_based_cron_possible']) {
208
-			print_unescaped('disabled');
209
-		}?>>
205
+            print_unescaped('checked="checked"');
206
+        }
207
+        if (!$_['cli_based_cron_possible']) {
208
+            print_unescaped('disabled');
209
+        }?>>
210 210
 		<label for="backgroundjobs_cron">Cron</label><br/>
211 211
 		<em><?php p($l->t("Use system's cron service to call the cron.php file every 15 minutes.")); ?>
212 212
 			<?php if($_['cli_based_cron_possible']) {
213
-				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
214
-			} else {
215
-				print_unescaped(str_replace(
216
-					['{linkstart}', '{linkend}'],
217
-					['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
218
-					$l->t('To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details.')
219
-				));
220
-		} ?></em>
213
+                p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
214
+            } else {
215
+                print_unescaped(str_replace(
216
+                    ['{linkstart}', '{linkend}'],
217
+                    ['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
218
+                    $l->t('To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details.')
219
+                ));
220
+        } ?></em>
221 221
 
222 222
 	</p>
223 223
 </div>
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 ?>
28 28
 
29 29
 <div id="security-warning" class="section">
30
-	<h2><?php p($l->t('Security & setup warnings'));?></h2>
31
-	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.'));?></p>
30
+	<h2><?php p($l->t('Security & setup warnings')); ?></h2>
31
+	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.')); ?></p>
32 32
 	<ul>
33 33
 		<?php
34 34
 		// is php setup properly to query system environment variables like getenv('PATH')
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 				<?php p($l->t('It was not possible to execute the cronjob via CLI. The following technical errors have appeared:')); ?>
131 131
 				<br>
132 132
 				<ol>
133
-					<?php foreach(json_decode($_['cronErrors']) as $error) { if(isset($error->error)) {?>
133
+					<?php foreach (json_decode($_['cronErrors']) as $error) { if (isset($error->error)) {?>
134 134
 						<li><?php p($error->error) ?> <?php p($error->hint) ?></li>
135 135
 					<?php }};?>
136 136
 				</ol>
@@ -140,22 +140,22 @@  discard block
 block discarded – undo
140 140
 		?>
141 141
 	</ul>
142 142
 
143
-	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
143
+	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
144 144
 		<div class="loading"></div>
145 145
 		<ul class="errors hidden"></ul>
146 146
 		<ul class="warnings hidden"></ul>
147 147
 		<ul class="info hidden"></ul>
148 148
 		<p class="hint hidden">
149
-			<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?>
149
+			<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?>
150 150
 		</p>
151 151
 	</div>
152 152
 	<div id="security-warning-state">
153
-		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.'));?></span>
153
+		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.')); ?></span>
154 154
 	</div>
155 155
 </div>
156 156
 
157 157
 <div class="section" id="backgroundjobs">
158
-	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
158
+	<h2 class="inlineblock"><?php p($l->t('Cron')); ?></h2>
159 159
 	<?php if ($_['cron_log']): ?>
160 160
 		<p class="cronlog inlineblock">
161 161
 			<?php if ($_['lastcron'] !== false):
@@ -163,13 +163,13 @@  discard block
 block discarded – undo
163 163
 				$absolute_time = OC_Util::formatDate($_['lastcron']);
164 164
 				if (time() - $_['lastcron'] <= 3600): ?>
165 165
 					<span class="status success"></span>
166
-					<span class="crondate" title="<?php p($absolute_time);?>">
167
-					<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
166
+					<span class="crondate" title="<?php p($absolute_time); ?>">
167
+					<?php p($l->t("Last cron job execution: %s.", [$relative_time])); ?>
168 168
 				</span>
169 169
 				<?php else: ?>
170 170
 					<span class="status error"></span>
171
-					<span class="crondate" title="<?php p($absolute_time);?>">
172
-					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
171
+					<span class="crondate" title="<?php p($absolute_time); ?>">
172
+					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time])); ?>
173 173
 				</span>
174 174
 				<?php endif;
175 175
 			else: ?>
@@ -179,10 +179,10 @@  discard block
 block discarded – undo
179 179
 		</p>
180 180
 	<?php endif; ?>
181 181
 	<a target="_blank" rel="noreferrer" class="icon-info"
182
-	   title="<?php p($l->t('Open documentation'));?>"
182
+	   title="<?php p($l->t('Open documentation')); ?>"
183 183
 	   href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
184 184
 
185
-	<p class="settings-hint"><?php p($l->t('For the optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
185
+	<p class="settings-hint"><?php p($l->t('For the optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.')); ?></p>
186 186
 	<p>
187 187
 		<input type="radio" name="mode" value="ajax" class="radio"
188 188
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 		}?>>
210 210
 		<label for="backgroundjobs_cron">Cron</label><br/>
211 211
 		<em><?php p($l->t("Use system's cron service to call the cron.php file every 15 minutes.")); ?>
212
-			<?php if($_['cli_based_cron_possible']) {
212
+			<?php if ($_['cli_based_cron_possible']) {
213 213
 				p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
214 214
 			} else {
215 215
 				print_unescaped(str_replace(
@@ -224,6 +224,6 @@  discard block
 block discarded – undo
224 224
 
225 225
 <div class="section">
226 226
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
227
-	<h2><?php p($l->t('Version'));?></h2>
227
+	<h2><?php p($l->t('Version')); ?></h2>
228 228
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
229 229
 </div>
Please login to merge, or discard this patch.
settings/templates/admin/tipstricks.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@
 block discarded – undo
31 31
 	<p class="settings-hint"><?php p($l->t('There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information.')); ?></p>
32 32
 	<ul>
33 33
 		<?php
34
-		// SQLite database performance issue
35
-		if ($_['databaseOverload']) {
36
-			?>
34
+        // SQLite database performance issue
35
+        if ($_['databaseOverload']) {
36
+            ?>
37 37
 			<li>
38 38
 				<?php p($l->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend.')); ?><br>
39 39
 				<?php p($l->t('This is particularly recommended when using the desktop client for file synchronisation.')); ?><br>
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 ?>
28 28
 
29 29
 <div class="section" id="admin-tips">
30
-	<h2><?php p($l->t('Tips & tricks'));?></h2>
30
+	<h2><?php p($l->t('Tips & tricks')); ?></h2>
31 31
 	<p class="settings-hint"><?php p($l->t('There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information.')); ?></p>
32 32
 	<ul>
33 33
 		<?php
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
 			<li>
38 38
 				<?php p($l->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend.')); ?><br>
39 39
 				<?php p($l->t('This is particularly recommended when using the desktop client for file synchronisation.')); ?><br>
40
-				<?php print_unescaped($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\', or see the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a>.', link_to_docs('admin-db-conversion') )); ?>
40
+				<?php print_unescaped($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\', or see the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a>.', link_to_docs('admin-db-conversion'))); ?>
41 41
 			</li>
42 42
 		<?php } ?>
43
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-backup')); ?>"><?php p($l->t('How to do backups'));?> ↗</a></li>
44
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-monitoring')); ?>"><?php p($l->t('Advanced monitoring'));?> ↗</a></li>
45
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-performance')); ?>"><?php p($l->t('Performance tuning'));?> ↗</a></li>
46
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-config')); ?>"><?php p($l->t('Improving the config.php'));?> ↗</a></li>
47
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('developer-theming')); ?>"><?php p($l->t('Theming'));?> ↗</a></li>
48
-		<li><a target="_blank" rel="noreferrer" href="https://scan.nextcloud.com"><?php p($l->t('Check the security of your Nextcloud over our security scan'));?> ↗</a></li>
49
-		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-security')); ?>"><?php p($l->t('Hardening and security guidance'));?> ↗</a></li>
43
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-backup')); ?>"><?php p($l->t('How to do backups')); ?> ↗</a></li>
44
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-monitoring')); ?>"><?php p($l->t('Advanced monitoring')); ?> ↗</a></li>
45
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-performance')); ?>"><?php p($l->t('Performance tuning')); ?> ↗</a></li>
46
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-config')); ?>"><?php p($l->t('Improving the config.php')); ?> ↗</a></li>
47
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('developer-theming')); ?>"><?php p($l->t('Theming')); ?> ↗</a></li>
48
+		<li><a target="_blank" rel="noreferrer" href="https://scan.nextcloud.com"><?php p($l->t('Check the security of your Nextcloud over our security scan')); ?> ↗</a></li>
49
+		<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-security')); ?>"><?php p($l->t('Hardening and security guidance')); ?> ↗</a></li>
50 50
 	</ul>
51 51
 </div>
Please login to merge, or discard this patch.
apps/federation/templates/settings-admin.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,19 +11,19 @@
 block discarded – undo
11 11
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
12 12
 
13 13
 	<p>
14
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
14
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if ($_['autoAddServers']) p('checked'); ?> />
15 15
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
16 16
 	</p>
17 17
 
18 18
 	<ul id="listOfTrustedServers">
19
-		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
19
+		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>
20 20
 			<li id="<?php p($trustedServer['id']); ?>">
21
-				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
21
+				<?php if ((int) $trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
22 22
 					<span class="status success"></span>
23 23
 				<?php
24
-				} elseif(
25
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
26
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
24
+				} elseif (
25
+					(int) $trustedServer['status'] === TrustedServers::STATUS_PENDING ||
26
+					(int) $trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
27 27
 				) { ?>
28 28
 					<span class="status indeterminate"></span>
29 29
 				<?php } else {?>
Please login to merge, or discard this patch.
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,10 @@
 block discarded – undo
11 11
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
12 12
 
13 13
 	<p>
14
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
14
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) {
15
+    p('checked');
16
+}
17
+?> />
15 18
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
16 19
 	</p>
17 20
 
Please login to merge, or discard this patch.