Completed
Pull Request — master (#7014)
by korelstar
13:29
created
apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 		$uid = $user->getUID();
80 80
 		foreach (range(1, min([$number, 20])) as $i) {
81
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
81
+			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
82 82
 
83 83
 			$dbCode = new BackupCode();
84 84
 			$dbCode->setUserId($uid);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		$codes = $this->mapper->getBackupCodes($user);
133 133
 		$total = count($codes);
134 134
 		$used = 0;
135
-		array_walk($codes, function (BackupCode $code) use (&$used) {
135
+		array_walk($codes, function(BackupCode $code) use (&$used) {
136 136
 			if (1 === (int) $code->getUsed()) {
137 137
 				$used++;
138 138
 			}
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 		$rows = $result->fetchAll();
48 48
 		$result->closeCursor();
49 49
 
50
-		return array_map(function ($row) {
50
+		return array_map(function($row) {
51 51
 			return BackupCode::fromRow($row);
52 52
 		}, $rows);
53 53
 	}
Please login to merge, or discard this patch.
apps/encryption/templates/altmail.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 /** @var array $_ */
4 4
 
5 5
 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'])));
6
-if ( isset($_['expiration']) ) {
6
+if (isset($_['expiration'])) {
7 7
 	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
8 8
 	print_unescaped("\n\n");
9 9
 }
@@ -12,5 +12,5 @@  discard block
 block discarded – undo
12 12
 ?>
13 13
 
14 14
 	--
15
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
15
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
16 16
 <?php print_unescaped("\n".$theme->getBaseUrl());
Please login to merge, or discard this patch.
apps/encryption/lib/Util.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 * @return bool
164 164
 	 */
165 165
 	public function userHasFiles($uid) {
166
-		return $this->files->file_exists($uid . '/files');
166
+		return $this->files->file_exists($uid.'/files');
167 167
 	}
168 168
 
169 169
 	/**
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		if (count($parts) > 1) {
180 180
 			$owner = $parts[1];
181 181
 			if ($this->userManager->userExists($owner) === false) {
182
-				throw new \BadMethodCallException('Unknown user: ' .
182
+				throw new \BadMethodCallException('Unknown user: '.
183 183
 				'method expects path to a user folder relative to the data folder');
184 184
 			}
185 185
 
Please login to merge, or discard this patch.
apps/encryption/lib/Controller/SettingsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
 				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
129 129
 				$header = $this->crypt->generateHeader();
130 130
 				if ($encryptedKey) {
131
-					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
131
+					$this->keyManager->setPrivateKey($uid, $header.$encryptedKey);
132 132
 					$this->session->setPrivateKey($decryptedKey);
133 133
 					$result = true;
134 134
 				}
Please login to merge, or discard this patch.
apps/encryption/lib/Controller/RecoveryController.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -74,36 +74,36 @@  discard block
 block discarded – undo
74 74
 	public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) {
75 75
 		// Check if both passwords are the same
76 76
 		if (empty($recoveryPassword)) {
77
-			$errorMessage = (string)$this->l->t('Missing recovery key password');
77
+			$errorMessage = (string) $this->l->t('Missing recovery key password');
78 78
 			return new DataResponse(['data' => ['message' => $errorMessage]],
79 79
 				Http::STATUS_BAD_REQUEST);
80 80
 		}
81 81
 
82 82
 		if (empty($confirmPassword)) {
83
-			$errorMessage = (string)$this->l->t('Please repeat the recovery key password');
83
+			$errorMessage = (string) $this->l->t('Please repeat the recovery key password');
84 84
 			return new DataResponse(['data' => ['message' => $errorMessage]],
85 85
 				Http::STATUS_BAD_REQUEST);
86 86
 		}
87 87
 
88 88
 		if ($recoveryPassword !== $confirmPassword) {
89
-			$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
89
+			$errorMessage = (string) $this->l->t('Repeated recovery key password does not match the provided recovery key password');
90 90
 			return new DataResponse(['data' => ['message' => $errorMessage]],
91 91
 				Http::STATUS_BAD_REQUEST);
92 92
 		}
93 93
 
94 94
 		if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
95 95
 			if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
96
-				return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully enabled')]]);
96
+				return new DataResponse(['data' => ['message' => (string) $this->l->t('Recovery key successfully enabled')]]);
97 97
 			}
98
-			return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
98
+			return new DataResponse(['data' => ['message' => (string) $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
99 99
 		} elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
100 100
 			if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
101
-				return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully disabled')]]);
101
+				return new DataResponse(['data' => ['message' => (string) $this->l->t('Recovery key successfully disabled')]]);
102 102
 			}
103
-			return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
103
+			return new DataResponse(['data' => ['message' => (string) $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
104 104
 		}
105 105
 		// this response should never be sent but just in case.
106
-		return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
106
+		return new DataResponse(['data' => ['message' => (string) $this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
107 107
 	}
108 108
 
109 109
 	/**
@@ -115,22 +115,22 @@  discard block
 block discarded – undo
115 115
 	public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) {
116 116
 		//check if both passwords are the same
117 117
 		if (empty($oldPassword)) {
118
-			$errorMessage = (string)$this->l->t('Please provide the old recovery password');
118
+			$errorMessage = (string) $this->l->t('Please provide the old recovery password');
119 119
 			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
120 120
 		}
121 121
 
122 122
 		if (empty($newPassword)) {
123
-			$errorMessage = (string)$this->l->t('Please provide a new recovery password');
124
-			return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
123
+			$errorMessage = (string) $this->l->t('Please provide a new recovery password');
124
+			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
125 125
 		}
126 126
 
127 127
 		if (empty($confirmPassword)) {
128
-			$errorMessage = (string)$this->l->t('Please repeat the new recovery password');
128
+			$errorMessage = (string) $this->l->t('Please repeat the new recovery password');
129 129
 			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
130 130
 		}
131 131
 
132 132
 		if ($newPassword !== $confirmPassword) {
133
-			$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
133
+			$errorMessage = (string) $this->l->t('Repeated recovery key password does not match the provided recovery key password');
134 134
 			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
135 135
 		}
136 136
 
@@ -141,14 +141,14 @@  discard block
 block discarded – undo
141 141
 			return new DataResponse(
142 142
 				[
143 143
 					'data' => [
144
-						'message' => (string)$this->l->t('Password successfully changed.')]
144
+						'message' => (string) $this->l->t('Password successfully changed.')]
145 145
 				]
146 146
 			);
147 147
 		}
148 148
 		return new DataResponse(
149 149
 			[
150 150
 				'data' => [
151
-					'message' => (string)$this->l->t('Could not change the password. Maybe the old password was not correct.')
151
+					'message' => (string) $this->l->t('Could not change the password. Maybe the old password was not correct.')
152 152
 				]
153 153
 			], Http::STATUS_BAD_REQUEST);
154 154
 	}
@@ -169,14 +169,14 @@  discard block
 block discarded – undo
169 169
 					return new DataResponse(
170 170
 						[
171 171
 							'data' => [
172
-								'message' => (string)$this->l->t('Recovery Key disabled')]
172
+								'message' => (string) $this->l->t('Recovery Key disabled')]
173 173
 						]
174 174
 					);
175 175
 				}
176 176
 				return new DataResponse(
177 177
 					[
178 178
 						'data' => [
179
-							'message' => (string)$this->l->t('Recovery Key enabled')]
179
+							'message' => (string) $this->l->t('Recovery Key enabled')]
180 180
 					]
181 181
 				);
182 182
 			}
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 		return new DataResponse(
186 186
 			[
187 187
 				'data' => [
188
-					'message' => (string)$this->l->t('Could not enable the recovery key, please try again or contact your administrator')
188
+					'message' => (string) $this->l->t('Could not enable the recovery key, please try again or contact your administrator')
189 189
 				]
190 190
 			], Http::STATUS_BAD_REQUEST);
191 191
 	}
Please login to merge, or discard this patch.
apps/encryption/lib/Exceptions/PublicKeyMissingException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 * @param string $userId
30 30
 	 */
31 31
 	public function __construct($userId) {
32
-		if(empty($userId)) {
32
+		if (empty($userId)) {
33 33
 			$userId = "<no-user-id-given>";
34 34
 		}
35 35
 		parent::__construct("Public Key missing for user: $userId");
Please login to merge, or discard this patch.
apps/encryption/lib/Exceptions/PrivateKeyMissingException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 	 * @param string $userId
33 33
 	 */
34 34
 	public function __construct($userId) {
35
-		if(empty($userId)) {
35
+		if (empty($userId)) {
36 36
 			$userId = "<no-user-id-given>";
37 37
 		}
38 38
 		parent::__construct("Private Key missing for user: $userId");
Please login to merge, or discard this patch.
apps/encryption/lib/AppInfo/Application.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		$this->encryptionManager = \OC::$server->getEncryptionManager();
63 63
 		$this->config = \OC::$server->getConfig();
64 64
 		$this->registerServices();
65
-		if($encryptionSystemReady === false) {
65
+		if ($encryptionSystemReady === false) {
66 66
 			/** @var Session $session */
67 67
 			$session = $this->getContainer()->query('Session');
68 68
 			$session->setStatus(Session::RUN_MIGRATION);
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		$container = $this->getContainer();
134 134
 
135 135
 		$container->registerService('Crypt',
136
-			function (IAppContainer $c) {
136
+			function(IAppContainer $c) {
137 137
 				$server = $c->getServer();
138 138
 				return new Crypt($server->getLogger(),
139 139
 					$server->getUserSession(),
@@ -142,14 +142,14 @@  discard block
 block discarded – undo
142 142
 			});
143 143
 
144 144
 		$container->registerService('Session',
145
-			function (IAppContainer $c) {
145
+			function(IAppContainer $c) {
146 146
 				$server = $c->getServer();
147 147
 				return new Session($server->getSession());
148 148
 			}
149 149
 		);
150 150
 
151 151
 		$container->registerService('KeyManager',
152
-			function (IAppContainer $c) {
152
+			function(IAppContainer $c) {
153 153
 				$server = $c->getServer();
154 154
 
155 155
 				return new KeyManager($server->getEncryptionKeyStorage(),
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 			});
164 164
 
165 165
 		$container->registerService('Recovery',
166
-			function (IAppContainer $c) {
166
+			function(IAppContainer $c) {
167 167
 				$server = $c->getServer();
168 168
 
169 169
 				return new Recovery(
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 					new View());
178 178
 			});
179 179
 
180
-		$container->registerService('RecoveryController', function (IAppContainer $c) {
180
+		$container->registerService('RecoveryController', function(IAppContainer $c) {
181 181
 			$server = $c->getServer();
182 182
 			return new RecoveryController(
183 183
 				$c->getAppName(),
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 				$c->query('Recovery'));
188 188
 		});
189 189
 
190
-		$container->registerService('StatusController', function (IAppContainer $c) {
190
+		$container->registerService('StatusController', function(IAppContainer $c) {
191 191
 			$server = $c->getServer();
192 192
 			return new StatusController(
193 193
 				$c->getAppName(),
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 			);
198 198
 		});
199 199
 
200
-		$container->registerService('SettingsController', function (IAppContainer $c) {
200
+		$container->registerService('SettingsController', function(IAppContainer $c) {
201 201
 			$server = $c->getServer();
202 202
 			return new SettingsController(
203 203
 				$c->getAppName(),
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		});
215 215
 
216 216
 		$container->registerService('UserSetup',
217
-			function (IAppContainer $c) {
217
+			function(IAppContainer $c) {
218 218
 				$server = $c->getServer();
219 219
 				return new Setup($server->getLogger(),
220 220
 					$server->getUserSession(),
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 			});
224 224
 
225 225
 		$container->registerService('Util',
226
-			function (IAppContainer $c) {
226
+			function(IAppContainer $c) {
227 227
 				$server = $c->getServer();
228 228
 
229 229
 				return new Util(
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 			});
237 237
 
238 238
 		$container->registerService('EncryptAll',
239
-			function (IAppContainer $c) {
239
+			function(IAppContainer $c) {
240 240
 				$server = $c->getServer();
241 241
 				return new EncryptAll(
242 242
 					$c->query('UserSetup'),
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 		);
255 255
 
256 256
 		$container->registerService('DecryptAll',
257
-			function (IAppContainer $c) {
257
+			function(IAppContainer $c) {
258 258
 				return new DecryptAll(
259 259
 					$c->query('Util'),
260 260
 					$c->query('KeyManager'),
Please login to merge, or discard this patch.