nextcloud / circles

lib/Model/Circle.php

Spacing +35 added lines, -35 removed lines

@@ -71,27 +71,27 @@ 
 	public const FLAGS_LONG = 2;
 
 	// specific value
-	public const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	public const CFG_SINGLE = 1;        // Circle with only one single member.
-	public const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	public const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	public const CFG_SINGLE = 1; // Circle with only one single member.
+	public const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	public const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
-	public const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
-	public const CFG_OPEN = 16;             // Circle is open, people can join
-	public const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
-	public const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
-	public const CFG_FRIEND = 128;          // Members of the circle can invite their friends
-	public const CFG_PROTECTED = 256;       // Password protected to join/request
-	public const CFG_NO_OWNER = 512;        // no owner, only members
-	public const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
-	public const CFG_BACKEND = 2048;            // Fully hidden, only backend Circles
-	public const CFG_LOCAL = 4096;              // Local even on GlobalScale
-	public const CFG_ROOT = 8192;               // Circle cannot be inside another Circle
-	public const CFG_CIRCLE_INVITE = 16384;     // Circle must confirm when invited in another circle
-	public const CFG_FEDERATED = 32768;         // Federated
-	public const CFG_MOUNTPOINT = 65536;        // Generate a Files folder for this Circle
-	public const CFG_APP = 131072;          // Some features are not available to the OCS API (ie. destroying Circle)
+	public const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
+	public const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	public const CFG_OPEN = 16; // Circle is open, people can join
+	public const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	public const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	public const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	public const CFG_PROTECTED = 256; // Password protected to join/request
+	public const CFG_NO_OWNER = 512; // no owner, only members
+	public const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	public const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	public const CFG_LOCAL = 4096; // Local even on GlobalScale
+	public const CFG_ROOT = 8192; // Circle cannot be inside another Circle
+	public const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
+	public const CFG_FEDERATED = 32768; // Federated
+	public const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
+	public const CFG_APP = 131072; // Some features are not available to the OCS API (ie. destroying Circle)
 	public static $DEF_CFG_MAX = 262143;
 
 
@@ -463,7 +463,7 @@ 
 	 */
 	public function addInheritedMembers(array $members): self {
 		$knownIds = array_map(
-			function (Member $member): string {
+			function(Member $member): string {
 				return $member->getId();
 			}, $this->inheritedMembers
 		);
@@ -879,7 +879,7 @@ 
 				$initiatorHelper->mustBeAdmin();
 				$arr['settings'] = $this->getSettings();
 				$arr['invitationCode'] = $this->getCircleInvitation()?->getInvitationCode();
-			} catch (MemberHelperException|MemberLevelException $e) {
+			} catch (MemberHelperException | MemberLevelException $e) {
 			}
 		}
 
@@ -895,23 +895,23 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'unique_id', $data) === '') {
+		if ($this->get($prefix.'unique_id', $data) === '') {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'unique_id', $data))
-			->setName($this->get($prefix . 'name', $data))
-			->setDisplayName($this->get($prefix . 'display_name', $data))
-			->setSanitizedName($this->get($prefix . 'sanitized_name', $data))
-			->setConfig($this->getInt($prefix . 'config', $data))
-			->setSource($this->getInt($prefix . 'source', $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->setSingleId($this->get($prefix.'unique_id', $data))
+			->setName($this->get($prefix.'name', $data))
+			->setDisplayName($this->get($prefix.'display_name', $data))
+			->setSanitizedName($this->get($prefix.'sanitized_name', $data))
+			->setConfig($this->getInt($prefix.'config', $data))
+			->setSource($this->getInt($prefix.'source', $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);
 		$dateTime = DateTime::createFromFormat('Y-m-d H:i:s', $creation);
 		$timestamp = $dateTime ? $dateTime->getTimestamp() : (int)strtotime($creation);
 		$this->setCreation($timestamp);

lib/Model/CircleInvitation.php

Spacing +5 added lines, -5 removed lines

@@ -186,12 +186,12 @@
 			throw new CircleInvitationNotFoundException();
 		}
 
-		$this->setId($this->getInt($prefix . 'id', $data))
-			->setCircleId($this->get($prefix . 'circle_id', $data))
-			->setInvitationCode($this->get($prefix . 'invitation_code', $data))
-			->setCreatedBy($this->get($prefix . 'created_by', $data));
+		$this->setId($this->getInt($prefix.'id', $data))
+			->setCircleId($this->get($prefix.'circle_id', $data))
+			->setInvitationCode($this->get($prefix.'invitation_code', $data))
+			->setCreatedBy($this->get($prefix.'created_by', $data));
 
-		$created = $this->get($prefix . 'created', $data);
+		$created = $this->get($prefix.'created', $data);
 		$dateTime = \DateTime::createFromFormat('Y-m-d H:i:s', $created);
 		$timestamp = $dateTime ? $dateTime->getTimestamp() : (int)strtotime($created);
 		$this->setCreated($timestamp);