Completed
Pull Request — master (#4304)
by Lukas
12:54 queued 01:14
created
lib/private/Group/Database.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
 				->setValue('gid', $qb->createNamedParameter($gid))
169 169
 				->execute();
170 170
 			return true;
171
-		}else{
171
+		} else{
172 172
 			return false;
173 173
 		}
174 174
 	}
Please login to merge, or discard this patch.
core/templates/installation.php 1 patch
Braces   +16 added lines, -6 removed lines patch added patch discarded remove patch
@@ -18,8 +18,11 @@  discard block
 block discarded – undo
18 18
 			<?php if(is_array($err)):?>
19 19
 				<?php print_unescaped($err['error']); ?>
20 20
 				<span class='hint'><?php print_unescaped($err['hint']); ?></span>
21
-			<?php else: ?>
22
-				<?php print_unescaped($err); ?>
21
+			<?php else {
22
+    : ?>
23
+				<?php print_unescaped($err);
24
+}
25
+?>
23 26
 			<?php endif; ?>
24 27
 		</p>
25 28
 		<?php endforeach; ?>
@@ -75,8 +78,12 @@  discard block
 block discarded – undo
75 78
 
76 79
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
77 80
 	<fieldset id='databaseBackend'>
78
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
79
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
81
+		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) {
82
+			$hasOtherDB = true;
83
+} else {
84
+			    $hasOtherDB =false;
85
+			}
86
+			//other than SQLite ?>
80 87
 		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
81 88
 		<div id="selectDbType">
82 89
 		<?php foreach($_['databases'] as $type => $label): ?>
@@ -88,11 +95,14 @@  discard block
 block discarded – undo
88 95
 				<?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a>
89 96
 		</p>
90 97
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
91
-		<?php else: ?>
98
+		<?php else {
99
+    : ?>
92 100
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
93 101
 			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
94 102
 		<label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label>
95
-		<?php endif; ?>
103
+		<?php endif;
104
+}
105
+?>
96 106
 		<?php endforeach; ?>
97 107
 		</div>
98 108
 	</fieldset>
Please login to merge, or discard this patch.
core/templates/404.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,10 +14,13 @@
 block discarded – undo
14 14
 ?>
15 15
 <?php if (isset($_['content'])): ?>
16 16
 	<?php print_unescaped($_['content']) ?>
17
-<?php else: ?>
17
+<?php else {
18
+    : ?>
18 19
 	<ul>
19 20
 		<li class="error">
20
-			<?php p($l->t('File not found')); ?><br>
21
+			<?php p($l->t('File not found'));
22
+}
23
+?><br>
21 24
 			<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
22 25
 			<p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p>
23 26
 		</li>
Please login to merge, or discard this patch.
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/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 cron job execution: %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 cron job execution: %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("Cron was not executed yet!"));
181
+			}
177 182
 			endif; ?>
178 183
 		</p>
179 184
 	<?php endif; ?>
Please login to merge, or discard this patch.
settings/templates/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/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.
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.