nextcloud / server

apps/federatedfilesharing/lib/Settings/PersonalSection.php

Indentation +49 added lines, -49 removed lines

@@ -29,58 +29,58 @@
 use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection {
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
-	}
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l = $l;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 12
-	 */
-	public function getIcon() {
-		return $this->urlGenerator->imagePath('core', 'actions/share.svg');
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 12
+     */
+    public function getIcon() {
+        return $this->urlGenerator->imagePath('core', 'actions/share.svg');
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 * @since 9.1
-	 */
-	public function getID() {
-		return 'sharing';
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     * @since 9.1
+     */
+    public function getID() {
+        return 'sharing';
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 * @since 9.1
-	 */
-	public function getName() {
-		return $this->l->t('Sharing');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     * @since 9.1
+     */
+    public function getName() {
+        return $this->l->t('Sharing');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 15;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 15;
+    }
 }

apps/federatedfilesharing/lib/Settings/Personal.php

Indentation +60 added lines, -60 removed lines

@@ -33,69 +33,69 @@
 
 class Personal implements ISettings {
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var \OC_Defaults */
-	private $defaults;
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var \OC_Defaults */
+    private $defaults;
 
-	public function __construct(
-		FederatedShareProvider $federatedShareProvider, #
-		IUserSession $userSession,
-		IL10N $l,
-		IURLGenerator $urlGenerator,
-		\OC_Defaults $defaults
-	) {
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->userSession = $userSession;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-		$this->defaults = $defaults;
-	}
+    public function __construct(
+        FederatedShareProvider $federatedShareProvider, #
+        IUserSession $userSession,
+        IL10N $l,
+        IURLGenerator $urlGenerator,
+        \OC_Defaults $defaults
+    ) {
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->userSession = $userSession;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+        $this->defaults = $defaults;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$cloudID = $this->userSession->getUser()->getCloudId();
-		$url = 'https://nextcloud.com/federation#' . $cloudID;
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $cloudID = $this->userSession->getUser()->getCloudId();
+        $url = 'https://nextcloud.com/federation#' . $cloudID;
 
-		$parameters = [
-			'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
-			'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
-			'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
-			'logoPath' => $this->urlGenerator->imagePath('core', 'logo-icon.svg'),
-			'reference' => $url,
-			'cloudId' => $cloudID,
-			'color' => $this->defaults->getColorPrimary(),
-			'textColor' => "#ffffff",
-		];
-		return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
-	}
+        $parameters = [
+            'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
+            'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
+            'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
+            'logoPath' => $this->urlGenerator->imagePath('core', 'logo-icon.svg'),
+            'reference' => $url,
+            'cloudId' => $cloudID,
+            'color' => $this->defaults->getColorPrimary(),
+            'textColor' => "#ffffff",
+        ];
+        return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @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 40;
-	}
+    /**
+     * @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 40;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function getForm() {
 		$cloudID = $this->userSession->getUser()->getCloudId();
-		$url = 'https://nextcloud.com/federation#' . $cloudID;
+		$url = 'https://nextcloud.com/federation#'.$cloudID;
 
 		$parameters = [
 			'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),

apps/federatedfilesharing/lib/AppInfo/Application.php

Indentation +75 added lines, -75 removed lines

@@ -34,86 +34,86 @@
 
 class Application extends App {
 
-	/** @var FederatedShareProvider */
-	protected $federatedShareProvider;
+    /** @var FederatedShareProvider */
+    protected $federatedShareProvider;
 
-	public function __construct() {
-		parent::__construct('federatedfilesharing');
+    public function __construct() {
+        parent::__construct('federatedfilesharing');
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
-			$addressHandler = new AddressHandler(
-				$server->getURLGenerator(),
-				$server->getL10N('federatedfilesharing'),
-				$server->getCloudIdManager()
-			);
-			$notification = new Notifications(
-				$addressHandler,
-				$server->getHTTPClientService(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				\OC::$server->getJobList()
-			);
-			return new RequestHandlerController(
-				$c->query('AppName'),
-				$server->getRequest(),
-				$this->getFederatedShareProvider(),
-				$server->getDatabaseConnection(),
-				$server->getShareManager(),
-				$notification,
-				$addressHandler,
-				$server->getUserManager(),
-				$server->getCloudIdManager()
-			);
-		});
-	}
+        $container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
+            $addressHandler = new AddressHandler(
+                $server->getURLGenerator(),
+                $server->getL10N('federatedfilesharing'),
+                $server->getCloudIdManager()
+            );
+            $notification = new Notifications(
+                $addressHandler,
+                $server->getHTTPClientService(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                \OC::$server->getJobList()
+            );
+            return new RequestHandlerController(
+                $c->query('AppName'),
+                $server->getRequest(),
+                $this->getFederatedShareProvider(),
+                $server->getDatabaseConnection(),
+                $server->getShareManager(),
+                $notification,
+                $addressHandler,
+                $server->getUserManager(),
+                $server->getCloudIdManager()
+            );
+        });
+    }
 
-	/**
-	 * get instance of federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	public function getFederatedShareProvider() {
-		if ($this->federatedShareProvider === null) {
-			$this->initFederatedShareProvider();
-		}
-		return $this->federatedShareProvider;
-	}
+    /**
+     * get instance of federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    public function getFederatedShareProvider() {
+        if ($this->federatedShareProvider === null) {
+            $this->initFederatedShareProvider();
+        }
+        return $this->federatedShareProvider;
+    }
 
-	/**
-	 * initialize federated share provider
-	 */
-	protected function initFederatedShareProvider() {
-		$c = $this->getContainer();
-		$addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
-			\OC::$server->getURLGenerator(),
-			\OC::$server->getL10N('federatedfilesharing'),
-			\OC::$server->getCloudIdManager()
-		);
-		$notifications = new \OCA\FederatedFileSharing\Notifications(
-			$addressHandler,
-			\OC::$server->getHTTPClientService(),
-			\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
-			\OC::$server->getJobList()
-		);
-		$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
-			\OC::$server->getSecureRandom()
-		);
+    /**
+     * initialize federated share provider
+     */
+    protected function initFederatedShareProvider() {
+        $c = $this->getContainer();
+        $addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
+            \OC::$server->getURLGenerator(),
+            \OC::$server->getL10N('federatedfilesharing'),
+            \OC::$server->getCloudIdManager()
+        );
+        $notifications = new \OCA\FederatedFileSharing\Notifications(
+            $addressHandler,
+            \OC::$server->getHTTPClientService(),
+            \OC::$server->query(\OCP\OCS\IDiscoveryService::class),
+            \OC::$server->getJobList()
+        );
+        $tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
+            \OC::$server->getSecureRandom()
+        );
 
