nextcloud / server

lib/base.php

Braces +1 added lines, -2 removed lines

@@ -864,8 +864,7 @@
 				$restrictions = array_values($restrictions);
 				if (empty($restrictions)) {
 					$appManager->disableApp($appId);
-				}
-				else{
+				} else{
 					$appManager->enableAppForGroups($appId, $restrictions);
 				}
 

apps/settings/templates/certificates.php

Braces +5 added lines, -2 removed lines

@@ -23,8 +23,11 @@
 					<?php p($rootCert->getIssuerName()) ?>
 				</td>
 				<td <?php if ($rootCert != ''): ?>class="remove"
-					<?php else: ?>style="visibility:hidden;"
-					<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
+					<?php else {
+    : ?>style="visibility:hidden;"
+					<?php endif;
+}
+?>><img alt="<?php p($l->t('Delete')); ?>"
 										 title="<?php p($l->t('Delete')); ?>"
 										 class="action"
 										 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>

apps/settings/templates/settings/personal/personal.info.php

Braces +48 added lines, -15 removed lines

@@ -57,8 +57,11 @@ 
 						<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 						<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 						<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
-					<?php else: ?>
-						<?php p($l->t('Picture provided by original account')); ?>
+					<?php else {
+    : ?>
+						<?php p($l->t('Picture provided by original account'));
+}
+?>
 					<?php endif; ?>
 				</div>
 
@@ -88,9 +91,12 @@ 
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
 								[$_['usage']]));?>
-						<?php else: ?>
+						<?php else {
+    : ?>
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+								[$_['usage'], $_['total_space'],  $_['usage_relative']]));
+}
+?>
 						<?php endif ?>
 					</p>
 				</div>
@@ -134,7 +140,10 @@ 
 						</span>
 					</div>
 				</h3>
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
 					switch($_['emailVerification']) {
@@ -177,7 +186,10 @@ 
 						</span>
 					</div>
 				</h3>
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
+				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 					   value="<?php p($_['phone']) ?>"
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -199,7 +211,10 @@ 
 						</span>
 					</div>
 				</h3>
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
 					   value="<?php p($_['address']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -222,7 +237,10 @@ 
 					</div>
 				</h3>
 				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 					<?php
 					switch($_['websiteVerification']) {
@@ -236,13 +254,16 @@ 
 							p(image_path('core', 'actions/verify.svg'));
 					}
 					?>"
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
+    print_unescaped(' class="verify-action"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">
 							<p class="explainVerification"></p>
 							<p class="verificationCode"></p>
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
+}
+?></p>
 						</div>
 					</div>
 				</div>
@@ -250,7 +271,10 @@ 
 				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+					   <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 				/>
 				<span class="icon-checkmark hidden"></span>
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -271,7 +295,10 @@ 
 					</div>
 				</h3>
 				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 					<?php
 					switch($_['twitterVerification']) {
@@ -285,13 +312,16 @@ 
 							p(image_path('core', 'actions/verify.svg'));
 					}
 					?>"
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
+    print_unescaped(' class="verify-action"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">
 							<p class="explainVerification"></p>
 							<p class="verificationCode"></p>
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
+}
+?></p>
 						</div>
 					</div>
 				</div>
@@ -299,7 +329,10 @@ 
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+					   <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 				/>
 				<span class="icon-checkmark hidden"></span>
 				<?php if($_['lookupServerUploadEnabled']) { ?>

apps/settings/templates/settings/admin/security.php

Braces +16 added lines, -4 removed lines

@@ -35,7 +35,10 @@ 
 	<p id="enable">
 		<input type="checkbox"
 			   id="enableEncryption" class="checkbox"
-			   value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> />
+			   value="1" <?php if ($_['encryptionEnabled']) {
+    print_unescaped('checked="checked" disabled="disabled"');
+}
+?> />
 		<label
 			for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
 	</p>
@@ -54,8 +57,14 @@ 
 																										   value="<?php p($l->t("Enable encryption")); ?>" /></p>
 	</div>
 
-	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
-		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
+	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) {
+    p('hidden');
+}
+?>">
+		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) {
+    p('hidden');
+}
+?>">
 			<?php
 			if (empty($_['encryptionModules'])) {
 				p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
@@ -76,7 +85,10 @@ 
 				</fieldset>
 			<?php } ?>
 		</div>
