Browse Source
Rename admin security section
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
pull/11671/head
Christoph Wurst
7 years ago
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
5 changed files with
8 additions and
8 deletions
-
lib/composer/composer/autoload_classmap.php
-
lib/composer/composer/autoload_static.php
-
lib/private/Settings/Admin/Security.php
-
lib/private/Settings/Manager.php
-
tests/lib/Settings/Admin/SecurityTest.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', |
|
|
|
|
|
|
|
@ -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', |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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') { |
|
|
|
|
|
|
|
@ -24,13 +24,13 @@ |
|
|
|
namespace Test\Settings\Admin; |
|
|
|
|
|
|
|
use OC\Encryption\Manager; |
|
|
|
use OC\Settings\Admin\Encryption; |
|
|
|
use OC\Settings\Admin\Security; |
|
|
|
use OCP\AppFramework\Http\TemplateResponse; |
|
|
|
use OCP\IUserManager; |
|
|
|
use Test\TestCase; |
|
|
|
|
|
|
|
class EncryptionTest extends TestCase { |
|
|
|
/** @var Encryption */ |
|
|
|
class SecurityTest extends TestCase { |
|
|
|
/** @var Security */ |
|
|
|
private $admin; |
|
|
|
/** @var Manager */ |
|
|
|
private $manager; |
|
|
|
@ -42,7 +42,7 @@ class EncryptionTest extends TestCase { |
|
|
|
$this->manager = $this->getMockBuilder('\OC\Encryption\Manager')->disableOriginalConstructor()->getMock(); |
|
|
|
$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock(); |
|
|
|
|
|
|
|
$this->admin = new Encryption( |
|
|
|
$this->admin = new Security( |
|
|
|
$this->manager, |
|
|
|
$this->userManager |
|
|
|
); |