@@ -25,10 +25,10 @@ discard block |
||
| 25 | 25 | /** @var array $_ */ |
| 26 | 26 | |
| 27 | 27 | script('settings', [ |
| 28 | - 'usersettings', |
|
| 29 | - 'federationsettingsview', |
|
| 30 | - 'federationscopemenu', |
|
| 31 | - 'settings/personalInfo', |
|
| 28 | + 'usersettings', |
|
| 29 | + 'federationsettingsview', |
|
| 30 | + 'federationscopemenu', |
|
| 31 | + 'settings/personalInfo', |
|
| 32 | 32 | ]); |
| 33 | 33 | style('settings', 'settings'); |
| 34 | 34 | vendor_script('strengthify/jquery.strengthify'); |
@@ -105,17 +105,17 @@ discard block |
||
| 105 | 105 | <div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>"> |
| 106 | 106 | <img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src=" |
| 107 | 107 | <?php |
| 108 | - switch($_['emailVerification']) { |
|
| 109 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 110 | - p(image_path('core', 'actions/verifying.svg')); |
|
| 111 | - break; |
|
| 112 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
| 113 | - p(image_path('core', 'actions/verified.svg')); |
|
| 114 | - break; |
|
| 115 | - default: |
|
| 116 | - p(image_path('core', 'actions/verify.svg')); |
|
| 117 | - } |
|
| 118 | - ?>"> |
|
| 108 | + switch($_['emailVerification']) { |
|
| 109 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 110 | + p(image_path('core', 'actions/verifying.svg')); |
|
| 111 | + break; |
|
| 112 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
| 113 | + p(image_path('core', 'actions/verified.svg')); |
|
| 114 | + break; |
|
| 115 | + default: |
|
| 116 | + p(image_path('core', 'actions/verify.svg')); |
|
| 117 | + } |
|
| 118 | + ?>"> |
|
| 119 | 119 | </div> |
| 120 | 120 | <input type="email" name="email" id="email" value="<?php p($_['email']); ?>" |
| 121 | 121 | <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> |
@@ -172,17 +172,17 @@ discard block |
||
| 172 | 172 | <div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>"> |
| 173 | 173 | <img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src=" |
| 174 | 174 | <?php |
| 175 | - switch($_['websiteVerification']) { |
|
| 176 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 177 | - p(image_path('core', 'actions/verifying.svg')); |
|
| 178 | - break; |
|
| 179 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
| 180 | - p(image_path('core', 'actions/verified.svg')); |
|
| 181 | - break; |
|
| 182 | - default: |
|
| 183 | - p(image_path('core', 'actions/verify.svg')); |
|
| 184 | - } |
|
| 185 | - ?>" |
|
| 175 | + switch($_['websiteVerification']) { |
|
| 176 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 177 | + p(image_path('core', 'actions/verifying.svg')); |
|
| 178 | + break; |
|
| 179 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
| 180 | + p(image_path('core', 'actions/verified.svg')); |
|
| 181 | + break; |
|
| 182 | + default: |
|
| 183 | + p(image_path('core', 'actions/verify.svg')); |
|
| 184 | + } |
|
| 185 | + ?>" |
|
| 186 | 186 | <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
| 187 | 187 | > |
| 188 | 188 | <div class="verification-dialog popovermenu bubble menu"> |
@@ -209,17 +209,17 @@ discard block |
||
| 209 | 209 | <div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>"> |
| 210 | 210 | <img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src=" |
| 211 | 211 | <?php |
| 212 | - switch($_['twitterVerification']) { |
|
| 213 | - case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 214 | - p(image_path('core', 'actions/verifying.svg')); |
|
| 215 | - break; |
|
| 216 | - case \OC\Accounts\AccountManager::VERIFIED: |
|
| 217 | - p(image_path('core', 'actions/verified.svg')); |
|
| 218 | - break; |
|
| 219 | - default: |
|
| 220 | - p(image_path('core', 'actions/verify.svg')); |
|
| 221 | - } |
|
| 222 | - ?>" |
|
| 212 | + switch($_['twitterVerification']) { |
|
| 213 | + case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS: |
|
| 214 | + p(image_path('core', 'actions/verifying.svg')); |
|
| 215 | + break; |
|
| 216 | + case \OC\Accounts\AccountManager::VERIFIED: |
|
| 217 | + p(image_path('core', 'actions/verified.svg')); |
|
| 218 | + break; |
|
| 219 | + default: |
|
| 220 | + p(image_path('core', 'actions/verify.svg')); |
|
| 221 | + } |
|
| 222 | + ?>" |
|
| 223 | 223 | <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?> |
| 224 | 224 | > |
| 225 | 225 | <div class="verification-dialog popovermenu bubble menu"> |
@@ -252,8 +252,8 @@ discard block |
||
| 252 | 252 | |
| 253 | 253 | <?php |
| 254 | 254 | if($_['passwordChangeSupported']) { |
| 255 | - script('jquery-showpassword'); |
|
| 256 | - ?> |
|
| 255 | + script('jquery-showpassword'); |
|
| 256 | + ?> |
|
| 257 | 257 | <form id="passwordform" class="section"> |
| 258 | 258 | <h2 class="inlineblock"><?php p($l->t('Password'));?></h2> |
| 259 | 259 | <div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div> |
@@ -321,15 +321,15 @@ discard block |
||
| 321 | 321 | |
| 322 | 322 | <p> |
| 323 | 323 | <?php print_unescaped(str_replace( |
| 324 | - [ |
|
| 325 | - '{contributeopen}', |
|
| 326 | - '{linkclose}', |
|
| 327 | - ], |
|
| 328 | - [ |
|
| 329 | - '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">', |
|
| 330 | - '</a>', |
|
| 331 | - ], |
|
| 332 | - $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?> |
|
| 324 | + [ |
|
| 325 | + '{contributeopen}', |
|
| 326 | + '{linkclose}', |
|
| 327 | + ], |
|
| 328 | + [ |
|
| 329 | + '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">', |
|
| 330 | + '</a>', |
|
| 331 | + ], |
|
| 332 | + $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?> |
|
| 333 | 333 | </p> |
| 334 | 334 | |
| 335 | 335 | <?php if(OC_APP::isEnabled('firstrunwizard')) {?> |
@@ -36,77 +36,77 @@ |
||
| 36 | 36 | |
| 37 | 37 | $application = new Application(); |
| 38 | 38 | $application->registerRoutes($this, [ |
| 39 | - 'resources' => [ |
|
| 40 | - 'users' => ['url' => '/settings/users/users'], |
|
| 41 | - 'AuthSettings' => ['url' => '/settings/personal/authtokens'], |
|
| 42 | - ], |
|
| 43 | - 'routes' => [ |
|
| 44 | - ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'], |
|
| 45 | - ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'], |
|
| 46 | - ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'], |
|
| 47 | - ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'], |
|
| 48 | - ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'], |
|
| 49 | - ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'], |
|
| 50 | - ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'], |
|
| 51 | - ['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'], |
|
| 52 | - ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'], |
|
| 53 | - ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'], |
|
| 54 | - ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'], |
|
| 55 | - ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'], |
|
| 56 | - ['name' => 'Users#setEnabled', 'url' => '/settings/users/{id}/setEnabled', 'verb' => 'POST'], |
|
| 57 | - ['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'], |
|
| 58 | - ['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'], |
|
| 59 | - ['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'], |
|
| 60 | - ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'], |
|
| 61 | - ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'], |
|
| 62 | - ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'], |
|
| 63 | - ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'], |
|
| 64 | - ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'], |
|
| 65 | - ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], |
|
| 66 | - ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'], |
|
| 67 | - ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], |
|
| 68 | - ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']], |
|
| 69 | - ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']], |
|
| 70 | - ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'], |
|
| 71 | - ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'], |
|
| 72 | - ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'], |
|
| 73 | - ['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'], |
|
| 74 | - ['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'], |
|
| 75 | - ['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'], |
|
| 76 | - ['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'], |
|
| 77 | - ['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'], |
|
| 78 | - ['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'], |
|
| 79 | - ] |
|
| 39 | + 'resources' => [ |
|
| 40 | + 'users' => ['url' => '/settings/users/users'], |
|
| 41 | + 'AuthSettings' => ['url' => '/settings/personal/authtokens'], |
|
| 42 | + ], |
|
| 43 | + 'routes' => [ |
|
| 44 | + ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'], |
|
| 45 | + ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'], |
|
| 46 | + ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'], |
|
| 47 | + ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'], |
|
| 48 | + ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'], |
|
| 49 | + ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'], |
|
| 50 | + ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'], |
|
| 51 | + ['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'], |
|
| 52 | + ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'], |
|
| 53 | + ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'], |
|
| 54 | + ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'], |
|
| 55 | + ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'], |
|
| 56 | + ['name' => 'Users#setEnabled', 'url' => '/settings/users/{id}/setEnabled', 'verb' => 'POST'], |
|
| 57 | + ['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'], |
|
| 58 | + ['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'], |
|
| 59 | + ['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'], |
|
| 60 | + ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'], |
|
| 61 | + ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'], |
|
| 62 | + ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'], |
|
| 63 | + ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'], |
|
| 64 | + ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'], |
|
| 65 | + ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], |
|
| 66 | + ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'], |
|
| 67 | + ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], |
|
| 68 | + ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']], |
|
| 69 | + ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']], |
|
| 70 | + ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'], |
|
| 71 | + ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'], |
|
| 72 | + ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'], |
|
| 73 | + ['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'], |
|
| 74 | + ['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'], |
|
| 75 | + ['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'], |
|
| 76 | + ['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'], |
|
| 77 | + ['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'], |
|
| 78 | + ['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'], |
|
| 79 | + ] |
|
| 80 | 80 | ]); |
| 81 | 81 | |
| 82 | 82 | /** @var $this \OCP\Route\IRouter */ |
| 83 | 83 | |
| 84 | 84 | // Settings pages |
| 85 | 85 | $this->create('settings_help', '/settings/help') |
| 86 | - ->actionInclude('settings/help.php'); |
|
| 86 | + ->actionInclude('settings/help.php'); |
|
| 87 | 87 | $this->create('settings_users', '/settings/users') |
| 88 | - ->actionInclude('settings/users.php'); |
|
| 88 | + ->actionInclude('settings/users.php'); |
|
| 89 | 89 | // Settings ajax actions |
| 90 | 90 | // users |
| 91 | 91 | $this->create('settings_ajax_setquota', '/settings/ajax/setquota.php') |
| 92 | - ->actionInclude('settings/ajax/setquota.php'); |
|
| 92 | + ->actionInclude('settings/ajax/setquota.php'); |
|
| 93 | 93 | $this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php') |
| 94 | - ->actionInclude('settings/ajax/togglegroups.php'); |
|
| 94 | + ->actionInclude('settings/ajax/togglegroups.php'); |
|
| 95 | 95 | $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php') |
| 96 | - ->actionInclude('settings/ajax/togglesubadmins.php'); |
|
| 96 | + ->actionInclude('settings/ajax/togglesubadmins.php'); |
|
| 97 | 97 | $this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php') |
| 98 | - ->actionInclude('settings/ajax/changegroupname.php'); |
|
| 98 | + ->actionInclude('settings/ajax/changegroupname.php'); |
|
| 99 | 99 | // apps |
| 100 | 100 | $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php') |
| 101 | - ->actionInclude('settings/ajax/enableapp.php'); |
|
| 101 | + ->actionInclude('settings/ajax/enableapp.php'); |
|
| 102 | 102 | $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php') |
| 103 | - ->actionInclude('settings/ajax/disableapp.php'); |
|
| 103 | + ->actionInclude('settings/ajax/disableapp.php'); |
|
| 104 | 104 | $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php') |
| 105 | - ->actionInclude('settings/ajax/updateapp.php'); |
|
| 105 | + ->actionInclude('settings/ajax/updateapp.php'); |
|
| 106 | 106 | $this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php') |
| 107 | - ->actionInclude('settings/ajax/uninstallapp.php'); |
|
| 107 | + ->actionInclude('settings/ajax/uninstallapp.php'); |
|
| 108 | 108 | $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php') |
| 109 | - ->actionInclude('settings/ajax/navigationdetect.php'); |
|
| 109 | + ->actionInclude('settings/ajax/navigationdetect.php'); |
|
| 110 | 110 | // admin |
| 111 | 111 | $this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php') |
| 112 | - ->actionInclude('settings/ajax/excludegroups.php'); |
|
| 112 | + ->actionInclude('settings/ajax/excludegroups.php'); |
|