@@ -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 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | public function getForm() { |
| 94 | 94 | $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing'); |
| 95 | 95 | $lookupServerUploadEnabled = false; |
| 96 | - if($federatedFileSharingEnabled) { |
|
| 96 | + if ($federatedFileSharingEnabled) { |
|
| 97 | 97 | $federatedFileSharing = new Application(); |
| 98 | 98 | $shareProvider = $federatedFileSharing->getFederatedShareProvider(); |
| 99 | 99 | $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled(); |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | private function getLanguages(IUser $user) { |
| 194 | 194 | $forceLanguage = $this->config->getSystemValue('force_language', false); |
| 195 | - if($forceLanguage !== false) { |
|
| 195 | + if ($forceLanguage !== false) { |
|
| 196 | 196 | return []; |
| 197 | 197 | } |
| 198 | 198 | |
@@ -204,16 +204,16 @@ discard block |
||
| 204 | 204 | $commonLanguages = []; |
| 205 | 205 | $languages = []; |
| 206 | 206 | |
| 207 | - foreach($languageCodes as $lang) { |
|
| 207 | + foreach ($languageCodes as $lang) { |
|
| 208 | 208 | $l = \OC::$server->getL10N('settings', $lang); |
| 209 | 209 | // TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version |
| 210 | 210 | $potentialName = (string) $l->t('__language_name__'); |
| 211 | - if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file |
|
| 211 | + if ($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file |
|
| 212 | 212 | $ln = array('code' => $lang, 'name' => $potentialName); |
| 213 | 213 | } elseif ($lang === 'en') { |
| 214 | 214 | $ln = ['code' => $lang, 'name' => 'English (US)']; |
| 215 | - }else{//fallback to language code |
|
| 216 | - $ln=array('code'=>$lang, 'name'=>$lang); |
|
| 215 | + } else {//fallback to language code |
|
| 216 | + $ln = array('code'=>$lang, 'name'=>$lang); |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | // put appropriate languages into appropriate arrays, to print them sorted |
@@ -221,9 +221,9 @@ discard block |
||
| 221 | 221 | if ($lang === $userLang) { |
| 222 | 222 | $userLang = $ln; |
| 223 | 223 | } elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) { |
| 224 | - $commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln; |
|
| 224 | + $commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)] = $ln; |
|
| 225 | 225 | } else { |
| 226 | - $languages[]=$ln; |
|
| 226 | + $languages[] = $ln; |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | ksort($commonLanguages); |
| 239 | 239 | |
| 240 | 240 | // sort now by displayed language not the iso-code |
| 241 | - usort( $languages, function ($a, $b) { |
|
| 241 | + usort($languages, function($a, $b) { |
|
| 242 | 242 | if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) { |
| 243 | 243 | // If a doesn't have a name, but b does, list b before a |
| 244 | 244 | return 1; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | default: |
| 277 | 277 | $message = $this->l->t('Verify'); |
| 278 | 278 | } |
| 279 | - $messageParameters[$property . 'Message'] = $message; |
|
| 279 | + $messageParameters[$property.'Message'] = $message; |
|
| 280 | 280 | } |
| 281 | 281 | return $messageParameters; |
| 282 | 282 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | 24 | style('settings', 'settings'); |
| 25 | -script('settings', [ 'settings', 'admin', 'log', 'certificates'] ); |
|
| 25 | +script('settings', ['settings', 'admin', 'log', 'certificates']); |
|
| 26 | 26 | script('core', ['multiselect', 'setupchecks']); |
| 27 | 27 | script('files', 'jquery.fileupload'); |
| 28 | 28 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | <ul> |
| 33 | 33 | <li class="settings-caption">Personal</li> |
| 34 | 34 | <?php |
| 35 | - foreach($_['forms']['personal'] as $form) { |
|
| 35 | + foreach ($_['forms']['personal'] as $form) { |
|
| 36 | 36 | if (isset($form['anchor'])) { |
| 37 | 37 | $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); |
| 38 | - $class = 'nav-icon-' . $form['anchor']; |
|
| 38 | + $class = 'nav-icon-'.$form['anchor']; |
|
| 39 | 39 | $sectionName = $form['section-name']; |
| 40 | 40 | $active = $form['active'] ? ' class="active"' : ''; |
| 41 | 41 | ?> |
@@ -55,16 +55,16 @@ discard block |
||
| 55 | 55 | ?> |
| 56 | 56 | |
| 57 | 57 | <?php |
| 58 | - if(!empty($_['forms']['admin'])) { |
|
| 58 | + if (!empty($_['forms']['admin'])) { |
|
| 59 | 59 | ?> |
| 60 | 60 | <li class="settings-caption">Administration</li> |
| 61 | 61 | <?php |
| 62 | 62 | } |
| 63 | - foreach($_['forms']['admin'] as $form) { |
|
| 63 | + foreach ($_['forms']['admin'] as $form) { |
|
| 64 | 64 | if (isset($form['anchor'])) { |
| 65 | 65 | |
| 66 | 66 | $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); |
| 67 | - $class = 'nav-icon-' . $form['anchor']; |
|
| 67 | + $class = 'nav-icon-'.$form['anchor']; |
|
| 68 | 68 | $sectionName = $form['section-name']; |
| 69 | 69 | $active = $form['active'] ? ' class="active"' : ''; |
| 70 | 70 | ?> |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | * @since 9.1 |
| 46 | 46 | */ |
| 47 | 47 | public function getForm() { |
| 48 | - $parameters = [ 'clients' => $this->getClientLinks() ]; |
|
| 48 | + $parameters = ['clients' => $this->getClientLinks()]; |
|
| 49 | 49 | return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -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> |
@@ -38,15 +38,15 @@ discard block |
||
| 38 | 38 | ?> |
| 39 | 39 | |
| 40 | 40 | <div id="quota" class="section"> |
| 41 | - <div style="width:<?php p($_['usage_relative']);?>%" |
|
| 42 | - <?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>> |
|
| 41 | + <div style="width:<?php p($_['usage_relative']); ?>%" |
|
| 42 | + <?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>> |
|
| 43 | 43 | <p id="quotatext"> |
| 44 | 44 | <?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?> |
| 45 | 45 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>', |
| 46 | - [$_['usage'], $_['total_space']]));?> |
|
| 46 | + [$_['usage'], $_['total_space']])); ?> |
|
| 47 | 47 | <?php else: ?> |
| 48 | 48 | <?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)', |
| 49 | - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> |
|
| 49 | + [$_['usage'], $_['total_space'], $_['usage_relative']])); ?> |
|
| 50 | 50 | <?php endif ?> |
| 51 | 51 | </p> |
| 52 | 52 | </div> |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | </div> |
| 81 | 81 | </div> |
| 82 | 82 | <span class="icon-checkmark hidden"/> |
| 83 | - <?php if($_['lookupServerUploadEnabled']) { ?> |
|
| 83 | + <?php if ($_['lookupServerUploadEnabled']) { ?> |
|
| 84 | 84 | <input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>"> |
| 85 | 85 | <?php } ?> |
| 86 | 86 | </form> |
@@ -94,14 +94,14 @@ discard block |
||
| 94 | 94 | <span class="icon-password"/> |
| 95 | 95 | </h2> |
| 96 | 96 | <input type="text" id="displayname" name="displayname" |
| 97 | - <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> |
|
| 97 | + <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> |
|
| 98 | 98 | value="<?php p($_['displayName']) ?>" |
| 99 | 99 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
| 100 | - <?php if(!$_['displayNameChangeSupported']) { ?> |
|
| 101 | - <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span> |
|
| 100 | + <?php if (!$_['displayNameChangeSupported']) { ?> |
|
| 101 | + <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span> |
|
| 102 | 102 | <?php } ?> |
| 103 | 103 | <span class="icon-checkmark hidden"/> |
| 104 | - <?php if($_['lookupServerUploadEnabled']) { ?> |
|
| 104 | + <?php if ($_['lookupServerUploadEnabled']) { ?> |
|
| 105 | 105 | <input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>"> |
| 106 | 106 | <?php } ?> |
| 107 | 107 | </form> |
@@ -112,10 +112,10 @@ discard block |
||
| 112 | 112 | <label for="email"><?php p($l->t('Email')); ?></label> |
| 113 | 113 | <span class="icon-password"/> |
| 114 | 114 | </h2> |
| 115 | - <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>"> |
|
| 115 | + <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>"> |
|
| 116 | 116 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" |
| 117 | 117 | <?php |
| 118 | - switch($_['emailVerification']) { |
|
| 118 | + switch ($_['emailVerification']) { |
|
| 119 | 119 | case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
| 120 | 120 | p(image_path('core', 'actions/verifying.svg')); |
| 121 | 121 | break; |
@@ -128,23 +128,23 @@ discard block |
||
| 128 | 128 | ?>"> |
| 129 | 129 | </div> |
| 130 | 130 | <input type="email" name="email" id="email" value="<?php p($_['email']); ?>" |
| 131 | - <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> |
|
| 131 | + <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> |
|
| 132 | 132 | placeholder="<?php p($l->t('Your email address')); ?>" |
| 133 | 133 | autocomplete="on" autocapitalize="none" autocorrect="off" /> |
| 134 | - <?php if(!$_['displayNameChangeSupported']) { ?> |
|
| 135 | - <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span> |
|
| 134 | + <?php if (!$_['displayNameChangeSupported']) { ?> |
|
| 135 | + <span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span> |
|
| 136 | 136 | <?php } ?> |
| 137 | - <?php if($_['displayNameChangeSupported']) { ?> |
|
| 137 | + <?php if ($_['displayNameChangeSupported']) { ?> |
|
| 138 | 138 | <br /> |
| 139 | 139 | <em><?php p($l->t('For password reset and notifications')); ?></em> |
| 140 | 140 | <?php } ?> |
| 141 | 141 | <span class="icon-checkmark hidden"/> |
| 142 | - <?php if($_['lookupServerUploadEnabled']) { ?> |
|
| 142 | + <?php if ($_['lookupServerUploadEnabled']) { ?> |
|
| 143 | 143 | <input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>"> |
| 144 | 144 | <?php } ?> |
| 145 | 145 | </form> |
| 146 | 146 | </div> |
| 147 | - <?php if($_['lookupServerUploadEnabled']) { ?> |
|
| 147 | + <?php if ($_['lookupServerUploadEnabled']) { ?> |
|
| 148 | 148 | <div class="personal-settings-setting-box"> |
| 149 | 149 | <form id="phoneform" class="section"> |
| 150 | 150 | <h2> |
@@ -179,10 +179,10 @@ discard block |
||
| 179 | 179 | <label for="website"><?php p($l->t('Website')); ?></label> |
| 180 | 180 | <span class="icon-password"/> |
| 181 | 181 | </h2> |
| 182 | - <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>"> |
|
| 182 | + <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>"> |
|
| 183 | 183 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" |
| 184 | 184 | <?php |
| 185 | - switch($_['websiteVerification']) { |
|
| 185 | + switch ($_['websiteVerification']) { |
|
| 186 | 186 | case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
| 187 | 187 | p(image_path('core', 'actions/verifying.svg')); |
| 188 | 188 | break; |
@@ -193,13 +193,13 @@ discard block |
||
| 193 | 193 | p(image_path('core', 'actions/verify.svg')); |
| 194 | 194 | } |
| 195 | 195 | ?>" |
| 196 | - <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 196 | + <?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 197 | 197 | > |
| 198 | 198 | <div class="verification-dialog popovermenu bubble menu"> |
| 199 | 199 | <div class="verification-dialog-content"> |
| 200 | 200 | <p class="explainVerification"></p> |
| 201 | 201 | <p class="verificationCode"></p> |
| 202 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
| 202 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p> |
|
| 203 | 203 | </div> |
| 204 | 204 | </div> |
| 205 | 205 | </div> |
@@ -216,10 +216,10 @@ discard block |
||
| 216 | 216 | <label for="twitter"><?php p($l->t('Twitter')); ?></label> |
| 217 | 217 | <span class="icon-password"/> |
| 218 | 218 | </h2> |
| 219 | - <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>"> |
|
| 219 | + <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>"> |
|
| 220 | 220 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" |
| 221 | 221 | <?php |
| 222 | - switch($_['twitterVerification']) { |
|
| 222 | + switch ($_['twitterVerification']) { |
|
| 223 | 223 | case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
| 224 | 224 | p(image_path('core', 'actions/verifying.svg')); |
| 225 | 225 | break; |
@@ -230,13 +230,13 @@ discard block |
||
| 230 | 230 | p(image_path('core', 'actions/verify.svg')); |
| 231 | 231 | } |
| 232 | 232 | ?>" |
| 233 | - <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 233 | + <?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
|
| 234 | 234 | > |
| 235 | 235 | <div class="verification-dialog popovermenu bubble menu"> |
| 236 | 236 | <div class="verification-dialog-content"> |
| 237 | 237 | <p class="explainVerification"></p> |
| 238 | 238 | <p class="verificationCode"></p> |
| 239 | - <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> |
|
| 239 | + <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p> |
|
| 240 | 240 | </div> |
| 241 | 241 | </div> |
| 242 | 242 | </div> |
@@ -261,19 +261,19 @@ discard block |
||
| 261 | 261 | </div> |
| 262 | 262 | |
| 263 | 263 | <?php |
| 264 | -if($_['passwordChangeSupported']) { |
|
| 264 | +if ($_['passwordChangeSupported']) { |
|
| 265 | 265 | script('jquery-showpassword'); |
| 266 | 266 | ?> |
| 267 | 267 | <form id="passwordform" class="section"> |
| 268 | - <h2 class="inlineblock"><?php p($l->t('Password'));?></h2> |
|
| 268 | + <h2 class="inlineblock"><?php p($l->t('Password')); ?></h2> |
|
| 269 | 269 | <div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div> |
| 270 | 270 | <br> |
| 271 | 271 | <label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label> |
| 272 | 272 | <input type="password" id="pass1" name="oldpassword" |
| 273 | - placeholder="<?php p($l->t('Current password'));?>" |
|
| 273 | + placeholder="<?php p($l->t('Current password')); ?>" |
|
| 274 | 274 | autocomplete="off" autocapitalize="none" autocorrect="off" /> |
| 275 | 275 | <div class="personal-show-container"> |
| 276 | - <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label> |
|
| 276 | + <label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label> |
|
| 277 | 277 | <input type="password" id="pass2" name="newpassword" |
| 278 | 278 | placeholder="<?php p($l->t('New password')); ?>" |
| 279 | 279 | data-typetoggle="#personal-show" |
@@ -290,27 +290,27 @@ discard block |
||
| 290 | 290 | <?php if (isset($_['activelanguage'])) { ?> |
| 291 | 291 | <form id="language" class="section"> |
| 292 | 292 | <h2> |
| 293 | - <label for="languageinput"><?php p($l->t('Language'));?></label> |
|
| 293 | + <label for="languageinput"><?php p($l->t('Language')); ?></label> |
|
| 294 | 294 | </h2> |
| 295 | - <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>"> |
|
| 296 | - <option value="<?php p($_['activelanguage']['code']);?>"> |
|
| 297 | - <?php p($_['activelanguage']['name']);?> |
|
| 295 | + <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>"> |
|
| 296 | + <option value="<?php p($_['activelanguage']['code']); ?>"> |
|
| 297 | + <?php p($_['activelanguage']['name']); ?> |
|
| 298 | 298 | </option> |
| 299 | - <?php foreach($_['commonlanguages'] as $language):?> |
|
| 300 | - <option value="<?php p($language['code']);?>"> |
|
| 301 | - <?php p($language['name']);?> |
|
| 299 | + <?php foreach ($_['commonlanguages'] as $language):?> |
|
| 300 | + <option value="<?php p($language['code']); ?>"> |
|
| 301 | + <?php p($language['name']); ?> |
|
| 302 | 302 | </option> |
| 303 | - <?php endforeach;?> |
|
| 303 | + <?php endforeach; ?> |
|
| 304 | 304 | <optgroup label="––––––––––"></optgroup> |
| 305 | - <?php foreach($_['languages'] as $language):?> |
|
| 306 | - <option value="<?php p($language['code']);?>"> |
|
| 307 | - <?php p($language['name']);?> |
|
| 305 | + <?php foreach ($_['languages'] as $language):?> |
|
| 306 | + <option value="<?php p($language['code']); ?>"> |
|
| 307 | + <?php p($language['name']); ?> |
|
| 308 | 308 | </option> |
| 309 | - <?php endforeach;?> |
|
| 309 | + <?php endforeach; ?> |
|
| 310 | 310 | </select> |
| 311 | 311 | <a href="https://www.transifex.com/nextcloud/nextcloud/" |
| 312 | 312 | target="_blank" rel="noreferrer"> |
| 313 | - <em><?php p($l->t('Help translate'));?></em> |
|
| 313 | + <em><?php p($l->t('Help translate')); ?></em> |
|
| 314 | 314 | </a> |
| 315 | 315 | </form> |
| 316 | 316 | <?php } ?> |
@@ -26,18 +26,18 @@ discard block |
||
| 26 | 26 | ?> |
| 27 | 27 | |
| 28 | 28 | <div id="clientsbox" class="section clientsbox"> |
| 29 | - <h2><?php p($l->t('Get the apps to sync your files'));?></h2> |
|
| 29 | + <h2><?php p($l->t('Get the apps to sync your files')); ?></h2> |
|
| 30 | 30 | <a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank"> |
| 31 | 31 | <img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>" |
| 32 | - alt="<?php p($l->t('Desktop client'));?>" /> |
|
| 32 | + alt="<?php p($l->t('Desktop client')); ?>" /> |
|
| 33 | 33 | </a> |
| 34 | 34 | <a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank"> |
| 35 | 35 | <img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>" |
| 36 | - alt="<?php p($l->t('Android app'));?>" /> |
|
| 36 | + alt="<?php p($l->t('Android app')); ?>" /> |
|
| 37 | 37 | </a> |
| 38 | 38 | <a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank"> |
| 39 | 39 | <img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>" |
| 40 | - alt="<?php p($l->t('iOS app'));?>" /> |
|
| 40 | + alt="<?php p($l->t('iOS app')); ?>" /> |
|
| 41 | 41 | </a> |
| 42 | 42 | |
| 43 | 43 | <p> |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?> |
| 54 | 54 | </p> |
| 55 | 55 | |
| 56 | - <?php if(OC_APP::isEnabled('firstrunwizard')) {?> |
|
| 57 | - <p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p> |
|
| 56 | + <?php if (OC_APP::isEnabled('firstrunwizard')) {?> |
|
| 57 | + <p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p> |
|
| 58 | 58 | <?php }?> |
| 59 | 59 | </div> |
@@ -104,10 +104,10 @@ discard block |
||
| 104 | 104 | * @return array[] [['class' => string, 'priority' => int], ...] |
| 105 | 105 | */ |
| 106 | 106 | public function getSectionsFromDB($type) { |
| 107 | - if($type === 'admin') { |
|
| 107 | + if ($type === 'admin') { |
|
| 108 | 108 | $sectionsTable = self::TABLE_ADMIN_SECTIONS; |
| 109 | 109 | $settingsTable = self::TABLE_ADMIN_SETTINGS; |
| 110 | - } else if($type === 'personal') { |
|
| 110 | + } else if ($type === 'personal') { |
|
| 111 | 111 | $sectionsTable = self::TABLE_PERSONAL_SECTIONS; |
| 112 | 112 | $settingsTable = self::TABLE_PERSONAL_SETTINGS; |
| 113 | 113 | } else { |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | ->from($settingsTable, 'f') |
| 121 | 121 | ->where($query->expr()->eq('s.id', 'f.section')); |
| 122 | 122 | $result = $query->execute(); |
| 123 | - return array_map(function ($row) { |
|
| 124 | - $row['priority'] = (int)$row['priority']; |
|
| 123 | + return array_map(function($row) { |
|
| 124 | + $row['priority'] = (int) $row['priority']; |
|
| 125 | 125 | return $row; |
| 126 | 126 | }, $result->fetchAll()); |
| 127 | 127 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | */ |
| 133 | 133 | public function add($table, array $values) { |
| 134 | 134 | $query = $this->dbc->getQueryBuilder(); |
| 135 | - $values = array_map(function ($value) use ($query) { |
|
| 135 | + $values = array_map(function($value) use ($query) { |
|
| 136 | 136 | return $query->createNamedParameter($value); |
| 137 | 137 | }, $values); |
| 138 | 138 | $query->insert($table)->values($values); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $data = $resultStatement->fetchAll(); |
| 154 | 154 | $resultStatement->closeCursor(); |
| 155 | 155 | |
| 156 | - return array_map(function ($row) { |
|
| 156 | + return array_map(function($row) { |
|
| 157 | 157 | return $row['class']; |
| 158 | 158 | }, $data); |
| 159 | 159 | } |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | $row = $result->fetch(); |
| 177 | 177 | $result->closeCursor(); |
| 178 | 178 | |
| 179 | - return (bool)$row; |
|
| 179 | + return (bool) $row; |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | protected function getSettings($section) { |
| 68 | 68 | $settings = $this->settingsManager->getPersonalSettings($section); |
| 69 | 69 | $formatted = $this->formatSettings($settings); |
| 70 | - if($section === 'additional') { |
|
| 70 | + if ($section === 'additional') { |
|
| 71 | 71 | $formatted['content'] .= $this->getLegacyForms(); |
| 72 | 72 | } |
| 73 | 73 | return $formatted; |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | private function getLegacyForms() { |
| 80 | 80 | $forms = \OC_App::getForms('personal'); |
| 81 | 81 | |
| 82 | - $forms = array_map(function ($form) { |
|
| 82 | + $forms = array_map(function($form) { |
|
| 83 | 83 | if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) { |
| 84 | - $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]); |
|
| 84 | + $sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]); |
|
| 85 | 85 | $sectionName = str_replace('</h2>', '', $sectionName); |
| 86 | 86 | $anchor = strtolower($sectionName); |
| 87 | 87 | $anchor = str_replace(' ', '-', $anchor); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | protected function getSettings($section) { |
| 78 | 78 | $settings = $this->settingsManager->getAdminSettings($section); |
| 79 | 79 | $formatted = $this->formatSettings($settings); |
| 80 | - if($section === 'additional') { |
|
| 80 | + if ($section === 'additional') { |
|
| 81 | 81 | $formatted['content'] .= $this->getLegacyForms(); |
| 82 | 82 | } |
| 83 | 83 | return $formatted; |
@@ -89,9 +89,9 @@ discard block |
||
| 89 | 89 | private function getLegacyForms() { |
| 90 | 90 | $forms = \OC_App::getForms('admin'); |
| 91 | 91 | |
| 92 | - $forms = array_map(function ($form) { |
|
| 92 | + $forms = array_map(function($form) { |
|
| 93 | 93 | if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) { |
| 94 | - $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]); |
|
| 94 | + $sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]); |
|
| 95 | 95 | $sectionName = str_replace('</h2>', '', $sectionName); |
| 96 | 96 | $anchor = strtolower($sectionName); |
| 97 | 97 | $anchor = str_replace(' ', '-', $anchor); |
@@ -29,13 +29,13 @@ |
||
| 29 | 29 | |
| 30 | 30 | OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php'; |
| 31 | 31 | |
| 32 | -require_once __DIR__ . '/../3rdparty/autoload.php'; |
|
| 32 | +require_once __DIR__.'/../3rdparty/autoload.php'; |
|
| 33 | 33 | |
| 34 | 34 | // register Application object singleton |
| 35 | 35 | \OC_Mount_Config::$app = new \OCA\Files_External\AppInfo\Application(); |
| 36 | 36 | $appContainer = \OC_Mount_Config::$app->getContainer(); |
| 37 | 37 | |
| 38 | -\OCA\Files\App::getNavigationManager()->add(function () { |
|
| 38 | +\OCA\Files\App::getNavigationManager()->add(function() { |
|
| 39 | 39 | $l = \OC::$server->getL10N('files_external'); |
| 40 | 40 | return [ |
| 41 | 41 | 'id' => 'extstoragemounts', |