nextcloud / server

apps/dav/lib/Migration/RemoveClassifiedEventActivity.php

Indentation +100 added lines, -100 removed lines

@@ -29,104 +29,104 @@
 
 class RemoveClassifiedEventActivity implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return 'Remove activity entries of private events';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		if (!$this->connection->tableExists('activity')) {
-			return;
-		}
-
-		$deletedEvents = $this->removePrivateEventActivity();
-		$deletedEvents += $this->removeConfidentialUncensoredEventActivity();
-
-		$output->info("Removed $deletedEvents activity entries");
-	}
-
-	protected function removePrivateEventActivity(): int {
-		$deletedEvents = 0;
-
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('activity')
-			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
-			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
-			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
-			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
-			->from('calendarobjects', 'o')
-			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
-			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_PRIVATE)));
-		$result = $query->execute();
-
-		while ($row = $result->fetch()) {
-			if ($row['principaluri'] === null) {
-				continue;
-			}
-
-			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
-				->setParameter('type', 'calendar')
-				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
-			$deletedEvents += $delete->execute();
-		}
-		$result->closeCursor();
-
-		return $deletedEvents;
-	}
-
-	protected function removeConfidentialUncensoredEventActivity(): int {
-		$deletedEvents = 0;
-
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('activity')
-			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
-			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
-			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
-			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')))
-			->andWhere($delete->expr()->notLike('subjectparams', $delete->createParameter('filtered_name')));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
-			->from('calendarobjects', 'o')
-			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
-			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_CONFIDENTIAL)));
-		$result = $query->execute();
-
-		while ($row = $result->fetch()) {
-			if ($row['principaluri'] === null) {
-				continue;
-			}
-
-			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
-				->setParameter('type', 'calendar')
-				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
-				->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
-			$deletedEvents += $delete->execute();
-		}
-		$result->closeCursor();
-
-		return $deletedEvents;
-	}
-
-	protected function getPrincipal(string $principalUri): string {
-		$uri = explode('/', $principalUri);
-		return array_pop($uri);
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return 'Remove activity entries of private events';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        if (!$this->connection->tableExists('activity')) {
+            return;
+        }
+
+        $deletedEvents = $this->removePrivateEventActivity();
+        $deletedEvents += $this->removeConfidentialUncensoredEventActivity();
+
+        $output->info("Removed $deletedEvents activity entries");
+    }
+
+    protected function removePrivateEventActivity(): int {
+        $deletedEvents = 0;
+
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('activity')
+            ->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+            ->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+            ->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+            ->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('c.principaluri', 'o.calendarid', 'o.uid')
+            ->from('calendarobjects', 'o')
+            ->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+            ->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_PRIVATE)));
+        $result = $query->execute();
+
+        while ($row = $result->fetch()) {
+            if ($row['principaluri'] === null) {
+                continue;
+            }
+
+            $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+                ->setParameter('type', 'calendar')
+                ->setParameter('calendar_id', $row['calendarid'])
+                ->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
+            $deletedEvents += $delete->execute();
+        }
+        $result->closeCursor();
+
+        return $deletedEvents;
+    }
+
+    protected function removeConfidentialUncensoredEventActivity(): int {
+        $deletedEvents = 0;
+
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('activity')
+            ->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+            ->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+            ->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+            ->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')))
+            ->andWhere($delete->expr()->notLike('subjectparams', $delete->createParameter('filtered_name')));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('c.principaluri', 'o.calendarid', 'o.uid')
+            ->from('calendarobjects', 'o')
+            ->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+            ->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_CONFIDENTIAL)));
+        $result = $query->execute();
+
+        while ($row = $result->fetch()) {
+            if ($row['principaluri'] === null) {
+                continue;
+            }
+
+            $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+                ->setParameter('type', 'calendar')
+                ->setParameter('calendar_id', $row['calendarid'])
+                ->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
+                ->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
+            $deletedEvents += $delete->execute();
+        }
+        $result->closeCursor();
+
+        return $deletedEvents;
+    }
+
+    protected function getPrincipal(string $principalUri): string {
+        $uri = explode('/', $principalUri);
+        return array_pop($uri);
+    }
 }

lib/public/Group/ISubAdmin.php

Indentation +58 added lines, -58 removed lines

