nextcloud / server

lib/private/Settings/Admin/Encryption.php

Indentation +52 added lines, -52 removed lines

@@ -31,63 +31,63 @@
 use OCP\Settings\ISettings;
 
 class Encryption implements ISettings {
-	/** @var IManager */
-	private $manager;
+    /** @var IManager */
+    private $manager;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/**
-	 * @param IManager $manager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IManager $manager, IUserManager $userManager) {
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param IManager $manager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IManager $manager, IUserManager $userManager) {
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$encryptionModules = $this->manager->getEncryptionModules();
-		$defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
-		$encryptionModuleList = [];
-		foreach ($encryptionModules as $module) {
-			$encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
-			$encryptionModuleList[$module['id']]['default'] = false;
-			if ($module['id'] === $defaultEncryptionModuleId) {
-				$encryptionModuleList[$module['id']]['default'] = true;
-			}
-		}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $encryptionModules = $this->manager->getEncryptionModules();
+        $defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
+        $encryptionModuleList = [];
+        foreach ($encryptionModules as $module) {
+            $encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
+            $encryptionModuleList[$module['id']]['default'] = false;
+            if ($module['id'] === $defaultEncryptionModuleId) {
+                $encryptionModuleList[$module['id']]['default'] = true;
+            }
+        }
 
-		$parameters = [
-			// Encryption API
-			'encryptionEnabled'       => $this->manager->isEnabled(),
-			'encryptionReady'         => $this->manager->isReady(),
-			'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
-			// Modules
-			'encryptionModules'       => $encryptionModuleList,
-		];
+        $parameters = [
+            // Encryption API
+            'encryptionEnabled'       => $this->manager->isEnabled(),
+            'encryptionReady'         => $this->manager->isReady(),
+            'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
+            // Modules
+            'encryptionModules'       => $encryptionModuleList,
+        ];
 
-		return new TemplateResponse('settings', 'settings/admin/encryption', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'settings/admin/encryption', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'security';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'security';
+    }
 
-	/**
-	 * @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
-	 */
-	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
+     */
+    public function getPriority() {
+        return 10;
+    }
 }

lib/private/Settings/Manager.php

Indentation +349 added lines, -349 removed lines

