nextcloud / server

apps/twofactor_backupcodes/lib/Activity/GenericFilter.php

Indentation +26 added lines, -26 removed lines

@@ -28,39 +28,39 @@
 
 class GenericFilter implements IFilter {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-	}
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+    }
 
-	public function allowedApps() {
-		return [];
-	}
+    public function allowedApps() {
+        return [];
+    }
 
-	public function filterTypes(array $types) {
-		return array_intersect(['twofactor'], $types);
-	}
+    public function filterTypes(array $types) {
+        return array_intersect(['twofactor'], $types);
+    }
 
-	public function getIcon() {
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
-	}
+    public function getIcon() {
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
+    }
 
-	public function getIdentifier() {
-		return 'twofactor';
-	}
+    public function getIdentifier() {
+        return 'twofactor';
+    }
 
-	public function getName() {
-		return $this->l10n->t('Two-factor authentication');
-	}
+    public function getName() {
+        return $this->l10n->t('Two-factor authentication');
+    }
 
-	public function getPriority() {
-		return 30;
-	}
+    public function getPriority() {
+        return 30;
+    }
 
 }

apps/twofactor_backupcodes/lib/Activity/GenericSetting.php

Indentation +26 added lines, -26 removed lines

@@ -27,39 +27,39 @@
 
 class GenericSetting implements ISetting {
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	public function canChangeMail() {
-		return false;
-	}
+    public function canChangeMail() {
+        return false;
+    }
 
-	public function canChangeStream() {
-		return false;
-	}
+    public function canChangeStream() {
+        return false;
+    }
 
-	public function getIdentifier() {
-		return 'twofactor';
-	}
+    public function getIdentifier() {
+        return 'twofactor';
+    }
 
-	public function getName() {
-		return $this->l10n->t('Two-factor authentication');
-	}
+    public function getName() {
+        return $this->l10n->t('Two-factor authentication');
+    }
 
-	public function getPriority() {
-		return 30;
-	}
+    public function getPriority() {
+        return 30;
+    }
 
-	public function isDefaultEnabledMail() {
-		return true;
-	}
+    public function isDefaultEnabledMail() {
+        return true;
+    }
 
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
 }

apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php

Indentation +128 added lines, -128 removed lines

