diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-08 13:57:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-08 13:57:38 +0200 |
| commit | bae3ba3b25550d4e08ba0b0ced3473a9dc42a3de (patch) | |
| tree | 04b8874116db1cb9e877d3819bd0c150aa970273 /lib | |
| parent | 7971ba5cc66201830e5b4b141d2478efa2257c75 (diff) | |
| parent | b1b43aa7bc3c4d5ffe4973cf12644c1e60305530 (diff) | |
| download | nextcloud-server-bae3ba3b25550d4e08ba0b0ced3473a9dc42a3de.tar.gz nextcloud-server-bae3ba3b25550d4e08ba0b0ced3473a9dc42a3de.zip | |
Merge pull request #11671 from nextcloud/refactor/rename-admin-security-section
Rename admin security section
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 2 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 2 | ||||
| -rw-r--r-- | lib/private/Settings/Admin/Security.php (renamed from lib/private/Settings/Admin/Encryption.php) | 4 | ||||
| -rw-r--r-- | lib/private/Settings/Manager.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 4e8a523fada..0223cafd1d4 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -976,9 +976,9 @@ return array( 'OC\\Settings\\Activity\\SecurityProvider' => $baseDir . '/settings/Activity/SecurityProvider.php', 'OC\\Settings\\Activity\\SecuritySetting' => $baseDir . '/settings/Activity/SecuritySetting.php', 'OC\\Settings\\Activity\\Setting' => $baseDir . '/settings/Activity/Setting.php', - 'OC\\Settings\\Admin\\Encryption' => $baseDir . '/lib/private/Settings/Admin/Encryption.php', 'OC\\Settings\\Admin\\Mail' => $baseDir . '/lib/private/Settings/Admin/Mail.php', 'OC\\Settings\\Admin\\Overview' => $baseDir . '/lib/private/Settings/Admin/Overview.php', + 'OC\\Settings\\Admin\\Security' => $baseDir . '/lib/private/Settings/Admin/Security.php', 'OC\\Settings\\Admin\\Server' => $baseDir . '/lib/private/Settings/Admin/Server.php', 'OC\\Settings\\Admin\\Sharing' => $baseDir . '/lib/private/Settings/Admin/Sharing.php', 'OC\\Settings\\Application' => $baseDir . '/settings/Application.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 34c530aa1e8..4b853936887 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1006,9 +1006,9 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Settings\\Activity\\SecurityProvider' => __DIR__ . '/../../..' . '/settings/Activity/SecurityProvider.php', 'OC\\Settings\\Activity\\SecuritySetting' => __DIR__ . '/../../..' . '/settings/Activity/SecuritySetting.php', 'OC\\Settings\\Activity\\Setting' => __DIR__ . '/../../..' . '/settings/Activity/Setting.php', - 'OC\\Settings\\Admin\\Encryption' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Encryption.php', 'OC\\Settings\\Admin\\Mail' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Mail.php', 'OC\\Settings\\Admin\\Overview' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Overview.php', + 'OC\\Settings\\Admin\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Security.php', 'OC\\Settings\\Admin\\Server' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Server.php', 'OC\\Settings\\Admin\\Sharing' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Sharing.php', 'OC\\Settings\\Application' => __DIR__ . '/../../..' . '/settings/Application.php', diff --git a/lib/private/Settings/Admin/Encryption.php b/lib/private/Settings/Admin/Security.php index 65f507154ad..dd80d4d3ae6 100644 --- a/lib/private/Settings/Admin/Encryption.php +++ b/lib/private/Settings/Admin/Security.php @@ -30,7 +30,7 @@ use OCP\Encryption\IManager; use OCP\IUserManager; use OCP\Settings\ISettings; -class Encryption implements ISettings { +class Security implements ISettings { /** @var IManager */ private $manager; @@ -70,7 +70,7 @@ class Encryption implements ISettings { 'encryptionModules' => $encryptionModuleList, ]; - return new TemplateResponse('settings', 'settings/admin/encryption', $parameters, ''); + return new TemplateResponse('settings', 'settings/admin/security', $parameters, ''); } /** diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 48883582ef4..036f1ed594f 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -234,7 +234,7 @@ class Manager implements IManager { } if ($section === 'security') { /** @var ISettings $form */ - $form = $this->container->query(Admin\Encryption::class); + $form = $this->container->query(Admin\Security::class); $forms[$form->getPriority()] = [$form]; } if ($section === 'sharing') { |