nextcloud / server

lib/private/Files/Stream/HashWrapper.php

Indentation +47 added lines, -47 removed lines

@@ -28,58 +28,58 @@
 use Icewind\Streams\Wrapper;
 
 class HashWrapper extends Wrapper {
-	protected $callback;
-	protected $hash;
+    protected $callback;
+    protected $hash;
 
-	public static function wrap($source, string $algo, callable $callback) {
-		$hash = hash_init($algo);
-		$context = stream_context_create([
-			'hash' => [
-				'source' => $source,
-				'callback' => $callback,
-				'hash' => $hash,
-			],
-		]);
-		return Wrapper::wrapSource($source, $context, 'hash', self::class);
-	}
+    public static function wrap($source, string $algo, callable $callback) {
+        $hash = hash_init($algo);
+        $context = stream_context_create([
+            'hash' => [
+                'source' => $source,
+                'callback' => $callback,
+                'hash' => $hash,
+            ],
+        ]);
+        return Wrapper::wrapSource($source, $context, 'hash', self::class);
+    }
 
-	protected function open() {
-		$context = $this->loadContext('hash');
+    protected function open() {
+        $context = $this->loadContext('hash');
 
-		$this->callback = $context['callback'];
-		$this->hash = $context['hash'];
-		return true;
-	}
+        $this->callback = $context['callback'];
+        $this->hash = $context['hash'];
+        return true;
+    }
 
-	public function dir_opendir($path, $options) {
-		return $this->open();
-	}
+    public function dir_opendir($path, $options) {
+        return $this->open();
+    }
 
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		return $this->open();
-	}
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        return $this->open();
+    }
 
-	public function stream_read($count) {
-		$result = parent::stream_read($count);
-		hash_update($this->hash, $result);
-		return $result;
-	}
+    public function stream_read($count) {
+        $result = parent::stream_read($count);
+        hash_update($this->hash, $result);
+        return $result;
+    }
 
-	public function stream_close() {
-		if (is_callable($this->callback)) {
-			// if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream
-			if ($this->hash instanceof \HashContext) {
-				try {
-					$hash = @hash_final($this->hash);
-					if ($hash) {
-						call_user_func($this->callback, $hash);
-					}
-				} catch (\Throwable $e) {
-				}
-			}
-			// prevent further calls by potential PHP 7 GC ghosts
-			$this->callback = null;
-		}
-		return parent::stream_close();
-	}
+    public function stream_close() {
+        if (is_callable($this->callback)) {
+            // if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream
+            if ($this->hash instanceof \HashContext) {
+                try {
+                    $hash = @hash_final($this->hash);
+                    if ($hash) {
+                        call_user_func($this->callback, $hash);
+                    }
+                } catch (\Throwable $e) {
+                }
+            }
+            // prevent further calls by potential PHP 7 GC ghosts
+            $this->callback = null;
+        }
+        return parent::stream_close();
+    }
 }

lib/public/Color.php

Spacing +3 added lines, -3 removed lines

