nextcloud / server

apps/dav/lib/CardDAV/AddressBook.php

Spacing +4 added lines, -4 removed lines

@@ -110,7 +110,7 @@ 
 				'privilege' => '{DAV:}read',
 				'principal' => $this->getOwner(),
 				'protected' => true,
-			],[
+			], [
 				'privilege' => '{DAV:}write',
 				'principal' => $this->getOwner(),
 				'protected' => true,
@@ -146,7 +146,7 @@ 
 
 		$acl = $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl);
 		$allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/system'];
-		return array_filter($acl, function ($rule) use ($allowedPrincipals) {
+		return array_filter($acl, function($rule) use ($allowedPrincipals) {
 			return \in_array($rule['principal'], $allowedPrincipals, true);
 		});
 	}
@@ -180,9 +180,9 @@ 
 
 	public function delete() {
 		if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
-			$principal = 'principal:' . parent::getOwner();
+			$principal = 'principal:'.parent::getOwner();
 			$shares = $this->carddavBackend->getShares($this->getResourceId());
-			$shares = array_filter($shares, function ($share) use ($principal) {
+			$shares = array_filter($shares, function($share) use ($principal) {
 				return $share['href'] === $principal;
 			});
 			if (empty($shares)) {

apps/dav/lib/CalDAV/WebcalCaching/Plugin.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
 		}
 
 		// $calendarHomePath will look like: calendars/username
-		$calendarHomePath = $pathParts[0] . '/' . $pathParts[1];
+		$calendarHomePath = $pathParts[0].'/'.$pathParts[1];
 		try {
 			$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
 			if (!($calendarHome instanceof CalendarHome)) {

apps/dav/lib/CalDAV/Reminder/ReminderService.php

Spacing +6 added lines, -6 removed lines

@@ -596,7 +596,7 @@ 
 	 */
 	private function getVEventByRecurrenceId(VObject\Component\VCalendar $vcalendar,
 											 int $recurrenceId,
-											 bool $isRecurrenceException):?VEvent {
+											 bool $isRecurrenceException): ?VEvent {
 		$vevents = $this->getAllVEventsFromVCalendar($vcalendar);
 		if (count($vevents) === 0) {
 			return null;
@@ -674,7 +674,7 @@ 
 	 * @param string $calendarData
 	 * @return VObject\Component\VCalendar|null
 	 */
-	private function parseCalendarData(string $calendarData):?VObject\Component\VCalendar {
+	private function parseCalendarData(string $calendarData): ?VObject\Component\VCalendar {
 		try {
 			return VObject\Reader::read($calendarData,
 				VObject\Reader::OPTION_FORGIVING);
@@ -687,7 +687,7 @@ 
 	 * @param string $principalUri
 	 * @return IUser|null
 	 */
-	private function getUserFromPrincipalURI(string $principalUri):?IUser {
+	private function getUserFromPrincipalURI(string $principalUri): ?IUser {
 		if (!$principalUri) {
 			return null;
 		}
@@ -727,7 +727,7 @@ 
 	 * @return VObject\Component\VEvent[]
 	 */
 	private function getRecurrenceExceptionFromListOfVEvents(array $vevents):array {
-		return array_values(array_filter($vevents, function (VEvent $vevent) {
+		return array_values(array_filter($vevents, function(VEvent $vevent) {
 			return $vevent->{'RECURRENCE-ID'} !== null;
 		}));
 	}
@@ -736,8 +736,8 @@ 
 	 * @param array $vevents
 	 * @return VEvent|null
 	 */
-	private function getMasterItemFromListOfVEvents(array $vevents):?VEvent {
-		$elements = array_values(array_filter($vevents, function (VEvent $vevent) {
+	private function getMasterItemFromListOfVEvents(array $vevents): ?VEvent {
+		$elements = array_values(array_filter($vevents, function(VEvent $vevent) {
 			return $vevent->{'RECURRENCE-ID'} === null;
 		}));
 

apps/provisioning_api/lib/Controller/GroupsController.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
 	 */
 	public function getGroups(string $search = '', int $limit = null, int $offset = 0): DataResponse {
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function ($group) {
+		$groups = array_map(function($group) {
 			/** @var IGroup $group */
 			return $group->getGID();
 		}, $groups);
@@ -108,7 +108,7 @@ 
 	 */
 	public function getGroupsDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function ($group) {
+		$groups = array_map(function($group) {
 			/** @var IGroup $group */
 			return [
 				'id' => $group->getGID(),
@@ -163,7 +163,7 @@ 
 		if ($this->groupManager->isAdmin($user->getUID())
 		   || $isSubadminOfGroup) {
 			$users = $this->groupManager->get($groupId)->getUsers();
-			$users = array_map(function ($user) {
+			$users = array_map(function($user) {
 				/** @var IUser $user */
 				return $user->getUID();
 			}, $users);
@@ -207,7 +207,7 @@ 
 			foreach ($users as $user) {
 				try {
 					/** @var IUser $user */
-					$userId = (string)$user->getUID();
+					$userId = (string) $user->getUID();
 					$userData = $this->getUserData($userId);
 					// Do not insert empty entry
 					if (!empty($userData)) {

apps/workflowengine/lib/BackgroundJobs/Rotate.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 
 	protected function run($argument) {
 		$config = \OC::$server->getConfig();
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/flow.log';
-		$this->filePath = trim((string)$config->getAppValue(Application::APP_ID, 'logfile', $default));
+		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/flow.log';
+		$this->filePath = trim((string) $config->getAppValue(Application::APP_ID, 'logfile', $default));
 
 		if ($this->filePath === '') {
 			// disabled, nothing to do

lib/private/OCS/DiscoveryService.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
 	public function discover(string $remote, string $service, bool $skipCache = false): array {
 		// Check the cache first
 		if ($skipCache === false) {
-			$cacheData = $this->cache->get($remote . '#' . $service);
+			$cacheData = $this->cache->get($remote.'#'.$service);
 			if ($cacheData) {
 				$data = json_decode($cacheData, true);
 				if (\is_array($data)) {
@@ -82,7 +82,7 @@ 
 
 		// query the remote server for available services
 		try {
-			$response = $this->client->get($remote . '/ocs-provider/', [
+			$response = $this->client->get($remote.'/ocs-provider/', [
 				'timeout' => 10,
 				'connect_timeout' => 10,
 			]);
@@ -97,7 +97,7 @@ 
 		}
 
 		// Write into cache
-		$this->cache->set($remote . '#' . $service, json_encode($discoveredServices), 60 * 60 * 24);
+		$this->cache->set($remote.'#'.$service, json_encode($discoveredServices), 60 * 60 * 24);
 		return $discoveredServices;
 	}
 
@@ -130,6 +130,6 @@ 
 	 * @return bool
 	 */
 	protected function isSafeUrl(string $url): bool {
-		return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
+		return (bool) preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
 	}
 }

lib/private/Security/Bruteforce/Throttler.php

Spacing +8 added lines, -8 removed lines

@@ -93,7 +93,7 @@ 
 	private function getCutoff(int $expire): \DateInterval {
 		$d1 = new \DateTime();
 		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
+		$d2->sub(new \DateInterval('PT'.$expire.'S'));
 		return $d2->diff($d1);
 	}
 
@@ -128,7 +128,7 @@ 
 		$values = [
 			'action' => $action,
 			'occurred' => $this->timeFactory->getTime(),
-			'ip' => (string)$ipAddress,
+			'ip' => (string) $ipAddress,
 			'subnet' => $ipAddress->getSubnet(),
 			'metadata' => json_encode($metadata),
 		];
@@ -164,7 +164,7 @@ 
 		}
 
 		$keys = $this->config->getAppKeys('bruteForce');
-		$keys = array_filter($keys, function ($key) {
+		$keys = array_filter($keys, function($key) {
 			return 0 === strpos($key, 'whitelist_');
 		});
 
@@ -183,7 +183,7 @@ 
 
 			$cx = explode('/', $cidr);
 			$addr = $cx[0];
-			$mask = (int)$cx[1];
+			$mask = (int) $cx[1];
 
 			// Do not compare ipv4 to ipv6
 			if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
@@ -195,8 +195,8 @@ 
 
 			$valid = true;
 			for ($i = 0; $i < $mask; $i++) {
-				$part = ord($addr[(int)($i / 8)]);
-				$orig = ord($ip[(int)($i / 8)]);
+				$part = ord($addr[(int) ($i / 8)]);
+				$orig = ord($ip[(int) ($i / 8)]);
 
 				$bitmask = 1 << (7 - ($i % 8));
 
@@ -231,7 +231,7 @@ 
 		}
 
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return 0;
 		}
 
@@ -289,7 +289,7 @@ 
 	 */
 	public function resetDelay(string $ip, string $action, array $metadata): void {
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return;
 		}
 

lib/private/User/Backend.php

Spacing +9 added lines, -9 removed lines

@@ -39,14 +39,14 @@ 
 	/**
 	 * actions that user backends can define
 	 */
-	public const CREATE_USER = 1;			// 1 << 0
-	public const SET_PASSWORD = 16;			// 1 << 4
-	public const CHECK_PASSWORD = 256;			// 1 << 8
-	public const GET_HOME = 4096;			// 1 << 12
-	public const GET_DISPLAYNAME = 65536;		// 1 << 16
-	public const SET_DISPLAYNAME = 1048576;		// 1 << 20
-	public const PROVIDE_AVATAR = 16777216;		// 1 << 24
-	public const COUNT_USERS = 268435456;	// 1 << 28
+	public const CREATE_USER = 1; // 1 << 0
+	public const SET_PASSWORD = 16; // 1 << 4
+	public const CHECK_PASSWORD = 256; // 1 << 8
+	public const GET_HOME = 4096; // 1 << 12
+	public const GET_DISPLAYNAME = 65536; // 1 << 16
+	public const SET_DISPLAYNAME = 1048576; // 1 << 20
+	public const PROVIDE_AVATAR = 16777216; // 1 << 24
+	public const COUNT_USERS = 268435456; // 1 << 28
 
 	protected $possibleActions = [
 		self::CREATE_USER => 'createUser',
@@ -86,7 +86,7 @@ 
 	 * compared with self::CREATE_USER etc.
 	 */
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**

lib/private/Encryption/Keys/Storage.php

Spacing +18 added lines, -18 removed lines

@@ -80,8 +80,8 @@ 
 		$this->util = $util;
 
 		$this->encryption_base_dir = '/files_encryption';
-		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
-		$this->backup_base_dir = $this->encryption_base_dir .'/backup';
+		$this->keys_base_dir = $this->encryption_base_dir.'/keys';
+		$this->backup_base_dir = $this->encryption_base_dir.'/backup';
 		$this->root_dir = $this->util->getKeyStorageRoot();
 		$this->crypto = $crypto;
 		$this->config = $config;
@@ -101,14 +101,14 @@ 
 	public function getFileKey($path, $keyId, $encryptionModuleId) {
 		$realFile = $this->util->stripPartialFileExtension($path);
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
-		$key = $this->getKey($keyDir . $keyId)['key'];
+		$key = $this->getKey($keyDir.$keyId)['key'];
 
 		if ($key === '' && $realFile !== $path) {
 			// Check if the part file has keys and use them, if no normal keys
 			// exist. This is required to fix copyBetweenStorage() when we
 			// rename a .part file over storage borders.
 			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-			$key = $this->getKey($keyDir . $keyId)['key'];
+			$key = $this->getKey($keyDir.$keyId)['key'];
 		}
 
 		return base64_decode($key);
@@ -138,7 +138,7 @@ 
 	 */
 	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return $this->setKey($keyDir . $keyId, [
+		return $this->setKey($keyDir.$keyId, [
 			'key' => base64_encode($key),
 		]);
 	}
@@ -180,7 +180,7 @@ 
 	 */
 	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
+		return !$this->view->file_exists($keyDir.$keyId) || $this->view->unlink($keyDir.$keyId);
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 */
 	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
 		if ($uid === null) {
-			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+			$path = $this->root_dir.'/'.$this->encryption_base_dir.'/'.$encryptionModuleId.'/'.$keyId;
 		} else {
-			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
-				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
+			$path = $this->root_dir.'/'.$uid.$this->encryption_base_dir.'/'
+				. $encryptionModuleId.'/'.$uid.'.'.$keyId;
 		}
 
 		return \OC\Files\Filesystem::normalizePath($path);
@@ -369,12 +369,12 @@ 
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$this->keys_base_dir.$filename.'/';
 		} else {
-			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$filename.'/';
 		}
 
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
+		return Filesystem::normalizePath($keyPath.$encryptionModuleId.'/', false);
 	}
 
 	/**
@@ -429,13 +429,13 @@ 
 	 * @since 12.0.0
 	 */
 	public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
-		$source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
-		$backupDir = $uid . $this->backup_base_dir;
+		$source = $uid.$this->encryption_base_dir.'/'.$encryptionModuleId;
+		$backupDir = $uid.$this->backup_base_dir;
 		if (!$this->view->file_exists($backupDir)) {
 			$this->view->mkdir($backupDir);
 		}
 
-		$backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
+		$backupDir = $backupDir.'/'.$purpose.'.'.$encryptionModuleId.'.'.$this->getTimestamp();
 		$this->view->mkdir($backupDir);
 
 		return $this->view->copy($source, $backupDir);
@@ -461,9 +461,9 @@ 
 		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
 
 		if ($systemWideMountPoint) {
-			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$this->keys_base_dir.$relativePath.'/';
 		} else {
-			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$relativePath.'/';
 		}
 
 		return  Filesystem::normalizePath($systemPath, false);
@@ -480,7 +480,7 @@ 
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if (!$this->view->is_dir($dir)) {
 					$this->view->mkdir($dir);
 				}