nextcloud / server

lib/private/NaturalSort.php

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 			// German umlauts, so using en_US instead
 			if (class_exists('Collator')) {
 				$this->collator = new \Collator('en_US');
-			}
-			else {
+			} else {
 				$this->collator = new \OC\NaturalSort_DefaultCollator();
 			}
 		}

lib/private/Group/Database.php

Braces +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 				->setValue('gid', $qb->createNamedParameter($gid))
 				->execute();
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

core/templates/installation.php

Braces +16 added lines, -6 removed lines

@@ -18,8 +18,11 @@ 
 			<?php if(is_array($err)):?>
 				<?php print_unescaped($err['error']); ?>
 				<span class='hint'><?php print_unescaped($err['hint']); ?></span>
-			<?php else: ?>
-				<?php print_unescaped($err); ?>
+			<?php else {
+    : ?>
+				<?php print_unescaped($err);
+}
+?>
 			<?php endif; ?>
 		</p>
 		<?php endforeach; ?>
@@ -75,8 +78,12 @@ 
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) {
+			$hasOtherDB = true;
+} else {
+			    $hasOtherDB =false;
+			}
+			//other than SQLite ?>
 		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
 		<div id="selectDbType">
 		<?php foreach($_['databases'] as $type => $label): ?>
@@ -88,11 +95,14 @@ 
 				<?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a>
 		</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
-		<?php else: ?>
+		<?php else {
+    : ?>
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
 			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
 		<label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php endforeach; ?>
 		</div>
 	</fieldset>

core/templates/404.php

Braces +5 added lines, -2 removed lines

@@ -14,10 +14,13 @@
 ?>
 <?php if (isset($_['content'])): ?>
 	<?php print_unescaped($_['content']) ?>
-<?php else: ?>
+<?php else {
+    : ?>
 	<ul>
 		<li class="error">
-			<?php p($l->t('File not found')); ?><br>
+			<?php p($l->t('File not found'));
+}
+?><br>
 			<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
 			<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>
 		</li>

core/templates/twofactorshowchallenge.php

Braces +5 added lines, -2 removed lines

@@ -16,8 +16,11 @@
 		<?php if ($error): ?>
 			<?php if($error_message): ?>
 				<p><strong><?php p($error_message); ?></strong></p>
-			<?php else: ?>
-				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
+			<?php else {
+    : ?>
+				<p><strong><?php p($l->t('Error while validating your second factor'));
+}
+?></strong></p>
 			<?php endif; ?>
 		<?php endif; ?>
 		<?php print_unescaped($template); ?>

core/search/ajax/search.php

Braces +1 added lines, -2 removed lines

@@ -56,7 +56,6 @@
 if($query) {
 	$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
 	OC_JSON::encodedPrint($result);
-}
-else {
+} else {
 	echo 'false';
 }

core/Command/Config/System/DeleteConfig.php

Braces +1 added lines, -2 removed lines

@@ -74,8 +74,7 @@
 
 			try {
 				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
 				return 1;
 			}

settings/templates/admin/server.php

Braces +8 added lines, -3 removed lines

@@ -165,15 +165,20 @@
 					<span class="crondate" title="<?php p($absolute_time);?>">
 					<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
 				</span>
-				<?php else: ?>
+				<?php else {
+    : ?>
 					<span class="status error"></span>
-					<span class="crondate" title="<?php p($absolute_time);?>">
+					<span class="crondate" title="<?php p($absolute_time);
+}
+?>">
 					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
 				</span>
 				<?php endif;
-			else: ?>
+			else {
+			    : ?>
 				<span class="status error"></span>
 				<?php p($l->t("Cron was not executed yet!"));
+			}
 			endif; ?>
 		</p>
 	<?php endif; ?>

settings/templates/admin/additional-mail.php

Braces +24 added lines, -6 removed lines

@@ -72,11 +72,17 @@ 
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
-				<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php p($l->t( 'Encryption' )); ?>
 			</label>
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
-				<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
 					$selected = '';
 					if ($secure == $_['mail_smtpsecure']):
@@ -95,7 +101,10 @@ 
 				   value='<?php p($_['mail_domain']) ?>' />
 		</p>
 
-		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpauthtype"><?php p($l->t( 'Authentication method' )); ?></label>
 			<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
@@ -108,11 +117,17 @@ 
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
-				<?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
+				<?php if ($_['mail_smtpauth']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
 		</p>
 
-		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
 			<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com"
 				   value='<?php p($_['mail_smtphost']) ?>' />
@@ -122,7 +137,10 @@ 
 		</p>
 	</form>
 	<form class="mail_settings" id="mail_credentials_settings">
-		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label>
 			<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
 				   value='<?php p($_['mail_smtpname']) ?>' />