nextcloud / server

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

Braces +1 added lines, -2 removed lines

@@ -247,8 +247,7 @@
 			return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST);
 		} catch (AuthenticationFailedException $e) {
 			return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			return new JSONResponse(
 				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
 				Http::STATUS_BAD_REQUEST

apps/federatedfilesharing/templates/settings-admin.php

Braces +24 added lines, -6 removed lines

@@ -18,14 +18,20 @@ 
 
 	<p>
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="outgoingServer2serverShareEnabled">
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
 		</label>
 	</p>
 	<p>
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="incomingServer2serverShareEnabled">
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
 		</label><br/>
@@ -33,14 +39,20 @@ 
 	<?php if($_['federatedGroupSharingSupported']): ?>
 	<p>
 		<input type="checkbox" name="outgoing_server2server_group_share_enabled" id="outgoingServer2serverGroupShareEnabled" class="checkbox"
-			   value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="outgoingServer2serverGroupShareEnabled">
 			<?php p($l->t('Allow users on this server to send shares to groups on other servers'));?>
 		</label>
 	</p>
 	<p>
 		<input type="checkbox" name="incoming_server2server_group_share_enabled" id="incomingServer2serverGroupShareEnabled" class="checkbox"
-			   value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="incomingServer2serverGroupShareEnabled">
 			<?php p($l->t('Allow users on this server to receive group shares from other servers'));?>
 		</label><br/>
@@ -48,14 +60,20 @@ 
 	<?php endif; ?>
 	<p>
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['lookupServerEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="lookupServerEnabled">
 			<?php p($l->t('Search global and public address book for users'));?>
 		</label><br/>
 	</p>
 	<p>
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
-			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['lookupServerUploadEnabled']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="lookupServerUploadEnabled">
 			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
 		</label><br/>

lib/private/Share20/Manager.php

Braces +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
 			if ($share->getSharedWith() === null) {
 				throw new \InvalidArgumentException('SharedWith should not be empty');
 			}
-		}  else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
+		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
 			if ($share->getSharedWith() === null) {
 				throw new \InvalidArgumentException('SharedWith should not be empty');
 			}

apps/files_sharing/lib/Controller/ShareAPIController.php

Braces +1 added lines, -1 removed lines

@@ -465,7 +465,7 @@
 
 			$share->setSharedWith($shareWith);
 			$share->setPermissions($permissions);
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
+		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
 			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
 				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
 			}

apps/files_external/templates/settings.php

Braces +24 added lines, -6 removed lines

@@ -96,7 +96,10 @@ 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
 	<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>
@@ -105,7 +108,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>
@@ -138,7 +144,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>
@@ -163,7 +172,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; ?>>
@@ -175,8 +187,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++; ?>

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']) ?>" />

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>%s</strong> of <strong>%s</strong> (<strong>%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']) { ?>

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 {
+    : ?>
 	<div class="body-login-container update">
 		<div class="icon-big icon-search icon-white"></div>
-		<h2><?php p($l->t('File not found')); ?></h2>
+		<h2><?php p($l->t('File not found'));
+}
+?></h2>
 		<p class="infogroup"><?php p($l->t('The document could not be found on the server. Maybe the share was deleted or has expired?')); ?></p>
 		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
 			<?php p($l->t('Back to %s', array($theme->getName()))); ?>

core/templates/twofactorselectchallenge.php

Braces +13 added lines, -5 removed lines

@@ -16,11 +16,15 @@ 
 	<p>
 		<?php if (is_null($_['backupProvider'])): ?>
 		<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance.')) ?></strong>
-		<?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>
@@ -34,6 +38,7 @@ 
 				<?php
 				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
 					$icon = $provider->getLightIcon();
+}
 				} else {
 					$icon = image_path('core', 'actions/password-white.svg');
 				}
@@ -50,7 +55,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'],
@@ -59,7 +65,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 log in')) ?>
 	</a></p>