nextcloud / server

lib/private/Preview/Krita.php

Indentation +20 added lines, -20 removed lines

@@ -26,26 +26,26 @@
 use OCP\IImage;
 
 class Krita extends Bundled {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/application\/x-krita/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/application\/x-krita/';
+    }
 
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$image = $this->extractThumbnail($file, 'mergedimage.png');
-		if (($image !== null) && $image->valid()) {
-			return $image;
-		}
-		$image = $this->extractThumbnail($file, 'preview.png');
-		if (($image !== null) && $image->valid()) {
-			return $image;
-		}
-		return null;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $image = $this->extractThumbnail($file, 'mergedimage.png');
+        if (($image !== null) && $image->valid()) {
+            return $image;
+        }
+        $image = $this->extractThumbnail($file, 'preview.png');
+        if (($image !== null) && $image->valid()) {
+            return $image;
+        }
+        return null;
+    }
 }

lib/public/Files/Config/ICachedMountFileInfo.php

Indentation +12 added lines, -12 removed lines

@@ -28,17 +28,17 @@
  * @since 13.0.0
  */
 interface ICachedMountFileInfo extends ICachedMountInfo {
-	/**
-	 * Return the path for the file within the cached mount
-	 *
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getInternalPath(): string;
+    /**
+     * Return the path for the file within the cached mount
+     *
+     * @return string
+     * @since 13.0.0
+     */
+    public function getInternalPath(): string;
 
-	/**
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getPath(): string;
+    /**
+     * @return string
+     * @since 13.0.0
+     */
+    public function getPath(): string;
 }

