Cancelled
Pull Request — master (#643)
by René
31s
created
lib/Service/MiscService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
 		ob_start();
285 285
 		echo(json_encode($result));
286 286
 		$size = ob_get_length();
287
-		header('Content-Length: ' . $size);
287
+		header('Content-Length: '.$size);
288 288
 		ob_end_flush();
289 289
 		flush();
290 290
 	}
Please login to merge, or discard this patch.
lib/Service/MembersService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -323,7 +323,7 @@
 block discarded – undo
323 323
 			return;
324 324
 		}
325 325
 
326
-		$tmpContact = $this->userId . ':' . $ident;
326
+		$tmpContact = $this->userId.':'.$ident;
327 327
 		$result = MiscService::getContactData($tmpContact);
328 328
 		if (empty($result)) {
329 329
 			throw new NoUserException($this->l10n->t("This contact is not available"));
Please login to merge, or discard this patch.
lib/Model/DavCard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 	 * @return string
147 147
 	 */
148 148
 	public function getUniqueId(): string {
149
-		return $this->getAddressBookId() . '/' . $this->getCardUri();
149
+		return $this->getAddressBookId().'/'.$this->getCardUri();
150 150
 	}
151 151
 
152 152
 
Please login to merge, or discard this patch.
lib/GlobalScale/GSMount/MountManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 	 * @return string
110 110
 	 */
111 111
 	protected function stripPath($path) {
112
-		$prefix = '/' . $this->userId . '/files';
112
+		$prefix = '/'.$this->userId.'/files';
113 113
 
114 114
 		return rtrim(substr($path, strlen($prefix)), '/');
115 115
 	}
Please login to merge, or discard this patch.
lib/Model/GlobalScale/GSShare.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 			return $mountPoint;
155 155
 		}
156 156
 
157
-		return '/' . $userId . '/files/' . ltrim($mountPoint, '/');
157
+		return '/'.$userId.'/files/'.ltrim($mountPoint, '/');
158 158
 	}
159 159
 
160 160
 	/**
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 	public function toMount(string $userId, string $protocol = 'https'): array {
294 294
 		return [
295 295
 			'owner'       => $this->getOwner(),
296
-			'remote'      => $protocol . '://' . $this->getInstance(),
296
+			'remote'      => $protocol.'://'.$this->getInstance(),
297 297
 			'token'       => $this->getToken(),
298 298
 			'share_token' => $this->getToken(),
299 299
 			'password'    => $this->getPassword(),
Please login to merge, or discard this patch.
lib/Db/GSSharesRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,11 +121,11 @@
 block discarded – undo
121 121
 
122 122
 	private function leftJoinMountPoint(IQueryBuilder $qb, string $userId) {
123 123
 		$expr = $qb->expr();
124
-		$pf = '' . $this->default_select_alias . '.';
124
+		$pf = ''.$this->default_select_alias.'.';
125 125
 
126 126
 		$on = $expr->andX();
127 127
 		$on->add($expr->eq('mp.user_id', $qb->createNamedParameter($userId)));
128
-		$on->add($expr->eq('mp.share_id', $pf . 'id'));
128
+		$on->add($expr->eq('mp.share_id', $pf.'id'));
129 129
 
130 130
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
131 131
 		$qb->selectAlias('mp.mountPoint', 'gsshares_mountpoint')
Please login to merge, or discard this patch.
lib/GlobalScale/GSMount/MountProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -148,13 +148,13 @@
 block discarded – undo
148 148
 		}
149 149
 
150 150
 		$info = pathinfo($share->getMountPoint());
151
-		$filename = $this->get('dirname', $info) . '/' . $this->get('filename', $info);
151
+		$filename = $this->get('dirname', $info).'/'.$this->get('filename', $info);
152 152
 		$extension = $this->get('extension', $info);
153
-		$extension = ($extension === '') ? '' : '.' . $extension;
153
+		$extension = ($extension === '') ? '' : '.'.$extension;
154 154
 
155 155
 		$n = 2;
156 156
 		while (true) {
157
-			$path = $filename . " ($n)" . $extension;
157
+			$path = $filename." ($n)".$extension;
158 158
 			try {
159 159
 				$fs->get($path);
160 160
 			} catch (NotFoundException $e) {
Please login to merge, or discard this patch.
lib/GlobalScale/FileShare.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -105,14 +105,14 @@  discard block
 block discarded – undo
105 105
 			$node = $share->getNode();
106 106
 			$filename = $node->getName();
107 107
 		} catch (NotFoundException $e) {
108
-			$this->miscService->log('issue while FileShare: ' . $e->getMessage());
108
+			$this->miscService->log('issue while FileShare: '.$e->getMessage());
109 109
 
110 110
 			return;
111 111
 		}
112 112
 
113 113
 		$event->getData()
114 114
 			  ->s('gs_federated', $share->getToken())
115
-			  ->s('gs_filename', '/' . $filename);
115
+			  ->s('gs_filename', '/'.$filename);
116 116
 	}
117 117
 
118 118
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 			);
302 302
 		} catch (Exception $e) {
303 303
 			OC::$server->getLogger()
304
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
304
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
305 305
 		}
306 306
 	}
307 307
 
@@ -319,8 +319,8 @@  discard block
 block discarded – undo
319 319
 		$message = $this->mailer->createMessage();
320 320
 
321 321
 		$this->miscService->log(
322
-			"Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
323
-			. ' - link: ' . $link, 0
322
+			"Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
323
+			. ' - link: '.$link, 0
324 324
 		);
325 325
 
326 326
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 
360 360
 		$message = $this->mailer->createMessage();
361 361
 
362
-		$this->miscService->log("Sending password mail to circle '" . $circleName . "': " . $email, 0);
362
+		$this->miscService->log("Sending password mail to circle '".$circleName."': ".$email, 0);
363 363
 
364 364
 		$filename = $share->getNode()
365 365
 						  ->getName();
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
415 415
 		if ($initiatorEmailAddress !== null) {
416 416
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
417
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
417
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
418 418
 		} else {
419 419
 			$emailTemplate->addFooter();
420 420
 		}
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 		$emailTemplate->addHeader();
450 450
 		$emailTemplate->addHeading($subject, false);
451 451
 		$emailTemplate->addBodyText(
452
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
452
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
453 453
 				$this->l10n->t('Click the button below to open it.')
454 454
 			), $text
455 455
 		);
Please login to merge, or discard this patch.
lib/Service/GSDownstreamService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 			$gs = $this->globalScaleService->getGlobalScaleEvent($event);
156 156
 			$gs->manage($event);
157 157
 		} catch (Exception $e) {
158
-			$this->miscService->log('issue onNewEvent: ' . json_encode($event) . ' - ' . $e->getMessage());
158
+			$this->miscService->log('issue onNewEvent: '.json_encode($event).' - '.$e->getMessage());
159 159
 		}
160 160
 	}
161 161
 
Please login to merge, or discard this patch.