nextcloud / server

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

Indentation +20 added lines, -20 removed lines

@@ -30,30 +30,30 @@
 
 class PersonalInfo implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function getIcon() {
-		return $this->urlGenerator->imagePath('core', 'actions/user.svg');
-	}
+    public function getIcon() {
+        return $this->urlGenerator->imagePath('core', 'actions/user.svg');
+    }
 
-	public function getID(): string {
-		return 'personal-info';
-	}
+    public function getID(): string {
+        return 'personal-info';
+    }
 
-	public function getName(): string {
-		return $this->l->t('Personal info');
-	}
+    public function getName(): string {
+        return $this->l->t('Personal info');
+    }
 
-	public function getPriority(): int {
-		return 0;
-	}
+    public function getPriority(): int {
+        return 0;
+    }
 }

apps/settings/lib/Settings/Personal/Security/TwoFactor.php

Spacing +2 added lines, -2 removed lines

@@ -106,12 +106,12 @@
 		}
 
 		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+			'providers' => array_map(function(IProvidesPersonalSettings $provider) use ($user) {
 				return [
 					'provider' => $provider,
 					'settings' => $provider->getPersonalSettings($user)
 				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+			}, array_filter($this->providerLoader->getProviders($user), function(IProvider $provider) {
 				return $provider instanceof IProvidesPersonalSettings;
 			}))
 		];

Indentation +91 added lines, -91 removed lines

@@ -42,95 +42,95 @@
 
 class TwoFactor implements ISettings {
 
-	/** @var ProviderLoader */
-	private $providerLoader;
-
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var string|null */
-	private $uid;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(ProviderLoader $providerLoader,
-								MandatoryTwoFactor $mandatoryTwoFactor,
-								IUserSession $userSession,
-								IConfig $config,
-								?string $UserId) {
-		$this->providerLoader = $providerLoader;
-		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-		$this->userSession = $userSession;
-		$this->uid = $UserId;
-		$this->config = $config;
-	}
-
-	public function getForm(): TemplateResponse {
-		return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
-			'twoFactorProviderData' => $this->getTwoFactorProviderData(),
-		]);
-	}
-
-	public function getSection(): ?string {
-		if (!$this->shouldShow()) {
-			return null;
-		}
-		return 'security';
-	}
-
-	public function getPriority(): int {
-		return 15;
-	}
-
-	private function shouldShow(): bool {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return false;
-		}
-
-		// Anyone who's supposed to use 2FA should see 2FA settings
-		if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
-			return true;
-		}
-
-		// If there is at least one provider with personal settings but it's not
-		// the backup codes provider, then these settings should show.
-		try {
-			$providers = $this->providerLoader->getProviders($user);
-		} catch (Exception $e) {
-			// Let's hope for the best
-			return true;
-		}
-		foreach ($providers as $provider) {
-			if ($provider instanceof IProvidesPersonalSettings
-				&& !($provider instanceof BackupCodesProvider)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private function getTwoFactorProviderData(): array {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return [];
-		}
-
-		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
-				return [
-					'provider' => $provider,
-					'settings' => $provider->getPersonalSettings($user)
-				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
-				return $provider instanceof IProvidesPersonalSettings;
-			}))
-		];
-	}
+    /** @var ProviderLoader */
+    private $providerLoader;
+
+    /** @var MandatoryTwoFactor */
+    private $mandatoryTwoFactor;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var string|null */
+    private $uid;
+
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(ProviderLoader $providerLoader,
+                                MandatoryTwoFactor $mandatoryTwoFactor,
+                                IUserSession $userSession,
+                                IConfig $config,
+                                ?string $UserId) {
+        $this->providerLoader = $providerLoader;
+        $this->mandatoryTwoFactor = $mandatoryTwoFactor;
+        $this->userSession = $userSession;
+        $this->uid = $UserId;
+        $this->config = $config;
+    }
+
+    public function getForm(): TemplateResponse {
+        return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
+            'twoFactorProviderData' => $this->getTwoFactorProviderData(),
+        ]);
+    }
+
+    public function getSection(): ?string {
+        if (!$this->shouldShow()) {
+            return null;
+        }
+        return 'security';
+    }
+
+    public function getPriority(): int {
+        return 15;
+    }
+
+    private function shouldShow(): bool {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return false;
+        }
+
+        // Anyone who's supposed to use 2FA should see 2FA settings
+        if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
+            return true;
+        }
+
+        // If there is at least one provider with personal settings but it's not
+        // the backup codes provider, then these settings should show.
+        try {
+            $providers = $this->providerLoader->getProviders($user);
+        } catch (Exception $e) {
+            // Let's hope for the best
+            return true;
+        }
+        foreach ($providers as $provider) {
+            if ($provider instanceof IProvidesPersonalSettings
+                && !($provider instanceof BackupCodesProvider)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private function getTwoFactorProviderData(): array {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return [];
+        }
+
+        return [
+            'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+                return [
+                    'provider' => $provider,
+                    'settings' => $provider->getPersonalSettings($user)
+                ];
+            }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+                return $provider instanceof IProvidesPersonalSettings;
+            }))
+        ];
+    }
 }

