nextcloud / server

apps/user_ldap/lib/Command/ShowRemnants.php

Indentation +63 added lines, -63 removed lines

@@ -36,73 +36,73 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ShowRemnants extends Command {
-	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
-	protected $dui;
+    /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+    protected $dui;
 
-	/** @var \OCP\IDateTimeFormatter */
-	protected $dateFormatter;
+    /** @var \OCP\IDateTimeFormatter */
+    protected $dateFormatter;
 
-	/**
-	 * @param DeletedUsersIndex $dui
-	 * @param IDateTimeFormatter $dateFormatter
-	 */
-	public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
-		$this->dui = $dui;
-		$this->dateFormatter = $dateFormatter;
-		parent::__construct();
-	}
+    /**
+     * @param DeletedUsersIndex $dui
+     * @param IDateTimeFormatter $dateFormatter
+     */
+    public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
+        $this->dui = $dui;
+        $this->dateFormatter = $dateFormatter;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:show-remnants')
-			->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
-			->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
-			->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:show-remnants')
+            ->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
+            ->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
+            ->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
+    }
 
-	protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
-		if (!($timestamp > 0)) {
-			return $default;
-		}
-		if ($showShortDate) {
-			return date('Y-m-d', $timestamp);
-		}
-		return $this->dateFormatter->formatDate($timestamp);
-	}
+    protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
+        if (!($timestamp > 0)) {
+            return $default;
+        }
+        if ($showShortDate) {
+            return date('Y-m-d', $timestamp);
+        }
+        return $this->dateFormatter->formatDate($timestamp);
+    }
 
-	/**
-	 * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
-	 *
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		/** @var \Symfony\Component\Console\Helper\Table $table */
-		$table = new Table($output);
-		$table->setHeaders([
-			'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
-			'Detected on', 'Dir', 'Sharer'
-		]);
-		$rows = [];
-		$resultSet = $this->dui->getUsers();
-		foreach ($resultSet as $user) {
-			$rows[] = [
-				'ocName' => $user->getOCName(),
-				'displayName' => $user->getDisplayName(),
-				'uid' => $user->getUID(),
-				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
-				'homePath' => $user->getHomePath(),
-				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
-			];
-		}
+    /**
+     * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
+     *
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        /** @var \Symfony\Component\Console\Helper\Table $table */
+        $table = new Table($output);
+        $table->setHeaders([
+            'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
+            'Detected on', 'Dir', 'Sharer'
+        ]);
+        $rows = [];
+        $resultSet = $this->dui->getUsers();
+        foreach ($resultSet as $user) {
+            $rows[] = [
+                'ocName' => $user->getOCName(),
+                'displayName' => $user->getDisplayName(),
+                'uid' => $user->getUID(),
+                'dn' => $user->getDN(),
+                'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
+                'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+                'homePath' => $user->getHomePath(),
+                'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
+            ];
+        }
 
-		if ($input->getOption('json')) {
-			$output->writeln(json_encode($rows));
-		} else {
-			$table->setRows($rows);
-			$table->render();
-		}
-		return 0;
-	}
+        if ($input->getOption('json')) {
+            $output->writeln(json_encode($rows));
+        } else {
+            $table->setRows($rows);
+            $table->render();
+        }
+        return 0;
+    }
 }

lib/private/Activity/ActivitySettingsAdapter.php

Indentation +27 added lines, -27 removed lines

