Completed
Pull Request — master (#6360)
by Christoph
14:02
created
settings/templates/users/main.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@  discard block
 block discarded – undo
18 18
 style('settings', 'settings');
19 19
 
20 20
 $userlistParams = array();
21
-$allGroups=array();
22
-foreach($_["adminGroup"] as $group) {
21
+$allGroups = array();
22
+foreach ($_["adminGroup"] as $group) {
23 23
 	$allGroups[] = $group['name'];
24 24
 }
25
-foreach($_["groups"] as $group) {
25
+foreach ($_["groups"] as $group) {
26 26
 	$allGroups[] = $group['name'];
27 27
 }
28 28
 $userlistParams['subadmingroups'] = $allGroups;
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	<?php print_unescaped($this->inc('users/part.grouplist')); ?>
39 39
 	<div id="app-settings">
40 40
 		<div id="app-settings-header">
41
-			<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"><?php p($l->t('Settings'));?></button>
41
+			<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"><?php p($l->t('Settings')); ?></button>
42 42
 		</div>
43 43
 		<div id="app-settings-content">
44 44
 			<?php print_unescaped($this->inc('users/part.setquota')); ?>
Please login to merge, or discard this patch.
apps/encryption/templates/mail.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	<tr><td>
28 28
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
29 29
 				<tr>
30
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
30
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
31 31
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
32 32
 					</td>
33 33
 				</tr>
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
53 53
 						<?php p($theme->getName()); ?> -
54 54
 						<?php p($theme->getSlogan()); ?>
55
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
55
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
56 56
 					</td>
57 57
 				</tr>
58 58
 				<tr>
Please login to merge, or discard this patch.
lib/private/Activity/EventMerger.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
133 133
 
134 134
 		// Check that all parameters from $event exist in $previousEvent
135 135
 		foreach ($params1 as $key => $parameter) {
136
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
136
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
137 137
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
138 138
 					$combined++;
139
-					$params[$mergeParameter . $combined] = $parameter;
139
+					$params[$mergeParameter.$combined] = $parameter;
140 140
 				}
141 141
 				continue;
142 142
 			}
@@ -151,10 +151,10 @@  discard block
 block discarded – undo
151 151
 
152 152
 		// Check that all parameters from $previousEvent exist in $event
153 153
 		foreach ($params2 as $key => $parameter) {
154
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
154
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
155 155
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
156 156
 					$combined++;
157
-					$params[$mergeParameter . $combined] = $parameter;
157
+					$params[$mergeParameter.$combined] = $parameter;
158 158
 				}
159 159
 				continue;
160 160
 			}
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 */
179 179
 	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
180 180
 		foreach ($parameters as $key => $param) {
181
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
181
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
182 182
 				if ($param === $parameter) {
183 183
 					return true;
184 184
 				}
@@ -196,30 +196,30 @@  discard block
 block discarded – undo
196 196
 	protected function getExtendedSubject($subject, $parameter, $counter) {
197 197
 		switch ($counter) {
198 198
 			case 1:
199
-				$replacement = '{' . $parameter . '1}';
199
+				$replacement = '{'.$parameter.'1}';
200 200
 				break;
201 201
 			case 2:
202 202
 				$replacement = $this->l10n->t(
203 203
 					'%1$s and %2$s',
204
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
204
+					['{'.$parameter.'2}', '{'.$parameter.'1}']
205 205
 				);
206 206
 				break;
207 207
 			case 3:
208 208
 				$replacement = $this->l10n->t(
209 209
 					'%1$s, %2$s and %3$s',
210
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
210
+					['{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
211 211
 				);
212 212
 				break;
213 213
 			case 4:
214 214
 				$replacement = $this->l10n->t(
215 215
 					'%1$s, %2$s, %3$s and %4$s',
216
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
216
+					['{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
217 217
 				);
218 218
 				break;
219 219
 			case 5:
220 220
 				$replacement = $this->l10n->t(
221 221
 					'%1$s, %2$s, %3$s, %4$s and %5$s',
222
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
222
+					['{'.$parameter.'5}', '{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
223 223
 				);
224 224
 				break;
225 225
 			default:
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 		}
228 228
 
229 229
 		return str_replace(
230
-			'{' . $parameter . '}',
230
+			'{'.$parameter.'}',
231 231
 			$replacement,
232 232
 			$subject
233 233
 		);
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 	protected function generateParsedSubject($subject, $parameters) {
242 242
 		$placeholders = $replacements = [];
243 243
 		foreach ($parameters as $placeholder => $parameter) {
244
-			$placeholders[] = '{' . $placeholder . '}';
244
+			$placeholders[] = '{'.$placeholder.'}';
245 245
 			if ($parameter['type'] === 'file') {
246 246
 				$replacements[] = trim($parameter['path'], '/');
247 247
 			} else if (isset($parameter['name'])) {
Please login to merge, or discard this patch.
lib/private/Files/ObjectStore/Swift.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
 
75 75
 		if (isset($params['apiKey'])) {
76 76
 			$this->client = new Rackspace($params['url'], $params);
77
-			$cacheKey = $this->params['username'] . '@' . $this->params['url'] . '/' . $this->params['bucket'];
77
+			$cacheKey = $this->params['username'].'@'.$this->params['url'].'/'.$this->params['bucket'];
78 78
 		} else {
79 79
 			$this->client = new OpenStack($params['url'], $params);
80
-			$cacheKey = $this->params['username'] . '@' . $this->params['url'] . '/' . $this->params['bucket'];
80
+			$cacheKey = $this->params['username'].'@'.$this->params['url'].'/'.$this->params['bucket'];
81 81
 		}
82 82
 
83 83
 		$cacheFactory = \OC::$server->getMemCacheFactory();
84
-		$this->memcache = $cacheFactory->create('swift::' . $cacheKey);
84
+		$this->memcache = $cacheFactory->create('swift::'.$cacheKey);
85 85
 
86 86
 		$this->params = $params;
87 87
 	}
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
 	private function exportToken() {
159 159
 		$export = $this->client->exportCredentials();
160
-		$export['catalog'] = array_map(function (CatalogItem $item) {
160
+		$export['catalog'] = array_map(function(CatalogItem $item) {
161 161
 			return [
162 162
 				'name' => $item->getName(),
163 163
 				'endpoints' => $item->getEndpoints(),
@@ -171,10 +171,10 @@  discard block
 block discarded – undo
171 171
 		$cachedTokenString = $this->memcache->get('token');
172 172
 		if ($cachedTokenString) {
173 173
 			$cachedToken = json_decode($cachedTokenString, true);
174
-			$cachedToken['catalog'] = array_map(function (array $item) {
174
+			$cachedToken['catalog'] = array_map(function(array $item) {
175 175
 				$itemClass = new \stdClass();
176 176
 				$itemClass->name = $item['name'];
177
-				$itemClass->endpoints = array_map(function (array $endpoint) {
177
+				$itemClass->endpoints = array_map(function(array $endpoint) {
178 178
 					return (object) $endpoint;
179 179
 				}, $item['endpoints']);
180 180
 				$itemClass->type = $item['type'];
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
 			}
214 214
 		}
215 215
 
216
-		$availableRegions = implode(', ', array_map(function ($endpoint) {
216
+		$availableRegions = implode(', ', array_map(function($endpoint) {
217 217
 			return $endpoint->region;
218 218
 		}, $endPoints));
219 219
 
@@ -221,9 +221,9 @@  discard block
 block discarded – undo
221 221
 	}
222 222
 
223 223
 	private function getAvailableServiceNames(Catalog $catalog) {
224
-		return array_map(function (CatalogItem $item) {
224
+		return array_map(function(CatalogItem $item) {
225 225
 			return $item->getName();
226
-		}, array_filter($catalog->getItems(), function (CatalogItem $item) {
226
+		}, array_filter($catalog->getItems(), function(CatalogItem $item) {
227 227
 			return $item->hasType(Service::DEFAULT_TYPE);
228 228
 		}));
229 229
 	}
Please login to merge, or discard this patch.
core/Controller/CssController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 			$folder = $this->appData->getFolder($appName);
67 67
 			$gzip = false;
68 68
 			$file = $this->getFile($folder, $fileName, $gzip);
69
-		} catch(NotFoundException $e) {
69
+		} catch (NotFoundException $e) {
70 70
 			return new NotFoundResponse();
71 71
 		}
72 72
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 		if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
96 96
 			try {
97 97
 				$gzip = true;
98
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
98
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
99 99
 			} catch (NotFoundException $e) {
100 100
 				// continue
101 101
 			}
Please login to merge, or discard this patch.
core/Controller/JsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 			$folder = $this->appData->getFolder($appName);
67 67
 			$gzip = false;
68 68
 			$file = $this->getFile($folder, $fileName, $gzip);
69
-		} catch(NotFoundException $e) {
69
+		} catch (NotFoundException $e) {
70 70
 			return new NotFoundResponse();
71 71
 		}
72 72
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 		if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
96 96
 			try {
97 97
 				$gzip = true;
98
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
98
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
99 99
 			} catch (NotFoundException $e) {
100 100
 				// continue
101 101
 			}
Please login to merge, or discard this patch.
lib/private/Files/Cache/Cache.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -163,21 +163,21 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
165 165
 		//fix types
166
-		$data['fileid'] = (int)$data['fileid'];
167
-		$data['parent'] = (int)$data['parent'];
166
+		$data['fileid'] = (int) $data['fileid'];
167
+		$data['parent'] = (int) $data['parent'];
168 168
 		$data['size'] = 0 + $data['size'];
169
-		$data['mtime'] = (int)$data['mtime'];
170
-		$data['storage_mtime'] = (int)$data['storage_mtime'];
171
-		$data['encryptedVersion'] = (int)$data['encrypted'];
172
-		$data['encrypted'] = (bool)$data['encrypted'];
169
+		$data['mtime'] = (int) $data['mtime'];
170
+		$data['storage_mtime'] = (int) $data['storage_mtime'];
171
+		$data['encryptedVersion'] = (int) $data['encrypted'];
172
+		$data['encrypted'] = (bool) $data['encrypted'];
173 173
 		$data['storage_id'] = $data['storage'];
174
-		$data['storage'] = (int)$data['storage'];
174
+		$data['storage'] = (int) $data['storage'];
175 175
 		$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
176 176
 		$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
177 177
 		if ($data['storage_mtime'] == 0) {
178 178
 			$data['storage_mtime'] = $data['mtime'];
179 179
 		}
180
-		$data['permissions'] = (int)$data['permissions'];
180
+		$data['permissions'] = (int) $data['permissions'];
181 181
 		return new CacheEntry($data);
182 182
 	}
183 183
 
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 					FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC';
206 206
 			$result = $this->connection->executeQuery($sql, [$fileId]);
207 207
 			$files = $result->fetchAll();
208
-			return array_map(function (array $data) {
209
-				return self::cacheEntryFromData($data, $this->mimetypeLoader);;
208
+			return array_map(function(array $data) {
209
+				return self::cacheEntryFromData($data, $this->mimetypeLoader); ;
210 210
 			}, $files);
211 211
 		} else {
212 212
 			return array();
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 		$queryParts[] = '`storage`';
266 266
 		$params[] = $this->getNumericStorageId();
267 267
 
268
-		$queryParts = array_map(function ($item) {
268
+		$queryParts = array_map(function($item) {
269 269
 			return trim($item, "`");
270 270
 		}, $queryParts);
271 271
 		$values = array_combine($queryParts, $params);
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 			'path_hash',
275 275
 		])
276 276
 		) {
277
-			return (int)$this->connection->lastInsertId('*PREFIX*filecache');
277
+			return (int) $this->connection->lastInsertId('*PREFIX*filecache');
278 278
 		}
279 279
 
280 280
 		// The file was created in the mean time
@@ -312,10 +312,10 @@  discard block
 block discarded – undo
312 312
 
313 313
 		// don't update if the data we try to set is the same as the one in the record
314 314
 		// some databases (Postgres) don't like superfluous updates
315
-		$sql = 'UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=? ' .
316
-			'WHERE (' .
317
-			implode(' <> ? OR ', $queryParts) . ' <> ? OR ' .
318
-			implode(' IS NULL OR ', $queryParts) . ' IS NULL' .
315
+		$sql = 'UPDATE `*PREFIX*filecache` SET '.implode(' = ?, ', $queryParts).'=? '.
316
+			'WHERE ('.
317
+			implode(' <> ? OR ', $queryParts).' <> ? OR '.
318
+			implode(' IS NULL OR ', $queryParts).' IS NULL'.
319 319
 			') AND `fileid` = ? ';
320 320
 		$this->connection->executeQuery($sql, $params);
321 321
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 					}
367 367
 				}
368 368
 				$params[] = $value;
369
-				$queryParts[] = '`' . $name . '`';
369
+				$queryParts[] = '`'.$name.'`';
370 370
 			}
371 371
 		}
372 372
 		return array($queryParts, $params);
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 			return -1;
409 409
 		} else {
410 410
 			$parent = $this->getParentPath($file);
411
-			return (int)$this->getId($parent);
411
+			return (int) $this->getId($parent);
412 412
 		}
413 413
 	}
414 414
 
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 	 */
455 455
 	private function getSubFolders($entry) {
456 456
 		$children = $this->getFolderContentsById($entry['fileid']);
457
-		return array_filter($children, function ($child) {
457
+		return array_filter($children, function($child) {
458 458
 			return $child['mimetype'] === 'httpd/unix-directory';
459 459
 		});
460 460
 	}
@@ -517,10 +517,10 @@  discard block
 block discarded – undo
517 517
 			list($targetStorageId, $targetPath) = $this->getMoveInfo($targetPath);
518 518
 
519 519
 			if (is_null($sourceStorageId) || $sourceStorageId === false) {
520
-				throw new \Exception('Invalid source storage id: ' . $sourceStorageId);
520
+				throw new \Exception('Invalid source storage id: '.$sourceStorageId);
521 521
 			}
522 522
 			if (is_null($targetStorageId) || $targetStorageId === false) {
523
-				throw new \Exception('Invalid target storage id: ' . $targetStorageId);
523
+				throw new \Exception('Invalid target storage id: '.$targetStorageId);
524 524
 			}
525 525
 
526 526
 			$this->connection->beginTransaction();
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 					->set('path_hash', $fun->md5($newPathFunction))
540 540
 					->set('path', $newPathFunction)
541 541
 					->where($query->expr()->eq('storage', $query->createNamedParameter($sourceStorageId, IQueryBuilder::PARAM_INT)))
542
-					->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($sourcePath) . '/%')));
542
+					->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($sourcePath).'/%')));
543 543
 
544 544
 				try {
545 545
 					$query->execute();
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
 		$sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
589 589
 		$result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));
590 590
 		if ($row = $result->fetch()) {
591
-			if ((int)$row['size'] === -1) {
591
+			if ((int) $row['size'] === -1) {
592 592
 				return self::SHALLOW;
593 593
 			} else {
594 594
 				return self::COMPLETE;
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
 	private function searchResultToCacheEntries(Statement $result) {
638 638
 		$files = $result->fetchAll();
639 639
 
640
-		return array_map(function (array $data) {
640
+		return array_map(function(array $data) {
641 641
 			return self::cacheEntryFromData($data, $this->mimetypeLoader);
642 642
 		}, $files);
643 643
 	}
@@ -656,7 +656,7 @@  discard block
 block discarded – undo
656 656
 			$where = '`mimepart` = ?';
657 657
 		}
658 658
 		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `storage_mtime`, `mtime`, `encrypted`, `etag`, `permissions`, `checksum`
659
-				FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
659
+				FROM `*PREFIX*filecache` WHERE ' . $where.' AND `storage` = ?';
660 660
 		$mimetype = $this->mimetypeLoader->getId($mimetype);
661 661
 		$result = $this->connection->executeQuery($sql, array($mimetype, $this->getNumericStorageId()));
662 662
 
@@ -707,20 +707,20 @@  discard block
 block discarded – undo
707 707
 	 * @return ICacheEntry[] file data
708 708
 	 */
709 709
 	public function searchByTag($tag, $userId) {
710
-		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, ' .
711
-			'`mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, ' .
712
-			'`encrypted`, `etag`, `permissions`, `checksum` ' .
713
-			'FROM `*PREFIX*filecache` `file`, ' .
714
-			'`*PREFIX*vcategory_to_object` `tagmap`, ' .
715
-			'`*PREFIX*vcategory` `tag` ' .
710
+		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, '.
711
+			'`mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, '.
712
+			'`encrypted`, `etag`, `permissions`, `checksum` '.
713
+			'FROM `*PREFIX*filecache` `file`, '.
714
+			'`*PREFIX*vcategory_to_object` `tagmap`, '.
715
+			'`*PREFIX*vcategory` `tag` '.
716 716
 			// JOIN filecache to vcategory_to_object
717
-			'WHERE `file`.`fileid` = `tagmap`.`objid` ' .
717
+			'WHERE `file`.`fileid` = `tagmap`.`objid` '.
718 718
 			// JOIN vcategory_to_object to vcategory
719
-			'AND `tagmap`.`type` = `tag`.`type` ' .
720
-			'AND `tagmap`.`categoryid` = `tag`.`id` ' .
719
+			'AND `tagmap`.`type` = `tag`.`type` '.
720
+			'AND `tagmap`.`categoryid` = `tag`.`id` '.
721 721
 			// conditions
722
-			'AND `file`.`storage` = ? ' .
723
-			'AND `tag`.`type` = \'files\' ' .
722
+			'AND `file`.`storage` = ? '.
723
+			'AND `tag`.`type` = \'files\' '.
724 724
 			'AND `tag`.`uid` = ? ';
725 725
 		if (is_int($tag)) {
726 726
 			$sql .= 'AND `tag`.`id` = ? ';
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 
739 739
 		$files = $result->fetchAll();
740 740
 
741
-		return array_map(function (array $data) {
741
+		return array_map(function(array $data) {
742 742
 			return self::cacheEntryFromData($data, $this->mimetypeLoader);
743 743
 		}, $files);
744 744
 	}
@@ -774,8 +774,8 @@  discard block
 block discarded – undo
774 774
 		}
775 775
 		if (isset($entry['mimetype']) && $entry['mimetype'] === 'httpd/unix-directory') {
776 776
 			$id = $entry['fileid'];
777
-			$sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2 ' .
778
-				'FROM `*PREFIX*filecache` ' .
777
+			$sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2 '.
778
+				'FROM `*PREFIX*filecache` '.
779 779
 				'WHERE `parent` = ? AND `storage` = ?';
780 780
 			$result = $this->connection->executeQuery($sql, array($id, $this->getNumericStorageId()));
781 781
 			if ($row = $result->fetch()) {
Please login to merge, or discard this patch.
lib/private/User/Database.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -185,15 +185,15 @@  discard block
 block discarded – undo
185 185
 		$parameters = [];
186 186
 		$searchLike = '';
187 187
 		if ($search !== '') {
188
-			$parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%';
189
-			$parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%';
188
+			$parameters[] = '%'.\OC::$server->getDatabaseConnection()->escapeLikeParameter($search).'%';
189
+			$parameters[] = '%'.\OC::$server->getDatabaseConnection()->escapeLikeParameter($search).'%';
190 190
 			$searchLike = ' WHERE LOWER(`displayname`) LIKE LOWER(?) OR '
191 191
 				. 'LOWER(`uid`) LIKE LOWER(?)';
192 192
 		}
193 193
 
194 194
 		$displayNames = array();
195 195
 		$query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`'
196
-			. $searchLike .' ORDER BY LOWER(`displayname`), LOWER(`uid`) ASC', $limit, $offset);
196
+			. $searchLike.' ORDER BY LOWER(`displayname`), LOWER(`uid`) ASC', $limit, $offset);
197 197
 		$result = $query->execute($parameters);
198 198
 		while ($row = $result->fetchRow()) {
199 199
 			$displayNames[$row['uid']] = $row['displayname'];
@@ -219,8 +219,8 @@  discard block
 block discarded – undo
219 219
 		if ($row) {
220 220
 			$storedHash = $row['password'];
221 221
 			$newHash = '';
222
-			if(\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
223
-				if(!empty($newHash)) {
222
+			if (\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
223
+				if (!empty($newHash)) {
224 224
 					$this->setPassword($uid, $password);
225 225
 				}
226 226
 				return $row['uid'];
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 		if (!isset($this->cache[$uid])) {
242 242
 			//guests $uid could be NULL or ''
243 243
 			if ($uid === '') {
244
-				$this->cache[$uid]=false;
244
+				$this->cache[$uid] = false;
245 245
 				return true;
246 246
 			}
247 247
 
@@ -281,11 +281,11 @@  discard block
 block discarded – undo
281 281
 		$parameters = [];
282 282
 		$searchLike = '';
283 283
 		if ($search !== '') {
284
-			$parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%';
284
+			$parameters[] = '%'.\OC::$server->getDatabaseConnection()->escapeLikeParameter($search).'%';
285 285
 			$searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)';
286 286
 		}
287 287
 
288
-		$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY LOWER(`uid`) ASC', $limit, $offset);
288
+		$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`'.$searchLike.' ORDER BY LOWER(`uid`) ASC', $limit, $offset);
289 289
 		$result = $query->execute($parameters);
290 290
 		$users = array();
291 291
 		while ($row = $result->fetchRow()) {
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 	 */
312 312
 	public function getHome($uid) {
313 313
 		if ($this->userExists($uid)) {
314
-			return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $uid;
314
+			return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT."/data").'/'.$uid;
315 315
 		}
316 316
 
317 317
 		return false;
@@ -357,12 +357,12 @@  discard block
 block discarded – undo
357 357
 	 * Backend name to be shown in user management
358 358
 	 * @return string the name of the backend to be shown
359 359
 	 */
360
-	public function getBackendName(){
360
+	public function getBackendName() {
361 361
 		return 'Database';
362 362
 	}
363 363
 
364 364
 	public static function preLoginNameUsedAsUserName($param) {
365
-		if(!isset($param['uid'])) {
365
+		if (!isset($param['uid'])) {
366 366
 			throw new \Exception('key uid is expected to be set in $param');
367 367
 		}
368 368
 
Please login to merge, or discard this patch.
lib/private/Repair/CleanTags.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -171,14 +171,14 @@
 block discarded – undo
171 171
 	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
172 172
 		$qb = $this->connection->getQueryBuilder();
173 173
 
174
-		$qb->select('d.' . $deleteId)
174
+		$qb->select('d.'.$deleteId)
175 175
 			->from($deleteTable, 'd')
176
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
176
+			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.'.$deleteId, 's.'.$sourceId))
177 177
 			->where(
178 178
 				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
179 179
 			)
180 180
 			->andWhere(
181
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
181
+				$qb->expr()->isNull('s.'.$sourceNullColumn)
182 182
 			);
183 183
 		$result = $qb->execute();
184 184
 
Please login to merge, or discard this patch.