apps/settings/lib/Settings/Personal/Security/Password.php

Indentation +25 added lines, -25 removed lines

@@ -34,35 +34,35 @@
 
 class Password implements ISettings {
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var string|null */
-	private $uid;
+    /** @var string|null */
+    private $uid;
 
-	public function __construct(IUserManager $userManager,
-								?string $UserId) {
-		$this->userManager = $userManager;
-		$this->uid = $UserId;
-	}
+    public function __construct(IUserManager $userManager,
+                                ?string $UserId) {
+        $this->userManager = $userManager;
+        $this->uid = $UserId;
+    }
 
-	public function getForm(): TemplateResponse {
-		$user = $this->userManager->get($this->uid);
-		$passwordChangeSupported = false;
-		if ($user !== null) {
-			$passwordChangeSupported = $user->canChangePassword();
-		}
+    public function getForm(): TemplateResponse {
+        $user = $this->userManager->get($this->uid);
+        $passwordChangeSupported = false;
+        if ($user !== null) {
+            $passwordChangeSupported = $user->canChangePassword();
+        }
 
-		return new TemplateResponse('settings', 'settings/personal/security/password', [
-			'passwordChangeSupported' => $passwordChangeSupported,
-		]);
-	}
+        return new TemplateResponse('settings', 'settings/personal/security/password', [
+            'passwordChangeSupported' => $passwordChangeSupported,
+        ]);
+    }
 
-	public function getSection(): string {
-		return 'security';
-	}
+    public function getSection(): string {
+        return 'security';
+    }
 
-	public function getPriority(): int {
-		return 10;
-	}
+    public function getPriority(): int {
+        return 10;
+    }
 }

lib/private/BackgroundJob/Job.php

Spacing +3 added lines, -3 removed lines

@@ -57,17 +57,17 @@
 
 		try {
 			$jobStartTime = time();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+			$logger->debug('Run '.get_class($this).' job with ID '.$this->getId(), ['app' => 'cron']);
 			$this->run($this->argument);
 			$timeTaken = time() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+			$logger->debug('Finished '.get_class($this).' job with ID '.$this->getId().' in '.$timeTaken.' seconds', ['app' => 'cron']);
 			$jobList->setExecutionTime($this, $timeTaken);
 		} catch (\Throwable $e) {
 			if ($logger) {
 				$logger->logException($e, [
 					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+					'message' => 'Error while running background job (class: '.get_class($this).', arguments: '.print_r($this->argument, true).')'
 				]);
 			}
 		}

Indentation +49 added lines, -49 removed lines