@@ -133,9 +133,9 @@
 	 */
 	public function alphaBlending(float $opacity, Color $source): Color {
 		return new Color(
-			(int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
-			(int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
-			(int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
+			(int) ((1 - $opacity) * $source->red() + $opacity * $this->red()),
+			(int) ((1 - $opacity) * $source->green() + $opacity * $this->green()),
+			(int) ((1 - $opacity) * $source->blue() + $opacity * $this->blue())
 		);
 	}
 

Indentation +114 added lines, -114 removed lines

@@ -10,129 +10,129 @@
  * @since 25.0.0
  */
 class Color {
-	private int $r;
-	private int $g;
-	private int $b;
+    private int $r;
+    private int $g;
+    private int $b;
 
-	/**
-	 * @since 25.0.0
-	 */
-	public function __construct($r, $g, $b) {
-		$this->r = $r;
-		$this->g = $g;
-		$this->b = $b;
-	}
+    /**
+     * @since 25.0.0
+     */
+    public function __construct($r, $g, $b) {
+        $this->r = $r;
+        $this->g = $g;
+        $this->b = $b;
+    }
 
-	/**
-	 * Returns the red color component of this color as an int from 0 to 255
-	 *
-	 * @since 25.0.0
-	 */
-	public function red(): int {
-		return $this->r;
-	}
+    /**
+     * Returns the red color component of this color as an int from 0 to 255
+     *
+     * @since 25.0.0
+     */
+    public function red(): int {
+        return $this->r;
+    }
 
-	/**
-	 * Returns the red color component of this color as a float from 0 to 1
-	 *
-	 * @since 25.0.0
-	 */
-	public function redF(): float {
-		return $this->r / 255;
-	}
+    /**
+     * Returns the red color component of this color as a float from 0 to 1
+     *
+     * @since 25.0.0
+     */
+    public function redF(): float {
+        return $this->r / 255;
+    }
 
-	/**
-	 * Returns the green color component of this color as an int from 0 to 255
-	 *
-	 * @since 25.0.0
-	 */
-	public function green(): int {
-		return $this->g;
-	}
+    /**
+     * Returns the green color component of this color as an int from 0 to 255
+     *
+     * @since 25.0.0
+     */
+    public function green(): int {
+        return $this->g;
+    }
 
-	/**
-	 * Returns the green color component of this color as a float from 0 to 1
-	 *
-	 * @since 25.0.0
-	 */
-	public function greenF(): float {
-		return $this->g / 255;
-	}
+    /**
+     * Returns the green color component of this color as a float from 0 to 1
+     *
+     * @since 25.0.0
+     */
+    public function greenF(): float {
+        return $this->g / 255;
+    }
 
-	/**
-	 * Returns the green blue component of this color as an int from 0 to 255
-	 *
-	 * @since 25.0.0
-	 */
-	public function blue(): int {
-		return $this->b;
-	}
+    /**
+     * Returns the green blue component of this color as an int from 0 to 255
+     *
+     * @since 25.0.0
+     */
+    public function blue(): int {
+        return $this->b;
+    }
 
-	/**
-	 * Returns the blue color component of this color as a float from 0 to 1
-	 *
-	 * @since 25.0.0
-	 */
-	public function blueF(): float {
-		return $this->g / 255;
-	}
+    /**
+     * Returns the blue color component of this color as a float from 0 to 1
+     *
+     * @since 25.0.0
+     */
+    public function blueF(): float {
+        return $this->g / 255;
+    }
 
-	/**
-	 * Returns the name of the color in the format "#RRGGBB"; i.e. a "#" character followed by three two-digit hexadecimal numbers.
-	 *
-	 * @since 25.0.0
-	 */
-	public function name(): string {
-		return sprintf('#%02x%02x%02x', $this->r, $this->g, $this->b);
-	}
+    /**
+     * Returns the name of the color in the format "#RRGGBB"; i.e. a "#" character followed by three two-digit hexadecimal numbers.
+     *
+     * @since 25.0.0
+     */
+    public function name(): string {
+        return sprintf('#%02x%02x%02x', $this->r, $this->g, $this->b);
+    }
 
-	/**
-	 * Mix two colors
-	 *
-	 * @param int $steps the number of intermediate colors that should be generated for the palette
-	 * @param Color $color1 the first color
-	 * @param Color $color2 the second color
-	 * @return list<Color>
-	 * @since 25.0.0
-	 */
-	public static function mixPalette(int $steps, Color $color1, Color $color2): array {
-		$palette = [$color1];
-		$step = self::stepCalc($steps, [$color1, $color2]);
-		for ($i = 1; $i < $steps; $i++) {
-			$r = intval($color1->red() + ($step[0] * $i));
-			$g = intval($color1->green() + ($step[1] * $i));
-			$b = intval($color1->blue() + ($step[2] * $i));
-			$palette[] = new Color($r, $g, $b);
-		}
-		return $palette;
-	}
+    /**
+     * Mix two colors
+     *
+     * @param int $steps the number of intermediate colors that should be generated for the palette
+     * @param Color $color1 the first color
+     * @param Color $color2 the second color
+     * @return list<Color>
+     * @since 25.0.0
+     */
+    public static function mixPalette(int $steps, Color $color1, Color $color2): array {
+        $palette = [$color1];
+        $step = self::stepCalc($steps, [$color1, $color2]);
+        for ($i = 1; $i < $steps; $i++) {
+            $r = intval($color1->red() + ($step[0] * $i));
+            $g = intval($color1->green() + ($step[1] * $i));
+            $b = intval($color1->blue() + ($step[2] * $i));
+            $palette[] = new Color($r, $g, $b);
+        }
+        return $palette;
+    }
 
-	/**
-	 * Alpha blend another color with a given opacity to this color
-	 *
-	 * @return Color The new color
-	 * @since 25.0.0
-	 */
-	public function alphaBlending(float $opacity, Color $source): Color {
-		return new Color(
-			(int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
-			(int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
-			(int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
-		);
-	}
+    /**
+     * Alpha blend another color with a given opacity to this color
+     *
+     * @return Color The new color
+     * @since 25.0.0
+     */
+    public function alphaBlending(float $opacity, Color $source): Color {
+        return new Color(
+            (int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
+            (int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
+            (int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
+        );
+    }
 
-	/**
-	 * Calculate steps between two Colors
-	 * @param int $steps start color
-	 * @param Color[] $ends end color
-	 * @return array{0: int, 1: int, 2: int} [r,g,b] steps for each color to go from $steps to $ends
-	 * @since 25.0.0
-	 */
-	private static function stepCalc(int $steps, array $ends): array {
-		$step = [];
-		$step[0] = ($ends[1]->red() - $ends[0]->red()) / $steps;
-		$step[1] = ($ends[1]->green() - $ends[0]->green()) / $steps;
-		$step[2] = ($ends[1]->blue() - $ends[0]->blue()) / $steps;
-		return $step;
-	}
+    /**
+     * Calculate steps between two Colors
+     * @param int $steps start color
+     * @param Color[] $ends end color
+     * @return array{0: int, 1: int, 2: int} [r,g,b] steps for each color to go from $steps to $ends
+     * @since 25.0.0
+     */
+    private static function stepCalc(int $steps, array $ends): array {
+        $step = [];
+        $step[0] = ($ends[1]->red() - $ends[0]->red()) / $steps;
+        $step[1] = ($ends[1]->green() - $ends[0]->green()) / $steps;
+        $step[2] = ($ends[1]->blue() - $ends[0]->blue()) / $steps;
+        return $step;
+    }
 }

lib/private/Avatar/PlaceholderAvatar.php

Spacing +3 added lines, -3 removed lines

@@ -112,9 +112,9 @@ 
 		$ext = 'png';
 
 		if ($size === -1) {
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $ext;
+			$path = 'avatar-placeholder'.($darkTheme ? '-dark' : '').'.'.$ext;
 		} else {
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $size . '.' . $ext;
+			$path = 'avatar-placeholder'.($darkTheme ? '-dark' : '').'.'.$size.'.'.$ext;
 		}
 
 		try {
@@ -132,7 +132,7 @@ 
 				$file = $this->folder->newFile($path);
 				$file->putContent($data);
 			} catch (NotPermittedException $e) {
-				$this->logger->error('Failed to save avatar placeholder for ' . $this->user->getUID());
+				$this->logger->error('Failed to save avatar placeholder for '.$this->user->getUID());
 				throw new NotFoundException();
 			}
 		}

Indentation +105 added lines, -105 removed lines

@@ -24,109 +24,109 @@
  * for faster retrieval, unlike the GuestAvatar.
  */
 class PlaceholderAvatar extends Avatar {
-	public function __construct(
-		private ISimpleFolder $folder,
-		private User $user,
-		LoggerInterface $logger,
-	) {
-		parent::__construct($logger);
-	}
-
-	/**
-	 * Check if an avatar exists for the user
-	 */
-	public function exists(): bool {
-		return true;
-	}
-
-	/**
-	 * Sets the users avatar.
-	 *
-	 * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
-	 * @throws \Exception if the provided file is not a jpg or png image
-	 * @throws \Exception if the provided image is not valid
-	 * @throws NotSquareException if the image is not square
-	 */
-	public function set($data): void {
-		// unimplemented for placeholder avatars
-	}
-
-	/**
-	 * Removes the users avatar.
-	 */
-	public function remove(bool $silent = false): void {
-		$avatars = $this->folder->getDirectoryListing();
-
-		foreach ($avatars as $avatar) {
-			$avatar->delete();
-		}
-	}
-
-	/**
-	 * Returns the avatar for an user.
-	 *
-	 * If there is no avatar file yet, one is generated.
-	 *
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function getFile(int $size, bool $darkTheme = false): ISimpleFile {
-		$ext = 'png';
-
-		if ($size === -1) {
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $ext;
-		} else {
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $size . '.' . $ext;
-		}
-
-		try {
-			$file = $this->folder->getFile($path);
-		} catch (NotFoundException $e) {
-			if ($size <= 0) {
-				throw new NotFoundException;
-			}
-
-			if (!$data = $this->generateAvatarFromSvg($size, $darkTheme)) {
-				$data = $this->generateAvatar($this->getDisplayName(), $size, $darkTheme);
-			}
-
-			try {
-				$file = $this->folder->newFile($path);
-				$file->putContent($data);
-			} catch (NotPermittedException $e) {
-				$this->logger->error('Failed to save avatar placeholder for ' . $this->user->getUID());
-				throw new NotFoundException();
-			}
-		}
-
-		return $file;
-	}
-
-	/**
-	 * Returns the user display name.
-	 */
-	public function getDisplayName(): string {
-		return $this->user->getDisplayName();
-	}
-
-	/**
-	 * Handles user changes.
-	 *
-	 * @param string $feature The changed feature
-	 * @param mixed $oldValue The previous value
-	 * @param mixed $newValue The new value
-	 * @throws NotPermittedException
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function userChanged(string $feature, $oldValue, $newValue): void {
-		$this->remove();
-	}
-
-	/**
-	 * Check if the avatar of a user is a custom uploaded one
-	 */
-	public function isCustomAvatar(): bool {
-		return false;
-	}
+    public function __construct(
+        private ISimpleFolder $folder,
+        private User $user,
+        LoggerInterface $logger,
+    ) {
+        parent::__construct($logger);
+    }
+
+    /**
+     * Check if an avatar exists for the user
+     */
+    public function exists(): bool {
+        return true;
+    }
+
+    /**
+     * Sets the users avatar.
+     *
+     * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
+     * @throws \Exception if the provided file is not a jpg or png image
+     * @throws \Exception if the provided image is not valid
+     * @throws NotSquareException if the image is not square
+     */
+    public function set($data): void {
+        // unimplemented for placeholder avatars
+    }
+
+    /**
+     * Removes the users avatar.
+     */
+    public function remove(bool $silent = false): void {
+        $avatars = $this->folder->getDirectoryListing();
+
+        foreach ($avatars as $avatar) {
+            $avatar->delete();
+        }
+    }
+
+    /**
+     * Returns the avatar for an user.
+     *
+     * If there is no avatar file yet, one is generated.
+     *
+     * @throws NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function getFile(int $size, bool $darkTheme = false): ISimpleFile {
+        $ext = 'png';
+
+        if ($size === -1) {
+            $path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $ext;
+        } else {
+            $path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $size . '.' . $ext;
+        }
+
+        try {
+            $file = $this->folder->getFile($path);
+        } catch (NotFoundException $e) {
+            if ($size <= 0) {
+                throw new NotFoundException;
+            }
+
+            if (!$data = $this->generateAvatarFromSvg($size, $darkTheme)) {
+                $data = $this->generateAvatar($this->getDisplayName(), $size, $darkTheme);
+            }
+
+            try {
+                $file = $this->folder->newFile($path);
+                $file->putContent($data);
+            } catch (NotPermittedException $e) {
+                $this->logger->error('Failed to save avatar placeholder for ' . $this->user->getUID());
+                throw new NotFoundException();
+            }
+        }
+
+        return $file;
+    }
+
+    /**
+     * Returns the user display name.
+     */
+    public function getDisplayName(): string {
+        return $this->user->getDisplayName();
+    }
+
+    /**
+     * Handles user changes.
+     *
+     * @param string $feature The changed feature
+     * @param mixed $oldValue The previous value
+     * @param mixed $newValue The new value
+     * @throws NotPermittedException
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function userChanged(string $feature, $oldValue, $newValue): void {
+        $this->remove();
+    }
+
+    /**
+     * Check if the avatar of a user is a custom uploaded one
+     */
+    public function isCustomAvatar(): bool {
+        return false;
+    }
 }

lib/public/Profile/BeforeTemplateRenderedEvent.php

Indentation +14 added lines, -14 removed lines

@@ -34,21 +34,21 @@
  * @since 25.0.0
  */
 class BeforeTemplateRenderedEvent extends Event {
-	private string $userId;
+    private string $userId;
 
-	/**
-	 * @since 25.0.0
-	 */
-	public function __construct(string $userId) {
-		parent::__construct();
+    /**
+     * @since 25.0.0
+     */
+    public function __construct(string $userId) {
+        parent::__construct();
 
-		$this->userId = $userId;
-	}
+        $this->userId = $userId;
+    }
 
-	/**
-	 * @since 25.0.0
-	 */
-	public function getUserId(): string {
-		return $this->userId;
-	}
+    /**
+     * @since 25.0.0
+     */
+    public function getUserId(): string {
+        return $this->userId;
+    }
 }

apps/settings/templates/settings/personal/personal.info.php

Indentation +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'templates',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
-	'vue-settings-personal-info',
+    'usersettings',
+    'templates',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
+    'vue-settings-personal-info',
 ]);
 ?>
 <?php if (!$_['isFairUseOfFreePushService']) : ?>

Braces +5 added lines, -2 removed lines

@@ -53,11 +53,14 @@
 		<div class="personal-settings-setting-box personal-settings-setting-box-detail">
 			<div id="vue-details-section"></div>
 		</div>
-	<?php else: ?>
+	<?php else {
+    : ?>
 		<div class="personal-settings-setting-box personal-settings-setting-box-detail--without-profile">
 			<div id="vue-details-section"></div>
 		</div>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 	<div class="personal-settings-setting-box">
 		<div id="vue-displayname-section"></div>
 	</div>

lib/public/Dashboard/IOptionWidget.php

Indentation +5 added lines, -5 removed lines

@@ -30,9 +30,9 @@
  * @since 25.0.0
  */
 interface IOptionWidget extends IWidget {
-	/**
-	 * Get additional options for the widget
-	 * @since 25.0.0
-	 */
-	public function getWidgetOptions(): WidgetOptions;
+    /**
+     * Get additional options for the widget
+     * @since 25.0.0
+     */
+    public function getWidgetOptions(): WidgetOptions;
 }

lib/public/Dashboard/Model/WidgetOptions.php

Indentation +26 added lines, -26 removed lines

@@ -29,33 +29,33 @@
  * @since 25.0.0
  */
 class WidgetOptions {
-	private bool $roundItemIcons;
+    private bool $roundItemIcons;
 
-	/**
-	 * @param bool $roundItemIcons
-	 * @since 25.0.0
-	 */
-	public function __construct(bool $roundItemIcons) {
-		$this->roundItemIcons = $roundItemIcons;
-	}
+    /**
+     * @param bool $roundItemIcons
+     * @since 25.0.0
+     */
+    public function __construct(bool $roundItemIcons) {
+        $this->roundItemIcons = $roundItemIcons;
+    }
 
-	/**
-	 * Get the default set of options
-	 *
-	 * @return WidgetOptions
-	 * @since 25.0.0
-	 */
-	public static function getDefault(): WidgetOptions {
-		return new WidgetOptions(false);
-	}
+    /**
+     * Get the default set of options
+     *
+     * @return WidgetOptions
+     * @since 25.0.0
+     */
+    public static function getDefault(): WidgetOptions {
+        return new WidgetOptions(false);
+    }
 
-	/**
-	 * Whether the clients should render icons for widget items as round icons
-	 *
-	 * @return bool
-	 * @since 25.0.0
-	 */
-	public function withRoundItemIcons(): bool {
-		return $this->roundItemIcons;
-	}
+    /**
+     * Whether the clients should render icons for widget items as round icons
+     *
+     * @return bool
+     * @since 25.0.0
+     */
+    public function withRoundItemIcons(): bool {
+        return $this->roundItemIcons;
+    }
 }

apps/settings/lib/Settings/Personal/PersonalInfo.php

Spacing +4 added lines, -4 removed lines

@@ -234,7 +234,7 @@ 
 	 */
 	private function getGroups(IUser $user): array {
 		$groups = array_map(
-			static function (IGroup $group) {
+			static function(IGroup $group) {
 				return $group->getDisplayName();
 			},
 			$this->groupManager->getUserGroups($user)
@@ -257,7 +257,7 @@ 
 		];
 
 		$additionalEmails = array_map(
-			function (IAccountProperty $property) {
+			function(IAccountProperty $property) {
 				return [
 					'name' => $property->getName(),
 					'value' => $property->getValue(),
@@ -272,7 +272,7 @@ 
 		$emailMap = [
 			'primaryEmail' => $systemEmail,
 			'additionalEmails' => $additionalEmails,
-			'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
+			'notificationEmail' => (string) $account->getUser()->getPrimaryEMailAddress(),
 		];
 
 		return $emailMap;
@@ -366,7 +366,7 @@ 
 				default:
 					$message = $this->l->t('Verify');
 			}
-			$messageParameters[$property . 'Message'] = $message;
+			$messageParameters[$property.'Message'] = $message;
 		}
 		return $messageParameters;
 	}

Indentation +283 added lines, -283 removed lines

@@ -33,287 +33,287 @@
 
 class PersonalInfo implements ISettings {
 
-	/** @var ProfileManager */
-	private $profileManager;
-
-	public function __construct(
-		private IConfig $config,
-		private IUserManager $userManager,
-		private IGroupManager $groupManager,
-		private IAccountManager $accountManager,
-		ProfileManager $profileManager,
-		private IAppManager $appManager,
-		private IFactory $l10nFactory,
-		private IL10N $l,
-		private IInitialState $initialStateService,
-		private IManager $manager,
-	) {
-		$this->profileManager = $profileManager;
-	}
-
-	public function getForm(): TemplateResponse {
-		$federationEnabled = $this->appManager->isEnabledForUser('federation');
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
-		$lookupServerUploadEnabled = false;
-		if ($federatedFileSharingEnabled) {
-			/** @var FederatedShareProvider $shareProvider */
-			$shareProvider = Server::get(FederatedShareProvider::class);
-			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
-		}
-
-		$uid = \OC_User::getUser();
-		$user = $this->userManager->get($uid);
-		$account = $this->accountManager->getAccount($user);
-
-		// make sure FS is setup before querying storage related stuff...
-		\OC_Util::setupFS($user->getUID());
-
-		$storageInfo = \OC_Helper::getStorageInfo('/');
-		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l->t('Unlimited');
-		} else {
-			$totalSpace = Util::humanFileSize($storageInfo['total']);
-		}
-
-		$messageParameters = $this->getMessageParameters($account);
-
-		$parameters = [
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-			'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
-			'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
-		] + $messageParameters;
-
-		$personalInfoParameters = [
-			'userId' => $uid,
-			'avatar' => $this->getProperty($account, IAccountManager::PROPERTY_AVATAR),
-			'groups' => $this->getGroups($user),
-			'quota' => $storageInfo['quota'],
-			'totalSpace' => $totalSpace,
-			'usage' => Util::humanFileSize($storageInfo['used']),
-			'usageRelative' => round($storageInfo['relative']),
-			'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
-			'emailMap' => $this->getEmailMap($account),
-			'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
-			'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
-			'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
-			'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
-			'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
-			'fediverse' => $this->getProperty($account, IAccountManager::PROPERTY_FEDIVERSE),
-			'languageMap' => $this->getLanguageMap($user),
-			'localeMap' => $this->getLocaleMap($user),
-			'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
-			'profileEnabled' => $this->profileManager->isProfileEnabled($user),
-			'organisation' => $this->getProperty($account, IAccountManager::PROPERTY_ORGANISATION),
-			'role' => $this->getProperty($account, IAccountManager::PROPERTY_ROLE),
-			'headline' => $this->getProperty($account, IAccountManager::PROPERTY_HEADLINE),
-			'biography' => $this->getProperty($account, IAccountManager::PROPERTY_BIOGRAPHY),
-			'birthdate' => $this->getProperty($account, IAccountManager::PROPERTY_BIRTHDATE),
-			'firstDayOfWeek' => $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK),
-			'pronouns' => $this->getProperty($account, IAccountManager::PROPERTY_PRONOUNS),
-		];
-
-		$accountParameters = [
-			'avatarChangeSupported' => $user->canChangeAvatar(),
-			'displayNameChangeSupported' => $user->canChangeDisplayName(),
-			'emailChangeSupported' => $user->canChangeEmail(),
-			'federationEnabled' => $federationEnabled,
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-		];
-
-		$profileParameters = [
-			'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user),
-		];
-
-		$this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled());
-		$this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters);
-		$this->initialStateService->provideInitialState('accountParameters', $accountParameters);
-		$this->initialStateService->provideInitialState('profileParameters', $profileParameters);
-
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
-	}
-
-	/**
-	 * Check if is fair use of free push service
-	 * @return boolean
-	 */
-	private function isFairUseOfFreePushService(): bool {
-		return $this->manager->isFairUseOfFreePushService();
-	}
-
-	/**
-	 * returns the property data in an
-	 * associative array
-	 */
-	private function getProperty(IAccount $account, string $property): array {
-		$property = [
-			'name' => $account->getProperty($property)->getName(),
-			'value' => $account->getProperty($property)->getValue(),
-			'scope' => $account->getProperty($property)->getScope(),
-			'verified' => $account->getProperty($property)->getVerified(),
-		];
-
-		return $property;
-	}
-
-	/**
-	 * returns the section ID string, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection(): string {
-		return 'personal-info';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority(): int {
-		return 10;
-	}
-
-	/**
-	 * returns a sorted list of the user's group GIDs
-	 */
-	private function getGroups(IUser $user): array {
-		$groups = array_map(
-			static function (IGroup $group) {
-				return $group->getDisplayName();
-			},
-			$this->groupManager->getUserGroups($user)
-		);
-		sort($groups);
-
-		return $groups;
-	}
-
-	/**
-	 * returns the primary email and additional emails in an
-	 * associative array
-	 */
-	private function getEmailMap(IAccount $account): array {
-		$systemEmail = [
-			'name' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getName(),
-			'value' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
-			'scope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
-			'verified' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
-		];
-
-		$additionalEmails = array_map(
-			function (IAccountProperty $property) {
-				return [
-					'name' => $property->getName(),
-					'value' => $property->getValue(),
-					'scope' => $property->getScope(),
-					'verified' => $property->getVerified(),
-					'locallyVerified' => $property->getLocallyVerified(),
-				];
-			},
-			$account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties(),
-		);
-
-		$emailMap = [
-			'primaryEmail' => $systemEmail,
-			'additionalEmails' => $additionalEmails,
-			'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
-		];
-
-		return $emailMap;
-	}
-
-	/**
-	 * returns the user's active language, common languages, and other languages in an
-	 * associative array
-	 */
-	private function getLanguageMap(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_language', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$languages = $this->l10nFactory->getLanguages();
-
-		// associate the user language with the proper array
-		$userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
-		$userLang = $languages['commonLanguages'][$userLangIndex];
-		// search in the other languages
-		if ($userLangIndex === false) {
-			$userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'));
-			$userLang = $languages['otherLanguages'][$userLangIndex];
-		}
-		// if user language is not available but set somehow: show the actual code as name
-		if (!is_array($userLang)) {
-			$userLang = [
-				'code' => $userConfLang,
-				'name' => $userConfLang,
-			];
-		}
-
-		return array_merge(
-			['activeLanguage' => $userLang],
-			$languages
-		);
-	}
-
-	private function getLocaleMap(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_locale', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));
-		$localeCodes = $this->l10nFactory->findAvailableLocales();
-		$userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);
-
-		if (!empty($userLocale)) {
-			$userLocale = reset($userLocale);
-		}
-
-		$localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => str_starts_with($localeCode['code'], $userLang)));
-		$otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => !str_starts_with($localeCode['code'], $userLang)));
-
-		if (!$userLocale) {
-			$userLocale = [
-				'code' => 'en',
-				'name' => 'English'
-			];
-		}
-
-		return [
-			'activeLocaleLang' => $userLocaleString,
-			'activeLocale' => $userLocale,
-			'localesForLanguage' => $localesForLanguage,
-			'otherLocales' => $otherLocales,
-		];
-	}
-
-	/**
-	 * returns the message parameters
-	 */
-	private function getMessageParameters(IAccount $account): array {
-		$needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
-		$messageParameters = [];
-		foreach ($needVerifyMessage as $property) {
-			switch ($account->getProperty($property)->getVerified()) {
-				case IAccountManager::VERIFIED:
-					$message = $this->l->t('Verifying');
-					break;
-				case IAccountManager::VERIFICATION_IN_PROGRESS:
-					$message = $this->l->t('Verifying …');
-					break;
-				default:
-					$message = $this->l->t('Verify');
-			}
-			$messageParameters[$property . 'Message'] = $message;
-		}
-		return $messageParameters;
-	}
+    /** @var ProfileManager */
+    private $profileManager;
+
+    public function __construct(
+        private IConfig $config,
+        private IUserManager $userManager,
+        private IGroupManager $groupManager,
+        private IAccountManager $accountManager,
+        ProfileManager $profileManager,
+        private IAppManager $appManager,
+        private IFactory $l10nFactory,
+        private IL10N $l,
+        private IInitialState $initialStateService,
+        private IManager $manager,
+    ) {
+        $this->profileManager = $profileManager;
+    }
+
+    public function getForm(): TemplateResponse {
+        $federationEnabled = $this->appManager->isEnabledForUser('federation');
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
+        $lookupServerUploadEnabled = false;
+        if ($federatedFileSharingEnabled) {
+            /** @var FederatedShareProvider $shareProvider */
+            $shareProvider = Server::get(FederatedShareProvider::class);
+            $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
+        }
+
+        $uid = \OC_User::getUser();
+        $user = $this->userManager->get($uid);
+        $account = $this->accountManager->getAccount($user);
+
+        // make sure FS is setup before querying storage related stuff...
+        \OC_Util::setupFS($user->getUID());
+
+        $storageInfo = \OC_Helper::getStorageInfo('/');
+        if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l->t('Unlimited');
+        } else {
+            $totalSpace = Util::humanFileSize($storageInfo['total']);
+        }
+
+        $messageParameters = $this->getMessageParameters($account);
+
+        $parameters = [
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+            'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
+            'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
+        ] + $messageParameters;
+
+        $personalInfoParameters = [
+            'userId' => $uid,
+            'avatar' => $this->getProperty($account, IAccountManager::PROPERTY_AVATAR),
+            'groups' => $this->getGroups($user),
+            'quota' => $storageInfo['quota'],
+            'totalSpace' => $totalSpace,
+            'usage' => Util::humanFileSize($storageInfo['used']),
+            'usageRelative' => round($storageInfo['relative']),
+            'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
+            'emailMap' => $this->getEmailMap($account),
+            'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
+            'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
+            'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
+            'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
+            'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
+            'fediverse' => $this->getProperty($account, IAccountManager::PROPERTY_FEDIVERSE),
+            'languageMap' => $this->getLanguageMap($user),
+            'localeMap' => $this->getLocaleMap($user),
+            'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
+            'profileEnabled' => $this->profileManager->isProfileEnabled($user),
+            'organisation' => $this->getProperty($account, IAccountManager::PROPERTY_ORGANISATION),
+            'role' => $this->getProperty($account, IAccountManager::PROPERTY_ROLE),
+            'headline' => $this->getProperty($account, IAccountManager::PROPERTY_HEADLINE),
+            'biography' => $this->getProperty($account, IAccountManager::PROPERTY_BIOGRAPHY),
+            'birthdate' => $this->getProperty($account, IAccountManager::PROPERTY_BIRTHDATE),
+            'firstDayOfWeek' => $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK),
+            'pronouns' => $this->getProperty($account, IAccountManager::PROPERTY_PRONOUNS),
+        ];
+
+        $accountParameters = [
+            'avatarChangeSupported' => $user->canChangeAvatar(),
+            'displayNameChangeSupported' => $user->canChangeDisplayName(),
+            'emailChangeSupported' => $user->canChangeEmail(),
+            'federationEnabled' => $federationEnabled,
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+        ];
+
+        $profileParameters = [
+            'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user),
+        ];
+
+        $this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled());
+        $this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters);
+        $this->initialStateService->provideInitialState('accountParameters', $accountParameters);
+        $this->initialStateService->provideInitialState('profileParameters', $profileParameters);
+
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
+    }
+
+    /**
+     * Check if is fair use of free push service
+     * @return boolean
+     */
+    private function isFairUseOfFreePushService(): bool {
+        return $this->manager->isFairUseOfFreePushService();
+    }
+
+    /**
+     * returns the property data in an
+     * associative array
+     */
+    private function getProperty(IAccount $account, string $property): array {
+        $property = [
+            'name' => $account->getProperty($property)->getName(),
+            'value' => $account->getProperty($property)->getValue(),
+            'scope' => $account->getProperty($property)->getScope(),
+            'verified' => $account->getProperty($property)->getVerified(),
+        ];
+
+        return $property;
+    }
+
+    /**
+     * returns the section ID string, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection(): string {
+        return 'personal-info';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority(): int {
+        return 10;
+    }
+
+    /**
+     * returns a sorted list of the user's group GIDs
+     */
+    private function getGroups(IUser $user): array {
+        $groups = array_map(
+            static function (IGroup $group) {
+                return $group->getDisplayName();
+            },
+            $this->groupManager->getUserGroups($user)
+        );
+        sort($groups);
+
+        return $groups;
+    }
+
+    /**
+     * returns the primary email and additional emails in an
+     * associative array
+     */
+    private function getEmailMap(IAccount $account): array {
+        $systemEmail = [
+            'name' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getName(),
+            'value' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
+            'scope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
+            'verified' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
+        ];
+
+        $additionalEmails = array_map(
+            function (IAccountProperty $property) {
+                return [
+                    'name' => $property->getName(),
+                    'value' => $property->getValue(),
+                    'scope' => $property->getScope(),
+                    'verified' => $property->getVerified(),
+                    'locallyVerified' => $property->getLocallyVerified(),
+                ];
+            },
+            $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties(),
+        );
+
+        $emailMap = [
+            'primaryEmail' => $systemEmail,
+            'additionalEmails' => $additionalEmails,
+            'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
+        ];
+
+        return $emailMap;
+    }
+
+    /**
+     * returns the user's active language, common languages, and other languages in an
+     * associative array
+     */
+    private function getLanguageMap(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_language', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $languages = $this->l10nFactory->getLanguages();
+
+        // associate the user language with the proper array
+        $userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
+        $userLang = $languages['commonLanguages'][$userLangIndex];
+        // search in the other languages
+        if ($userLangIndex === false) {
+            $userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'));
+            $userLang = $languages['otherLanguages'][$userLangIndex];
+        }
+        // if user language is not available but set somehow: show the actual code as name
+        if (!is_array($userLang)) {
+            $userLang = [
+                'code' => $userConfLang,
+                'name' => $userConfLang,
+            ];
+        }
+
+        return array_merge(
+            ['activeLanguage' => $userLang],
+            $languages
+        );
+    }
+
+    private function getLocaleMap(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_locale', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));
+        $localeCodes = $this->l10nFactory->findAvailableLocales();
+        $userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);
+
+        if (!empty($userLocale)) {
+            $userLocale = reset($userLocale);
+        }
+
+        $localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => str_starts_with($localeCode['code'], $userLang)));
+        $otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => !str_starts_with($localeCode['code'], $userLang)));
+
+        if (!$userLocale) {
+            $userLocale = [
+                'code' => 'en',
+                'name' => 'English'
+            ];
+        }
+
+        return [
+            'activeLocaleLang' => $userLocaleString,
+            'activeLocale' => $userLocale,
+            'localesForLanguage' => $localesForLanguage,
+            'otherLocales' => $otherLocales,
+        ];
+    }
+
+    /**
+     * returns the message parameters
+     */
+    private function getMessageParameters(IAccount $account): array {
+        $needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
+        $messageParameters = [];
+        foreach ($needVerifyMessage as $property) {
+            switch ($account->getProperty($property)->getVerified()) {
+                case IAccountManager::VERIFIED:
+                    $message = $this->l->t('Verifying');
+                    break;
+                case IAccountManager::VERIFICATION_IN_PROGRESS:
+                    $message = $this->l->t('Verifying …');
+                    break;
+                default:
+                    $message = $this->l->t('Verify');
+            }
+            $messageParameters[$property . 'Message'] = $message;
+        }
+        return $messageParameters;
+    }
 }

