Skip to content

Where is your data? #13097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 10 commits into from
Feb 11, 2019
Merged

Where is your data? #13097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
107fab9
Add the "where is your data?" frontend
weeman1337 Dec 16, 2018
6993faa
Add the "server info" settings
weeman1337 Dec 18, 2018
813ff43
Implement storing and loading the server info
weeman1337 Dec 19, 2018
d715840
Update wording
weeman1337 Jan 13, 2019
2cd3fd3
Move server info to theming section
weeman1337 Jan 13, 2019
7562edd
Fix location source
weeman1337 Jan 13, 2019
5712997
Update provider icon
weeman1337 Jan 20, 2019
b8d25a1
Remove debug setting
weeman1337 Jan 20, 2019
6c52821
Make the where is your data section optional
weeman1337 Jan 29, 2019
587a140
Code style and comment fixes
weeman1337 Feb 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 0 additions & 83 deletions apps/theming/lib/Settings/Section.php
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions apps/theming/tests/ServicesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@
use OCA\Theming\Capabilities;
use OCA\Theming\Controller\ThemingController;
use OCA\Theming\Settings\Admin;
use OCA\Theming\Settings\Section;
use OCA\Theming\ThemingDefaults;
use OCA\Theming\Util;
use OCP\AppFramework\App;
use OCP\Capabilities\ICapability;
use OCP\IL10N;
use OCP\Settings\ISection;
use OCP\Settings\ISettings;
use Test\TestCase;

Expand Down Expand Up @@ -72,8 +70,6 @@ public function queryData() {
// Settings
[Admin::class],
[Admin::class, ISettings::class],
[Section::class],
[Section::class, ISection::class],
];
}

Expand Down
77 changes: 0 additions & 77 deletions apps/theming/tests/Settings/SectionTest.php
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions core/css/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ a {
* {
cursor: pointer;
}
}

a.external {
margin: 0 3px;
text-decoration: underline;
&.external {
margin: 0 3px;
text-decoration: underline;
}
}

input {
Expand Down
5 changes: 5 additions & 0 deletions lib/private/Settings/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ public function getAdminSections(): array {
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'))],
];
Expand Down Expand Up @@ -237,6 +238,10 @@ private function getBuiltInAdminSettings($section): array {
$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);
Expand Down
44 changes: 40 additions & 4 deletions lib/private/Settings/Personal/PersonalInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
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;
Expand All @@ -38,6 +39,7 @@
use OCP\IUserManager;
use OCP\L10N\IFactory;
use OCP\Settings\ISettings;
use OCP\Encryption\IManager as EncryptionManager;
Copy link
Contributor

@kesselb kesselb Feb 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IEncryptionManager would be more clear here.

Copy link
Member

@MorrisJobke MorrisJobke Feb 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's do this later as well together with the email check.


class PersonalInfo implements ISettings {

Expand All @@ -55,14 +57,18 @@ 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,
Expand All @@ -71,7 +77,8 @@ public function __construct(
AccountManager $accountManager,
IAppManager $appManager,
IFactory $l10nFactory,
IL10N $l
IL10N $l,
EncryptionManager $encryptionManager
) {
$this->config = $config;
$this->userManager = $userManager;
Expand All @@ -80,6 +87,7 @@ public function __construct(
$this->appManager = $appManager;
$this->l10nFactory = $l10nFactory;
$this->l = $l;
$this->encryptionManager = $encryptionManager;
}

/**
Expand Down Expand Up @@ -135,12 +143,40 @@ public function getForm() {
'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
'groups' => $this->getGroups($user),
] + $messageParameters + $languageParameters + $localeParameters;

] + $this->getWhereIsYourDataParams() + $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 string the section ID, e.g. 'sharing'
* @since 9.1
Expand Down Expand Up @@ -202,7 +238,7 @@ private function getLanguages(IUser $user) {
$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
Expand Down
Loading