@@ -33,133 +33,133 @@
 
 class BackupCodeStorage {
 
-	private static $CODE_LENGTH = 16;
-
-	/** @var BackupCodeMapper */
-	private $mapper;
-
-	/** @var IHasher */
-	private $hasher;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param BackupCodeMapper $mapper
-	 * @param ISecureRandom $random
-	 * @param IHasher $hasher
-	 * @param IManager $activityManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher,
-		IManager $activityManager, ILogger $logger) {
-		$this->mapper = $mapper;
-		$this->hasher = $hasher;
-		$this->random = $random;
-		$this->activityManager = $activityManager;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	public function createCodes(IUser $user, $number = 10) {
-		$result = [];
-
-		// Delete existing ones
-		$this->mapper->deleteCodes($user);
-
-		$uid = $user->getUID();
-		foreach (range(1, min([$number, 20])) as $i) {
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-
-			$dbCode = new BackupCode();
-			$dbCode->setUserId($uid);
-			$dbCode->setCode($this->hasher->hash($code));
-			$dbCode->setUsed(0);
-			$this->mapper->insert($dbCode);
-
-			array_push($result, $code);
-		}
-
-		$this->publishEvent($user, 'codes_generated');
-
-		return $result;
-	}
-
-	/**
-	 * Push an event the user's activity stream
-	 *
-	 * @param IUser $user
-	 * @param string $event
-	 */
-	private function publishEvent(IUser $user, $event) {
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('twofactor_backupcodes')
-			->setType('twofactor')
-			->setAuthor($user->getUID())
-			->setAffectedUser($user->getUID())
-			->setSubject($event);
-		try {
-			$this->activityManager->publish($activity);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('could not publish backup code creation activity', ['app' => 'twofactor_backupcodes']);
-			$this->logger->logException($e, ['app' => 'twofactor_backupcodes']);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return bool
-	 */
-	public function hasBackupCodes(IUser $user) {
-		$codes = $this->mapper->getBackupCodes($user);
-		return count($codes) > 0;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	public function getBackupCodesState(IUser $user) {
-		$codes = $this->mapper->getBackupCodes($user);
-		$total = count($codes);
-		$used = 0;
-		array_walk($codes, function (BackupCode $code) use (&$used) {
-			if (1 === (int) $code->getUsed()) {
-				$used++;
-			}
-		});
-		return [
-			'enabled' => $total > 0,
-			'total' => $total,
-			'used' => $used,
-		];
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string $code
-	 * @return bool
-	 */
-	public function validateCode(IUser $user, $code) {
-		$dbCodes = $this->mapper->getBackupCodes($user);
-
-		foreach ($dbCodes as $dbCode) {
-			if (0 === (int) $dbCode->getUsed() && $this->hasher->verify($code, $dbCode->getCode())) {
-				$dbCode->setUsed(1);
-				$this->mapper->update($dbCode);
-				return true;
-			}
-		}
-		return false;
-	}
+    private static $CODE_LENGTH = 16;
+
+    /** @var BackupCodeMapper */
+    private $mapper;
+
+    /** @var IHasher */
+    private $hasher;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /** @var IManager */
+    private $activityManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param BackupCodeMapper $mapper
+     * @param ISecureRandom $random
+     * @param IHasher $hasher
+     * @param IManager $activityManager
+     * @param ILogger $logger
+     */
+    public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher,
+        IManager $activityManager, ILogger $logger) {
+        $this->mapper = $mapper;
+        $this->hasher = $hasher;
+        $this->random = $random;
+        $this->activityManager = $activityManager;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    public function createCodes(IUser $user, $number = 10) {
+        $result = [];
+
+        // Delete existing ones
+        $this->mapper->deleteCodes($user);
+
+        $uid = $user->getUID();
+        foreach (range(1, min([$number, 20])) as $i) {
+            $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+
+            $dbCode = new BackupCode();
+            $dbCode->setUserId($uid);
+            $dbCode->setCode($this->hasher->hash($code));
+            $dbCode->setUsed(0);
+            $this->mapper->insert($dbCode);
+
+            array_push($result, $code);
+        }
+
+        $this->publishEvent($user, 'codes_generated');
+
+        return $result;
+    }
+
+    /**
+     * Push an event the user's activity stream
+     *
+     * @param IUser $user
+     * @param string $event
+     */
+    private function publishEvent(IUser $user, $event) {
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('twofactor_backupcodes')
+            ->setType('twofactor')
+            ->setAuthor($user->getUID())
+            ->setAffectedUser($user->getUID())
+            ->setSubject($event);
+        try {
+            $this->activityManager->publish($activity);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('could not publish backup code creation activity', ['app' => 'twofactor_backupcodes']);
+            $this->logger->logException($e, ['app' => 'twofactor_backupcodes']);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @return bool
+     */
+    public function hasBackupCodes(IUser $user) {
+        $codes = $this->mapper->getBackupCodes($user);
+        return count($codes) > 0;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    public function getBackupCodesState(IUser $user) {
+        $codes = $this->mapper->getBackupCodes($user);
+        $total = count($codes);
+        $used = 0;
+        array_walk($codes, function (BackupCode $code) use (&$used) {
+            if (1 === (int) $code->getUsed()) {
+                $used++;
+            }
+        });
+        return [
+            'enabled' => $total > 0,
+            'total' => $total,
+            'used' => $used,
+        ];
+    }
+
+    /**
+     * @param IUser $user
+     * @param string $code
+     * @return bool
+     */
+    public function validateCode(IUser $user, $code) {
+        $dbCodes = $this->mapper->getBackupCodes($user);
+
+        foreach ($dbCodes as $dbCode) {
+            if (0 === (int) $dbCode->getUsed() && $this->hasher->verify($code, $dbCode->getCode())) {
+                $dbCode->setUsed(1);
+                $this->mapper->update($dbCode);
+                return true;
+            }
+        }
+        return false;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 
 		$uid = $user->getUID();
 		foreach (range(1, min([$number, 20])) as $i) {
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 
 			$dbCode = new BackupCode();
 			$dbCode->setUserId($uid);
@@ -132,7 +132,7 @@ 
 		$codes = $this->mapper->getBackupCodes($user);
 		$total = count($codes);
 		$used = 0;
-		array_walk($codes, function (BackupCode $code) use (&$used) {
+		array_walk($codes, function(BackupCode $code) use (&$used) {
 			if (1 === (int) $code->getUsed()) {
 				$used++;
 			}

apps/twofactor_backupcodes/lib/Controller/SettingsController.php

Indentation +37 added lines, -37 removed lines

@@ -30,46 +30,46 @@
 
 class SettingsController extends Controller {
 
-	/** @var BackupCodeStorage */
-	private $storage;
+    /** @var BackupCodeStorage */
+    private $storage;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param BackupCodeStorage $storage
-	 * @param IUserSession $userSession
-	 */
-	public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) {
-		parent::__construct($appName, $request);
-		$this->userSession = $userSession;
-		$this->storage = $storage;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param BackupCodeStorage $storage
+     * @param IUserSession $userSession
+     */
+    public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) {
+        parent::__construct($appName, $request);
+        $this->userSession = $userSession;
+        $this->storage = $storage;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @return JSONResponse
-	 */
-	public function state() {
-		$user = $this->userSession->getUser();
-		return $this->storage->getBackupCodesState($user);
-	}
+    /**
+     * @NoAdminRequired
+     * @return JSONResponse
+     */
+    public function state() {
+        $user = $this->userSession->getUser();
+        return $this->storage->getBackupCodesState($user);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function createCodes() {
-		$user = $this->userSession->getUser();
-		$codes = $this->storage->createCodes($user);
-		return new JSONResponse([
-			'codes' => $codes,
-			'state' => $this->storage->getBackupCodesState($user),
-		]);
-	}
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @return JSONResponse
+     */
+    public function createCodes() {
+        $user = $this->userSession->getUser();
+        $codes = $this->storage->createCodes($user);
+        return new JSONResponse([
+            'codes' => $codes,
+            'state' => $this->storage->getBackupCodesState($user),
+        ]);
+    }
 
 }

apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php

Indentation +27 added lines, -27 removed lines

@@ -27,38 +27,38 @@
 
 class BackupCodeMapper extends Mapper {
 
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'twofactor_backup_codes');
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'twofactor_backup_codes');
+    }
 
-	/**
-	 * @param IUser $user
-	 * @return BackupCode[]
-	 */
-	public function getBackupCodes(IUser $user) {
-		/* @var IQueryBuilder $qb */
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @param IUser $user
+     * @return BackupCode[]
+     */
+    public function getBackupCodes(IUser $user) {
+        /* @var IQueryBuilder $qb */
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->select('id', 'user_id', 'code', 'used')
-			->from('twofactor_backup_codes')
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
-		$result = $qb->execute();
+        $qb->select('id', 'user_id', 'code', 'used')
+            ->from('twofactor_backup_codes')
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
+        $result = $qb->execute();
 
-		$rows = $result->fetchAll();
-		$result->closeCursor();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
 
-		return array_map(function ($row) {
-			return BackupCode::fromRow($row);
-		}, $rows);
-	}
+        return array_map(function ($row) {
+            return BackupCode::fromRow($row);
+        }, $rows);
+    }
 
-	public function deleteCodes(IUser $user) {
-		/* @var IQueryBuilder $qb */
-		$qb = $this->db->getQueryBuilder();
+    public function deleteCodes(IUser $user) {
+        /* @var IQueryBuilder $qb */
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->delete('twofactor_backup_codes')
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
-		$qb->execute();
-	}
+        $qb->delete('twofactor_backup_codes')
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
+        $qb->execute();
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		$rows = $result->fetchAll();
 		$result->closeCursor();
 
-		return array_map(function ($row) {
+		return array_map(function($row) {
 			return BackupCode::fromRow($row);
 		}, $rows);
 	}

apps/twofactor_backupcodes/lib/Db/BackupCode.php

Indentation +6 added lines, -6 removed lines

@@ -34,13 +34,13 @@
  */
 class BackupCode extends Entity {
 
-	/** @var string */
-	protected $userId;
+    /** @var string */
+    protected $userId;
 
-	/** @var string */
-	protected $code;
+    /** @var string */
+    protected $code;
 
-	/** @var int */
-	protected $used;
+    /** @var int */
+    protected $used;
 
 }

apps/twofactor_backupcodes/appinfo/routes.php

Indentation +12 added lines, -12 removed lines

@@ -21,17 +21,17 @@
  */
 // @codeCoverageIgnoreStart
 return [
-	'routes' => [
-		[
-			'name' => 'settings#state',
-			'url' => '/settings/state',
-			'verb' => 'GET'
-		],
-		[
-			'name' => 'settings#createCodes',
-			'url' => '/settings/create',
-			'verb' => 'POST'
-		],
-	]
+    'routes' => [
+        [
+            'name' => 'settings#state',
+            'url' => '/settings/state',
+            'verb' => 'GET'
+        ],
+        [
+            'name' => 'settings#createCodes',
+            'url' => '/settings/create',
+            'verb' => 'POST'
+        ],
+    ]
 ];
 // @codeCoverageIgnoreEnd

apps/encryption/templates/altmail.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password'])));
 if ( isset($_['expiration']) ) {
-	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
-	print_unescaped("\n\n");
+    print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
+    print_unescaped("\n\n");
 }
 // TRANSLATORS term at the end of a mail
 p($l->t("Cheers!"));

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 /** @var array $_ */
 
 print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password'])));
-if ( isset($_['expiration']) ) {
+if (isset($_['expiration'])) {
 	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
 	print_unescaped("\n\n");
 }
@@ -12,5 +12,5 @@ 
 ?>
 
 	--
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
 <?php print_unescaped("\n".$theme->getBaseUrl());

apps/encryption/templates/settings-personal.php

Indentation +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-	/** @var array $_ */
-	/** @var \OCP\IL10N $l */
+    /** @var array $_ */
+    /** @var \OCP\IL10N $l */
 script('encryption', 'settings-personal');
 script('core', 'multiselect');
 ?>
@@ -20,8 +20,8 @@ 
 			<br />
 			<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
 			<?php if (  $_["recoveryEnabledForUser"] ):
-					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
-			endif; ?>
+                    p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
+            endif; ?>
 			<br />
 			<input
 				type="password"

Spacing +16 added lines, -16 removed lines

@@ -7,57 +7,57 @@ 
 <form id="ocDefaultEncryptionModule" class="section">
 	<h2><?php p($l->t('Basic encryption module')); ?></h2>
 
-	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
+	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
 
 	<?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?>
 
-	<?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
+	<?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
 		<p>
 			<a name="changePKPasswd" />
 			<label for="changePrivateKeyPasswd">
-				<em><?php p( $l->t( "Your private key password no longer matches your log-in password." ) ); ?></em>
+				<em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
 			</label>
 			<br />
-			<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
-			<?php if (  $_["recoveryEnabledForUser"] ):
-					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
+			<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
+			<?php if ($_["recoveryEnabledForUser"]):
+					p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
 			endif; ?>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="oldPrivateKeyPassword" />
-			<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>
+			<label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="newPrivateKeyPassword" />
-			<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>
+			<label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
 			<br />
 			<button
 				type="button"
 				name="submitChangePrivateKeyPassword"
-				disabled><?php p($l->t( "Update Private Key Password" )); ?>
+				disabled><?php p($l->t("Update Private Key Password")); ?>
 			</button>
 			<span class="msg"></span>
 		</p>
 
-	<?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] &&  $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
+	<?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
 		<br />
 		<p id="userEnableRecovery">
-			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
+			<label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
 			<span class="msg"></span>
 			<br />
-			<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>
+			<em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
 			<br />
 			<input
 			type='radio'
 			id='userEnableRecovery'
 			name='userEnableRecovery'
 			value='1'
-			<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
-			<label for="userEnableRecovery"><?php p( $l->t( "Enabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
+			<label for="userEnableRecovery"><?php p($l->t("Enabled")); ?></label>
 			<br />
 
 			<input
@@ -65,8 +65,8 @@ 
 			id='userDisableRecovery'
 			name='userEnableRecovery'
 			value='0'
-			<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
-			<label for="userDisableRecovery"><?php p( $l->t( "Disabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
+			<label for="userDisableRecovery"><?php p($l->t("Disabled")); ?></label>
 		</p>
 	<?php endif; ?>
 </form>