nextcloud / server

core/Command/User/Report.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 				'count-dirs',
 				null,
 				InputOption::VALUE_NONE,
-				'Also count the number of user directories in the database (could time out on huge installations, therefore defaults to no with ' . self::DEFAULT_COUNT_DIRS_MAX_USERS . '+ users)'
+				'Also count the number of user directories in the database (could time out on huge installations, therefore defaults to no with '.self::DEFAULT_COUNT_DIRS_MAX_USERS.'+ users)'
 			)
 		;
 	}

apps/dav/lib/Listener/CardListener.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -81,7 +81,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a changed card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -99,7 +99,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

apps/dav/lib/Listener/AddressbookListener.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -77,7 +77,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a changed addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -93,7 +93,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -111,7 +111,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for (un)sharing addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for (un)sharing addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php

Spacing +8 added lines, -8 removed lines

@@ -78,7 +78,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar move, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -93,7 +93,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a deleted calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -114,7 +114,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error restoring reminders of a calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -129,7 +129,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error creating reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error creating reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -144,7 +144,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -159,7 +159,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error deleting reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error deleting reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -174,7 +174,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error restoring reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -189,7 +189,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php

Spacing +7 added lines, -7 removed lines

@@ -99,15 +99,15 @@ 
 			$tags = $this->tagManager->getTagsByIds([$tagId]);
 			$tag = current($tags);
 			if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-				throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+				throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign');
 			}
 			if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
-				throw new Forbidden('No permission to assign tag ' . $tagId);
+				throw new Forbidden('No permission to assign tag '.$tagId);
 			}
 
 			$this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
 		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+			throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign');
 		}
 	}
 
@@ -124,11 +124,11 @@ 
 					return $this->makeNode($tag);
 				}
 			}
-			throw new NotFound('Tag with id ' . $tagName . ' not present for object ' . $this->objectId);
+			throw new NotFound('Tag with id '.$tagName.' not present for object '.$this->objectId);
 		} catch (\InvalidArgumentException $e) {
 			throw new BadRequest('Invalid tag id', 0, $e);
 		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $tagName . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$tagName.' not found', 0, $e);
 		}
 	}
 
@@ -140,11 +140,11 @@ 
 		$tags = $this->tagManager->getTagsByIds($tagIds);
 
 		// filter out non-visible tags
