nextcloud / server

apps/files/lib/Activity/FavoriteProvider.php

Indentation +143 added lines, -143 removed lines

@@ -31,147 +31,147 @@
 
 class FavoriteProvider implements IProvider {
 
-	const SUBJECT_ADDED = 'added_favorite';
-	const SUBJECT_REMOVED = 'removed_favorite';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IEventMerger $eventMerger) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'files' || $event->getType() !== 'favorite') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-
-		if ($event->getSubject() === self::SUBJECT_ADDED) {
-			$event->setParsedSubject($this->l->t('Added to favorites'));
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
-			$event->setParsedSubject($this->l->t('Removed from favorites'));
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
-
-		if ($event->getSubject() === self::SUBJECT_ADDED) {
-			$subject = $this->l->t('You added {file} to your favorites');
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
-			$subject = $this->l->t('You removed {file} from your favorites');
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->setSubjects($event, $subject);
-		$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 */
-	protected function setSubjects(IEvent $event, $subject) {
-		$subjectParams = $event->getSubjectParameters();
-		if (empty($subjectParams)) {
-			// Try to fall back to the old way, but this does not work for emails.
-			// But at least old activities still work.
-			$subjectParams = [
-				'id' => $event->getObjectId(),
-				'path' => $event->getObjectName(),
-			];
-		}
-		$parameter = [
-			'type' => 'file',
-			'id' => $subjectParams['id'],
-			'name' => basename($subjectParams['path']),
-			'path' => trim($subjectParams['path'], '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $subjectParams['id']]),
-		];
-
-		$event->setParsedSubject(str_replace('{file}', $parameter['path'], $subject))
-			->setRichSubject($subject, ['file' => $parameter]);
-	}
+    const SUBJECT_ADDED = 'added_favorite';
+    const SUBJECT_REMOVED = 'removed_favorite';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IEventMerger $eventMerger) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'files' || $event->getType() !== 'favorite') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+
+        if ($event->getSubject() === self::SUBJECT_ADDED) {
+            $event->setParsedSubject($this->l->t('Added to favorites'));
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_REMOVED) {
+            $event->setParsedSubject($this->l->t('Removed from favorites'));
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
+
+        if ($event->getSubject() === self::SUBJECT_ADDED) {
+            $subject = $this->l->t('You added {file} to your favorites');
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_REMOVED) {
+            $subject = $this->l->t('You removed {file} from your favorites');
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->setSubjects($event, $subject);
+        $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     */
+    protected function setSubjects(IEvent $event, $subject) {
+        $subjectParams = $event->getSubjectParameters();
+        if (empty($subjectParams)) {
+            // Try to fall back to the old way, but this does not work for emails.
+            // But at least old activities still work.
+            $subjectParams = [
+                'id' => $event->getObjectId(),
+                'path' => $event->getObjectName(),
+            ];
+        }
+        $parameter = [
+            'type' => 'file',
+            'id' => $subjectParams['id'],
+            'name' => basename($subjectParams['path']),
+            'path' => trim($subjectParams['path'], '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $subjectParams['id']]),
+        ];
+
+        $event->setParsedSubject(str_replace('{file}', $parameter['path'], $subject))
+            ->setRichSubject($subject, ['file' => $parameter]);
+    }
 }

settings/Activity/Provider.php

Indentation +153 added lines, -153 removed lines

@@ -32,157 +32,157 @@
 
 class Provider implements IProvider {
 
-	const PASSWORD_CHANGED_BY = 'password_changed_by';
-	const PASSWORD_CHANGED_SELF = 'password_changed_self';
-	const PASSWORD_RESET = 'password_changed';
-	const EMAIL_CHANGED_BY = 'email_changed_by';
-	const EMAIL_CHANGED_SELF = 'email_changed_self';
-	const EMAIL_CHANGED = 'email_changed';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var string[] cached displayNames - key is the UID and value the displayname */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IUserManager $userManager
-	 * @param IManager $activityManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IUserManager $userManager, IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->userManager = $userManager;
-		$this->activityManager = $activityManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'settings') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('settings', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
-		}
-
-		if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your password');
-		} else if ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your password');
-		} else if ($event->getSubject() === self::PASSWORD_RESET) {
-			$subject = $this->l->t('Your password was reset by an administrator');
-
-		} else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
-			$subject = $this->l->t('{actor} changed your email address');
-		} else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
-			$subject = $this->l->t('You changed your email address');
-		} else if ($event->getSubject() === self::EMAIL_CHANGED) {
-			$subject = $this->l->t('Your email address was changed by an administrator');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::PASSWORD_CHANGED_SELF:
-			case self::PASSWORD_RESET:
-			case self::EMAIL_CHANGED_SELF:
-			case self::EMAIL_CHANGED:
-				return [];
-			case self::PASSWORD_CHANGED_BY:
-			case self::EMAIL_CHANGED_BY:
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		}
-
-		return $uid;
-	}
+    const PASSWORD_CHANGED_BY = 'password_changed_by';
+    const PASSWORD_CHANGED_SELF = 'password_changed_self';
+    const PASSWORD_RESET = 'password_changed';
+    const EMAIL_CHANGED_BY = 'email_changed_by';
+    const EMAIL_CHANGED_SELF = 'email_changed_self';
+    const EMAIL_CHANGED = 'email_changed';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    private $activityManager;
+
+    /** @var string[] cached displayNames - key is the UID and value the displayname */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IUserManager $userManager
+     * @param IManager $activityManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IUserManager $userManager, IManager $activityManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->userManager = $userManager;
+        $this->activityManager = $activityManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'settings') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('settings', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('settings', 'personal.svg')));
+        }
+
+        if ($event->getSubject() === self::PASSWORD_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your password');
+        } else if ($event->getSubject() === self::PASSWORD_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your password');
+        } else if ($event->getSubject() === self::PASSWORD_RESET) {
+            $subject = $this->l->t('Your password was reset by an administrator');
+
+        } else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
+            $subject = $this->l->t('{actor} changed your email address');
+        } else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
+            $subject = $this->l->t('You changed your email address');
+        } else if ($event->getSubject() === self::EMAIL_CHANGED) {
+            $subject = $this->l->t('Your email address was changed by an administrator');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::PASSWORD_CHANGED_SELF:
+            case self::PASSWORD_RESET:
+            case self::EMAIL_CHANGED_SELF:
+            case self::EMAIL_CHANGED:
+                return [];
+            case self::PASSWORD_CHANGED_BY:
+            case self::EMAIL_CHANGED_BY:
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        }
+
+        return $uid;
+    }
 }