lib/private/Group/MetaData.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	 * @param string $userSearch the pattern users are search for
 	 */
 	public function get(string $groupSearch = '', string $userSearch = ''): array {
-		$key = $groupSearch . '::' . $userSearch;
+		$key = $groupSearch.'::'.$userSearch;
 		if (isset($this->metaData[$key])) {
 			return $this->metaData[$key];
 		}

Indentation +151 added lines, -151 removed lines

@@ -13,155 +13,155 @@
 use OCP\IUserSession;
 
 class MetaData {
-	public const SORT_NONE = 0;
-	public const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
-	public const SORT_GROUPNAME = 2;
-
-	/** @var array */
-	protected $metaData = [];
-	/** @var int */
-	protected $sorting = self::SORT_NONE;
-
-	/**
-	 * @param string $user the uid of the current user
-	 * @param bool $isAdmin whether the current users is an admin
-	 */
-	public function __construct(
-		private string $user,
-		private bool $isAdmin,
-		private bool $isDelegatedAdmin,
-		private IGroupManager $groupManager,
-		private IUserSession $userSession,
-	) {
-	}
-
-	/**
-	 * returns an array with meta data about all available groups
-	 * the array is structured as follows:
-	 * [0] array containing meta data about admin groups
-	 * [1] array containing meta data about unprivileged groups
-	 * @param string $groupSearch only effective when instance was created with
-	 *                            isAdmin being true
-	 * @param string $userSearch the pattern users are search for
-	 */
-	public function get(string $groupSearch = '', string $userSearch = ''): array {
-		$key = $groupSearch . '::' . $userSearch;
-		if (isset($this->metaData[$key])) {
-			return $this->metaData[$key];
-		}
-
-		$adminGroups = [];
-		$groups = [];
-		$sortGroupsIndex = 0;
-		$sortGroupsKeys = [];
-		$sortAdminGroupsIndex = 0;
-		$sortAdminGroupsKeys = [];
-
-		foreach ($this->getGroups($groupSearch) as $group) {
-			$groupMetaData = $this->generateGroupMetaData($group, $userSearch);
-			if (strtolower($group->getGID()) !== 'admin') {
-				$this->addEntry(
-					$groups,
-					$sortGroupsKeys,
-					$sortGroupsIndex,
-					$groupMetaData);
-			} else {
-				//admin group is hard coded to 'admin' for now. In future,
-				//backends may define admin groups too. Then the if statement
-				//has to be adjusted accordingly.
-				$this->addEntry(
-					$adminGroups,
-					$sortAdminGroupsKeys,
-					$sortAdminGroupsIndex,
-					$groupMetaData);
-			}
-		}
-
-		//whether sorting is necessary is will be checked in sort()
-		$this->sort($groups, $sortGroupsKeys);
-		$this->sort($adminGroups, $sortAdminGroupsKeys);
-
-		$this->metaData[$key] = [$adminGroups, $groups];
-		return $this->metaData[$key];
-	}
-
-	/**
-	 * sets the sort mode, see SORT_* constants for supported modes
-	 */
-	public function setSorting(int $sortMode): void {
-		switch ($sortMode) {
-			case self::SORT_USERCOUNT:
-			case self::SORT_GROUPNAME:
-				$this->sorting = $sortMode;
-				break;
-
-			default:
-				$this->sorting = self::SORT_NONE;
-		}
-	}
-
-	/**
-	 * adds an group entry to the resulting array
-	 * @param array $entries the resulting array, by reference
-	 * @param array $sortKeys the sort key array, by reference
-	 * @param int $sortIndex the sort key index, by reference
-	 * @param array $data the group's meta data as returned by generateGroupMetaData()
-	 */
-	private function addEntry(array &$entries, array &$sortKeys, int &$sortIndex, array $data): void {
-		$entries[] = $data;
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			$sortKeys[$sortIndex] = $data['usercount'];
-			$sortIndex++;
-		} elseif ($this->sorting === self::SORT_GROUPNAME) {
-			$sortKeys[$sortIndex] = $data['name'];
-			$sortIndex++;
-		}
-	}
-
-	/**
-	 * creates an array containing the group meta data
-	 * @return array with the keys 'id', 'name', 'usercount' and 'disabled'
-	 */
-	private function generateGroupMetaData(IGroup $group, string $userSearch): array {
-		return [
-			'id' => $group->getGID(),
-			'name' => $group->getDisplayName(),
-			'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
-			'disabled' => $group->countDisabled(),
-			'canAdd' => $group->canAddUser(),
-			'canRemove' => $group->canRemoveUser(),
-		];
-	}
-
-	/**
-	 * sorts the result array, if applicable
-	 * @param array $entries the result array, by reference
-	 * @param array $sortKeys the array containing the sort keys
-	 */
-	private function sort(array &$entries, array $sortKeys): void {
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			array_multisort($sortKeys, SORT_DESC, $entries);
-		} elseif ($this->sorting === self::SORT_GROUPNAME) {
-			array_multisort($sortKeys, SORT_ASC, $entries);
-		}
-	}
-
-	/**
-	 * returns the available groups
-	 * @return IGroup[]
-	 */
-	public function getGroups(string $search = ''): array {
-		if ($this->isAdmin || $this->isDelegatedAdmin) {
-			return $this->groupManager->search($search);
-		} else {
-			$userObject = $this->userSession->getUser();
-			if ($userObject !== null && $this->groupManager instanceof GroupManager) {
-				$groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
-			} else {
-				$groups = [];
-			}
-
-			return $groups;
-		}
-	}
+    public const SORT_NONE = 0;
+    public const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
+    public const SORT_GROUPNAME = 2;
+
+    /** @var array */
+    protected $metaData = [];
+    /** @var int */
+    protected $sorting = self::SORT_NONE;
+
+    /**
+     * @param string $user the uid of the current user
+     * @param bool $isAdmin whether the current users is an admin
+     */
+    public function __construct(
+        private string $user,
+        private bool $isAdmin,
+        private bool $isDelegatedAdmin,
+        private IGroupManager $groupManager,
+        private IUserSession $userSession,
+    ) {
+    }
+
+    /**
+     * returns an array with meta data about all available groups
+     * the array is structured as follows:
+     * [0] array containing meta data about admin groups
+     * [1] array containing meta data about unprivileged groups
+     * @param string $groupSearch only effective when instance was created with
+     *                            isAdmin being true
+     * @param string $userSearch the pattern users are search for
+     */
+    public function get(string $groupSearch = '', string $userSearch = ''): array {
+        $key = $groupSearch . '::' . $userSearch;
+        if (isset($this->metaData[$key])) {
+            return $this->metaData[$key];
+        }
+
+        $adminGroups = [];
+        $groups = [];
+        $sortGroupsIndex = 0;
+        $sortGroupsKeys = [];
+        $sortAdminGroupsIndex = 0;
+        $sortAdminGroupsKeys = [];
+
+        foreach ($this->getGroups($groupSearch) as $group) {
+            $groupMetaData = $this->generateGroupMetaData($group, $userSearch);
+            if (strtolower($group->getGID()) !== 'admin') {
+                $this->addEntry(
+                    $groups,
+                    $sortGroupsKeys,
+                    $sortGroupsIndex,
+                    $groupMetaData);
+            } else {
+                //admin group is hard coded to 'admin' for now. In future,
+                //backends may define admin groups too. Then the if statement
+                //has to be adjusted accordingly.
+                $this->addEntry(
+                    $adminGroups,
+                    $sortAdminGroupsKeys,
+                    $sortAdminGroupsIndex,
+                    $groupMetaData);
+            }
+        }
+
+        //whether sorting is necessary is will be checked in sort()
+        $this->sort($groups, $sortGroupsKeys);
+        $this->sort($adminGroups, $sortAdminGroupsKeys);
+
+        $this->metaData[$key] = [$adminGroups, $groups];
+        return $this->metaData[$key];
+    }
+
+    /**
+     * sets the sort mode, see SORT_* constants for supported modes
+     */
+    public function setSorting(int $sortMode): void {
+        switch ($sortMode) {
+            case self::SORT_USERCOUNT:
+            case self::SORT_GROUPNAME:
+                $this->sorting = $sortMode;
+                break;
+
+            default:
+                $this->sorting = self::SORT_NONE;
+        }
+    }
+
+    /**
+     * adds an group entry to the resulting array
+     * @param array $entries the resulting array, by reference
+     * @param array $sortKeys the sort key array, by reference
+     * @param int $sortIndex the sort key index, by reference
+     * @param array $data the group's meta data as returned by generateGroupMetaData()
+     */
+    private function addEntry(array &$entries, array &$sortKeys, int &$sortIndex, array $data): void {
+        $entries[] = $data;
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            $sortKeys[$sortIndex] = $data['usercount'];
+            $sortIndex++;
+        } elseif ($this->sorting === self::SORT_GROUPNAME) {
+            $sortKeys[$sortIndex] = $data['name'];
+            $sortIndex++;
+        }
+    }
+
+    /**
+     * creates an array containing the group meta data
+     * @return array with the keys 'id', 'name', 'usercount' and 'disabled'
+     */
+    private function generateGroupMetaData(IGroup $group, string $userSearch): array {
+        return [
+            'id' => $group->getGID(),
+            'name' => $group->getDisplayName(),
+            'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
+            'disabled' => $group->countDisabled(),
+            'canAdd' => $group->canAddUser(),
+            'canRemove' => $group->canRemoveUser(),
+        ];
+    }
+
+    /**
+     * sorts the result array, if applicable
+     * @param array $entries the result array, by reference
+     * @param array $sortKeys the array containing the sort keys
+     */
+    private function sort(array &$entries, array $sortKeys): void {
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            array_multisort($sortKeys, SORT_DESC, $entries);
+        } elseif ($this->sorting === self::SORT_GROUPNAME) {
+            array_multisort($sortKeys, SORT_ASC, $entries);
+        }
+    }
+
+    /**
+     * returns the available groups
+     * @return IGroup[]
+     */
+    public function getGroups(string $search = ''): array {
+        if ($this->isAdmin || $this->isDelegatedAdmin) {
+            return $this->groupManager->search($search);
+        } else {
+            $userObject = $this->userSession->getUser();
+            if ($userObject !== null && $this->groupManager instanceof GroupManager) {
+                $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
+            } else {
+                $groups = [];
+            }
+
+            return $groups;
+        }
+    }
 }

