summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-04-13 11:58:19 +0200
committerJoas Schilling <coding@schilljs.com>2017-04-13 12:01:10 +0200
commit0eb08a510b7393da0067750e01cdae8a4d1d009a (patch)
tree2d81b735e53c31d9e074984d0588107955f607c3
parent49fd41b21f43831198ec64aeeeaa46ecdf87849e (diff)
downloadnextcloud-server-0eb08a510b7393da0067750e01cdae8a4d1d009a.tar.gz
nextcloud-server-0eb08a510b7393da0067750e01cdae8a4d1d009a.zip
Move logic into new class with DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--settings/Application.php97
-rw-r--r--settings/Hooks.php138
2 files changed, 155 insertions, 80 deletions
diff --git a/settings/Application.php b/settings/Application.php
index c52fe6393e2..c54c8928b51 100644
--- a/settings/Application.php
+++ b/settings/Application.php
@@ -42,8 +42,6 @@ use OC\Settings\Middleware\SubadminMiddleware;
use OCP\AppFramework\App;
use OCP\Defaults;
use OCP\IContainer;
-use OCP\IL10N;
-use OCP\IUser;
use OCP\Settings\IManager;
use OCP\Util;
@@ -139,7 +137,7 @@ class Application extends App {
$activityManager->registerSetting(Setting::class); // FIXME move to info.xml
$activityManager->registerProvider(Provider::class); // FIXME move to info.xml
- Util::connectHook('OC_User', 'post_setPassword', $this, 'onPasswordChange');
+ Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
}
@@ -148,89 +146,28 @@ class Application extends App {
* @throws \InvalidArgumentException
* @throws \BadMethodCallException
* @throws \Exception
+ * @throws \OCP\AppFramework\QueryException
*/
- public function onPasswordChange(array $parameters) {
- $userManager = $this->getContainer()->getServer()->getUserManager();
- $user = $userManager->get($parameters['uid']);
-
- if (!$user instanceof IUser || $user->getEMailAddress() === null) {
- return;
- }
-
- $activityManager = $this->getContainer()->getServer()->getActivityManager();
- $event = $activityManager->generateEvent();
- $event->setApp('settings')
- ->setType('personal_settings')
- ->setAffectedUser($user->getUID());
-
- /** @var IL10N $l */
- $l = $this->getContainer()->query(IL10N::class);
- $urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
- $instanceUrl = $urlGenerator->getAbsoluteURL('/');
-
- $actor = $this->getContainer()->getServer()->getUserSession()->getUser();
- if ($actor instanceof IUser) {
- if ($actor->getUID() !== $user->getUID()) {
- $text = $l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
- $event->setAuthor($actor->getUID())
- ->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
- } else {
- $text = $l->t('Your password on %s was changed.', [$instanceUrl]);
- $event->setAuthor($actor->getUID())
- ->setSubject(Provider::PASSWORD_CHANGED_SELF);
- }
- } else {
- $text = $l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
- $event->setSubject(Provider::PASSWORD_RESET);
- }
-
- $activityManager->publish($event);
-
- if ($user->getEMailAddress() !== null) {
- $mailer = $this->getContainer()->getServer()->getMailer();
- $template = $mailer->createEMailTemplate();
- $template->addHeader();
- $template->addHeading($l->t('Password changed for %s', $user->getDisplayName()), false);
- $template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator as soon as possible.'));
- $template->addFooter();
-
-
- $message = $mailer->createMessage();
- $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
- $message->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
- $message->setBody($template->renderText(), 'text/plain');
- $message->setHtmlBody($template->renderHTML());
-
- $mailer->send($message);
- }
+ public function onChangePassword(array $parameters) {
+ /** @var Hooks $hooks */
+ $hooks = $this->getContainer()->query(Hooks::class);
+ $hooks->onChangePassword($parameters['uid']);
}
- public function onChangeInfo($parameters) {
+ /**
+ * @param array $parameters
+ * @throws \InvalidArgumentException
+ * @throws \BadMethodCallException
+ * @throws \Exception
+ * @throws \OCP\AppFramework\QueryException
+ */
+ public function onChangeInfo(array $parameters) {
if ($parameters['feature'] !== 'eMailAddress') {
return;
}
- /** @var IUser $user */
- $user = $parameters['user'];
-
- $activityManager = $this->getContainer()->getServer()->getActivityManager();
- $event = $activityManager->generateEvent();
- $event->setApp('settings')
- ->setType('personal_settings')
- ->setAffectedUser($user->getUID());
-
- $actor = $this->getContainer()->getServer()->getUserSession()->getUser();
- if ($actor instanceof IUser) {
- if ($actor->getUID() !== $user->getUID()) {
- $event->setAuthor($actor->getUID())
- ->setSubject(Provider::EMAIL_CHANGED_BY, [$actor->getUID()]);
- } else {
- $event->setAuthor($actor->getUID())
- ->setSubject(Provider::EMAIL_CHANGED_SELF);
- }
- } else {
- $event->setSubject(Provider::EMAIL_CHANGED);
- }
- $activityManager->publish($event);
+ /** @var Hooks $hooks */
+ $hooks = $this->getContainer()->query(Hooks::class);
+ $hooks->onChangeEmail($parameters['user']);
}
}
diff --git a/settings/Hooks.php b/settings/Hooks.php
new file mode 100644
index 00000000000..cc445d3fafb
--- /dev/null
+++ b/settings/Hooks.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Settings;
+
+use OC\Settings\Activity\Provider;
+use OCP\Activity\IManager as IActivityManager;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\Mail\IMailer;
+
+class Hooks {
+
+ /** @var IActivityManager */
+ protected $activityManager;
+ /** @var IUserManager */
+ protected $userManager;
+ /** @var IUserSession */
+ protected $userSession;
+ /** @var IURLGenerator */
+ protected $urlGenerator;
+ /** @var IMailer */
+ protected $mailer;
+ /** @var IL10N */
+ protected $l;
+
+ public function __construct(IActivityManager $activityManager, IUserManager $userManager, IUserSession $userSession, IURLGenerator $urlGenerator, IMailer $mailer, IL10N $l) {
+ $this->activityManager = $activityManager;
+ $this->userManager = $userManager;
+ $this->userSession = $userSession;
+ $this->urlGenerator = $urlGenerator;
+ $this->mailer = $mailer;
+ $this->l = $l;
+ }
+
+ /**
+ * @param string $uid
+ * @throws \InvalidArgumentException
+ * @throws \BadMethodCallException
+ * @throws \Exception
+ */
+ public function onChangePassword($uid) {
+ $user = $this->userManager->get($uid);
+
+ if (!$user instanceof IUser || $user->getEMailAddress() === null) {
+ return;
+ }
+
+ $event = $this->activityManager->generateEvent();
+ $event->setApp('settings')
+ ->setType('personal_settings')
+ ->setAffectedUser($user->getUID());
+
+ $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+
+ $actor = $this->userSession->getUser();
+ if ($actor instanceof IUser) {
+ if ($actor->getUID() !== $user->getUID()) {
+ $text = $this->l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
+ $event->setAuthor($actor->getUID())
+ ->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
+ } else {
+ $text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
+ $event->setAuthor($actor->getUID())
+ ->setSubject(Provider::PASSWORD_CHANGED_SELF);
+ }
+ } else {
+ $text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
+ $event->setSubject(Provider::PASSWORD_RESET);
+ }
+
+ $this->activityManager->publish($event);
+
+ if ($user->getEMailAddress() !== null) {
+ $template = $this->mailer->createEMailTemplate();
+ $template->addHeader();
+ $template->addHeading($this->l->t('Password changed for %s', $user->getDisplayName()), false);
+ $template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+ $template->addFooter();
+
+
+ $message = $this->mailer->createMessage();
+ $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
+ $message->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+ $message->setBody($template->renderText(), 'text/plain');
+ $message->setHtmlBody($template->renderHTML());
+
+ $this->mailer->send($message);
+ }
+ }
+
+ /**
+ * @param IUser $user
+ * @throws \InvalidArgumentException
+ * @throws \BadMethodCallException
+ */
+ public function onChangeEmail(IUser $user) {
+ $event = $this->activityManager->generateEvent();
+ $event->setApp('settings')
+ ->setType('personal_settings')
+ ->setAffectedUser($user->getUID());
+
+ $actor = $this->userSession->getUser();
+ if ($actor instanceof IUser) {
+ if ($actor->getUID() !== $user->getUID()) {
+ $event->setAuthor($actor->getUID())
+ ->setSubject(Provider::EMAIL_CHANGED_BY, [$actor->getUID()]);
+ } else {
+ $event->setAuthor($actor->getUID())
+ ->setSubject(Provider::EMAIL_CHANGED_SELF);
+ }
+ } else {
+ $event->setSubject(Provider::EMAIL_CHANGED);
+ }
+ $this->activityManager->publish($event);
+ }
+}