nextcloud / server

settings/templates/settings/personal/security.php

Indentation +25 added lines, -25 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');
 }
 
 ?>
@@ -106,27 +106,27 @@ 
 	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
 	<p class="settings-hint">
 		<?php
-		if ($_['twoFactorProviderData']['enabled']) {
-			p($l->t('Two-factor authentication is enabled on your account.'));
-		} else {
-			p($l->t('Two-factor authentication is disabled on your account.'));
-		}
-		?>
+        if ($_['twoFactorProviderData']['enabled']) {
+            p($l->t('Two-factor authentication is enabled on your account.'));
+        } else {
+            p($l->t('Two-factor authentication is disabled on your account.'));
+        }
+        ?>
 	</p>
 	<ul>
 	<?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>
 	<p class="settings-hint">
 		<?php
 		if ($_['twoFactorProviderData']['enabled']) {

lib/private/Settings/Personal/Security.php

Indentation +79 added lines, -79 removed lines

@@ -38,83 +38,83 @@
 
 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 [
-			'isEnabled' => $this->twoFactorManager->isTwoFactorAuthenticated($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) {
-				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 [
+            'isEnabled' => $this->twoFactorManager->isTwoFactorAuthenticated($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) {
+                return $provider instanceof IProvidesPersonalSettings;
+            }))
+        ];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -107,12 +107,12 @@
 
 		return [
 			'isEnabled' => $this->twoFactorManager->isTwoFactorAuthenticated($user),
-			'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;
 			}))
 		];

lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php

Indentation +6 added lines, -6 removed lines

@@ -33,11 +33,11 @@
  */
 interface IPersonalProviderSettings {
 
-	/**
-	 * @return Template
-	 *
-	 * @since 15.0.0
-	 */
-	public function getBody(): Template;
+    /**
+     * @return Template
+     *
+     * @since 15.0.0
+     */
+    public function getBody(): Template;
 
 }

lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php

Indentation +8 added lines, -8 removed lines

@@ -35,13 +35,13 @@
  */
 interface IProvidesPersonalSettings extends IProvider {
 
-	/**
-	 * @param IUser $user
-	 *
-	 * @return IPersonalProviderSettings
-	 *
-	 * @since 15.0.0
-	 */
-	public function getPersonalSettings(IUser $user): IPersonalProviderSettings;
+    /**
+     * @param IUser $user
+     *
+     * @return IPersonalProviderSettings
+     *
+     * @since 15.0.0
+     */
+    public function getPersonalSettings(IUser $user): IPersonalProviderSettings;
 
 }

apps/twofactor_backupcodes/lib/Settings/Personal.php

Indentation +3 added lines, -3 removed lines

@@ -30,8 +30,8 @@
 
 class Personal implements IPersonalProviderSettings {
 
-	public function getBody(): Template {
-		return new Template('twofactor_backupcodes', 'personal');
-	}
+    public function getBody(): Template {
+        return new Template('twofactor_backupcodes', 'personal');
+    }
 
 }

apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php

Indentation +115 added lines, -115 removed lines

