diff options
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/Manager.php | 5 | ||||
| -rw-r--r-- | lib/private/Settings/Personal/PersonalInfo.php | 44 | ||||
| -rw-r--r-- | lib/private/Settings/Theming/ServerInfo.php | 121 |
5 files changed, 4 insertions, 170 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 91ecf88dab3..a0fe19e0118 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1089,7 +1089,6 @@ return array( 'OC\\Settings\\Controller\\LogSettingsController' => $baseDir . '/settings/Controller/LogSettingsController.php', 'OC\\Settings\\Controller\\MailSettingsController' => $baseDir . '/settings/Controller/MailSettingsController.php', 'OC\\Settings\\Controller\\PersonalSettingsController' => $baseDir . '/settings/Controller/PersonalSettingsController.php', - 'OC\\Settings\\Controller\\ServerInfoSettingsController' => $baseDir . '/settings/Controller/ServerInfoSettingsController.php', 'OC\\Settings\\Controller\\TwoFactorSettingsController' => $baseDir . '/settings/Controller/TwoFactorSettingsController.php', 'OC\\Settings\\Controller\\UsersController' => $baseDir . '/settings/Controller/UsersController.php', 'OC\\Settings\\Hooks' => $baseDir . '/settings/Hooks.php', @@ -1101,7 +1100,6 @@ return array( 'OC\\Settings\\Personal\\Security' => $baseDir . '/lib/private/Settings/Personal/Security.php', 'OC\\Settings\\Personal\\ServerDevNotice' => $baseDir . '/lib/private/Settings/Personal/ServerDevNotice.php', 'OC\\Settings\\Section' => $baseDir . '/lib/private/Settings/Section.php', - 'OC\\Settings\\Theming\\ServerInfo' => $baseDir . '/lib/private/Settings/Theming/ServerInfo.php', 'OC\\Setup' => $baseDir . '/lib/private/Setup.php', 'OC\\Setup\\AbstractDatabase' => $baseDir . '/lib/private/Setup/AbstractDatabase.php', 'OC\\Setup\\MySQL' => $baseDir . '/lib/private/Setup/MySQL.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 9bd287f302d..3dcca438cb6 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1119,7 +1119,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Settings\\Controller\\LogSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/LogSettingsController.php', 'OC\\Settings\\Controller\\MailSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/MailSettingsController.php', 'OC\\Settings\\Controller\\PersonalSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/PersonalSettingsController.php', - 'OC\\Settings\\Controller\\ServerInfoSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/ServerInfoSettingsController.php', 'OC\\Settings\\Controller\\TwoFactorSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/TwoFactorSettingsController.php', 'OC\\Settings\\Controller\\UsersController' => __DIR__ . '/../../..' . '/settings/Controller/UsersController.php', 'OC\\Settings\\Hooks' => __DIR__ . '/../../..' . '/settings/Hooks.php', @@ -1131,7 +1130,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Settings\\Personal\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Security.php', 'OC\\Settings\\Personal\\ServerDevNotice' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/ServerDevNotice.php', 'OC\\Settings\\Section' => __DIR__ . '/../../..' . '/lib/private/Settings/Section.php', - 'OC\\Settings\\Theming\\ServerInfo' => __DIR__ . '/../../..' . '/lib/private/Settings/Theming/ServerInfo.php', 'OC\\Setup' => __DIR__ . '/../../..' . '/lib/private/Setup.php', 'OC\\Setup\\AbstractDatabase' => __DIR__ . '/../../..' . '/lib/private/Setup/AbstractDatabase.php', 'OC\\Setup\\MySQL' => __DIR__ . '/../../..' . '/lib/private/Setup/MySQL.php', diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 3f72557d8ec..42ec16e223b 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -192,7 +192,6 @@ class Manager implements IManager { 1 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))], 5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))], 10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))], - 30 => [new Section('theming', $this->l->t('Theming'), 0, $this->url->imagePath('settings', 'theming-dark.svg'))], 50 => [new Section('groupware', $this->l->t('Groupware'), 0, $this->url->imagePath('core', 'places/contacts.svg'))], 98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))], ]; @@ -238,10 +237,6 @@ class Manager implements IManager { $form = $this->container->query(Admin\Security::class); $forms[$form->getPriority()] = [$form]; } - if ($section === 'theming') { - $form = $this->container->query(Theming\ServerInfo::class); - $forms[$form->getPriority()] = [$form]; - } if ($section === 'sharing') { /** @var ISettings $form */ $form = $this->container->query(Admin\Sharing::class); diff --git a/lib/private/Settings/Personal/PersonalInfo.php b/lib/private/Settings/Personal/PersonalInfo.php index 74969806540..98991ce6d40 100644 --- a/lib/private/Settings/Personal/PersonalInfo.php +++ b/lib/private/Settings/Personal/PersonalInfo.php @@ -26,7 +26,6 @@ namespace OC\Settings\Personal; use OC\Accounts\AccountManager; -use OC\Settings\Theming\ServerInfo; use OCA\FederatedFileSharing\AppInfo\Application; use OCP\App\IAppManager; use OCP\AppFramework\Http\TemplateResponse; @@ -39,7 +38,6 @@ use OCP\IUser; use OCP\IUserManager; use OCP\L10N\IFactory; use OCP\Settings\ISettings; -use OCP\Encryption\IManager as EncryptionManager; class PersonalInfo implements ISettings { @@ -57,18 +55,14 @@ class PersonalInfo implements ISettings { private $l10nFactory; /** @var IL10N */ private $l; - /** @var EncryptionManager */ - private $encryptionManager; /** * @param IConfig $config * @param IUserManager $userManager * @param IGroupManager $groupManager * @param AccountManager $accountManager - * @param IAppManager $appManager * @param IFactory $l10nFactory * @param IL10N $l - * @param EncryptionManager $encryptionManager */ public function __construct( IConfig $config, @@ -77,8 +71,7 @@ class PersonalInfo implements ISettings { AccountManager $accountManager, IAppManager $appManager, IFactory $l10nFactory, - IL10N $l, - EncryptionManager $encryptionManager + IL10N $l ) { $this->config = $config; $this->userManager = $userManager; @@ -87,7 +80,6 @@ class PersonalInfo implements ISettings { $this->appManager = $appManager; $this->l10nFactory = $l10nFactory; $this->l = $l; - $this->encryptionManager = $encryptionManager; } /** @@ -143,38 +135,10 @@ class PersonalInfo implements ISettings { 'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'], 'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'], 'groups' => $this->getGroups($user), - ] + $this->getWhereIsYourDataParams() + $messageParameters + $languageParameters + $localeParameters; + ] + $messageParameters + $languageParameters + $localeParameters; - return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, ''); - } - - /** - * Returns the "where is your data" template params. - * - * @return array - */ - private function getWhereIsYourDataParams(): array { - - $adminContactConfigId = $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_ADMIN_CONTACT); - $adminContact = $this->userManager->get($adminContactConfigId); - - $params = [ - 'dataLocation' => $this->config->getSystemValue(ServerInfo::SETTING_LOCATION), - 'provider' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER), - 'providerLink' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_WEBSITE), - 'providerPrivacyLink' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_PRIVACY_LINK), - 'encryptionEnabled' => $this->encryptionManager->isEnabled(), - 'adminName' => $adminContact !== null ? $adminContact->getDisplayName() : '', - 'adminMail' => $adminContact !== null ? $adminContact->getEMailAddress() : '' - ]; - - $params['show_where_is_your_data_section'] = empty($params['dataLocation']) === false - || empty($params['provider']) === false - || $params['encryptionEnabled'] === true - || empty($params['adminName']) === false; - - return $params; + return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, ''); } /** @@ -238,7 +202,7 @@ class PersonalInfo implements ISettings { $userLang = $languages['commonlanguages'][$userLangIndex]; // search in the other languages if ($userLangIndex === false) { - $userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code')); + $userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code')); $userLang = $languages['languages'][$userLangIndex]; } // if user language is not available but set somehow: show the actual code as name diff --git a/lib/private/Settings/Theming/ServerInfo.php b/lib/private/Settings/Theming/ServerInfo.php deleted file mode 100644 index ecd2fc418fc..00000000000 --- a/lib/private/Settings/Theming/ServerInfo.php +++ /dev/null @@ -1,121 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu> - * - * @author Michael Weimann <mail@michael-weimann.eu> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -namespace OC\Settings\Theming; - -use OCP\AppFramework\Http\TemplateResponse; -use OCP\IConfig; -use OCP\IGroupManager; -use OCP\IUser; -use OCP\Settings\ISettings; - -/** - * This class describes the server info settings. - */ -class ServerInfo implements ISettings { - - const SETTING_LOCATION = 'serverinfo.location'; - const SETTING_PROVIDER = 'serverinfo.provider'; - const SETTING_PROVIDER_WEBSITE = 'serverinfo.provider.website'; - const SETTING_PROVIDER_PRIVACY_LINK = 'serverinfo.provider.privacylink'; - const SETTING_PROVIDER_ADMIN_CONTACT = 'serverinfo.admincontact'; - - /** - * @var IConfig - */ - private $config; - - /** - * @var IGroupManager - */ - private $groupManager; - - /** - * ServerInfo constructor. - * - * @param IConfig $config - * @param IGroupManager $groupManager - */ - public function __construct(IConfig $config, IGroupManager $groupManager) { - $this->config = $config; - $this->groupManager = $groupManager; - } - - /** - * @return TemplateResponse - */ - public function getForm(): TemplateResponse { - $parameters = [ - 'location' => $this->config->getSystemValue(self::SETTING_LOCATION), - 'provider' => $this->config->getSystemValue(self::SETTING_PROVIDER), - 'providerWebsite' => $this->config->getSystemValue(self::SETTING_PROVIDER_WEBSITE), - 'providerPrivacyLink' => $this->config->getSystemValue(self::SETTING_PROVIDER_PRIVACY_LINK), - 'adminUsers' => $this->getAdminListValues(), - 'adminContact' => $this->config->getSystemValue(self::SETTING_PROVIDER_ADMIN_CONTACT), - ]; - return new TemplateResponse('settings', 'settings/admin/server-info', $parameters, ''); - } - - /** - * Returns the admin list values. - * - * @return array[] An array or arrays with the keys 'id' and 'displayName' - */ - private function getAdminListValues(): array { - $adminGroup = $this->groupManager->get('admin'); - $users = $adminGroup->getUsers(); - - $users = array_map(function(IUser $user) { - return [ - 'id' => $user->getUID(), - 'displayName' => $user->getDisplayName() - ]; - }, $users); - - usort($your_data, function(array $a, array $b) { - return strcmp($a['displayName'], $b['displayName']); - }); - - return $users; - } - - /** - * Returns the server info section id. - * - * @return string - */ - public function getSection(): string { - return 'theming'; - } - - /** - * Returns the server info settings priority. - * - * @return int whether the form should be rather on the top or bottom of - * the admin section. The forms are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. - */ - public function getPriority(): int { - return 10; - } - -} |