-		$this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
-			\OC::$server->getDatabaseConnection(),
-			$addressHandler,
-			$notifications,
-			$tokenHandler,
-			\OC::$server->getL10N('federatedfilesharing'),
-			\OC::$server->getLogger(),
-			\OC::$server->getLazyRootFolder(),
-			\OC::$server->getConfig(),
-			\OC::$server->getUserManager(),
-			\OC::$server->getCloudIdManager(),
-			$c->query(IConfig::class)
-		);
-	}
+        $this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
+            \OC::$server->getDatabaseConnection(),
+            $addressHandler,
+            $notifications,
+            $tokenHandler,
+            \OC::$server->getL10N('federatedfilesharing'),
+            \OC::$server->getLogger(),
+            \OC::$server->getLazyRootFolder(),
+            \OC::$server->getConfig(),
+            \OC::$server->getUserManager(),
+            \OC::$server->getCloudIdManager(),
+            $c->query(IConfig::class)
+        );
+    }
 
 }

apps/twofactor_backupcodes/lib/Settings/PersonalSection.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
 	 * integration'. Use the L10N service to translate it.
 	 *
-	 * @return string
+	 * @return \OC_L10N_String
 	 * @since 9.1
 	 */
 	public function getName() {

Indentation +58 added lines, -58 removed lines

@@ -32,67 +32,67 @@
 
 class PersonalSection implements IIconSection {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l;
-	/** @var BackupCodesProvider */
-	private $provider;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l;
+    /** @var BackupCodesProvider */
+    private $provider;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l, BackupCodesProvider $provider, IUserSession $userSession) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
-		$this->provider = $provider;
-		$this->userSession = $userSession;
-	}
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l, BackupCodesProvider $provider, IUserSession $userSession) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l = $l;
+        $this->provider = $provider;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 12
-	 */
-	public function getIcon() {
-		return $this->urlGenerator->imagePath('settings', 'password.svg');
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 12
+     */
+    public function getIcon() {
+        return $this->urlGenerator->imagePath('settings', 'password.svg');
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 * @since 9.1
-	 */
-	public function getID() {
-		if (!$this->provider->isActive($this->userSession->getUser())) {
-			return null;
-		}
-		return 'twofactor';
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     * @since 9.1
+     */
+    public function getID() {
+        if (!$this->provider->isActive($this->userSession->getUser())) {
+            return null;
+        }
+        return 'twofactor';
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 * @since 9.1
-	 */
-	public function getName() {
-		return $this->l->t('Second factor auth');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     * @since 9.1
+     */
+    public function getName() {
+        return $this->l->t('Second factor auth');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 8;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 8;
+    }
 }

settings/templates/settings/empty.php

Indentation +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
  *
  */
 
-	# used for Personal/Additional settings as fallback for legacy settings
+    # used for Personal/Additional settings as fallback for legacy settings
 ?>

apps/twofactor_backupcodes/lib/Settings/Personal.php

Indentation +42 added lines, -42 removed lines

@@ -32,51 +32,51 @@
 
 class Personal implements ISettings {
 
-	/** @var Application */
-	private $app;
-	/** @var BackupCodesProvider */
-	private $provider;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var Application */
+    private $app;
+    /** @var BackupCodesProvider */
+    private $provider;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(Application $app, BackupCodesProvider $provider, IUserSession $userSession) {
-		$this->app = $app;
-		$this->provider = $provider;
-		$this->userSession = $userSession;
-	}
+    public function __construct(Application $app, BackupCodesProvider $provider, IUserSession $userSession) {
+        $this->app = $app;
+        $this->provider = $provider;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$templateOwner = 'settings';
-		$templateName = 'settings/empty';
-		if ($this->provider->isActive($this->userSession->getUser())) {
-			$templateOwner = $this->app->getContainer()->getAppName();
-			$templateName = 'personal';
-		}
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $templateOwner = 'settings';
+        $templateName = 'settings/empty';
+        if ($this->provider->isActive($this->userSession->getUser())) {
+            $templateOwner = $this->app->getContainer()->getAppName();
+            $templateName = 'personal';
+        }
 
-		return new TemplateResponse($templateOwner, $templateName, [], '');
-	}
+        return new TemplateResponse($templateOwner, $templateName, [], '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'twofactor';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'twofactor';
+    }
 
-	/**
-	 * @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 85;
-	}
+    /**
+     * @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 85;
+    }
 }

apps/twofactor_backupcodes/lib/AppInfo/Application.php

Indentation +20 added lines, -20 removed lines

@@ -28,27 +28,27 @@
 use OCP\Util;
 
 class Application extends App {
-	public function __construct () {
-		parent::__construct('twofactor_backupcodes');
-	}
+    public function __construct () {
+        parent::__construct('twofactor_backupcodes');
+    }
 
-	/**
-	 * Register the different app parts
-	 */
-	public function register() {
-		$this->registerHooksAndEvents();
-	}
+    /**
+     * Register the different app parts
+     */
+    public function register() {
+        $this->registerHooksAndEvents();
+    }
 
-	/**
-	 * Register the hooks and events
-	 */
-	public function registerHooksAndEvents() {
-		Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
-	}
+    /**
+     * Register the hooks and events
+     */
+    public function registerHooksAndEvents() {
+        Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
+    }
 
-	public function deleteUser($params) {
-		/** @var BackupCodeMapper $mapper */
-		$mapper = $this->getContainer()->query(BackupCodeMapper::class);
-		$mapper->deleteCodesByUserId($params['uid']);
-	}
+    public function deleteUser($params) {
+        /** @var BackupCodeMapper $mapper */
+        $mapper = $this->getContainer()->query(BackupCodeMapper::class);
+        $mapper->deleteCodesByUserId($params['uid']);
+    }
 }

settings/Controller/CommonSettingsTrait.php

Doc Comments +13 added lines

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

Indentation +94 added lines, -94 removed lines

@@ -29,98 +29,98 @@
 use OCP\Settings\ISettings;
 
 trait CommonSettingsTrait  {
-	/** @var ISettingsManager */
-	private $settingsManager;
-
-	/**
-	 * @param string $currentSection
-	 * @return array
-	 */
-	private function getNavigationParameters($currentType, $currentSection) {
-		$templateParameters = [
-			'personal' => $this->formatPersonalSections($currentType, $currentSection),
-			'admin' => []
-		];
-
-		if(\OC_User::isAdminUser(\OC_User::getUser())) {
-			$templateParameters['admin'] = $this->formatAdminSections($currentType, $currentSection);
-		}
-
-		return [
-			'forms' => $templateParameters
-		];
-	}
-
-	protected function formatSections($sections, $currentSection, $type, $currentType) {
-		$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();
-				}
-
-				$active = $section->getID() === $currentSection
-					&& $type === $currentType;
-
-				$templateParameters[] = [
-					'anchor'       => $section->getID(),
-					'section-name' => $section->getName(),
-					'active'       => $active,
-					'icon'         => $icon,
-				];
-			}
-		}
-		return $templateParameters;
-	}
-
-	protected function formatPersonalSections($currentType, $currentSections) {
-		$sections = $this->settingsManager->getPersonalSections();
-		$templateParameters = $this->formatSections($sections, $currentSections, 'personal', $currentType);
-
-		return $templateParameters;
-	}
-
-	protected function formatAdminSections($currentType, $currentSections) {
-		$sections = $this->settingsManager->getAdminSections();
-		$templateParameters = $this->formatSections($sections, $currentSections, 'admin', $currentType);
-
-		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($type, $section) {
-		$templateParams = [];
-		$templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
-		$templateParams = array_merge($templateParams, $this->getSettings($section));
-
-		return new TemplateResponse('settings', 'settings/frame', $templateParams);
-	}
-
-	abstract protected function getSettings($section);
+    /** @var ISettingsManager */
+    private $settingsManager;
+
+    /**
+     * @param string $currentSection
+     * @return array
+     */
+    private function getNavigationParameters($currentType, $currentSection) {
+        $templateParameters = [
+            'personal' => $this->formatPersonalSections($currentType, $currentSection),
+            'admin' => []
+        ];
+
+        if(\OC_User::isAdminUser(\OC_User::getUser())) {
+            $templateParameters['admin'] = $this->formatAdminSections($currentType, $currentSection);
+        }
+
+        return [
+            'forms' => $templateParameters
+        ];
+    }
+
+    protected function formatSections($sections, $currentSection, $type, $currentType) {
+        $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();
+                }
+
+                $active = $section->getID() === $currentSection
+                    && $type === $currentType;
+
+                $templateParameters[] = [
+                    'anchor'       => $section->getID(),
+                    'section-name' => $section->getName(),
+                    'active'       => $active,
+                    'icon'         => $icon,
+                ];
+            }
+        }
+        return $templateParameters;
+    }
+
+    protected function formatPersonalSections($currentType, $currentSections) {
+        $sections = $this->settingsManager->getPersonalSections();
+        $templateParameters = $this->formatSections($sections, $currentSections, 'personal', $currentType);
+
+        return $templateParameters;
+    }
+
+    protected function formatAdminSections($currentType, $currentSections) {
+        $sections = $this->settingsManager->getAdminSections();
+        $templateParameters = $this->formatSections($sections, $currentSections, 'admin', $currentType);
+
+        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($type, $section) {
+        $templateParams = [];
+        $templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
+        $templateParams = array_merge($templateParams, $this->getSettings($section));
+
+        return new TemplateResponse('settings', 'settings/frame', $templateParams);
+    }
+
+    abstract protected 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($currentType, $currentSection);
 		}
 
