nextcloud / polls

tests/Unit/Db/NotificationMapperTest.php

Indentation +54 added lines, -54 removed lines

@@ -33,65 +33,65 @@
 
 class NotificationMapperTest extends UnitTestCase {
 
-	/** @var IDBConnection */
-	private $con;
-	/** @var NotificationMapper */
-	private $notificationMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+    /** @var IDBConnection */
+    private $con;
+    /** @var NotificationMapper */
+    private $notificationMapper;
+    /** @var EventMapper */
+    private $eventMapper;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->con = \OC::$server->getDatabaseConnection();
-		$this->notificationMapper = new NotificationMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp() {
+        parent::setUp();
+        $this->con = \OC::$server->getDatabaseConnection();
+        $this->notificationMapper = new NotificationMapper($this->con);
+        $this->eventMapper = new EventMapper($this->con);
+    }
 
-	/**
-	 * Create some fake data and persist them to the database.
-	 *
-	 * @return Notification
-	 */
-	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+    /**
+     * Create some fake data and persist them to the database.
+     *
+     * @return Notification
+     */
+    public function testCreate() {
+        /** @var Event $event */
+        $event = $this->fm->instance('OCA\Polls\Db\Event');
+        $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
 
-		/** @var Notification $notification */
-		$notification = $this->fm->instance('OCA\Polls\Db\Notification');
-		$notification->setPollId($event->getId());
-		$this->assertInstanceOf(Notification::class, $this->notificationMapper->insert($notification));
+        /** @var Notification $notification */
+        $notification = $this->fm->instance('OCA\Polls\Db\Notification');
+        $notification->setPollId($event->getId());
+        $this->assertInstanceOf(Notification::class, $this->notificationMapper->insert($notification));
 
-		return $notification;
-	}
+        return $notification;
+    }
 
-	/**
-	 * Update the previously created entry and persist the changes.
-	 *
-	 * @depends testCreate
-	 * @param Notification $notification
-	 * @return Notification
-	 */
-	public function testUpdate(Notification $notification) {
-		$newUserId = Faker::firstNameMale();
-		$notification->setUserId($newUserId());
-		$this->notificationMapper->update($notification);
+    /**
+     * Update the previously created entry and persist the changes.
+     *
+     * @depends testCreate
+     * @param Notification $notification
+     * @return Notification
+     */
+    public function testUpdate(Notification $notification) {
+        $newUserId = Faker::firstNameMale();
+        $notification->setUserId($newUserId());
+        $this->notificationMapper->update($notification);
 
-		return $notification;
-	}
+        return $notification;
+    }
 
-	/**
-	 * Delete the previously created entries from the database.
-	 *
-	 * @depends testUpdate
-	 * @param Notification $notification
-	 */
-	public function testDelete(Notification $notification) {
-		$event = $this->eventMapper->find($notification->getPollId());
-		$this->notificationMapper->delete($notification);
-		$this->eventMapper->delete($event);
-	}
+    /**
+     * Delete the previously created entries from the database.
+     *
+     * @depends testUpdate
+     * @param Notification $notification
+     */
+    public function testDelete(Notification $notification) {
+        $event = $this->eventMapper->find($notification->getPollId());
+        $this->notificationMapper->delete($notification);
+        $this->eventMapper->delete($event);
+    }
 }

tests/Unit/Db/TextMapperTest.php

Indentation +54 added lines, -54 removed lines

@@ -33,65 +33,65 @@
 
 class TextMapperTest extends UnitTestCase {
 
-	/** @var IDBConnection */
-	private $con;
-	/** @var TextMapper */
-	private $textMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+    /** @var IDBConnection */
+    private $con;
+    /** @var TextMapper */
+    private $textMapper;
+    /** @var EventMapper */
+    private $eventMapper;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->con = \OC::$server->getDatabaseConnection();
-		$this->textMapper = new TextMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp() {
+        parent::setUp();
+        $this->con = \OC::$server->getDatabaseConnection();
+        $this->textMapper = new TextMapper($this->con);
+        $this->eventMapper = new EventMapper($this->con);
+    }
 
-	/**
-	 * Create some fake data and persist them to the database.
-	 *
-	 * @return Text
-	 */
-	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+    /**
+     * Create some fake data and persist them to the database.
+     *
+     * @return Text
+     */
+    public function testCreate() {
+        /** @var Event $event */
+        $event = $this->fm->instance('OCA\Polls\Db\Event');
+        $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
 
-		/** @var Text $text */
-		$text = $this->fm->instance('OCA\Polls\Db\Text');
-		$text->setPollId($event->getId());
-		$this->assertInstanceOf(Text::class, $this->textMapper->insert($text));
+        /** @var Text $text */
+        $text = $this->fm->instance('OCA\Polls\Db\Text');
+        $text->setPollId($event->getId());
+        $this->assertInstanceOf(Text::class, $this->textMapper->insert($text));
 
-		return $text;
-	}
+        return $text;
+    }
 
-	/**
-	 * Update the previously created entry and persist the changes.
-	 *
-	 * @depends testCreate
-	 * @param Text $text
-	 * @return Text
-	 */
-	public function testUpdate(Text $text) {
-		$newText = Faker::paragraph();
-		$text->setText($newText());
-		$this->textMapper->update($text);
+    /**
+     * Update the previously created entry and persist the changes.
+     *
+     * @depends testCreate
+     * @param Text $text
+     * @return Text
+     */
+    public function testUpdate(Text $text) {
+        $newText = Faker::paragraph();
+        $text->setText($newText());
+        $this->textMapper->update($text);
 
-		return $text;
-	}
+        return $text;
+    }
 
-	/**
-	 * Delete the previously created entries from the database.
-	 *
-	 * @depends testUpdate
-	 * @param Text $text
-	 */
-	public function testDelete(Text $text) {
-		$event = $this->eventMapper->find($text->getPollId());
-		$this->textMapper->delete($text);
-		$this->eventMapper->delete($event);
-	}
+    /**
+     * Delete the previously created entries from the database.
+     *
+     * @depends testUpdate
+     * @param Text $text
+     */
+    public function testDelete(Text $text) {
+        $event = $this->eventMapper->find($text->getPollId());
+        $this->textMapper->delete($text);
+        $this->eventMapper->delete($event);
+    }
 }

tests/Unit/Db/ParticipationTextMapperTest.php

Indentation +54 added lines, -54 removed lines

@@ -33,65 +33,65 @@
 
 class ParticipationTextMapperTest extends UnitTestCase {
 
-	/** @var IDBConnection */
-	private $con;
-	/** @var ParticipationTextMapper */
-	private $participationTextMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+    /** @var IDBConnection */
+    private $con;
+    /** @var ParticipationTextMapper */
+    private $participationTextMapper;
+    /** @var EventMapper */
+    private $eventMapper;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->con = \OC::$server->getDatabaseConnection();
-		$this->participationTextMapper = new ParticipationTextMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp() {
+        parent::setUp();
+        $this->con = \OC::$server->getDatabaseConnection();
+        $this->participationTextMapper = new ParticipationTextMapper($this->con);
+        $this->eventMapper = new EventMapper($this->con);
+    }
 
-	/**
-	 * Create some fake data and persist them to the database.
-	 *
-	 * @return ParticipationText
-	 */
-	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+    /**
+     * Create some fake data and persist them to the database.
+     *
+     * @return ParticipationText
+     */
+    public function testCreate() {
+        /** @var Event $event */
+        $event = $this->fm->instance('OCA\Polls\Db\Event');
+        $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
 
-		/** @var ParticipationText $participationText */
-		$participationText = $this->fm->instance('OCA\Polls\Db\ParticipationText');
-		$participationText->setPollId($event->getId());
-		$this->assertInstanceOf(ParticipationText::class, $this->participationTextMapper->insert($participationText));
+        /** @var ParticipationText $participationText */
+        $participationText = $this->fm->instance('OCA\Polls\Db\ParticipationText');
+        $participationText->setPollId($event->getId());
+        $this->assertInstanceOf(ParticipationText::class, $this->participationTextMapper->insert($participationText));
 
-		return $participationText;
-	}
+        return $participationText;
+    }
 