@@ -33,66 +33,66 @@
  * @deprecated internal class, use \OCP\BackgroundJob\Job
  */
 abstract class Job implements IJob {
-	/** @var int */
-	protected $id;
+    /** @var int */
+    protected $id;
 
-	/** @var int */
-	protected $lastRun;
+    /** @var int */
+    protected $lastRun;
 
-	/** @var mixed */
-	protected $argument;
+    /** @var mixed */
+    protected $argument;
 
-	public function execute(IJobList $jobList, ILogger $logger = null) {
-		$jobList->setLastRun($this);
-		if ($logger === null) {
-			$logger = \OC::$server->getLogger();
-		}
+    public function execute(IJobList $jobList, ILogger $logger = null) {
+        $jobList->setLastRun($this);
+        if ($logger === null) {
+            $logger = \OC::$server->getLogger();
+        }
 
-		try {
-			$jobStartTime = time();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
-			$this->run($this->argument);
-			$timeTaken = time() - $jobStartTime;
+        try {
+            $jobStartTime = time();
+            $logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+            $this->run($this->argument);
+            $timeTaken = time() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
-			$jobList->setExecutionTime($this, $timeTaken);
-		} catch (\Throwable $e) {
-			if ($logger) {
-				$logger->logException($e, [
-					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
-				]);
-			}
-		}
-	}
+            $logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+            $jobList->setExecutionTime($this, $timeTaken);
+        } catch (\Throwable $e) {
+            if ($logger) {
+                $logger->logException($e, [
+                    'app' => 'core',
+                    'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+                ]);
+            }
+        }
+    }
 
-	public function start(IJobList $jobList): void {
-		$this->execute($jobList);
-	}
+    public function start(IJobList $jobList): void {
+        $this->execute($jobList);
+    }
 
-	abstract protected function run($argument);
+    abstract protected function run($argument);
 
-	public function setId(int $id) {
-		$this->id = $id;
-	}
+    public function setId(int $id) {
+        $this->id = $id;
+    }
 
-	public function setLastRun(int $lastRun) {
-		$this->lastRun = $lastRun;
-	}
+    public function setLastRun(int $lastRun) {
+        $this->lastRun = $lastRun;
+    }
 
-	public function setArgument($argument) {
-		$this->argument = $argument;
-	}
+    public function setArgument($argument) {
+        $this->argument = $argument;
+    }
 
-	public function getId() {
-		return $this->id;
-	}
+    public function getId() {
+        return $this->id;
+    }
 
-	public function getLastRun() {
-		return $this->lastRun;
-	}
+    public function getLastRun() {
+        return $this->lastRun;
+    }
 
-	public function getArgument() {
-		return $this->argument;
-	}
+    public function getArgument() {
+        return $this->argument;
+    }
 }

lib/private/DB/SetTransactionIsolationLevel.php

Indentation +10 added lines, -10 removed lines

@@ -32,15 +32,15 @@
 use Doctrine\DBAL\TransactionIsolationLevel;
 
 class SetTransactionIsolationLevel implements EventSubscriber {
-	/**
-	 * @param ConnectionEventArgs $args
-	 * @return void
-	 */
-	public function postConnect(ConnectionEventArgs $args) {
-		$args->getConnection()->setTransactionIsolation(TransactionIsolationLevel::READ_COMMITTED);
-	}
+    /**
+     * @param ConnectionEventArgs $args
+     * @return void
+     */
+    public function postConnect(ConnectionEventArgs $args) {
+        $args->getConnection()->setTransactionIsolation(TransactionIsolationLevel::READ_COMMITTED);
+    }
 
-	public function getSubscribedEvents() {
-		return [Events::postConnect];
-	}
+    public function getSubscribedEvents() {
+        return [Events::postConnect];
+    }
 }

apps/dav/lib/CalDAV/Integration/ICalendarProvider.php

Indentation +34 added lines, -34 removed lines

@@ -32,42 +32,42 @@
  */
 interface ICalendarProvider {
 
-	/**
-	 * Provides the appId of the plugin
-	 *
-	 * @since 19.0.0
-	 * @return string AppId
-	 */
-	public function getAppId(): string;
+    /**
+     * Provides the appId of the plugin
+     *
+     * @since 19.0.0
+     * @return string AppId
+     */
+    public function getAppId(): string;
 
-	/**
-	 * Fetches all calendars for a given principal uri
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @return ExternalCalendar[] Array of all calendars
-	 */
-	public function fetchAllForCalendarHome(string $principalUri): array;
+    /**
+     * Fetches all calendars for a given principal uri
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @return ExternalCalendar[] Array of all calendars
+     */
+    public function fetchAllForCalendarHome(string $principalUri): array;
 
-	/**
-	 * Checks whether plugin has a calendar for a given principalUri and calendarUri
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $calendarUri E.g. personal
-	 * @return bool True if calendar for principalUri and calendarUri exists, false otherwise
-	 */
-	public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool;
+    /**
+     * Checks whether plugin has a calendar for a given principalUri and calendarUri
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $calendarUri E.g. personal
+     * @return bool True if calendar for principalUri and calendarUri exists, false otherwise
+     */
+    public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool;
 
-	/**
-	 * Fetches a calendar for a given principalUri and calendarUri
-	 * Returns null if calendar does not exist
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $calendarUri E.g. personal
-	 * @return ExternalCalendar|null Calendar if it exists, null otherwise
-	 */
-	public function getCalendarInCalendarHome(string $principalUri, string $calendarUri): ?ExternalCalendar;
+    /**
+     * Fetches a calendar for a given principalUri and calendarUri
+     * Returns null if calendar does not exist
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $calendarUri E.g. personal
+     * @return ExternalCalendar|null Calendar if it exists, null otherwise
+     */
+    public function getCalendarInCalendarHome(string $principalUri, string $calendarUri): ?ExternalCalendar;
 
 }

apps/files/lib/Controller/TransferOwnershipController.php

Spacing +4 added lines, -4 removed lines

@@ -112,7 +112,7 @@ 
 				'targetUser' => $recipient,
 				'nodeName' => $node->getName(),
 			])
