nextcloud / server

apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php

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);
 	}

Indentation +36 added lines, -36 removed lines

@@ -28,48 +28,48 @@
 
 class BackupCodeMapper extends Mapper {
 
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'twofactor_backupcodes');
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'twofactor_backupcodes');
+    }
 
-	/**
-	 * @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_backupcodes')
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
-		$result = $qb->execute();
+        $qb->select('id', 'user_id', 'code', 'used')
+            ->from('twofactor_backupcodes')
+            ->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);
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	public function deleteCodes(IUser $user) {
-		$this->deleteCodesByUserId($user->getUID());
-	}
+    /**
+     * @param IUser $user
+     */
+    public function deleteCodes(IUser $user) {
+        $this->deleteCodesByUserId($user->getUID());
+    }
 
-	/**
-	 * @param string $uid
-	 */
-	public function deleteCodesByUserId($uid) {
-		/* @var IQueryBuilder $qb */
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @param string $uid
+     */
+    public function deleteCodesByUserId($uid) {
+        /* @var IQueryBuilder $qb */
+        $qb = $this->db->getQueryBuilder();
 
-		$qb->delete('twofactor_backupcodes')
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
-		$qb->execute();
-	}
+        $qb->delete('twofactor_backupcodes')
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
+        $qb->execute();
+    }
 
 }

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,49 +7,49 @@ 
 <form id="ocDefaultEncryptionModule" class="section">
 	<h2 data-anchor-name="basic-encryption-module"><?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"
@@ -57,8 +57,8 @@ 
 			id="userEnableRecoveryCheckbox"
 			name="userEnableRecovery"
 			value="1"
-			<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
-			<label for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
+			<label for="userEnableRecoveryCheckbox"><?php p($l->t("Enabled")); ?></label>
 			<br />
 
 			<input
@@ -67,8 +67,8 @@ 
 			id="userDisableRecoveryCheckbox"
 			name="userEnableRecovery"
 			value="0"
-			<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
-			<label for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
+			<label for="userDisableRecoveryCheckbox"><?php p($l->t("Disabled")); ?></label>
 		</p>
 	<?php endif; ?>
 </form>

apps/encryption/templates/mail.php

Indentation +4 added lines, -4 removed lines

@@ -15,10 +15,10 @@
 					<td width="20px">&nbsp;</td>
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 						<?php
-						print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please 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.<br><br>', array($_['password'])));
-						// TRANSLATORS term at the end of a mail
-						p($l->t('Cheers!'));
-						?>
+                        print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please 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.<br><br>', array($_['password'])));
+                        // TRANSLATORS term at the end of a mail
+                        p($l->t('Cheers!'));
+                        ?>
 					</td>
 				</tr>
 				<tr><td colspan="2">&nbsp;</td></tr>

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
@@ -52,7 +52,7 @@ 
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 						<?php p($theme->getName()); ?> -
 						<?php p($theme->getSlogan()); ?>
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 					</td>
 				</tr>
 				<tr>

