nextcloud / server

lib/public/Collaboration/Reference/IReferenceProvider.php

Indentation +29 added lines, -29 removed lines

@@ -28,36 +28,36 @@
  * @since 25.0.0
  */
 interface IReferenceProvider {
-	/**
-	 * Validate that a given reference identifier matches the current provider
-	 *
-	 * @since 25.0.0
-	 */
-	public function matchReference(string $referenceText): bool;
+    /**
+     * Validate that a given reference identifier matches the current provider
+     *
+     * @since 25.0.0
+     */
+    public function matchReference(string $referenceText): bool;
 
-	/**
-	 * Return a reference with its metadata for a given reference identifier
-	 *
-	 * @since 25.0.0
-	 */
-	public function resolveReference(string $referenceText): ?IReference;
+    /**
+     * Return a reference with its metadata for a given reference identifier
+     *
+     * @since 25.0.0
+     */
+    public function resolveReference(string $referenceText): ?IReference;
 
-	/**
-	 * Return true if the reference metadata can be globally cached
-	 *
-	 * @since 25.0.0
-	 */
-	public function getCachePrefix(string $referenceId): string;
+    /**
+     * Return true if the reference metadata can be globally cached
+     *
+     * @since 25.0.0
+     */
+    public function getCachePrefix(string $referenceId): string;
 
-	/**
-	 * Return a custom cache key to be used for caching the metadata
-	 * This could be for example the current user id if the reference
-	 * access permissions are different for each user
-	 *
-	 * Should return null, if the cache is only related to the
-	 * reference id and has no further dependency
-	 *
-	 * @since 25.0.0
-	 */
-	public function getCacheKey(string $referenceId): ?string;
+    /**
+     * Return a custom cache key to be used for caching the metadata
+     * This could be for example the current user id if the reference
+     * access permissions are different for each user
+     *
+     * Should return null, if the cache is only related to the
+     * reference id and has no further dependency
+     *
+     * @since 25.0.0
+     */
+    public function getCacheKey(string $referenceId): ?string;
 }

apps/settings/templates/settings/personal/security/password.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  */
 
 if ($_['passwordChangeSupported']) {
-	\OCP\Util::addScript('settings', 'vue-settings-personal-password');
+    \OCP\Util::addScript('settings', 'vue-settings-personal-password');
 }
 ?>
 <div id="security-password"></div>

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: float, 1: float, 2: float} [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: float, 1: float, 2: float} [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;
+    }
 }