@@ -32,68 +32,68 @@
  */
 interface ISubAdmin {
 
-	/**
-	 * add a SubAdmin
-	 * @param IUser $user user to be SubAdmin
-	 * @param IGroup $group group $user becomes subadmin of
-	 *
-	 * @since 16.0.0
-	 */
-	public function createSubAdmin(IUser $user, IGroup $group): void;
+    /**
+     * add a SubAdmin
+     * @param IUser $user user to be SubAdmin
+     * @param IGroup $group group $user becomes subadmin of
+     *
+     * @since 16.0.0
+     */
+    public function createSubAdmin(IUser $user, IGroup $group): void;
 
-	/**
-	 * delete a SubAdmin
-	 * @param IUser $user the user that is the SubAdmin
-	 * @param IGroup $group the group
-	 *
-	 * @since 16.0.0
-	 */
-	public function deleteSubAdmin(IUser $user, IGroup $group): void;
+    /**
+     * delete a SubAdmin
+     * @param IUser $user the user that is the SubAdmin
+     * @param IGroup $group the group
+     *
+     * @since 16.0.0
+     */
+    public function deleteSubAdmin(IUser $user, IGroup $group): void;
 
-	/**
-	 * get groups of a SubAdmin
-	 * @param IUser $user the SubAdmin
-	 * @return IGroup[]
-	 *
-	 * @since 16.0.0
-	 */
-	public function getSubAdminsGroups(IUser $user): array;
+    /**
+     * get groups of a SubAdmin
+     * @param IUser $user the SubAdmin
+     * @return IGroup[]
+     *
+     * @since 16.0.0
+     */
+    public function getSubAdminsGroups(IUser $user): array;
 
-	/**
-	 * get SubAdmins of a group
-	 * @param IGroup $group the group
-	 * @return IUser[]
-	 *
-	 * @since 16.0.0
-	 */
-	public function getGroupsSubAdmins(IGroup $group): array;
+    /**
+     * get SubAdmins of a group
+     * @param IGroup $group the group
+     * @return IUser[]
+     *
+     * @since 16.0.0
+     */
+    public function getGroupsSubAdmins(IGroup $group): array;
 
-	/**
-	 * checks if a user is a SubAdmin of a group
-	 * @param IUser $user
-	 * @param IGroup $group
-	 * @return bool
-	 *
-	 * @since 16.0.0
-	 */
-	public function isSubAdminOfGroup(IUser $user, IGroup $group): bool;
+    /**
+     * checks if a user is a SubAdmin of a group
+     * @param IUser $user
+     * @param IGroup $group
+     * @return bool
+     *
+     * @since 16.0.0
+     */
+    public function isSubAdminOfGroup(IUser $user, IGroup $group): bool;
 
-	/**
-	 * checks if a user is a SubAdmin
-	 * @param IUser $user
-	 * @return bool
-	 *
-	 * @since 16.0.0
-	 */
-	public function isSubAdmin(IUser $user): bool;
+    /**
+     * checks if a user is a SubAdmin
+     * @param IUser $user
+     * @return bool
+     *
+     * @since 16.0.0
+     */
+    public function isSubAdmin(IUser $user): bool;
 
-	/**
-	 * checks if a user is a accessible by a subadmin
-	 * @param IUser $subadmin
-	 * @param IUser $user
-	 * @return bool
-	 *
-	 * @since 16.0.0
-	 */
-	public function isUserAccessible(IUser $subadmin, IUser $user): bool;
+    /**
+     * checks if a user is a accessible by a subadmin
+     * @param IUser $subadmin
+     * @param IUser $user
+     * @return bool
+     *
+     * @since 16.0.0
+     */
+    public function isUserAccessible(IUser $subadmin, IUser $user): bool;
 }

apps/twofactor_backupcodes/lib/Settings/Personal.php

Indentation +3 added lines, -3 removed lines

@@ -28,8 +28,8 @@
 use OCP\Template;
 
 class Personal implements IPersonalProviderSettings {
-	public function getBody(): Template {
-		return new Template('twofactor_backupcodes', 'personal');
-	}
+    public function getBody(): Template {
+        return new Template('twofactor_backupcodes', 'personal');
+    }
 
 }

lib/private/AppFramework/Middleware/Security/ReloadExecutionMiddleware.php

Indentation +23 added lines, -23 removed lines

@@ -35,34 +35,34 @@
  * a reload but if the session variable is set we properly redirect to the login page.
  */
 class ReloadExecutionMiddleware extends Middleware {
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(ISession $session, IURLGenerator $urlGenerator) {
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(ISession $session, IURLGenerator $urlGenerator) {
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function beforeController($controller, $methodName) {
-		if ($this->session->exists('clearingExecutionContexts')) {
-			throw new ReloadExecutionException();
-		}
-	}
+    public function beforeController($controller, $methodName) {
+        if ($this->session->exists('clearingExecutionContexts')) {
+            throw new ReloadExecutionException();
+        }
+    }
 
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof ReloadExecutionException) {
-			$this->session->remove('clearingExecutionContexts');
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof ReloadExecutionException) {
+            $this->session->remove('clearingExecutionContexts');
 
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
-				'core.login.showLoginForm',
-				['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
-			));
-		}
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
+                'core.login.showLoginForm',
+                ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
+            ));
+        }
 