apps/encryption/lib/Util.php

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
 	 * @return bool
 	 */
 	public function userHasFiles($uid) {
-		return $this->files->file_exists($uid . '/files');
+		return $this->files->file_exists($uid.'/files');
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 		if (count($parts) > 1) {
 			$owner = $parts[1];
 			if ($this->userManager->userExists($owner) === false) {
-				throw new \BadMethodCallException('Unknown user: ' .
+				throw new \BadMethodCallException('Unknown user: '.
 				'method expects path to a user folder relative to the data folder');
 			}
 

Indentation +161 added lines, -161 removed lines

@@ -37,166 +37,166 @@
 use OCP\PreConditionNotMetException;
 
 class Util {
-	/**
-	 * @var View
-	 */
-	private $files;
-	/**
-	 * @var Crypt
-	 */
-	private $crypt;
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
-	/**
-	 * @var bool|IUser
-	 */
-	private $user;
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/**
-	 * Util constructor.
-	 *
-	 * @param View $files
-	 * @param Crypt $crypt
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(View $files,
-								Crypt $crypt,
-								ILogger $logger,
-								IUserSession $userSession,
-								IConfig $config,
-								IUserManager $userManager
-	) {
-		$this->files = $files;
-		$this->crypt = $crypt;
-		$this->logger = $logger;
-		$this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false;
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * check if recovery key is enabled for user
-	 *
-	 * @param string $uid
-	 * @return bool
-	 */
-	public function isRecoveryEnabledForUser($uid) {
-		$recoveryMode = $this->config->getUserValue($uid,
-			'encryption',
-			'recoveryEnabled',
-			'0');
-
-		return ($recoveryMode === '1');
-	}
-
-	/**
-	 * check if the home storage should be encrypted
-	 *
-	 * @return bool
-	 */
-	public function shouldEncryptHomeStorage() {
-		$encryptHomeStorage = $this->config->getAppValue(
-			'encryption',
-			'encryptHomeStorage',
-			'1'
-		);
-
-		return ($encryptHomeStorage === '1');
-	}
-
-	/**
-	 * set the home storage encryption on/off
-	 *
-	 * @param bool $encryptHomeStorage
-	 */
-	public function setEncryptHomeStorage($encryptHomeStorage) {
-		$value = $encryptHomeStorage ? '1' : '0';
-		$this->config->setAppValue(
-			'encryption',
-			'encryptHomeStorage',
-			$value
-		);
-	}
-
-	/**
-	 * check if master key is enabled
-	 *
-	 * @return bool
-	 */
-	public function isMasterKeyEnabled() {
-		$userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1');
-		return ($userMasterKey === '1');
-	}
-
-	/**
-	 * @param $enabled
-	 * @return bool
-	 */
-	public function setRecoveryForUser($enabled) {
-		$value = $enabled ? '1' : '0';
-
-		try {
-			$this->config->setUserValue($this->user->getUID(),
-				'encryption',
-				'recoveryEnabled',
-				$value);
-			return true;
-		} catch (PreConditionNotMetException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $uid
-	 * @return bool
-	 */
-	public function userHasFiles($uid) {
-		return $this->files->file_exists($uid . '/files');
-	}
-
-	/**
-	 * get owner from give path, path relative to data/ expected
-	 *
-	 * @param string $path relative to data/
-	 * @return string
-	 * @throws \BadMethodCallException
-	 */
-	public function getOwner($path) {
-		$owner = '';
-		$parts = explode('/', $path, 3);
-		if (count($parts) > 1) {
-			$owner = $parts[1];
-			if ($this->userManager->userExists($owner) === false) {
-				throw new \BadMethodCallException('Unknown user: ' .
-				'method expects path to a user folder relative to the data folder');
-			}
-
-		}
-
-		return $owner;
-	}
-
-	/**
-	 * get storage of path
-	 *
-	 * @param string $path
-	 * @return \OC\Files\Storage\Storage
-	 */
-	public function getStorage($path) {
-		return $this->files->getMount($path)->getStorage();
-	}
+    /**
+     * @var View
+     */
+    private $files;
+    /**
+     * @var Crypt
+     */
+    private $crypt;
+    /**
+     * @var ILogger
+     */
+    private $logger;
+    /**
+     * @var bool|IUser
+     */
+    private $user;
+    /**
+     * @var IConfig
+     */
+    private $config;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /**
+     * Util constructor.
+     *
+     * @param View $files
+     * @param Crypt $crypt
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     */
+    public function __construct(View $files,
+                                Crypt $crypt,
+                                ILogger $logger,
+                                IUserSession $userSession,
+                                IConfig $config,
+                                IUserManager $userManager
+    ) {
+        $this->files = $files;
+        $this->crypt = $crypt;
+        $this->logger = $logger;
+        $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false;
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * check if recovery key is enabled for user
+     *
+     * @param string $uid
+     * @return bool
+     */
+    public function isRecoveryEnabledForUser($uid) {
+        $recoveryMode = $this->config->getUserValue($uid,
+            'encryption',
+            'recoveryEnabled',
+            '0');
+
+        return ($recoveryMode === '1');
+    }
+
+    /**
+     * check if the home storage should be encrypted
+     *
+     * @return bool
+     */
+    public function shouldEncryptHomeStorage() {
+        $encryptHomeStorage = $this->config->getAppValue(
+            'encryption',
+            'encryptHomeStorage',
+            '1'
+        );
+
+        return ($encryptHomeStorage === '1');
+    }
+
+    /**
+     * set the home storage encryption on/off
+     *
+     * @param bool $encryptHomeStorage
+     */
+    public function setEncryptHomeStorage($encryptHomeStorage) {
+        $value = $encryptHomeStorage ? '1' : '0';
+        $this->config->setAppValue(
+            'encryption',
+            'encryptHomeStorage',
+            $value
+        );
+    }
+
+    /**
+     * check if master key is enabled
+     *
+     * @return bool
+     */
+    public function isMasterKeyEnabled() {
+        $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1');
+        return ($userMasterKey === '1');
+    }
+
+    /**
+     * @param $enabled
+     * @return bool
+     */
+    public function setRecoveryForUser($enabled) {
+        $value = $enabled ? '1' : '0';
+
+        try {
+            $this->config->setUserValue($this->user->getUID(),
+                'encryption',
+                'recoveryEnabled',
+                $value);
+            return true;
+        } catch (PreConditionNotMetException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $uid
+     * @return bool
+     */
+    public function userHasFiles($uid) {
+        return $this->files->file_exists($uid . '/files');
+    }
+
+    /**
+     * get owner from give path, path relative to data/ expected
+     *
+     * @param string $path relative to data/
+     * @return string
+     * @throws \BadMethodCallException
+     */
+    public function getOwner($path) {
+        $owner = '';
+        $parts = explode('/', $path, 3);
+        if (count($parts) > 1) {
+            $owner = $parts[1];
+            if ($this->userManager->userExists($owner) === false) {
+                throw new \BadMethodCallException('Unknown user: ' .
+                'method expects path to a user folder relative to the data folder');
+            }
+
+        }
+
+        return $owner;
+    }
+
+    /**
+     * get storage of path
+     *
+     * @param string $path
+     * @return \OC\Files\Storage\Storage
+     */
+    public function getStorage($path) {
+        return $this->files->getMount($path)->getStorage();
+    }
 
 }

apps/encryption/lib/Users/Setup.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
 use OCP\IUserSession;
 
 class Setup {
-	/**
-	 * @var Crypt
-	 */
-	private $crypt;
-	/**
-	 * @var KeyManager
-	 */
-	private $keyManager;
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
-	/**
-	 * @var bool|string
-	 */
-	private $user;
+    /**
+     * @var Crypt
+     */
+    private $crypt;
+    /**
+     * @var KeyManager
+     */
+    private $keyManager;
+    /**
+     * @var ILogger
+     */
+    private $logger;
+    /**
+     * @var bool|string
+     */
+    private $user;
 
 
-	/**
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param Crypt $crypt
-	 * @param KeyManager $keyManager
-	 */
-	public function __construct(ILogger $logger,
-								IUserSession $userSession,
-								Crypt $crypt,
-								KeyManager $keyManager) {
-		$this->logger = $logger;
-		$this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
-		$this->crypt = $crypt;
-		$this->keyManager = $keyManager;
- 	}
+    /**
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param Crypt $crypt
+     * @param KeyManager $keyManager
+     */
+    public function __construct(ILogger $logger,
+                                IUserSession $userSession,
+                                Crypt $crypt,
+                                KeyManager $keyManager) {
+        $this->logger = $logger;
+        $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
+        $this->crypt = $crypt;
+        $this->keyManager = $keyManager;
+        }
 
-	/**
-	 * @param string $uid user id
-	 * @param string $password user password
-	 * @return bool
-	 */
-	public function setupUser($uid, $password) {
-		if (!$this->keyManager->userHasKeys($uid)) {
-			return $this->keyManager->storeKeyPair($uid, $password,
-				$this->crypt->createKeyPair());
-		}
-		return true;
-	}
+    /**
+     * @param string $uid user id
+     * @param string $password user password
+     * @return bool
+     */
+    public function setupUser($uid, $password) {
+        if (!$this->keyManager->userHasKeys($uid)) {
+            return $this->keyManager->storeKeyPair($uid, $password,
+                $this->crypt->createKeyPair());
+        }
+        return true;
+    }
 
-	/**
-	 * make sure that all system keys exists
-	 */
-	public function setupSystem() {
-		$this->keyManager->validateShareKey();
-		$this->keyManager->validateMasterKey();
-	}
+    /**
+     * make sure that all system keys exists
+     */
+    public function setupSystem() {
+        $this->keyManager->validateShareKey();
+        $this->keyManager->validateMasterKey();
+    }
 }

apps/encryption/lib/Controller/SettingsController.php

Indentation +124 added lines, -124 removed lines

@@ -38,129 +38,129 @@
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var KeyManager */
-	private $keyManager;
-
-	/** @var Crypt */
-	private $crypt;
-
-	/** @var Session */
-	private $session;
-
-	/** @var ISession  */
-	private $ocSession;
-
-	/** @var  Util */
-	private $util;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param KeyManager $keyManager
-	 * @param Crypt $crypt
-	 * @param Session $session
-	 * @param ISession $ocSession
-	 * @param Util $util
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								IUserManager $userManager,
-								IUserSession $userSession,
-								KeyManager $keyManager,
-								Crypt $crypt,
-								Session $session,
-								ISession $ocSession,
-								Util $util
+    /** @var IL10N */
+    private $l;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var KeyManager */
+    private $keyManager;
+
+    /** @var Crypt */
+    private $crypt;
+
+    /** @var Session */
+    private $session;
+
+    /** @var ISession  */
+    private $ocSession;
+
+    /** @var  Util */
+    private $util;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param KeyManager $keyManager
+     * @param Crypt $crypt
+     * @param Session $session
+     * @param ISession $ocSession
+     * @param Util $util
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IUserManager $userManager,
+                                IUserSession $userSession,
+                                KeyManager $keyManager,
+                                Crypt $crypt,
+                                Session $session,
+                                ISession $ocSession,
+                                Util $util
 ) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->keyManager = $keyManager;
-		$this->crypt = $crypt;
-		$this->session = $session;
-		$this->ocSession = $ocSession;
-		$this->util = $util;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 * @UseSession
-	 *
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 * @return DataResponse
-	 */
-	public function updatePrivateKeyPassword($oldPassword, $newPassword) {
-		$result = false;
-		$uid = $this->userSession->getUser()->getUID();
-		$errorMessage = $this->l->t('Could not update the private key password.');
-
-		//check if password is correct
-		$passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
-		if ($passwordCorrect === false) {
-			// if check with uid fails we need to check the password with the login name
-			// e.g. in the ldap case. For local user we need to check the password with
-			// the uid because in this case the login name is case insensitive
-			$loginName = $this->ocSession->get('loginname');
-			$passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
-		}
-
-		if ($passwordCorrect !== false) {
-			$encryptedKey = $this->keyManager->getPrivateKey($uid);
-			$decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
-
-			if ($decryptedKey) {
-				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
-				$header = $this->crypt->generateHeader();
-				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
-					$this->session->setPrivateKey($decryptedKey);
-					$result = true;
-				}
-			} else {
-				$errorMessage = $this->l->t('The old password was not correct, please try again.');
-			}
-		} else {
-			$errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
-		}
-
-		if ($result === true) {
-			$this->session->setStatus(Session::INIT_SUCCESSFUL);
-			return new DataResponse(
-				['message' => (string) $this->l->t('Private key password successfully updated.')]
-			);
-		} else {
-			return new DataResponse(
-				['message' => (string) $errorMessage],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-	}
-
-	/**
-	 * @UseSession
-	 *
-	 * @param bool $encryptHomeStorage
-	 * @return DataResponse
-	 */
-	public function setEncryptHomeStorage($encryptHomeStorage) {
-		$this->util->setEncryptHomeStorage($encryptHomeStorage);
-		return new DataResponse();
-	}
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->keyManager = $keyManager;
+        $this->crypt = $crypt;
+        $this->session = $session;
+        $this->ocSession = $ocSession;
+        $this->util = $util;
+    }
+
+
+    /**
+     * @NoAdminRequired
+     * @UseSession
+     *
+     * @param string $oldPassword
+     * @param string $newPassword
+     * @return DataResponse
+     */
+    public function updatePrivateKeyPassword($oldPassword, $newPassword) {
+        $result = false;
+        $uid = $this->userSession->getUser()->getUID();
+        $errorMessage = $this->l->t('Could not update the private key password.');
+
+        //check if password is correct
+        $passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
+        if ($passwordCorrect === false) {
+            // if check with uid fails we need to check the password with the login name
+            // e.g. in the ldap case. For local user we need to check the password with
+            // the uid because in this case the login name is case insensitive
+            $loginName = $this->ocSession->get('loginname');
+            $passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
+        }
+
+        if ($passwordCorrect !== false) {
+            $encryptedKey = $this->keyManager->getPrivateKey($uid);
+            $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
+
+            if ($decryptedKey) {
+                $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
+                $header = $this->crypt->generateHeader();
+                if ($encryptedKey) {
+                    $this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
+                    $this->session->setPrivateKey($decryptedKey);
+                    $result = true;
+                }
+            } else {
+                $errorMessage = $this->l->t('The old password was not correct, please try again.');
+            }
+        } else {
+            $errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
+        }
+
+        if ($result === true) {
+            $this->session->setStatus(Session::INIT_SUCCESSFUL);
+            return new DataResponse(
+                ['message' => (string) $this->l->t('Private key password successfully updated.')]
+            );
+        } else {
+            return new DataResponse(
+                ['message' => (string) $errorMessage],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
+
+    }
+
+    /**
+     * @UseSession
+     *
+     * @param bool $encryptHomeStorage
+     * @return DataResponse
+     */
+    public function setEncryptHomeStorage($encryptHomeStorage) {
+        $this->util->setEncryptHomeStorage($encryptHomeStorage);
+        return new DataResponse();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
 				$header = $this->crypt->generateHeader();
 				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
+					$this->keyManager->setPrivateKey($uid, $header.$encryptedKey);
 					$this->session->setPrivateKey($decryptedKey);
 					$result = true;
 				}