lib/public/Activity/IManager.php

Indentation +258 added lines, -258 removed lines

@@ -39,262 +39,262 @@
  * @since 6.0.0
  */
 interface IManager {
-	/**
-	 * 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
-	 * @since 8.2.0
-	 */
-	public function generateEvent();
-
-	/**
-	 * 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
-	 * @since 8.2.0
-	 */
-	public function publish(IEvent $event);
-
-	/**
-	 * @param string $app           The app where this event is associated with
-	 * @param string $subject       A short description of the event
-	 * @param array  $subjectParams Array with parameters that are filled in the subject
-	 * @param string $message       A longer description of the event
-	 * @param array  $messageParams Array with parameters that are filled in the message
-	 * @param string $file          The file including path where this event is associated with
-	 * @param string $link          A link where this event is associated with
-	 * @param string $affectedUser  Recipient of the activity
-	 * @param string $type          Type of the notification
-	 * @param int    $priority      Priority of the notification
-	 * @since 6.0.0
-	 * @deprecated 8.2.0 Grab an IEvent from generateEvent() instead and use the publish() method
-	 */
-	public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority);
-
-	/**
-	 * 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 \OCP\Activity\IConsumer
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerConsumer(\Closure $callable);
-
-	/**
-	 * 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 \OCP\Activity\IExtension
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 8.0.0
-	 */
-	public function registerExtension(\Closure $callable);
-
-	/**
-	 * @param string $filter Class must implement OCA\Activity\IFilter
-	 * @return void
-	 * @since 11.0.0
-	 */
-	public function registerFilter($filter);
-
-	/**
-	 * @return IFilter[]
-	 * @since 11.0.0
-	 */
-	public function getFilters();
-
-	/**
-	 * @param string $id
-	 * @return IFilter
-	 * @throws \InvalidArgumentException when the filter was not found
-	 * @since 11.0.0
-	 */
-	public function getFilterById($id);
-
-	/**
-	 * @param string $setting Class must implement OCA\Activity\ISetting
-	 * @return void
-	 * @since 11.0.0
-	 */
-	public function registerSetting($setting);
-
-	/**
-	 * @return ISetting[]
-	 * @since 11.0.0
-	 */
-	public function getSettings();
-
-	/**
-	 * @param string $provider Class must implement OCA\Activity\IProvider
-	 * @return void
-	 * @since 11.0.0
-	 */
-	public function registerProvider($provider);
-
-	/**
-	 * @return IProvider[]
-	 * @since 11.0.0
-	 */
-	public function getProviders();
-
-	/**
-	 * @param string $id
-	 * @return ISetting
-	 * @throws \InvalidArgumentException when the setting was not found
-	 * @since 11.0.0
-	 */
-	public function getSettingById($id);
-
-	/**
-	 * Will return additional notification types as specified by other apps
-	 *
-	 * @param string $languageCode
-	 * @return array Array "stringID of the type" => "translated string description for the setting"
-	 * 				or Array "stringID of the type" => [
-	 * 					'desc' => "translated string description for the setting"
-	 * 					'methods' => [\OCP\Activity\IExtension::METHOD_*],
-	 * 				]
-	 * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
-	 * @deprecated 11.0.0 - Use getSettings() instead
-	 */
-	public function getNotificationTypes($languageCode);
-
-	/**
-	 * @param string $method
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getSettings()->isDefaulEnabled<method>() instead
-	 */
-	public function getDefaultTypes($method);
-
-	/**
-	 * @param string $type
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getTypeIcon($type);
-
-	/**
-	 * @param string $type
-	 * @param int $id
-	 * @since 8.2.0
-	 */
-	public function setFormattingObject($type, $id);
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isFormattingFilteredObject();
-
-	/**
-	 * @param bool $status Set to true, when parsing events should not use SVG icons
-	 * @since 12.0.1
-	 */
-	public function setRequirePNG($status);
-
-	/**
-	 * @return bool
-	 * @since 12.0.1
-	 */
-	public function getRequirePNG();
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @param array $params
-	 * @param boolean $stripPath
-	 * @param boolean $highlightParams
-	 * @param string $languageCode
-	 * @return string|false
-	 * @since 8.0.0
-	 */
-	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function getSpecialParameterList($app, $text);
-
-	/**
-	 * @param array $activity
-	 * @return integer|false
-	 * @since 8.0.0
-	 */
-	public function getGroupParameter($activity);
-
-
-	/**
-	 * Set the user we need to use
-	 *
-	 * @param string|null $currentUserId
-	 * @throws \UnexpectedValueException If the user is invalid
-	 * @since 9.0.1
-	 */
-	public function setCurrentUserId($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
-	 * @since 8.1.0
-	 */
-	public function getCurrentUserId();
-
-	/**
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilters() instead
-	 */
-	public function getNavigation();
-
-	/**
-	 * @param string $filterValue
-	 * @return boolean
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilterById() instead
-	 */
-	public function isFilterValid($filterValue);
-
-	/**
-	 * @param array $types
-	 * @param string $filter
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilterById()->filterTypes() instead
-	 */
-	public function filterNotificationTypes($types, $filter);
-
-	/**
-	 * @param string $filter
-	 * @return array
-	 * @since 8.0.0
-	 * @deprecated 11.0.0 - Use getFilterById() instead
-	 */
-	public function getQueryForFilter($filter);
+    /**
+     * 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
+     * @since 8.2.0
+     */
+    public function generateEvent();
+
+    /**
+     * 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
+     * @since 8.2.0
+     */
+    public function publish(IEvent $event);
+
+    /**
+     * @param string $app           The app where this event is associated with
+     * @param string $subject       A short description of the event
+     * @param array  $subjectParams Array with parameters that are filled in the subject
+     * @param string $message       A longer description of the event
+     * @param array  $messageParams Array with parameters that are filled in the message
+     * @param string $file          The file including path where this event is associated with
+     * @param string $link          A link where this event is associated with
+     * @param string $affectedUser  Recipient of the activity
+     * @param string $type          Type of the notification
+     * @param int    $priority      Priority of the notification
+     * @since 6.0.0
+     * @deprecated 8.2.0 Grab an IEvent from generateEvent() instead and use the publish() method
+     */
+    public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority);
+
+    /**
+     * 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 \OCP\Activity\IConsumer
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerConsumer(\Closure $callable);
+
+    /**
+     * 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 \OCP\Activity\IExtension
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 8.0.0
+     */
+    public function registerExtension(\Closure $callable);
+
+    /**
+     * @param string $filter Class must implement OCA\Activity\IFilter
+     * @return void
+     * @since 11.0.0
+     */
+    public function registerFilter($filter);
+
+    /**
+     * @return IFilter[]
+     * @since 11.0.0
+     */
+    public function getFilters();
+
+    /**
+     * @param string $id
+     * @return IFilter
+     * @throws \InvalidArgumentException when the filter was not found
+     * @since 11.0.0
+     */
+    public function getFilterById($id);
+
+    /**
+     * @param string $setting Class must implement OCA\Activity\ISetting
+     * @return void
+     * @since 11.0.0
+     */
+    public function registerSetting($setting);
+
+    /**
+     * @return ISetting[]
+     * @since 11.0.0
+     */
+    public function getSettings();
+
+    /**
+     * @param string $provider Class must implement OCA\Activity\IProvider
+     * @return void
+     * @since 11.0.0
+     */
+    public function registerProvider($provider);
+
+    /**
+     * @return IProvider[]
+     * @since 11.0.0
+     */
+    public function getProviders();
+
+    /**
+     * @param string $id
+     * @return ISetting
+     * @throws \InvalidArgumentException when the setting was not found
+     * @since 11.0.0
+     */
+    public function getSettingById($id);
+
+    /**
+     * Will return additional notification types as specified by other apps
+     *
+     * @param string $languageCode
+     * @return array Array "stringID of the type" => "translated string description for the setting"
+     * 				or Array "stringID of the type" => [
+     * 					'desc' => "translated string description for the setting"
+     * 					'methods' => [\OCP\Activity\IExtension::METHOD_*],
+     * 				]
+     * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
+     * @deprecated 11.0.0 - Use getSettings() instead
+     */
+    public function getNotificationTypes($languageCode);
+
+    /**
+     * @param string $method
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getSettings()->isDefaulEnabled<method>() instead
+     */
+    public function getDefaultTypes($method);
+
+    /**
+     * @param string $type
+     * @return string
+     * @since 8.0.0
+     */
+    public function getTypeIcon($type);
+
+    /**
+     * @param string $type
+     * @param int $id
+     * @since 8.2.0
+     */
+    public function setFormattingObject($type, $id);
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isFormattingFilteredObject();
+
+    /**
+     * @param bool $status Set to true, when parsing events should not use SVG icons
+     * @since 12.0.1
+     */
+    public function setRequirePNG($status);
+
+    /**
+     * @return bool
+     * @since 12.0.1
+     */
+    public function getRequirePNG();
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @param array $params
+     * @param boolean $stripPath
+     * @param boolean $highlightParams
+     * @param string $languageCode
+     * @return string|false
+     * @since 8.0.0
+     */
+    public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function getSpecialParameterList($app, $text);
+
+    /**
+     * @param array $activity
+     * @return integer|false
+     * @since 8.0.0
+     */
+    public function getGroupParameter($activity);
+
+
+    /**
+     * Set the user we need to use
+     *
+     * @param string|null $currentUserId
+     * @throws \UnexpectedValueException If the user is invalid
+     * @since 9.0.1
+     */
+    public function setCurrentUserId($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
+     * @since 8.1.0
+     */
+    public function getCurrentUserId();
+
+    /**
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilters() instead
+     */
+    public function getNavigation();
+
+    /**
+     * @param string $filterValue
+     * @return boolean
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilterById() instead
+     */
+    public function isFilterValid($filterValue);
+
+    /**
+     * @param array $types
+     * @param string $filter
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilterById()->filterTypes() instead
+     */
+    public function filterNotificationTypes($types, $filter);
+
+    /**
+     * @param string $filter
+     * @return array
+     * @since 8.0.0
+     * @deprecated 11.0.0 - Use getFilterById() instead
+     */
+    public function getQueryForFilter($filter);
 }