lib/private/User/Listeners/BeforeUserDeletedListener.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 			// no avatar to remove
 		} catch (\Exception $e) {
 			// Ignore exceptions
-			$this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
+			$this->logger->info('Could not cleanup avatar of '.$user->getUID(), [
 				'exception' => $e,
 			]);
 		}

Indentation +32 added lines, -32 removed lines

@@ -20,36 +20,36 @@
  * @template-implements IEventListener<BeforeUserDeletedEvent>
  */
 class BeforeUserDeletedListener implements IEventListener {
-	private IAvatarManager $avatarManager;
-	private ICredentialsManager $credentialsManager;
-	private LoggerInterface $logger;
-
-	public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager, ICredentialsManager $credentialsManager) {
-		$this->avatarManager = $avatarManager;
-		$this->credentialsManager = $credentialsManager;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof BeforeUserDeletedEvent)) {
-			return;
-		}
-
-		$user = $event->getUser();
-
-		// Delete avatar on user deletion
-		try {
-			$avatar = $this->avatarManager->getAvatar($user->getUID());
-			$avatar->remove(true);
-		} catch (NotFoundException $e) {
-			// no avatar to remove
-		} catch (\Exception $e) {
-			// Ignore exceptions
-			$this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
-				'exception' => $e,
-			]);
-		}
-		// Delete storages credentials on user deletion
-		$this->credentialsManager->erase($user->getUID());
-	}
+    private IAvatarManager $avatarManager;
+    private ICredentialsManager $credentialsManager;
+    private LoggerInterface $logger;
+
+    public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager, ICredentialsManager $credentialsManager) {
+        $this->avatarManager = $avatarManager;
+        $this->credentialsManager = $credentialsManager;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof BeforeUserDeletedEvent)) {
+            return;
+        }
+
+        $user = $event->getUser();
+
+        // Delete avatar on user deletion
+        try {
+            $avatar = $this->avatarManager->getAvatar($user->getUID());
+            $avatar->remove(true);
+        } catch (NotFoundException $e) {
+            // no avatar to remove
+        } catch (\Exception $e) {
+            // Ignore exceptions
+            $this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
+                'exception' => $e,
+            ]);
+        }
+        // Delete storages credentials on user deletion
+        $this->credentialsManager->erase($user->getUID());
+    }
 }