nextcloud / circles

lib/Db/CircleProviderRequestBuilder.php

Spacing +16 added lines, -16 removed lines

@@ -78,7 +78,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'share_with',
+				$pf.'share_with',
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
 			)
 		);
@@ -95,7 +95,7 @@ 
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
 	}
 
 
@@ -144,8 +144,8 @@ 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->andWhere(
 			$expr->orX(
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
 			)
 		);
 	}
@@ -167,7 +167,7 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 		$qb->andWhere(
 			$expr->in(
-				$pf . 'file_source',
+				$pf.'file_source',
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
 			)
 		);
@@ -200,13 +200,13 @@ 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
 
 		if ($reShares === false) {
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
 		} else {
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
 			$qb->andWhere(
 				$expr->orX(
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
 				)
 			);
 		}
@@ -304,11 +304,11 @@ 
 		$expr = $qb->expr();
 		$andX = $expr->andX();
 
-		$andX->add($expr->eq($aliasM . '.user_id', $qb->createNamedParameter($userId)));
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)));
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(Member::TYPE_USER)));
+		$andX->add($expr->eq($aliasM.'.user_id', $qb->createNamedParameter($userId)));
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)));
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(Member::TYPE_USER)));
 
 		return $andX;
 	}
@@ -330,10 +330,10 @@ 
 		$expr = $qb->expr();
 		$andX = $expr->andX();
 
-		$andX->add($expr->eq($aliasM . '.user_id', $qb->createNamedParameter($userId)));
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
+		$andX->add($expr->eq($aliasM.'.user_id', $qb->createNamedParameter($userId)));
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
 
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)));
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)));
 
 		return $andX;
 	}

lib/Service/SharingFrameService.php

Spacing +7 added lines, -7 removed lines

@@ -146,7 +146,7 @@ 
 	public function createFrame($circleUniqueId, SharingFrame $frame, $broadcast = null) {
 
 		$this->miscService->log(
-			'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $this->userId, 0
+			'Create frame with payload '.json_encode($frame->getPayload()).' as '.$this->userId, 0
 		);
 		try {
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId);
@@ -161,7 +161,7 @@ 
 			$this->initiateShare($circle->getUniqueId(), $frame->getUniqueId());
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage()
+				'fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage()
 			);
 			throw $e;
 		}
@@ -300,7 +300,7 @@ 
 		];
 
 		$client = $this->clientService->newClient();
-		$addr = $this->configService->getLocalAddress() . \OC::$WEBROOT;
+		$addr = $this->configService->getLocalAddress().\OC::$WEBROOT;
 		$opts = [
 			'body'            => $args,
 			'timeout'         => Application::CLIENT_TIMEOUT,
@@ -317,8 +317,8 @@ 
 			return true;
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to initialise circle share to ' . $addr . ' for circle ' . $circleUniqueId . ' - '
-				. json_encode($opts) . ' - ' . $e->getMessage(), 3
+				'fail to initialise circle share to '.$addr.' for circle '.$circleUniqueId.' - '
+				. json_encode($opts).' - '.$e->getMessage(), 3
 			);
 			throw $e;
 		}
@@ -331,7 +331,7 @@ 
 	 * @return string
 	 */
 	private function generatePayloadDeliveryURL($remote) {
-		return $this->configService->generateRemoteHost($remote) .
+		return $this->configService->generateRemoteHost($remote).
 			   $this->urlGenerator->linkToRoute('circles.Shares.initShareDelivery');
 	}
 
@@ -406,7 +406,7 @@ 
 
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to send frame to ' . $link->getAddress() . ' - ' . $e->getMessage()
+				'fail to send frame to '.$link->getAddress().' - '.$e->getMessage()
 			);
 		}
 	}