nextcloud / circles

lib/FederatedItems/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/Service/FederatedEventService.php

Spacing +3 added lines, -3 removed lines

@@ -238,16 +238,16 @@
 		try {
 			$test = new ReflectionClass($class);
 		} catch (ReflectionException $e) {
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
 		}
 
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
 		}
 
 		$item = OC::$server->get($class);
 		if (!($item instanceof IFederatedItem)) {
-			throw new FederatedEventException($class . ' not an IFederatedItem');
+			throw new FederatedEventException($class.' not an IFederatedItem');
 		}
 
 		$this->setFederatedEventBypass($event, $item);

lib/Command/MembersAdd.php

Spacing +3 added lines, -3 removed lines

@@ -119,12 +119,12 @@ 
 		$userType = $input->getOption('type');
 
 		//
-		$this->federatedUserService->commandLineInitiator($input->getOption('initiator'), $circleId,  false);
+		$this->federatedUserService->commandLineInitiator($input->getOption('initiator'), $circleId, false);
 
 		$member = $this->federatedUserService->createFederatedUser($userId, (int)$userType);
 		$outcome = $this->memberService->addMember($circleId, $member);
 
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}
@@ -175,7 +175,7 @@ 
 				$instance = $host;
 			}
 
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
 		}
 
 //		if ($userId === '') {

lib/Model/Circle.php

Spacing +26 added lines, -26 removed lines

@@ -78,22 +78,22 @@ 
 
 
 	// specific value
-	const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	const CFG_SINGLE = 1;        // Circle with only one single member.
-	const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	const CFG_SINGLE = 1; // Circle with only one single member.
+	const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	const CFG_VISIBLE = 8;        // Visible to everyone, if not visible, people have to know its name to be able to find it
-	const CFG_OPEN = 16;          // Circle is open, people can join
-	const CFG_INVITE = 32;        // Adding a member generate an invitation that needs to be accepted
-	const CFG_REQUEST = 64;       // Request to join Circles needs to be confirmed by a moderator
-	const CFG_FRIEND = 128;       // Members of the circle can invite their friends
-	const CFG_PROTECTED = 256;    // Password protected to join/request
-	const CFG_NO_OWNER = 512;     // no owner, only members
-	const CFG_HIDDEN = 1024;      // hidden from listing, but available as a share entity
-	const CFG_BACKEND = 2048;     // Fully hidden, only backend Circles
-	const CFG_ROOT = 4096;        // Circle cannot be inside another Circle
-	const CFG_FEDERATED = 8192;   // Federated
+	const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	const CFG_OPEN = 16; // Circle is open, people can join
+	const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	const CFG_PROTECTED = 256; // Password protected to join/request
+	const CFG_NO_OWNER = 512; // no owner, only members
+	const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	const CFG_ROOT = 4096; // Circle cannot be inside another Circle
+	const CFG_FEDERATED = 8192; // Federated
 
 	static $DEF = [
 		1 => 'S|Single',
@@ -583,21 +583,21 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
-		if (!array_key_exists($prefix . 'unique_id', $data)) {
+		if (!array_key_exists($prefix.'unique_id', $data)) {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setAltName($this->get($prefix . 'alt_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $data))
-			 ->setInstance($this->get($prefix . 'instance', $data))
-			 ->setSettings($this->getArray($prefix . 'settings', $data))
-			 ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data))
-			 ->setContactGroupName($this->get($prefix . 'contact_groupname', $data))
-			 ->setDescription($this->get($prefix . 'description', $data));
-
-		$creation = $this->get($prefix . 'creation', $data);
+		$this->setId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setAltName($this->get($prefix.'alt_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $data))
+			 ->setInstance($this->get($prefix.'instance', $data))
+			 ->setSettings($this->getArray($prefix.'settings', $data))
+			 ->setContactAddressBook($this->getInt($prefix.'contact_addressbook', $data))
+			 ->setContactGroupName($this->get($prefix.'contact_groupname', $data))
+			 ->setDescription($this->get($prefix.'description', $data));
+
+		$creation = $this->get($prefix.'creation', $data);
 		$this->setCreation(DateTime::createFromFormat('Y-m-d H:i:s', $creation)->getTimestamp());
 
 		$this->getManager()->importOwnerFromDatabase($this, $data);

lib/Model/Helpers/MemberHelper.php

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
 		try {
 			$level = Member::parseLevelString($levelString);
 		} catch (MemberLevelException $e) {
-			throw new MemberHelperException('method ' . $levelString . ' not found');
+			throw new MemberHelperException('method '.$levelString.' not found');
 		}
 
 		$this->mustHaveLevelEqualOrAbove($level);
@@ -122,11 +122,11 @@ 
 		try {
 			$level = Member::parseLevelString($levelString);
 		} catch (MemberLevelException $e) {
-			throw new MemberHelperException('method ' . $levelString . ' not found');
+			throw new MemberHelperException('method '.$levelString.' not found');
 		}
 
 		if ($this->member->getLevel() >= $level) {
-			throw new MemberLevelException('Member cannot be ' . $levelString);
+			throw new MemberLevelException('Member cannot be '.$levelString);
 		}
 	}
 

lib/Command/MembersLevel.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 		$level = Member::parseLevelString($input->getArgument('level'));
 		$outcome = $this->memberService->memberLevel($memberId, $level);
 
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}

lib/Command/MembersRemove.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 
 		$outcome = $this->memberService->removeMember($memberId);
 
-		echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n";
+		echo json_encode($outcome, JSON_PRETTY_PRINT)."\n";
 
 		return 0;
 	}

lib/Service/FederatedUserService.php

Spacing +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
 	public function createLocalFederatedUser(string $userId): FederatedUser {
 		$user = $this->userManager->get($userId);
 		if ($user === null) {
-			throw new NoUserException('user ' . $userId . ' not found');
+			throw new NoUserException('user '.$userId.' not found');
 		}
 
 		$federatedUser = new FederatedUser();
@@ -330,7 +330,7 @@ 
 			$circle = new Circle();
 			$id = $this->token(ManagedModel::ID_LENGTH);
 
-			$circle->setName('single:' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName('single:'.$federatedUser->getUserId().':'.$id)
 				   ->setId($id)
 				   ->setConfig(Circle::CFG_SINGLE);
 			$this->circleRequest->save($circle);
@@ -391,8 +391,8 @@ 
 
 		$last = $this->generateMemberships($federatedUser);
 
-		echo 'known: ' . json_encode($federatedUser->getMemberships()) . "\n";
-		echo 'last: ' . json_encode($last) . "\n";
+		echo 'known: '.json_encode($federatedUser->getMemberships())."\n";
+		echo 'last: '.json_encode($last)."\n";
 
 //
 //		$circles = $this->circleRequest->getCircles(null, $viewer);

lib/Service/RemoteService.php

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
 			$loop++;
 			if ($loop > 10 || in_array($instance, $knownInstance)) {
 				throw new CircleNotFoundException(
-					'circle not found after browsing ' . implode(', ', $knownInstance)
+					'circle not found after browsing '.implode(', ', $knownInstance)
 				);
 			}
 			$knownInstance[] = $instance;