@@ -35,121 +35,121 @@
 
 class BackupCodesProvider implements IProvider, IProvidesPersonalSettings {
 
-	/** @var string */
-	private $appName;
-
-	/** @var BackupCodeStorage */
-	private $storage;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var AppManager */
-	private $appManager;
-
-	/**
-	 * @param string $appName
-	 * @param BackupCodeStorage $storage
-	 * @param IL10N $l10n
-	 * @param AppManager $appManager
-	 */
-	public function __construct(string $appName, BackupCodeStorage $storage, IL10N $l10n, AppManager $appManager) {
-		$this->appName = $appName;
-		$this->l10n = $l10n;
-		$this->storage = $storage;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * Get unique identifier of this 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getId(): string {
-		return 'backup_codes';
-	}
-
-	/**
-	 * Get the display name for selecting the 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Backup code');
-	}
-
-	/**
-	 * Get the description for selecting the 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Use backup code');
-	}
-
-	/**
-	 * Get the template for rending the 2FA provider view
-	 *
-	 * @param IUser $user
-	 * @return Template
-	 */
-	public function getTemplate(IUser $user): Template {
-		return new Template('twofactor_backupcodes', 'challenge');
-	}
-
-	/**
-	 * Verify the given challenge
-	 *
-	 * @param IUser $user
-	 * @param string $challenge
-	 * @return bool
-	 */
-	public function verifyChallenge(IUser $user, string $challenge): bool {
-		return $this->storage->validateCode($user, $challenge);
-	}
-
-	/**
-	 * Decides whether 2FA is enabled for the given user
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
-		return $this->storage->hasBackupCodes($user);
-	}
-
-	/**
-	 * Determine whether backup codes should be active or not
-	 *
-	 * Backup codes only make sense if at least one 2FA provider is active,
-	 * hence this method checks all enabled apps on whether they provide 2FA
-	 * functionality or not. If there's at least one app, backup codes are
-	 * enabled on the personal settings page.
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isActive(IUser $user): bool {
-		$appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function($appId) {
-			return $appId !== $this->appName;
-		});
-		foreach ($appIds as $appId) {
-			$info = $this->appManager->getAppInfo($appId);
-			if (isset($info['two-factor-providers']) && count($info['two-factor-providers']) > 0) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param IUser $user
-	 *
-	 * @return IPersonalProviderSettings
-	 */
-	public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
-		return new Personal();
-	}
+    /** @var string */
+    private $appName;
+
+    /** @var BackupCodeStorage */
+    private $storage;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var AppManager */
+    private $appManager;
+
+    /**
+     * @param string $appName
+     * @param BackupCodeStorage $storage
+     * @param IL10N $l10n
+     * @param AppManager $appManager
+     */
+    public function __construct(string $appName, BackupCodeStorage $storage, IL10N $l10n, AppManager $appManager) {
+        $this->appName = $appName;
+        $this->l10n = $l10n;
+        $this->storage = $storage;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * Get unique identifier of this 2FA provider
+     *
+     * @return string
+     */
+    public function getId(): string {
+        return 'backup_codes';
+    }
+
+    /**
+     * Get the display name for selecting the 2FA provider
+     *
+     * @return string
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Backup code');
+    }
+
+    /**
+     * Get the description for selecting the 2FA provider
+     *
+     * @return string
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Use backup code');
+    }
+
+    /**
+     * Get the template for rending the 2FA provider view
+     *
+     * @param IUser $user
+     * @return Template
+     */
+    public function getTemplate(IUser $user): Template {
+        return new Template('twofactor_backupcodes', 'challenge');
+    }
+
+    /**
+     * Verify the given challenge
+     *
+     * @param IUser $user
+     * @param string $challenge
+     * @return bool
+     */
+    public function verifyChallenge(IUser $user, string $challenge): bool {
+        return $this->storage->validateCode($user, $challenge);
+    }
+
+    /**
+     * Decides whether 2FA is enabled for the given user
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
+        return $this->storage->hasBackupCodes($user);
+    }
+
+    /**
+     * Determine whether backup codes should be active or not
+     *
+     * Backup codes only make sense if at least one 2FA provider is active,
+     * hence this method checks all enabled apps on whether they provide 2FA
+     * functionality or not. If there's at least one app, backup codes are
+     * enabled on the personal settings page.
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isActive(IUser $user): bool {
+        $appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function($appId) {
+            return $appId !== $this->appName;
+        });
+        foreach ($appIds as $appId) {
+            $info = $this->appManager->getAppInfo($appId);
+            if (isset($info['two-factor-providers']) && count($info['two-factor-providers']) > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param IUser $user
+     *
+     * @return IPersonalProviderSettings
+     */
+    public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
+        return new Personal();
+    }
 
 }