Completed
Pull Request — master (#371)
by Tortue
01:45
created
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/Circles/FileSharingBroadcaster.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			$this->miscService = OC::$server->query(MiscService::class);
146 146
 		} catch (QueryException $e) {
147 147
 			OC::$server->getLogger()
148
-					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
148
+					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
149 149
 		}
150 150
 
151 151
 		try {
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	 * @throws IllegalIDChangeException
323 323
 	 */
324 324
 	private function generateShare($data): IShare {
325
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
325
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
326 326
 
327 327
 		$share = new Share($this->rootFolder, $this->userManager);
328 328
 		$share->setId($data['id']);
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 			);
414 414
 		} catch (Exception $e) {
415 415
 			OC::$server->getLogger()
416
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
416
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
417 417
 		}
418 418
 	}
419 419
 
@@ -431,8 +431,8 @@  discard block
 block discarded – undo
431 431
 		$message = $this->mailer->createMessage();
432 432
 
433 433
 		$this->logger->log(
434
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
435
-			   . ' - link: ' . $link
434
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
435
+			   . ' - link: '.$link
436 436
 		);
437 437
 
438 438
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 
472 472
 		$message = $this->mailer->createMessage();
473 473
 
474
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
474
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
475 475
 
476 476
 		$filename = $share->getNode()
477 477
 						  ->getName();
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
527 527
 		if ($initiatorEmailAddress !== null) {
528 528
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
529
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
529
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
530 530
 		} else {
531 531
 			$emailTemplate->addFooter();
532 532
 		}
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 		$emailTemplate->addHeader();
562 562
 		$emailTemplate->addHeading($subject, false);
563 563
 		$emailTemplate->addBodyText(
564
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
564
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
565 565
 				$this->l10n->t('Click the button below to open it.')
566 566
 			), $text
567 567
 		);
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 			$this->sendMailExistingShares($template, $author, $recipient);
607 607
 			$this->sendPasswordExistingShares($author, $recipient, $password);
608 608
 		} catch (Exception $e) {
609
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
609
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
610 610
 		}
611 611
 	}
612 612
 
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
631 631
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
632 632
 
633
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
633
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
634 634
 
635 635
 		$plainBodyPart = $this->l10n->t(
636 636
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
673 673
 		if ($authorEmail !== null) {
674 674
 			$message->setReplyTo([$authorEmail => $authorName]);
675
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
675
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
676 676
 		} else {
677 677
 			$emailTemplate->addFooter();
678 678
 		}
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 	 */
720 720
 	protected function generateMailExitingShares($author, $circleName) {
721 721
 		$this->logger->log(
722
-			0, "Generating mail about existing share mail from '" . $author . "' in "
722
+			0, "Generating mail about existing share mail from '".$author."' in "
723 723
 			   . $circleName
724 724
 		);
725 725
 
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 use OCP\AppFramework\QueryException;
41 41
 use OCP\Util;
42 42
 
43
-require_once __DIR__ . '/../../appinfo/autoload.php';
43
+require_once __DIR__.'/../../appinfo/autoload.php';
44 44
 
45 45
 
46 46
 class Application extends App {
Please login to merge, or discard this patch.
lib/Service/DavService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	public function onDeleteCard(GenericEvent $event) {
159 159
 		$davCard = $this->generateDavCard($event, true);
160 160
 
161
-		$this->miscService->log('Deleting Card: ' . json_encode($davCard), 1);
161
+		$this->miscService->log('Deleting Card: '.json_encode($davCard), 1);
162 162
 		$this->membersRequest->removeMembersByContactId($davCard->getUniqueId(), Member::TYPE_USER);
163 163
 		$this->manageDeprecatedCircles($davCard->getAddressBookId());
164 164
 		$this->manageDeprecatedMembers($davCard);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 *
215 215
 	 */
216 216
 	private function manageDavCard(DavCard $davCard) {
217
-		$this->miscService->log('Updating Card: ' . json_encode($davCard), 1);
217
+		$this->miscService->log('Updating Card: '.json_encode($davCard), 1);
218 218
 		$this->manageCircles($davCard);
219 219
 		$this->manageContact($davCard);
220 220
 	}
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 			}
333 333
 		}
334 334
 
335
-		$davCard->setUserId($davCard->getOwner() . ':' . $davCard->getContactId());
335
+		$davCard->setUserId($davCard->getOwner().':'.$davCard->getContactId());
336 336
 
337 337
 		return DavCard::TYPE_CONTACT;
338 338
 	}
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			}
392 392
 
393 393
 			$user = $this->userManager->get($davCard->getOwner());
394
-			$circle = new Circle($this->configService->contactsBackendType(), $group . ' - ' . $user->getDisplayName());
394
+			$circle = new Circle($this->configService->contactsBackendType(), $group.' - '.$user->getDisplayName());
395 395
 			$circle->setContactAddressBook($davCard->getAddressBookId());
396 396
 			$circle->setContactGroupName($group);
397 397
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 		$this->manageDeprecatedCircles();
491 491
 		$users = $this->userManager->search('');
492 492
 		foreach ($users as $user) {
493
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
493
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
494 494
 			foreach ($books as $book) {
495 495
 				$this->migrateBook($book['id']);
496 496
 			}
Please login to merge, or discard this patch.