Merge pull request #13097 from nextcloud/feature/11319/where-is-your-data

Where is your data?

Author: MorrisJobke

apps/theming/lib/Settings/Section.php

@@ -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;
 
@@ -72,8 +70,6 @@ public function queryData() {
 			// Settings
 			[Admin::class],
 			[Admin::class, ISettings::class],
-			[Section::class],
-			[Section::class, ISection::class],
 		];
 	}
 

apps/theming/tests/ServicesTest.php

@@ -60,11 +60,11 @@ a {
 	* {
 		cursor: pointer;
 	}
-}
 
-a.external {
-	margin: 0 3px;
-	text-decoration: underline;
+	&.external {
+		margin: 0 3px;
+		text-decoration: underline;
+	}
 }
 
 input {

apps/theming/tests/Settings/SectionTest.php

@@ -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'))],
 		];
@@ -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);

core/css/styles.scss

@@ -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;
@@ -38,6 +39,7 @@
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Settings\ISettings;
+use OCP\Encryption\IManager as EncryptionManager;
 
 class PersonalInfo implements ISettings {
 
@@ -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,
@@ -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;
@@ -80,6 +87,7 @@ public function __construct(
 		$this->appManager = $appManager;
 		$this->l10nFactory = $l10nFactory;
 		$this->l = $l;
+		$this->encryptionManager = $encryptionManager;
 	}
 
 	/**
@@ -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
@@ -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