settings/templates/settings/empty.php

Indentation +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
  *
  */
 
-	# used for Personal/Additional settings as fallback for legacy settings
+    # used for Personal/Additional settings as fallback for legacy settings
 ?>

apps/twofactor_backupcodes/lib/AppInfo/Application.php

Indentation +20 added lines, -20 removed lines

@@ -28,27 +28,27 @@
 use OCP\Util;
 
 class Application extends App {
-	public function __construct () {
-		parent::__construct('twofactor_backupcodes');
-	}
+    public function __construct () {
+        parent::__construct('twofactor_backupcodes');
+    }
 
-	/**
-	 * Register the different app parts
-	 */
-	public function register() {
-		$this->registerHooksAndEvents();
-	}
+    /**
+     * Register the different app parts
+     */
+    public function register() {
+        $this->registerHooksAndEvents();
+    }
 
-	/**
-	 * Register the hooks and events
-	 */
-	public function registerHooksAndEvents() {
-		Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
-	}
+    /**
+     * Register the hooks and events
+     */
+    public function registerHooksAndEvents() {
+        Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
+    }
 
-	public function deleteUser($params) {
-		/** @var BackupCodeMapper $mapper */
-		$mapper = $this->getContainer()->query(BackupCodeMapper::class);
-		$mapper->deleteCodesByUserId($params['uid']);
-	}
+    public function deleteUser($params) {
+        /** @var BackupCodeMapper $mapper */
+        $mapper = $this->getContainer()->query(BackupCodeMapper::class);
+        $mapper->deleteCodesByUserId($params['uid']);
+    }
 }