apps/admin_audit/lib/AuditLogger.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		$logFile = $config->getSystemValueString('logfile_audit', '');
 
 		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
 			// Legacy way was appconfig, now it's paralleled with the normal log config
 			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
 		}

Indentation +52 added lines, -52 removed lines

@@ -18,56 +18,56 @@
  */
 class AuditLogger implements IAuditLogger {
 
-	private LoggerInterface $parentLogger;
-
-	public function __construct(ILogFactory $logFactory, IConfig $config) {
-		$auditType = $config->getSystemValueString('log_type_audit', 'file');
-		$defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
-		$auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
-		$logFile = $config->getSystemValueString('logfile_audit', '');
-
-		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-			// Legacy way was appconfig, now it's paralleled with the normal log config
-			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-		}
-
-		$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
-	}
-
-	public function emergency($message, array $context = []): void {
-		$this->parentLogger->emergency($message, $context);
-	}
-
-	public function alert($message, array $context = []): void {
-		$this->parentLogger->alert($message, $context);
-	}
-
-	public function critical($message, array $context = []): void {
-		$this->parentLogger->critical($message, $context);
-	}
-
-	public function error($message, array $context = []): void {
-		$this->parentLogger->error($message, $context);
-	}
-
-	public function warning($message, array $context = []): void {
-		$this->parentLogger->warning($message, $context);
-	}
-
-	public function notice($message, array $context = []): void {
-		$this->parentLogger->notice($message, $context);
-	}
-
-	public function info($message, array $context = []): void {
-		$this->parentLogger->info($message, $context);
-	}
-
-	public function debug($message, array $context = []): void {
-		$this->parentLogger->debug($message, $context);
-	}
-
-	public function log($level, $message, array $context = []): void {
-		$this->parentLogger->log($level, $message, $context);
-	}
+    private LoggerInterface $parentLogger;
+
+    public function __construct(ILogFactory $logFactory, IConfig $config) {
+        $auditType = $config->getSystemValueString('log_type_audit', 'file');
+        $defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
+        $auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
+        $logFile = $config->getSystemValueString('logfile_audit', '');
+
+        if ($auditType === 'file' && !$logFile) {
+            $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+            // Legacy way was appconfig, now it's paralleled with the normal log config
+            $logFile = $config->getAppValue('admin_audit', 'logfile', $default);
+        }
+
+        $this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
+    }
+
+    public function emergency($message, array $context = []): void {
+        $this->parentLogger->emergency($message, $context);
+    }
+
+    public function alert($message, array $context = []): void {
+        $this->parentLogger->alert($message, $context);
+    }
+
+    public function critical($message, array $context = []): void {
+        $this->parentLogger->critical($message, $context);
+    }
+
+    public function error($message, array $context = []): void {
+        $this->parentLogger->error($message, $context);
+    }
+
+    public function warning($message, array $context = []): void {
+        $this->parentLogger->warning($message, $context);
+    }
+
+    public function notice($message, array $context = []): void {
+        $this->parentLogger->notice($message, $context);
+    }
+
+    public function info($message, array $context = []): void {
+        $this->parentLogger->info($message, $context);
+    }
+
+    public function debug($message, array $context = []): void {
+        $this->parentLogger->debug($message, $context);
+    }
+
+    public function log($level, $message, array $context = []): void {
+        $this->parentLogger->log($level, $message, $context);
+    }
 }