-	/**
-	 * Update the previously created entry and persist the changes.
-	 *
-	 * @depends testCreate
-	 * @param ParticipationText $participationText
-	 * @return ParticipationText
-	 */
-	public function testUpdate(ParticipationText $participationText) {
-		$newText = Faker::paragraph();
-		$participationText->setText($newText());
-		$this->participationTextMapper->update($participationText);
+    /**
+     * Update the previously created entry and persist the changes.
+     *
+     * @depends testCreate
+     * @param ParticipationText $participationText
+     * @return ParticipationText
+     */
+    public function testUpdate(ParticipationText $participationText) {
+        $newText = Faker::paragraph();
+        $participationText->setText($newText());
+        $this->participationTextMapper->update($participationText);
 
-		return $participationText;
-	}
+        return $participationText;
+    }
 
-	/**
-	 * Delete the previously created entries from the database.
-	 *
-	 * @depends testUpdate
-	 * @param ParticipationText $participationText
-	 */
-	public function testDelete(ParticipationText $participationText) {
-		$event = $this->eventMapper->find($participationText->getPollId());
-		$this->participationTextMapper->delete($participationText);
-		$this->eventMapper->delete($event);
-	}
+    /**
+     * Delete the previously created entries from the database.
+     *
+     * @depends testUpdate
+     * @param ParticipationText $participationText
+     */
+    public function testDelete(ParticipationText $participationText) {
+        $event = $this->eventMapper->find($participationText->getPollId());
+        $this->participationTextMapper->delete($participationText);
+        $this->eventMapper->delete($event);
+    }
 }

tests/Unit/Db/ParticipationMapperTest.php

Indentation +54 added lines, -54 removed lines

@@ -33,65 +33,65 @@
 
 class ParticipationMapperTest extends UnitTestCase {
 
-	/** @var IDBConnection */
-	private $con;
-	/** @var ParticipationMapper */
-	private $participationMapper;
-	/** @var EventMapper */
-	private $eventMapper;
+    /** @var IDBConnection */
+    private $con;
+    /** @var ParticipationMapper */
+    private $participationMapper;
+    /** @var EventMapper */
+    private $eventMapper;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->con = \OC::$server->getDatabaseConnection();
-		$this->participationMapper = new ParticipationMapper($this->con);
-		$this->eventMapper = new EventMapper($this->con);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp() {
+        parent::setUp();
+        $this->con = \OC::$server->getDatabaseConnection();
+        $this->participationMapper = new ParticipationMapper($this->con);
+        $this->eventMapper = new EventMapper($this->con);
+    }
 
-	/**
-	 * Create some fake data and persist them to the database.
-	 *
-	 * @return Participation
-	 */
-	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+    /**
+     * Create some fake data and persist them to the database.
+     *
+     * @return Participation
+     */
+    public function testCreate() {
+        /** @var Event $event */
+        $event = $this->fm->instance('OCA\Polls\Db\Event');
+        $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
 
-		/** @var Participation $participation */
-		$participation = $this->fm->instance('OCA\Polls\Db\Participation');
-		$participation->setPollId($event->getId());
-		$this->assertInstanceOf(Participation::class, $this->participationMapper->insert($participation));
+        /** @var Participation $participation */
+        $participation = $this->fm->instance('OCA\Polls\Db\Participation');
+        $participation->setPollId($event->getId());
+        $this->assertInstanceOf(Participation::class, $this->participationMapper->insert($participation));
 
-		return $participation;
-	}
+        return $participation;
+    }
 
-	/**
-	 * Update the previously created entry and persist the changes.
-	 *
-	 * @depends testCreate
-	 * @param Participation $participation
-	 * @return Participation
-	 */
-	public function testUpdate(Participation $participation) {
-		$newDt = Faker::date('Y-m-d H:i:s');
-		$participation->setDt($newDt());
-		$this->participationMapper->update($participation);
+    /**
+     * Update the previously created entry and persist the changes.
+     *
+     * @depends testCreate
+     * @param Participation $participation
+     * @return Participation
+     */
+    public function testUpdate(Participation $participation) {
+        $newDt = Faker::date('Y-m-d H:i:s');
+        $participation->setDt($newDt());
+        $this->participationMapper->update($participation);
 
-		return $participation;
-	}
+        return $participation;
+    }
 
-	/**
-	 * Delete the previously created entries from the database.
-	 *
-	 * @depends testUpdate
-	 * @param Participation $participation
-	 */
-	public function testDelete(Participation $participation) {
-		$event = $this->eventMapper->find($participation->getPollId());
-		$this->participationMapper->delete($participation);
-		$this->eventMapper->delete($event);
-	}
+    /**
+     * Delete the previously created entries from the database.
+     *
+     * @depends testUpdate
+     * @param Participation $participation
+     */
+    public function testDelete(Participation $participation) {
+        $event = $this->eventMapper->find($participation->getPollId());
+        $this->participationMapper->delete($participation);
+        $this->eventMapper->delete($event);
+    }
 }

tests/Unit/Db/EventMapperTest.php

Indentation +47 added lines, -47 removed lines