apps/federatedfilesharing/lib/Settings/PersonalSection.php

Indentation +49 added lines, -49 removed lines

@@ -29,58 +29,58 @@
 use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection {
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
-	}
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l = $l;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 13.0.0
-	 */
-	public function getIcon() {
-		return $this->urlGenerator->imagePath('core', 'actions/share.svg');
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 13.0.0
+     */
+    public function getIcon() {
+        return $this->urlGenerator->imagePath('core', 'actions/share.svg');
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 * @since 9.1
-	 */
-	public function getID() {
-		return 'sharing';
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     * @since 9.1
+     */
+    public function getID() {
+        return 'sharing';
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 * @since 9.1
-	 */
-	public function getName() {
-		return $this->l->t('Sharing');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     * @since 9.1
+     */
+    public function getName() {
+        return $this->l->t('Sharing');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 15;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 15;
+    }
 }

lib/private/Settings/Admin/Encryption.php

Indentation +52 added lines, -52 removed lines

@@ -29,63 +29,63 @@
 use OCP\Settings\ISettings;
 
 class Encryption implements ISettings {
-	/** @var IManager */
-	private $manager;
+    /** @var IManager */
+    private $manager;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/**
-	 * @param IManager $manager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IManager $manager, IUserManager $userManager) {
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param IManager $manager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IManager $manager, IUserManager $userManager) {
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$encryptionModules = $this->manager->getEncryptionModules();
-		$defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
-		$encryptionModuleList = [];
-		foreach ($encryptionModules as $module) {
-			$encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
-			$encryptionModuleList[$module['id']]['default'] = false;
-			if ($module['id'] === $defaultEncryptionModuleId) {
-				$encryptionModuleList[$module['id']]['default'] = true;
-			}
-		}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $encryptionModules = $this->manager->getEncryptionModules();
+        $defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
+        $encryptionModuleList = [];
+        foreach ($encryptionModules as $module) {
+            $encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
+            $encryptionModuleList[$module['id']]['default'] = false;
+            if ($module['id'] === $defaultEncryptionModuleId) {
+                $encryptionModuleList[$module['id']]['default'] = true;
+            }
+        }
 
-		$parameters = [
-			// Encryption API
-			'encryptionEnabled'       => $this->manager->isEnabled(),
-			'encryptionReady'         => $this->manager->isReady(),
-			'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
-			// Modules
-			'encryptionModules'       => $encryptionModuleList,
-		];
+        $parameters = [
+            // Encryption API
+            'encryptionEnabled'       => $this->manager->isEnabled(),
+            'encryptionReady'         => $this->manager->isReady(),
+            'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
+            // Modules
+            'encryptionModules'       => $encryptionModuleList,
+        ];
 
-		return new TemplateResponse('settings', 'settings/admin/encryption', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'settings/admin/encryption', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'encryption';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'encryption';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
 }

lib/private/Settings/Admin/TipsTricks.php

Indentation +34 added lines, -34 removed lines

@@ -28,44 +28,44 @@
 use OCP\Settings\ISettings;
 
 class TipsTricks implements ISettings {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$databaseOverload = (strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false);
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $databaseOverload = (strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false);
 
-		$parameters = [
-			'databaseOverload' => $databaseOverload,
-		];
+        $parameters = [
+            'databaseOverload' => $databaseOverload,
+        ];
 
-		return new TemplateResponse('settings', 'settings/admin/tipstricks', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'settings/admin/tipstricks', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'tips-tricks';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'tips-tricks';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
 }

lib/private/Settings/Admin/ServerDevNotice.php

Indentation +22 added lines, -22 removed lines

@@ -26,28 +26,28 @@
 use OCP\Settings\ISettings;
 
 class ServerDevNotice implements ISettings {
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		return new TemplateResponse('settings', 'settings/admin/server.development.notice');
-	}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        return new TemplateResponse('settings', 'settings/admin/server.development.notice');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'server';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'server';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 1000;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 1000;
+    }
 }