nextcloud / server

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,

core/templates/installation.php

Braces +16 added lines, -6 removed lines

@@ -17,8 +17,11 @@ 
 			<?php if(is_array($err)):?>
 				<?php p($err['error']); ?>
 				<span class='hint'><?php p($err['hint']); ?></span>
-			<?php else: ?>
-				<?php p($err); ?>
+			<?php else {
+    : ?>
+				<?php p($err);
+}
+?>
 			<?php endif; ?>
 		</p>
 		<?php endforeach; ?>
@@ -74,8 +77,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): ?>
@@ -87,11 +94,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>

apps/settings/templates/settings/admin/sharing.php

Braces +120 added lines, -30 removed lines

@@ -34,97 +34,181 @@ 
         <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p>
 	<p id="enable">
 		<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
-			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
 	</p>
 
-	<p id="internalShareSettings" class="indent <?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
+	<p id="internalShareSettings" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_default_internal_expire_date" id="shareapiDefaultInternalExpireDate" class="checkbox"
-			   value="1" <?php if ($_['shareDefaultInternalExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareDefaultInternalExpireDateSet'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares'));?></label><br/>
 	</p>
-	<p id="setDefaultInternalExpireDate" class="double-indent <?php if ($_['shareDefaultInternalExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p id="setDefaultInternalExpireDate" class="double-indent <?php if ($_['shareDefaultInternalExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<?php p($l->t( 'Expire after ' )); ?>
 		<input type="text" name='shareapi_internal_expire_after_n_days' id="shareapiInternalExpireAfterNDays" placeholder="<?php p('7')?>"
 			   value='<?php p($_['shareInternalExpireAfterNDays']) ?>' />
 		<?php p($l->t( 'days' )); ?>
 		<input type="checkbox" name="shareapi_internal_enforce_expire_date" id="shareapiInternalEnforceExpireDate" class="checkbox"
-			   value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
 	</p>
 
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_links" id="allowLinks" class="checkbox"
-			   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowLinks'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
 	</p>
 
-	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
+	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox"
-			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
 		<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
-			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
 		<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
-			   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['enforceLinkPassword']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
 
 		<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
-			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date for link shares'));?></label><br/>
 
 	</p>
-	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<?php p($l->t( 'Expire after ' )); ?>
 		<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
 			   value='<?php p($_['shareExpireAfterNDays']) ?>' />
 		<?php p($l->t( 'days' )); ?>
 		<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
-			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" class="checkbox"
-			   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowResharing'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_group_sharing" id="allowGroupSharing" class="checkbox"
-			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox"
-			   value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['onlyShareWithGroupMembers']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" class="checkbox"
-			   value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareExcludeGroups']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
 	</p>
-	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
+	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
 		<br />
 		<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
 	</p>
 
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration" class="checkbox"
-			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered.'));?></label><br />
 	</p>
 
-	<p id="shareapi_restrict_user_enumeration_to_group_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') p('hidden');?>">
+	<p id="shareapi_restrict_user_enumeration_to_group_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_restrict_user_enumeration_to_group" value="1" id="shareapi_restrict_user_enumeration_to_group" class="checkbox"
-			<?php if ($_['restrictUserEnumerationToGroup'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			<?php if ($_['restrictUserEnumerationToGroup'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapi_restrict_user_enumeration_to_group"><?php p($l->t('Restrict username autocompletion to users within the same groups'));?></label><br />
 	</p>
 
 	<p>
 		<input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"
-			<?php if ($_['publicShareDisclaimerText'] !== null) print_unescaped('checked="checked"'); ?> />
+			<?php if ($_['publicShareDisclaimerText'] !== null) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)'));?></label>
 		<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
 		<br/>
@@ -134,10 +218,16 @@ 
 	<h3><?php p($l->t('Default share permissions'));?></h3>
 	<input type="hidden" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox"
 		   value="<?php p($_['shareApiDefaultPermissions']) ?>" />
-	<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
+	<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<?php foreach ($_['shareApiDefaultPermissionsCheckboxes'] as $perm): ?>
 			<input type="checkbox" name="shareapi_default_permission_<?php p($perm['id']) ?>" id="shareapi_default_permission_<?php p($perm['id']) ?>"
-				   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) print_unescaped('checked="checked"'); ?> />
+				   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']);?></label>
 		<?php endforeach ?>
 	</p>