Completed
Push — master ( 5aaa8a...afaee6 )
by Morris
12:26
created
apps/files/ajax/download.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 OCP\User::checkLoggedIn();
32 32
 \OC::$server->getSession()->close();
33 33
 
34
-$files = isset($_GET['files']) ? (string)$_GET['files'] : '';
35
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
34
+$files = isset($_GET['files']) ? (string) $_GET['files'] : '';
35
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
36 36
 
37 37
 $files_list = json_decode($files);
38 38
 // in case we get only a single file
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
  * the content must not be longer than 32 characters and must only contain
46 46
  * alphanumeric characters
47 47
  */
48
-if(isset($_GET['downloadStartSecret'])
48
+if (isset($_GET['downloadStartSecret'])
49 49
 	&& !isset($_GET['downloadStartSecret'][32])
50 50
 	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
51 51
 	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
52 52
 }
53 53
 
54
-$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' );
54
+$server_params = array('head' => \OC::$server->getRequest()->getMethod() === 'HEAD');
55 55
 
56 56
 /**
57 57
  * Http range requests support
Please login to merge, or discard this patch.
apps/files_sharing/lib/Migration/OwncloudGuestShareType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 
69 69
 		$query = $this->connection->getQueryBuilder();
70 70
 		$query->update('share')
71
-			->set('share_type',  $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
71
+			->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
72 72
 			->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
73 73
 		$query->execute();
74 74
 	}
Please login to merge, or discard this patch.
config/config.sample.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
  *   ubos-raspberry-pi.local and ubos-raspberry-pi-2.local
68 68
  */
69 69
 'trusted_domains' =>
70
-  array (
70
+  array(
71 71
     'demo.example.org',
72 72
     'otherdomain.example.org',
73 73
   ),
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
  *
193 193
  * Defaults to ``60*60*24*15`` seconds (15 days)
194 194
  */
195
-'remember_login_cookie_lifetime' => 60*60*24*15,
195
+'remember_login_cookie_lifetime' => 60 * 60 * 24 * 15,
196 196
 
197 197
 /**
198 198
  * The lifetime of a session after inactivity.
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
  * See https://redis.io/topics/cluster-spec for details about the Redis cluster
1075 1075
  */
1076 1076
 'redis.cluster' => [
1077
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1077
+	'seeds' => [// provide some/all of the cluster servers to bootstrap discovery, port required
1078 1078
 		'localhost:7000',
1079 1079
 		'localhost:7001'
1080 1080
 	],
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
  *
1139 1139
  * Defaults to ``60*60*24`` (1 day)
1140 1140
  */
1141
-'cache_chunk_gc_ttl' => 60*60*24,
1141
+'cache_chunk_gc_ttl' => 60 * 60 * 24,
1142 1142
 
1143 1143
 /**
1144 1144
  * Using Object Store with Nextcloud
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
  * Defaults to ``60*60`` seconds (1 hour) or the php
1463 1463
  *             max_execution_time, whichever is higher.
1464 1464
  */
1465
-'filelocking.ttl' => 60*60,
1465
+'filelocking.ttl' => 60 * 60,
1466 1466
 
1467 1467
 /**
1468 1468
  * Memory caching backend for file locking
Please login to merge, or discard this patch.
lib/private/Files/Type/Loader.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -169,8 +169,8 @@
 block discarded – undo
169 169
 				'mimetype', $update->createNamedParameter($folderMimeTypeId)
170 170
 			))
171 171
 			->andWhere($update->expr()->like(
172
-				$update->createFunction('LOWER(' . $update->getColumnName('name') . ')'),
173
-				$update->createNamedParameter('%' . $this->dbConnection->escapeLikeParameter('.' . $ext))
172
+				$update->createFunction('LOWER('.$update->getColumnName('name').')'),
173
+				$update->createNamedParameter('%'.$this->dbConnection->escapeLikeParameter('.'.$ext))
174 174
 			));
175 175
 		return $update->execute();
176 176
 	}
Please login to merge, or discard this patch.
core/templates/update.use-cli.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 
15 15
 	<?php if ($_['tooBig']) { ?>
16 16
 		<div class="warning updateAnyways">
17
-			<?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.' )); ?>
18
-			<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk' )); ?></a>
17
+			<?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.')); ?>
18
+			<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk')); ?></a>
19 19
 		</div>
20 20
 	<?php } ?>
21 21
 
Please login to merge, or discard this patch.
lib/private/ServerContainer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 
85 85
 		if (isset($this->namespaces[$namespace])) {
86 86
 			if (!isset($this->hasNoAppContainer[$namespace])) {
87
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
87
+				$applicationClassName = 'OCA\\'.$sensitiveNamespace.'\\AppInfo\\Application';
88 88
 				if (class_exists($applicationClassName)) {
89 89
 					new $applicationClassName();
90 90
 					if (isset($this->appContainers[$namespace])) {
Please login to merge, or discard this patch.
apps/oauth2/lib/Db/ClientMapper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 		$result = $qb->execute();
50 50
 		$row = $result->fetch();
51 51
 		$result->closeCursor();
52
-		if($row === false) {
52
+		if ($row === false) {
53 53
 			throw new ClientNotFoundException();
54 54
 		}
55 55
 		return Client::fromRow($row);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		$result = $qb->execute();
70 70
 		$row = $result->fetch();
71 71
 		$result->closeCursor();
72
-		if($row === false) {
72
+		if ($row === false) {
73 73
 			throw new ClientNotFoundException();
74 74
 		}
75 75
 		return Client::fromRow($row);
Please login to merge, or discard this patch.
apps/oauth2/lib/Db/AccessTokenMapper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 		$result = $qb->execute();
50 50
 		$row = $result->fetch();
51 51
 		$result->closeCursor();
52
-		if($row === false) {
52
+		if ($row === false) {
53 53
 			throw new AccessTokenNotFoundException();
54 54
 		}
55 55
 		return AccessToken::fromRow($row);
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/Auth.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
170 170
 	 */
171 171
 	private function requiresCSRFCheck() {
172 172
 		// GET requires no check at all
173
-		if($this->request->getMethod() === 'GET') {
173
+		if ($this->request->getMethod() === 'GET') {
174 174
 			return false;
175 175
 		}
176 176
 
177 177
 		// Official Nextcloud clients require no checks
178
-		if($this->request->isUserAgent([
178
+		if ($this->request->isUserAgent([
179 179
 			IRequest::USER_AGENT_CLIENT_DESKTOP,
180 180
 			IRequest::USER_AGENT_CLIENT_ANDROID,
181 181
 			IRequest::USER_AGENT_CLIENT_IOS,
@@ -184,17 +184,17 @@  discard block
 block discarded – undo
184 184
 		}
185 185
 
186 186
 		// If not logged-in no check is required
187
-		if(!$this->userSession->isLoggedIn()) {
187
+		if (!$this->userSession->isLoggedIn()) {
188 188
 			return false;
189 189
 		}
190 190
 
191 191
 		// POST always requires a check
192
-		if($this->request->getMethod() === 'POST') {
192
+		if ($this->request->getMethod() === 'POST') {
193 193
 			return true;
194 194
 		}
195 195
 
196 196
 		// If logged-in AND DAV authenticated no check is required
197
-		if($this->userSession->isLoggedIn() &&
197
+		if ($this->userSession->isLoggedIn() &&
198 198
 			$this->isDavAuthenticated($this->userSession->getUser()->getUID())) {
199 199
 			return false;
200 200
 		}
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
 	private function auth(RequestInterface $request, ResponseInterface $response) {
212 212
 		$forcedLogout = false;
213 213
 
214
-		if(!$this->request->passesCSRFCheck() &&
214
+		if (!$this->request->passesCSRFCheck() &&
215 215
 			$this->requiresCSRFCheck()) {
216 216
 			// In case of a fail with POST we need to recheck the credentials
217
-			if($this->request->getMethod() === 'POST') {
217
+			if ($this->request->getMethod() === 'POST') {
218 218
 				$forcedLogout = true;
219 219
 			} else {
220 220
 				$response->setStatus(401);
@@ -222,10 +222,10 @@  discard block
 block discarded – undo
222 222
 			}
223 223
 		}
224 224
 
225
-		if($forcedLogout) {
225
+		if ($forcedLogout) {
226 226
 			$this->userSession->logout();
227 227
 		} else {
228
-			if($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
228
+			if ($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
229 229
 				throw new \Sabre\DAV\Exception\NotAuthenticated('2FA challenge not passed.');
230 230
 			}
231 231
 			if (\OC_User::handleApacheAuth() ||
@@ -238,19 +238,19 @@  discard block
 block discarded – undo
238 238
 				\OC_Util::setupFS($user);
239 239
 				$this->currentUser = $user;
240 240
 				$this->session->close();
241
-				return [true, $this->principalPrefix . $user];
241
+				return [true, $this->principalPrefix.$user];
242 242
 			}
243 243
 		}
244 244
 
245 245
 		if (!$this->userSession->isLoggedIn() && in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With')))) {
246 246
 			// do not re-authenticate over ajax, use dummy auth name to prevent browser popup
247
-			$response->addHeader('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
247
+			$response->addHeader('WWW-Authenticate', 'DummyBasic realm="'.$this->realm.'"');
248 248
 			$response->setStatus(401);
249 249
 			throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
250 250
 		}
251 251
 
252 252
 		$data = parent::check($request, $response);
253
-		if($data[0] === true) {
253
+		if ($data[0] === true) {
254 254
 			$startPos = strrpos($data[1], '/') + 1;
255 255
 			$user = $this->userSession->getUser()->getUID();
256 256
 			$data[1] = substr_replace($data[1], $user, $startPos);
Please login to merge, or discard this patch.