-		return parent::afterException($controller, $methodName, $exception);
-	}
+        return parent::afterException($controller, $methodName, $exception);
+    }
 
 
 }

lib/public/Files/SimpleFS/InMemoryFile.php

Indentation +115 added lines, -115 removed lines

@@ -32,119 +32,119 @@
  * @since 16.0.0
  */
 class InMemoryFile implements ISimpleFile {
-	/**
-	 * Holds the file name.
-	 *
-	 * @var string
-	 */
-	private $name;
-
-	/**
-	 * Holds the file contents.
-	 *
-	 * @var string
-	 */
-	private $contents;
-
-	/**
-	 * InMemoryFile constructor.
-	 *
-	 * @param string $name The file name
-	 * @param string $contents The file contents
-	 * @since 16.0.0
-	 */
-	public function __construct(string $name, string $contents) {
-		$this->name = $name;
-		$this->contents = $contents;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getSize() {
-		return strlen($this->contents);
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getETag() {
-		return '';
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getMTime() {
-		return time();
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getContent() {
-		return $this->contents;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function putContent($data) {
-		$this->contents = $data;
-	}
-
-	/**
-	 * In memory files can't be deleted.
-	 *
-	 * @since 16.0.0
-	 */
-	public function delete() {
-		// unimplemented for in memory files
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getMimeType() {
-		$fileInfo = new \finfo(FILEINFO_MIME_TYPE);
-		return $fileInfo->buffer($this->contents);
-	}
-
-	/**
-	 * Stream reading is unsupported for in memory files.
-	 *
-	 * @throws NotPermittedException
-	 * @since 16.0.0
-	 */
-	public function read() {
-		throw new NotPermittedException(
-			'Stream reading is unsupported for in memory files'
-		);
-	}
-
-	/**
-	 * Stream writing isn't available for in memory files.
-	 *
-	 * @throws NotPermittedException
-	 * @since 16.0.0
-	 */
-	public function write() {
-		throw new NotPermittedException(
-			'Stream writing is unsupported for in memory files'
-		);
-	}
+    /**
+     * Holds the file name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Holds the file contents.
+     *
+     * @var string
+     */
+    private $contents;
+
+    /**
+     * InMemoryFile constructor.
+     *
+     * @param string $name The file name
+     * @param string $contents The file contents
+     * @since 16.0.0
+     */
+    public function __construct(string $name, string $contents) {
+        $this->name = $name;
+        $this->contents = $contents;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getSize() {
+        return strlen($this->contents);
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getETag() {
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getMTime() {
+        return time();
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getContent() {
+        return $this->contents;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function putContent($data) {
+        $this->contents = $data;
+    }
+
+    /**
+     * In memory files can't be deleted.
+     *
+     * @since 16.0.0
+     */
+    public function delete() {
+        // unimplemented for in memory files
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getMimeType() {
+        $fileInfo = new \finfo(FILEINFO_MIME_TYPE);
+        return $fileInfo->buffer($this->contents);
+    }
+
+    /**
+     * Stream reading is unsupported for in memory files.
+     *
+     * @throws NotPermittedException
+     * @since 16.0.0
+     */
+    public function read() {
+        throw new NotPermittedException(
+            'Stream reading is unsupported for in memory files'
+        );
+    }
+
+    /**
+     * Stream writing isn't available for in memory files.
+     *
+     * @throws NotPermittedException
+     * @since 16.0.0
+     */
+    public function write() {
+        throw new NotPermittedException(
+            'Stream writing is unsupported for in memory files'
+        );
+    }
 }

lib/public/IAvatarManager.php

Indentation +18 added lines, -18 removed lines

@@ -34,24 +34,24 @@
 
 interface IAvatarManager {
 
-	/**
-	 * return a user specific instance of \OCP\IAvatar
-	 * @see IAvatar
-	 * @param string $user the ownCloud user id
-	 * @return IAvatar
-	 * @throws \Exception In case the username is potentially dangerous
-	 * @throws \OCP\Files\NotFoundException In case there is no user folder yet
-	 * @since 6.0.0
-	 */
-	public function getAvatar(string $user) : IAvatar;
+    /**
+     * return a user specific instance of \OCP\IAvatar
+     * @see IAvatar
+     * @param string $user the ownCloud user id
+     * @return IAvatar
+     * @throws \Exception In case the username is potentially dangerous
+     * @throws \OCP\Files\NotFoundException In case there is no user folder yet
+     * @since 6.0.0
+     */
+    public function getAvatar(string $user) : IAvatar;
 
-	/**
-	 * Returns a guest user avatar instance.
-	 *
-	 * @param string $name The guest name, e.g. "Albert".
-	 * @return IAvatar
-	 * @since 16.0.0
-	 */
-	public function getGuestAvatar(string $name): IAvatar;
+    /**
+     * Returns a guest user avatar instance.
+     *
+     * @param string $name The guest name, e.g. "Albert".
+     * @return IAvatar
+     * @since 16.0.0
+     */
+    public function getGuestAvatar(string $name): IAvatar;
 
 }

lib/private/Avatar/GuestAvatar.php

Indentation +78 added lines, -78 removed lines

@@ -30,90 +30,90 @@
  * This class represents a guest user's avatar.
  */
 class GuestAvatar extends Avatar {
-	/**
-	 * Holds the guest user display name.
-	 *
-	 * @var string
-	 */
-	private $userDisplayName;
+    /**
+     * Holds the guest user display name.
+     *
+     * @var string
+     */
+    private $userDisplayName;
 
-	/**
-	 * GuestAvatar constructor.
-	 *
-	 * @param string $userDisplayName The guest user display name
-	 * @param ILogger $logger The logger
-	 */
-	public function __construct(string $userDisplayName, ILogger $logger) {
-		parent::__construct($logger);
-		$this->userDisplayName = $userDisplayName;
-	}
+    /**
+     * GuestAvatar constructor.
+     *
+     * @param string $userDisplayName The guest user display name
+     * @param ILogger $logger The logger
+     */
+    public function __construct(string $userDisplayName, ILogger $logger) {
+        parent::__construct($logger);
+        $this->userDisplayName = $userDisplayName;
+    }
 
-	/**
-	 * Tests if the user has an avatar.
-	 *
-	 * @return true Guests always have an avatar.
-	 */
-	public function exists() {
-		return true;
-	}
+    /**
+     * Tests if the user has an avatar.
+     *
+     * @return true Guests always have an avatar.
+     */
+    public function exists() {
+        return true;
+    }
 
-	/**
-	 * Returns the guest user display name.
-	 *
-	 * @return string
-	 */
-	public function getDisplayName(): string {
-		return $this->userDisplayName;
-	}
+    /**
+     * Returns the guest user display name.
+     *
+     * @return string
+     */
+    public function getDisplayName(): string {
+        return $this->userDisplayName;
+    }
 
-	/**
-	 * Setting avatars isn't implemented for guests.
-	 *
-	 * @param \OCP\IImage|resource|string $data
-	 * @return void
-	 */
-	public function set($data) {
-		// unimplemented for guest user avatars
-	}
+    /**
+     * Setting avatars isn't implemented for guests.
+     *
+     * @param \OCP\IImage|resource|string $data
+     * @return void
+     */
+    public function set($data) {
+        // unimplemented for guest user avatars
+    }
 
-	/**
-	 * Removing avatars isn't implemented for guests.
-	 */
-	public function remove() {
-		// unimplemented for guest user avatars
-	}
+    /**
+     * Removing avatars isn't implemented for guests.
+     */
+    public function remove() {
+        // unimplemented for guest user avatars
+    }
 
-	/**
-	 * Generates an avatar for the guest.
-	 *
-	 * @param int $size The desired image size.
-	 * @return InMemoryFile
-	 */
-	public function getFile($size) {
-		$avatar = $this->generateAvatar($this->userDisplayName, $size);
-		return new InMemoryFile('avatar.png', $avatar);
-	}
+    /**
+     * Generates an avatar for the guest.
+     *
+     * @param int $size The desired image size.
+     * @return InMemoryFile
+     */
+    public function getFile($size) {
+        $avatar = $this->generateAvatar($this->userDisplayName, $size);
+        return new InMemoryFile('avatar.png', $avatar);
+    }
 
-	/**
-	 * Updates the display name if changed.
-	 *
-	 * @param string $feature The changed feature
-	 * @param mixed $oldValue The previous value
-	 * @param mixed $newValue The new value
-	 * @return void
-	 */
-	public function userChanged($feature, $oldValue, $newValue) {
-		if ($feature === 'displayName') {
-			$this->userDisplayName = $newValue;
-		}
-	}
+    /**
+     * Updates the display name if changed.
+     *
+     * @param string $feature The changed feature
+     * @param mixed $oldValue The previous value
+     * @param mixed $newValue The new value
+     * @return void
+     */
+    public function userChanged($feature, $oldValue, $newValue) {
+        if ($feature === 'displayName') {
+            $this->userDisplayName = $newValue;
+        }
+    }
 
-	/**
-	 * Guests don't have custom avatars.
-	 *
-	 * @return bool
-	 */
-	public function isCustomAvatar(): bool {
-		return false;
-	}
+    /**
+     * Guests don't have custom avatars.
+     *
+     * @return bool
+     */
+    public function isCustomAvatar(): bool {
+        return false;
+    }
 }

core/Controller/GuestAvatarController.php

Indentation +64 added lines, -64 removed lines

@@ -33,75 +33,75 @@
  */
 class GuestAvatarController extends Controller {
 
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
+    /**
+     * @var ILogger
+     */
+    private $logger;
 
-	/**
-	 * @var IAvatarManager
-	 */
-	private $avatarManager;
+    /**
+     * @var IAvatarManager
+     */
+    private $avatarManager;
 
-	/**
-	 * GuestAvatarController constructor.
-	 *
-	 * @param $appName
-	 * @param IRequest $request
-	 * @param IAvatarManager $avatarManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IAvatarManager $avatarManager,
-		ILogger $logger
-	) {
-		parent::__construct($appName, $request);
-		$this->avatarManager = $avatarManager;
-		$this->logger = $logger;
-	}
+    /**
+     * GuestAvatarController constructor.
+     *
+     * @param $appName
+     * @param IRequest $request
+     * @param IAvatarManager $avatarManager
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IAvatarManager $avatarManager,
+        ILogger $logger
+    ) {
+        parent::__construct($appName, $request);
+        $this->avatarManager = $avatarManager;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Returns a guest avatar image response.
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $guestName The guest name, e.g. "Albert"
-	 * @param string $size The desired avatar size, e.g. 64 for 64x64px
-	 * @return FileDisplayResponse|Http\Response
-	 */
-	public function getAvatar($guestName, $size) {
-		$size = (int) $size;
+    /**
+     * Returns a guest avatar image response.
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $guestName The guest name, e.g. "Albert"
+     * @param string $size The desired avatar size, e.g. 64 for 64x64px
+     * @return FileDisplayResponse|Http\Response
+     */
+    public function getAvatar($guestName, $size) {
+        $size = (int) $size;
 
-		// min/max size
-		if ($size > 2048) {
-			$size = 2048;
-		} elseif ($size <= 0) {
-			$size = 64;
-		}
+        // min/max size
+        if ($size > 2048) {
+            $size = 2048;
+        } elseif ($size <= 0) {
+            $size = 64;
+        }
 
-		try {
-			$avatar = $this->avatarManager->getGuestAvatar($guestName);
-			$avatarFile = $avatar->getFile($size);
+        try {
+            $avatar = $this->avatarManager->getGuestAvatar($guestName);
+            $avatarFile = $avatar->getFile($size);
 
-			$resp = new FileDisplayResponse(
-				$avatarFile,
-				$avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
-				['Content-Type' => $avatarFile->getMimeType()]
-			);
-		} catch (\Exception $e) {
-			$this->logger->error('error while creating guest avatar', [
-				'err' => $e,
-			]);
-			$resp = new Http\Response();
-			$resp->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
-			return $resp;
-		}
+            $resp = new FileDisplayResponse(
+                $avatarFile,
+                $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
+                ['Content-Type' => $avatarFile->getMimeType()]
+            );
+        } catch (\Exception $e) {
+            $this->logger->error('error while creating guest avatar', [
+                'err' => $e,
+            ]);
+            $resp = new Http\Response();
+            $resp->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
+            return $resp;
+        }
 
-		// Cache for 30 minutes
-		$resp->cacheFor(1800);
-		return $resp;
-	}
+        // Cache for 30 minutes
+        $resp->cacheFor(1800);
+        return $resp;
+    }
 }

apps/files_external/lib/Config/IConfigHandler.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@
  * @since 16.0.0
  */
 interface IConfigHandler {
-	/**
-	 * @param mixed $optionValue
-	 * @return mixed the same type as $optionValue
-	 * @since 16.0.0
-	 */
-	public function handle($optionValue);
+    /**
+     * @param mixed $optionValue
+     * @return mixed the same type as $optionValue
+     * @since 16.0.0
+     */
+    public function handle($optionValue);
 }