Completed
Pull Request — master (#8565)
by Joas
105:07 queued 85:11
created
core/search/ajax/search.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,6 @@
 block discarded – undo
56 56
 if($query) {
57 57
 	$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
58 58
 	OC_JSON::encodedPrint($result);
59
-}
60
-else {
59
+} else {
61 60
 	echo 'false';
62 61
 }
Please login to merge, or discard this patch.
core/Command/Config/System/DeleteConfig.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,7 @@
 block discarded – undo
74 74
 
75 75
 			try {
76 76
 				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
77
-			}
78
-			catch (\UnexpectedValueException $e) {
77
+			} catch (\UnexpectedValueException $e) {
79 78
 				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
80 79
 				return 1;
81 80
 			}
Please login to merge, or discard this patch.
settings/templates/users/part.setquota.php 1 patch
Braces   +13 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,12 +3,18 @@  discard block
 block discarded – undo
3 3
 	<span><?php p($l->t('Default quota'));?></span>
4 4
 	<?php if((bool) $_['isAdmin']): ?>
5 5
 		<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
6
-			<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
6
+			<option <?php if($_['default_quota'] === 'none') {
7
+    print_unescaped('selected="selected"');
8
+}
9
+?> value='none'>
7 10
 				<?php p($l->t('Unlimited'));?>
8 11
 			</option>
9 12
 			<?php foreach($_['quota_preset'] as $preset):?>
10 13
 				<?php if($preset !== 'default'):?>
11
-					<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
14
+					<option <?php if($_['default_quota']==$preset) {
15
+    print_unescaped('selected="selected"');
16
+}
17
+?> value='<?php p($preset);?>'>
12 18
 						<?php p($preset);?>
13 19
 					</option>
14 20
 				<?php endif;?>
@@ -28,8 +34,11 @@  discard block
 block discarded – undo
28 34
 		:
29 35
 		<?php if( $_['default_quota'] === 'none'): ?>
30 36
 			<?php p($l->t('Unlimited'));?>
31
-		<?php else: ?>
32
-			<?php p($_['default_quota']);?>
37
+		<?php else {
38
+    : ?>
39
+			<?php p($_['default_quota']);
40
+}
41
+?>
33 42
 		<?php endif; ?>
34 43
 	<?php endif; ?>
35 44
 </div>
Please login to merge, or discard this patch.
settings/templates/certificates.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,11 @@
 block discarded – undo
23 23
 					<?php p($rootCert->getIssuerName()) ?>
24 24
 				</td>
25 25
 				<td <?php if ($rootCert != ''): ?>class="remove"
26
-					<?php else: ?>style="visibility:hidden;"
27
-					<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
26
+					<?php else {
27
+    : ?>style="visibility:hidden;"
28
+					<?php endif;
29
+}
30
+?>><img alt="<?php p($l->t('Delete')); ?>"
28 31
 										 title="<?php p($l->t('Delete')); ?>"
29 32
 										 class="action"
30 33
 										 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>
Please login to merge, or discard this patch.
settings/ajax/setquota.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
 // Return Success story
67 67
 if($username) {
68 68
 	$targetUserObject->setQuota($quota);
69
-}else{//set the default quota when no username is specified
69
+} else{//set the default quota when no username is specified
70 70
 	if($quota === 'default') {//'default' as default quota makes no sense
71 71
 		$quota='none';
72 72
 	}
Please login to merge, or discard this patch.
settings/users.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
 		];
83 83
 	}
84 84
 	$subAdmins = $result;
85
-}else{
85
+} else{
86 86
 	/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
87 87
 	$gids = array();
88 88
 	foreach($groups as $group) {
Please login to merge, or discard this patch.
settings/help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
40 40
 	$style1='';
41 41
 	$style2=' active';
42
-}else{
42
+} else{
43 43
 	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
44 44
 	$style1=' active';
45 45
 	$style2='';
Please login to merge, or discard this patch.
core/templates/twofactorshowchallenge.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,11 @@
 block discarded – undo
16 16
 	<?php if ($error): ?>
17 17
 			<?php if($error_message): ?>
18 18
 				<p><strong><?php p($error_message); ?></strong></p>
19
-			<?php else: ?>
20
-				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
19
+			<?php else {
20
+    : ?>
21
+				<p><strong><?php p($l->t('Error while validating your second factor'));
22
+}
23
+?></strong></p>
21 24
 			<?php endif; ?>
22 25
 	<?php endif; ?>
23 26
 	<?php print_unescaped($template); ?>
Please login to merge, or discard this patch.
settings/templates/users/main.php 1 patch
Braces   +20 added lines, -5 removed lines patch added patch discarded remove patch
@@ -46,35 +46,50 @@
 block discarded – undo
46 46
 			<div id="userlistoptions">
47 47
 				<p>
48 48
 					<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation"
49
-						class="checkbox" <?php if ($_['show_storage_location'] === 'true') print_unescaped('checked="checked"'); ?> />
49
+						class="checkbox" <?php if ($_['show_storage_location'] === 'true') {
50
+    print_unescaped('checked="checked"');
51
+}
52
+?> />
50 53
 					<label for="CheckboxStorageLocation">
51 54
 						<?php p($l->t('Show storage location')) ?>
52 55
 					</label>
53 56
 				</p>
54 57
 				<p>
55 58
 					<input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend"
56
-						class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> />
59
+						class="checkbox" <?php if ($_['show_backend'] === 'true') {
60
+    print_unescaped('checked="checked"');
61
+}
62
+?> />
57 63
 					<label for="CheckboxUserBackend">
58 64
 						<?php p($l->t('Show user backend')) ?>
59 65
 					</label>
60 66
 				</p>
61 67
 				<p>
62 68
 					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin"
63
-						class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> />
69
+						class="checkbox" <?php if ($_['show_last_login'] === 'true') {
70
+    print_unescaped('checked="checked"');
71
+}
72
+?> />
64 73
 					<label for="CheckboxLastLogin">
65 74
 						<?php p($l->t('Show last login')) ?>
66 75
 					</label>
67 76
 				</p>
68 77
 				<p>
69 78
 					<input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress"
70
-						class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> />
79
+						class="checkbox" <?php if ($_['show_email'] === 'true') {
80
+    print_unescaped('checked="checked"');
81
+}
82
+?> />
71 83
 					<label for="CheckboxEmailAddress">
72 84
 						<?php p($l->t('Show email address')) ?>
73 85
 					</label>
74 86
 				</p>
75 87
 				<p>
76 88
 					<input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate"
77
-						class="checkbox" <?php if ($_['send_email'] === 'true') print_unescaped('checked="checked"'); ?> />
89
+						class="checkbox" <?php if ($_['send_email'] === 'true') {
90
+    print_unescaped('checked="checked"');
91
+}
92
+?> />
78 93
 					<label for="CheckboxMailOnUserCreate">
79 94
 						<?php p($l->t('Send email to new user')) ?>
80 95
 					</label>
Please login to merge, or discard this patch.