@@ -49,353 +49,353 @@
 use OCP\Util;
 
 class Manager implements IManager {
-	/** @var ILogger */
-	private $log;
-	/** @var IDBConnection */
-	private $dbc;
-	/** @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 IAppManager */
-	private $appManager;
-
-	/**
-	 * @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 IURLGenerator $url
-	 * @param AccountManager $accountManager
-	 * @param IGroupManager $groupManager
-	 * @param IFactory $l10nFactory
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(
-		ILogger $log,
-		IDBConnection $dbc,
-		IL10N $l,
-		IConfig $config,
-		EncryptionManager $encryptionManager,
-		IUserManager $userManager,
-		ILockingProvider $lockingProvider,
-		IRequest $request,
-		IURLGenerator $url,
-		AccountManager $accountManager,
-		IGroupManager $groupManager,
-		IFactory $l10nFactory,
-		IAppManager $appManager
-	) {
-		$this->log = $log;
-		$this->dbc = $dbc;
-		$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->appManager = $appManager;
-	}
-
-	/** @var array */
-	protected $sectionClasses = [];
-
-	/** @var array */
-	protected $sections = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section Class must implement OCP\Settings\ISection
-	 * @return void
-	 */
-	public function registerSection(string $type, string $section) {
-		$this->sectionClasses[$section] = $type;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @return ISection[]
-	 */
-	protected function getSections(string $type): array {
-		if (!isset($this->sections[$type])) {
-			$this->sections[$type] = [];
-		}
-
-		foreach ($this->sectionClasses as $class => $sectionType) {
-			try {
-				/** @var ISection $section */
-				$section = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$section instanceof ISection) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			$this->sections[$sectionType][$section->getID()] = $section;
-
-			unset($this->sectionClasses[$class]);
-		}
-
-		return $this->sections[$type];
-	}
-
-	/** @var array */
-	protected $settingClasses = [];
-
-	/** @var array */
-	protected $settings = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $setting Class must implement OCP\Settings\ISetting
-	 * @return void
-	 */
-	public function registerSetting(string $type, string $setting) {
-		$this->settingClasses[$setting] = $type;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section
-	 * @return ISettings[]
-	 */
-	protected function getSettings(string $type, string $section): array {
-		if (!isset($this->settings[$type])) {
-			$this->settings[$type] = [];
-		}
-		if (!isset($this->settings[$type][$section])) {
-			$this->settings[$type][$section] = [];
-		}
-
-		foreach ($this->settingClasses as $class => $settingsType) {
-			try {
-				/** @var ISettings $setting */
-				$setting = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$setting instanceof ISettings) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!isset($this->settings[$settingsType][$setting->getSection()])) {
-				$this->settings[$settingsType][$setting->getSection()] = [];
-			}
-			$this->settings[$settingsType][$setting->getSection()][] = $setting;
-
-			unset($this->settingClasses[$class]);
-		}
-
-		return $this->settings[$type][$section];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSections(): array {
-		// built-in sections
-		$sections = [
-			0 => [new Section('overview', $this->l->t('Overview'), 0, $this->url->imagePath('settings', 'admin.svg'))],
-			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'))],
-			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'))],
-		];
-
-		$appSections = $this->getSections('admin');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInAdminSettings($section): array {
-		$forms = [];
-
-		if ($section === 'overview') {
-			/** @var ISettings $form */
-			$form = new Admin\Overview($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
-		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\Mail($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'security') {
-			/** @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, $this->l);
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInPersonalSettings($section): array {
-		$forms = [];
-
-		if ($section === 'personal-info') {
-			/** @var ISettings $form */
-			$form = new Personal\PersonalInfo(
-				$this->config,
-				$this->userManager,
-				$this->groupManager,
-				$this->accountManager,
-				$this->appManager,
-				$this->l10nFactory,
-				$this->l
-			);
-			$forms[$form->getPriority()] = [$form];
-			$form = new Personal\ServerDevNotice();
-			$forms[$form->getPriority()] = [$form];
-		}
-		if($section === 'security') {
-			/** @var ISettings $form */
-			$form = new Personal\Security($this->userManager);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = new Personal\Additional();
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSettings($section): array {
-		$settings = $this->getBuiltInAdminSettings($section);
-		$appSettings = $this->getSettings('admin', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSections(): array {
-		$sections = [
-			0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
-			5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
-			15 => [new Section('sync-clients', $this->l->t('Mobile & desktop'), 0, $this->url->imagePath('core', 'clients/phone.svg'))],
-		];
-
-		$legacyForms = \OC_App::getForms('personal');
-		if(!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
-			$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
-		}
-
-		$appSections = $this->getSections('personal');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string[] $forms
-	 * @return bool
-	 */
-	private function hasLegacyPersonalSettingsToRender(array $forms): bool {
-		foreach ($forms as $form) {
-			if(trim($form) !== '') {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSettings($section): array {
-		$settings = $this->getBuiltInPersonalSettings($section);
-		$appSettings = $this->getSettings('personal', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
+    /** @var ILogger */
+    private $log;
+    /** @var IDBConnection */
+    private $dbc;
+    /** @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 IAppManager */
+    private $appManager;
+
+    /**
+     * @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 IURLGenerator $url
+     * @param AccountManager $accountManager
+     * @param IGroupManager $groupManager
+     * @param IFactory $l10nFactory
+     * @param IAppManager $appManager
+     */
+    public function __construct(
+        ILogger $log,
+        IDBConnection $dbc,
+        IL10N $l,
+        IConfig $config,
+        EncryptionManager $encryptionManager,
+        IUserManager $userManager,
+        ILockingProvider $lockingProvider,
+        IRequest $request,
+        IURLGenerator $url,
+        AccountManager $accountManager,
+        IGroupManager $groupManager,
+        IFactory $l10nFactory,
+        IAppManager $appManager
+    ) {
+        $this->log = $log;
+        $this->dbc = $dbc;
+        $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->appManager = $appManager;
+    }
+
+    /** @var array */
+    protected $sectionClasses = [];
+
+    /** @var array */
+    protected $sections = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section Class must implement OCP\Settings\ISection
+     * @return void
+     */
+    public function registerSection(string $type, string $section) {
+        $this->sectionClasses[$section] = $type;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @return ISection[]
+     */
+    protected function getSections(string $type): array {
+        if (!isset($this->sections[$type])) {
+            $this->sections[$type] = [];
+        }
+
+        foreach ($this->sectionClasses as $class => $sectionType) {
+            try {
+                /** @var ISection $section */
+                $section = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$section instanceof ISection) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            $this->sections[$sectionType][$section->getID()] = $section;
+
+            unset($this->sectionClasses[$class]);
+        }
+
+        return $this->sections[$type];
+    }
+
+    /** @var array */
+    protected $settingClasses = [];
+
+    /** @var array */
+    protected $settings = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $setting Class must implement OCP\Settings\ISetting
+     * @return void
+     */
+    public function registerSetting(string $type, string $setting) {
+        $this->settingClasses[$setting] = $type;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section
+     * @return ISettings[]
+     */
+    protected function getSettings(string $type, string $section): array {
+        if (!isset($this->settings[$type])) {
+            $this->settings[$type] = [];
+        }
+        if (!isset($this->settings[$type][$section])) {
+            $this->settings[$type][$section] = [];
+        }
+
+        foreach ($this->settingClasses as $class => $settingsType) {
+            try {
+                /** @var ISettings $setting */
+                $setting = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$setting instanceof ISettings) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!isset($this->settings[$settingsType][$setting->getSection()])) {
+                $this->settings[$settingsType][$setting->getSection()] = [];
+            }
+            $this->settings[$settingsType][$setting->getSection()][] = $setting;
+
+            unset($this->settingClasses[$class]);
+        }
+
+        return $this->settings[$type][$section];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSections(): array {
+        // built-in sections
+        $sections = [
+            0 => [new Section('overview', $this->l->t('Overview'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+            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'))],
+            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'))],
+        ];
+
+        $appSections = $this->getSections('admin');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInAdminSettings($section): array {
+        $forms = [];
+
+        if ($section === 'overview') {
+            /** @var ISettings $form */
+            $form = new Admin\Overview($this->config);
+            $forms[$form->getPriority()] = [$form];
+        }
+        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\Mail($this->config);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'security') {
+            /** @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, $this->l);
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInPersonalSettings($section): array {
+        $forms = [];
+
+        if ($section === 'personal-info') {
+            /** @var ISettings $form */
+            $form = new Personal\PersonalInfo(
+                $this->config,
+                $this->userManager,
+                $this->groupManager,
+                $this->accountManager,
+                $this->appManager,
+                $this->l10nFactory,
+                $this->l
+            );
+            $forms[$form->getPriority()] = [$form];
+            $form = new Personal\ServerDevNotice();
+            $forms[$form->getPriority()] = [$form];
+        }
+        if($section === 'security') {
+            /** @var ISettings $form */
+            $form = new Personal\Security($this->userManager);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'additional') {
+            /** @var ISettings $form */
+            $form = new Personal\Additional();
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSettings($section): array {
+        $settings = $this->getBuiltInAdminSettings($section);
+        $appSettings = $this->getSettings('admin', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSections(): array {
+        $sections = [
+            0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
+            5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
+            15 => [new Section('sync-clients', $this->l->t('Mobile & desktop'), 0, $this->url->imagePath('core', 'clients/phone.svg'))],
+        ];
+
+        $legacyForms = \OC_App::getForms('personal');
+        if(!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
+            $sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
+        }
+
+        $appSections = $this->getSections('personal');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string[] $forms
+     * @return bool
+     */
+    private function hasLegacyPersonalSettingsToRender(array $forms): bool {
+        foreach ($forms as $form) {
+            if(trim($form) !== '') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSettings($section): array {
+        $settings = $this->getBuiltInPersonalSettings($section);
+        $appSettings = $this->getSettings('personal', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
 }

apps/encryption/lib/Settings/Admin.php

Indentation +85 added lines, -85 removed lines

@@ -38,90 +38,90 @@
 
 class Admin implements ISettings {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ISession */
-	private $session;
-
-	public function __construct(
-		IL10N $l,
-		ILogger $logger,
-		IUserSession $userSession,
-		IConfig $config,
-		IUserManager $userManager,
-		ISession $session
-	) {
-		$this->l = $l;
-		$this->logger = $logger;
-		$this->userSession = $userSession;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->session = $session;
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$crypt = new Crypt(
-			$this->logger,
-			$this->userSession,
-			$this->config,
-			$this->l);
-
-		$util = new Util(
-			new View(),
-			$crypt,
-			$this->logger,
-			$this->userSession,
-			$this->config,
-			$this->userManager);
-
-		// Check if an adminRecovery account is enabled for recovering files after lost pwd
-		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
-		$session = new Session($this->session);
-
-		$encryptHomeStorage = $util->shouldEncryptHomeStorage();
-
-		$parameters = [
-			'recoveryEnabled'    => $recoveryAdminEnabled,
-			'initStatus'         => $session->getStatus(),
-			'encryptHomeStorage' => $encryptHomeStorage,
-			'masterKeyEnabled'   => $util->isMasterKeyEnabled(),
-		];
-
-		return new TemplateResponse('encryption', 'settings-admin', $parameters, '');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'security';
-	}
-
-	/**
-	 * @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
-	 */
-	public function getPriority() {
-		return 11;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ISession */
+    private $session;
+
+    public function __construct(
+        IL10N $l,
+        ILogger $logger,
+        IUserSession $userSession,
+        IConfig $config,
+        IUserManager $userManager,
+        ISession $session
+    ) {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->userSession = $userSession;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->session = $session;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $crypt = new Crypt(
+            $this->logger,
+            $this->userSession,
+            $this->config,
+            $this->l);
+
+        $util = new Util(
+            new View(),
+            $crypt,
+            $this->logger,
+            $this->userSession,
+            $this->config,
+            $this->userManager);
+
+        // Check if an adminRecovery account is enabled for recovering files after lost pwd
+        $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
+        $session = new Session($this->session);
+
+        $encryptHomeStorage = $util->shouldEncryptHomeStorage();
+
+        $parameters = [
+            'recoveryEnabled'    => $recoveryAdminEnabled,
+            'initStatus'         => $session->getStatus(),
+            'encryptHomeStorage' => $encryptHomeStorage,
+            'masterKeyEnabled'   => $util->isMasterKeyEnabled(),
+        ];
+
+        return new TemplateResponse('encryption', 'settings-admin', $parameters, '');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'security';
+    }
+
+    /**
+     * @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
+     */
+    public function getPriority() {
+        return 11;
+    }
 
 }

apps/files_external/templates/settings.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	<h2><?php p($l->t('No external storage configured or you don\'t have the permission to configure them')); ?></h2>
 </div>
 
-<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
+<form data-can-create="<?php echo $canCreateMounts ? 'true' : 'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled'] ? 'true' : 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
 	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>

Braces +24 added lines, -6 removed lines

@@ -96,7 +96,10 @@ 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
-	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
+	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
+    print_unescaped(''.$_['dependencies'].'');
+}
+?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
 			<tr>
@@ -105,7 +108,10 @@ 
 				<th><?php p($l->t('External storage')); ?></th>
 				<th><?php p($l->t('Authentication')); ?></th>
 				<th><?php p($l->t('Configuration')); ?></th>
-				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
+				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
+}
+?>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
@@ -138,7 +144,10 @@ 
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
+							<?php if ($backend->getDeprecateTo()) {
+    continue;
+}
+// ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -163,7 +172,10 @@ 
 
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
-			value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> />
+			value="1" <?php if ($_['allowUserMounting']) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
@@ -175,8 +187,14 @@ 
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
-				<?php else: ?>
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<?php else {
+    : ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
+}
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php endif; ?>
 				<?php $i++; ?>

settings/templates/settings/personal/personal.info.php

Spacing +60 added lines, -60 removed lines

@@ -69,7 +69,7 @@ 
 					</div>
 				</div>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 				<?php } ?>
 			</form>
@@ -87,14 +87,14 @@ 
 					<p class="quotatext">
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
-								[$_['usage']]));?>
+								[$_['usage']])); ?>
 						<?php else: ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+								[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
 						<?php endif ?>
 					</p>
 				</div>
-				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
+				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
 			</div>
 		</div>
 	</div>
@@ -111,15 +111,15 @@ 
 					</div>
 				</h2>
 				<input type="text" id="displayname" name="displayname"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 					   value="<?php p($_['displayName']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
-				<?php if(!$_['displayNameChangeSupported']) { ?>
-					<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
+				<?php if (!$_['displayNameChangeSupported']) { ?>
+					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
 				<?php } ?>
 				<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 				<?php } ?>
 			</form>
@@ -134,10 +134,10 @@ 
 						</span>
 					</div>
 				</h2>
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
+				<div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
-					switch($_['emailVerification']) {
+					switch ($_['emailVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -150,18 +150,18 @@ 
 					?>">
 				</div>
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 					   placeholder="<?php p($l->t('Your email address')); ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
 			   	<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
-				<?php if(!$_['displayNameChangeSupported']) { ?>
-					<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
+				<?php if (!$_['displayNameChangeSupported']) { ?>
+					<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
 				<?php } ?>
-				<?php if($_['displayNameChangeSupported']) { ?>
+				<?php if ($_['displayNameChangeSupported']) { ?>
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
 				<?php } ?>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 				<?php } ?>
 			</form>
@@ -177,12 +177,12 @@ 
 						</span>
 					</div>
 				</h2>
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
+				<input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 					   value="<?php p($_['phone']) ?>"
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
 				<?php } ?>
 			</form>
@@ -199,12 +199,12 @@ 
 						</span>
 					</div>
 				</h2>
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				<input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
 					   value="<?php p($_['address']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
 				<?php } ?>
 			</form>
@@ -221,11 +221,11 @@ 
 						</span>
 					</div>
 				</h2>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
+				<div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 					<?php
-					switch($_['websiteVerification']) {
+					switch ($_['websiteVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -236,13 +236,13 @@ 
 							p(image_path('core', 'actions/verify.svg'));
 					}
 					?>"
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+					<?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">
 							<p class="explainVerification"></p>
 							<p class="verificationCode"></p>
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
 						</div>
 					</div>
 				</div>
@@ -250,10 +250,10 @@ 
 				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+					   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 				/>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
 				<?php } ?>
 			</form>
@@ -270,11 +270,11 @@ 
 						</span>
 					</div>
 				</h2>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
+				<div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 					<?php
-					switch($_['twitterVerification']) {
+					switch ($_['twitterVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -285,13 +285,13 @@ 
 							p(image_path('core', 'actions/verify.svg'));
 					}
 					?>"
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+					<?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">
 							<p class="explainVerification"></p>
 							<p class="verificationCode"></p>
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
 						</div>
 					</div>
 				</div>
@@ -299,10 +299,10 @@ 
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+					   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 				/>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
 				<?php } ?>
 			</form>
@@ -315,27 +315,27 @@ 
 			<?php if (isset($_['activelanguage'])) { ?>
 				<form id="language" class="section">
 					<h2>
-						<label for="languageinput"><?php p($l->t('Language'));?></label>
+						<label for="languageinput"><?php p($l->t('Language')); ?></label>
 					</h2>
-					<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-						<option value="<?php p($_['activelanguage']['code']);?>">
-							<?php p($_['activelanguage']['name']);?>
+					<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
+						<option value="<?php p($_['activelanguage']['code']); ?>">
+							<?php p($_['activelanguage']['name']); ?>
 						</option>
-						<?php foreach($_['commonlanguages'] as $language):?>
-							<option value="<?php p($language['code']);?>">
-								<?php p($language['name']);?>
+						<?php foreach ($_['commonlanguages'] as $language):?>
+							<option value="<?php p($language['code']); ?>">
+								<?php p($language['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 						<optgroup label="––––––––––"></optgroup>
-						<?php foreach($_['languages'] as $language):?>
-							<option value="<?php p($language['code']);?>">
-								<?php p($language['name']);?>
+						<?php foreach ($_['languages'] as $language):?>
+							<option value="<?php p($language['code']); ?>">
+								<?php p($language['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 					</select>
 					<a href="https://www.transifex.com/nextcloud/nextcloud/"
 					   target="_blank" rel="noreferrer noopener">
-						<em><?php p($l->t('Help translate'));?></em>
+						<em><?php p($l->t('Help translate')); ?></em>
 					</a>
 				</form>
 			<?php } ?>
@@ -344,27 +344,27 @@ 
 			<?php if (isset($_['activelocale'])) { ?>
 				<form id="locale" class="section">
 					<h2>
-						<label for="localeinput"><?php p($l->t('Locale'));?></label>
+						<label for="localeinput"><?php p($l->t('Locale')); ?></label>
 					</h2>
-					<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale'));?>">
-						<option value="<?php p($_['activelocale']['code']);?>">
-							<?php p($_['activelocale']['name']);?>
+					<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale')); ?>">
+						<option value="<?php p($_['activelocale']['code']); ?>">
+							<?php p($_['activelocale']['name']); ?>
 						</option>
 						<optgroup label="––––––––––"></optgroup>
-						<?php foreach($_['localesForLanguage'] as $locale):?>
-							<option value="<?php p($locale['code']);?>">
-								<?php p($locale['name']);?>
+						<?php foreach ($_['localesForLanguage'] as $locale):?>
+							<option value="<?php p($locale['code']); ?>">
+								<?php p($locale['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 						<optgroup label="––––––––––"></optgroup>
-						<option value="<?php p($_['activelocale']['code']);?>">
-							<?php p($_['activelocale']['name']);?>
+						<option value="<?php p($_['activelocale']['code']); ?>">
+							<?php p($_['activelocale']['name']); ?>
 						</option>
-						<?php foreach($_['locales'] as $locale):?>
-							<option value="<?php p($locale['code']);?>">
-								<?php p($locale['name']);?>
+						<?php foreach ($_['locales'] as $locale):?>
+							<option value="<?php p($locale['code']); ?>">
+								<?php p($locale['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 					</select>
 					<div id="localeexample" class="personal-info icon-timezone">
 						<p>