nextcloud / server

apps/dav/lib/DAV/SystemPrincipalBackend.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 	 * @return array
 	 */
 	function getGroupMembership($principal) {
-		list($prefix, ) = \Sabre\Uri\split($principal);
+		list($prefix,) = \Sabre\Uri\split($principal);
 
 		if ($prefix === 'principals/system') {
 			$principal = $this->getPrincipalByPath($principal);

lib/private/Calendar/Manager.php

Spacing +6 added lines, -6 removed lines

@@ -30,12 +30,12 @@ 
 	/**
 	 * @var ICalendar[] holds all registered calendars
 	 */
-	private $calendars=[];
+	private $calendars = [];
 
 	/**
 	 * @var \Closure[] to call to load/register calendar providers
 	 */
-	private $calendarLoaders=[];
+	private $calendarLoaders = [];
 
 	/**
 	 * This function is used to search and find objects within the user's calendars.
@@ -50,12 +50,12 @@ 
 	 * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
 	 * @since 13.0.0
 	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+	public function search($pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null) {
 		$this->loadCalendars();
 		$result = [];
-		foreach($this->calendars as $calendar) {
+		foreach ($this->calendars as $calendar) {
 			$r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
-			foreach($r as $o) {
+			foreach ($r as $o) {
 				$o['calendar-key'] = $calendar->getKey();
 				$result[] = $o;
 			}
@@ -132,7 +132,7 @@ 
 	 * loads all calendars
 	 */
 	private function loadCalendars() {
-		foreach($this->calendarLoaders as $callable) {
+		foreach ($this->calendarLoaders as $callable) {
 			$callable($this);
 		}
 		$this->calendarLoaders = [];

apps/dav/lib/CalDAV/CalendarImpl.php

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 	 * @return array an array of events/journals/todos which are arrays of key-value-pairs
 	 * @since 13.0.0
 	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+	public function search($pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null) {
 		return $this->backend->search($this->calendarInfo, $pattern,
 			$searchProperties, $options, $limit, $offset);
 	}
@@ -100,7 +100,7 @@ 
 		$permissions = $this->calendar->getACL();
 		$result = 0;
 		foreach ($permissions as $permission) {
-			switch($permission['privilege']) {
+			switch ($permission['privilege']) {
 				case '{DAV:}read':
 					$result |= Constants::PERMISSION_READ;
 					break;

lib/private/Files/Config/UserMountCache.php

Spacing +12 added lines, -12 removed lines

@@ -89,11 +89,11 @@ 
 
 	public function registerMounts(IUser $user, array $mounts) {
 		// filter out non-proper storages coming from unit tests
-		$mounts = array_filter($mounts, function (IMountPoint $mount) {
+		$mounts = array_filter($mounts, function(IMountPoint $mount) {
 			return $mount instanceof SharedMount || $mount->getStorage() && $mount->getStorage()->getCache();
 		});
 		/** @var ICachedMountInfo[] $newMounts */
-		$newMounts = array_map(function (IMountPoint $mount) use ($user) {
+		$newMounts = array_map(function(IMountPoint $mount) use ($user) {
 			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
 			if ($mount->getStorageRootId() === -1) {
 				return null;
@@ -104,7 +104,7 @@ 
 		$newMounts = array_values(array_filter($newMounts));
 
 		$cachedMounts = $this->getMountsForUser($user);
-		$mountDiff = function (ICachedMountInfo $mount1, ICachedMountInfo $mount2) {
+		$mountDiff = function(ICachedMountInfo $mount1, ICachedMountInfo $mount2) {
 			// since we are only looking for mounts for a specific user comparing on root id is enough
 			return $mount1->getRootId() - $mount2->getRootId();
 		};
@@ -165,7 +165,7 @@ 
 			], ['root_id', 'user_id']);
 		} else {
 			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+			$this->logger->debug('Could not get storage info for mount at '.$mount->getMountPoint());
 		}
 	}
 
@@ -200,7 +200,7 @@ 
 		if (!is_null($mount_id)) {
 			$mount_id = (int) $mount_id;
 		}
-		return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $mount_id, isset($row['path']) ? $row['path'] : '');
+		return new CachedMountInfo($user, (int) $row['storage_id'], (int) $row['root_id'], $row['mount_point'], $mount_id, isset($row['path']) ? $row['path'] : '');
 	}
 
 	/**
@@ -274,12 +274,12 @@ 
 			$row = $query->execute()->fetch();
 			if (is_array($row)) {
 				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
+					(int) $row['storage'],
 					$row['path'],
-					(int)$row['mimetype']
+					(int) $row['mimetype']
 				];
 			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
+				throw new NotFoundException('File with id "'.$fileId.'" not found');
 			}
 		}
 		return $this->cacheInfoCache[$fileId];
@@ -300,16 +300,16 @@ 
 		$mountsForStorage = $this->getMountsForStorageId($storageId, $user);
 
 		// filter mounts that are from the same storage but a different directory
-		$filteredMounts = array_filter($mountsForStorage, function (ICachedMountInfo $mount) use ($internalPath, $fileId) {
+		$filteredMounts = array_filter($mountsForStorage, function(ICachedMountInfo $mount) use ($internalPath, $fileId) {
 			if ($fileId === $mount->getRootId()) {
 				return true;
 			}
 			$internalMountPath = $mount->getRootInternalPath();
 
-			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
+			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath.'/';
 		});
 
-		return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
+		return array_map(function(ICachedMountInfo $mount) use ($internalPath) {
 			return new CachedMountFileInfo(
 				$mount->getUser(),
 				$mount->getStorageId(),
@@ -367,7 +367,7 @@ 
 			$slash
 		);
 
-		$userIds = array_map(function (IUser $user) {
+		$userIds = array_map(function(IUser $user) {
 			return $user->getUID();
 		}, $users);
 

lib/private/Files/Storage/Wrapper/Jail.php

Spacing +2 added lines, -2 removed lines

@@ -56,12 +56,12 @@
 		if ($path === '') {
 			return $this->rootPath;
 		} else {
-			return $this->rootPath . '/' . $path;
+			return $this->rootPath.'/'.$path;
 		}
 	}
 
 	public function getJailedPath($path) {
-		$root = rtrim($this->rootPath, '/') . '/';
+		$root = rtrim($this->rootPath, '/').'/';
 
 		if (strpos($path, $root) !== 0) {
 			return null;

apps/dav/lib/Controller/BirthdayCalendarController.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 								IDBConnection $db, IConfig $config,
 								IJobList $jobList,
 								IUserManager $userManager,
-								CalDavBackend $calDavBackend){
+								CalDavBackend $calDavBackend) {
 		parent::__construct($appName, $request);
 		$this->db = $db;
 		$this->config = $config;

apps/user_ldap/templates/part.wizardcontrols.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="ldapWizardControls">
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
+	<span class="ldap_saving hidden"><?php p($l->t('Saving')); ?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"
 			type="button">
-		<?php p($l->t('Back'));?>
+		<?php p($l->t('Back')); ?>
 	</button>
 	<button class="ldap_action_continue primary" name="ldap_action_continue" type="button">
-		<?php p($l->t('Continue'));?>
+		<?php p($l->t('Continue')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer noopener">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
+		<span class="ldap_grey"><?php p($l->t('Help')); ?></span>
 	</a>
 </div>

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Spacing +22 added lines, -22 removed lines

@@ -201,11 +201,11 @@ 
 		}
 
 		$data = array(
-			'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal,
-			'invitee_name' => (string)$meetingInviteeName ?: $defaultVal,
-			'meeting_title' => (string)$meetingTitle ?: $defaultVal,
-			'meeting_description' => (string)$meetingDescription ?: $defaultVal,
-			'meeting_url' => (string)$meetingUrl ?: $defaultVal,
+			'attendee_name' => (string) $meetingAttendeeName ?: $defaultVal,
+			'invitee_name' => (string) $meetingInviteeName ?: $defaultVal,
+			'meeting_title' => (string) $meetingTitle ?: $defaultVal,
+			'meeting_description' => (string) $meetingDescription ?: $defaultVal,
+			'meeting_url' => (string) $meetingUrl ?: $defaultVal,
 		);
 
 		$fromEMail = \OCP\Util::getDefaultEmailAddress('invitations-noreply');
@@ -216,7 +216,7 @@ 
 			->setReplyTo([$sender => $senderName])
 			->setTo([$recipient => $recipientName]);
 
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
+		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.'.$method, $data);
 		$template->addHeader();
 
 		$this->addSubjectAndHeading($template, $l10n, $method, $summary,
@@ -229,8 +229,8 @@ 
 
 		$attachment = $this->mailer->createAttachment(
 			$iTipMessage->message->serialize(),
-			'event.ics',// TODO(leon): Make file name unique, e.g. add event id
-			'text/calendar; method=' . $iTipMessage->method
+			'event.ics', // TODO(leon): Make file name unique, e.g. add event id
+			'text/calendar; method='.$iTipMessage->method
 		);
 		$message->attach($attachment);
 
@@ -241,7 +241,7 @@ 
 				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  implode(', ', $failed)]);
 				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
 			}
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 			$this->logger->logException($ex, ['app' => 'dav']);
 			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
 		}
@@ -277,13 +277,13 @@ 
 				$lastOccurrence = $firstOccurrence;
 			}
 		} else {
-			$it = new EventIterator($vObject, (string)$component->UID);
+			$it = new EventIterator($vObject, (string) $component->UID);
 			$maxDate = new \DateTime(self::MAX_DATE);
 			if ($it->isInfinite()) {
 				$lastOccurrence = $maxDate->getTimestamp();
 			} else {
 				$end = $it->getDtEnd();
-				while($it->valid() && $end < $maxDate) {
+				while ($it->valid() && $end < $maxDate) {
 					$end = $it->getDtEnd();
 					$it->next();
 
@@ -359,7 +359,7 @@ 
 			$localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']);
 			$localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']);
 
-			return $localeStart . ' - ' . $localeEnd;
+			return $localeStart.' - '.$localeEnd;
 		}
 
 		/** @var Property\ICalendar\DateTime $dtstart */
@@ -378,26 +378,26 @@ 
 			}
 		}
 
-		$localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']) . ', ' .
+		$localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']).', '.
 			$l10n->l('datetime', $dtstartDt, ['width' => 'medium|short']);
 
 		// always show full date with timezone if timezones are different
 		if ($startTimezone !== $endTimezone) {
 			$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
 
-			return $localeStart . ' (' . $startTimezone . ') - ' .
-				$localeEnd . ' (' . $endTimezone . ')';
+			return $localeStart.' ('.$startTimezone.') - '.
+				$localeEnd.' ('.$endTimezone.')';
 		}
 
 		// show only end time if date is the same
 		if ($this->isDayEqual($dtstartDt, $dtendDt)) {
 			$localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']);
 		} else {
-			$localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']) . ', ' .
+			$localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']).', '.
 				$l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
 		}
 
-		return  $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')';
+		return  $localeStart.' - '.$localeEnd.' ('.$startTimezone.')';
 	}
 
 	/**
@@ -420,15 +420,15 @@ 
 	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
 										  $method, $summary, $attendeeName, $inviteeName) {
 		if ($method === self::METHOD_CANCEL) {
-			$template->setSubject('Cancelled: ' . $summary);
+			$template->setSubject('Cancelled: '.$summary);
 			$template->addHeading($l10n->t('Invitation canceled'), $l10n->t('Hello %s,', [$attendeeName]));
 			$template->addBodyText($l10n->t('The meeting »%s« with %s was canceled.', [$summary, $inviteeName]));
 		} else if ($method === self::METHOD_REPLY) {
-			$template->setSubject('Re: ' . $summary);
+			$template->setSubject('Re: '.$summary);
 			$template->addHeading($l10n->t('Invitation updated'), $l10n->t('Hello %s,', [$attendeeName]));
 			$template->addBodyText($l10n->t('The meeting »%s« with %s was updated.', [$summary, $inviteeName]));
 		} else {
-			$template->setSubject('Invitation: ' . $summary);
+			$template->setSubject('Invitation: '.$summary);
 			$template->addHeading($l10n->t('%s invited you to »%s«', [$inviteeName, $summary]), $l10n->t('Hello %s,', [$attendeeName]));
 		}
 
@@ -451,11 +451,11 @@ 
 				$this->getAbsoluteImagePath('filetypes/location.svg'));
 		}
 		if ($description) {
-			$template->addBodyListItem((string)$description, $l10n->t('Description:'),
+			$template->addBodyListItem((string) $description, $l10n->t('Description:'),
 				$this->getAbsoluteImagePath('filetypes/text.svg'));
 		}
 		if ($url) {
-			$template->addBodyListItem((string)$url, $l10n->t('Link:'),
+			$template->addBodyListItem((string) $url, $l10n->t('Link:'),
 				$this->getAbsoluteImagePath('filetypes/link.svg'));
 		}
 	}

core/templates/lostpassword/resetpassword.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 		</p>
 		<input class="primary" type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
 		<p class="text-center">
-			<img class="hidden" id="float-spinner" src="<?php p(image_path('core', 'loading-dark.gif'));?>"/>
+			<img class="hidden" id="float-spinner" src="<?php p(image_path('core', 'loading-dark.gif')); ?>"/>
 		</p>
 	</fieldset>
 </form>