-			->setObject('transfer', (string)$transferOwnership->getId());
+			->setObject('transfer', (string) $transferOwnership->getId());
 
 		$this->notificationManager->notify($notification);
 
@@ -135,7 +135,7 @@ 
 
 		$notification = $this->notificationManager->createNotification();
 		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
+			->setObject('transfer', (string) $id);
 		$this->notificationManager->markProcessed($notification);
 
 		$newTransferOwnership = new TransferOwnershipEntity();
@@ -168,7 +168,7 @@ 
 
 		$notification = $this->notificationManager->createNotification();
 		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
+			->setObject('transfer', (string) $id);
 		$this->notificationManager->markProcessed($notification);
 
 		$notification = $this->notificationManager->createNotification();
@@ -180,7 +180,7 @@ 
 				'targetUser' => $transferOwnership->getTargetUser(),
 				'nodeName' => $transferOwnership->getNodeName()
 			])
-			->setObject('transfer', (string)$transferOwnership->getId());
+			->setObject('transfer', (string) $transferOwnership->getId());
 		$this->notificationManager->notify($notification);
 
 		$this->mapper->delete($transferOwnership);

Indentation +149 added lines, -149 removed lines

@@ -44,153 +44,153 @@
 
 class TransferOwnershipController extends OCSController {
 
-	/** @var string */
-	private $userId;
-	/** @var NotificationManager */
-	private $notificationManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IJobList */
-	private $jobList;
-	/** @var TransferOwnershipMapper */
-	private $mapper;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								string $userId,
-								NotificationManager $notificationManager,
-								ITimeFactory $timeFactory,
-								IJobList $jobList,
-								TransferOwnershipMapper $mapper,
-								IUserManager $userManager,
-								IRootFolder $rootFolder) {
-		parent::__construct($appName, $request);
-
-		$this->userId = $userId;
-		$this->notificationManager = $notificationManager;
-		$this->timeFactory = $timeFactory;
-		$this->jobList = $jobList;
-		$this->mapper = $mapper;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function transfer(string $recipient, string $path): DataResponse {
-		$recipientUser = $this->userManager->get($recipient);
-
-		if ($recipientUser === null) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$userRoot = $this->rootFolder->getUserFolder($this->userId);
-
-		try {
-			$node = $userRoot->get($path);
-		} catch (\Exception $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		if ($node->getOwner()->getUID() !== $this->userId || !$node->getStorage()->instanceOfStorage(IHomeStorage::class)) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$transferOwnership = new TransferOwnershipEntity();
-		$transferOwnership->setSourceUser($this->userId);
-		$transferOwnership->setTargetUser($recipient);
-		$transferOwnership->setFileId($node->getId());
-		$transferOwnership->setNodeName($node->getName());
-		$transferOwnership = $this->mapper->insert($transferOwnership);
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($recipient)
-			->setApp($this->appName)
-			->setDateTime($this->timeFactory->getDateTime())
-			->setSubject('transferownershipRequest', [
-				'sourceUser' => $this->userId,
-				'targetUser' => $recipient,
-				'nodeName' => $node->getName(),
-			])
-			->setObject('transfer', (string)$transferOwnership->getId());
-
-		$this->notificationManager->notify($notification);
-
-		return new DataResponse([]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function accept(int $id): DataResponse {
-		try {
-			$transferOwnership = $this->mapper->getById($id);
-		} catch (DoesNotExistException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if ($transferOwnership->getTargetUser() !== $this->userId) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
-		$this->notificationManager->markProcessed($notification);
-
-		$newTransferOwnership = new TransferOwnershipEntity();
-		$newTransferOwnership->setNodeName($transferOwnership->getNodeName());
-		$newTransferOwnership->setFileId($transferOwnership->getFileId());
-		$newTransferOwnership->setSourceUser($transferOwnership->getSourceUser());
-		$newTransferOwnership->setTargetUser($transferOwnership->getTargetUser());
-		$this->mapper->insert($newTransferOwnership);
-
-		$this->jobList->add(TransferOwnership::class, [
-			'id' => $newTransferOwnership->getId(),
-		]);
-
-		return new DataResponse([], Http::STATUS_OK);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function reject(int $id): DataResponse {
-		try {
-			$transferOwnership = $this->mapper->getById($id);
-		} catch (DoesNotExistException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if ($transferOwnership->getTargetUser() !== $this->userId) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('files')
-			->setObject('transfer', (string)$id);
-		$this->notificationManager->markProcessed($notification);
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transferOwnership->getSourceUser())
-			->setApp($this->appName)
-			->setDateTime($this->timeFactory->getDateTime())
-			->setSubject('transferownershipRequestDenied', [
-				'sourceUser' => $transferOwnership->getSourceUser(),
-				'targetUser' => $transferOwnership->getTargetUser(),
-				'nodeName' => $transferOwnership->getNodeName()
-			])
-			->setObject('transfer', (string)$transferOwnership->getId());
-		$this->notificationManager->notify($notification);
-
-		$this->mapper->delete($transferOwnership);
-
-		return new DataResponse([], Http::STATUS_OK);
-	}
+    /** @var string */
+    private $userId;
+    /** @var NotificationManager */
+    private $notificationManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IJobList */
+    private $jobList;
+    /** @var TransferOwnershipMapper */
+    private $mapper;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                string $userId,
+                                NotificationManager $notificationManager,
+                                ITimeFactory $timeFactory,
+                                IJobList $jobList,
+                                TransferOwnershipMapper $mapper,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder) {
+        parent::__construct($appName, $request);
+
+        $this->userId = $userId;
+        $this->notificationManager = $notificationManager;
+        $this->timeFactory = $timeFactory;
+        $this->jobList = $jobList;
+        $this->mapper = $mapper;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
+
+
+    /**
+     * @NoAdminRequired
+     */
+    public function transfer(string $recipient, string $path): DataResponse {
+        $recipientUser = $this->userManager->get($recipient);
+
+        if ($recipientUser === null) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        $userRoot = $this->rootFolder->getUserFolder($this->userId);
+
+        try {
+            $node = $userRoot->get($path);
+        } catch (\Exception $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        if ($node->getOwner()->getUID() !== $this->userId || !$node->getStorage()->instanceOfStorage(IHomeStorage::class)) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $transferOwnership = new TransferOwnershipEntity();
+        $transferOwnership->setSourceUser($this->userId);
+        $transferOwnership->setTargetUser($recipient);
+        $transferOwnership->setFileId($node->getId());
+        $transferOwnership->setNodeName($node->getName());
+        $transferOwnership = $this->mapper->insert($transferOwnership);
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($recipient)
+            ->setApp($this->appName)
+            ->setDateTime($this->timeFactory->getDateTime())
+            ->setSubject('transferownershipRequest', [
+                'sourceUser' => $this->userId,
+                'targetUser' => $recipient,
+                'nodeName' => $node->getName(),
+            ])
+            ->setObject('transfer', (string)$transferOwnership->getId());
+
+        $this->notificationManager->notify($notification);
+
+        return new DataResponse([]);
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function accept(int $id): DataResponse {
+        try {
+            $transferOwnership = $this->mapper->getById($id);
+        } catch (DoesNotExistException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if ($transferOwnership->getTargetUser() !== $this->userId) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('files')
+            ->setObject('transfer', (string)$id);
+        $this->notificationManager->markProcessed($notification);
+
+        $newTransferOwnership = new TransferOwnershipEntity();
+        $newTransferOwnership->setNodeName($transferOwnership->getNodeName());
+        $newTransferOwnership->setFileId($transferOwnership->getFileId());
+        $newTransferOwnership->setSourceUser($transferOwnership->getSourceUser());
+        $newTransferOwnership->setTargetUser($transferOwnership->getTargetUser());
+        $this->mapper->insert($newTransferOwnership);
+
+        $this->jobList->add(TransferOwnership::class, [
+            'id' => $newTransferOwnership->getId(),
+        ]);
+
+        return new DataResponse([], Http::STATUS_OK);
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function reject(int $id): DataResponse {
+        try {
+            $transferOwnership = $this->mapper->getById($id);
+        } catch (DoesNotExistException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if ($transferOwnership->getTargetUser() !== $this->userId) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('files')
+            ->setObject('transfer', (string)$id);
+        $this->notificationManager->markProcessed($notification);
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transferOwnership->getSourceUser())
+            ->setApp($this->appName)
+            ->setDateTime($this->timeFactory->getDateTime())
+            ->setSubject('transferownershipRequestDenied', [
+                'sourceUser' => $transferOwnership->getSourceUser(),
+                'targetUser' => $transferOwnership->getTargetUser(),
+                'nodeName' => $transferOwnership->getNodeName()
+            ])
+            ->setObject('transfer', (string)$transferOwnership->getId());
+        $this->notificationManager->notify($notification);
+
+        $this->mapper->delete($transferOwnership);
+
+        return new DataResponse([], Http::STATUS_OK);
+    }
 }

apps/files_sharing/lib/Controller/ExternalSharesController.php

Spacing +6 added lines, -6 removed lines

@@ -135,15 +135,15 @@
 		}
 
 		if (
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('https://' . $remote . '/status.php', true)
+			$this->testUrl('https://'.$remote.'/ocs-provider/') ||
+			$this->testUrl('https://'.$remote.'/ocs-provider/index.php') ||
+			$this->testUrl('https://'.$remote.'/status.php', true)
 		) {
 			return new DataResponse('https');
 		} elseif (
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('http://' . $remote . '/status.php', true)
+			$this->testUrl('http://'.$remote.'/ocs-provider/') ||
+			$this->testUrl('http://'.$remote.'/ocs-provider/index.php') ||
+			$this->testUrl('http://'.$remote.'/status.php', true)
 		) {
 			return new DataResponse('http');
 		} else {

Indentation +103 added lines, -103 removed lines

@@ -40,115 +40,115 @@
  */
 class ExternalSharesController extends Controller {
 
-	/** @var \OCA\Files_Sharing\External\Manager */
-	private $externalManager;
-	/** @var IClientService */
-	private $clientService;
+    /** @var \OCA\Files_Sharing\External\Manager */
+    private $externalManager;
+    /** @var IClientService */
+    private $clientService;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param \OCA\Files_Sharing\External\Manager $externalManager
-	 * @param IClientService $clientService
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								\OCA\Files_Sharing\External\Manager $externalManager,
-								IClientService $clientService) {
-		parent::__construct($appName, $request);
-		$this->externalManager = $externalManager;
-		$this->clientService = $clientService;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param \OCA\Files_Sharing\External\Manager $externalManager
+     * @param IClientService $clientService
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                \OCA\Files_Sharing\External\Manager $externalManager,
+                                IClientService $clientService) {
+        parent::__construct($appName, $request);
+        $this->externalManager = $externalManager;
+        $this->clientService = $clientService;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function index() {
-		return new JSONResponse($this->externalManager->getOpenShares());
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @return JSONResponse
+     */
+    public function index() {
+        return new JSONResponse($this->externalManager->getOpenShares());
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param int $id
-	 * @return JSONResponse
-	 */
-	public function create($id) {
-		$this->externalManager->acceptShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param int $id
+     * @return JSONResponse
+     */
+    public function create($id) {
+        $this->externalManager->acceptShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param integer $id
-	 * @return JSONResponse
-	 */
-	public function destroy($id) {
-		$this->externalManager->declineShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param integer $id
+     * @return JSONResponse
+     */
+    public function destroy($id) {
+        $this->externalManager->declineShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * Test whether the specified remote is accessible
-	 *
-	 * @param string $remote
-	 * @param bool $checkVersion
-	 * @return bool
-	 */
-	protected function testUrl($remote, $checkVersion = false) {
-		try {
-			$client = $this->clientService->newClient();
-			$response = json_decode($client->get(
-				$remote,
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			)->getBody());
+    /**
+     * Test whether the specified remote is accessible
+     *
+     * @param string $remote
+     * @param bool $checkVersion
+     * @return bool
+     */
+    protected function testUrl($remote, $checkVersion = false) {
+        try {
+            $client = $this->clientService->newClient();
+            $response = json_decode($client->get(
+                $remote,
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            )->getBody());
 
-			if ($checkVersion) {
-				return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
-			} else {
-				return is_object($response);
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
+            if ($checkVersion) {
+                return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
+            } else {
+                return is_object($response);
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoOutgoingFederatedSharingRequired
-	 * @NoIncomingFederatedSharingRequired
-	 *
-	 * @param string $remote
-	 * @return DataResponse
-	 */
-	public function testRemote($remote) {
-		if (strpos($remote, '#') !== false || strpos($remote, '?') !== false || strpos($remote, ';') !== false) {
-			return new DataResponse(false);
-		}
+    /**
+     * @PublicPage
+     * @NoOutgoingFederatedSharingRequired
+     * @NoIncomingFederatedSharingRequired
+     *
+     * @param string $remote
+     * @return DataResponse
+     */
+    public function testRemote($remote) {
+        if (strpos($remote, '#') !== false || strpos($remote, '?') !== false || strpos($remote, ';') !== false) {
+            return new DataResponse(false);
+        }
 
-		if (
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('https://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('https');
-		} elseif (
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('http://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('http');
-		} else {
-			return new DataResponse(false);
-		}
-	}
+        if (
+            $this->testUrl('https://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('https://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('https');
+        } elseif (
+            $this->testUrl('http://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('http://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('http');
+        } else {
+            return new DataResponse(false);
+        }
+    }
 }

apps/contactsinteraction/lib/Migration/Version010000Date20200304152605.php

Indentation +54 added lines, -54 removed lines

@@ -33,61 +33,61 @@
 
 class Version010000Date20200304152605 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return 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 ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable(RecentContactMapper::TABLE_NAME);
-		$table->addColumn('id', 'integer', [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->addColumn('actor_uid', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('uid', 'string', [
-			'notnull' => false,
-			'length' => 64,
-		]);
-		$table->addColumn('email', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('federated_cloud_id', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('card', 'blob', [
-			'notnull' => true,
-		]);
-		$table->addColumn('last_contact', 'integer', [
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->setPrimaryKey(['id']);
-		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
-		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
-		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
-		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
-		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
-		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+        $table = $schema->createTable(RecentContactMapper::TABLE_NAME);
+        $table->addColumn('id', 'integer', [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->addColumn('actor_uid', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('uid', 'string', [
+            'notnull' => false,
+            'length' => 64,
+        ]);
+        $table->addColumn('email', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('federated_cloud_id', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('card', 'blob', [
+            'notnull' => true,
+        ]);
+        $table->addColumn('last_contact', 'integer', [
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->setPrimaryKey(['id']);
+        // To find all recent entries
+        $table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+        // To find a specific entry
+        $table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+        // To find all recent entries with a given UID
+        $table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+        // To find all recent entries with a given email address
+        $table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+        // To find all recent entries with a give federated cloud id
+        $table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+        // For the cleanup
+        $table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
 
-		return $schema;
-	}
+        return $schema;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -75,17 +75,17 @@
 		]);
 		$table->setPrimaryKey(['id']);
 		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME.'_actor_uid');
 		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME.'_id_uid');
 		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME.'_uid');
 		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME.'_email');
 		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME.'_fed_id');
 		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME.'_last_contact');
 
 		return $schema;
 	}