core/Migrations/Version24000Date20211222112246.php

Indentation +59 added lines, -59 removed lines

@@ -33,66 +33,66 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211222112246 extends SimpleMigrationStep {
-	private const TABLE_NAME = 'reactions';
+    private const TABLE_NAME = 'reactions';
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$action = false;
-		$comments = $schema->getTable('comments');
-		if (!$comments->hasColumn('reactions')) {
-			$comments->addColumn('reactions', Types::STRING, [
-				'notnull' => false,
-				'length' => 4000,
-			]);
-			$action = true;
-		}
+        $action = false;
+        $comments = $schema->getTable('comments');
+        if (!$comments->hasColumn('reactions')) {
+            $comments->addColumn('reactions', Types::STRING, [
+                'notnull' => false,
+                'length' => 4000,
+            ]);
+            $action = true;
+        }
 
-		if (!$schema->hasTable(self::TABLE_NAME)) {
-			$table = $schema->createTable(self::TABLE_NAME);
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('parent_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('message_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('actor_type', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('actor_id', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('reaction', Types::STRING, [
-				'notnull' => true,
-				'length' => 32,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['reaction'], 'comment_reaction');
-			$table->addIndex(['parent_id'], 'comment_reaction_parent_id');
-			$table->addUniqueIndex(['parent_id', 'actor_type', 'actor_id', 'reaction'], 'comment_reaction_unique');
-			$action = true;
-		}
-		return $action ? $schema : null;
-	}
+        if (!$schema->hasTable(self::TABLE_NAME)) {
+            $table = $schema->createTable(self::TABLE_NAME);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('parent_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('message_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('actor_type', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('actor_id', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('reaction', Types::STRING, [
+                'notnull' => true,
+                'length' => 32,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['reaction'], 'comment_reaction');
+            $table->addIndex(['parent_id'], 'comment_reaction_parent_id');
+            $table->addUniqueIndex(['parent_id', 'actor_type', 'actor_id', 'reaction'], 'comment_reaction_unique');
+            $action = true;
+        }
+        return $action ? $schema : null;
+    }
 }

lib/private/Profile/TProfileHelper.php

Indentation +7 added lines, -7 removed lines

@@ -29,11 +29,11 @@
 use OCP\IConfig;
 
 trait TProfileHelper {
-	protected function isProfileEnabledByDefault(IConfig $config): ?bool {
-		return filter_var(
-			$config->getAppValue('settings', 'profile_enabled_by_default', '1'),
-			FILTER_VALIDATE_BOOLEAN,
-			FILTER_NULL_ON_FAILURE,
-		);
-	}
+    protected function isProfileEnabledByDefault(IConfig $config): ?bool {
+        return filter_var(
+            $config->getAppValue('settings', 'profile_enabled_by_default', '1'),
+            FILTER_VALIDATE_BOOLEAN,
+            FILTER_NULL_ON_FAILURE,
+        );
+    }
 }

apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php

Spacing +2 added lines, -2 removed lines

@@ -89,11 +89,11 @@
 			return;
 		}
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
+		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function() {
 			return $this->jsDataService;
 		});
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
+		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function() use ($user) {
 			return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
 		});
 

Indentation +42 added lines, -42 removed lines

@@ -23,53 +23,53 @@
 /** @template-implements IEventListener<BeforeTemplateRenderedEvent> */
 class BeforeTemplateRenderedListener implements IEventListener {
 
-	/** @var ProfileManager */
-	private $profileManager;
+    /** @var ProfileManager */
+    private $profileManager;
 
-	/**
-	 * BeforeTemplateRenderedListener constructor.
-	 *
-	 * @param ProfileManager $profileManager
-	 * @param IUserSession $userSession
-	 * @param IInitialStateService $initialState
-	 * @param JSDataService $jsDataService
-	 */
-	public function __construct(
-		ProfileManager $profileManager,
-		private IUserSession $userSession,
-		private IInitialStateService $initialState,
-		private JSDataService $jsDataService,
-	) {
-		$this->profileManager = $profileManager;
-	}
+    /**
+     * BeforeTemplateRenderedListener constructor.
+     *
+     * @param ProfileManager $profileManager
+     * @param IUserSession $userSession
+     * @param IInitialStateService $initialState
+     * @param JSDataService $jsDataService
+     */
+    public function __construct(
+        ProfileManager $profileManager,
+        private IUserSession $userSession,
+        private IInitialStateService $initialState,
+        private JSDataService $jsDataService,
+    ) {
+        $this->profileManager = $profileManager;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function handle(Event $event): void {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return;
-		}
+    /**
+     * @inheritDoc
+     */
+    public function handle(Event $event): void {
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return;
+        }
 
-		if (!($event instanceof BeforeTemplateRenderedEvent)) {
-			// Unrelated
-			return;
-		}
+        if (!($event instanceof BeforeTemplateRenderedEvent)) {
+            // Unrelated
+            return;
+        }
 
-		if (!$event->isLoggedIn() || $event->getResponse()->getRenderAs() !== TemplateResponse::RENDER_AS_USER) {
-			return;
-		}
+        if (!$event->isLoggedIn() || $event->getResponse()->getRenderAs() !== TemplateResponse::RENDER_AS_USER) {
+            return;
+        }
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
-			return $this->jsDataService;
-		});
+        $this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
+            return $this->jsDataService;
+        });
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
-			return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
-		});
+        $this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
+            return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
+        });
 