@@ -31,57 +31,57 @@
 
 class EventMapperTest extends UnitTestCase {
 
-	/** @var IDBConnection */
-	private $con;
-	/** @var EventMapper */
-	private $eventMapper;
+    /** @var IDBConnection */
+    private $con;
+    /** @var EventMapper */
+    private $eventMapper;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function setUp() {
-		parent::setUp();
-		$this->con = \OC::$server->getDatabaseConnection();
-		$this->eventMapper = new EventMapper($this->con);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp() {
+        parent::setUp();
+        $this->con = \OC::$server->getDatabaseConnection();
+        $this->eventMapper = new EventMapper($this->con);
+    }
 
-	/**
-	 * Create some fake data and persist them to the database.
-	 *
-	 * @return Event
-	 */
-	public function testCreate() {
-		/** @var Event $event */
-		$event = $this->fm->instance('OCA\Polls\Db\Event');
-		$this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
+    /**
+     * Create some fake data and persist them to the database.
+     *
+     * @return Event
+     */
+    public function testCreate() {
+        /** @var Event $event */
+        $event = $this->fm->instance('OCA\Polls\Db\Event');
+        $this->assertInstanceOf(Event::class, $this->eventMapper->insert($event));
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * Update the previously created entry and persist the changes.
-	 *
-	 * @depends testCreate
-	 * @param Event $event
-	 * @return Event
-	 */
-	public function testUpdate(Event $event) {
-		$newTitle = Faker::sentence(10);
-		$newDescription = Faker::paragraph();
-		$event->setTitle($newTitle());
-		$event->setDescription($newDescription());
-		$this->eventMapper->update($event);
+    /**
+     * Update the previously created entry and persist the changes.
+     *
+     * @depends testCreate
+     * @param Event $event
+     * @return Event
+     */
+    public function testUpdate(Event $event) {
+        $newTitle = Faker::sentence(10);
+        $newDescription = Faker::paragraph();
+        $event->setTitle($newTitle());
+        $event->setDescription($newDescription());
+        $this->eventMapper->update($event);
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * Delete the previously created entry from the database.
-	 *
-	 * @depends testUpdate
-	 * @param Event $event
-	 */
-	public function testDelete(Event $event) {
-		$this->eventMapper->delete($event);
-	}
+    /**
+     * Delete the previously created entry from the database.
+     *
+     * @depends testUpdate
+     * @param Event $event
+     */
+    public function testDelete(Event $event) {
+        $this->eventMapper->delete($event);
+    }
 }

tests/bootstrap.php

Indentation +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 if (!defined('PHPUNIT_RUN')) {
-	define('PHPUNIT_RUN', 1);
+    define('PHPUNIT_RUN', 1);
 }
 
 require_once __DIR__ . '/../../../lib/base.php';
@@ -32,7 +32,7 @@ 
 \OC_App::loadApp('polls');
 
 if (!class_exists('PHPUnit_Framework_TestCase')) {
-	require_once 'PHPUnit/Autoload.php';
+    require_once 'PHPUnit/Autoload.php';
 }
 
 \OC_Hook::clear();

lib/Controller/PageController.php

Indentation +705 added lines, -705 removed lines

@@ -55,709 +55,709 @@
 
 class PageController extends Controller {
 
-	private $userId;
-	private $commentMapper;
-	private $dateMapper;
-	private $eventMapper;
-	private $notificationMapper;
-	private $participationMapper;
-	private $participationTextMapper;
-	private $textMapper;
-	private $urlGenerator;
-	private $manager;
-	private $avatarManager;
-	private $logger;
-	private $trans;
-	private $userMgr;
-	private $groupManager;
-
-	/**
-	 * PageController constructor.
-	 * @param $appName
-	 * @param IRequest $request
-	 * @param IUserManager $manager
-	 * @param IGroupManager $groupManager
-	 * @param IAvatarManager $avatarManager
-	 * @param ILogger $logger
-	 * @param IL10N $trans
-	 * @param IURLGenerator $urlGenerator
-	 * @param $userId
-	 * @param CommentMapper $commentMapper
-	 * @param DateMapper $dateMapper
-	 * @param EventMapper $eventMapper
-	 * @param NotificationMapper $notificationMapper
-	 * @param ParticipationMapper $ParticipationMapper
-	 * @param ParticipationTextMapper $ParticipationTextMapper
-	 * @param TextMapper $textMapper
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IUserManager $manager,
-		IGroupManager $groupManager,
-		IAvatarManager $avatarManager,
-		ILogger $logger,
-		IL10N $trans,
-		IURLGenerator $urlGenerator,
-		$userId,
-		CommentMapper $commentMapper,
-		DateMapper $dateMapper,
-		EventMapper $eventMapper,
-		NotificationMapper $notificationMapper,
-		ParticipationMapper $ParticipationMapper,
-		ParticipationTextMapper $ParticipationTextMapper,
-		TextMapper $textMapper
-	) {
-		parent::__construct($appName, $request);
-		$this->manager = $manager;
-		$this->groupManager = $groupManager;
-		$this->avatarManager = $avatarManager;
-		$this->logger = $logger;
-		$this->trans = $trans;
-		$this->urlGenerator = $urlGenerator;
-		$this->userId = $userId;
-		$this->commentMapper = $commentMapper;
-		$this->dateMapper = $dateMapper;
-		$this->eventMapper = $eventMapper;
-		$this->notificationMapper = $notificationMapper;
-		$this->participationMapper = $ParticipationMapper;
-		$this->participationTextMapper = $ParticipationTextMapper;
-		$this->textMapper = $textMapper;
-		$this->userMgr = \OC::$server->getUserManager();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function index() {
-		$polls = $this->eventMapper->findAllForUserWithInfo($this->userId);
-		$comments = $this->commentMapper->findDistinctByUser($this->userId);
-		$partic = $this->participationMapper->findDistinctByUser($this->userId);
-		$particText = $this->participationTextMapper->findDistinctByUser($this->userId);
-		$response = new TemplateResponse('polls', 'main.tmpl', [
-			'polls' => $polls,
-			'comments' => $comments,
-			'participations' => $partic,
-			'participations_text' => $particText,
-			'userId' => $this->userId,
-			'userMgr' => $this->manager,
-			'urlGenerator' => $this->urlGenerator
-		]);
-		if (class_exists('OCP\AppFramework\Http\ContentSecurityPolicy')) {
-			$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
-			$response->setContentSecurityPolicy($csp);
-		}
-		return $response;
-	}
-
-	/**
-	 * @param string $pollId
-	 * @param string $from
-	 */
-	private function sendNotifications($pollId, $from) {
-		$poll = $this->eventMapper->find($pollId);
-		$notifications = $this->notificationMapper->findAllByPoll($pollId);
-		foreach ($notifications as $notification) {
-			if ($from === $notification->getUserId()) {
-				continue;
-			}
-			$email = \OC::$server->getConfig()->getUserValue($notification->getUserId(), 'settings', 'email');
-			if (strlen($email) === 0 || !isset($email)) {
-				continue;
-			}
-			$url = \OC::$server->getURLGenerator()->getAbsoluteURL(\OC::$server->getURLGenerator()->linkToRoute('polls.page.goto_poll',
-				array('hash' => $poll->getHash())));
-
-			$recUser = $this->userMgr->get($notification->getUserId());
-			$sendUser = $this->userMgr->get($from);
-			$rec = "";
-			if ($recUser !== null) {
-				$rec = $recUser->getDisplayName();
-			}
-			if ($sendUser !== null) {
-				$sender = $sendUser->getDisplayName();
-			} else {
-				$sender = $from;
-			}
-			$msg = $this->trans->t('Hello %s,<br/><br/><strong>%s</strong> participated in the poll \'%s\'.<br/><br/>To go directly to the poll, you can use this <a href="%s">link</a>',
-				array(
-					$rec,
-					$sender,
-					$poll->getTitle(),
-					$url
-				));
-
-			$msg .= "<br/><br/>";
-
-			$toName = $this->userMgr->get($notification->getUserId())->getDisplayName();
-			$subject = $this->trans->t('Polls App - New Comment');
-			$fromAddress = Util::getDefaultEmailAddress('no-reply');
-			$fromName = $this->trans->t("Polls App") . ' (' . $from . ')';
-
-			try {
-				$mailer = \OC::$server->getMailer();
-				$message = $mailer->createMessage();
-				$message->setSubject($subject);
-				$message->setFrom(array($fromAddress => $fromName));
-				$message->setTo(array($email => $toName));
-				$message->setHtmlBody($msg);
-				$mailer->send($message);
-			} catch (\Exception $e) {
-				$message = 'Error sending mail to: ' . $toName . ' (' . $email . ')';
-				Util::writeLog("polls", $message, Util::ERROR);
-			}
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @param string $hash
-	 * @return TemplateResponse
-	 */
-	public function gotoPoll($hash) {
-		try {
-			$poll = $this->eventMapper->findByHash($hash);
-		} catch(DoesNotExistException $e) {
-			return new TemplateResponse('polls', 'no.acc.tmpl', []);
-		}
-		if ($poll->getType() == '0') {
-			$dates = $this->dateMapper->findByPoll($poll->getId());
-			$votes = $this->participationMapper->findByPoll($poll->getId());
-		} else {
-			$dates = $this->textMapper->findByPoll($poll->getId());
-			$votes = $this->participationTextMapper->findByPoll($poll->getId());
-		}
-		$comments = $this->commentMapper->findByPoll($poll->getId());
-		try {
-			$notification = $this->notificationMapper->findByUserAndPoll($poll->getId(), $this->userId);
-		} catch (DoesNotExistException $e) {
-			$notification = null;
-		}
-		if ($this->hasUserAccess($poll)) {
-			return new TemplateResponse('polls', 'goto.tmpl', [
-				'poll' => $poll,
-				'dates' => $dates,
-				'comments' => $comments,
-				'votes' => $votes,
-				'notification' => $notification,
-				'userId' => $this->userId,
-				'userMgr' => $this->manager,
-				'urlGenerator' => $this->urlGenerator,
-				'avatarManager' => $this->avatarManager
-			]);
-		} else {
-			User::checkLoggedIn();
-			return new TemplateResponse('polls', 'no.acc.tmpl', []);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param string $pollId
-	 * @return RedirectResponse
-	 */
-	public function deletePoll($pollId) {
-		$poll = new Event();
-		$poll->setId($pollId);
-		$this->eventMapper->delete($poll);
-		$this->textMapper->deleteByPoll($pollId);
-		$this->dateMapper->deleteByPoll($pollId);
-		$this->participationMapper->deleteByPoll($pollId);
-		$this->participationTextMapper->deleteByPoll($pollId);
-		$this->commentMapper->deleteByPoll($pollId);
-		$url = $this->urlGenerator->linkToRoute('polls.page.index');
-		return new RedirectResponse($url);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param string $hash
-	 * @return TemplateResponse
-	 */
-	public function editPoll($hash) {
-		$poll = $this->eventMapper->findByHash($hash);
-		if ($this->userId !== $poll->getOwner()) {
-			return new TemplateResponse('polls', 'no.create.tmpl');
-		}
-		if ($poll->getType() == '0') {
-			$dates = $this->dateMapper->findByPoll($poll->getId());
-		} else {
-			$dates = $this->textMapper->findByPoll($poll->getId());
-		}
-		return new TemplateResponse('polls', 'create.tmpl', [
-			'poll' => $poll,
-			'dates' => $dates,
-			'userId' => $this->userId,
-			'userMgr' => $this->manager,
-			'urlGenerator' => $this->urlGenerator
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param $pollId
-	 * @param $pollType
-	 * @param $pollTitle
-	 * @param $pollDesc
-	 * @param $userId
-	 * @param $chosenDates
-	 * @param $expireTs
-	 * @param $accessType
-	 * @param $accessValues
-	 * @param $isAnonymous
-	 * @param $hideNames
-	 * @return RedirectResponse
-	 */
-	public function updatePoll(
-		$pollId,
-		$pollType,
-		$pollTitle,
-		$pollDesc,
-		$userId,
-		$chosenDates,
-		$expireTs,
-		$accessType,
-		$accessValues,
-		$isAnonymous,
-		$hideNames
-	) {
-		$event = $this->eventMapper->find($pollId);
-		$event->setTitle(htmlspecialchars($pollTitle));
-		$event->setDescription(htmlspecialchars($pollDesc));
-		$event->setIsAnonymous($isAnonymous ? 1 : 0);
-		$event->setFullAnonymous($isAnonymous && $hideNames ? 1 : 0);
-
-		if ($accessType === 'select') {
-			if (isset($accessValues)) {
-				$accessValues = json_decode($accessValues);
-				if ($accessValues !== null) {
-					$groups = array();
-					$users = array();
-					if ($accessValues->groups !== null) {
-						$groups = $accessValues->groups;
-					}
-					if ($accessValues->users !== null) {
-						$users = $accessValues->users;
-					}
-					$accessType = '';
-					foreach ($groups as $gid) {
-						$accessType .= $gid . ';';
-					}
-					foreach ($users as $uid) {
-						$accessType .= $uid . ';';
-					}
-				}
-			}
-		}
-		$event->setAccess($accessType);
-
-		$chosenDates = json_decode($chosenDates);
-
-		$expire = null;
-		if ($expireTs !== null && $expireTs !== '') {
-			$expire = date('Y-m-d H:i:s', $expireTs + 60 * 60 * 24); //add one day, so it expires at the end of a day
-		}
-		$event->setExpire($expire);
-
-		$this->dateMapper->deleteByPoll($pollId);
-		$this->textMapper->deleteByPoll($pollId);
-		if ($pollType === 'event') {
-			$event->setType(0);
-			$this->eventMapper->update($event);
-			sort($chosenDates);
-			foreach ($chosenDates as $el) {
-				$date = new Date();
-				$date->setPollId($pollId);
-				$date->setDt(date('Y-m-d H:i:s', $el));
-				$this->dateMapper->insert($date);
-			}
-		} else {
-			$event->setType(1);
-			$this->eventMapper->update($event);
-			foreach ($chosenDates as $el) {
-				$text = new Text();
-				$text->setText($el);
-				$text->setPollId($pollId);
-				$this->textMapper->insert($text);
-			}
-		}
-		$url = $this->urlGenerator->linkToRoute('polls.page.index');
-		return new RedirectResponse($url);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function createPoll() {
-		return new TemplateResponse('polls', 'create.tmpl',
-			['userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param $pollType
-	 * @param $pollTitle
-	 * @param $pollDesc
-	 * @param $userId
-	 * @param $chosenDates
-	 * @param $expireTs
-	 * @param $accessType
-	 * @param $accessValues
-	 * @param $isAnonymous
-	 * @param $hideNames
-	 * @return RedirectResponse
-	 */
-	public function insertPoll(
-		$pollType,
-		$pollTitle,
-		$pollDesc,
-		$userId,
-		$chosenDates,
-		$expireTs,
-		$accessType,
-		$accessValues,
-		$isAnonymous,
-		$hideNames
-	) {
-		$event = new Event();
-		$event->setTitle(htmlspecialchars($pollTitle));
-		$event->setDescription(htmlspecialchars($pollDesc));
-		$event->setOwner($userId);
-		$event->setCreated(date('Y-m-d H:i:s'));
-		$event->setHash(\OC::$server->getSecureRandom()->generate(
-			16,
-			ISecureRandom::CHAR_DIGITS .
-			ISecureRandom::CHAR_LOWER .
-			ISecureRandom::CHAR_UPPER
-		));
-		$event->setIsAnonymous($isAnonymous ? 1 : 0);
-		$event->setFullAnonymous($isAnonymous && $hideNames ? 1 : 0);
-
-		if ($accessType === 'select') {
-			if (isset($accessValues)) {
-				$accessValues = json_decode($accessValues);
-				if ($accessValues !== null) {
-					$groups = array();
-					$users = array();
-					if ($accessValues->groups !== null) {
-						$groups = $accessValues->groups;
-					}
-					if ($accessValues->users !== null) {
-						$users = $accessValues->users;
-					}
-					$accessType = '';
-					foreach ($groups as $gid) {
-						$accessType .= $gid . ';';
-					}
-					foreach ($users as $uid) {
-						$accessType .= $uid . ';';
-					}
-				}
-			}
-		}
-		$event->setAccess($accessType);
-
-		$chosenDates = json_decode($chosenDates);
-
-		$expire = null;
-		if ($expireTs !== null && $expireTs !== '') {
-			$expire = date('Y-m-d H:i:s', $expireTs + 60 * 60 * 24); //add one day, so it expires at the end of a day
-		}
-		$event->setExpire($expire);
-
-		if ($pollType === 'event') {
-			$event->setType(0);
-			$ins = $this->eventMapper->insert($event);
-			$poll_id = $ins->getId();
-			sort($chosenDates);
-			foreach ($chosenDates as $el) {
-				$date = new Date();
-				$date->setPollId($poll_id);
-				$date->setDt(date('Y-m-d H:i:s', $el));
-				$this->dateMapper->insert($date);
-			}
-		} else {
-			$event->setType(1);
-			$ins = $this->eventMapper->insert($event);
-			$poll_id = $ins->getId();
-			$cnt = 1;
-			foreach ($chosenDates as $el) {
-				$text = new Text();
-				$text->setText($el . '_' . $cnt);
-				$text->setPollId($poll_id);
-				$this->textMapper->insert($text);
-				$cnt++;
-			}
-		}
-		$url = $this->urlGenerator->linkToRoute('polls.page.index');
-		return new RedirectResponse($url);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @param $pollId
-	 * @param $userId
-	 * @param $types
-	 * @param $dates
-	 * @param $receiveNotifications
-	 * @param $changed
-	 * @return RedirectResponse
-	 */
-	public function insertVote($pollId, $userId, $types, $dates, $receiveNotifications, $changed) {
-		if ($this->userId !== null) {
-			if ($receiveNotifications === 'true') {
-				try {
-					//check if user already set notification for this poll
-					$this->notificationMapper->findByUserAndPoll($pollId, $userId);
-				} catch (DoesNotExistException $e) {
-					//insert if not exist
-					$not = new Notification();
-					$not->setUserId($userId);
-					$not->setPollId($pollId);
-					$this->notificationMapper->insert($not);
-				}
-			} else {
-				try {
-					//delete if entry is in db
-					$not = $this->notificationMapper->findByUserAndPoll($pollId, $userId);
-					$this->notificationMapper->delete($not);
-				} catch (DoesNotExistException $e) {
-					//doesn't exist in db, nothing to do
-				}
-			}
-		}
-		$poll = $this->eventMapper->find($pollId);
-		if ($changed === 'true') {
-			$dates = json_decode($dates);
-			$types = json_decode($types);
-			$count_dates = count($dates);
-			if ($poll->getType() == '0') {
-				$this->participationMapper->deleteByPollAndUser($pollId, $userId);
-			} else {
-				$this->participationTextMapper->deleteByPollAndUser($pollId, $userId);
-			}
-			for ($i = 0; $i < $count_dates; $i++) {
-				if ($poll->getType() == '0') {
-					$part = new Participation();
-					$part->setPollId($pollId);
-					$part->setUserId($userId);
-					$part->setDt(date('Y-m-d H:i:s', $dates[$i]));
-					$part->setType($types[$i]);
-					$this->participationMapper->insert($part);
-				} else {
-					$part = new ParticipationText();
-					$part->setPollId($pollId);
-					$part->setUserId($userId);
-					$part->setText($dates[$i]);
-					$part->setType($types[$i]);
-					$this->participationTextMapper->insert($part);
-				}
-
-			}
-			$this->sendNotifications($pollId, $userId);
-		}
-		$hash = $poll->getHash();
-		$url = $this->urlGenerator->linkToRoute('polls.page.goto_poll', ['hash' => $hash]);
-		return new RedirectResponse($url);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @param $pollId
-	 * @param $userId
-	 * @param $commentBox
-	 * @return JSONResponse
-	 */
-	public function insertComment($pollId, $userId, $commentBox) {
-		$comment = new Comment();
-		$comment->setPollId($pollId);
-		$comment->setUserId($userId);
-		$comment->setComment($commentBox);
-		$comment->setDt(date('Y-m-d H:i:s'));
-		$this->commentMapper->insert($comment);
-		$this->sendNotifications($pollId, $userId);
-		if ($this->manager->get($userId) !== null) {
-			$newUserId = $this->manager->get($userId)->getDisplayName();
-		} else {
-			$newUserId = $userId;
-		}
-		return new JSONResponse(array(
-			'comment' => $commentBox,
-			'date' => date('Y-m-d H:i:s'),
-			'userName' => $newUserId
-		));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param $searchTerm
-	 * @param $groups
-	 * @param $users
-	 * @return array
-	 */
-	 public function search($searchTerm, $groups, $users) {
-		return array_merge($this->searchForGroups($searchTerm, $groups), $this->searchForUsers($searchTerm, $users));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param $searchTerm
-	 * @param $groups
-	 * @return array
-	 */
-	 public function searchForGroups($searchTerm, $groups) {
-		$selectedGroups = json_decode($groups);
-		$groups = $this->groupManager->search($searchTerm);
-		$gids = array();
-		$sgids = array();
-		foreach ($selectedGroups as $sg) {
-			$sgids[] = str_replace('group_', '', $sg);
-		}
-		foreach ($groups as $g) {
-			$gids[] = $g->getGID();
-		}
-		$diffGids = array_diff($gids, $sgids);
-		$gids = array();
-		foreach ($diffGids as $g) {
-			$gids[] = ['gid' => $g, 'isGroup' => true];
-		}
-		return $gids;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param $searchTerm
-	 * @param $users
-	 * @return array
-	 */
-	 public function searchForUsers($searchTerm, $users) {
-		$selectedUsers = json_decode($users);
-		Util::writeLog("polls", print_r($selectedUsers, true), Util::ERROR);
-		$userNames = $this->userMgr->searchDisplayName($searchTerm);
-		$users = array();
-		$sUsers = array();
-		foreach ($selectedUsers as $su) {
-			$sUsers[] = str_replace('user_', '', $su);
-		}
-		foreach ($userNames as $u) {
-			$alreadyAdded = false;
-			foreach ($sUsers as &$su) {
-				if ($su === $u->getUID()) {
-					unset($su);
-					$alreadyAdded = true;
-					break;
-				}
-			}
-			if (!$alreadyAdded) {
-				$users[] = array('uid' => $u->getUID(), 'displayName' => $u->getDisplayName(), 'isGroup' => false);
-			} else {
-				continue;
-			}
-		}
-		return $users;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param $username
-	 * @return string
-	 */
-	 public function getDisplayName($username) {
-		return $this->manager->get($username)->getDisplayName();
-	}
-
-	/**
-	 * @return Event[]
-	 */
-	 public function getPollsForUser() {
-		return $this->eventMapper->findAllForUser($this->userId);
-	}
-
-	/**
-	 * @param $user
-	 * @return Event[]
-	 */
-	 public function getPollsForUserWithInfo($user = null) {
-		if ($user === null) {
-			return $this->eventMapper->findAllForUserWithInfo($this->userId);
-		} else {
-			return $this->eventMapper->findAllForUserWithInfo($user);
-		}
-	}
-	/**
-	 * @return array
-	 */
-	 public function getGroups() {
-		// $this->requireLogin();
-		if (class_exists('\OC_Group', true)) {
-			// Nextcloud <= 11, ownCloud
-			return \OC_Group::getUserGroups($this->userId);
-		}
-		// Nextcloud >= 12
-		$groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
-		return array_map(function ($group) {
-			return $group->getGID();
-		}, $groups);
-	}
-
-	/**
-	 * @param $poll
-	 * @return bool
-	 */
-	private function hasUserAccess($poll) {
-		$access = $poll->getAccess();
-		$owner = $poll->getOwner();
-		if ($access === 'public') {
-			return true;
-		}
-		if ($access === 'hidden') {
-			return true;
-		}
-		if ($this->userId === null) {
-			return false;
-		}
-		if ($access === 'registered') {
-			return true;
-		}
-		if ($owner === $this->userId) {
-			return true;
-		}
-		Util::writeLog("polls", $this->userId, Util::ERROR);
-		$user_groups = $this->getGroups();
-		$arr = explode(';', $access);
-		foreach ($arr as $item) {
-			if (strpos($item, 'group_') === 0) {
-				$grp = substr($item, 6);
-				foreach ($user_groups as $user_group) {
-					if ($user_group === $grp) {
-						return true;
-					}
-				}
-			} else {
-				if (strpos($item, 'user_') === 0) {
-					$usr = substr($item, 5);
-					if ($usr === User::getUser()) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
+    private $userId;
+    private $commentMapper;
+    private $dateMapper;
+    private $eventMapper;
+    private $notificationMapper;
+    private $participationMapper;
+    private $participationTextMapper;
+    private $textMapper;
+    private $urlGenerator;
+    private $manager;
+    private $avatarManager;
+    private $logger;
+    private $trans;
+    private $userMgr;
+    private $groupManager;
+
+    /**
+     * PageController constructor.
+     * @param $appName
+     * @param IRequest $request
+     * @param IUserManager $manager
+     * @param IGroupManager $groupManager
+     * @param IAvatarManager $avatarManager
+     * @param ILogger $logger
+     * @param IL10N $trans
+     * @param IURLGenerator $urlGenerator
+     * @param $userId
+     * @param CommentMapper $commentMapper
+     * @param DateMapper $dateMapper
+     * @param EventMapper $eventMapper
+     * @param NotificationMapper $notificationMapper
+     * @param ParticipationMapper $ParticipationMapper
+     * @param ParticipationTextMapper $ParticipationTextMapper
+     * @param TextMapper $textMapper
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IUserManager $manager,
+        IGroupManager $groupManager,
+        IAvatarManager $avatarManager,
+        ILogger $logger,
+        IL10N $trans,
+        IURLGenerator $urlGenerator,
+        $userId,
+        CommentMapper $commentMapper,
+        DateMapper $dateMapper,
+        EventMapper $eventMapper,
+        NotificationMapper $notificationMapper,
+        ParticipationMapper $ParticipationMapper,
+        ParticipationTextMapper $ParticipationTextMapper,
+        TextMapper $textMapper
+    ) {
+        parent::__construct($appName, $request);
+        $this->manager = $manager;
+        $this->groupManager = $groupManager;
+        $this->avatarManager = $avatarManager;
+        $this->logger = $logger;
+        $this->trans = $trans;
+        $this->urlGenerator = $urlGenerator;
+        $this->userId = $userId;
+        $this->commentMapper = $commentMapper;
+        $this->dateMapper = $dateMapper;
+        $this->eventMapper = $eventMapper;
+        $this->notificationMapper = $notificationMapper;
+        $this->participationMapper = $ParticipationMapper;
+        $this->participationTextMapper = $ParticipationTextMapper;
+        $this->textMapper = $textMapper;
+        $this->userMgr = \OC::$server->getUserManager();
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function index() {
+        $polls = $this->eventMapper->findAllForUserWithInfo($this->userId);
+        $comments = $this->commentMapper->findDistinctByUser($this->userId);
+        $partic = $this->participationMapper->findDistinctByUser($this->userId);
+        $particText = $this->participationTextMapper->findDistinctByUser($this->userId);
+        $response = new TemplateResponse('polls', 'main.tmpl', [
+            'polls' => $polls,
+            'comments' => $comments,
+            'participations' => $partic,
+            'participations_text' => $particText,
+            'userId' => $this->userId,
+            'userMgr' => $this->manager,
+            'urlGenerator' => $this->urlGenerator
+        ]);
+        if (class_exists('OCP\AppFramework\Http\ContentSecurityPolicy')) {
+            $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
+            $response->setContentSecurityPolicy($csp);
+        }
+        return $response;
+    }
+
+    /**
+     * @param string $pollId
+     * @param string $from
+     */
+    private function sendNotifications($pollId, $from) {
+        $poll = $this->eventMapper->find($pollId);
+        $notifications = $this->notificationMapper->findAllByPoll($pollId);
+        foreach ($notifications as $notification) {
+            if ($from === $notification->getUserId()) {
+                continue;
+            }
+            $email = \OC::$server->getConfig()->getUserValue($notification->getUserId(), 'settings', 'email');
+            if (strlen($email) === 0 || !isset($email)) {
+                continue;
+            }
+            $url = \OC::$server->getURLGenerator()->getAbsoluteURL(\OC::$server->getURLGenerator()->linkToRoute('polls.page.goto_poll',
+                array('hash' => $poll->getHash())));
+
+            $recUser = $this->userMgr->get($notification->getUserId());
+            $sendUser = $this->userMgr->get($from);
+            $rec = "";
+            if ($recUser !== null) {
+                $rec = $recUser->getDisplayName();
+            }
+            if ($sendUser !== null) {
+                $sender = $sendUser->getDisplayName();
+            } else {
+                $sender = $from;
+            }
+            $msg = $this->trans->t('Hello %s,<br/><br/><strong>%s</strong> participated in the poll \'%s\'.<br/><br/>To go directly to the poll, you can use this <a href="%s">link</a>',
+                array(
+                    $rec,
+                    $sender,
+                    $poll->getTitle(),
+                    $url
+                ));
+
+            $msg .= "<br/><br/>";
+
+            $toName = $this->userMgr->get($notification->getUserId())->getDisplayName();
+            $subject = $this->trans->t('Polls App - New Comment');
+            $fromAddress = Util::getDefaultEmailAddress('no-reply');
+            $fromName = $this->trans->t("Polls App") . ' (' . $from . ')';
+
+            try {
+                $mailer = \OC::$server->getMailer();
+                $message = $mailer->createMessage();
+                $message->setSubject($subject);
+                $message->setFrom(array($fromAddress => $fromName));
+                $message->setTo(array($email => $toName));
+                $message->setHtmlBody($msg);
+                $mailer->send($message);
+            } catch (\Exception $e) {
+                $message = 'Error sending mail to: ' . $toName . ' (' . $email . ')';
+                Util::writeLog("polls", $message, Util::ERROR);
+            }
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     * @param string $hash
+     * @return TemplateResponse
+     */
+    public function gotoPoll($hash) {
+        try {
+            $poll = $this->eventMapper->findByHash($hash);
+        } catch(DoesNotExistException $e) {
+            return new TemplateResponse('polls', 'no.acc.tmpl', []);
+        }
+        if ($poll->getType() == '0') {
+            $dates = $this->dateMapper->findByPoll($poll->getId());
+            $votes = $this->participationMapper->findByPoll($poll->getId());
+        } else {
+            $dates = $this->textMapper->findByPoll($poll->getId());
+            $votes = $this->participationTextMapper->findByPoll($poll->getId());
+        }
+        $comments = $this->commentMapper->findByPoll($poll->getId());
+        try {
+            $notification = $this->notificationMapper->findByUserAndPoll($poll->getId(), $this->userId);
+        } catch (DoesNotExistException $e) {
+            $notification = null;
+        }
+        if ($this->hasUserAccess($poll)) {
+            return new TemplateResponse('polls', 'goto.tmpl', [
+                'poll' => $poll,
+                'dates' => $dates,
+                'comments' => $comments,
+                'votes' => $votes,
+                'notification' => $notification,
+                'userId' => $this->userId,
+                'userMgr' => $this->manager,
+                'urlGenerator' => $this->urlGenerator,
+                'avatarManager' => $this->avatarManager
+            ]);
+        } else {
+            User::checkLoggedIn();
+            return new TemplateResponse('polls', 'no.acc.tmpl', []);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param string $pollId
+     * @return RedirectResponse
+     */
+    public function deletePoll($pollId) {
+        $poll = new Event();
+        $poll->setId($pollId);
+        $this->eventMapper->delete($poll);
+        $this->textMapper->deleteByPoll($pollId);
+        $this->dateMapper->deleteByPoll($pollId);
+        $this->participationMapper->deleteByPoll($pollId);
+        $this->participationTextMapper->deleteByPoll($pollId);
+        $this->commentMapper->deleteByPoll($pollId);
+        $url = $this->urlGenerator->linkToRoute('polls.page.index');
+        return new RedirectResponse($url);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param string $hash
+     * @return TemplateResponse
+     */
+    public function editPoll($hash) {
+        $poll = $this->eventMapper->findByHash($hash);
+        if ($this->userId !== $poll->getOwner()) {
+            return new TemplateResponse('polls', 'no.create.tmpl');
+        }
+        if ($poll->getType() == '0') {
+            $dates = $this->dateMapper->findByPoll($poll->getId());
+        } else {
+            $dates = $this->textMapper->findByPoll($poll->getId());
+        }
+        return new TemplateResponse('polls', 'create.tmpl', [
+            'poll' => $poll,
+            'dates' => $dates,
+            'userId' => $this->userId,
+            'userMgr' => $this->manager,
+            'urlGenerator' => $this->urlGenerator
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param $pollId
+     * @param $pollType
+     * @param $pollTitle
+     * @param $pollDesc
+     * @param $userId
+     * @param $chosenDates
+     * @param $expireTs
+     * @param $accessType
+     * @param $accessValues
+     * @param $isAnonymous
+     * @param $hideNames
+     * @return RedirectResponse
+     */
+    public function updatePoll(
+        $pollId,
+        $pollType,
+        $pollTitle,
+        $pollDesc,
+        $userId,
+        $chosenDates,
+        $expireTs,
+        $accessType,
+        $accessValues,
+        $isAnonymous,
+        $hideNames
+    ) {
+        $event = $this->eventMapper->find($pollId);
+        $event->setTitle(htmlspecialchars($pollTitle));
+        $event->setDescription(htmlspecialchars($pollDesc));
+        $event->setIsAnonymous($isAnonymous ? 1 : 0);
+        $event->setFullAnonymous($isAnonymous && $hideNames ? 1 : 0);
+
+        if ($accessType === 'select') {
+            if (isset($accessValues)) {
+                $accessValues = json_decode($accessValues);
+                if ($accessValues !== null) {
+                    $groups = array();
+                    $users = array();
+                    if ($accessValues->groups !== null) {
+                        $groups = $accessValues->groups;
+                    }
+                    if ($accessValues->users !== null) {
+                        $users = $accessValues->users;
+                    }
+                    $accessType = '';
+                    foreach ($groups as $gid) {
+                        $accessType .= $gid . ';';
+                    }
+                    foreach ($users as $uid) {
+                        $accessType .= $uid . ';';
+                    }
+                }
+            }
+        }
+        $event->setAccess($accessType);
+
+        $chosenDates = json_decode($chosenDates);
+
+        $expire = null;
+        if ($expireTs !== null && $expireTs !== '') {
+            $expire = date('Y-m-d H:i:s', $expireTs + 60 * 60 * 24); //add one day, so it expires at the end of a day
+        }
+        $event->setExpire($expire);
+
+        $this->dateMapper->deleteByPoll($pollId);
+        $this->textMapper->deleteByPoll($pollId);
+        if ($pollType === 'event') {
+            $event->setType(0);
+            $this->eventMapper->update($event);
+            sort($chosenDates);
+            foreach ($chosenDates as $el) {
+                $date = new Date();
+                $date->setPollId($pollId);
+                $date->setDt(date('Y-m-d H:i:s', $el));
+                $this->dateMapper->insert($date);
+            }
+        } else {
+            $event->setType(1);
+            $this->eventMapper->update($event);
+            foreach ($chosenDates as $el) {
+                $text = new Text();
+                $text->setText($el);
+                $text->setPollId($pollId);
+                $this->textMapper->insert($text);
+            }
+        }
+        $url = $this->urlGenerator->linkToRoute('polls.page.index');
+        return new RedirectResponse($url);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function createPoll() {
+        return new TemplateResponse('polls', 'create.tmpl',
+            ['userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator]);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param $pollType
+     * @param $pollTitle
+     * @param $pollDesc
+     * @param $userId
+     * @param $chosenDates
+     * @param $expireTs
+     * @param $accessType
+     * @param $accessValues
+     * @param $isAnonymous
+     * @param $hideNames
+     * @return RedirectResponse
+     */
+    public function insertPoll(
+        $pollType,
+        $pollTitle,
+        $pollDesc,
+        $userId,
+        $chosenDates,
+        $expireTs,
+        $accessType,
+        $accessValues,
+        $isAnonymous,
+        $hideNames
+    ) {
+        $event = new Event();
+        $event->setTitle(htmlspecialchars($pollTitle));
+        $event->setDescription(htmlspecialchars($pollDesc));
+        $event->setOwner($userId);
+        $event->setCreated(date('Y-m-d H:i:s'));
+        $event->setHash(\OC::$server->getSecureRandom()->generate(
+            16,
+            ISecureRandom::CHAR_DIGITS .
+            ISecureRandom::CHAR_LOWER .
+            ISecureRandom::CHAR_UPPER
+        ));
+        $event->setIsAnonymous($isAnonymous ? 1 : 0);
+        $event->setFullAnonymous($isAnonymous && $hideNames ? 1 : 0);
+
+        if ($accessType === 'select') {
+            if (isset($accessValues)) {
+                $accessValues = json_decode($accessValues);
+                if ($accessValues !== null) {
+                    $groups = array();
+                    $users = array();
+                    if ($accessValues->groups !== null) {
+                        $groups = $accessValues->groups;
+                    }
+                    if ($accessValues->users !== null) {
+                        $users = $accessValues->users;
+                    }
+                    $accessType = '';
+                    foreach ($groups as $gid) {
+                        $accessType .= $gid . ';';
+                    }
+                    foreach ($users as $uid) {
+                        $accessType .= $uid . ';';
+                    }
+                }
+            }
+        }
+        $event->setAccess($accessType);
+
+        $chosenDates = json_decode($chosenDates);
+
+        $expire = null;
+        if ($expireTs !== null && $expireTs !== '') {
+            $expire = date('Y-m-d H:i:s', $expireTs + 60 * 60 * 24); //add one day, so it expires at the end of a day
+        }
+        $event->setExpire($expire);
+
+        if ($pollType === 'event') {
+            $event->setType(0);
+            $ins = $this->eventMapper->insert($event);
+            $poll_id = $ins->getId();
+            sort($chosenDates);
+            foreach ($chosenDates as $el) {
+                $date = new Date();
+                $date->setPollId($poll_id);
+                $date->setDt(date('Y-m-d H:i:s', $el));
+                $this->dateMapper->insert($date);
+            }
+        } else {
+            $event->setType(1);
+            $ins = $this->eventMapper->insert($event);
+            $poll_id = $ins->getId();
+            $cnt = 1;
+            foreach ($chosenDates as $el) {
+                $text = new Text();
+                $text->setText($el . '_' . $cnt);
+                $text->setPollId($poll_id);
+                $this->textMapper->insert($text);
+                $cnt++;
+            }
+        }
+        $url = $this->urlGenerator->linkToRoute('polls.page.index');
+        return new RedirectResponse($url);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     * @param $pollId
+     * @param $userId
+     * @param $types
+     * @param $dates
+     * @param $receiveNotifications
+     * @param $changed
+     * @return RedirectResponse
+     */
+    public function insertVote($pollId, $userId, $types, $dates, $receiveNotifications, $changed) {
+        if ($this->userId !== null) {
+            if ($receiveNotifications === 'true') {
+                try {
+                    //check if user already set notification for this poll
+                    $this->notificationMapper->findByUserAndPoll($pollId, $userId);
+                } catch (DoesNotExistException $e) {
+                    //insert if not exist
+                    $not = new Notification();
+                    $not->setUserId($userId);
+                    $not->setPollId($pollId);
+                    $this->notificationMapper->insert($not);
+                }
+            } else {
+                try {
+                    //delete if entry is in db
+                    $not = $this->notificationMapper->findByUserAndPoll($pollId, $userId);
+                    $this->notificationMapper->delete($not);
+                } catch (DoesNotExistException $e) {
+                    //doesn't exist in db, nothing to do
+                }
+            }
+        }
+        $poll = $this->eventMapper->find($pollId);
+        if ($changed === 'true') {
+            $dates = json_decode($dates);
+            $types = json_decode($types);
+            $count_dates = count($dates);
+            if ($poll->getType() == '0') {
+                $this->participationMapper->deleteByPollAndUser($pollId, $userId);
+            } else {
+                $this->participationTextMapper->deleteByPollAndUser($pollId, $userId);
+            }
+            for ($i = 0; $i < $count_dates; $i++) {
+                if ($poll->getType() == '0') {
+                    $part = new Participation();
+                    $part->setPollId($pollId);
+                    $part->setUserId($userId);
+                    $part->setDt(date('Y-m-d H:i:s', $dates[$i]));
+                    $part->setType($types[$i]);
+                    $this->participationMapper->insert($part);
+                } else {
+                    $part = new ParticipationText();
+                    $part->setPollId($pollId);
+                    $part->setUserId($userId);
+                    $part->setText($dates[$i]);
+                    $part->setType($types[$i]);
+                    $this->participationTextMapper->insert($part);
+                }
+
+            }
+            $this->sendNotifications($pollId, $userId);
+        }
+        $hash = $poll->getHash();
+        $url = $this->urlGenerator->linkToRoute('polls.page.goto_poll', ['hash' => $hash]);
+        return new RedirectResponse($url);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     * @param $pollId
+     * @param $userId
+     * @param $commentBox
+     * @return JSONResponse
+     */
+    public function insertComment($pollId, $userId, $commentBox) {
+        $comment = new Comment();
+        $comment->setPollId($pollId);
+        $comment->setUserId($userId);
+        $comment->setComment($commentBox);
+        $comment->setDt(date('Y-m-d H:i:s'));
+        $this->commentMapper->insert($comment);
+        $this->sendNotifications($pollId, $userId);
+        if ($this->manager->get($userId) !== null) {
+            $newUserId = $this->manager->get($userId)->getDisplayName();
+        } else {
+            $newUserId = $userId;
+        }
+        return new JSONResponse(array(
+            'comment' => $commentBox,
+            'date' => date('Y-m-d H:i:s'),
+            'userName' => $newUserId
+        ));
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param $searchTerm
+     * @param $groups
+     * @param $users
+     * @return array
+     */
+        public function search($searchTerm, $groups, $users) {
+        return array_merge($this->searchForGroups($searchTerm, $groups), $this->searchForUsers($searchTerm, $users));
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param $searchTerm
+     * @param $groups
+     * @return array
+     */
+        public function searchForGroups($searchTerm, $groups) {
+        $selectedGroups = json_decode($groups);
+        $groups = $this->groupManager->search($searchTerm);
+        $gids = array();
+        $sgids = array();
+        foreach ($selectedGroups as $sg) {
+            $sgids[] = str_replace('group_', '', $sg);
+        }
+        foreach ($groups as $g) {
+            $gids[] = $g->getGID();
+        }
+        $diffGids = array_diff($gids, $sgids);
+        $gids = array();
+        foreach ($diffGids as $g) {
+            $gids[] = ['gid' => $g, 'isGroup' => true];
+        }
+        return $gids;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param $searchTerm
+     * @param $users
+     * @return array
+     */
+        public function searchForUsers($searchTerm, $users) {
+        $selectedUsers = json_decode($users);
+        Util::writeLog("polls", print_r($selectedUsers, true), Util::ERROR);
+        $userNames = $this->userMgr->searchDisplayName($searchTerm);
+        $users = array();
+        $sUsers = array();
+        foreach ($selectedUsers as $su) {
+            $sUsers[] = str_replace('user_', '', $su);
+        }
+        foreach ($userNames as $u) {
+            $alreadyAdded = false;
+            foreach ($sUsers as &$su) {
+                if ($su === $u->getUID()) {
+                    unset($su);
+                    $alreadyAdded = true;
+                    break;
+                }
+            }
+            if (!$alreadyAdded) {
+                $users[] = array('uid' => $u->getUID(), 'displayName' => $u->getDisplayName(), 'isGroup' => false);
+            } else {
+                continue;
+            }
+        }
+        return $users;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param $username
+     * @return string
+     */
+        public function getDisplayName($username) {
+        return $this->manager->get($username)->getDisplayName();
+    }
+
+    /**
+     * @return Event[]
+     */
+        public function getPollsForUser() {
+        return $this->eventMapper->findAllForUser($this->userId);
+    }
+
+    /**
+     * @param $user
+     * @return Event[]
+     */
+        public function getPollsForUserWithInfo($user = null) {
+        if ($user === null) {
+            return $this->eventMapper->findAllForUserWithInfo($this->userId);
+        } else {
+            return $this->eventMapper->findAllForUserWithInfo($user);
+        }
+    }
+    /**
+     * @return array
+     */
+        public function getGroups() {
+        // $this->requireLogin();
+        if (class_exists('\OC_Group', true)) {
+            // Nextcloud <= 11, ownCloud
+            return \OC_Group::getUserGroups($this->userId);
+        }
+        // Nextcloud >= 12
+        $groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
+        return array_map(function ($group) {
+            return $group->getGID();
+        }, $groups);
+    }
+
+    /**
+     * @param $poll
+     * @return bool
+     */
+    private function hasUserAccess($poll) {
+        $access = $poll->getAccess();
+        $owner = $poll->getOwner();
+        if ($access === 'public') {
+            return true;
+        }
+        if ($access === 'hidden') {
+            return true;
+        }
+        if ($this->userId === null) {
+            return false;
+        }
+        if ($access === 'registered') {
+            return true;
+        }
+        if ($owner === $this->userId) {
+            return true;
+        }
+        Util::writeLog("polls", $this->userId, Util::ERROR);
+        $user_groups = $this->getGroups();
+        $arr = explode(';', $access);
+        foreach ($arr as $item) {
+            if (strpos($item, 'group_') === 0) {
+                $grp = substr($item, 6);
+                foreach ($user_groups as $user_group) {
+                    if ($user_group === $grp) {
+                        return true;
+                    }
+                }
+            } else {
+                if (strpos($item, 'user_') === 0) {
+                    $usr = substr($item, 5);
+                    if ($usr === User::getUser()) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }

lib/Db/NotificationMapper.php

Indentation +55 added lines, -55 removed lines

@@ -28,64 +28,64 @@
 
 class NotificationMapper extends Mapper {
 
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_notif', '\OCA\Polls\Db\Notification');
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_notif', '\OCA\Polls\Db\Notification');
+    }
 
-	/**
-	 * @param int $id
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
-	 * @return Notification
-	 */
-	public function find($id) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE id = ?';
-		return $this->findEntity($sql, [$id]);
-	}
+    /**
+     * @param int $id
+     * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
+     * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
+     * @return Notification
+     */
+    public function find($id) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE id = ?';
+        return $this->findEntity($sql, [$id]);
+    }
 
-	/**
-	 * @param string $userId
-	 * @param string $from
-	 * @param string $until
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Notification[]
-	 */
-	public function findBetween($userId, $from, $until, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE userId = ? AND timestamp BETWEEN ? AND ?';
-		return $this->findEntities($sql, [$userId, $from, $until], $limit, $offset);
-	}
+    /**
+     * @param string $userId
+     * @param string $from
+     * @param string $until
+     * @param int $limit
+     * @param int $offset
+     * @return Notification[]
+     */
+    public function findBetween($userId, $from, $until, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE userId = ? AND timestamp BETWEEN ? AND ?';
+        return $this->findEntities($sql, [$userId, $from, $until], $limit, $offset);
+    }
 
-	/**
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Notification[]
-	 */
-	public function findAll($limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName();
-		return $this->findEntities($sql, [], $limit, $offset);
-	}
+    /**
+     * @param int $limit
+     * @param int $offset
+     * @return Notification[]
+     */
+    public function findAll($limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName();
+        return $this->findEntities($sql, [], $limit, $offset);
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Notification[]
-	 */
-	public function findAllByPoll($pollId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
-	}
+    /**
+     * @param string $pollId
+     * @param int $limit
+     * @param int $offset
+     * @return Notification[]
+     */
+    public function findAllByPoll($pollId, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        return $this->findEntities($sql, [$pollId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param string $userId
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
-	 * @return Notification
-	 */
-	public function findByUserAndPoll($pollId, $userId) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
-		return $this->findEntity($sql, [$pollId, $userId]);
-	}
+    /**
+     * @param string $pollId
+     * @param string $userId
+     * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
+     * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
+     * @return Notification
+     */
+    public function findByUserAndPoll($pollId, $userId) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
+        return $this->findEntity($sql, [$pollId, $userId]);
+    }
 }

lib/Db/EventMapper.php

Indentation +49 added lines, -49 removed lines

@@ -28,57 +28,57 @@ 
 
 class EventMapper extends Mapper {
 
-	/**
-	 * EventMapper constructor.
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_events', '\OCA\Polls\Db\Event');
-	}
+    /**
+     * EventMapper constructor.
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_events', '\OCA\Polls\Db\Event');
+    }
 
-	/**
-	 * @param int $id
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
-	 * @return Event
-	 */
-	public function find($id) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE id = ?';
-		return $this->findEntity($sql, [$id]);
-	}
+    /**
+     * @param int $id
+     * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
+     * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
+     * @return Event
+     */
+    public function find($id) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE id = ?';
+        return $this->findEntity($sql, [$id]);
+    }
 
-	/**
-	 * @param $hash
-	 * @param int $limit
-	 * @param int $offset
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
-	 * @return Event
-	 */
-	public function findByHash($hash, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE hash = ?';
-		return $this->findEntity($sql, [$hash], $limit, $offset);
-	}
+    /**
+     * @param $hash
+     * @param int $limit
+     * @param int $offset
+     * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
+     * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
+     * @return Event
+     */
+    public function findByHash($hash, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE hash = ?';
+        return $this->findEntity($sql, [$hash], $limit, $offset);
+    }
 
-	/**
-	 * @param $userId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Event[]
-	 */
-	public function findAllForUser($userId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE owner = ?';
-		return $this->findEntities($sql, [$userId], $limit, $offset);
-	}
+    /**
+     * @param $userId
+     * @param int $limit
+     * @param int $offset
+     * @return Event[]
+     */
+    public function findAllForUser($userId, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE owner = ?';
+        return $this->findEntities($sql, [$userId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $userId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Event[]
-	 */
-	public function findAllForUserWithInfo($userId, $limit = null, $offset = null) {
-		$sql = 'SELECT DISTINCT *PREFIX*polls_events.id,
+    /**
+     * @param string $userId
+     * @param int $limit
+     * @param int $offset
+     * @return Event[]
+     */
+    public function findAllForUserWithInfo($userId, $limit = null, $offset = null) {
+        $sql = 'SELECT DISTINCT *PREFIX*polls_events.id,
 								*PREFIX*polls_events.hash,
 								*PREFIX*polls_events.type,
 								*PREFIX*polls_events.title,
@@ -103,6 +103,6 @@ 
 					OR
 					*PREFIX*polls_comments.user_id = ?
 					ORDER BY created';
-		return $this->findEntities($sql, ['hidden', $userId, 'hidden', $userId, $userId], $limit, $offset);
-	}
+        return $this->findEntities($sql, ['hidden', $userId, 'hidden', $userId, $userId], $limit, $offset);
+    }
 }