nextcloud / server

lib/public/IAvatarManager.php

Indentation +18 added lines, -18 removed lines

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

core/Controller/GuestAvatarController.php

Indentation +64 added lines, -64 removed lines

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

apps/files_external/lib/Config/IConfigHandler.php

Indentation +6 added lines, -6 removed lines

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

apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php

Indentation +36 added lines, -36 removed lines

@@ -28,47 +28,47 @@
 
 class GenerateBirthdayCalendarBackgroundJob extends QueuedJob {
 
-	/** @var BirthdayService */
-	private $birthdayService;
+    /** @var BirthdayService */
+    private $birthdayService;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * GenerateAllBirthdayCalendarsBackgroundJob constructor.
-	 *
-	 * @param BirthdayService $birthdayService
-	 * @param IConfig $config
-	 */
-	public function __construct(BirthdayService $birthdayService,
-								IConfig $config) {
-		$this->birthdayService = $birthdayService;
-		$this->config = $config;
-	}
+    /**
+     * GenerateAllBirthdayCalendarsBackgroundJob constructor.
+     *
+     * @param BirthdayService $birthdayService
+     * @param IConfig $config
+     */
+    public function __construct(BirthdayService $birthdayService,
+                                IConfig $config) {
+        $this->birthdayService = $birthdayService;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param array $arguments
-	 */
-	public function run($arguments) {
-		$userId = $arguments['userId'];
-		$purgeBeforeGenerating = $arguments['purgeBeforeGenerating'] ?? false;
+    /**
+     * @param array $arguments
+     */
+    public function run($arguments) {
+        $userId = $arguments['userId'];
+        $purgeBeforeGenerating = $arguments['purgeBeforeGenerating'] ?? false;
 
-		// make sure admin didn't change his mind
-		$isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
-		if ($isGloballyEnabled !== 'yes') {
-			return;
-		}
+        // make sure admin didn't change his mind
+        $isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+        if ($isGloballyEnabled !== 'yes') {
+            return;
+        }
 
-		// did the user opt out?
-		$isUserEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-		if ($isUserEnabled !== 'yes') {
-			return;
-		}
+        // did the user opt out?
+        $isUserEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+        if ($isUserEnabled !== 'yes') {
+            return;
+        }
 
-		if ($purgeBeforeGenerating) {
-			$this->birthdayService->resetForUser($userId);
-		}
+        if ($purgeBeforeGenerating) {
+            $this->birthdayService->resetForUser($userId);
+        }
 
-		$this->birthdayService->syncUser($userId);
-	}
+        $this->birthdayService->syncUser($userId);
+    }
 }

apps/cloud_federation_api/lib/Capabilities.php

Indentation +31 added lines, -31 removed lines

@@ -28,38 +28,38 @@
 
 class Capabilities implements ICapability {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IURLGenerator $urlGenerator) {
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(IURLGenerator $urlGenerator) {
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
-		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
-		$capabilities = ['ocm' =>
-			[
-				'enabled' => true,
-				'apiVersion' => '1.0-proposal1',
-				'endPoint' => substr($url, 0, strrpos($url, '/')),
-				'resourceTypes' => [
-					[
-						'name' => 'file',
-						'shareTypes' => ['user', 'group'],
-						'protocols' => [
-							'webdav' => '/public.php/webdav/',
-						]
-					],
-				]
-			]
-		];
+    /**
+     * Function an app uses to return the capabilities
+     *
+     * @return array Array containing the apps capabilities
+     * @since 8.2.0
+     */
+    public function getCapabilities() {
+        $url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
+        $capabilities = ['ocm' =>
+            [
+                'enabled' => true,
+                'apiVersion' => '1.0-proposal1',
+                'endPoint' => substr($url, 0, strrpos($url, '/')),
+                'resourceTypes' => [
+                    [
+                        'name' => 'file',
+                        'shareTypes' => ['user', 'group'],
+                        'protocols' => [
+                            'webdav' => '/public.php/webdav/',
+                        ]
+                    ],
+                ]
+            ]
+        ];
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 }

lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php

Indentation +11 added lines, -11 removed lines

@@ -31,19 +31,19 @@
 
 class AddClenupLoginFlowV2BackgroundJob implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Add background job to cleanup login flow v2 tokens';
-	}
+    public function getName(): string {
+        return 'Add background job to cleanup login flow v2 tokens';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(CleanupLoginFlowV2::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(CleanupLoginFlowV2::class);
+    }
 
 }

core/Data/LoginFlowV2Credentials.php

Indentation +36 added lines, -36 removed lines

@@ -25,47 +25,47 @@
 namespace OC\Core\Data;
 
 class LoginFlowV2Credentials implements \JsonSerializable {
-	/** @var string */
-	private $server;
-	/** @var string */
-	private $loginName;
-	/** @var string */
-	private $appPassword;
+    /** @var string */
+    private $server;
+    /** @var string */
+    private $loginName;
+    /** @var string */
+    private $appPassword;
 
-	public function __construct(string $server, string $loginName, string $appPassword) {
-		$this->server = $server;
-		$this->loginName = $loginName;
-		$this->appPassword = $appPassword;
-	}
+    public function __construct(string $server, string $loginName, string $appPassword) {
+        $this->server = $server;
+        $this->loginName = $loginName;
+        $this->appPassword = $appPassword;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getServer(): string {
-		return $this->server;
-	}
+    /**
+     * @return string
+     */
+    public function getServer(): string {
+        return $this->server;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLoginName(): string {
-		return $this->loginName;
-	}
+    /**
+     * @return string
+     */
+    public function getLoginName(): string {
+        return $this->loginName;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getAppPassword(): string {
-		return $this->appPassword;
-	}
+    /**
+     * @return string
+     */
+    public function getAppPassword(): string {
+        return $this->appPassword;
+    }
 
-	public function jsonSerialize(): array {
-		return [
-			'server' => $this->server,
-			'loginName' => $this->loginName,
-			'appPassword' => $this->appPassword,
-		];
-	}
+    public function jsonSerialize(): array {
+        return [
+            'server' => $this->server,
+            'loginName' => $this->loginName,
+            'appPassword' => $this->appPassword,
+        ];
+    }
 
 
 }

core/Db/LoginFlowV2.php

Indentation +32 added lines, -32 removed lines

@@ -49,37 +49,37 @@
  * @method void setAppPassword(string $appPassword)
  */
 class LoginFlowV2 extends Entity {
-	/** @var int */
-	protected $timestamp;
-	/** @var int */
-	protected $started;
-	/** @var string */
-	protected $pollToken;
-	/** @var string */
-	protected $loginToken;
-	/** @var string */
-	protected $publicKey;
-	/** @var string */
-	protected $privateKey;
-	/** @var string */
-	protected $clientName;
-	/** @var string */
-	protected $loginName;
-	/** @var string */
-	protected $server;
-	/** @var string */
-	protected $appPassword;
+    /** @var int */
+    protected $timestamp;
+    /** @var int */
+    protected $started;
+    /** @var string */
+    protected $pollToken;
+    /** @var string */
+    protected $loginToken;
+    /** @var string */
+    protected $publicKey;
+    /** @var string */
+    protected $privateKey;
+    /** @var string */
+    protected $clientName;
+    /** @var string */
+    protected $loginName;
+    /** @var string */
+    protected $server;
+    /** @var string */
+    protected $appPassword;
 
-	public function __construct() {
-		$this->addType('timestamp', 'int');
-		$this->addType('started', 'int');
-		$this->addType('pollToken', 'string');
-		$this->addType('loginToken', 'string');
-		$this->addType('publicKey', 'string');
-		$this->addType('privateKey', 'string');
-		$this->addType('clientName', 'string');
-		$this->addType('loginName', 'string');
-		$this->addType('server', 'string');
-		$this->addType('appPassword', 'string');
-	}
+    public function __construct() {
+        $this->addType('timestamp', 'int');
+        $this->addType('started', 'int');
+        $this->addType('pollToken', 'string');
+        $this->addType('loginToken', 'string');
+        $this->addType('publicKey', 'string');
+        $this->addType('privateKey', 'string');
+        $this->addType('clientName', 'string');
+        $this->addType('loginName', 'string');
+        $this->addType('server', 'string');
+        $this->addType('appPassword', 'string');
+    }
 }

core/Db/LoginFlowV2Mapper.php

Indentation +57 added lines, -57 removed lines

@@ -30,71 +30,71 @@
 use OCP\IDBConnection;
 
 class LoginFlowV2Mapper extends QBMapper {
-	private const lifetime = 1200;
+    private const lifetime = 1200;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
-		parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
-		$this->timeFactory = $timeFactory;
-	}
+    public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
+        parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param string $pollToken
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	public function getByPollToken(string $pollToken): LoginFlowV2 {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
-			);
+    /**
+     * @param string $pollToken
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    public function getByPollToken(string $pollToken): LoginFlowV2 {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
+            );
 
-		$entity = $this->findEntity($qb);
-		return $this->validateTimestamp($entity);
-	}
+        $entity = $this->findEntity($qb);
+        return $this->validateTimestamp($entity);
+    }
 
-	/**
-	 * @param string $loginToken
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	public function getByLoginToken(string $loginToken): LoginFlowV2 {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
-			);
+    /**
+     * @param string $loginToken
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    public function getByLoginToken(string $loginToken): LoginFlowV2 {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
+            );
 
-		$entity = $this->findEntity($qb);
-		return $this->validateTimestamp($entity);
-	}
+        $entity = $this->findEntity($qb);
+        return $this->validateTimestamp($entity);
+    }
 
-	public function cleanup(): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-			->where(
-				$qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
-			);
+    public function cleanup(): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->getTableName())
+            ->where(
+                $qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
+            );
 
-		$qb->execute();
-	}
+        $qb->execute();
+    }
 
-	/**
-	 * @param LoginFlowV2 $flowV2
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
-		if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
-			$this->delete($flowV2);
-			throw new DoesNotExistException('Token expired');
-		}
+    /**
+     * @param LoginFlowV2 $flowV2
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
+        if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
+            $this->delete($flowV2);
+            throw new DoesNotExistException('Token expired');
+        }
 
-		return $flowV2;
-	}
+        return $flowV2;
+    }
 }