-		$tags = array_filter($tags, function ($tag) {
+		$tags = array_filter($tags, function($tag) {
 			return $this->tagManager->canUserSeeTag($tag, $this->user);
 		});
 
-		return array_values(array_map(function ($tag) {
+		return array_values(array_map(function($tag) {
 			return $this->makeNode($tag);
 		}, $tags));
 	}

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

Spacing +46 added lines, -46 removed lines

@@ -99,49 +99,49 @@ 
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_ADD.'_self') {
 			$subject = $this->l->t('You created calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
 			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
 			$subject = $this->l->t('You deleted calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
 			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
 			$subject = $this->l->t('You updated calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_MOVE_TO_TRASH) {
 			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_MOVE_TO_TRASH . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_MOVE_TO_TRASH.'_self') {
 			$subject = $this->l->t('You deleted calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_RESTORE) {
 			$subject = $this->l->t('{actor} restored calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_RESTORE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_RESTORE.'_self') {
 			$subject = $this->l->t('You restored calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_PUBLISH.'_self') {
 			$subject = $this->l->t('You shared calendar {calendar} as public link');
-		} elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH.'_self') {
 			$subject = $this->l->t('You removed public link for calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
 		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -177,45 +177,45 @@ 
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
 				case self::SUBJECT_ADD:
-				case self::SUBJECT_ADD . '_self':
+				case self::SUBJECT_ADD.'_self':
 				case self::SUBJECT_DELETE:
-				case self::SUBJECT_DELETE . '_self':
+				case self::SUBJECT_DELETE.'_self':
 				case self::SUBJECT_UPDATE:
-				case self::SUBJECT_UPDATE . '_self':
+				case self::SUBJECT_UPDATE.'_self':
 				case self::SUBJECT_MOVE_TO_TRASH:
-				case self::SUBJECT_MOVE_TO_TRASH . '_self':
+				case self::SUBJECT_MOVE_TO_TRASH.'_self':
 				case self::SUBJECT_RESTORE:
-				case self::SUBJECT_RESTORE . '_self':
-				case self::SUBJECT_PUBLISH . '_self':
-				case self::SUBJECT_UNPUBLISH . '_self':
+				case self::SUBJECT_RESTORE.'_self':
+				case self::SUBJECT_PUBLISH.'_self':
+				case self::SUBJECT_UNPUBLISH.'_self':
 				case self::SUBJECT_SHARE_USER:
 				case self::SUBJECT_UNSHARE_USER:
-				case self::SUBJECT_UNSHARE_USER . '_self':
+				case self::SUBJECT_UNSHARE_USER.'_self':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 					];
-				case self::SUBJECT_SHARE_USER . '_you':
-				case self::SUBJECT_UNSHARE_USER . '_you':
+				case self::SUBJECT_SHARE_USER.'_you':
+				case self::SUBJECT_UNSHARE_USER.'_you':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'user' => $this->generateUserParameter($parameters['user']),
 					];
-				case self::SUBJECT_SHARE_USER . '_by':
-				case self::SUBJECT_UNSHARE_USER . '_by':
+				case self::SUBJECT_SHARE_USER.'_by':
+				case self::SUBJECT_UNSHARE_USER.'_by':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'user' => $this->generateUserParameter($parameters['user']),
 					];
-				case self::SUBJECT_SHARE_GROUP . '_you':
-				case self::SUBJECT_UNSHARE_GROUP . '_you':
+				case self::SUBJECT_SHARE_GROUP.'_you':
+				case self::SUBJECT_UNSHARE_GROUP.'_you':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'group' => $this->generateGroupParameter($parameters['group']),
 					];
-				case self::SUBJECT_SHARE_GROUP . '_by':
-				case self::SUBJECT_UNSHARE_GROUP . '_by':
+				case self::SUBJECT_SHARE_GROUP.'_by':
+				case self::SUBJECT_UNSHARE_GROUP.'_by':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
@@ -231,41 +231,41 @@ 
 		// they will get the dead entries in their stream.
 		switch ($subject) {
 			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
+			case self::SUBJECT_ADD.'_self':
 			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
+			case self::SUBJECT_DELETE.'_self':
 			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
-			case self::SUBJECT_PUBLISH . '_self':
-			case self::SUBJECT_UNPUBLISH . '_self':
+			case self::SUBJECT_UPDATE.'_self':
+			case self::SUBJECT_PUBLISH.'_self':
+			case self::SUBJECT_UNPUBLISH.'_self':
 			case self::SUBJECT_SHARE_USER:
 			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
+			case self::SUBJECT_UNSHARE_USER.'_self':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
+			case self::SUBJECT_SHARE_USER.'_you':
+			case self::SUBJECT_UNSHARE_USER.'_you':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
+			case self::SUBJECT_SHARE_USER.'_by':
+			case self::SUBJECT_UNSHARE_USER.'_by':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
+			case self::SUBJECT_SHARE_GROUP.'_you':
+			case self::SUBJECT_UNSHARE_GROUP.'_you':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
+			case self::SUBJECT_SHARE_GROUP.'_by':
+			case self::SUBJECT_UNSHARE_GROUP.'_by':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),

apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	}
 
 	public function calendarQuery(array $filters) {
-		return array_map(function (array $calendarObjectInfo) {
+		return array_map(function(array $calendarObjectInfo) {
 			return $this->getRelativeObjectPath($calendarObjectInfo);
 		}, $this->caldavBackend->getDeletedCalendarObjectsByPrincipal($this->principalInfo['uri']));
 	}

lib/public/AppFramework/Http/DownloadResponse.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 		$filename = strtr($filename, ['"' => '\\"', '\\' => '\\\\']);
 
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$this->addHeader('Content-Type', $contentType);
 	}
 }

status.php

Spacing +2 added lines, -2 removed lines

@@ -31,10 +31,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	$systemConfig = \OC::$server->getSystemConfig();