aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2020-10-05 15:12:57 +0200
committerMorris Jobke <hey@morrisjobke.de>2020-10-05 20:25:24 +0200
commitd9015a8c94bfd71fe484618a06d276701d3bf9ff (patch)
tree3f7a1cd6ec2fd982dd02de71b76076f7f01cef70 /apps/encryption
parentd357f4b10fe1b59e1e07bb90641d647522c7bfe2 (diff)
downloadnextcloud-server-d9015a8c94bfd71fe484618a06d276701d3bf9ff.tar.gz
nextcloud-server-d9015a8c94bfd71fe484618a06d276701d3bf9ff.zip
Format code to a single space around binary operators
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/lib/Crypto/DecryptAll.php2
-rw-r--r--apps/encryption/lib/Crypto/EncryptAll.php2
-rw-r--r--apps/encryption/lib/KeyManager.php2
-rw-r--r--apps/encryption/lib/Settings/Admin.php6
-rw-r--r--apps/encryption/templates/settings-personal.php2
-rw-r--r--apps/encryption/tests/Crypto/CryptTest.php2
-rw-r--r--apps/encryption/tests/Crypto/EncryptAllTest.php6
-rw-r--r--apps/encryption/tests/KeyManagerTest.php2
8 files changed, 12 insertions, 12 deletions
diff --git a/apps/encryption/lib/Crypto/DecryptAll.php b/apps/encryption/lib/Crypto/DecryptAll.php
index d8760a0b717..926d4b38db1 100644
--- a/apps/encryption/lib/Crypto/DecryptAll.php
+++ b/apps/encryption/lib/Crypto/DecryptAll.php
@@ -84,7 +84,7 @@ class DecryptAll {
if ($this->util->isMasterKeyEnabled()) {
$output->writeln('Use master key to decrypt all files');
$user = $this->keyManager->getMasterKeyId();
- $password =$this->keyManager->getMasterKeyPassword();
+ $password = $this->keyManager->getMasterKeyPassword();
} else {
$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
if (!empty($user)) {
diff --git a/apps/encryption/lib/Crypto/EncryptAll.php b/apps/encryption/lib/Crypto/EncryptAll.php
index 8fa2214234e..8124f2a7a75 100644
--- a/apps/encryption/lib/Crypto/EncryptAll.php
+++ b/apps/encryption/lib/Crypto/EncryptAll.php
@@ -264,7 +264,7 @@ class EncryptAll {
protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
$this->setupUserFS($uid);
$directories = [];
- $directories[] = '/' . $uid . '/files';
+ $directories[] = '/' . $uid . '/files';
while ($root = array_pop($directories)) {
$content = $this->rootView->getDirectoryContent($root);
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 0a4a29eb166..64ef1bd232c 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -508,7 +508,7 @@ class KeyManager {
* @param View $view
*/
public function setVersion($path, $version, View $view) {
- $fileInfo= $view->getFileInfo($path);
+ $fileInfo = $view->getFileInfo($path);
if ($fileInfo !== false) {
$cache = $fileInfo->getStorage()->getCache();
diff --git a/apps/encryption/lib/Settings/Admin.php b/apps/encryption/lib/Settings/Admin.php
index d3b64bee4ee..c7493278ead 100644
--- a/apps/encryption/lib/Settings/Admin.php
+++ b/apps/encryption/lib/Settings/Admin.php
@@ -99,10 +99,10 @@ class Admin implements ISettings {
$encryptHomeStorage = $util->shouldEncryptHomeStorage();
$parameters = [
- 'recoveryEnabled' => $recoveryAdminEnabled,
- 'initStatus' => $session->getStatus(),
+ 'recoveryEnabled' => $recoveryAdminEnabled,
+ 'initStatus' => $session->getStatus(),
'encryptHomeStorage' => $encryptHomeStorage,
- 'masterKeyEnabled' => $util->isMasterKeyEnabled(),
+ 'masterKeyEnabled' => $util->isMasterKeyEnabled(),
];
return new TemplateResponse('encryption', 'settings-admin', $parameters, '');
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index 23886b7c824..899ba4a1747 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -42,7 +42,7 @@ script('encryption', 'settings-personal');
<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>
diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php
index a49a37bea08..7bfaed0b17e 100644
--- a/apps/encryption/tests/Crypto/CryptTest.php
+++ b/apps/encryption/tests/Crypto/CryptTest.php
@@ -306,7 +306,7 @@ class CryptTest extends TestCase {
* test parseHeader()
*/
public function testParseHeader() {
- $header= 'HBEGIN:foo:bar:cipher:AES-256-CFB:HEND';
+ $header = 'HBEGIN:foo:bar:cipher:AES-256-CFB:HEND';
$result = self::invokePrivate($this->crypt, 'parseHeader', [$header]);
$this->assertTrue(is_array($result));
diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php
index 10d667bb4a8..8254cfc9b78 100644
--- a/apps/encryption/tests/Crypto/EncryptAllTest.php
+++ b/apps/encryption/tests/Crypto/EncryptAllTest.php
@@ -306,15 +306,15 @@ class EncryptAllTest extends TestCase {
$this->view->expects($this->at(0))->method('getDirectoryContent')
->with('/user1/files')->willReturn(
[
- ['name' => 'foo', 'type'=>'dir'],
- ['name' => 'bar', 'type'=>'file'],
+ ['name' => 'foo', 'type' => 'dir'],
+ ['name' => 'bar', 'type' => 'file'],
]
);
$this->view->expects($this->at(3))->method('getDirectoryContent')
->with('/user1/files/foo')->willReturn(
[
- ['name' => 'subfile', 'type'=>'file']
+ ['name' => 'subfile', 'type' => 'file']
]
);
diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php
index d3350af21e8..1180c65a871 100644
--- a/apps/encryption/tests/KeyManagerTest.php
+++ b/apps/encryption/tests/KeyManagerTest.php
@@ -237,7 +237,7 @@ class KeyManagerTest extends TestCase {
$this->keyStorageMock->expects($this->exactly(2))
->method('getUserKey')
->willReturnCallback(function ($uid, $keyID, $encryptionModuleId) {
- if ($keyID=== 'privateKey') {
+ if ($keyID === 'privateKey') {
return '';
}
return 'key';