| @@ -194,8 +194,11 @@ | ||
| 194 | 194 | <?php $i = 0; foreach ($userBackends as $backend): ?> | 
| 195 | 195 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> | 
| 196 | 196 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> | 
| 197 | - <?php else: ?> | |
| 198 | -					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { | |
| 197 | +				<?php else { | |
| 198 | + : ?> | |
| 199 | + <input type="checkbox" id="allowUserMountingBackends<?php p($i); | |
| 200 | +} | |
| 201 | +?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { | |
| 199 | 202 |  				print_unescaped(' checked="checked"'); | 
| 200 | 203 | } ?> /> | 
| 201 | 204 | <label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br /> | 
| @@ -9,11 +9,13 @@ | ||
| 9 | 9 |  	<h3><?php p($l->t("Default encryption module")); ?></h3> | 
| 10 | 10 | <?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?> | 
| 11 | 11 |  		<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?> | 
| 12 | - <?php else: ?> | |
| 12 | +	<?php else { | |
| 13 | + : ?> | |
| 13 | 14 | <p id="encryptHomeStorageSetting"> | 
| 14 | 15 | <input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage" | 
| 15 | 16 |  				   value="1" <?php if ($_['encryptHomeStorage']) { | 
| 16 | 17 |  	print_unescaped('checked="checked"'); | 
| 18 | +} | |
| 17 | 19 | } ?> /> | 
| 18 | 20 |  			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br> | 
| 19 | 21 |  			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em> | 
| @@ -16,8 +16,11 @@ | ||
| 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); ?> | 
| @@ -50,17 +50,23 @@ | ||
| 50 | 50 | <div id="preview"> | 
| 51 | 51 | <?php if (isset($_['folder'])): ?> | 
| 52 | 52 | <?php print_unescaped($_['folder']); ?> | 
| 53 | - <?php else: ?> | |
| 53 | +			<?php else { | |
| 54 | + : ?> | |
| 54 | 55 | <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?> | 
| 55 | 56 | <div id="imgframe"> | 
| 56 | - <audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px"> | |
| 57 | + <audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); | |
| 58 | +} | |
| 59 | +?>px; max-height: <?php p($_['previewMaxY']); ?>px"> | |
| 57 | 60 | <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> | 
| 58 | 61 | </audio> | 
| 59 | 62 | </div> | 
| 60 | - <?php else: ?> | |
| 63 | +				<?php else { | |
| 64 | + : ?> | |
| 61 | 65 | <!-- Preview frame is filled via JS to support SVG images for modern browsers --> | 
| 62 | 66 | <div id="imgframe"></div> | 
| 63 | - <?php endif; ?> | |
| 67 | + <?php endif; | |
| 68 | +} | |
| 69 | +?> | |
| 64 | 70 | <?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?> | 
| 65 | 71 | <div class="directDownload"> | 
| 66 | 72 | <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> | 
| @@ -15,9 +15,12 @@ | ||
| 15 | 15 |  					<p><?php p($l->t('%s used', [$_['usage']])); ?></p> | 
| 16 | 16 | </a> | 
| 17 | 17 | </li> | 
| 18 | - <?php else: ?> | |
| 18 | +		<?php else { | |
| 19 | + : ?> | |
| 19 | 20 | <li id="quota" class="has-tooltip pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>" | 
| 20 | -				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); ?>"> | |
| 21 | +				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); | |
| 22 | +} | |
| 23 | +?>"> | |
| 21 | 24 | <a href="#" class="icon-quota svg"> | 
| 22 | 25 |  					<p id="quotatext"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p> | 
| 23 | 26 | <div class="quota-container"> | 
| @@ -14,10 +14,13 @@ | ||
| 14 | 14 | ?> | 
| 15 | 15 | <?php if (isset($_['content'])): ?> | 
| 16 | 16 | <?php print_unescaped($_['content']) ?> | 
| 17 | -<?php else: ?> | |
| 17 | +<?php else { | |
| 18 | + : ?> | |
| 18 | 19 | <div class="body-login-container update"> | 
| 19 | 20 | <div class="icon-big icon-search icon-white"></div> | 
| 20 | -		<h2><?php p($l->t('File not found')); ?></h2> | |
| 21 | +		<h2><?php p($l->t('File not found')); | |
| 22 | +} | |
| 23 | +?></h2> | |
| 21 | 24 |  		<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> | 
| 22 | 25 |  		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"> | 
| 23 | 26 |  			<?php p($l->t('Back to %s', [$theme->getName()])); ?> | 
| @@ -55,8 +55,11 @@ discard block | ||
| 55 | 55 |  						<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div> | 
| 56 | 56 | <input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield"> | 
| 57 | 57 |  						<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p> | 
| 58 | - <?php else: ?> | |
| 59 | -						<?php p($l->t('Picture provided by original account')); ?> | |
| 58 | +					<?php else { | |
| 59 | + : ?> | |
| 60 | +						<?php p($l->t('Picture provided by original account')); | |
| 61 | +} | |
| 62 | +?> | |
| 60 | 63 | <?php endif; ?> | 
| 61 | 64 | </div> | 
| 62 | 65 | |
| @@ -86,9 +89,12 @@ discard block | ||
| 86 | 89 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> | 
| 87 | 90 |  							<?php print_unescaped($l->t('You are using <strong>%s</strong>', | 
| 88 | 91 | [$_['usage']]));?> | 
| 89 | - <?php else: ?> | |
| 92 | +						<?php else { | |
| 93 | + : ?> | |
| 90 | 94 |  							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)', | 
| 91 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> | |
| 95 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); | |
| 96 | +} | |
| 97 | +?> | |
| 92 | 98 | <?php endif ?> | 
| 93 | 99 | </p> | 
| 94 | 100 | </div> | 
| @@ -17,8 +17,11 @@ discard block | ||
| 17 | 17 | <?php if (is_array($err)):?> | 
| 18 | 18 | <?php p($err['error']); ?> | 
| 19 | 19 | <span class='hint'><?php p($err['hint']); ?></span> | 
| 20 | - <?php else: ?> | |
| 21 | - <?php p($err); ?> | |
| 20 | +			<?php else { | |
| 21 | + : ?> | |
| 22 | + <?php p($err); | |
| 23 | +} | |
| 24 | +?> | |
| 22 | 25 | <?php endif; ?> | 
| 23 | 26 | </p> | 
| 24 | 27 | <?php endforeach; ?> | 
| @@ -90,11 +93,14 @@ discard block | ||
| 90 | 93 |  				<?php p($l->t('For more details check out the documentation.')); ?> ↗</a> | 
| 91 | 94 | </p> | 
| 92 | 95 | <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> | 
| 93 | - <?php else: ?> | |
| 96 | +		<?php else { | |
| 97 | + : ?> | |
| 94 | 98 | <input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>" | 
| 95 | 99 | <?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/> | 
| 96 | 100 | <label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label> | 
| 97 | - <?php endif; ?> | |
| 101 | + <?php endif; | |
| 102 | +} | |
| 103 | +?> | |
| 98 | 104 | <?php endforeach; ?> | 
| 99 | 105 | </div> | 
| 100 | 106 | </fieldset> | 
| @@ -27,11 +27,15 @@ discard block | ||
| 27 | 27 |  					<?php p($l->t('Set up two-factor authentication')) ?> | 
| 28 | 28 | </a> | 
| 29 | 29 | <?php } ?> | 
| 30 | - <?php else: ?> | |
| 30 | +		<?php else { | |
| 31 | + : ?> | |
| 31 | 32 |  			<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> | 
| 32 | - <?php endif; ?> | |
| 33 | + <?php endif; | |
| 34 | +} | |
| 35 | +?> | |
| 33 | 36 | </p> | 
| 34 | - <?php else: ?> | |
| 37 | +	<?php else { | |
| 38 | + : ?> | |
| 35 | 39 | <ul> | 
| 36 | 40 | <?php foreach ($_['providers'] as $provider): ?> | 
| 37 | 41 | <li> | 
| @@ -45,6 +49,7 @@ discard block | ||
| 45 | 49 | <?php | 
| 46 | 50 |  				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) { | 
| 47 | 51 | $icon = $provider->getLightIcon(); | 
| 52 | +} | |
| 48 | 53 |  				} else { | 
| 49 | 54 |  					$icon = image_path('core', 'actions/password-white.svg'); | 
| 50 | 55 | } | 
| @@ -61,7 +66,8 @@ discard block | ||
| 61 | 66 | <?php endif ?> | 
| 62 | 67 | <?php if (!is_null($_['backupProvider'])): ?> | 
| 63 | 68 | <p> | 
| 64 | -		<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', | |
| 69 | +		<a class="<?php if ($noProviders): ?>button primary two-factor-primary<?php else { | |
| 70 | +    : ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge', | |
| 65 | 71 | [ | 
| 66 | 72 | 'challengeProviderId' => $_['backupProvider']->getId(), | 
| 67 | 73 | 'redirect_url' => $_['redirect_url'], | 
| @@ -70,7 +76,9 @@ discard block | ||
| 70 | 76 |  			<?php p($l->t('Use backup code')) ?> | 
| 71 | 77 | </a> | 
| 72 | 78 | </p> | 
| 73 | - <?php endif; ?> | |
| 79 | + <?php endif; | |
| 80 | +} | |
| 81 | +?> | |
| 74 | 82 | <p><a class="two-factor-secondary" href="<?php print_unescaped($_['logout_url']); ?>"> | 
| 75 | 83 |  		<?php p($l->t('Cancel login')) ?> | 
| 76 | 84 | </a></p> |