nextcloud / server

lib/private/Settings/Personal/Security.php

Indentation +78 added lines, -78 removed lines

@@ -38,82 +38,82 @@
 
 class Security implements ISettings {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var TwoFactorManager */
-	private $twoFactorManager;
-
-	/** @var ProviderLoader */
-	private $providerLoader;
-
-	/** @var IUserSession */
-	private $userSession;
-
-
-	public function __construct(IUserManager $userManager,
-								TwoFactorManager $providerManager,
-								ProviderLoader $providerLoader,
-								IUserSession $userSession) {
-		$this->userManager = $userManager;
-		$this->twoFactorManager = $providerManager;
-		$this->providerLoader = $providerLoader;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$user = $this->userManager->get(\OC_User::getUser());
-		$passwordChangeSupported = false;
-		if ($user !== null) {
-			$passwordChangeSupported = $user->canChangePassword();
-		}
-
-		return new TemplateResponse('settings', 'settings/personal/security', [
-			'passwordChangeSupported' => $passwordChangeSupported,
-			'twoFactorProviderData' => $this->getTwoFactorProviderData(),
-		]);
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	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
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 10;
-	}
-
-	private function getTwoFactorProviderData(): array {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return [];
-		}
-
-		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
-				return [
-					'provider' => $provider,
-					'settings' => $provider->getPersonalSettings($user)
-				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
-				return $provider instanceof IProvidesPersonalSettings;
-			}))
-		];
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var TwoFactorManager */
+    private $twoFactorManager;
+
+    /** @var ProviderLoader */
+    private $providerLoader;
+
+    /** @var IUserSession */
+    private $userSession;
+
+
+    public function __construct(IUserManager $userManager,
+                                TwoFactorManager $providerManager,
+                                ProviderLoader $providerLoader,
+                                IUserSession $userSession) {
+        $this->userManager = $userManager;
+        $this->twoFactorManager = $providerManager;
+        $this->providerLoader = $providerLoader;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $user = $this->userManager->get(\OC_User::getUser());
+        $passwordChangeSupported = false;
+        if ($user !== null) {
+            $passwordChangeSupported = $user->canChangePassword();
+        }
+
+        return new TemplateResponse('settings', 'settings/personal/security', [
+            'passwordChangeSupported' => $passwordChangeSupported,
+            'twoFactorProviderData' => $this->getTwoFactorProviderData(),
+        ]);
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    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
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 10;
+    }
+
+    private function getTwoFactorProviderData(): array {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return [];
+        }
+
+        return [
+            'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+                return [
+                    'provider' => $provider,
+                    'settings' => $provider->getPersonalSettings($user)
+                ];
+            }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+                return $provider instanceof IProvidesPersonalSettings;
+            }))
+        ];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -106,12 +106,12 @@
 		}
 
 		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+			'providers' => array_map(function(IProvidesPersonalSettings $provider) use ($user) {
 				return [
 					'provider' => $provider,
 					'settings' => $provider->getPersonalSettings($user)
 				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+			}, array_filter($this->providerLoader->getProviders($user), function(IProvider $provider) {
 				return $provider instanceof IProvidesPersonalSettings;
 			}))
 		];

settings/templates/settings/personal/security.php

Indentation +19 added lines, -19 removed lines

@@ -22,18 +22,18 @@ 
  */
 
 script('settings', [
-	'authtoken',
-	'authtoken_collection',
-	'templates',
-	'authtoken_view',
-	'settings/authtoken-init'
+    'authtoken',
+    'authtoken_collection',
+    'templates',
+    'authtoken_view',
+    'settings/authtoken-init'
 ]);
 
 if($_['passwordChangeSupported']) {
-	script('settings', 'security_password');
-	script('jquery-showpassword');
-	vendor_script('strengthify/jquery.strengthify');
-	vendor_style('strengthify/strengthify');
+    script('settings', 'security_password');
+    script('jquery-showpassword');
+    vendor_script('strengthify/jquery.strengthify');
+    vendor_style('strengthify/strengthify');
 }
 
 ?>
@@ -108,16 +108,16 @@ 
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
 		<li>
 			<?php
-			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
-			$provider = $data['provider'];
-			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-				$icon = $provider->getDarkIcon();
-			} else {
-				$icon = image_path('core', 'actions/password.svg');
-			}
-			/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
-			$settings = $data['settings'];
-			?>
+            /** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
+            $provider = $data['provider'];
+            if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+                $icon = $provider->getDarkIcon();
+            } else {
+                $icon = image_path('core', 'actions/password.svg');
+            }
+            /** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
+            $settings = $data['settings'];
+            ?>
 			<h3>
 				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
 				<?php p($provider->getDisplayName()) ?>

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
 	'settings/authtoken-init'
 ]);
 
-if($_['passwordChangeSupported']) {
+if ($_['passwordChangeSupported']) {
 	script('settings', 'security_password');
 	script('jquery-showpassword');
 	vendor_script('strengthify/jquery.strengthify');
@@ -37,19 +37,19 @@ 
 }
 
 ?>
-<?php if($_['passwordChangeSupported']) { ?>
+<?php if ($_['passwordChangeSupported']) { ?>
 <div id="security-password" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
 	<span id="password-error-msg" class="msg success hidden">Saved</span>
 	<div class="personal-settings-setting-box personal-settings-password-box">
 			<form id="passwordform">
 				<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
 				<input type="password" id="pass1" name="oldpassword"
-					   placeholder="<?php p($l->t('Current password'));?>"
+					   placeholder="<?php p($l->t('Current password')); ?>"
 					   autocomplete="off" autocapitalize="none" autocorrect="off" />
 
 				<div class="personal-show-container">
-					<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
+					<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
 					<input type="password" id="pass2" name="newpassword"
 						   placeholder="<?php p($l->t('New password')); ?>"
 						   data-typetoggle="#personal-show"
@@ -66,14 +66,14 @@ 
 <?php } ?>
 
 <div id="security" class="section">
-	<h2><?php p($l->t('Devices & sessions'));?></h2>
-	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></p>
+	<h2><?php p($l->t('Devices & sessions')); ?></h2>
+	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.')); ?></p>
 	<table class="icon-loading">
 		<thead class="token-list-header">
 			<tr>
 				<th></th>
-				<th><?php p($l->t('Device'));?></th>
-				<th><?php p($l->t('Last activity'));?></th>
+				<th><?php p($l->t('Device')); ?></th>
+				<th><?php p($l->t('Last activity')); ?></th>
 				<th></th>
 			</tr>
 		</thead>
@@ -103,7 +103,7 @@ 
 </div>
 
 <div id="two-factor-auth" class="section">
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
+	<h2><?php p($l->t('Two-Factor Authentication')); ?></h2>
 	<ul>
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
 		<li>