nextcloud / circles

lib/Model/GlobalScale/GSShare.php

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
 			return $mountPoint;
 		}
 
-		return '/' . $userId . '/files/' . ltrim($mountPoint, '/');
+		return '/'.$userId.'/files/'.ltrim($mountPoint, '/');
 	}
 
 	/**
@@ -293,7 +293,7 @@ 
 	public function toMount(string $userId, string $protocol = 'https'): array {
 		return [
 			'owner'       => $this->getOwner(),
-			'remote'      => $protocol . '://' . $this->getInstance(),
+			'remote'      => $protocol.'://'.$this->getInstance(),
 			'token'       => $this->getToken(),
 			'share_token' => $this->getToken(),
 			'password'    => $this->getPassword(),

lib/Db/GSSharesRequest.php

Spacing +2 added lines, -2 removed lines

@@ -121,11 +121,11 @@
 
 	private function leftJoinMountPoint(IQueryBuilder $qb, string $userId) {
 		$expr = $qb->expr();
-		$pf = '' . $this->default_select_alias . '.';
+		$pf = ''.$this->default_select_alias.'.';
 
 		$on = $expr->andX();
 		$on->add($expr->eq('mp.user_id', $qb->createNamedParameter($userId)));
-		$on->add($expr->eq('mp.share_id', $pf . 'id'));
+		$on->add($expr->eq('mp.share_id', $pf.'id'));
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('mp.mountPoint', 'gsshares_mountpoint')

lib/GlobalScale/GSMount/MountProvider.php

Spacing +3 added lines, -3 removed lines

@@ -148,13 +148,13 @@
 		}
 
 		$info = pathinfo($share->getMountPoint());
-		$filename = $this->get('dirname', $info) . '/' . $this->get('filename', $info);
+		$filename = $this->get('dirname', $info).'/'.$this->get('filename', $info);
 		$extension = $this->get('extension', $info);
-		$extension = ($extension === '') ? '' : '.' . $extension;
+		$extension = ($extension === '') ? '' : '.'.$extension;
 
 		$n = 2;
 		while (true) {
-			$path = $filename . " ($n)" . $extension;
+			$path = $filename." ($n)".$extension;
 			try {
 				$fs->get($path);
 			} catch (NotFoundException $e) {

lib/GlobalScale/FileShare.php

Spacing +8 added lines, -8 removed lines

@@ -105,14 +105,14 @@ 
 			$node = $share->getNode();
 			$filename = $node->getName();
 		} catch (NotFoundException $e) {
-			$this->miscService->log('issue while FileShare: ' . $e->getMessage());
+			$this->miscService->log('issue while FileShare: '.$e->getMessage());
 
 			return;
 		}
 
 		$event->getData()
 			  ->s('gs_federated', $share->getToken())
-			  ->s('gs_filename', '/' . $filename);
+			  ->s('gs_filename', '/'.$filename);
 	}
 
 
@@ -301,7 +301,7 @@ 
 			);
 		} catch (Exception $e) {
 			OC::$server->getLogger()
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
 		}
 	}
 
@@ -319,8 +319,8 @@ 
 		$message = $this->mailer->createMessage();
 
 		$this->miscService->log(
-			"Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
-			. ' - link: ' . $link, 0
+			"Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
+			. ' - link: '.$link, 0
 		);
 
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -359,7 +359,7 @@ 
 
 		$message = $this->mailer->createMessage();
 
-		$this->miscService->log("Sending password mail to circle '" . $circleName . "': " . $email, 0);
+		$this->miscService->log("Sending password mail to circle '".$circleName."': ".$email, 0);
 
 		$filename = $share->getNode()
 						  ->getName();
@@ -414,7 +414,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -449,7 +449,7 @@ 
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($subject, false);
 		$emailTemplate->addBodyText(
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
 				$this->l10n->t('Click the button below to open it.')
 			), $text
 		);

lib/Service/GSDownstreamService.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 			$gs = $this->globalScaleService->getGlobalScaleEvent($event);
 			$gs->manage($event);
 		} catch (Exception $e) {
-			$this->miscService->log('issue onNewEvent: ' . json_encode($event) . ' - ' . $e->getMessage());
+			$this->miscService->log('issue onNewEvent: '.json_encode($event).' - '.$e->getMessage());
 		}
 	}
 

lib/Command/SyncContact.php

Spacing +5 added lines, -5 removed lines

@@ -119,9 +119,9 @@ 
 		$tCards = $tBooks = 0;
 		$knownBooks = [];
 		foreach ($users as $user) {
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
 			$output->writeln(
-				'- User <info>' . $user->getUID() . '</info> have ' . sizeof($books) . ' address books:'
+				'- User <info>'.$user->getUID().'</info> have '.sizeof($books).' address books:'
 			);
 
 			$tBooks += sizeof($books);
@@ -137,11 +137,11 @@ 
 
 				$shared = '';
 				if ($owner !== $user->getUID()) {
-					$shared = ' (shared by <info>' . $owner . '</info>)';
+					$shared = ' (shared by <info>'.$owner.'</info>)';
 				}
 
 				$output->writeln(
-					'  <comment>*</comment> book #' . $bookId . $shared . ' contains '
+					'  <comment>*</comment> book #'.$bookId.$shared.' contains '
 					. sizeof($cards)
 					. ' entries'
 				);
@@ -151,7 +151,7 @@ 
 		}
 
 		$output->writeln('');
-		$output->writeln('with a total of ' . $tBooks . ' address books and ' . $tCards . ' contact entries');
+		$output->writeln('with a total of '.$tBooks.' address books and '.$tCards.' contact entries');
 	}
 
 

lib/GlobalScale/MemberAdd.php

Spacing +3 added lines, -3 removed lines

@@ -177,7 +177,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -327,7 +327,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -369,7 +369,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/GlobalScale/GlobalSync.php

Spacing +3 added lines, -3 removed lines

@@ -116,13 +116,13 @@ 
 				}
 
 				$this->miscService->log(
-					'updating member :' . json_encode($member) . ' from ' . json_encode($knownMember), 2
+					'updating member :'.json_encode($member).' from '.json_encode($knownMember), 2
 				);
 				$this->membersRequest->updateMemberLevel($member);
 			} catch (MemberDoesNotExistException $e) {
 				try {
 					$this->miscService->log(
-						'creating member :' . json_encode($member), 2
+						'creating member :'.json_encode($member), 2
 					);
 					$this->membersRequest->createMember($member);
 				} catch (MemberAlreadyExistsException $e) {
@@ -140,7 +140,7 @@ 
 			try {
 				$this->getMember($knownItem, $circle->getMembers(), $source);
 			} catch (MemberDoesNotExistException $e) {
-				$this->miscService->log('removing deprecated member :' . json_encode($knownItem), 2);
+				$this->miscService->log('removing deprecated member :'.json_encode($knownItem), 2);
 				$this->membersRequest->removeMember($knownItem);
 				$this->gsSharesRequest->removeGSSharesFromMember($knownItem);
 			}

lib/Service/GSUpstreamService.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,7 @@ 
 			}
 		} catch (Exception $e) {
 			$this->miscService->log(
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
 			);
 			throw $e;
 		}
@@ -246,13 +246,13 @@ 
 		$request->setDataSerialize($event);
 
 		$result = $this->retrieveJson($request);
-		$this->miscService->log('result ' . json_encode($result), 0);
+		$this->miscService->log('result '.json_encode($result), 0);
 		if ($this->getInt('status', $result) === 0) {
 			throw new GlobalScaleEventException($this->get('error', $result));
 		}
 
 		$updatedData = $this->getArray('event', $result);
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData), 0);
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData), 0);
 		if (!empty($updatedData)) {
 			$updated = new GSEvent();
 			try {