-		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
+		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) {
+    p('hidden');
+}
+?>">
 			<?php
 			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
 				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\''));

apps/settings/templates/settings/admin/additional-mail.php

Braces +24 added lines, -6 removed lines

@@ -71,11 +71,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']):
@@ -94,7 +100,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):
@@ -107,11 +116,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']) ?>" />
@@ -121,7 +136,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']) ?>" />

apps/files_external/templates/settings.php

Braces +24 added lines, -6 removed lines

@@ -100,7 +100,10 @@ 
 	<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
 	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
-	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
+	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
+    print_unescaped(''.$_['dependencies'].'');
+}
+?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
 			<tr>
@@ -109,7 +112,10 @@ 
 				<th><?php p($l->t('External storage')); ?></th>
 				<th><?php p($l->t('Authentication')); ?></th>
 				<th><?php p($l->t('Configuration')); ?></th>
-				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
+				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
+}
+?>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
@@ -142,7 +148,10 @@ 
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
+							<?php if ($backend->getDeprecateTo()) {
+    continue;
+}
+// ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -167,7 +176,10 @@ 
 
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
-			value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> />
+			value="1" <?php if ($_['allowUserMounting']) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
@@ -179,8 +191,14 @@ 
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
-				<?php else: ?>
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<?php else {
+    : ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
+}
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php endif; ?>
 				<?php $i++; ?>

core/templates/twofactorselectchallenge.php

Braces +13 added lines, -5 removed lines

@@ -27,11 +27,15 @@ 
 					<?php p($l->t('Set up two-factor authentication')) ?>
 				</a>
 			<?php } ?>
-		<?php else: ?>
+		<?php else {
+    : ?>
 			<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 	</p>
-	<?php else: ?>
+	<?php else {
+    : ?>
 	<ul>
 	<?php foreach ($_['providers'] as $provider): ?>
 		<li>
@@ -45,6 +49,7 @@ 
 				<?php
 				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
 					$icon = $provider->getLightIcon();
+}
 				} else {
 					$icon = image_path('core', 'actions/password-white.svg');
 				}
@@ -61,7 +66,8 @@ 
 	<?php endif ?>
 	<?php if (!is_null($_['backupProvider'])): ?>
 	<p>
-		<a class="<?php if($noProviders): ?>button primary two-factor-primary<?php else: ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
+		<a class="<?php if($noProviders): ?>button primary two-factor-primary<?php else {
+    : ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
 			[
 				'challengeProviderId' => $_['backupProvider']->getId(),
 				'redirect_url' => $_['redirect_url'],
@@ -70,7 +76,9 @@ 
 			<?php p($l->t('Use backup code')) ?>
 		</a>
 	</p>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 	<p><a class="two-factor-secondary" href="<?php print_unescaped($_['logout_url']); ?>">
 		<?php p($l->t('Cancel login')) ?>
 	</a></p>

apps/settings/templates/settings/personal/security/twofactor.php

Braces +2 added lines, -4 removed lines

@@ -76,16 +76,14 @@
 			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
 				if ($_['themedark']) {
 					$icon = $provider->getLightIcon();
-				}
-				else {
+				} else {
 					$icon = $provider->getDarkIcon();
 				}
 				//fallback icon if the 2factor provider doesn't provide an icon.
 			} else {
 				if ($_['themedark']) {
 					$icon = image_path('core', 'actions/password-white.svg');
-				}
-				else {
+				} else {
 					$icon = image_path('core', 'actions/password.svg');
 				}
 

lib/private/Setup/MySQL.php

Braces +1 added lines, -2 removed lines

@@ -125,8 +125,7 @@
 				$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
 				$connection->executeUpdate($query);
 			}
-		}
-		catch (\Exception $ex){
+		} catch (\Exception $ex){
 			$this->logger->logException($ex, [
 				'message' => 'Database user creation failed.',
 				'level' => ILogger::ERROR,