nextcloud / server

settings/Controller/CommonSettingsTrait.php

Doc Comments +12 added lines

@@ -51,6 +51,9 @@ 
 		];
 	}
 
+	/**
+	 * @param string $type
+	 */
 	protected function formatSections($sections, $currentSection, $type) {
 		$templateParameters = [];
 		/** @var \OCP\Settings\ISection[] $prioritizedSections */
@@ -81,6 +84,9 @@ 
 		return $templateParameters;
 	}
 
+	/**
+	 * @param string $currentSections
+	 */
 	protected function formatPersonalSections($currentSections) {
 		$sections = $this->settingsManager->getPersonalSections();
 		$templateParameters = $this->formatSections($sections, $currentSections, 'personal');
@@ -88,6 +94,9 @@ 
 		return $templateParameters;
 	}
 
+	/**
+	 * @param string $currentSections
+	 */
 	protected function formatAdminSections($currentSections) {
 		$sections = $this->settingsManager->getAdminSections();
 		$templateParameters = $this->formatSections($sections, $currentSections, 'admin');
@@ -111,6 +120,9 @@ 
 		return ['content' => $html];
 	}
 
+	/**
+	 * @param string $section
+	 */
 	private function getIndexResponse($section) {
 		$templateParams = [];
 		$templateParams = array_merge($templateParams, $this->getNavigationParameters($section));

Indentation +91 added lines, -91 removed lines

@@ -29,95 +29,95 @@
 use OCP\Settings\ISettings;
 
 trait CommonSettingsTrait  {
-	/** @var ISettingsManager */
-	private $settingsManager;
-
-	/**
-	 * @param string $currentSection
-	 * @return array
-	 */
-	private function getNavigationParameters($currentSection) {
-		$templateParameters = [
-			'personal' => $this->formatPersonalSections($currentSection),
-			'admin' => []
-		];
-
-		if(\OC_User::isAdminUser(\OC_User::getUser())) {
-			$templateParameters['admin'] = $this->formatAdminSections($currentSection);
-		}
-
-		return [
-			'forms' => $templateParameters
-		];
-	}
-
-	protected function formatSections($sections, $currentSection, $type) {
-		$templateParameters = [];
-		/** @var \OCP\Settings\ISection[] $prioritizedSections */
-		foreach($sections as $prioritizedSections) {
-			foreach ($prioritizedSections as $section) {
-				if($type === 'admin') {
-					$settings = $this->settingsManager->getAdminSettings($section->getID());
-				} else if($type === 'personal') {
-					$settings = $this->settingsManager->getPersonalSettings($section->getID());
-				}
-				if (empty($settings)) {
-					continue;
-				}
-
-				$icon = '';
-				if ($section instanceof IIconSection) {
-					$icon = $section->getIcon();
-				}
-
-				$templateParameters[] = [
-					'anchor'       => $section->getID(),
-					'section-name' => $section->getName(),
-					'active'       => $section->getID() === $currentSection,
-					'icon'         => $icon,
-				];
-			}
-		}
-		return $templateParameters;
-	}
-
-	protected function formatPersonalSections($currentSections) {
-		$sections = $this->settingsManager->getPersonalSections();
-		$templateParameters = $this->formatSections($sections, $currentSections, 'personal');
-
-		return $templateParameters;
-	}
-
-	protected function formatAdminSections($currentSections) {
-		$sections = $this->settingsManager->getAdminSections();
-		$templateParameters = $this->formatSections($sections, $currentSections, 'admin');
-
-		return $templateParameters;
-	}
-
-	/**
-	 * @param ISettings[] $settings
-	 * @return array
-	 */
-	private function formatSettings($settings) {
-		$html = '';
-		foreach ($settings as $prioritizedSettings) {
-			foreach ($prioritizedSettings as $setting) {
-				/** @var \OCP\Settings\ISettings $setting */
-				$form = $setting->getForm();
-				$html .= $form->renderAs('')->render();
-			}
-		}
-		return ['content' => $html];
-	}
-
-	private function getIndexResponse($section) {
-		$templateParams = [];
-		$templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
-		$templateParams = array_merge($templateParams, $this->getSettings($section));
-
-		return new TemplateResponse('settings', 'settings/frame', $templateParams);
-	}
-
-	abstract public function getSettings($section);
+    /** @var ISettingsManager */
+    private $settingsManager;
+
+    /**
+     * @param string $currentSection
+     * @return array
+     */
+    private function getNavigationParameters($currentSection) {
+        $templateParameters = [
+            'personal' => $this->formatPersonalSections($currentSection),
+            'admin' => []
+        ];
+
+        if(\OC_User::isAdminUser(\OC_User::getUser())) {
+            $templateParameters['admin'] = $this->formatAdminSections($currentSection);
+        }
+
+        return [
+            'forms' => $templateParameters
+        ];
+    }
+
+    protected function formatSections($sections, $currentSection, $type) {
+        $templateParameters = [];
+        /** @var \OCP\Settings\ISection[] $prioritizedSections */
+        foreach($sections as $prioritizedSections) {
+            foreach ($prioritizedSections as $section) {
+                if($type === 'admin') {
+                    $settings = $this->settingsManager->getAdminSettings($section->getID());
+                } else if($type === 'personal') {
+                    $settings = $this->settingsManager->getPersonalSettings($section->getID());
+                }
+                if (empty($settings)) {
+                    continue;
+                }
+
+                $icon = '';
+                if ($section instanceof IIconSection) {
+                    $icon = $section->getIcon();
+                }
+
+                $templateParameters[] = [
+                    'anchor'       => $section->getID(),
+                    'section-name' => $section->getName(),
+                    'active'       => $section->getID() === $currentSection,
+                    'icon'         => $icon,
+                ];
+            }
+        }
+        return $templateParameters;
+    }
+
+    protected function formatPersonalSections($currentSections) {
+        $sections = $this->settingsManager->getPersonalSections();
+        $templateParameters = $this->formatSections($sections, $currentSections, 'personal');
+
+        return $templateParameters;
+    }
+
+    protected function formatAdminSections($currentSections) {
+        $sections = $this->settingsManager->getAdminSections();
+        $templateParameters = $this->formatSections($sections, $currentSections, 'admin');
+
+        return $templateParameters;
+    }
+
+    /**
+     * @param ISettings[] $settings
+     * @return array
+     */
+    private function formatSettings($settings) {
+        $html = '';
+        foreach ($settings as $prioritizedSettings) {
+            foreach ($prioritizedSettings as $setting) {
+                /** @var \OCP\Settings\ISettings $setting */
+                $form = $setting->getForm();
+                $html .= $form->renderAs('')->render();
+            }
+        }
+        return ['content' => $html];
+    }
+
+    private function getIndexResponse($section) {
+        $templateParams = [];
+        $templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
+        $templateParams = array_merge($templateParams, $this->getSettings($section));
+
+        return new TemplateResponse('settings', 'settings/frame', $templateParams);
+    }
+
+    abstract public function getSettings($section);
 }

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 use OCP\Settings\IIconSection;
 use OCP\Settings\ISettings;
 
-trait CommonSettingsTrait  {
+trait CommonSettingsTrait {
 	/** @var ISettingsManager */
 	private $settingsManager;
 
@@ -42,7 +42,7 @@ 
 			'admin' => []
 		];
 
-		if(\OC_User::isAdminUser(\OC_User::getUser())) {
+		if (\OC_User::isAdminUser(\OC_User::getUser())) {
 			$templateParameters['admin'] = $this->formatAdminSections($currentSection);
 		}
 
@@ -54,11 +54,11 @@ 
 	protected function formatSections($sections, $currentSection, $type) {
 		$templateParameters = [];
 		/** @var \OCP\Settings\ISection[] $prioritizedSections */
-		foreach($sections as $prioritizedSections) {
+		foreach ($sections as $prioritizedSections) {
 			foreach ($prioritizedSections as $section) {
-				if($type === 'admin') {
+				if ($type === 'admin') {
 					$settings = $this->settingsManager->getAdminSettings($section->getID());
-				} else if($type === 'personal') {
+				} else if ($type === 'personal') {
 					$settings = $this->settingsManager->getPersonalSettings($section->getID());
 				}
 				if (empty($settings)) {

lib/private/Settings/Personal/PersonalInfo.php

Braces +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 				$ln = array('code' => $lang, 'name' => $potentialName);
 			} elseif ($lang === 'en') {
 				$ln = ['code' => $lang, 'name' => 'English (US)'];
-			}else{//fallback to language code
+			} else{//fallback to language code
 				$ln=array('code'=>$lang, 'name'=>$lang);
 			}
 

Spacing +7 added lines, -7 removed lines

@@ -154,16 +154,16 @@ 
 		$commonLanguages = [];
 		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
 		$languageCodes = $this->l10nFactory->findAvailableLanguages();
-		foreach($languageCodes as $lang) {
+		foreach ($languageCodes as $lang) {
 			$l = \OC::$server->getL10N('settings', $lang);
 			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 			$potentialName = (string) $l->t('__language_name__');
-			if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+			if ($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
 				$ln = array('code' => $lang, 'name' => $potentialName);
 			} elseif ($lang === 'en') {
 				$ln = ['code' => $lang, 'name' => 'English (US)'];
-			}else{//fallback to language code
-				$ln=array('code'=>$lang, 'name'=>$lang);
+			} else {//fallback to language code
+				$ln = array('code'=>$lang, 'name'=>$lang);
 			}
 
 			// put appropriate languages into appropriate arrays, to print them sorted
@@ -171,9 +171,9 @@ 
 			if ($lang === $userLang) {
 				$userLang = $ln;
 			} elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
-				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
+				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)] = $ln;
 			} else {
-				$languages[]=$ln;
+				$languages[] = $ln;
 			}
 		}
 
@@ -188,7 +188,7 @@ 
 		ksort($commonLanguages);
 
 		// sort now by displayed language not the iso-code
-		usort( $languages, function ($a, $b) {
+		usort($languages, function($a, $b) {
 			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 				// If a doesn't have a name, but b does, list b before a
 				return 1;

Indentation +199 added lines, -199 removed lines

@@ -37,204 +37,204 @@
 use OCP\Settings\ISettings;
 
 class PersonalInfo implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IFactory */
-	private $l10nFactory;
-
-	const COMMON_LANGUAGE_CODES = [
-		'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it',
-		'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
-	];
-
-	/** @var IL10N */
-	private $l;
-
-	/**
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param AccountManager $accountManager
-	 * @param IFactory $l10nFactory
-	 * @param IL10N $l
-	 */
-	public function __construct(
-		IConfig $config,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		AccountManager $accountManager,
-		IFactory $l10nFactory,
-		IL10N $l
-	) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
-		$this->groupManager = $groupManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->l = $l;
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$lookupServerUploadEnabled = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes');
-		$lookupServerUploadEnabled = $lookupServerUploadEnabled === 'yes';
-
-		$uid = \OC_User::getUser();
-		$user = $this->userManager->get($uid);
-		$userData = $this->accountManager->getUser($user);
-
-		$storageInfo = \OC_Helper::getStorageInfo('/');
-		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l->t('Unlimited');
-		} else {
-			$totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
-		}
-
-		list($activeLanguage, $commonLanguages, $languages) = $this->getLanguages($user);
-
-		$parameters = [
-			'total_space' => $totalSpace,
-			'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
-			'usage_relative' => $storageInfo['relative'],
-			'quota' => $storageInfo['quota'],
-			'avatarChangeSupported' => \OC_User::canUserChangeAvatar($uid),
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-			'avatar_scope' => $userData[AccountManager::PROPERTY_AVATAR]['scope'],
-			'displayNameChangeSupported' => \OC_User::canUserChangeDisplayName($uid),
-			'displayName' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'],
-			'email' => $userData[AccountManager::PROPERTY_EMAIL]['value'],
-			'emailScope' => $userData[AccountManager::PROPERTY_EMAIL]['scope'],
-			'emailMesage' => '',
-			'emailVerification' => $userData[AccountManager::PROPERTY_EMAIL]['verified'],
-			'phone' => $userData[AccountManager::PROPERTY_PHONE]['value'],
-			'phoneScope' => $userData[AccountManager::PROPERTY_PHONE]['scope'],
-			'address', $userData[AccountManager::PROPERTY_ADDRESS]['value'],
-			'addressScope', $userData[AccountManager::PROPERTY_ADDRESS]['scope'],
-			'website' =>  $userData[AccountManager::PROPERTY_WEBSITE]['value'],
-			'websiteScope' =>  $userData[AccountManager::PROPERTY_WEBSITE]['scope'],
-			'websiteVerification' => $userData[AccountManager::PROPERTY_WEBSITE]['verified'],
-			'twitter' => $userData[AccountManager::PROPERTY_TWITTER]['value'],
-			'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
-			'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
-			'groups' => $this->getGroups($user),
-			'passwordChangeSupported' => \OC_User::canUserChangePassword($uid),
-			'activelanguage' => $activeLanguage,
-			'commonlanguages' => $commonLanguages,
-			'languages' => $languages,
-		];
-
-
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'personal-info';
-	}
-
-	/**
-	 * @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.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 10;
-	}
-
-	/**
-	 * returns a sorted list of the user's group GIDs
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	private function getGroups(IUser $user) {
-		$groups = array_map(
-			function(IGroup $group) {
-				return $group->getGID();
-			},
-			$this->groupManager->getUserGroups($user)
-		);
-		sort($groups);
-
-		return $groups;
-	}
-
-	/**
-	 * returns the user language, common language and other languages in an
-	 * associative array
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	private function getLanguages(IUser $user) {
-		$uid = $user->getUID();
-
-		$commonLanguages = [];
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$languageCodes = $this->l10nFactory->findAvailableLanguages();
-		foreach($languageCodes as $lang) {
-			$l = \OC::$server->getL10N('settings', $lang);
-			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
-			$potentialName = (string) $l->t('__language_name__');
-			if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
-				$ln = array('code' => $lang, 'name' => $potentialName);
-			} elseif ($lang === 'en') {
-				$ln = ['code' => $lang, 'name' => 'English (US)'];
-			}else{//fallback to language code
-				$ln=array('code'=>$lang, 'name'=>$lang);
-			}
-
-			// put appropriate languages into appropriate arrays, to print them sorted
-			// used language -> common languages -> divider -> other languages
-			if ($lang === $userLang) {
-				$userLang = $ln;
-			} elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
-				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
-			} else {
-				$languages[]=$ln;
-			}
-		}
-
-		// if user language is not available but set somehow: show the actual code as name
-		if (!is_array($userLang)) {
-			$userLang = [
-				'code' => $userLang,
-				'name' => $userLang,
-			];
-		}
-
-		ksort($commonLanguages);
-
-		// sort now by displayed language not the iso-code
-		usort( $languages, function ($a, $b) {
-			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
-				// If a doesn't have a name, but b does, list b before a
-				return 1;
-			}
-			if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
-				// If a does have a name, but b doesn't, list a before b
-				return -1;
-			}
-			// Otherwise compare the names
-			return strcmp($a['name'], $b['name']);
-		});
-
-		return [$userLang, $commonLanguages, $languages];
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IFactory */
+    private $l10nFactory;
+
+    const COMMON_LANGUAGE_CODES = [
+        'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it',
+        'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
+    ];
+
+    /** @var IL10N */
+    private $l;
+
+    /**
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param AccountManager $accountManager
+     * @param IFactory $l10nFactory
+     * @param IL10N $l
+     */
+    public function __construct(
+        IConfig $config,
+        IUserManager $userManager,
+        IGroupManager $groupManager,
+        AccountManager $accountManager,
+        IFactory $l10nFactory,
+        IL10N $l
+    ) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->accountManager = $accountManager;
+        $this->groupManager = $groupManager;
+        $this->l10nFactory = $l10nFactory;
+        $this->l = $l;
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $lookupServerUploadEnabled = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes');
+        $lookupServerUploadEnabled = $lookupServerUploadEnabled === 'yes';
+
+        $uid = \OC_User::getUser();
+        $user = $this->userManager->get($uid);
+        $userData = $this->accountManager->getUser($user);
+
+        $storageInfo = \OC_Helper::getStorageInfo('/');
+        if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l->t('Unlimited');
+        } else {
+            $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
+        }
+
+        list($activeLanguage, $commonLanguages, $languages) = $this->getLanguages($user);
+
+        $parameters = [
+            'total_space' => $totalSpace,
+            'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
+            'usage_relative' => $storageInfo['relative'],
+            'quota' => $storageInfo['quota'],
+            'avatarChangeSupported' => \OC_User::canUserChangeAvatar($uid),
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+            'avatar_scope' => $userData[AccountManager::PROPERTY_AVATAR]['scope'],
+            'displayNameChangeSupported' => \OC_User::canUserChangeDisplayName($uid),
+            'displayName' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'],
+            'email' => $userData[AccountManager::PROPERTY_EMAIL]['value'],
+            'emailScope' => $userData[AccountManager::PROPERTY_EMAIL]['scope'],
+            'emailMesage' => '',
+            'emailVerification' => $userData[AccountManager::PROPERTY_EMAIL]['verified'],
+            'phone' => $userData[AccountManager::PROPERTY_PHONE]['value'],
+            'phoneScope' => $userData[AccountManager::PROPERTY_PHONE]['scope'],
+            'address', $userData[AccountManager::PROPERTY_ADDRESS]['value'],
+            'addressScope', $userData[AccountManager::PROPERTY_ADDRESS]['scope'],
+            'website' =>  $userData[AccountManager::PROPERTY_WEBSITE]['value'],
+            'websiteScope' =>  $userData[AccountManager::PROPERTY_WEBSITE]['scope'],
+            'websiteVerification' => $userData[AccountManager::PROPERTY_WEBSITE]['verified'],
+            'twitter' => $userData[AccountManager::PROPERTY_TWITTER]['value'],
+            'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
+            'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
+            'groups' => $this->getGroups($user),
+            'passwordChangeSupported' => \OC_User::canUserChangePassword($uid),
+            'activelanguage' => $activeLanguage,
+            'commonlanguages' => $commonLanguages,
+            'languages' => $languages,
+        ];
+
+
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'personal-info';
+    }
+
+    /**
+     * @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.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 10;
+    }
+
+    /**
+     * returns a sorted list of the user's group GIDs
+     *
+     * @param IUser $user
+     * @return array
+     */
+    private function getGroups(IUser $user) {
+        $groups = array_map(
+            function(IGroup $group) {
+                return $group->getGID();
+            },
+            $this->groupManager->getUserGroups($user)
+        );
+        sort($groups);
+
+        return $groups;
+    }
+
+    /**
+     * returns the user language, common language and other languages in an
+     * associative array
+     *
+     * @param IUser $user
+     * @return array
+     */
+    private function getLanguages(IUser $user) {
+        $uid = $user->getUID();
+
+        $commonLanguages = [];
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $languageCodes = $this->l10nFactory->findAvailableLanguages();
+        foreach($languageCodes as $lang) {
+            $l = \OC::$server->getL10N('settings', $lang);
+            // TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
+            $potentialName = (string) $l->t('__language_name__');
+            if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+                $ln = array('code' => $lang, 'name' => $potentialName);
+            } elseif ($lang === 'en') {
+                $ln = ['code' => $lang, 'name' => 'English (US)'];
+            }else{//fallback to language code
+                $ln=array('code'=>$lang, 'name'=>$lang);
+            }
+
+            // put appropriate languages into appropriate arrays, to print them sorted
+            // used language -> common languages -> divider -> other languages
+            if ($lang === $userLang) {
+                $userLang = $ln;
+            } elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
+                $commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
+            } else {
+                $languages[]=$ln;
+            }
+        }
+
+        // if user language is not available but set somehow: show the actual code as name
+        if (!is_array($userLang)) {
+            $userLang = [
+                'code' => $userLang,
+                'name' => $userLang,
+            ];
+        }
+
+        ksort($commonLanguages);
+
+        // sort now by displayed language not the iso-code
+        usort( $languages, function ($a, $b) {
+            if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
+                // If a doesn't have a name, but b does, list b before a
+                return 1;
+            }
+            if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
+                // If a does have a name, but b doesn't, list a before b
+                return -1;
+            }
+            // Otherwise compare the names
+            return strcmp($a['name'], $b['name']);
+        });
+
+        return [$userLang, $commonLanguages, $languages];
+    }
 
 }

settings/Controller/AdminSettingsController.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 		// PhpStorm shows this as unused, but is required by CommonSettingsTrait
 		$settings = $this->settingsManager->getAdminSettings($section);
 		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
+		if ($section === 'additional') {
 			$formatted['content'] .= $this->getLegacyForms();
 		}
 		return $formatted;
@@ -90,9 +90,9 @@ 
 	private function getLegacyForms() {
 		$forms = \OC_App::getForms('admin');
 
-		$forms = array_map(function ($form) {
+		$forms = array_map(function($form) {
 			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+				$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
 				$sectionName = str_replace('</h2>', '', $sectionName);
 				$anchor = strtolower($sectionName);
 				$anchor = str_replace(' ', '-', $anchor);

Indentation +69 added lines, -69 removed lines

@@ -35,84 +35,84 @@
  * @package OC\Settings\Controller
  */
 class AdminSettingsController extends Controller {
-	use CommonSettingsTrait;
+    use CommonSettingsTrait;
 
-	/** @var INavigationManager */
-	private $navigationManager;
-	/** @var ISettingsManager */
-	private $settingsManager;
+    /** @var INavigationManager */
+    private $navigationManager;
+    /** @var ISettingsManager */
+    private $settingsManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param INavigationManager $navigationManager
-	 * @param ISettingsManager $settingsManager
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		INavigationManager $navigationManager,
-		ISettingsManager $settingsManager
-	) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->settingsManager = $settingsManager;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param INavigationManager $navigationManager
+     * @param ISettingsManager $settingsManager
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        INavigationManager $navigationManager,
+        ISettingsManager $settingsManager
+    ) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @param string $section
-	 * @return TemplateResponse
-	 *
-	 * @NoCSRFRequired
-	 */
-	public function index($section) {
-		$this->navigationManager->setActiveEntry('admin');
-		return $this->getIndexResponse($section);
-	}
+    /**
+     * @param string $section
+     * @return TemplateResponse
+     *
+     * @NoCSRFRequired
+     */
+    public function index($section) {
+        $this->navigationManager->setActiveEntry('admin');
+        return $this->getIndexResponse($section);
+    }
 
-	/**
-	 * @param string $section
-	 * @return array
-	 */
-	private function getSettings($section) {
-		// PhpStorm shows this as unused, but is required by CommonSettingsTrait
-		$settings = $this->settingsManager->getAdminSettings($section);
-		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
-			$formatted['content'] .= $this->getLegacyForms();
-		}
-		return $formatted;
-	}
+    /**
+     * @param string $section
+     * @return array
+     */
+    private function getSettings($section) {
+        // PhpStorm shows this as unused, but is required by CommonSettingsTrait
+        $settings = $this->settingsManager->getAdminSettings($section);
+        $formatted = $this->formatSettings($settings);
+        if($section === 'additional') {
+            $formatted['content'] .= $this->getLegacyForms();
+        }
+        return $formatted;
+    }
 
-	/**
-	 * @return bool|string
-	 */
-	private function getLegacyForms() {
-		$forms = \OC_App::getForms('admin');
+    /**
+     * @return bool|string
+     */
+    private function getLegacyForms() {
+        $forms = \OC_App::getForms('admin');
 
-		$forms = array_map(function ($form) {
-			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
-				$sectionName = str_replace('</h2>', '', $sectionName);
-				$anchor = strtolower($sectionName);
-				$anchor = str_replace(' ', '-', $anchor);
+        $forms = array_map(function ($form) {
+            if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+                $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+                $sectionName = str_replace('</h2>', '', $sectionName);
+                $anchor = strtolower($sectionName);
+                $anchor = str_replace(' ', '-', $anchor);
 
-				return array(
-					'anchor' => $anchor,
-					'section-name' => $sectionName,
-					'form' => $form
-				);
-			}
-			return array(
-				'form' => $form
-			);
-		}, $forms);
+                return array(
+                    'anchor' => $anchor,
+                    'section-name' => $sectionName,
+                    'form' => $form
+                );
+            }
+            return array(
+                'form' => $form
+            );
+        }, $forms);
 
-		$out = new Template('settings', 'settings/additional');
-		$out->assign('forms', $forms);
+        $out = new Template('settings', 'settings/additional');
+        $out->assign('forms', $forms);
 
-		return $out->fetchPage();
-	}
+        return $out->fetchPage();
+    }
 
 
 }

settings/templates/settings/frame.php

Indentation +23 added lines, -23 removed lines

@@ -32,13 +32,13 @@ 
 	<ul>
 		<li class="settings-caption">Personal</li>
 		<?php
-		foreach($_['forms']['personal'] as $form) {
-			if (isset($form['anchor'])) {
-				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
-				$class = 'nav-icon-' . $form['anchor'];
-				$sectionName = $form['section-name'];
-				$active = $form['active'] ? ' class="active"' : '';
-				?>
+        foreach($_['forms']['personal'] as $form) {
+            if (isset($form['anchor'])) {
+                $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
+                $class = 'nav-icon-' . $form['anchor'];
+                $sectionName = $form['section-name'];
+                $active = $form['active'] ? ' class="active"' : '';
+                ?>
 				<li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>
 					<a href="<?php p($anchor); ?>">
 						<?php if (!empty($form['icon'])) { ?>
@@ -50,24 +50,24 @@ 
 					</a>
 				</li>
 				<?php
-			}
-		}
-		?>
+            }
+        }
+        ?>
 
 		<?php
-		if(!empty($_['forms']['admin'])) {
-			?>
+        if(!empty($_['forms']['admin'])) {
+            ?>
 			<li class="settings-caption">Administration</li>
 			<?php
-		}
-		foreach($_['forms']['admin'] as $form) {
-			if (isset($form['anchor'])) {
+        }
+        foreach($_['forms']['admin'] as $form) {
+            if (isset($form['anchor'])) {
 
-				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
-				$class = 'nav-icon-' . $form['anchor'];
-				$sectionName = $form['section-name'];
-				$active = $form['active'] ? ' class="active"' : '';
-		?>
+                $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
+                $class = 'nav-icon-' . $form['anchor'];
+                $sectionName = $form['section-name'];
+                $active = $form['active'] ? ' class="active"' : '';
+        ?>
 				<li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>
 					<a href="<?php p($anchor); ?>">
 						<?php if (!empty($form['icon'])) { ?>
@@ -79,9 +79,9 @@ 
 					</a>
 				</li>
 		<?php
-			}
-		}
-		?>
+            }
+        }
+        ?>
 	</ul>
 </div>
 

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 style('settings', 'settings');
-script('settings', [ 'settings', 'admin', 'log', 'certificates'] );
+script('settings', ['settings', 'admin', 'log', 'certificates']);
 script('core', ['multiselect', 'setupchecks']);
 script('files', 'jquery.fileupload');
 
@@ -32,10 +32,10 @@ 
 	<ul>
 		<li class="settings-caption">Personal</li>
 		<?php
-		foreach($_['forms']['personal'] as $form) {
+		foreach ($_['forms']['personal'] as $form) {
 			if (isset($form['anchor'])) {
 				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
-				$class = 'nav-icon-' . $form['anchor'];
+				$class = 'nav-icon-'.$form['anchor'];
 				$sectionName = $form['section-name'];
 				$active = $form['active'] ? ' class="active"' : '';
 				?>
@@ -55,16 +55,16 @@ 
 		?>
 
 		<?php
-		if(!empty($_['forms']['admin'])) {
+		if (!empty($_['forms']['admin'])) {
 			?>
 			<li class="settings-caption">Administration</li>
 			<?php
 		}
-		foreach($_['forms']['admin'] as $form) {
+		foreach ($_['forms']['admin'] as $form) {
 			if (isset($form['anchor'])) {
 
 				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
-				$class = 'nav-icon-' . $form['anchor'];
+				$class = 'nav-icon-'.$form['anchor'];
 				$sectionName = $form['section-name'];
 				$active = $form['active'] ? ' class="active"' : '';
 		?>

settings/routes.php

Indentation +53 added lines, -53 removed lines

@@ -36,77 +36,77 @@
 
 $application = new Application();
 $application->registerRoutes($this, [
-	'resources' => [
-		'users' => ['url' => '/settings/users/users'],
-		'AuthSettings' => ['url' => '/settings/personal/authtokens'],
-	],
-	'routes' => [
-		['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
-		['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
-		['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
-		['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
-		['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
-		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
-		['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
-		['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
-		['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
-		['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
-		['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
-		['name' => 'Users#setEnabled', 'url' => '/settings/users/{id}/setEnabled', 'verb' => 'POST'],
-		['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'],
-		['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
-		['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
-		['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
-		['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
-		['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
-		['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
-		['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
-		['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
-		['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
-		['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
-		['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
-		['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'],
-		['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'],
-		['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'],
-		['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'],
-		['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'],
-		['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'],
-	]
+    'resources' => [
+        'users' => ['url' => '/settings/users/users'],
+        'AuthSettings' => ['url' => '/settings/personal/authtokens'],
+    ],
+    'routes' => [
+        ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
+        ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
+        ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
+        ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
+        ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
+        ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
+        ['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
+        ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
+        ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
+        ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
+        ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
+        ['name' => 'Users#setEnabled', 'url' => '/settings/users/{id}/setEnabled', 'verb' => 'POST'],
+        ['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'],
+        ['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
+        ['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
+        ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
+        ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
+        ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
+        ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
+        ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
+        ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
+        ['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'],
+        ['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'],
+        ['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'],
+        ['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'],
+        ['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'],
+        ['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'],
+    ]
 ]);
 
 /** @var $this \OCP\Route\IRouter */
 
 // Settings pages
 $this->create('settings_help', '/settings/help')
-	->actionInclude('settings/help.php');
+    ->actionInclude('settings/help.php');
 $this->create('settings_users', '/settings/users')
-	->actionInclude('settings/users.php');
+    ->actionInclude('settings/users.php');
 // Settings ajax actions
 // users
 $this->create('settings_ajax_setquota', '/settings/ajax/setquota.php')
-	->actionInclude('settings/ajax/setquota.php');
+    ->actionInclude('settings/ajax/setquota.php');
 $this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php')
-	->actionInclude('settings/ajax/togglegroups.php');
+    ->actionInclude('settings/ajax/togglegroups.php');
 $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php')
-	->actionInclude('settings/ajax/togglesubadmins.php');
+    ->actionInclude('settings/ajax/togglesubadmins.php');
 $this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php')
-	->actionInclude('settings/ajax/changegroupname.php');
+    ->actionInclude('settings/ajax/changegroupname.php');
 // apps
 $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
-	->actionInclude('settings/ajax/enableapp.php');
+    ->actionInclude('settings/ajax/enableapp.php');
 $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
-	->actionInclude('settings/ajax/disableapp.php');
+    ->actionInclude('settings/ajax/disableapp.php');
 $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
-	->actionInclude('settings/ajax/updateapp.php');
+    ->actionInclude('settings/ajax/updateapp.php');
 $this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php')
-	->actionInclude('settings/ajax/uninstallapp.php');
+    ->actionInclude('settings/ajax/uninstallapp.php');
 $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
-	->actionInclude('settings/ajax/navigationdetect.php');
+    ->actionInclude('settings/ajax/navigationdetect.php');
 // admin
 $this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
-	->actionInclude('settings/ajax/excludegroups.php');
+    ->actionInclude('settings/ajax/excludegroups.php');

lib/private/Settings/Personal/AppPasswords.php

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
 
 class AppPasswords implements ISettings {
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		return new TemplateResponse('settings', 'settings/personal/app-passwords');
-	}
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        return new TemplateResponse('settings', 'settings/personal/app-passwords');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'app-passwords';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'app-passwords';
+    }
 
-	/**
-	 * @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.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 5;
-	}
+    /**
+     * @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.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 5;
+    }
 }

lib/private/Settings/Personal/Sessions.php

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
 
 class Sessions implements ISettings {
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		return new TemplateResponse('settings', 'settings/personal/sessions');
-	}
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        return new TemplateResponse('settings', 'settings/personal/sessions');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'sessions';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'sessions';
+    }
 
-	/**
-	 * @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.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @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.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 10;
+    }
 }

lib/private/Settings/Personal/SyncClients.php

Indentation +47 added lines, -47 removed lines

@@ -30,56 +30,56 @@
 
 class SyncClients implements ISettings {
 
-	/** @var IConfig */
-	private $config;
-	/** @var \OC_Defaults */
-	private $defaults;
+    /** @var IConfig */
+    private $config;
+    /** @var \OC_Defaults */
+    private $defaults;
 
-	public function __construct(IConfig $config, \OC_Defaults $defaults) {
-		$this->config = $config;
-		$this->defaults = $defaults;
-	}
+    public function __construct(IConfig $config, \OC_Defaults $defaults) {
+        $this->config = $config;
+        $this->defaults = $defaults;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$parameters = [ 'clients' => $this->getClientLinks() ];
-		return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters);
-	}
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $parameters = [ 'clients' => $this->getClientLinks() ];
+        return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters);
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'sync-clients';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'sync-clients';
+    }
 
-	/**
-	 * @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.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 20;
-	}
+    /**
+     * @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.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 20;
+    }
 
-	/**
-	 * returns an array containing links to the various clients
-	 *
-	 * @return array
-	 */
-	private function getClientLinks() {
-		$clients = [
-			'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()),
-			'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()),
-			'ios' => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl())
-		];
-		return $clients;
-	}
+    /**
+     * returns an array containing links to the various clients
+     *
+     * @return array
+     */
+    private function getClientLinks() {
+        $clients = [
+            'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()),
+            'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()),
+            'ios' => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl())
+        ];
+        return $clients;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 * @since 9.1
 	 */
 	public function getForm() {
-		$parameters = [ 'clients' => $this->getClientLinks() ];
+		$parameters = ['clients' => $this->getClientLinks()];
 		return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters);
 	}
 

lib/private/Settings/Manager.php

Spacing +12 added lines, -12 removed lines

@@ -183,7 +183,7 @@ 
 	 */
 	private function setupSectionEntry($sectionClassName, $type) {
 		if (!class_exists($sectionClassName)) {
-			$this->log->debug('Could not find ' . ucfirst($type) . ' section class ' . $sectionClassName);
+			$this->log->debug('Could not find '.ucfirst($type).' section class '.$sectionClassName);
 			return;
 		}
 		try {
@@ -195,13 +195,13 @@ 
 
 		if (!$section instanceof ISection) {
 			$this->log->error(
-				ucfirst($type) .' section instance must implement \OCP\ISection. Invalid class: {class}',
+				ucfirst($type).' section instance must implement \OCP\ISection. Invalid class: {class}',
 				['class' => $sectionClassName]
 			);
 			return;
 		}
 		$table = $this->getSectionTableForType($type);
-		if(!$this->hasSection(get_class($section), $table)) {
+		if (!$this->hasSection(get_class($section), $table)) {
 			$this->addSection($section, $table);
 		} else {
 			$this->updateSection($section, $table);
@@ -267,7 +267,7 @@ 
 
 	private function setupSettingsEntry($settingsClassName, $type) {
 		if (!class_exists($settingsClassName)) {
-			$this->log->debug('Could not find ' . $type . ' section class ' . $settingsClassName);
+			$this->log->debug('Could not find '.$type.' section class '.$settingsClassName);
 			return;
 		}
 
@@ -281,7 +281,7 @@ 
 
 		if (!$settings instanceof ISettings) {
 			$this->log->error(
-				ucfirst($type) . ' section instance must implement \OCP\Settings\ISettings. Invalid class: {class}',
+				ucfirst($type).' section instance must implement \OCP\Settings\ISettings. Invalid class: {class}',
 				['class' => $settingsClassName]
 			);
 			return;
@@ -295,18 +295,18 @@ 
 	}
 
 	private function getSectionTableForType($type) {
-		if($type === 'admin') {
+		if ($type === 'admin') {
 			return Mapper::TABLE_ADMIN_SECTIONS;
-		} else if($type === 'personal') {
+		} else if ($type === 'personal') {
 			return Mapper::TABLE_PERSONAL_SECTIONS;
 		}
 		throw new \InvalidArgumentException('"admin" or "personal" expected');
 	}
 
 	private function getSettingsTableForType($type) {
-		if($type === 'admin') {
+		if ($type === 'admin') {
 			return Mapper::TABLE_ADMIN_SETTINGS;
-		} else if($type === 'personal') {
+		} else if ($type === 'personal') {
 			return Mapper::TABLE_PERSONAL_SETTINGS;
 		}
 		throw new \InvalidArgumentException('"admin" or "personal" expected');
@@ -405,17 +405,17 @@ 
 				$form = new Personal\PersonalInfo($this->config, $this->userManager, $this->groupManager, $this->accountManager, $this->l10nFactory, $this->l);
 				$forms[$form->getPriority()] = [$form];
 			}
-			if($section === 'sessions') {
+			if ($section === 'sessions') {
 				/** @var ISettings $form */
 				$form = new Personal\Sessions();
 				$forms[$form->getPriority()] = [$form];
 			}
-			if($section === 'app-passwords') {
+			if ($section === 'app-passwords') {
 				/** @var ISettings $form */
 				$form = new Personal\AppPasswords();
 				$forms[$form->getPriority()] = [$form];
 			}
-			if($section === 'sync-clients') {
+			if ($section === 'sync-clients') {
 				/** @var ISettings $form */
 				$form = new Personal\SyncClients($this->config, $this->defaults);
 				$forms[$form->getPriority()] = [$form];

Doc Comments +6 added lines

@@ -265,6 +265,9 @@ 
 		return $this->mapper->has($table, $className);
 	}
 
+	/**
+	 * @param string $type
+	 */
 	private function setupSettingsEntry($settingsClassName, $type) {
 		if (!class_exists($settingsClassName)) {
 			$this->log->debug('Could not find ' . $type . ' section class ' . $settingsClassName);
@@ -294,6 +297,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $type
+	 */
 	private function getSectionTableForType($type) {
 		if($type === 'admin') {
 			return Mapper::TABLE_ADMIN_SECTIONS;

Indentation +433 added lines, -433 removed lines

@@ -41,437 +41,437 @@
 use OCP\Settings\ISection;
 
 class Manager implements IManager {
-	/** @var ILogger */
-	private $log;
-	/** @var IDBConnection */
-	private $dbc;
-	/** @var Mapper */
-	private $mapper;
-	/** @var IL10N */
-	private $l;
-	/** @var IConfig */
-	private $config;
-	/** @var EncryptionManager */
-	private $encryptionManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var ILockingProvider */
-	private $lockingProvider;
-	/** @var IRequest */
-	private $request;
-	/** @var IURLGenerator */
-	private $url;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var \OC_Defaults */
-	private $defaults;
-
-	/**
-	 * @param ILogger $log
-	 * @param IDBConnection $dbc
-	 * @param IL10N $l
-	 * @param IConfig $config
-	 * @param EncryptionManager $encryptionManager
-	 * @param IUserManager $userManager
-	 * @param ILockingProvider $lockingProvider
-	 * @param IRequest $request
-	 * @param Mapper $mapper
-	 * @param IURLGenerator $url
-	 * @param AccountManager $accountManager
-	 * @param IGroupManager $groupManager
-	 * @param IFactory $l10nFactory
-	 * @param \OC_Defaults $defaults
-	 */
-	public function __construct(
-		ILogger $log,
-		IDBConnection $dbc,
-		IL10N $l,
-		IConfig $config,
-		EncryptionManager $encryptionManager,
-		IUserManager $userManager,
-		ILockingProvider $lockingProvider,
-		IRequest $request,
-		Mapper $mapper,
-		IURLGenerator $url,
-		AccountManager $accountManager,
-		IGroupManager $groupManager,
-		IFactory $l10nFactory,
-		\OC_Defaults $defaults
-	) {
-		$this->log = $log;
-		$this->dbc = $dbc;
-		$this->mapper = $mapper;
-		$this->l = $l;
-		$this->config = $config;
-		$this->encryptionManager = $encryptionManager;
-		$this->userManager = $userManager;
-		$this->lockingProvider = $lockingProvider;
-		$this->request = $request;
-		$this->url = $url;
-		$this->accountManager = $accountManager;
-		$this->groupManager = $groupManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->defaults = $defaults;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setupSettings(array $settings) {
-		if (isset($settings[IManager::KEY_ADMIN_SECTION])) {
-			$this->setupSectionEntry($settings[IManager::KEY_ADMIN_SECTION], 'admin');
-		}
-		if (isset($settings[IManager::KEY_ADMIN_SETTINGS])) {
-			$this->setupSettingsEntry($settings[IManager::KEY_ADMIN_SETTINGS], 'admin');
-		}
-
-		if (isset($settings[IManager::KEY_PERSONAL_SECTION])) {
-			$this->setupSectionEntry($settings[IManager::KEY_PERSONAL_SECTION], 'personal');
-		}
-		if (isset($settings[IManager::KEY_PERSONAL_SETTINGS])) {
-			$this->setupSettingsEntry($settings[IManager::KEY_PERSONAL_SETTINGS], 'personal');
-		}
-	}
-
-	/**
-	 * attempts to remove an apps section and/or settings entry. A listener is
-	 * added centrally making sure that this method is called ones an app was
-	 * disabled.
-	 *
-	 * @param string $appId
-	 * @since 9.1.0
-	 */
-	public function onAppDisabled($appId) {
-		$appInfo = \OC_App::getAppInfo($appId); // hello static legacy
-
-		if (isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) {
-			$this->mapper->remove(Mapper::TABLE_ADMIN_SECTIONS, trim($appInfo['settings'][IManager::KEY_ADMIN_SECTION], '\\'));
-		}
-		if (isset($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS])) {
-			$this->mapper->remove(Mapper::TABLE_ADMIN_SETTINGS, trim($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS], '\\'));
-		}
-
-		if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SECTION])) {
-			$this->mapper->remove(Mapper::TABLE_PERSONAL_SECTIONS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SECTION], '\\'));
-		}
-		if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS])) {
-			$this->mapper->remove(Mapper::TABLE_PERSONAL_SETTINGS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS], '\\'));
-		}
-	}
-
-	public function checkForOrphanedClassNames() {
-		$tables = [Mapper::TABLE_ADMIN_SECTIONS, Mapper::TABLE_ADMIN_SETTINGS, Mapper::TABLE_PERSONAL_SECTIONS, Mapper::TABLE_PERSONAL_SETTINGS];
-		foreach ($tables as $table) {
-			$classes = $this->mapper->getClasses($table);
-			foreach ($classes as $className) {
-				try {
-					\OC::$server->query($className);
-				} catch (QueryException $e) {
-					$this->mapper->remove($table, $className);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param string $sectionClassName
-	 * @param string $type either 'admin' or 'personal'
-	 */
-	private function setupSectionEntry($sectionClassName, $type) {
-		if (!class_exists($sectionClassName)) {
-			$this->log->debug('Could not find ' . ucfirst($type) . ' section class ' . $sectionClassName);
-			return;
-		}
-		try {
-			$section = $this->query($sectionClassName);
-		} catch (QueryException $e) {
-			// cancel
-			return;
-		}
-
-		if (!$section instanceof ISection) {
-			$this->log->error(
-				ucfirst($type) .' section instance must implement \OCP\ISection. Invalid class: {class}',
-				['class' => $sectionClassName]
-			);
-			return;
-		}
-		$table = $this->getSectionTableForType($type);
-		if(!$this->hasSection(get_class($section), $table)) {
-			$this->addSection($section, $table);
-		} else {
-			$this->updateSection($section, $table);
-		}
-	}
-
-	private function addSection(ISection $section, $table) {
-		$this->mapper->add($table, [
-			'id' => $section->getID(),
-			'class' => get_class($section),
-			'priority' => $section->getPriority(),
-		]);
-	}
-
-	private function addSettings(ISettings $settings, $table) {
-		$this->mapper->add($table, [
-			'class' => get_class($settings),
-			'section' => $settings->getSection(),
-			'priority' => $settings->getPriority(),
-		]);
-	}
-
-	private function updateSettings(ISettings $settings, $table) {
-		$this->mapper->update(
-			$table,
-			'class',
-			get_class($settings),
-			[
-				'section' => $settings->getSection(),
-				'priority' => $settings->getPriority(),
-			]
-		);
-	}
-
-	private function updateSection(ISection $section, $table) {
-		$this->mapper->update(
-			$table,
-			'class',
-			get_class($section),
-			[
-				'id' => $section->getID(),
-				'priority' => $section->getPriority(),
-			]
-		);
-	}
-
-	/**
-	 * @param string $className
-	 * @param string $table
-	 * @return bool
-	 */
-	private function hasSection($className, $table) {
-		return $this->mapper->has($table, $className);
-	}
-
-	/**
-	 * @param string $className
-	 * @return bool
-	 */
-	private function hasSettings($className, $table) {
-		return $this->mapper->has($table, $className);
-	}
-
-	private function setupSettingsEntry($settingsClassName, $type) {
-		if (!class_exists($settingsClassName)) {
-			$this->log->debug('Could not find ' . $type . ' section class ' . $settingsClassName);
-			return;
-		}
-
-		try {
-			/** @var ISettings $settings */
-			$settings = $this->query($settingsClassName);
-		} catch (QueryException $e) {
-			// cancel
-			return;
-		}
-
-		if (!$settings instanceof ISettings) {
-			$this->log->error(
-				ucfirst($type) . ' section instance must implement \OCP\Settings\ISettings. Invalid class: {class}',
-				['class' => $settingsClassName]
-			);
-			return;
-		}
-		$table = $this->getSettingsTableForType($type);
-		if (!$this->hasSettings(get_class($settings), $table)) {
-			$this->addSettings($settings, $table);
-		} else {
-			$this->updateSettings($settings, $table);
-		}
-	}
-
-	private function getSectionTableForType($type) {
-		if($type === 'admin') {
-			return Mapper::TABLE_ADMIN_SECTIONS;
-		} else if($type === 'personal') {
-			return Mapper::TABLE_PERSONAL_SECTIONS;
-		}
-		throw new \InvalidArgumentException('"admin" or "personal" expected');
-	}
-
-	private function getSettingsTableForType($type) {
-		if($type === 'admin') {
-			return Mapper::TABLE_ADMIN_SETTINGS;
-		} else if($type === 'personal') {
-			return Mapper::TABLE_PERSONAL_SETTINGS;
-		}
-		throw new \InvalidArgumentException('"admin" or "personal" expected');
-	}
-
-	private function query($className) {
-		try {
-			return \OC::$server->query($className);
-		} catch (QueryException $e) {
-			$this->log->logException($e);
-			throw $e;
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSections() {
-		// built-in sections
-		$sections = [
-			0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.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'))],
-			45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
-			99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
-		];
-
-		$rows = $this->mapper->getAdminSectionsFromDB();
-
-		foreach ($rows as $row) {
-			if (!isset($sections[$row['priority']])) {
-				$sections[$row['priority']] = [];
-			}
-			try {
-				$sections[$row['priority']][] = $this->query($row['class']);
-			} catch (QueryException $e) {
-				// skip
-			}
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInAdminSettings($section) {
-		$forms = [];
-		try {
-			if ($section === 'server') {
-				/** @var ISettings $form */
-				$form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
-				$forms[$form->getPriority()] = [$form];
-				$form = new Admin\ServerDevNotice();
-				$forms[$form->getPriority()] = [$form];
-			}
-			if ($section === 'encryption') {
-				/** @var ISettings $form */
-				$form = new Admin\Encryption($this->encryptionManager, $this->userManager);
-				$forms[$form->getPriority()] = [$form];
-			}
-			if ($section === 'sharing') {
-				/** @var ISettings $form */
-				$form = new Admin\Sharing($this->config);
-				$forms[$form->getPriority()] = [$form];
-			}
-			if ($section === 'additional') {
-				/** @var ISettings $form */
-				$form = new Admin\Additional($this->config);
-				$forms[$form->getPriority()] = [$form];
-			}
-			if ($section === 'tips-tricks') {
-				/** @var ISettings $form */
-				$form = new Admin\TipsTricks($this->config);
-				$forms[$form->getPriority()] = [$form];
-			}
-		} catch (QueryException $e) {
-			// skip
-		}
-		return $forms;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInPersonalSettings($section) {
-		$forms = [];
-		try {
-			if ($section === 'personal-info') {
-				/** @var ISettings $form */
-				$form = new Personal\PersonalInfo($this->config, $this->userManager, $this->groupManager, $this->accountManager, $this->l10nFactory, $this->l);
-				$forms[$form->getPriority()] = [$form];
-			}
-			if($section === 'sessions') {
-				/** @var ISettings $form */
-				$form = new Personal\Sessions();
-				$forms[$form->getPriority()] = [$form];
-			}
-			if($section === 'app-passwords') {
-				/** @var ISettings $form */
-				$form = new Personal\AppPasswords();
-				$forms[$form->getPriority()] = [$form];
-			}
-			if($section === 'sync-clients') {
-				/** @var ISettings $form */
-				$form = new Personal\SyncClients($this->config, $this->defaults);
-				$forms[$form->getPriority()] = [$form];
-			}
-			if ($section === 'additional') {
-				/** @var ISettings $form */
-				$form = new Personal\Additional($this->config);
-				$forms[$form->getPriority()] = [$form];
-			}
-		} catch (QueryException $e) {
-			// skip
-		}
-		return $forms;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSettings($section) {
-		$settings = $this->getBuiltInAdminSettings($section);
-		$dbRows = $this->mapper->getAdminSettingsFromDB($section);
-
-		foreach ($dbRows as $row) {
-			if (!isset($settings[$row['priority']])) {
-				$settings[$row['priority']] = [];
-			}
-			try {
-				$settings[$row['priority']][] = $this->query($row['class']);
-			} catch (QueryException $e) {
-				// skip
-			}
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSections() {
-		$sections = [
-			0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
-			5 => [new Section('sessions', $this->l->t('Sessions'), 0, $this->url->imagePath('settings', 'admin.svg'))],
-			10 => [new Section('app-passwords', $this->l->t('App passwords'), 0, $this->url->imagePath('settings', 'password.svg'))],
-			15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
-		];
-		return $sections;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSettings($section) {
-		$settings = $this->getBuiltInPersonalSettings($section);
-		return $settings;
-	}
+    /** @var ILogger */
+    private $log;
+    /** @var IDBConnection */
+    private $dbc;
+    /** @var Mapper */
+    private $mapper;
+    /** @var IL10N */
+    private $l;
+    /** @var IConfig */
+    private $config;
+    /** @var EncryptionManager */
+    private $encryptionManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var ILockingProvider */
+    private $lockingProvider;
+    /** @var IRequest */
+    private $request;
+    /** @var IURLGenerator */
+    private $url;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var \OC_Defaults */
+    private $defaults;
+
+    /**
+     * @param ILogger $log
+     * @param IDBConnection $dbc
+     * @param IL10N $l
+     * @param IConfig $config
+     * @param EncryptionManager $encryptionManager
+     * @param IUserManager $userManager
+     * @param ILockingProvider $lockingProvider
+     * @param IRequest $request
+     * @param Mapper $mapper
+     * @param IURLGenerator $url
+     * @param AccountManager $accountManager
+     * @param IGroupManager $groupManager
+     * @param IFactory $l10nFactory
+     * @param \OC_Defaults $defaults
+     */
+    public function __construct(
+        ILogger $log,
+        IDBConnection $dbc,
+        IL10N $l,
+        IConfig $config,
+        EncryptionManager $encryptionManager,
+        IUserManager $userManager,
+        ILockingProvider $lockingProvider,
+        IRequest $request,
+        Mapper $mapper,
+        IURLGenerator $url,
+        AccountManager $accountManager,
+        IGroupManager $groupManager,
+        IFactory $l10nFactory,
+        \OC_Defaults $defaults
+    ) {
+        $this->log = $log;
+        $this->dbc = $dbc;
+        $this->mapper = $mapper;
+        $this->l = $l;
+        $this->config = $config;
+        $this->encryptionManager = $encryptionManager;
+        $this->userManager = $userManager;
+        $this->lockingProvider = $lockingProvider;
+        $this->request = $request;
+        $this->url = $url;
+        $this->accountManager = $accountManager;
+        $this->groupManager = $groupManager;
+        $this->l10nFactory = $l10nFactory;
+        $this->defaults = $defaults;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setupSettings(array $settings) {
+        if (isset($settings[IManager::KEY_ADMIN_SECTION])) {
+            $this->setupSectionEntry($settings[IManager::KEY_ADMIN_SECTION], 'admin');
+        }
+        if (isset($settings[IManager::KEY_ADMIN_SETTINGS])) {
+            $this->setupSettingsEntry($settings[IManager::KEY_ADMIN_SETTINGS], 'admin');
+        }
+
+        if (isset($settings[IManager::KEY_PERSONAL_SECTION])) {
+            $this->setupSectionEntry($settings[IManager::KEY_PERSONAL_SECTION], 'personal');
+        }
+        if (isset($settings[IManager::KEY_PERSONAL_SETTINGS])) {
+            $this->setupSettingsEntry($settings[IManager::KEY_PERSONAL_SETTINGS], 'personal');
+        }
+    }
+
+    /**
+     * attempts to remove an apps section and/or settings entry. A listener is
+     * added centrally making sure that this method is called ones an app was
+     * disabled.
+     *
+     * @param string $appId
+     * @since 9.1.0
+     */
+    public function onAppDisabled($appId) {
+        $appInfo = \OC_App::getAppInfo($appId); // hello static legacy
+
+        if (isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) {
+            $this->mapper->remove(Mapper::TABLE_ADMIN_SECTIONS, trim($appInfo['settings'][IManager::KEY_ADMIN_SECTION], '\\'));
+        }
+        if (isset($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS])) {
+            $this->mapper->remove(Mapper::TABLE_ADMIN_SETTINGS, trim($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS], '\\'));
+        }
+
+        if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SECTION])) {
+            $this->mapper->remove(Mapper::TABLE_PERSONAL_SECTIONS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SECTION], '\\'));
+        }
+        if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS])) {
+            $this->mapper->remove(Mapper::TABLE_PERSONAL_SETTINGS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS], '\\'));
+        }
+    }
+
+    public function checkForOrphanedClassNames() {
+        $tables = [Mapper::TABLE_ADMIN_SECTIONS, Mapper::TABLE_ADMIN_SETTINGS, Mapper::TABLE_PERSONAL_SECTIONS, Mapper::TABLE_PERSONAL_SETTINGS];
+        foreach ($tables as $table) {
+            $classes = $this->mapper->getClasses($table);
+            foreach ($classes as $className) {
+                try {
+                    \OC::$server->query($className);
+                } catch (QueryException $e) {
+                    $this->mapper->remove($table, $className);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $sectionClassName
+     * @param string $type either 'admin' or 'personal'
+     */
+    private function setupSectionEntry($sectionClassName, $type) {
+        if (!class_exists($sectionClassName)) {
+            $this->log->debug('Could not find ' . ucfirst($type) . ' section class ' . $sectionClassName);
+            return;
+        }
+        try {
+            $section = $this->query($sectionClassName);
+        } catch (QueryException $e) {
+            // cancel
+            return;
+        }
+
+        if (!$section instanceof ISection) {
+            $this->log->error(
+                ucfirst($type) .' section instance must implement \OCP\ISection. Invalid class: {class}',
+                ['class' => $sectionClassName]
+            );
+            return;
+        }
+        $table = $this->getSectionTableForType($type);
+        if(!$this->hasSection(get_class($section), $table)) {
+            $this->addSection($section, $table);
+        } else {
+            $this->updateSection($section, $table);
+        }
+    }
+
+    private function addSection(ISection $section, $table) {
+        $this->mapper->add($table, [
+            'id' => $section->getID(),
+            'class' => get_class($section),
+            'priority' => $section->getPriority(),
+        ]);
+    }
+
+    private function addSettings(ISettings $settings, $table) {
+        $this->mapper->add($table, [
+            'class' => get_class($settings),
+            'section' => $settings->getSection(),
+            'priority' => $settings->getPriority(),
+        ]);
+    }
+
+    private function updateSettings(ISettings $settings, $table) {
+        $this->mapper->update(
+            $table,
+            'class',
+            get_class($settings),
+            [
+                'section' => $settings->getSection(),
+                'priority' => $settings->getPriority(),
+            ]
+        );
+    }
+
+    private function updateSection(ISection $section, $table) {
+        $this->mapper->update(
+            $table,
+            'class',
+            get_class($section),
+            [
+                'id' => $section->getID(),
+                'priority' => $section->getPriority(),
+            ]
+        );
+    }
+
+    /**
+     * @param string $className
+     * @param string $table
+     * @return bool
+     */
+    private function hasSection($className, $table) {
+        return $this->mapper->has($table, $className);
+    }
+
+    /**
+     * @param string $className
+     * @return bool
+     */
+    private function hasSettings($className, $table) {
+        return $this->mapper->has($table, $className);
+    }
+
+    private function setupSettingsEntry($settingsClassName, $type) {
+        if (!class_exists($settingsClassName)) {
+            $this->log->debug('Could not find ' . $type . ' section class ' . $settingsClassName);
+            return;
+        }
+
+        try {
+            /** @var ISettings $settings */
+            $settings = $this->query($settingsClassName);
+        } catch (QueryException $e) {
+            // cancel
+            return;
+        }
+
+        if (!$settings instanceof ISettings) {
+            $this->log->error(
+                ucfirst($type) . ' section instance must implement \OCP\Settings\ISettings. Invalid class: {class}',
+                ['class' => $settingsClassName]
+            );
+            return;
+        }
+        $table = $this->getSettingsTableForType($type);
+        if (!$this->hasSettings(get_class($settings), $table)) {
+            $this->addSettings($settings, $table);
+        } else {
+            $this->updateSettings($settings, $table);
+        }
+    }
+
+    private function getSectionTableForType($type) {
+        if($type === 'admin') {
+            return Mapper::TABLE_ADMIN_SECTIONS;
+        } else if($type === 'personal') {
+            return Mapper::TABLE_PERSONAL_SECTIONS;
+        }
+        throw new \InvalidArgumentException('"admin" or "personal" expected');
+    }
+
+    private function getSettingsTableForType($type) {
+        if($type === 'admin') {
+            return Mapper::TABLE_ADMIN_SETTINGS;
+        } else if($type === 'personal') {
+            return Mapper::TABLE_PERSONAL_SETTINGS;
+        }
+        throw new \InvalidArgumentException('"admin" or "personal" expected');
+    }
+
+    private function query($className) {
+        try {
+            return \OC::$server->query($className);
+        } catch (QueryException $e) {
+            $this->log->logException($e);
+            throw $e;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSections() {
+        // built-in sections
+        $sections = [
+            0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.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'))],
+            45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
+            98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
+            99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
+        ];
+
+        $rows = $this->mapper->getAdminSectionsFromDB();
+
+        foreach ($rows as $row) {
+            if (!isset($sections[$row['priority']])) {
+                $sections[$row['priority']] = [];
+            }
+            try {
+                $sections[$row['priority']][] = $this->query($row['class']);
+            } catch (QueryException $e) {
+                // skip
+            }
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInAdminSettings($section) {
+        $forms = [];
+        try {
+            if ($section === 'server') {
+                /** @var ISettings $form */
+                $form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
+                $forms[$form->getPriority()] = [$form];
+                $form = new Admin\ServerDevNotice();
+                $forms[$form->getPriority()] = [$form];
+            }
+            if ($section === 'encryption') {
+                /** @var ISettings $form */
+                $form = new Admin\Encryption($this->encryptionManager, $this->userManager);
+                $forms[$form->getPriority()] = [$form];
+            }
+            if ($section === 'sharing') {
+                /** @var ISettings $form */
+                $form = new Admin\Sharing($this->config);
+                $forms[$form->getPriority()] = [$form];
+            }
+            if ($section === 'additional') {
+                /** @var ISettings $form */
+                $form = new Admin\Additional($this->config);
+                $forms[$form->getPriority()] = [$form];
+            }
+            if ($section === 'tips-tricks') {
+                /** @var ISettings $form */
+                $form = new Admin\TipsTricks($this->config);
+                $forms[$form->getPriority()] = [$form];
+            }
+        } catch (QueryException $e) {
+            // skip
+        }
+        return $forms;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInPersonalSettings($section) {
+        $forms = [];
+        try {
+            if ($section === 'personal-info') {
+                /** @var ISettings $form */
+                $form = new Personal\PersonalInfo($this->config, $this->userManager, $this->groupManager, $this->accountManager, $this->l10nFactory, $this->l);
+                $forms[$form->getPriority()] = [$form];
+            }
+            if($section === 'sessions') {
+                /** @var ISettings $form */
+                $form = new Personal\Sessions();
+                $forms[$form->getPriority()] = [$form];
+            }
+            if($section === 'app-passwords') {
+                /** @var ISettings $form */
+                $form = new Personal\AppPasswords();
+                $forms[$form->getPriority()] = [$form];
+            }
+            if($section === 'sync-clients') {
+                /** @var ISettings $form */
+                $form = new Personal\SyncClients($this->config, $this->defaults);
+                $forms[$form->getPriority()] = [$form];
+            }
+            if ($section === 'additional') {
+                /** @var ISettings $form */
+                $form = new Personal\Additional($this->config);
+                $forms[$form->getPriority()] = [$form];
+            }
+        } catch (QueryException $e) {
+            // skip
+        }
+        return $forms;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSettings($section) {
+        $settings = $this->getBuiltInAdminSettings($section);
+        $dbRows = $this->mapper->getAdminSettingsFromDB($section);
+
+        foreach ($dbRows as $row) {
+            if (!isset($settings[$row['priority']])) {
+                $settings[$row['priority']] = [];
+            }
+            try {
+                $settings[$row['priority']][] = $this->query($row['class']);
+            } catch (QueryException $e) {
+                // skip
+            }
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSections() {
+        $sections = [
+            0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
+            5 => [new Section('sessions', $this->l->t('Sessions'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+            10 => [new Section('app-passwords', $this->l->t('App passwords'), 0, $this->url->imagePath('settings', 'password.svg'))],
+            15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
+            98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
+        ];
+        return $sections;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSettings($section) {
+        $settings = $this->getBuiltInPersonalSettings($section);
+        return $settings;
+    }
 }