nextcloud / polls

lib/Controller/PageController.php

Spacing +14 added lines, -14 removed lines

@@ -223,7 +223,7 @@ 
 		try {
 			$poll = $this->eventMapper->findByHash($hash);
 		} catch (DoesNotExistException $e) {
-			return new TemplateResponse('polls', 'no.acc.tmpl', []);
+			return new TemplateResponse('polls', 'no.acc.tmpl', [ ]);
 		}
 		if ($poll->getType() === 0) {
 			$dates = $this->dateMapper->findByPoll($poll->getId());
@@ -255,7 +255,7 @@ 
 			]);
 		} else {
 			User::checkLoggedIn();
-			return new TemplateResponse('polls', 'no.acc.tmpl', []);
+			return new TemplateResponse('polls', 'no.acc.tmpl', [ ]);
 		}
 	}
 
@@ -406,7 +406,7 @@ 
 	 */
 	public function createPoll() {
 		return new TemplateResponse('polls', 'create.tmpl',
-			['userId' => $this->userId, 'userMgr' => $this->userMgr, 'urlGenerator' => $this->urlGenerator]);
+			[ 'userId' => $this->userId, 'userMgr' => $this->userMgr, 'urlGenerator' => $this->urlGenerator ]);
 	}
 
 	/**
@@ -560,15 +560,15 @@ 
 					$part = new Participation();
 					$part->setPollId($pollId);
 					$part->setUserId($userId);
-					$part->setDt(date('Y-m-d H:i:s', $dates[$i]));
-					$part->setType($types[$i]);
+					$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]);
+					$part->setText($dates[ $i ]);
+					$part->setType($types[ $i ]);
 					$this->participationTextMapper->insert($part);
 				}
 
@@ -576,7 +576,7 @@ 
 			$this->sendNotifications($pollId, $userId);
 		}
 		$hash = $poll->getHash();
-		$url = $this->urlGenerator->linkToRoute('polls.page.goto_poll', ['hash' => $hash]);
+		$url = $this->urlGenerator->linkToRoute('polls.page.goto_poll', [ 'hash' => $hash ]);
 		return new RedirectResponse($url);
 	}
 
@@ -633,15 +633,15 @@ 
 		$gids = array();
 		$sgids = array();
 		foreach ($selectedGroups as $sg) {
-			$sgids[] = str_replace('group_', '', $sg);
+			$sgids[ ] = str_replace('group_', '', $sg);
 		}
 		foreach ($groups as $g) {
-			$gids[] = $g->getGID();
+			$gids[ ] = $g->getGID();
 		}
 		$diffGids = array_diff($gids, $sgids);
 		$gids = array();
 		foreach ($diffGids as $g) {
-			$gids[] = ['gid' => $g, 'isGroup' => true];
+			$gids[ ] = [ 'gid' => $g, 'isGroup' => true ];
 		}
 		return $gids;
 	}
@@ -660,7 +660,7 @@ 
 		$users = array();
 		$sUsers = array();
 		foreach ($selectedUsers as $su) {
-			$sUsers[] = str_replace('user_', '', $su);
+			$sUsers[ ] = str_replace('user_', '', $su);
 		}
 		foreach ($userNames as $u) {
 			$alreadyAdded = false;
@@ -672,7 +672,7 @@ 
 				}
 			}
 			if (!$alreadyAdded) {
-				$users[] = array('uid' => $u->getUID(), 'displayName' => $u->getDisplayName(), 'isGroup' => false);
+				$users[ ] = array('uid' => $u->getUID(), 'displayName' => $u->getDisplayName(), 'isGroup' => false);
 			} else {
 				continue;
 			}
@@ -700,7 +700,7 @@ 
 		}
 		// Nextcloud >= 12
 		$groups = $this->groupManager->getUserGroups(\OC::$server->getUserSession()->getUser());
-		return array_map(function ($group) {
+		return array_map(function($group) {
 			return $group->getGID();
 		}, $groups);
 	}

Indentation +692 added lines, -692 removed lines

@@ -57,696 +57,696 @@
 
 class PageController extends Controller {
 
-	private $userId;
-	private $commentMapper;
-	private $dateMapper;
-	private $eventMapper;
-	private $notificationMapper;
-	private $participationMapper;
-	private $participationTextMapper;
-	private $textMapper;
-	private $urlGenerator;
-	private $userMgr;
-	private $avatarManager;
-	private $logger;
-	private $trans;
-	private $groupManager;
-
-	/**
-	 * PageController constructor.
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userMgr
-	 * @param IGroupManager $groupManager
-	 * @param IAvatarManager $avatarManager
-	 * @param ILogger $logger
-	 * @param IL10N $trans
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $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 $userMgr,
-		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->userMgr = $userMgr;
-		$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;
-	}
-
-	/**
-	 * @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->userMgr,
-			'urlGenerator' => $this->urlGenerator
-		]);
-		$csp = new ContentSecurityPolicy();
-		$response->setContentSecurityPolicy($csp);
-		return $response;
-	}
-
-	/**
-	 * @param int $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 ($email === null || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
-				continue;
-			}
-			$url = $this->urlGenerator->getAbsoluteURL(
-				$this->urlGenerator->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();
-			}
-			$sender = $from;
-			if ($sendUser !== null) {
-				$sender = $sendUser->getDisplayName();
-			}
-			$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 Activity');
-			$fromAddress = Util::getDefaultEmailAddress('no-reply');
-			$fromName = $this->trans->t('Polls App') . ' (' . $from . ')';
-
-			try {
-				/** @var IMailer $mailer */
-				$mailer = \OC::$server->getMailer();
-				/** @var \OC\Mail\Message $message */
-				$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());
-			$participants = $this->participationMapper->findParticipantsByPoll($poll->getId());
-		} else {
-			$dates = $this->textMapper->findByPoll($poll->getId());
-			$votes = $this->participationTextMapper->findByPoll($poll->getId());
-			$participants = $this->participationTextMapper->findParticipantsByPoll($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,
-				'participants' => $participants,
-				'notification' => $notification,
-				'userId' => $this->userId,
-				'userMgr' => $this->userMgr,
-				'urlGenerator' => $this->urlGenerator,
-				'avatarManager' => $this->avatarManager
-			]);
-		} else {
-			User::checkLoggedIn();
-			return new TemplateResponse('polls', 'no.acc.tmpl', []);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param int $pollId
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function deletePoll($pollId) {
-		$pollToDelete = $this->eventMapper->find($pollId);
-		if ($this->userId !== $pollToDelete->getOwner()) {
-			return new TemplateResponse('polls', 'no.delete.tmpl');
-		}
-		$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->userMgr,
-			'urlGenerator' => $this->urlGenerator
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param int $pollId
-	 * @param string $pollType
-	 * @param string $pollTitle
-	 * @param string $pollDesc
-	 * @param string $userId
-	 * @param string $chosenDates
-	 * @param int $expireTs
-	 * @param string $accessType
-	 * @param string $accessValues
-	 * @param bool $isAnonymous
-	 * @param bool $hideNames
-	 * @return RedirectResponse
-	 */
-	public function updatePoll(
-		$pollId,
-		$pollType,
-		$pollTitle,
-		$pollDesc,
-		$userId,
-		$chosenDates,
-		$expireTs,
-		$accessType,
-		$accessValues,
-		$isAnonymous,
-		$hideNames
-	) {
-
-
-		$event = $this->eventMapper->find($pollId);
-		$event->setTitle($pollTitle);
-		$event->setDescription($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);
-		/** @var string[] $chosenDates */
-		$chosenDates = json_decode($chosenDates);
-
-		$expire = null;
-		if ($expireTs !== 0 && $expireTs !== '') {
-			$expire = date('Y-m-d H:i:s', $expireTs);
-		}
-		$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->setPollId($pollId);
-				$text->setText($el);
-				$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->userMgr, 'urlGenerator' => $this->urlGenerator]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param string $pollType
-	 * @param string $pollTitle
-	 * @param string $pollDesc
-	 * @param string $userId
-	 * @param string $chosenDates
-	 * @param int $expireTs
-	 * @param string $accessType
-	 * @param string $accessValues
-	 * @param bool $isAnonymous
-	 * @param bool $hideNames
-	 * @return RedirectResponse
-	 */
-	public function insertPoll(
-		$pollType,
-		$pollTitle,
-		$pollDesc,
-		$userId,
-		$chosenDates,
-		$expireTs,
-		$accessType,
-		$accessValues,
-		$isAnonymous,
-		$hideNames
-	) {
-		$event = new Event();
-		$event->setTitle($pollTitle);
-		$event->setDescription($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);
-		/** @var string[] $chosenDates */
-		$chosenDates = json_decode($chosenDates);
-
-		$expire = null;
-		if ($expireTs !== 0 && $expireTs !== '') {
-			$expire = date('Y-m-d H:i:s', $expireTs);
-		}
-		$event->setExpire($expire);
-
-		if ($pollType === 'event') {
-			$event->setType(0);
-			$ins = $this->eventMapper->insert($event);
-			$pollId = $ins->getId();
-			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);
-			$ins = $this->eventMapper->insert($event);
-			$pollId = $ins->getId();
-			$cnt = 1;
-			foreach ($chosenDates as $el) {
-				$text = new Text();
-				$text->setPollId($pollId);
-				$text->setText($el . '_' . $cnt);
-				$this->textMapper->insert($text);
-				$cnt++;
-			}
-		}
-		$url = $this->urlGenerator->linkToRoute('polls.page.index');
-		return new RedirectResponse($url);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @param int $pollId
-	 * @param string $userId
-	 * @param string $types
-	 * @param string $dates
-	 * @param bool $receiveNotifications
-	 * @param bool $changed
-	 * @return RedirectResponse
-	 */
-	public function insertVote($pollId, $userId, $types, $dates, $receiveNotifications, $changed) {
-		if ($this->userId !== null) {
-			if ($receiveNotifications) {
-				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) {
-			$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 int $pollId
-	 * @param string $userId
-	 * @param string $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);
-		$displayName = $userId;
-		$user = $this->userMgr->get($userId);
-		if ($user !== null) {
-			$displayName = $user->getDisplayName();
-		}
-		return new JSONResponse(array(
-			'comment' => $commentBox,
-			'date' => date('Y-m-d H:i:s'),
-			'userId' => $userId,
-			'displayName' => $displayName
-		));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param string $searchTerm
-	 * @param string $groups
-	 * @param string $users
-	 * @return array
-	 */
-	public function search($searchTerm, $groups, $users) {
-		return array_merge($this->searchForGroups($searchTerm, $groups), $this->searchForUsers($searchTerm, $users));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @param string $searchTerm
-	 * @param string $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 string $searchTerm
-	 * @param string $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 string $username
-	 * @return string
-	 */
-	public function getDisplayName($username) {
-		return $this->userMgr->get($username)->getDisplayName();
-	}
-
-	/**
-	 * @return \OCP\IGroup[]
-	 */
-	private function getGroups() {
-		if (class_exists('\OC_Group')) {
-			// Nextcloud <= 11, ownCloud
-			return \OC_Group::getUserGroups($this->userId);
-		}
-		// Nextcloud >= 12
-		$groups = $this->groupManager->getUserGroups(\OC::$server->getUserSession()->getUser());
-		return array_map(function ($group) {
-			return $group->getGID();
-		}, $groups);
-	}
-
-	/**
-	 * @param Event $poll
-	 * @return bool
-	 */
-	private function hasUserAccess($poll) {
-		$access = $poll->getAccess();
-		$owner = $poll->getOwner();
-		if ($access === 'public' || $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);
-		$userGroups = $this->getGroups();
-		$arr = explode(';', $access);
-		foreach ($arr as $item) {
-			if (strpos($item, 'group_') === 0) {
-				$grp = substr($item, 6);
-				foreach ($userGroups as $userGroup) {
-					if ($userGroup === $grp) {
-						return true;
-					}
-				}
-			} else {
-				if (strpos($item, 'user_') === 0) {
-					$usr = substr($item, 5);
-					if ($usr === $this->userId) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
+    private $userId;
+    private $commentMapper;
+    private $dateMapper;
+    private $eventMapper;
+    private $notificationMapper;
+    private $participationMapper;
+    private $participationTextMapper;
+    private $textMapper;
+    private $urlGenerator;
+    private $userMgr;
+    private $avatarManager;
+    private $logger;
+    private $trans;
+    private $groupManager;
+
+    /**
+     * PageController constructor.
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userMgr
+     * @param IGroupManager $groupManager
+     * @param IAvatarManager $avatarManager
+     * @param ILogger $logger
+     * @param IL10N $trans
+     * @param IURLGenerator $urlGenerator
+     * @param string $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 $userMgr,
+        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->userMgr = $userMgr;
+        $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;
+    }
+
+    /**
+     * @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->userMgr,
+            'urlGenerator' => $this->urlGenerator
+        ]);
+        $csp = new ContentSecurityPolicy();
+        $response->setContentSecurityPolicy($csp);
+        return $response;
+    }
+
+    /**
+     * @param int $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 ($email === null || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                continue;
+            }
+            $url = $this->urlGenerator->getAbsoluteURL(
+                $this->urlGenerator->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();
+            }
+            $sender = $from;
+            if ($sendUser !== null) {
+                $sender = $sendUser->getDisplayName();
+            }
+            $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 Activity');
+            $fromAddress = Util::getDefaultEmailAddress('no-reply');
+            $fromName = $this->trans->t('Polls App') . ' (' . $from . ')';
+
+            try {
+                /** @var IMailer $mailer */
+                $mailer = \OC::$server->getMailer();
+                /** @var \OC\Mail\Message $message */
+                $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());
+            $participants = $this->participationMapper->findParticipantsByPoll($poll->getId());
+        } else {
+            $dates = $this->textMapper->findByPoll($poll->getId());
+            $votes = $this->participationTextMapper->findByPoll($poll->getId());
+            $participants = $this->participationTextMapper->findParticipantsByPoll($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,
+                'participants' => $participants,
+                'notification' => $notification,
+                'userId' => $this->userId,
+                'userMgr' => $this->userMgr,
+                'urlGenerator' => $this->urlGenerator,
+                'avatarManager' => $this->avatarManager
+            ]);
+        } else {
+            User::checkLoggedIn();
+            return new TemplateResponse('polls', 'no.acc.tmpl', []);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param int $pollId
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function deletePoll($pollId) {
+        $pollToDelete = $this->eventMapper->find($pollId);
+        if ($this->userId !== $pollToDelete->getOwner()) {
+            return new TemplateResponse('polls', 'no.delete.tmpl');
+        }
+        $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->userMgr,
+            'urlGenerator' => $this->urlGenerator
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param int $pollId
+     * @param string $pollType
+     * @param string $pollTitle
+     * @param string $pollDesc
+     * @param string $userId
+     * @param string $chosenDates
+     * @param int $expireTs
+     * @param string $accessType
+     * @param string $accessValues
+     * @param bool $isAnonymous
+     * @param bool $hideNames
+     * @return RedirectResponse
+     */
+    public function updatePoll(
+        $pollId,
+        $pollType,
+        $pollTitle,
+        $pollDesc,
+        $userId,
+        $chosenDates,
+        $expireTs,
+        $accessType,
+        $accessValues,
+        $isAnonymous,
+        $hideNames
+    ) {
+
+
+        $event = $this->eventMapper->find($pollId);
+        $event->setTitle($pollTitle);
+        $event->setDescription($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);
+        /** @var string[] $chosenDates */
+        $chosenDates = json_decode($chosenDates);
+
+        $expire = null;
+        if ($expireTs !== 0 && $expireTs !== '') {
+            $expire = date('Y-m-d H:i:s', $expireTs);
+        }
+        $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->setPollId($pollId);
+                $text->setText($el);
+                $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->userMgr, 'urlGenerator' => $this->urlGenerator]);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param string $pollType
+     * @param string $pollTitle
+     * @param string $pollDesc
+     * @param string $userId
+     * @param string $chosenDates
+     * @param int $expireTs
+     * @param string $accessType
+     * @param string $accessValues
+     * @param bool $isAnonymous
+     * @param bool $hideNames
+     * @return RedirectResponse
+     */
+    public function insertPoll(
+        $pollType,
+        $pollTitle,
+        $pollDesc,
+        $userId,
+        $chosenDates,
+        $expireTs,
+        $accessType,
+        $accessValues,
+        $isAnonymous,
+        $hideNames
+    ) {
+        $event = new Event();
+        $event->setTitle($pollTitle);
+        $event->setDescription($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);
+        /** @var string[] $chosenDates */
+        $chosenDates = json_decode($chosenDates);
+
+        $expire = null;
+        if ($expireTs !== 0 && $expireTs !== '') {
+            $expire = date('Y-m-d H:i:s', $expireTs);
+        }
+        $event->setExpire($expire);
+
+        if ($pollType === 'event') {
+            $event->setType(0);
+            $ins = $this->eventMapper->insert($event);
+            $pollId = $ins->getId();
+            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);
+            $ins = $this->eventMapper->insert($event);
+            $pollId = $ins->getId();
+            $cnt = 1;
+            foreach ($chosenDates as $el) {
+                $text = new Text();
+                $text->setPollId($pollId);
+                $text->setText($el . '_' . $cnt);
+                $this->textMapper->insert($text);
+                $cnt++;
+            }
+        }
+        $url = $this->urlGenerator->linkToRoute('polls.page.index');
+        return new RedirectResponse($url);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     * @param int $pollId
+     * @param string $userId
+     * @param string $types
+     * @param string $dates
+     * @param bool $receiveNotifications
+     * @param bool $changed
+     * @return RedirectResponse
+     */
+    public function insertVote($pollId, $userId, $types, $dates, $receiveNotifications, $changed) {
+        if ($this->userId !== null) {
+            if ($receiveNotifications) {
+                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) {
+            $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 int $pollId
+     * @param string $userId
+     * @param string $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);
+        $displayName = $userId;
+        $user = $this->userMgr->get($userId);
+        if ($user !== null) {
+            $displayName = $user->getDisplayName();
+        }
+        return new JSONResponse(array(
+            'comment' => $commentBox,
+            'date' => date('Y-m-d H:i:s'),
+            'userId' => $userId,
+            'displayName' => $displayName
+        ));
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param string $searchTerm
+     * @param string $groups
+     * @param string $users
+     * @return array
+     */
+    public function search($searchTerm, $groups, $users) {
+        return array_merge($this->searchForGroups($searchTerm, $groups), $this->searchForUsers($searchTerm, $users));
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param string $searchTerm
+     * @param string $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 string $searchTerm
+     * @param string $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 string $username
+     * @return string
+     */
+    public function getDisplayName($username) {
+        return $this->userMgr->get($username)->getDisplayName();
+    }
+
+    /**
+     * @return \OCP\IGroup[]
+     */
+    private function getGroups() {
+        if (class_exists('\OC_Group')) {
+            // Nextcloud <= 11, ownCloud
+            return \OC_Group::getUserGroups($this->userId);
+        }
+        // Nextcloud >= 12
+        $groups = $this->groupManager->getUserGroups(\OC::$server->getUserSession()->getUser());
+        return array_map(function ($group) {
+            return $group->getGID();
+        }, $groups);
+    }
+
+    /**
+     * @param Event $poll
+     * @return bool
+     */
+    private function hasUserAccess($poll) {
+        $access = $poll->getAccess();
+        $owner = $poll->getOwner();
+        if ($access === 'public' || $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);
+        $userGroups = $this->getGroups();
+        $arr = explode(';', $access);
+        foreach ($arr as $item) {
+            if (strpos($item, 'group_') === 0) {
+                $grp = substr($item, 6);
+                foreach ($userGroups as $userGroup) {
+                    if ($userGroup === $grp) {
+                        return true;
+                    }
+                }
+            } else {
+                if (strpos($item, 'user_') === 0) {
+                    $usr = substr($item, 5);
+                    if ($usr === $this->userId) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }

templates/main.tmpl.php

Indentation +126 added lines, -126 removed lines

@@ -1,40 +1,40 @@ 
 <?php
-	/**
-	 * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
-	 *
-	 * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.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/>.
-	 *
-	 */
+    /**
+     * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+     *
+     * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.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/>.
+     *
+     */
 
-	use OCP\User;
+    use OCP\User;
 
-	\OCP\Util::addStyle('polls', 'main');
-	\OCP\Util::addStyle('polls', 'list');
-	\OCP\Util::addScript('polls', 'app');
-	\OCP\Util::addScript('polls', 'start');
+    \OCP\Util::addStyle('polls', 'main');
+    \OCP\Util::addStyle('polls', 'list');
+    \OCP\Util::addScript('polls', 'app');
+    \OCP\Util::addScript('polls', 'start');
 
-	$userId = $_['userId'];
-	/** @var \OCP\IUserManager $userMgr */
-	$userMgr = $_['userMgr'];
-	/** @var \OCP\IURLGenerator $urlGenerator */
-	$urlGenerator = $_['urlGenerator'];
-	/** @var \OCA\Polls\Db\Event[] $polls */
-	$polls = $_['polls'];
+    $userId = $_['userId'];
+    /** @var \OCP\IUserManager $userMgr */
+    $userMgr = $_['userMgr'];
+    /** @var \OCP\IURLGenerator $urlGenerator */
+    $urlGenerator = $_['urlGenerator'];
+    /** @var \OCA\Polls\Db\Event[] $polls */
+    $polls = $_['polls'];
 ?>
 
 <div id="app">
@@ -90,64 +90,64 @@ 
 
 				<?php foreach ($polls as $poll) : ?>
 					<?php
-						if (!userHasAccess($poll, $userId)) {
-							continue;
-						}
-						// direct url to poll
-						$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
-						$owner = $poll->getOwner();
+                        if (!userHasAccess($poll, $userId)) {
+                            continue;
+                        }
+                        // direct url to poll
+                        $pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
+                        $owner = $poll->getOwner();
 
-						$expiry_style = '';
-						if ($poll->getType() === 0) {
-							$participated = $_['participations'];
-						} else {
-							$participated = $_['participations_text'];
-						}
-						$participated_class = 'partic_no';
-						$participated_title = 'You did not vote';
-						$participated_count = count($participated);
+                        $expiry_style = '';
+                        if ($poll->getType() === 0) {
+                            $participated = $_['participations'];
+                        } else {
+                            $participated = $_['participations_text'];
+                        }
+                        $participated_class = 'partic_no';
+                        $participated_title = 'You did not vote';
+                        $participated_count = count($participated);
 
-						$comments = $_['comments'];
-						$commented_class = 'commented_no';
-						$commented_title = 'You did not comment';
-						$commented_count = count($comments);
+                        $comments = $_['comments'];
+                        $commented_class = 'commented_no';
+                        $commented_title = 'You did not comment';
+                        $commented_count = count($comments);
 
-						if ($owner === $userId) {
-							$owner = $l->t('Yourself');
-						}
+                        if ($owner === $userId) {
+                            $owner = $l->t('Yourself');
+                        }
 
-						$timestamp_style = '';
-						$expiry_style = ' endless';
-						$expiry_date = $l->t('Never');
+                        $timestamp_style = '';
+                        $expiry_style = ' endless';
+                        $expiry_date = $l->t('Never');
 
-						if ($poll->getExpire() !== null) {
-							$expiry_date = \OCP\Template::relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
-							$expiry_style = ' progress';
-							$timestamp_style = ' live-relative-timestamp';
-							if (date('U') > strtotime($poll->getExpire())) {
-								$expiry_date = \OCP\Template::relative_modified_date(strtotime($poll->getExpire()));
-								$expiry_style = ' expired';
-							}
-						}
+                        if ($poll->getExpire() !== null) {
+                            $expiry_date = \OCP\Template::relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
+                            $expiry_style = ' progress';
+                            $timestamp_style = ' live-relative-timestamp';
+                            if (date('U') > strtotime($poll->getExpire())) {
+                                $expiry_date = \OCP\Template::relative_modified_date(strtotime($poll->getExpire()));
+                                $expiry_style = ' expired';
+                            }
+                        }
 
-						for ($i = 0; $i < count($participated); $i++) {
-							if ($poll->getId() === $participated[$i]->getPollId()) {
-								$participated_class = 'partic_yes';
-								$participated_title = 'You voted';
-								array_splice($participated, $i, 1);
-								break;
-							}
-						}
+                        for ($i = 0; $i < count($participated); $i++) {
+                            if ($poll->getId() === $participated[$i]->getPollId()) {
+                                $participated_class = 'partic_yes';
+                                $participated_title = 'You voted';
+                                array_splice($participated, $i, 1);
+                                break;
+                            }
+                        }
 
-						for ($i = 0; $i < count($comments); $i++) {
-							if ($poll->getId() === $comments[$i]->getPollId()) {
-								$commented_class = 'commented_yes';
-								$commented_title = 'You commented';
-								array_splice($comments, $i, 1);
-								break;
-							}
-						}
-					?>
+                        for ($i = 0; $i < count($comments); $i++) {
+                            if ($poll->getId() === $comments[$i]->getPollId()) {
+                                $commented_class = 'commented_yes';
+                                $commented_title = 'You commented';
+                                array_splice($comments, $i, 1);
+                                break;
+                            }
+                        }
+                    ?>
 
 					<div class="table-row table-body">
 						<div class="wrapper group-master">
@@ -223,15 +223,15 @@ 
  * @return \OCP\IGroup[]
  */
 function getGroups($userId) {
-	if (class_exists('\OC_Group')) {
-		// Nextcloud <= 11, ownCloud
-		return \OC_Group::getUserGroups($userId);
-	}
-	// Nextcloud >= 12
-	$groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
-	return array_map(function ($group) {
-		return $group->getGID();
-	}, $groups);
+    if (class_exists('\OC_Group')) {
+        // Nextcloud <= 11, ownCloud
+        return \OC_Group::getUserGroups($userId);
+    }
+    // Nextcloud >= 12
+    $groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
+    return array_map(function ($group) {
+        return $group->getGID();
+    }, $groups);
 }
 
 /**
@@ -240,40 +240,40 @@ 
  * @return boolean
  */
 function userHasAccess(OCA\Polls\Db\Event $poll, $userId) {
-	if ($poll === null) {
-		return false;
-	}
-	$access = $poll->getAccess();
-	$owner = $poll->getOwner();
-	if (!User::isLoggedIn()) {
-		return false;
-	}
-	if ($access === 'public' || $access === 'hidden' || $access === 'registered') {
-		return true;
-	}
-	if ($owner === $userId) {
-		return true;
-	}
+    if ($poll === null) {
+        return false;
+    }
+    $access = $poll->getAccess();
+    $owner = $poll->getOwner();
+    if (!User::isLoggedIn()) {
+        return false;
+    }
+    if ($access === 'public' || $access === 'hidden' || $access === 'registered') {
+        return true;
+    }
+    if ($owner === $userId) {
+        return true;
+    }
 
-	$user_groups = getGroups($userId);
-	$arr = explode(';', $access);
+    $user_groups = getGroups($userId);
+    $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 === $userId) {
-				return true;
-			}
-		}
-	}
-	return false;
+    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 === $userId) {
+                return true;
+            }
+        }
+    }
+    return false;
 }
 ?>

Spacing +15 added lines, -15 removed lines

@@ -28,13 +28,13 @@ 
 	\OCP\Util::addScript('polls', 'app');
 	\OCP\Util::addScript('polls', 'start');
 
-	$userId = $_['userId'];
+	$userId = $_[ 'userId' ];
 	/** @var \OCP\IUserManager $userMgr */
-	$userMgr = $_['userMgr'];
+	$userMgr = $_[ 'userMgr' ];
 	/** @var \OCP\IURLGenerator $urlGenerator */
-	$urlGenerator = $_['urlGenerator'];
+	$urlGenerator = $_[ 'urlGenerator' ];
 	/** @var \OCA\Polls\Db\Event[] $polls */
-	$polls = $_['polls'];
+	$polls = $_[ 'polls' ];
 ?>
 
 <div id="app">
@@ -55,7 +55,7 @@ 
 						<input class="stop icon-close" style="display:none" value="" type="button">
 					</div>
 				</div>
-	<?php if (count($_['polls']) === 0) : ?>
+	<?php if (count($_[ 'polls' ]) === 0) : ?>
 		<div id="emptycontent" class="">
 			<div class="icon-polls"></div>
 			<h2><?php p($l->t('No existing polls.')); ?></h2>
@@ -98,15 +98,15 @@ 
 
 						$expiry_style = '';
 						if ($poll->getType() === 0) {
-							$participated = $_['participations'];
+							$participated = $_[ 'participations' ];
 						} else {
-							$participated = $_['participations_text'];
+							$participated = $_[ 'participations_text' ];
 						}
 						$participated_class = 'partic_no';
 						$participated_title = 'You did not vote';
 						$participated_count = count($participated);
 
-						$comments = $_['comments'];
+						$comments = $_[ 'comments' ];
 						$commented_class = 'commented_no';
 						$commented_title = 'You did not comment';
 						$commented_count = count($comments);
@@ -130,7 +130,7 @@ 
 						}
 
 						for ($i = 0; $i < count($participated); $i++) {
-							if ($poll->getId() === $participated[$i]->getPollId()) {
+							if ($poll->getId() === $participated[ $i ]->getPollId()) {
 								$participated_class = 'partic_yes';
 								$participated_title = 'You voted';
 								array_splice($participated, $i, 1);
@@ -139,7 +139,7 @@ 
 						}
 
 						for ($i = 0; $i < count($comments); $i++) {
-							if ($poll->getId() === $comments[$i]->getPollId()) {
+							if ($poll->getId() === $comments[ $i ]->getPollId()) {
 								$commented_class = 'commented_yes';
 								$commented_title = 'You commented';
 								array_splice($comments, $i, 1);
@@ -151,7 +151,7 @@ 
 					<div class="table-row table-body">
 						<div class="wrapper group-master">
 							<div class="wrapper group-1">
-								<div class="thumbnail <?php p($expiry_style . ' ' . $commented_class. ' ' . $participated_class); ?>"></div><!-- Image to display the status or type of poll -->
+								<div class="thumbnail <?php p($expiry_style . ' ' . $commented_class . ' ' . $participated_class); ?>"></div><!-- Image to display the status or type of poll -->
 								<a href="<?php p($pollUrl); ?>" class="wrapper group-1-1">
 									<div class="flex-column name">						  <?php p($poll->getTitle()); ?></div>
 									<div class="flex-column description">				   <?php p($poll->getDescription()); ?></div>
@@ -174,7 +174,7 @@ 
 												</a>
 											</li>
 											<li>
-												<a id="id_edit_<?php p($poll->getId()); ?>" class="menuitem action permanent" href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>">
+												<a id="id_edit_<?php p($poll->getId()); ?>" class="menuitem action permanent" href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', [ 'hash' => $poll->getHash() ])); ?>">
 													<span class="icon-rename"></span>
 													<span>Edit Poll</span>
 												</a>
@@ -193,10 +193,10 @@ 
 								</div>
 								<div class="wrapper group-2-1">
 									<div class="flex-column access"><?php p($l->t($poll->getAccess())); ?></div>
-									<div class="flex-column created has-tooltip live-relative-timestamp" data-timestamp="<?php p(strtotime($poll->getCreated())*1000); ?>" data-value="<?php p($poll->getCreated()); ?>"><?php p(\OCP\Template::relative_modified_date(strtotime($poll->getCreated()))); ?></div>
+									<div class="flex-column created has-tooltip live-relative-timestamp" data-timestamp="<?php p(strtotime($poll->getCreated()) * 1000); ?>" data-value="<?php p($poll->getCreated()); ?>"><?php p(\OCP\Template::relative_modified_date(strtotime($poll->getCreated()))); ?></div>
 								</div>
 								<div class="wrapper group-2-2">
-									<div class="flex-column has-tooltip expiry<?php p($expiry_style . $timestamp_style); ?>" data-timestamp="<?php p(strtotime($poll->getExpire())*1000); ?>" data-value="<?php p($poll->getExpire()); ?>"> <?php p($expiry_date); ?></div>
+									<div class="flex-column has-tooltip expiry<?php p($expiry_style . $timestamp_style); ?>" data-timestamp="<?php p(strtotime($poll->getExpire()) * 1000); ?>" data-value="<?php p($poll->getExpire()); ?>"> <?php p($expiry_date); ?></div>
 									<div class="flex-column participants">
 										<div class="symbol alt-tooltip partic_voted icon-<?php p($participated_class); ?>" title="<?php p($participated_title); ?>"></div>
 										<div class="symbol alt-tooltip partic_commented icon-<?php p($commented_class); ?>" title="<?php p($commented_title); ?>"></div>
@@ -228,7 +228,7 @@ 
 	}
 	// Nextcloud >= 12
 	$groups = \OC::$server->getGroupManager()->getUserGroups(\OC::$server->getUserSession()->getUser());
-	return array_map(function ($group) {
+	return array_map(function($group) {
 		return $group->getGID();
 	}, $groups);
 }

Braces +6 added lines, -4 removed lines

@@ -60,14 +60,17 @@ 
 			<div class="icon-polls"></div>
 			<h2><?php p($l->t('No existing polls.')); ?></h2>
 		</div>
-	<?php else : ?>
+	<?php else {
+    : ?>
 			<div class="table main-container has-controls">
 				<div class ="table-row table-header">
 
 					<div class="wrapper group-master">
 						<div class="wrapper group-1">
 							<div class="wrapper group-1-1">
-								<div class="flex-column name">		<?php p($l->t('Title')); ?></div>
+								<div class="flex-column name">		<?php p($l->t('Title'));
+}
+?></div>
 							</div>
 							<div class="wrapper group-1-2">
 								<div class="flex-column actions"></div>
@@ -265,8 +268,7 @@ 
 					return true;
 				}
 			}
-		}
-		else if (strpos($item, 'user_') === 0) {
+		} else if (strpos($item, 'user_') === 0) {
 			$usr = substr($item, 5);
 			if ($usr === $userId) {
 				return true;

tests/Unit/Factories/EventFactory.php

Indentation +16 added lines, -16 removed lines

@@ -27,20 +27,20 @@
  * General factory for the event model.
  */
 $fm->define('OCA\Polls\Db\Event')->setDefinitions([
-	'type' => 0,
-	'title' => Faker::sentence(10),
-	'description' => Faker::text(256),
-	'owner' => Faker::firstNameMale(),
-	'created' => function () {
-		$date = new DateTime('today');
-		return $date->format('Y-m-d H:i:s');
-	},
-	'access' => 'registered',
-	'expire' => function () {
-		$date = new DateTime('tomorrow');
-		return $date->format('Y-m-d H:i:s');
-	},
-	'hash' => Faker::regexify('[A-Za-z0-9]{16}'),
-	'isAnonymous' => 0,
-	'fullAnonymous' => 0
+    'type' => 0,
+    'title' => Faker::sentence(10),
+    'description' => Faker::text(256),
+    'owner' => Faker::firstNameMale(),
+    'created' => function () {
+        $date = new DateTime('today');
+        return $date->format('Y-m-d H:i:s');
+    },
+    'access' => 'registered',
+    'expire' => function () {
+        $date = new DateTime('tomorrow');
+        return $date->format('Y-m-d H:i:s');
+    },
+    'hash' => Faker::regexify('[A-Za-z0-9]{16}'),
+    'isAnonymous' => 0,
+    'fullAnonymous' => 0
 ]);

Spacing +2 added lines, -2 removed lines

@@ -31,12 +31,12 @@
 	'title' => Faker::sentence(10),
 	'description' => Faker::text(256),
 	'owner' => Faker::firstNameMale(),
-	'created' => function () {
+	'created' => function() {
 		$date = new DateTime('today');
 		return $date->format('Y-m-d H:i:s');
 	},
 	'access' => 'registered',
-	'expire' => function () {
+	'expire' => function() {
 		$date = new DateTime('tomorrow');
 		return $date->format('Y-m-d H:i:s');
 	},

tests/Unit/Factories/TextFactory.php

Indentation +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
  * General factory for the text model.
  */
 $fm->define('OCA\Polls\Db\Text')->setDefinitions([
-	'text' => Faker::text(256)
+    'text' => Faker::text(256)
 ]);

tests/Unit/Factories/ParticipationTextFactory.php

Indentation +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
  * General factory for the participation text model.
  */
 $fm->define('OCA\Polls\Db\ParticipationText')->setDefinitions([
-	'text' => Faker::text(256),
-	'userId' => Faker::firstNameMale(),
-	'type' => 0
+    'text' => Faker::text(256),
+    'userId' => Faker::firstNameMale(),
+    'type' => 0
 ]);

lib/AppInfo/Application.php

Indentation +114 added lines, -114 removed lines

@@ -36,118 +36,118 @@
 
 class Application extends App {
 
-	/**
-	 * Application constructor.
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('polls', $urlParams);
-
-		$container = $this->getContainer();
-		$server = $container->getServer();
-
-		/**
-		 * Controllers
-		 */
-		$container->registerService('PageController', function (IContainer $c) {
-			return new PageController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('UserManager'),
-				$c->query('GroupManager'),
-				$c->query('AvatarManager'),
-				$c->query('Logger'),
-				$c->query('L10N'),
-				$c->query('ServerContainer')->getURLGenerator(),
-				$c->query('UserId'),
-				$c->query('CommentMapper'),
-				$c->query('DateMapper'),
-				$c->query('EventMapper'),
-				$c->query('NotificationMapper'),
-				$c->query('ParticipationMapper'),
-				$c->query('ParticipationTextMapper'),
-				$c->query('TextMapper')
-			);
-		});
-
-		$container->registerService('UserManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getUserManager();
-		});
-
-		$container->registerService('GroupManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getGroupManager();
-		});
-
-		$container->registerService('AvatarManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getAvatarManager();
-		});
-
-		$container->registerService('Logger', function (IContainer $c) {
-			return $c->query('ServerContainer')->getLogger();
-		});
-
-		$container->registerService('L10N', function (IContainer $c) {
-			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
-		});
-
-		$container->registerService('CommentMapper', function (IContainer $c) use ($server) {
-			return new CommentMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('DateMapper', function (IContainer $c) use ($server) {
-			return new DateMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('EventMapper', function (IContainer $c) use ($server) {
-			return new EventMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('NotificationMapper', function (IContainer $c) use ($server) {
-			return new NotificationMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('ParticipationMapper', function (IContainer $c) use ($server) {
-			return new ParticipationMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('ParticipationTextMapper', function (IContainer $c) use ($server) {
-			return new ParticipationTextMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('TextMapper', function (IContainer $c) use ($server) {
-			return new TextMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-	}
-
-	/**
-	 * Register navigation entry for main navigation.
-	 */
-	public function registerNavigationEntry() {
-		$container = $this->getContainer();
-		$container->query('OCP\INavigationManager')->add(function () use ($container) {
-			$urlGenerator = $container->query('OCP\IURLGenerator');
-			$l10n = $container->query('OCP\IL10N');
-			return [
-				'id' => 'polls',
-				'order' => 77,
-				'href' => $urlGenerator->linkToRoute('polls.page.index'),
-				'icon' => $urlGenerator->imagePath('polls', 'app.svg'),
-				'name' => $l10n->t('Polls')
-			];
-		});
-	}
+    /**
+     * Application constructor.
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('polls', $urlParams);
+
+        $container = $this->getContainer();
+        $server = $container->getServer();
+
+        /**
+         * Controllers
+         */
+        $container->registerService('PageController', function (IContainer $c) {
+            return new PageController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->query('UserManager'),
+                $c->query('GroupManager'),
+                $c->query('AvatarManager'),
+                $c->query('Logger'),
+                $c->query('L10N'),
+                $c->query('ServerContainer')->getURLGenerator(),
+                $c->query('UserId'),
+                $c->query('CommentMapper'),
+                $c->query('DateMapper'),
+                $c->query('EventMapper'),
+                $c->query('NotificationMapper'),
+                $c->query('ParticipationMapper'),
+                $c->query('ParticipationTextMapper'),
+                $c->query('TextMapper')
+            );
+        });
+
+        $container->registerService('UserManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getUserManager();
+        });
+
+        $container->registerService('GroupManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getGroupManager();
+        });
+
+        $container->registerService('AvatarManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getAvatarManager();
+        });
+
+        $container->registerService('Logger', function (IContainer $c) {
+            return $c->query('ServerContainer')->getLogger();
+        });
+
+        $container->registerService('L10N', function (IContainer $c) {
+            return $c->query('ServerContainer')->getL10N($c->query('AppName'));
+        });
+
+        $container->registerService('CommentMapper', function (IContainer $c) use ($server) {
+            return new CommentMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('DateMapper', function (IContainer $c) use ($server) {
+            return new DateMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('EventMapper', function (IContainer $c) use ($server) {
+            return new EventMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('NotificationMapper', function (IContainer $c) use ($server) {
+            return new NotificationMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('ParticipationMapper', function (IContainer $c) use ($server) {
+            return new ParticipationMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('ParticipationTextMapper', function (IContainer $c) use ($server) {
+            return new ParticipationTextMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('TextMapper', function (IContainer $c) use ($server) {
+            return new TextMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+    }
+
+    /**
+     * Register navigation entry for main navigation.
+     */
+    public function registerNavigationEntry() {
+        $container = $this->getContainer();
+        $container->query('OCP\INavigationManager')->add(function () use ($container) {
+            $urlGenerator = $container->query('OCP\IURLGenerator');
+            $l10n = $container->query('OCP\IL10N');
+            return [
+                'id' => 'polls',
+                'order' => 77,
+                'href' => $urlGenerator->linkToRoute('polls.page.index'),
+                'icon' => $urlGenerator->imagePath('polls', 'app.svg'),
+                'name' => $l10n->t('Polls')
+            ];
+        });
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -49,7 +49,7 @@ 
 		/**
 		 * Controllers
 		 */
-		$container->registerService('PageController', function (IContainer $c) {
+		$container->registerService('PageController', function(IContainer $c) {
 			return new PageController(
 				$c->query('AppName'),
 				$c->query('Request'),
@@ -70,63 +70,63 @@ 
 			);
 		});
 
-		$container->registerService('UserManager', function (IContainer $c) {
+		$container->registerService('UserManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getUserManager();
 		});
 
-		$container->registerService('GroupManager', function (IContainer $c) {
+		$container->registerService('GroupManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getGroupManager();
 		});
 
-		$container->registerService('AvatarManager', function (IContainer $c) {
+		$container->registerService('AvatarManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getAvatarManager();
 		});
 
-		$container->registerService('Logger', function (IContainer $c) {
+		$container->registerService('Logger', function(IContainer $c) {
 			return $c->query('ServerContainer')->getLogger();
 		});
 
-		$container->registerService('L10N', function (IContainer $c) {
+		$container->registerService('L10N', function(IContainer $c) {
 			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
 		});
 
-		$container->registerService('CommentMapper', function (IContainer $c) use ($server) {
+		$container->registerService('CommentMapper', function(IContainer $c) use ($server) {
 			return new CommentMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('DateMapper', function (IContainer $c) use ($server) {
+		$container->registerService('DateMapper', function(IContainer $c) use ($server) {
 			return new DateMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('EventMapper', function (IContainer $c) use ($server) {
+		$container->registerService('EventMapper', function(IContainer $c) use ($server) {
 			return new EventMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('NotificationMapper', function (IContainer $c) use ($server) {
+		$container->registerService('NotificationMapper', function(IContainer $c) use ($server) {
 			return new NotificationMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('ParticipationMapper', function (IContainer $c) use ($server) {
+		$container->registerService('ParticipationMapper', function(IContainer $c) use ($server) {
 			return new ParticipationMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('ParticipationTextMapper', function (IContainer $c) use ($server) {
+		$container->registerService('ParticipationTextMapper', function(IContainer $c) use ($server) {
 			return new ParticipationTextMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('TextMapper', function (IContainer $c) use ($server) {
+		$container->registerService('TextMapper', function(IContainer $c) use ($server) {
 			return new TextMapper(
 				$server->getDatabaseConnection()
 			);
@@ -138,7 +138,7 @@ 
 	 */
 	public function registerNavigationEntry() {
 		$container = $this->getContainer();
-		$container->query('OCP\INavigationManager')->add(function () use ($container) {
+		$container->query('OCP\INavigationManager')->add(function() use ($container) {
 			$urlGenerator = $container->query('OCP\IURLGenerator');
 			$l10n = $container->query('OCP\IL10N');
 			return [

templates/goto.tmpl.php

Braces +19 added lines, -7 removed lines

@@ -118,9 +118,12 @@ 
 				<span class="symbol icon-settings"></span>
 				<?php if (count($comments)) : ?>
 					<div id="comment-counter" class="badge"><?php p(count($comments)) ?></div>
-				<?php else: ?>
+				<?php else {
+    : ?>
 					<div id="comment-counter" class="badge no-comments"><?php p(count($comments)) ?></div>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</a>
 		</div>
 
@@ -333,7 +336,10 @@ 
 				</div>
 			<?php if (User::isLoggedIn()) : ?>
 				<div class="notification">
-					<input type="checkbox" id="check_notif" class="checkbox" <?php if ($notification !== null) print_unescaped(' checked'); ?> />
+					<input type="checkbox" id="check_notif" class="checkbox" <?php if ($notification !== null) {
+    print_unescaped(' checked');
+}
+?> />
 					<label for="check_notif"><?php p($l->t('Receive notification email on activity')); ?></label>
 				</div>
 			<?php endif; ?>
@@ -430,8 +436,11 @@ 
 						<div class="author"><?php p($userMgr->get($userId)->getDisplayName()) ?></div>
 					</div>
 
-				<?php else: ?>
-					<a href="<?php p($urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); ?>"><?php p($l->t('Login or ...')); ?></a>
+				<?php else {
+    : ?>
+					<a href="<?php p($urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+}
+?>"><?php p($l->t('Login or ...')); ?></a>
 					<div class="authorRow user-cell flex-row">
 						<div class="avatar has-tooltip" title="?"></div>
 						<div id="id_ac_detected" class="author  flex-column external">
@@ -452,9 +461,12 @@ 
 
 				<?php if ($comments == null) : ?>
 					<li id="no-comments" class="emptycontent">
-				<?php else : ?>
+				<?php else {
+    : ?>
 					<li id="no-comments" class="emptycontent hidden">
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 
 						<div class="icon-comment"></div>
 						<p><?php p($l->t('No comments yet. Be the first.')); ?></p>

Indentation +317 added lines, -317 removed lines

@@ -1,99 +1,99 @@ 
 <?php
-	/**
-	 * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
-	 *
-	 * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.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/>.
-	 *
-	 */
-
-	use OCP\User;
-
-	\OCP\Util::addStyle('polls', 'main');
-	\OCP\Util::addStyle('polls', 'vote');
-	if (!User::isLoggedIn()) {
-		\OCP\Util::addStyle('polls', 'public');
-	}
-
-	\OCP\Util::addScript('polls', 'app');
-	\OCP\Util::addScript('polls', 'vote');
-
-	$userId = $_['userId'];
-	/** @var \OCP\IUserManager $userMgr */
-	$userMgr = $_['userMgr'];
-	/** @var \OCP\IURLGenerator $urlGenerator */
-	$urlGenerator = $_['urlGenerator'];
-	/** @var \OCP\IAvatarManager $avaMgr */
-	$avaMgr = $_['avatarManager'];
-	/** @var \OCA\Polls\Db\Event $poll */
-	$poll = $_['poll'];
-	/** @var OCA\Polls\Db\Date[]|OCA\Polls\Db\Text[] $dates */
-	$dates = $_['dates'];
-	/** @var OCA\Polls\Db\Participation[]|OCA\Polls\Db\ParticipationText[] $votes */
-	$votes = $_['votes'];
-	/** @var \OCA\Polls\Db\Comment[] $comments */
-	$comments = $_['comments'];
-	/** @var \OCA\Polls\Db\Notification $notification */
-	$notification = $_['notification'];
-
-	$isAnonymous = $poll->getIsAnonymous() && $userId !== $poll->getOwner();
-	$hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
-	$access = $poll->getAccess();
-	if ($poll->getExpire() === null) {
-		$expired = false;
-	} else {
-		$expired = time() > strtotime($poll->getExpire());
-	}
-
-	if ($expired) {
-		$statusClass = 'expired-vote';
-	} else {
-		$statusClass = 'open-vote';
-		if (time() < strtotime($poll->getExpire())) {
-			$statusClass .= ' endless';
-		}
-	}
-
- 	if ($poll->getType() === 0) {
-		$pollType = 'date-poll';
-		$pollTypeClass = 'date-poll';
-	} else if ($poll->getType() === 1) {
-		$pollType = 'option-poll';
-		$pollTypeClass = 'option-poll';
-	}
-
-
-	if (
-		$poll->getDescription() !== null &&
-		$poll->getDescription() !== ''
-	) {
-		$description = str_replace(array('\r\n', '\r', '\n') , '<br/>', htmlspecialchars($poll->getDescription()));
-	} else {
-		$description = $l->t('No description provided.');
-	}
-
-	// init array for counting 'yes'-votes for each date
-	$total = array();
-	for ($i = 0; $i < count($dates); $i++) {
-		$total['yes'][$i] = 0;
-		$total['no'][$i] = 0;
-	}
-	$userVoted = array();
-	$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
+    /**
+     * @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+     *
+     * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.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/>.
+     *
+     */
+
+    use OCP\User;
+
+    \OCP\Util::addStyle('polls', 'main');
+    \OCP\Util::addStyle('polls', 'vote');
+    if (!User::isLoggedIn()) {
+        \OCP\Util::addStyle('polls', 'public');
+    }
+
+    \OCP\Util::addScript('polls', 'app');
+    \OCP\Util::addScript('polls', 'vote');
+
+    $userId = $_['userId'];
+    /** @var \OCP\IUserManager $userMgr */
+    $userMgr = $_['userMgr'];
+    /** @var \OCP\IURLGenerator $urlGenerator */
+    $urlGenerator = $_['urlGenerator'];
+    /** @var \OCP\IAvatarManager $avaMgr */
+    $avaMgr = $_['avatarManager'];
+    /** @var \OCA\Polls\Db\Event $poll */
+    $poll = $_['poll'];
+    /** @var OCA\Polls\Db\Date[]|OCA\Polls\Db\Text[] $dates */
+    $dates = $_['dates'];
+    /** @var OCA\Polls\Db\Participation[]|OCA\Polls\Db\ParticipationText[] $votes */
+    $votes = $_['votes'];
+    /** @var \OCA\Polls\Db\Comment[] $comments */
+    $comments = $_['comments'];
+    /** @var \OCA\Polls\Db\Notification $notification */
+    $notification = $_['notification'];
+
+    $isAnonymous = $poll->getIsAnonymous() && $userId !== $poll->getOwner();
+    $hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
+    $access = $poll->getAccess();
+    if ($poll->getExpire() === null) {
+        $expired = false;
+    } else {
+        $expired = time() > strtotime($poll->getExpire());
+    }
+
+    if ($expired) {
+        $statusClass = 'expired-vote';
+    } else {
+        $statusClass = 'open-vote';
+        if (time() < strtotime($poll->getExpire())) {
+            $statusClass .= ' endless';
+        }
+    }
+
+        if ($poll->getType() === 0) {
+        $pollType = 'date-poll';
+        $pollTypeClass = 'date-poll';
+    } else if ($poll->getType() === 1) {
+        $pollType = 'option-poll';
+        $pollTypeClass = 'option-poll';
+    }
+
+
+    if (
+        $poll->getDescription() !== null &&
+        $poll->getDescription() !== ''
+    ) {
+        $description = str_replace(array('\r\n', '\r', '\n') , '<br/>', htmlspecialchars($poll->getDescription()));
+    } else {
+        $description = $l->t('No description provided.');
+    }
+
+    // init array for counting 'yes'-votes for each date
+    $total = array();
+    for ($i = 0; $i < count($dates); $i++) {
+        $total['yes'][$i] = 0;
+        $total['no'][$i] = 0;
+    }
+    $userVoted = array();
+    $pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
 ?>
 
 <div id="app">
@@ -127,84 +127,84 @@ 
 		<div id="votings" class="main-container">
 			<div class="wordwrap description"><span><?php print_unescaped($description); ?></span>
 			<?php
-				if ($expired) {
-					print_unescaped('<span class="' . $statusClass . '">' . $l->t('The poll expired on %s. Voting is disabled, but you can still comment.', array(date('d.m.Y H:i', strtotime($poll->getExpire())))) . '</span>');
-				}?>
+                if ($expired) {
+                    print_unescaped('<span class="' . $statusClass . '">' . $l->t('The poll expired on %s. Voting is disabled, but you can still comment.', array(date('d.m.Y H:i', strtotime($poll->getExpire())))) . '</span>');
+                }?>
 			</div>
 			<div class="table">
 					<ul class="flex-row header" >
 						<?php
-						foreach ($dates as $dateElement) {
-							if ($poll->getType() === 0) {
-								$timestamp = strtotime($dateElement->getDt());
-								print_unescaped('<li id="slot_' . $dateElement->getId() . '" title="' . $dateElement->getDt() . ' ' . date_default_timezone_get() . '" class="flex-column vote time has-tooltip" data-timestamp="' . $timestamp . '"data-value-utc="' . $dateElement->getDt() . '">');
-
-								print_unescaped('	<div class="date-box flex-column">');
-								print_unescaped('		<div class="month">' . $l->t(date('M', $timestamp))  . '</div>');
-								print_unescaped('		<div class="day">'   .       date('j', $timestamp)   . '</div>');
-								print_unescaped('		<div class="dayow">' . $l->t(date('D', $timestamp))  . '</div>');
-								print_unescaped('		<div class="time">'  .       date('G:i', $timestamp) . ' UTC</div>');
-								print_unescaped('	</div>');
-							} else {
-								print_unescaped('<li id="slot_' . $dateElement->getId() . '" title="' . preg_replace('/_\d+$/', '', $dateElement->getText()) . '" class="flex-column vote option">');
-								print_unescaped('	<div class="date-box flex-column">' . preg_replace('/_\d+$/', '', $dateElement->getText()).'</div>');
-							}
-							print_unescaped('<div class="counter flex-row">');
-							print_unescaped('	<div class="yes flex-row">');
-							print_unescaped('		<div class="svg"></div>');
-							print_unescaped('		<div id="counter_yes_voteid_' . $dateElement->getId() . '" class ="result-cell yes" data-voteId="' . $dateElement->getId() . '">0</div>');
-							print_unescaped('	</div>');
-							print_unescaped('	<div class="no flex-row">');
-							print_unescaped('		<div class="svg"></div>');
-							print_unescaped('		<div id="counter_no_voteid_' . $dateElement->getId() . '" class ="result-cell no" data-voteId="' . $dateElement->getId() . '">0</div>');
-							print_unescaped('	</div>');
-							print_unescaped('</div>');
-						}
-						?>
+                        foreach ($dates as $dateElement) {
+                            if ($poll->getType() === 0) {
+                                $timestamp = strtotime($dateElement->getDt());
+                                print_unescaped('<li id="slot_' . $dateElement->getId() . '" title="' . $dateElement->getDt() . ' ' . date_default_timezone_get() . '" class="flex-column vote time has-tooltip" data-timestamp="' . $timestamp . '"data-value-utc="' . $dateElement->getDt() . '">');
+
+                                print_unescaped('	<div class="date-box flex-column">');
+                                print_unescaped('		<div class="month">' . $l->t(date('M', $timestamp))  . '</div>');
+                                print_unescaped('		<div class="day">'   .       date('j', $timestamp)   . '</div>');
+                                print_unescaped('		<div class="dayow">' . $l->t(date('D', $timestamp))  . '</div>');
+                                print_unescaped('		<div class="time">'  .       date('G:i', $timestamp) . ' UTC</div>');
+                                print_unescaped('	</div>');
+                            } else {
+                                print_unescaped('<li id="slot_' . $dateElement->getId() . '" title="' . preg_replace('/_\d+$/', '', $dateElement->getText()) . '" class="flex-column vote option">');
+                                print_unescaped('	<div class="date-box flex-column">' . preg_replace('/_\d+$/', '', $dateElement->getText()).'</div>');
+                            }
+                            print_unescaped('<div class="counter flex-row">');
+                            print_unescaped('	<div class="yes flex-row">');
+                            print_unescaped('		<div class="svg"></div>');
+                            print_unescaped('		<div id="counter_yes_voteid_' . $dateElement->getId() . '" class ="result-cell yes" data-voteId="' . $dateElement->getId() . '">0</div>');
+                            print_unescaped('	</div>');
+                            print_unescaped('	<div class="no flex-row">');
+                            print_unescaped('		<div class="svg"></div>');
+                            print_unescaped('		<div id="counter_no_voteid_' . $dateElement->getId() . '" class ="result-cell no" data-voteId="' . $dateElement->getId() . '">0</div>');
+                            print_unescaped('	</div>');
+                            print_unescaped('</div>');
+                        }
+                        ?>
 						</li>
 					</ul>
 				<ul class="flex-column table-body">
 					<?php
-					if ($votes !== null) {
-						//group by user
-						$others = array();
-						$displayName = '';
-						$avatarName = '';
-						$activeClass = '';
-						foreach ($votes as $vote) {
-							if (!isset($others[$vote->getUserId()])) {
-								$others[$vote->getUserId()] = array();
-							}
-							$others[$vote->getUserId()][]= $vote;
-						}
-						$userCnt = 0;
-						foreach (array_keys($others) as $usr) {
-							$userCnt++;
-							if ($usr === $userId) {
-								// if poll expired, just put current user among the others;
-								// otherwise skip here to add current user as last flex-row (to vote)
-								if (!$expired) {
-									$userVoted = $others[$usr];
-									continue;
-								}
-							}
-							if (
-								$userMgr->get($usr) !== null &&
-								!$isAnonymous &&
-								!$hideNames
-							) {
-								$displayName = $userMgr->get($usr)->getDisplayName();
-								$avatarName = $usr;
-							} else {
-								if ($isAnonymous || $hideNames) {
-									$displayName = 'Anonymous';
-									$avatarName = $userCnt;
-								} else {
-									$displayName = $usr;
-									$avatarName = $usr;
-								}
-							}
-							?>
+                    if ($votes !== null) {
+                        //group by user
+                        $others = array();
+                        $displayName = '';
+                        $avatarName = '';
+                        $activeClass = '';
+                        foreach ($votes as $vote) {
+                            if (!isset($others[$vote->getUserId()])) {
+                                $others[$vote->getUserId()] = array();
+                            }
+                            $others[$vote->getUserId()][]= $vote;
+                        }
+                        $userCnt = 0;
+                        foreach (array_keys($others) as $usr) {
+                            $userCnt++;
+                            if ($usr === $userId) {
+                                // if poll expired, just put current user among the others;
+                                // otherwise skip here to add current user as last flex-row (to vote)
+                                if (!$expired) {
+                                    $userVoted = $others[$usr];
+                                    continue;
+                                }
+                            }
+                            if (
+                                $userMgr->get($usr) !== null &&
+                                !$isAnonymous &&
+                                !$hideNames
+                            ) {
+                                $displayName = $userMgr->get($usr)->getDisplayName();
+                                $avatarName = $usr;
+                            } else {
+                                if ($isAnonymous || $hideNames) {
+                                    $displayName = 'Anonymous';
+                                    $avatarName = $userCnt;
+                                } else {
+                                    $displayName = $usr;
+                                    $avatarName = $usr;
+                                }
+                            }
+                            ?>
 							<li class="flex-row user">
 								<div class="first">
 									<div class="user-cell flex-row">
@@ -214,109 +214,109 @@ 
 									</div>
 									<ul class="flex-row">
 							<?php
-							// loop over dts
-							$i_tot = 0;
-
-							foreach ($dates as $dateElement) {
-								if ($poll->getType() === 0) {
-									$dateId = strtotime($dateElement->getDt());
-									$pollId = 'voteid_' . $dateElement->getId();
-								} else {
-									$dateId = $dateElement->getText();
-									$pollId = 'voteid_' . $dateElement->getId();
-								}
-								// look what user voted for this dts
-								$class = 'flex-column poll-cell no';
-								foreach ($others[$usr] as $vote) {
-									$voteVal = null;
-									if ($poll->getType() === 0) {
-										$voteVal = strtotime($vote->getDt());
-									} else {
-										$voteVal = $vote->getText();
-									}
-									if ($dateId === $voteVal) {
-										if ($vote->getType() === 1) {
-											$class = 'flex-column poll-cell yes';
-											$total['yes'][$i_tot]++;
-										} else if ($vote->getType() === 0) {
-											$class = 'flex-column poll-cell no';
-											$total['no'][$i_tot]++;
-										} else if ($vote->getType() === 2) {
-											$class = 'flex-column poll-cell maybe';
-										}
-										break;
-									}
-								}
-								print_unescaped('<li id="'. $pollId . '" class="' . $class . '"></li>');
-								$i_tot++;
-							}
-
-							print_unescaped('</ul>');
-							print_unescaped('</li>');
-						}
-					}
-					$totalYesOthers = array_merge(array(), $total['yes']);
-					$totalNoOthers = array_merge(array(), $total['no']);
-					$toggleTooltip = $l->t('Switch all options at once');
-					if (!$expired) {
-						print_unescaped('<li class="flex-row user current-user">');
-						print_unescaped('	<div class="flex-row first">');
-						print_unescaped('		<div class="user-cell flex-row">');
-						if (User::isLoggedIn()) {
-							print_unescaped('		<div class="avatar has-tooltip" title="'.($userId).'"></div>');
-							print_unescaped('		<div class="name">');
-							p($userMgr->get($userId)->getDisplayName());
-						} else {
-							print_unescaped('		<div class="avatar has-tooltip" title="?"></div>');
-							print_unescaped('		<div id="id_ac_detected" class="name external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
-						}
-						print_unescaped('		</div>');
-						print_unescaped('	</div>');
-						print_unescaped('	<div id="toggle-cell" class="toggle-cell has-tooltip maybe" title="'. $toggleTooltip .'">');
-						print_unescaped('		<div class="toggle"></div>');
-						print_unescaped('	</div>');
-						print_unescaped('</div>');
-						print_unescaped('<ul class="flex-row">');
-
-						$i_tot = 0;
-						foreach ($dates as $dateElement) {
-							if ($poll->getType() === 0) {
-								$dateId = strtotime($dateElement->getDt());
-								$pollId = 'voteid_' . $dateElement->getId();
-							} else {
-								$dateId = $dateElement->getText();
-								$pollId = 'voteid_' . $dateElement->getId();
-							}
-							// see if user already has data for this event
-							$class = 'no';
-							$activeClass = 'flex-column active poll-cell';
-							if (isset($userVoted)) {
-								foreach ($userVoted as $obj) {
-									$voteVal = null;
-									if($poll->getType() === 0) {
-										$voteVal = strtotime($obj->getDt());
-									} else {
-										$voteVal = $obj->getText();
-									}
-									if ($voteVal === $dateId) {
-										if ($obj->getType() === 1) {
-											$class = 'yes';
-											$total['yes'][$i_tot]++;
-										} else if($obj->getType() === 2) {
-											$class = 'maybe';
-										}
-										break;
-									}
-								}
-							}
-							print_unescaped('<li id="' . $pollId . '" class="' . $activeClass . ' ' . $class . '" data-value="' . $dateId . '"></li>');
-
-							$i_tot++;
-						}
-						print_unescaped('</ul>');
-						print_unescaped('</li>');
-					}
-					?>
+                            // loop over dts
+                            $i_tot = 0;
+
+                            foreach ($dates as $dateElement) {
+                                if ($poll->getType() === 0) {
+                                    $dateId = strtotime($dateElement->getDt());
+                                    $pollId = 'voteid_' . $dateElement->getId();
+                                } else {
+                                    $dateId = $dateElement->getText();
+                                    $pollId = 'voteid_' . $dateElement->getId();
+                                }
+                                // look what user voted for this dts
+                                $class = 'flex-column poll-cell no';
+                                foreach ($others[$usr] as $vote) {
+                                    $voteVal = null;
+                                    if ($poll->getType() === 0) {
+                                        $voteVal = strtotime($vote->getDt());
+                                    } else {
+                                        $voteVal = $vote->getText();
+                                    }
+                                    if ($dateId === $voteVal) {
+                                        if ($vote->getType() === 1) {
+                                            $class = 'flex-column poll-cell yes';
+                                            $total['yes'][$i_tot]++;
+                                        } else if ($vote->getType() === 0) {
+                                            $class = 'flex-column poll-cell no';
+                                            $total['no'][$i_tot]++;
+                                        } else if ($vote->getType() === 2) {
+                                            $class = 'flex-column poll-cell maybe';
+                                        }
+                                        break;
+                                    }
+                                }
+                                print_unescaped('<li id="'. $pollId . '" class="' . $class . '"></li>');
+                                $i_tot++;
+                            }
+
+                            print_unescaped('</ul>');
+                            print_unescaped('</li>');
+                        }
+                    }
+                    $totalYesOthers = array_merge(array(), $total['yes']);
+                    $totalNoOthers = array_merge(array(), $total['no']);
+                    $toggleTooltip = $l->t('Switch all options at once');
+                    if (!$expired) {
+                        print_unescaped('<li class="flex-row user current-user">');
+                        print_unescaped('	<div class="flex-row first">');
+                        print_unescaped('		<div class="user-cell flex-row">');
+                        if (User::isLoggedIn()) {
+                            print_unescaped('		<div class="avatar has-tooltip" title="'.($userId).'"></div>');
+                            print_unescaped('		<div class="name">');
+                            p($userMgr->get($userId)->getDisplayName());
+                        } else {
+                            print_unescaped('		<div class="avatar has-tooltip" title="?"></div>');
+                            print_unescaped('		<div id="id_ac_detected" class="name external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
+                        }
+                        print_unescaped('		</div>');
+                        print_unescaped('	</div>');
+                        print_unescaped('	<div id="toggle-cell" class="toggle-cell has-tooltip maybe" title="'. $toggleTooltip .'">');
+                        print_unescaped('		<div class="toggle"></div>');
+                        print_unescaped('	</div>');
+                        print_unescaped('</div>');
+                        print_unescaped('<ul class="flex-row">');
+
+                        $i_tot = 0;
+                        foreach ($dates as $dateElement) {
+                            if ($poll->getType() === 0) {
+                                $dateId = strtotime($dateElement->getDt());
+                                $pollId = 'voteid_' . $dateElement->getId();
+                            } else {
+                                $dateId = $dateElement->getText();
+                                $pollId = 'voteid_' . $dateElement->getId();
+                            }
+                            // see if user already has data for this event
+                            $class = 'no';
+                            $activeClass = 'flex-column active poll-cell';
+                            if (isset($userVoted)) {
+                                foreach ($userVoted as $obj) {
+                                    $voteVal = null;
+                                    if($poll->getType() === 0) {
+                                        $voteVal = strtotime($obj->getDt());
+                                    } else {
+                                        $voteVal = $obj->getText();
+                                    }
+                                    if ($voteVal === $dateId) {
+                                        if ($obj->getType() === 1) {
+                                            $class = 'yes';
+                                            $total['yes'][$i_tot]++;
+                                        } else if($obj->getType() === 2) {
+                                            $class = 'maybe';
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+                            print_unescaped('<li id="' . $pollId . '" class="' . $activeClass . ' ' . $class . '" data-value="' . $dateId . '"></li>');
+
+                            $i_tot++;
+                        }
+                        print_unescaped('</ul>');
+                        print_unescaped('</li>');
+                    }
+                    ?>
 				</ul>
 			</div>
 			<div class="submitPoll flex-row">
@@ -356,30 +356,30 @@ 
 
 				<div class="cloud">
 					<?php
-					if ($expired) {
-						print_unescaped('<span class="expired">' . $l->t('Expired'). '</span>');
-					} else {
-						if ($poll->getExpire() !== null){
-							print_unescaped('<span class="open">' . $l->t('Expires on %s', array(date('d.m.Y', strtotime($poll->getExpire())))) . '</span>');
-						} else {
-							print_unescaped('<span class="open">' . $l->t('Expires never') . '</span>');
-						}
-					}
-
-					if ($access === 'public' || $access === 'hidden' || $access === 'registered') {
-						print_unescaped('<span class="information">' . $access . '</span>');
-					} else {
-						print_unescaped('<span class="information">' . $l->t('Invitation access') . '</span>');
-					}
-					if ($isAnonymous) {
-						print_unescaped('<span class="information">' . $l->t('Anononymous poll') . '</span>');
-						if ($hideNames) {
-							print_unescaped('<span class="information">' . $l->t('Usernames hidden to Owner') . '</span>');
-						} else {
-							print_unescaped('<span class="information">' . $l->t('Usernames visible to Owner') . '</span>');
-						}
-					}
-					?>
+                    if ($expired) {
+                        print_unescaped('<span class="expired">' . $l->t('Expired'). '</span>');
+                    } else {
+                        if ($poll->getExpire() !== null){
+                            print_unescaped('<span class="open">' . $l->t('Expires on %s', array(date('d.m.Y', strtotime($poll->getExpire())))) . '</span>');
+                        } else {
+                            print_unescaped('<span class="open">' . $l->t('Expires never') . '</span>');
+                        }
+                    }
+
+                    if ($access === 'public' || $access === 'hidden' || $access === 'registered') {
+                        print_unescaped('<span class="information">' . $access . '</span>');
+                    } else {
+                        print_unescaped('<span class="information">' . $l->t('Invitation access') . '</span>');
+                    }
+                    if ($isAnonymous) {
+                        print_unescaped('<span class="information">' . $l->t('Anononymous poll') . '</span>');
+                        if ($hideNames) {
+                            print_unescaped('<span class="information">' . $l->t('Usernames hidden to Owner') . '</span>');
+                        } else {
+                            print_unescaped('<span class="information">' . $l->t('Usernames visible to Owner') . '</span>');
+                        }
+                    }
+                    ?>
 				</div>
 
 			</div>
@@ -463,31 +463,31 @@ 
 				<?php foreach ($comments as $comment) : ?>
 
 					<?php
-						if ( $comment->getUserId() === $userId ) {
-							// Comment is from current user
-							// -> display user
-							$avatarName = $userId;
-							$displayName = $userMgr->get($userId)->getDisplayName();
-
-						} else if ( !$isAnonymous && !$hideNames ) {
-							// comment is from another user,
-							// poll is not anoymous (for current user)
-							// users are not hidden
-							// -> display user
-							$avatarName = $comment->getUserId();
-							$displayName = $avatarName;
-							if ($userMgr->get($comment->getUserId()) !== null) {
-								$displayName = $userMgr->get($avatarName)->getDisplayName();
-							}
-						} else {
-							// in all other cases
-							// -> make user anonymous
-							// poll is anonymous and current user is not owner
-							// or names are hidden
-							$displayName = 'Anonymous';
-							$avatarName = $displayName;
-						}
-					?>
+                        if ( $comment->getUserId() === $userId ) {
+                            // Comment is from current user
+                            // -> display user
+                            $avatarName = $userId;
+                            $displayName = $userMgr->get($userId)->getDisplayName();
+
+                        } else if ( !$isAnonymous && !$hideNames ) {
+                            // comment is from another user,
+                            // poll is not anoymous (for current user)
+                            // users are not hidden
+                            // -> display user
+                            $avatarName = $comment->getUserId();
+                            $displayName = $avatarName;
+                            if ($userMgr->get($comment->getUserId()) !== null) {
+                                $displayName = $userMgr->get($avatarName)->getDisplayName();
+                            }
+                        } else {
+                            // in all other cases
+                            // -> make user anonymous
+                            // poll is anonymous and current user is not owner
+                            // or names are hidden
+                            $displayName = 'Anonymous';
+                            $avatarName = $displayName;
+                        }
+                    ?>
 
 					<li id="comment_<?php p($comment->getId()); ?>" class="comment flex-column">
 						<div class="authorRow user-cell flex-row">

Spacing +40 added lines, -40 removed lines

@@ -32,23 +32,23 @@ 
 	\OCP\Util::addScript('polls', 'app');
 	\OCP\Util::addScript('polls', 'vote');
 
-	$userId = $_['userId'];
+	$userId = $_[ 'userId' ];
 	/** @var \OCP\IUserManager $userMgr */
-	$userMgr = $_['userMgr'];
+	$userMgr = $_[ 'userMgr' ];
 	/** @var \OCP\IURLGenerator $urlGenerator */
-	$urlGenerator = $_['urlGenerator'];
+	$urlGenerator = $_[ 'urlGenerator' ];
 	/** @var \OCP\IAvatarManager $avaMgr */
-	$avaMgr = $_['avatarManager'];
+	$avaMgr = $_[ 'avatarManager' ];
 	/** @var \OCA\Polls\Db\Event $poll */
-	$poll = $_['poll'];
+	$poll = $_[ 'poll' ];
 	/** @var OCA\Polls\Db\Date[]|OCA\Polls\Db\Text[] $dates */
-	$dates = $_['dates'];
+	$dates = $_[ 'dates' ];
 	/** @var OCA\Polls\Db\Participation[]|OCA\Polls\Db\ParticipationText[] $votes */
-	$votes = $_['votes'];
+	$votes = $_[ 'votes' ];
 	/** @var \OCA\Polls\Db\Comment[] $comments */
-	$comments = $_['comments'];
+	$comments = $_[ 'comments' ];
 	/** @var \OCA\Polls\Db\Notification $notification */
-	$notification = $_['notification'];
+	$notification = $_[ 'notification' ];
 
 	$isAnonymous = $poll->getIsAnonymous() && $userId !== $poll->getOwner();
 	$hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
@@ -81,7 +81,7 @@ 
 		$poll->getDescription() !== null &&
 		$poll->getDescription() !== ''
 	) {
-		$description = str_replace(array('\r\n', '\r', '\n') , '<br/>', htmlspecialchars($poll->getDescription()));
+		$description = str_replace(array('\r\n', '\r', '\n'), '<br/>', htmlspecialchars($poll->getDescription()));
 	} else {
 		$description = $l->t('No description provided.');
 	}
@@ -89,11 +89,11 @@ 
 	// init array for counting 'yes'-votes for each date
 	$total = array();
 	for ($i = 0; $i < count($dates); $i++) {
-		$total['yes'][$i] = 0;
-		$total['no'][$i] = 0;
+		$total[ 'yes' ][ $i ] = 0;
+		$total[ 'no' ][ $i ] = 0;
 	}
 	$userVoted = array();
-	$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
+	$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', [ 'hash' => $poll->getHash() ]);
 ?>
 
 <div id="app">
@@ -140,14 +140,14 @@ 
 								print_unescaped('<li id="slot_' . $dateElement->getId() . '" title="' . $dateElement->getDt() . ' ' . date_default_timezone_get() . '" class="flex-column vote time has-tooltip" data-timestamp="' . $timestamp . '"data-value-utc="' . $dateElement->getDt() . '">');
 
 								print_unescaped('	<div class="date-box flex-column">');
-								print_unescaped('		<div class="month">' . $l->t(date('M', $timestamp))  . '</div>');
-								print_unescaped('		<div class="day">'   .       date('j', $timestamp)   . '</div>');
-								print_unescaped('		<div class="dayow">' . $l->t(date('D', $timestamp))  . '</div>');
-								print_unescaped('		<div class="time">'  .       date('G:i', $timestamp) . ' UTC</div>');
+								print_unescaped('		<div class="month">' . $l->t(date('M', $timestamp)) . '</div>');
+								print_unescaped('		<div class="day">' . date('j', $timestamp) . '</div>');
+								print_unescaped('		<div class="dayow">' . $l->t(date('D', $timestamp)) . '</div>');
+								print_unescaped('		<div class="time">' . date('G:i', $timestamp) . ' UTC</div>');
 								print_unescaped('	</div>');
 							} else {
 								print_unescaped('<li id="slot_' . $dateElement->getId() . '" title="' . preg_replace('/_\d+$/', '', $dateElement->getText()) . '" class="flex-column vote option">');
-								print_unescaped('	<div class="date-box flex-column">' . preg_replace('/_\d+$/', '', $dateElement->getText()).'</div>');
+								print_unescaped('	<div class="date-box flex-column">' . preg_replace('/_\d+$/', '', $dateElement->getText()) . '</div>');
 							}
 							print_unescaped('<div class="counter flex-row">');
 							print_unescaped('	<div class="yes flex-row">');
@@ -172,10 +172,10 @@ 
 						$avatarName = '';
 						$activeClass = '';
 						foreach ($votes as $vote) {
-							if (!isset($others[$vote->getUserId()])) {
-								$others[$vote->getUserId()] = array();
+							if (!isset($others[ $vote->getUserId() ])) {
+								$others[ $vote->getUserId() ] = array();
 							}
-							$others[$vote->getUserId()][]= $vote;
+							$others[ $vote->getUserId() ][ ] = $vote;
 						}
 						$userCnt = 0;
 						foreach (array_keys($others) as $usr) {
@@ -184,7 +184,7 @@ 
 								// if poll expired, just put current user among the others;
 								// otherwise skip here to add current user as last flex-row (to vote)
 								if (!$expired) {
-									$userVoted = $others[$usr];
+									$userVoted = $others[ $usr ];
 									continue;
 								}
 							}
@@ -227,7 +227,7 @@ 
 								}
 								// look what user voted for this dts
 								$class = 'flex-column poll-cell no';
-								foreach ($others[$usr] as $vote) {
+								foreach ($others[ $usr ] as $vote) {
 									$voteVal = null;
 									if ($poll->getType() === 0) {
 										$voteVal = strtotime($vote->getDt());
@@ -237,17 +237,17 @@ 
 									if ($dateId === $voteVal) {
 										if ($vote->getType() === 1) {
 											$class = 'flex-column poll-cell yes';
-											$total['yes'][$i_tot]++;
+											$total[ 'yes' ][ $i_tot ]++;
 										} else if ($vote->getType() === 0) {
 											$class = 'flex-column poll-cell no';
-											$total['no'][$i_tot]++;
+											$total[ 'no' ][ $i_tot ]++;
 										} else if ($vote->getType() === 2) {
 											$class = 'flex-column poll-cell maybe';
 										}
 										break;
 									}
 								}
-								print_unescaped('<li id="'. $pollId . '" class="' . $class . '"></li>');
+								print_unescaped('<li id="' . $pollId . '" class="' . $class . '"></li>');
 								$i_tot++;
 							}
 
@@ -255,15 +255,15 @@ 
 							print_unescaped('</li>');
 						}
 					}
-					$totalYesOthers = array_merge(array(), $total['yes']);
-					$totalNoOthers = array_merge(array(), $total['no']);
+					$totalYesOthers = array_merge(array(), $total[ 'yes' ]);
+					$totalNoOthers = array_merge(array(), $total[ 'no' ]);
 					$toggleTooltip = $l->t('Switch all options at once');
 					if (!$expired) {
 						print_unescaped('<li class="flex-row user current-user">');
 						print_unescaped('	<div class="flex-row first">');
 						print_unescaped('		<div class="user-cell flex-row">');
 						if (User::isLoggedIn()) {
-							print_unescaped('		<div class="avatar has-tooltip" title="'.($userId).'"></div>');
+							print_unescaped('		<div class="avatar has-tooltip" title="' . ($userId) . '"></div>');
 							print_unescaped('		<div class="name">');
 							p($userMgr->get($userId)->getDisplayName());
 						} else {
@@ -272,7 +272,7 @@ 
 						}
 						print_unescaped('		</div>');
 						print_unescaped('	</div>');
-						print_unescaped('	<div id="toggle-cell" class="toggle-cell has-tooltip maybe" title="'. $toggleTooltip .'">');
+						print_unescaped('	<div id="toggle-cell" class="toggle-cell has-tooltip maybe" title="' . $toggleTooltip . '">');
 						print_unescaped('		<div class="toggle"></div>');
 						print_unescaped('	</div>');
 						print_unescaped('</div>');
@@ -293,7 +293,7 @@ 
 							if (isset($userVoted)) {
 								foreach ($userVoted as $obj) {
 									$voteVal = null;
-									if($poll->getType() === 0) {
+									if ($poll->getType() === 0) {
 										$voteVal = strtotime($obj->getDt());
 									} else {
 										$voteVal = $obj->getText();
@@ -301,8 +301,8 @@ 
 									if ($voteVal === $dateId) {
 										if ($obj->getType() === 1) {
 											$class = 'yes';
-											$total['yes'][$i_tot]++;
-										} else if($obj->getType() === 2) {
+											$total[ 'yes' ][ $i_tot ]++;
+										} else if ($obj->getType() === 2) {
 											$class = 'maybe';
 										}
 										break;
@@ -343,7 +343,7 @@ 
 	</div>
 	<div id="app-sidebar" class="detailsView scroll-container disappear">
 		<div class="close flex-row">
-			<a id="closeDetails" class="close icon-close has-tooltip-bottom" title="<?php p($l->t('Close details')); ?>" href="#" alt="<?php $l->t('Close');?>"></a>
+			<a id="closeDetails" class="close icon-close has-tooltip-bottom" title="<?php p($l->t('Close details')); ?>" href="#" alt="<?php $l->t('Close'); ?>"></a>
 		</div>
 
 		<div class="header flex-row">
@@ -357,9 +357,9 @@ 
 				<div class="cloud">
 					<?php
 					if ($expired) {
-						print_unescaped('<span class="expired">' . $l->t('Expired'). '</span>');
+						print_unescaped('<span class="expired">' . $l->t('Expired') . '</span>');
 					} else {
-						if ($poll->getExpire() !== null){
+						if ($poll->getExpire() !== null) {
 							print_unescaped('<span class="open">' . $l->t('Expires on %s', array(date('d.m.Y', strtotime($poll->getExpire())))) . '</span>');
 						} else {
 							print_unescaped('<span class="open">' . $l->t('Expires never') . '</span>');
@@ -398,7 +398,7 @@ 
 						</a>
 					</li>
 					<li>
-						<a id="id_edit_<?php p($poll->getId()); ?>" class="icon-rename svg" href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>">
+						<a id="id_edit_<?php p($poll->getId()); ?>" class="icon-rename svg" href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', [ 'hash' => $poll->getHash() ])); ?>">
 							<?php p($l->t('Edit Poll')); ?>
 						</a>
 					</li>
@@ -463,13 +463,13 @@ 
 				<?php foreach ($comments as $comment) : ?>
 
 					<?php
-						if ( $comment->getUserId() === $userId ) {
+						if ($comment->getUserId() === $userId) {
 							// Comment is from current user
 							// -> display user
 							$avatarName = $userId;
 							$displayName = $userMgr->get($userId)->getDisplayName();
 
-						} else if ( !$isAnonymous && !$hideNames ) {
+						} else if (!$isAnonymous && !$hideNames) {
 							// comment is from another user,
 							// poll is not anoymous (for current user)
 							// users are not hidden
@@ -493,7 +493,7 @@ 
 						<div class="authorRow user-cell flex-row">
 							<div class="avatar has-tooltip" title="<?php p($avatarName)?>"></div>
 							<div class="author"><?php p($displayName) ?></div>
-							<div class="date has-tooltip live-relative-timestamp datespan" data-timestamp="<?php p(strtotime($comment->getDt())*1000); ?>" title="<?php p($comment->getDt()) ?>"><?php p(\OCP\Template::relative_modified_date(strtotime($comment->getDt()))) ?></div>
+							<div class="date has-tooltip live-relative-timestamp datespan" data-timestamp="<?php p(strtotime($comment->getDt()) * 1000); ?>" title="<?php p($comment->getDt()) ?>"><?php p(\OCP\Template::relative_modified_date(strtotime($comment->getDt()))) ?></div>
 						</div>
 						<div class="message wordwrap comment-content"><?php p($comment->getComment()); ?></div>
 					</li>