-		Util::addScript('user_status', 'menu');
-		Util::addStyle('user_status', 'user-status-menu');
-	}
+        Util::addScript('user_status', 'menu');
+        Util::addStyle('user_status', 'user-status-menu');
+    }
 }

lib/public/IRequestId.php

Indentation +8 added lines, -8 removed lines

@@ -28,12 +28,12 @@
  * @since 24.0.0
  */
 interface IRequestId {
-	/**
-	 * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
-	 * If `mod_unique_id` is installed this value will be taken.
-	 *
-	 * @return string
-	 * @since 24.0.0
-	 */
-	public function getId(): string;
+    /**
+     * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
+     * If `mod_unique_id` is installed this value will be taken.
+     *
+     * @return string
+     * @since 24.0.0
+     */
+    public function getId(): string;
 }

apps/settings/lib/Controller/AuthSettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
 		}
 
 		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
+			$name = mb_substr($name, 0, 120).'…';
 		}
 
 		$token = $this->generateRandomDeviceToken();
@@ -246,7 +246,7 @@ 
 		}
 
 		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
+			$name = mb_substr($name, 0, 120).'…';
 		}
 
 		if ($token instanceof INamedToken && $name !== $currentName) {

Indentation +250 added lines, -250 removed lines

@@ -32,254 +32,254 @@
 use Psr\Log\LoggerInterface;
 
 class AuthSettingsController extends Controller {
-	/** @var IProvider */
-	private $tokenProvider;
-
-	/** @var RemoteWipe */
-	private $remoteWipe;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IProvider $tokenProvider
-	 * @param ISession $session
-	 * @param ISecureRandom $random
-	 * @param string|null $userId
-	 * @param IUserSession $userSession
-	 * @param IManager $activityManager
-	 * @param RemoteWipe $remoteWipe
-	 * @param LoggerInterface $logger
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IProvider $tokenProvider,
-		private ISession $session,
-		private ISecureRandom $random,
-		private ?string $userId,
-		private IUserSession $userSession,
-		private IManager $activityManager,
-		RemoteWipe $remoteWipe,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-		$this->tokenProvider = $tokenProvider;
-		$this->remoteWipe = $remoteWipe;
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $name
-	 * @return JSONResponse
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	public function create($name) {
-		if ($this->checkAppToken()) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-		if ($this->userSession->getImpersonatingUserID() !== null) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-			$loginName = $sessionToken->getLoginName();
-			try {
-				$password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
-			} catch (PasswordlessTokenException $ex) {
-				$password = null;
-			}
-		} catch (InvalidTokenException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
-		}
-
-		$token = $this->generateRandomDeviceToken();
-		$deviceToken = $this->tokenProvider->generateToken($token, $this->userId, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
-		$tokenData = $deviceToken->jsonSerialize();
-		$tokenData['canDelete'] = true;
-		$tokenData['canRename'] = true;
-
-		$this->publishActivity(Provider::APP_TOKEN_CREATED, $deviceToken->getId(), ['name' => $deviceToken->getName()]);
-
-		return new JSONResponse([
-			'token' => $token,
-			'loginName' => $loginName,
-			'deviceToken' => $tokenData,
-		]);
-	}
-
-	/**
-	 * @return JSONResponse
-	 */
-	private function getServiceNotAvailableResponse() {
-		$resp = new JSONResponse();
-		$resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
-		return $resp;
-	}
-
-	/**
-	 * Return a 25 digit device password
-	 *
-	 * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
-	 *
-	 * @return string
-	 */
-	private function generateRandomDeviceToken() {
-		$groups = [];
-		for ($i = 0; $i < 5; $i++) {
-			$groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
-		}
-		return implode('-', $groups);
-	}
-
-	private function checkAppToken(): bool {
-		return $this->session->exists('app_password');
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param int $id
-	 * @return array|JSONResponse
-	 */
-	#[NoAdminRequired]
-	public function destroy($id) {
-		if ($this->checkAppToken()) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (WipeTokenException $e) {
-			//continue as we can destroy tokens in wipe
-			$token = $e->getToken();
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$this->tokenProvider->invalidateTokenById($this->userId, $token->getId());
-		$this->publishActivity(Provider::APP_TOKEN_DELETED, $token->getId(), ['name' => $token->getName()]);
-		return [];
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param int $id
-	 * @param array $scope
-	 * @param string $name
-	 * @return array|JSONResponse
-	 */
-	#[NoAdminRequired]
-	public function update($id, array $scope, string $name) {
-		if ($this->checkAppToken()) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$currentName = $token->getName();
-
-		if ($scope !== $token->getScopeAsArray()) {
-			$token->setScope([IToken::SCOPE_FILESYSTEM => $scope[IToken::SCOPE_FILESYSTEM]]);
-			$this->publishActivity($scope[IToken::SCOPE_FILESYSTEM] ? Provider::APP_TOKEN_FILESYSTEM_GRANTED : Provider::APP_TOKEN_FILESYSTEM_REVOKED, $token->getId(), ['name' => $currentName]);
-		}
-
-		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
-		}
-
-		if ($token instanceof INamedToken && $name !== $currentName) {
-			$token->setName($name);
-			$this->publishActivity(Provider::APP_TOKEN_RENAMED, $token->getId(), ['name' => $currentName, 'newName' => $name]);
-		}
-
-		$this->tokenProvider->updateToken($token);
-		return [];
-	}
-
-	/**
-	 * @param string $subject
-	 * @param int $id
-	 * @param array $parameters
-	 */
-	private function publishActivity(string $subject, int $id, array $parameters = []): void {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('security')
-			->setAffectedUser($this->userId)
-			->setAuthor($this->userId)
-			->setSubject($subject, $parameters)
-			->setObject('app_token', $id, 'App Password');
-
-		try {
-			$this->activityManager->publish($event);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('could not publish activity', ['exception' => $e]);
-		}
-	}
-
-	/**
-	 * Find a token by given id and check if uid for current session belongs to this token
-	 *
-	 * @param int $id
-	 * @return IToken
-	 * @throws InvalidTokenException
-	 */
-	private function findTokenByIdAndUser(int $id): IToken {
-		try {
-			$token = $this->tokenProvider->getTokenById($id);
-		} catch (ExpiredTokenException $e) {
-			$token = $e->getToken();
-		}
-		if ($token->getUID() !== $this->userId) {
-			/** @psalm-suppress DeprecatedClass We have to throw the OC version so both OC and OCP catches catch it */
-			throw new OcInvalidTokenException('This token does not belong to you!');
-		}
-		return $token;
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param int $id
-	 * @return JSONResponse
-	 * @throws InvalidTokenException
-	 * @throws ExpiredTokenException
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	public function wipe(int $id): JSONResponse {
-		if ($this->checkAppToken()) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if (!$this->remoteWipe->markTokenForWipe($token)) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		return new JSONResponse([]);
-	}
+    /** @var IProvider */
+    private $tokenProvider;
+
+    /** @var RemoteWipe */
+    private $remoteWipe;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IProvider $tokenProvider
+     * @param ISession $session
+     * @param ISecureRandom $random
+     * @param string|null $userId
+     * @param IUserSession $userSession
+     * @param IManager $activityManager
+     * @param RemoteWipe $remoteWipe
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IProvider $tokenProvider,
+        private ISession $session,
+        private ISecureRandom $random,
+        private ?string $userId,
+        private IUserSession $userSession,
+        private IManager $activityManager,
+        RemoteWipe $remoteWipe,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+        $this->tokenProvider = $tokenProvider;
+        $this->remoteWipe = $remoteWipe;
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param string $name
+     * @return JSONResponse
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    public function create($name) {
+        if ($this->checkAppToken()) {
+            return $this->getServiceNotAvailableResponse();
+        }
+
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
+        if ($this->userSession->getImpersonatingUserID() !== null) {
+            return $this->getServiceNotAvailableResponse();
+        }
+
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+            $loginName = $sessionToken->getLoginName();
+            try {
+                $password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
+            } catch (PasswordlessTokenException $ex) {
+                $password = null;
+            }
+        } catch (InvalidTokenException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
+
+        if (mb_strlen($name) > 128) {
+            $name = mb_substr($name, 0, 120) . '…';
+        }
+
+        $token = $this->generateRandomDeviceToken();
+        $deviceToken = $this->tokenProvider->generateToken($token, $this->userId, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+        $tokenData = $deviceToken->jsonSerialize();
+        $tokenData['canDelete'] = true;
+        $tokenData['canRename'] = true;
+
+        $this->publishActivity(Provider::APP_TOKEN_CREATED, $deviceToken->getId(), ['name' => $deviceToken->getName()]);
+
+        return new JSONResponse([
+            'token' => $token,
+            'loginName' => $loginName,
+            'deviceToken' => $tokenData,
+        ]);
+    }
+
+    /**
+     * @return JSONResponse
+     */
+    private function getServiceNotAvailableResponse() {
+        $resp = new JSONResponse();
+        $resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
+        return $resp;
+    }
+
+    /**
+     * Return a 25 digit device password
+     *
+     * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
+     *
+     * @return string
+     */
+    private function generateRandomDeviceToken() {
+        $groups = [];
+        for ($i = 0; $i < 5; $i++) {
+            $groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
+        }
+        return implode('-', $groups);
+    }
+
+    private function checkAppToken(): bool {
+        return $this->session->exists('app_password');
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param int $id
+     * @return array|JSONResponse
+     */
+    #[NoAdminRequired]
+    public function destroy($id) {
+        if ($this->checkAppToken()) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (WipeTokenException $e) {
+            //continue as we can destroy tokens in wipe
+            $token = $e->getToken();
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $this->tokenProvider->invalidateTokenById($this->userId, $token->getId());
+        $this->publishActivity(Provider::APP_TOKEN_DELETED, $token->getId(), ['name' => $token->getName()]);
+        return [];
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param int $id
+     * @param array $scope
+     * @param string $name
+     * @return array|JSONResponse
+     */
+    #[NoAdminRequired]
+    public function update($id, array $scope, string $name) {
+        if ($this->checkAppToken()) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $currentName = $token->getName();
+
+        if ($scope !== $token->getScopeAsArray()) {
+            $token->setScope([IToken::SCOPE_FILESYSTEM => $scope[IToken::SCOPE_FILESYSTEM]]);
+            $this->publishActivity($scope[IToken::SCOPE_FILESYSTEM] ? Provider::APP_TOKEN_FILESYSTEM_GRANTED : Provider::APP_TOKEN_FILESYSTEM_REVOKED, $token->getId(), ['name' => $currentName]);
+        }
+
+        if (mb_strlen($name) > 128) {
+            $name = mb_substr($name, 0, 120) . '…';
+        }
+
+        if ($token instanceof INamedToken && $name !== $currentName) {
+            $token->setName($name);
+            $this->publishActivity(Provider::APP_TOKEN_RENAMED, $token->getId(), ['name' => $currentName, 'newName' => $name]);
+        }
+
+        $this->tokenProvider->updateToken($token);
+        return [];
+    }
+
+    /**
+     * @param string $subject
+     * @param int $id
+     * @param array $parameters
+     */
+    private function publishActivity(string $subject, int $id, array $parameters = []): void {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('security')
+            ->setAffectedUser($this->userId)
+            ->setAuthor($this->userId)
+            ->setSubject($subject, $parameters)
+            ->setObject('app_token', $id, 'App Password');
+
+        try {
+            $this->activityManager->publish($event);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('could not publish activity', ['exception' => $e]);
+        }
+    }
+
+    /**
+     * Find a token by given id and check if uid for current session belongs to this token
+     *
+     * @param int $id
+     * @return IToken
+     * @throws InvalidTokenException
+     */
+    private function findTokenByIdAndUser(int $id): IToken {
+        try {
+            $token = $this->tokenProvider->getTokenById($id);
+        } catch (ExpiredTokenException $e) {
+            $token = $e->getToken();
+        }
+        if ($token->getUID() !== $this->userId) {
+            /** @psalm-suppress DeprecatedClass We have to throw the OC version so both OC and OCP catches catch it */
+            throw new OcInvalidTokenException('This token does not belong to you!');
+        }
+        return $token;
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param int $id
+     * @return JSONResponse
+     * @throws InvalidTokenException
+     * @throws ExpiredTokenException
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    public function wipe(int $id): JSONResponse {
+        if ($this->checkAppToken()) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if (!$this->remoteWipe->markTokenForWipe($token)) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        return new JSONResponse([]);
+    }
 }