@@ -32,39 +32,39 @@
  * class based one
  */
 class ActivitySettingsAdapter extends ActivitySettings {
-	private $oldSettings;
-	private $l10n;
+    private $oldSettings;
+    private $l10n;
 
-	public function __construct(ISetting $oldSettings, IL10N $l10n) {
-		$this->oldSettings = $oldSettings;
-		$this->l10n = $l10n;
-	}
+    public function __construct(ISetting $oldSettings, IL10N $l10n) {
+        $this->oldSettings = $oldSettings;
+        $this->l10n = $l10n;
+    }
 
-	public function getIdentifier() {
-		return $this->oldSettings->getIdentifier();
-	}
+    public function getIdentifier() {
+        return $this->oldSettings->getIdentifier();
+    }
 
-	public function getName() {
-		return $this->oldSettings->getName();
-	}
+    public function getName() {
+        return $this->oldSettings->getName();
+    }
 
-	public function getGroupIdentifier() {
-		return 'other';
-	}
+    public function getGroupIdentifier() {
+        return 'other';
+    }
 
-	public function getGroupName() {
-		return $this->l10n->t('Other activities');
-	}
+    public function getGroupName() {
+        return $this->l10n->t('Other activities');
+    }
 
-	public function getPriority() {
-		return $this->oldSettings->getPriority();
-	}
+    public function getPriority() {
+        return $this->oldSettings->getPriority();
+    }
 
-	public function canChangeMail() {
-		return $this->oldSettings->canChangeMail();
-	}
+    public function canChangeMail() {
+        return $this->oldSettings->canChangeMail();
+    }
 
-	public function isDefaultEnabledMail() {
-		return $this->oldSettings->isDefaultEnabledMail();
-	}
+    public function isDefaultEnabledMail() {
+        return $this->oldSettings->isDefaultEnabledMail();
+    }
 }

lib/private/Activity/Manager.php

Indentation +354 added lines, -354 removed lines