@@ -54,11 +54,11 @@ 
 	protected function formatSections($sections, $currentSection, $type, $currentType) {
 		$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)) {

apps/encryption/lib/Settings/Personal.php

Indentation +52 added lines, -52 removed lines

@@ -33,63 +33,63 @@
 
 class Personal implements  ISettings {
 
-	/** @var IConfig */
-	private $config;
-	/** @var Session */
-	private $session;
-	/** @var Util */
-	private $util;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IConfig */
+    private $config;
+    /** @var Session */
+    private $session;
+    /** @var Util */
+    private $util;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
-		$this->config = $config;
-		$this->session = $session;
-		$this->util = $util;
-		$this->userSession = $userSession;
-	}
+    public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
+        $this->config = $config;
+        $this->session = $session;
+        $this->util = $util;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
-		$privateKeySet = $this->session->isPrivateKeySet();
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
+        $privateKeySet = $this->session->isPrivateKeySet();
 
-		if (!$recoveryAdminEnabled && $privateKeySet) {
-			return new TemplateResponse('settings', 'settings/empty', [], '');
-		}
+        if (!$recoveryAdminEnabled && $privateKeySet) {
+            return new TemplateResponse('settings', 'settings/empty', [], '');
+        }
 
-		$userId = $this->userSession->getUser()->getUID();
-		$recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
+        $userId = $this->userSession->getUser()->getUID();
+        $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
 
-		$parameters = [
-			'recoveryEnabled' => $recoveryAdminEnabled,
-			'recoveryEnabledForUser' => $recoveryEnabledForUser,
-			'privateKeySet' => $privateKeySet,
-			'initialized' => $this->session->getStatus(),
-		];
-		return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
-	}
+        $parameters = [
+            'recoveryEnabled' => $recoveryAdminEnabled,
+            'recoveryEnabledForUser' => $recoveryEnabledForUser,
+            'privateKeySet' => $privateKeySet,
+            'initialized' => $this->session->getStatus(),
+        ];
+        return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'encryption';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'encryption';
+    }
 
-	/**
-	 * @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;
+    }
 }