| @@ -135,7 +135,7 @@ | ||
| 135 | 135 |  				$ln = array('code' => $lang, 'name' => $potentialName); | 
| 136 | 136 |  			} elseif ($lang === 'en') { | 
| 137 | 137 | $ln = ['code' => $lang, 'name' => 'English (US)']; | 
| 138 | -			}else{//fallback to language code | |
| 138 | +			} else{//fallback to language code | |
| 139 | 139 |  				$ln=array('code'=>$lang, 'name'=>$lang); | 
| 140 | 140 | } | 
| 141 | 141 | |
| @@ -47,9 +47,12 @@ discard block | ||
| 47 | 47 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> | 
| 48 | 48 |  				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', | 
| 49 | 49 | [$_['usage'], $_['total_space']]));?> | 
| 50 | - <?php else: ?> | |
| 50 | +			<?php else { | |
| 51 | + : ?> | |
| 51 | 52 |  				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', | 
| 52 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> | |
| 53 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); | |
| 54 | +} | |
| 55 | +?> | |
| 53 | 56 | <?php endif ?> | 
| 54 | 57 | </p> | 
| 55 | 58 | </div> | 
| @@ -71,8 +74,11 @@ discard block | ||
| 71 | 74 |  					<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div> | 
| 72 | 75 | <input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield"> | 
| 73 | 76 |  					<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p> | 
| 74 | - <?php else: ?> | |
| 75 | -					<?php p($l->t('Picture provided by original account')); ?> | |
| 77 | +				<?php else { | |
| 78 | + : ?> | |
| 79 | +					<?php p($l->t('Picture provided by original account')); | |
| 80 | +} | |
| 81 | +?> | |
| 76 | 82 | <?php endif; ?> | 
| 77 | 83 | </div> | 
| 78 | 84 | |
| @@ -115,7 +121,10 @@ discard block | ||
| 115 | 121 |  					<label for="email"><?php p($l->t('Email')); ?></label> | 
| 116 | 122 | <span class="icon-password"/> | 
| 117 | 123 | </h2> | 
| 118 | -				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>"> | |
| 124 | +				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') { | |
| 125 | +    p('hidden'); | |
| 126 | +} | |
| 127 | +?>"> | |
| 119 | 128 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" | 
| 120 | 129 | <?php | 
| 121 | 130 |  					switch($_['emailVerification']) { | 
| @@ -182,7 +191,10 @@ discard block | ||
| 182 | 191 |  						<label for="website"><?php p($l->t('Website')); ?></label> | 
| 183 | 192 | <span class="icon-password"/> | 
| 184 | 193 | </h2> | 
| 185 | -					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>"> | |
| 194 | +					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') { | |
| 195 | +    p('hidden'); | |
| 196 | +} | |
| 197 | +?>"> | |
| 186 | 198 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" | 
| 187 | 199 | <?php | 
| 188 | 200 |  						switch($_['websiteVerification']) { | 
| @@ -196,13 +208,16 @@ discard block | ||
| 196 | 208 |  								p(image_path('core', 'actions/verify.svg')); | 
| 197 | 209 | } | 
| 198 | 210 | ?>" | 
| 199 | -							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> | |
| 211 | +							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { | |
| 212 | +    print_unescaped(' class="verify-action"') ?> | |
| 200 | 213 | > | 
| 201 | 214 | <div class="verification-dialog popovermenu bubble menu"> | 
| 202 | 215 | <div class="verification-dialog-content"> | 
| 203 | 216 | <p class="explainVerification"></p> | 
| 204 | 217 | <p class="verificationCode"></p> | 
| 205 | -								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> | |
| 218 | +								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); | |
| 219 | +} | |
| 220 | +?></p> | |
| 206 | 221 | </div> | 
| 207 | 222 | </div> | 
| 208 | 223 | </div> | 
| @@ -219,7 +234,10 @@ discard block | ||
| 219 | 234 |  						<label for="twitter"><?php p($l->t('Twitter')); ?></label> | 
| 220 | 235 | <span class="icon-password"/> | 
| 221 | 236 | </h2> | 
| 222 | -					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>"> | |
| 237 | +					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') { | |
| 238 | +    p('hidden'); | |
| 239 | +} | |
| 240 | +?>"> | |
| 223 | 241 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" | 
| 224 | 242 | <?php | 
| 225 | 243 |  						switch($_['twitterVerification']) { | 
| @@ -233,13 +251,16 @@ discard block | ||
| 233 | 251 |  								p(image_path('core', 'actions/verify.svg')); | 
| 234 | 252 | } | 
| 235 | 253 | ?>" | 
| 236 | -							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> | |
| 254 | +							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) { | |
| 255 | +    print_unescaped(' class="verify-action"') ?> | |
| 237 | 256 | > | 
| 238 | 257 | <div class="verification-dialog popovermenu bubble menu"> | 
| 239 | 258 | <div class="verification-dialog-content"> | 
| 240 | 259 | <p class="explainVerification"></p> | 
| 241 | 260 | <p class="verificationCode"></p> | 
| 242 | -								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> | |
| 261 | +								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); | |
| 262 | +} | |
| 263 | +?></p> | |
| 243 | 264 | </div> | 
| 244 | 265 | </div> | 
| 245 | 266 | </div> |