@@ -43,358 +43,358 @@
 use OCP\RichObjectStrings\IValidator;
 
 class Manager implements IManager {
-	/** @var IRequest */
-	protected $request;
-
-	/** @var IUserSession */
-	protected $session;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IValidator */
-	protected $validator;
-
-	/** @var string */
-	protected $formattingObjectType;
-
-	/** @var int */
-	protected $formattingObjectId;
-
-	/** @var bool */
-	protected $requirePNG = false;
-
-	/** @var string */
-	protected $currentUserId;
-
-	protected $l10n;
-
-	public function __construct(
-			IRequest $request,
-			IUserSession $session,
-			IConfig $config,
-			IValidator $validator,
-			IL10N $l10n
-	) {
-		$this->request = $request;
-		$this->session = $session;
-		$this->config = $config;
-		$this->validator = $validator;
-		$this->l10n = $l10n;
-	}
-
-	/** @var \Closure[] */
-	private $consumersClosures = [];
-
-	/** @var IConsumer[] */
-	private $consumers = [];
-
-	/**
-	 * @return \OCP\Activity\IConsumer[]
-	 */
-	protected function getConsumers(): array {
-		if (!empty($this->consumers)) {
-			return $this->consumers;
-		}
-
-		$this->consumers = [];
-		foreach ($this->consumersClosures as $consumer) {
-			$c = $consumer();
-			if ($c instanceof IConsumer) {
-				$this->consumers[] = $c;
-			} else {
-				throw new \InvalidArgumentException('The given consumer does not implement the \OCP\Activity\IConsumer interface');
-			}
-		}
-
-		return $this->consumers;
-	}
-
-	/**
-	 * Generates a new IEvent object
-	 *
-	 * Make sure to call at least the following methods before sending it to the
-	 * app with via the publish() method:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @return IEvent
-	 */
-	public function generateEvent(): IEvent {
-		return new Event($this->validator);
-	}
-
-	/**
-	 * Publish an event to the activity consumers
-	 *
-	 * Make sure to call at least the following methods before sending an Event:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @param IEvent $event
-	 * @throws \BadMethodCallException if required values have not been set
-	 */
-	public function publish(IEvent $event): void {
-		if ($event->getAuthor() === '') {
-			if ($this->session->getUser() instanceof IUser) {
-				$event->setAuthor($this->session->getUser()->getUID());
-			}
-		}
-
-		if (!$event->getTimestamp()) {
-			$event->setTimestamp(time());
-		}
-
-		if (!$event->isValid()) {
-			throw new \BadMethodCallException('The given event is invalid');
-		}
-
-		foreach ($this->getConsumers() as $c) {
-			$c->receive($event);
-		}
-	}
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of OCA\Activity\IConsumer
-	 *
-	 * @param \Closure $callable
-	 */
-	public function registerConsumer(\Closure $callable): void {
-		$this->consumersClosures[] = $callable;
-		$this->consumers = [];
-	}
-
-	/** @var string[] */
-	protected $filterClasses = [];
-
-	/** @var IFilter[] */
-	protected $filters = [];
-
-	/**
-	 * @param string $filter Class must implement OCA\Activity\IFilter
-	 * @return void
-	 */
-	public function registerFilter(string $filter): void {
-		$this->filterClasses[$filter] = false;
-	}
-
-	/**
-	 * @return IFilter[]
-	 * @throws \InvalidArgumentException
-	 */
-	public function getFilters(): array {
-		foreach ($this->filterClasses as $class => $false) {
-			/** @var IFilter $filter */
-			$filter = \OC::$server->query($class);
-
-			if (!$filter instanceof IFilter) {
-				throw new \InvalidArgumentException('Invalid activity filter registered');
-			}
-
-			$this->filters[$filter->getIdentifier()] = $filter;
-
-			unset($this->filterClasses[$class]);
-		}
-		return $this->filters;
-	}
-
-	/**
-	 * @param string $id
-	 * @return IFilter
-	 * @throws \InvalidArgumentException when the filter was not found
-	 * @since 11.0.0
-	 */
-	public function getFilterById(string $id): IFilter {
-		$filters = $this->getFilters();
-
-		if (isset($filters[$id])) {
-			return $filters[$id];
-		}
-
-		throw new \InvalidArgumentException('Requested filter does not exist');
-	}
-
-	/** @var string[] */
-	protected $providerClasses = [];
-
-	/** @var IProvider[] */
-	protected $providers = [];
-
-	/**
-	 * @param string $provider Class must implement OCA\Activity\IProvider
-	 * @return void
-	 */
-	public function registerProvider(string $provider): void {
-		$this->providerClasses[$provider] = false;
-	}
-
-	/**
-	 * @return IProvider[]
-	 * @throws \InvalidArgumentException
-	 */
-	public function getProviders(): array {
-		foreach ($this->providerClasses as $class => $false) {
-			/** @var IProvider $provider */
-			$provider = \OC::$server->query($class);
-
-			if (!$provider instanceof IProvider) {
-				throw new \InvalidArgumentException('Invalid activity provider registered');
-			}
-
-			$this->providers[] = $provider;
-
-			unset($this->providerClasses[$class]);
-		}
-		return $this->providers;
-	}
-
-	/** @var string[] */
-	protected $settingsClasses = [];
-
-	/** @var ISetting[] */
-	protected $settings = [];
-
-	/**
-	 * @param string $setting Class must implement OCA\Activity\ISetting
-	 * @return void
-	 */
-	public function registerSetting(string $setting): void {
-		$this->settingsClasses[$setting] = false;
-	}
-
-	/**
-	 * @return ActivitySettings[]
-	 * @throws \InvalidArgumentException
-	 */
-	public function getSettings(): array {
-		foreach ($this->settingsClasses as $class => $false) {
-			/** @var ISetting $setting */
-			$setting = \OC::$server->query($class);
-
-			if ($setting instanceof ISetting) {
-				if (!$setting instanceof ActivitySettings) {
-					$setting = new ActivitySettingsAdapter($setting, $this->l10n);
-				}
-			} else {
-				throw new \InvalidArgumentException('Invalid activity filter registered');
-			}
-
-			$this->settings[$setting->getIdentifier()] = $setting;
-
-			unset($this->settingsClasses[$class]);
-		}
-		return $this->settings;
-	}
-
-	/**
-	 * @param string $id
-	 * @return ActivitySettings
-	 * @throws \InvalidArgumentException when the setting was not found
-	 * @since 11.0.0
-	 */
-	public function getSettingById(string $id): ActivitySettings {
-		$settings = $this->getSettings();
-
-		if (isset($settings[$id])) {
-			return $settings[$id];
-		}
-
-		throw new \InvalidArgumentException('Requested setting does not exist');
-	}
-
-
-	/**
-	 * @param string $type
-	 * @param int $id
-	 */
-	public function setFormattingObject(string $type, int $id): void {
-		$this->formattingObjectType = $type;
-		$this->formattingObjectId = $id;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isFormattingFilteredObject(): bool {
-		return $this->formattingObjectType !== null && $this->formattingObjectId !== null
-			&& $this->formattingObjectType === $this->request->getParam('object_type')
-			&& $this->formattingObjectId === (int) $this->request->getParam('object_id');
-	}
-
-	/**
-	 * @param bool $status Set to true, when parsing events should not use SVG icons
-	 */
-	public function setRequirePNG(bool $status): void {
-		$this->requirePNG = $status;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function getRequirePNG(): bool {
-		return $this->requirePNG;
-	}
-
-	/**
-	 * Set the user we need to use
-	 *
-	 * @param string|null $currentUserId
-	 * @throws \UnexpectedValueException If the user is invalid
-	 */
-	public function setCurrentUserId(string $currentUserId = null): void {
-		if (!is_string($currentUserId) && $currentUserId !== null) {
-			throw new \UnexpectedValueException('The given current user is invalid');
-		}
-		$this->currentUserId = $currentUserId;
-	}
-
-	/**
-	 * Get the user we need to use
-	 *
-	 * Either the user is logged in, or we try to get it from the token
-	 *
-	 * @return string
-	 * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
-	 */
-	public function getCurrentUserId(): string {
-		if ($this->currentUserId !== null) {
-			return $this->currentUserId;
-		}
-
-		if (!$this->session->isLoggedIn()) {
-			return $this->getUserFromToken();
-		}
-
-		return $this->session->getUser()->getUID();
-	}
-
-	/**
-	 * Get the user for the token
-	 *
-	 * @return string
-	 * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
-	 */
-	protected function getUserFromToken(): string {
-		$token = (string) $this->request->getParam('token', '');
-		if (strlen($token) !== 30) {
-			throw new \UnexpectedValueException('The token is invalid');
-		}
-
-		$users = $this->config->getUsersForUserValue('activity', 'rsstoken', $token);
-
-		if (count($users) !== 1) {
-			// No unique user found
-			throw new \UnexpectedValueException('The token is invalid');
-		}
-
-		// Token found login as that user
-		return array_shift($users);
-	}
+    /** @var IRequest */
+    protected $request;
+
+    /** @var IUserSession */
+    protected $session;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IValidator */
+    protected $validator;
+
+    /** @var string */
+    protected $formattingObjectType;
+
+    /** @var int */
+    protected $formattingObjectId;
+
+    /** @var bool */
+    protected $requirePNG = false;
+
+    /** @var string */
+    protected $currentUserId;
+
+    protected $l10n;
+
+    public function __construct(
+            IRequest $request,
+            IUserSession $session,
+            IConfig $config,
+            IValidator $validator,
+            IL10N $l10n
+    ) {
+        $this->request = $request;
+        $this->session = $session;
+        $this->config = $config;
+        $this->validator = $validator;
+        $this->l10n = $l10n;
+    }
+
+    /** @var \Closure[] */
+    private $consumersClosures = [];
+
+    /** @var IConsumer[] */
+    private $consumers = [];
+
+    /**
+     * @return \OCP\Activity\IConsumer[]
+     */
+    protected function getConsumers(): array {
+        if (!empty($this->consumers)) {
+            return $this->consumers;
+        }
+
+        $this->consumers = [];
+        foreach ($this->consumersClosures as $consumer) {
+            $c = $consumer();
+            if ($c instanceof IConsumer) {
+                $this->consumers[] = $c;
+            } else {
+                throw new \InvalidArgumentException('The given consumer does not implement the \OCP\Activity\IConsumer interface');
+            }
+        }
+
+        return $this->consumers;
+    }
+
+    /**
+     * Generates a new IEvent object
+     *
+     * Make sure to call at least the following methods before sending it to the
+     * app with via the publish() method:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @return IEvent
+     */
+    public function generateEvent(): IEvent {
+        return new Event($this->validator);
+    }
+
+    /**
+     * Publish an event to the activity consumers
+     *
+     * Make sure to call at least the following methods before sending an Event:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @param IEvent $event
+     * @throws \BadMethodCallException if required values have not been set
+     */
+    public function publish(IEvent $event): void {
+        if ($event->getAuthor() === '') {
+            if ($this->session->getUser() instanceof IUser) {
+                $event->setAuthor($this->session->getUser()->getUID());
+            }
+        }
+
+        if (!$event->getTimestamp()) {
+            $event->setTimestamp(time());
+        }
+
+        if (!$event->isValid()) {
+            throw new \BadMethodCallException('The given event is invalid');
+        }
+
+        foreach ($this->getConsumers() as $c) {
+            $c->receive($event);
+        }
+    }
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of OCA\Activity\IConsumer
+     *
+     * @param \Closure $callable
+     */
+    public function registerConsumer(\Closure $callable): void {
+        $this->consumersClosures[] = $callable;
+        $this->consumers = [];
+    }
+
+    /** @var string[] */
+    protected $filterClasses = [];
+
+    /** @var IFilter[] */
+    protected $filters = [];
+
+    /**
+     * @param string $filter Class must implement OCA\Activity\IFilter
+     * @return void
+     */
+    public function registerFilter(string $filter): void {
+        $this->filterClasses[$filter] = false;
+    }
+
+    /**
+     * @return IFilter[]
+     * @throws \InvalidArgumentException
+     */
+    public function getFilters(): array {
+        foreach ($this->filterClasses as $class => $false) {
+            /** @var IFilter $filter */
+            $filter = \OC::$server->query($class);
+
+            if (!$filter instanceof IFilter) {
+                throw new \InvalidArgumentException('Invalid activity filter registered');
+            }
+
+            $this->filters[$filter->getIdentifier()] = $filter;
+
+            unset($this->filterClasses[$class]);
+        }
+        return $this->filters;
+    }
+
+    /**
+     * @param string $id
+     * @return IFilter
+     * @throws \InvalidArgumentException when the filter was not found
+     * @since 11.0.0
+     */
+    public function getFilterById(string $id): IFilter {
+        $filters = $this->getFilters();
+
+        if (isset($filters[$id])) {
+            return $filters[$id];
+        }
+
+        throw new \InvalidArgumentException('Requested filter does not exist');
+    }
+
+    /** @var string[] */
+    protected $providerClasses = [];
+
+    /** @var IProvider[] */
+    protected $providers = [];
+
+    /**
+     * @param string $provider Class must implement OCA\Activity\IProvider
+     * @return void
+     */
+    public function registerProvider(string $provider): void {
+        $this->providerClasses[$provider] = false;
+    }
+
+    /**
+     * @return IProvider[]
+     * @throws \InvalidArgumentException
+     */
+    public function getProviders(): array {
+        foreach ($this->providerClasses as $class => $false) {
+            /** @var IProvider $provider */
+            $provider = \OC::$server->query($class);
+
+            if (!$provider instanceof IProvider) {
+                throw new \InvalidArgumentException('Invalid activity provider registered');
+            }
+
+            $this->providers[] = $provider;
+
+            unset($this->providerClasses[$class]);
+        }
+        return $this->providers;
+    }
+
+    /** @var string[] */
+    protected $settingsClasses = [];
+
+    /** @var ISetting[] */
+    protected $settings = [];
+
+    /**
+     * @param string $setting Class must implement OCA\Activity\ISetting
+     * @return void
+     */
+    public function registerSetting(string $setting): void {
+        $this->settingsClasses[$setting] = false;
+    }
+
+    /**
+     * @return ActivitySettings[]
+     * @throws \InvalidArgumentException
+     */
+    public function getSettings(): array {
+        foreach ($this->settingsClasses as $class => $false) {
+            /** @var ISetting $setting */
+            $setting = \OC::$server->query($class);
+
+            if ($setting instanceof ISetting) {
+                if (!$setting instanceof ActivitySettings) {
+                    $setting = new ActivitySettingsAdapter($setting, $this->l10n);
+                }
+            } else {
+                throw new \InvalidArgumentException('Invalid activity filter registered');
+            }
+
+            $this->settings[$setting->getIdentifier()] = $setting;
+
+            unset($this->settingsClasses[$class]);
+        }
+        return $this->settings;
+    }
+
+    /**
+     * @param string $id
+     * @return ActivitySettings
+     * @throws \InvalidArgumentException when the setting was not found
+     * @since 11.0.0
+     */
+    public function getSettingById(string $id): ActivitySettings {
+        $settings = $this->getSettings();
+
+        if (isset($settings[$id])) {
+            return $settings[$id];
+        }
+
+        throw new \InvalidArgumentException('Requested setting does not exist');
+    }
+
+
+    /**
+     * @param string $type
+     * @param int $id
+     */
+    public function setFormattingObject(string $type, int $id): void {
+        $this->formattingObjectType = $type;
+        $this->formattingObjectId = $id;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isFormattingFilteredObject(): bool {
+        return $this->formattingObjectType !== null && $this->formattingObjectId !== null
+            && $this->formattingObjectType === $this->request->getParam('object_type')
+            && $this->formattingObjectId === (int) $this->request->getParam('object_id');
+    }
+
+    /**
+     * @param bool $status Set to true, when parsing events should not use SVG icons
+     */
+    public function setRequirePNG(bool $status): void {
+        $this->requirePNG = $status;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getRequirePNG(): bool {
+        return $this->requirePNG;
+    }
+
+    /**
+     * Set the user we need to use
+     *
+     * @param string|null $currentUserId
+     * @throws \UnexpectedValueException If the user is invalid
+     */
+    public function setCurrentUserId(string $currentUserId = null): void {
+        if (!is_string($currentUserId) && $currentUserId !== null) {
+            throw new \UnexpectedValueException('The given current user is invalid');
+        }
+        $this->currentUserId = $currentUserId;
+    }
+
+    /**
+     * Get the user we need to use
+     *
+     * Either the user is logged in, or we try to get it from the token
+     *
+     * @return string
+     * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
+     */
+    public function getCurrentUserId(): string {
+        if ($this->currentUserId !== null) {
+            return $this->currentUserId;
+        }
+
+        if (!$this->session->isLoggedIn()) {
+            return $this->getUserFromToken();
+        }
+
+        return $this->session->getUser()->getUID();
+    }
+
+    /**
+     * Get the user for the token
+     *
+     * @return string
+     * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
+     */
+    protected function getUserFromToken(): string {
+        $token = (string) $this->request->getParam('token', '');
+        if (strlen($token) !== 30) {
+            throw new \UnexpectedValueException('The token is invalid');
+        }
+
+        $users = $this->config->getUsersForUserValue('activity', 'rsstoken', $token);
+
+        if (count($users) !== 1) {
+            // No unique user found
+            throw new \UnexpectedValueException('The token is invalid');
+        }
+
+        // Token found login as that user
+        return array_shift($users);
+    }
 }

lib/public/Activity/ActivitySettings.php

Indentation +73 added lines, -73 removed lines

@@ -27,87 +27,87 @@
  * @since 20.0.0
  */
 abstract class ActivitySettings implements ISetting {
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 20.0.0
-	 */
-	abstract public function getIdentifier();
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 20.0.0
+     */
+    abstract public function getIdentifier();
 
-	/**
-	 * @return string A translated string
-	 * @since 20.0.0
-	 */
-	abstract public function getName();
+    /**
+     * @return string A translated string
+     * @since 20.0.0
+     */
+    abstract public function getName();
 
-	/**
-	 * @return string Lowercase a-z and underscore only group identifier
-	 * @since 20.0.0
-	 */
-	abstract public function getGroupIdentifier();
+    /**
+     * @return string Lowercase a-z and underscore only group identifier
+     * @since 20.0.0
+     */
+    abstract public function getGroupIdentifier();
 
-	/**
-	 * @return string A translated string for the settings group
-	 * @since 20.0.0
-	 */
-	abstract public function getGroupName();
+    /**
+     * @return string A translated string for the settings group
+     * @since 20.0.0
+     */
+    abstract public function getGroupName();
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 20.0.0
-	 */
-	abstract public function getPriority();
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 20.0.0
+     */
+    abstract public function getPriority();
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 20.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 20.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the notification
-	 * @since 20.0.0
-	 */
-	public function canChangeNotification() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the notification
+     * @since 20.0.0
+     */
+    public function canChangeNotification() {
+        return true;
+    }
 
-	/**
-	 * @return bool Whether or not an activity email should be send by default
-	 * @since 20.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool Whether or not an activity email should be send by default
+     * @since 20.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 
-	/**
-	 * @return bool Whether or not an activity notification should be send by default
-	 * @since 20.0.0
-	 */
-	public function isDefaultEnabledNotification() {
-		return $this->isDefaultEnabledMail() && !$this->canChangeMail();
-	}
+    /**
+     * @return bool Whether or not an activity notification should be send by default
+     * @since 20.0.0
+     */
+    public function isDefaultEnabledNotification() {
+        return $this->isDefaultEnabledMail() && !$this->canChangeMail();
+    }
 
-	/**
-	 * Left in for backwards compatibility
-	 *
-	 * @return bool
-	 * @since 20.0.0
-	 */
-	public function canChangeStream() {
-		return false;
-	}
+    /**
+     * Left in for backwards compatibility
+     *
+     * @return bool
+     * @since 20.0.0
+     */
+    public function canChangeStream() {
+        return false;
+    }
 
-	/**
-	 * Left in for backwards compatibility
-	 *
-	 * @return bool
-	 * @since 20.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * Left in for backwards compatibility
+     *
+     * @return bool
+     * @since 20.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 }

apps/files_sharing/lib/Activity/Settings/PublicLinks.php

Indentation +51 added lines, -51 removed lines

@@ -24,61 +24,61 @@
 namespace OCA\Files_Sharing\Activity\Settings;
 
 class PublicLinks extends ShareActivitySettings {
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'public_links';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'public_links';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 20;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 20;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }

apps/files_sharing/lib/Activity/Settings/Shared.php

Indentation +51 added lines, -51 removed lines

@@ -25,61 +25,61 @@
 namespace OCA\Files_Sharing\Activity\Settings;
 
 class Shared extends ShareActivitySettings {
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'shared';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'shared';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder has been <strong>shared</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder has been <strong>shared</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 10;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }

apps/files_sharing/lib/Activity/Settings/RemoteShare.php

Indentation +51 added lines, -51 removed lines

@@ -25,61 +25,61 @@
 namespace OCA\Files_Sharing\Activity\Settings;
 
 class RemoteShare extends ShareActivitySettings {
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'remote_share';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'remote_share';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder was shared from <strong>another server</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder was shared from <strong>another server</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 11;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 11;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }

apps/files_sharing/lib/Activity/Settings/ShareActivitySettings.php

Indentation +14 added lines, -14 removed lines

@@ -27,21 +27,21 @@
 use OCP\IL10N;
 
 abstract class ShareActivitySettings extends ActivitySettings {
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	public function getGroupIdentifier() {
-		return 'files';
-	}
+    public function getGroupIdentifier() {
+        return 'files';
+    }
 
-	public function getGroupName() {
-		return $this->l->t('Files');
-	}
+    public function getGroupName() {
+        return $this->l->t('Files');
+    }
 }

apps/dav/lib/Upload/ChunkingPlugin.php

Indentation +83 added lines, -83 removed lines

@@ -35,97 +35,97 @@
 
 class ChunkingPlugin extends ServerPlugin {
 
-	/** @var Server */
-	private $server;
-	/** @var FutureFile */
-	private $sourceNode;
+    /** @var Server */
+    private $server;
+    /** @var FutureFile */
+    private $sourceNode;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function initialize(Server $server) {
-		$server->on('beforeMove', [$this, 'beforeMove']);
-		$this->server = $server;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function initialize(Server $server) {
+        $server->on('beforeMove', [$this, 'beforeMove']);
+        $this->server = $server;
+    }
 
-	/**
-	 * @param string $sourcePath source path
-	 * @param string $destination destination path
-	 * @return bool|void
-	 * @throws BadRequest
-	 * @throws NotFound
-	 */
-	public function beforeMove($sourcePath, $destination) {
-		$this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
-		if (!$this->sourceNode instanceof FutureFile) {
-			// skip handling as the source is not a chunked FutureFile
-			return;
-		}
+    /**
+     * @param string $sourcePath source path
+     * @param string $destination destination path
+     * @return bool|void
+     * @throws BadRequest
+     * @throws NotFound
+     */
+    public function beforeMove($sourcePath, $destination) {
+        $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
+        if (!$this->sourceNode instanceof FutureFile) {
+            // skip handling as the source is not a chunked FutureFile
+            return;
+        }
 
-		try {
-			/** @var INode $destinationNode */
-			$destinationNode = $this->server->tree->getNodeForPath($destination);
-			if ($destinationNode instanceof Directory) {
-				throw new BadRequest("The given destination $destination is a directory.");
-			}
-		} catch (NotFound $e) {
-			// If the destination does not exist yet it's not a directory either ;)
-		}
+        try {
+            /** @var INode $destinationNode */
+            $destinationNode = $this->server->tree->getNodeForPath($destination);
+            if ($destinationNode instanceof Directory) {
+                throw new BadRequest("The given destination $destination is a directory.");
+            }
+        } catch (NotFound $e) {
+            // If the destination does not exist yet it's not a directory either ;)
+        }
 
-		$this->verifySize();
-		return $this->performMove($sourcePath, $destination);
-	}
+        $this->verifySize();
+        return $this->performMove($sourcePath, $destination);
+    }
 
-	/**
-	 * Move handler for future file.
-	 *
-	 * This overrides the default move behavior to prevent Sabre
-	 * to delete the target file before moving. Because deleting would
-	 * lose the file id and metadata.
-	 *
-	 * @param string $path source path
-	 * @param string $destination destination path
-	 * @return bool|void false to stop handling, void to skip this handler
-	 */
-	public function performMove($path, $destination) {
-		$fileExists = $this->server->tree->nodeExists($destination);
-		// do a move manually, skipping Sabre's default "delete" for existing nodes
-		try {
-			$this->server->tree->move($path, $destination);
-		} catch (Forbidden $e) {
-			$sourceNode = $this->server->tree->getNodeForPath($path);
-			if ($sourceNode instanceof FutureFile) {
-				$sourceNode->delete();
-			}
-			throw $e;
-		}
+    /**
+     * Move handler for future file.
+     *
+     * This overrides the default move behavior to prevent Sabre
+     * to delete the target file before moving. Because deleting would
+     * lose the file id and metadata.
+     *
+     * @param string $path source path
+     * @param string $destination destination path
+     * @return bool|void false to stop handling, void to skip this handler
+     */
+    public function performMove($path, $destination) {
+        $fileExists = $this->server->tree->nodeExists($destination);
+        // do a move manually, skipping Sabre's default "delete" for existing nodes
+        try {
+            $this->server->tree->move($path, $destination);
+        } catch (Forbidden $e) {
+            $sourceNode = $this->server->tree->getNodeForPath($path);
+            if ($sourceNode instanceof FutureFile) {
+                $sourceNode->delete();
+            }
+            throw $e;
+        }
 
-		// trigger all default events (copied from CorePlugin::move)
-		$this->server->emit('afterMove', [$path, $destination]);
-		$this->server->emit('afterUnbind', [$path]);
-		$this->server->emit('afterBind', [$destination]);
+        // trigger all default events (copied from CorePlugin::move)
+        $this->server->emit('afterMove', [$path, $destination]);
+        $this->server->emit('afterUnbind', [$path]);
+        $this->server->emit('afterBind', [$destination]);
 
-		$response = $this->server->httpResponse;
-		$response->setHeader('Content-Length', '0');
-		$response->setStatus($fileExists ? 204 : 201);
+        $response = $this->server->httpResponse;
+        $response->setHeader('Content-Length', '0');
+        $response->setStatus($fileExists ? 204 : 201);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * @throws BadRequest
-	 */
-	private function verifySize() {
-		$expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length');
-		if ($expectedSize === null) {
-			return;
-		}
-		$actualSize = $this->sourceNode->getSize();
+    /**
+     * @throws BadRequest
+     */
+    private function verifySize() {
+        $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length');
+        if ($expectedSize === null) {
+            return;
+        }
+        $actualSize = $this->sourceNode->getSize();
 
-		// casted to string because cast to float cause equality for non equal numbers
-		// and integer has the problem of limited size on 32 bit systems
-		if ((string)$expectedSize !== (string)$actualSize) {
-			throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
-		}
-	}
+        // casted to string because cast to float cause equality for non equal numbers
+        // and integer has the problem of limited size on 32 bit systems
+        if ((string)$expectedSize !== (string)$actualSize) {
+            throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
+        }
+    }
 }