Completed
Pull Request — master (#10069)
by
unknown
18:05
created
lib/private/DB/MDB2SchemaWriter.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,8 +116,7 @@  discard block
 block discarded – undo
116 116
 				$length = '4';
117 117
 				if ($column->getType() == 'SmallInt') {
118 118
 					$length = '2';
119
-				}
120
-				elseif ($column->getType() == 'BigInt') {
119
+				} elseif ($column->getType() == 'BigInt') {
121 120
 					$length = '8';
122 121
 				}
123 122
 				$xml->addChild('length', $length);
@@ -165,8 +164,7 @@  discard block
 block discarded – undo
165 164
 		$xml->addChild('name', $index->getName());
166 165
 		if ($index->isPrimary()) {
167 166
 			$xml->addChild('primary', 'true');
168
-		}
169
-		elseif ($index->isUnique()) {
167
+		} elseif ($index->isUnique()) {
170 168
 			$xml->addChild('unique', 'true');
171 169
 		}
172 170
 		foreach($index->getColumns() as $column) {
Please login to merge, or discard this patch.
lib/private/NaturalSort.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,7 @@
 block discarded – undo
88 88
 			// German umlauts, so using en_US instead
89 89
 			if (class_exists('Collator')) {
90 90
 				$this->collator = new \Collator('en_US');
91
-			}
92
-			else {
91
+			} else {
93 92
 				$this->collator = new \OC\NaturalSort_DefaultCollator();
94 93
 			}
95 94
 		}
Please login to merge, or discard this patch.
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/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/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/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.