nextcloud / polls

lib/Db/Model.php

Spacing +1 added lines, -1 removed lines

@@ -34,6 +34,6 @@
 	 * @param $value
 	 */
 	public function __set($name, $value) {
-		$this->setter($name, [$value]);
+		$this->setter($name, [ $value ]);
 	}
 }

tests/Unit/Factories/CommentFactory.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  */
 $fm->define('OCA\Polls\Db\Comment')->setDefinitions([
 	'userId' => Faker::firstNameMale(),
-	'dt' => function () {
+	'dt' => function() {
 		$date = new DateTime('today');
 		return $date->format('Y-m-d H:i:s');
 	},

tests/Unit/Factories/ParticipationFactory.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  */
 $fm->define('OCA\Polls\Db\Participation')->setDefinitions([
 	'userId' => Faker::firstNameMale(),
-	'dt' => function () {
+	'dt' => function() {
 		$date = new DateTime('today');
 		return $date->format('Y-m-d H:i:s');
 	},

tests/Unit/Factories/DateFactory.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * General factory for the date model.
  */
 $fm->define('OCA\Polls\Db\Date')->setDefinitions([
-	'dt' => function () {
+	'dt' => function() {
 		$date = new DateTime('today');
 		return $date->format('Y-m-d H:i:s');
 	}

templates/create.tmpl.php

Spacing +8 added lines, -8 removed lines

@@ -27,22 +27,22 @@ 
 	\OCP\Util::addScript('polls', 'create_edit');
 	\OCP\Util::addScript('polls', 'vendor/jquery.datetimepicker.full.min');
 
-	$userId = $_['userId'];
+	$userId = $_[ 'userId' ];
 	/** @var \OCP\IUserManager $userMgr */
-	$userMgr = $_['userMgr'];
+	$userMgr = $_[ 'userMgr' ];
 	/** @var \OCP\IURLGenerator $urlGenerator */
-	$urlGenerator = $_['urlGenerator'];
-	$isUpdate = isset($_['poll']) && $_['poll'] !== null;
+	$urlGenerator = $_[ 'urlGenerator' ];
+	$isUpdate = isset($_[ 'poll' ]) && $_[ 'poll' ] !== null;
 	$isAnonymous = false;
 	$hideNames = false;
 
 	if ($isUpdate) {
 		/** @var OCA\Polls\Db\Event $poll */
-		$poll = $_['poll'];
+		$poll = $_[ 'poll' ];
 		$isAnonymous = $poll->getIsAnonymous();
 		$hideNames = $isAnonymous && $poll->getFullAnonymous();
 		/** @var OCA\Polls\Db\Date[]|OCA\Polls\Db\Text[] $dates */
-		$dates = $_['dates'];
+		$dates = $_[ 'dates' ];
 		$chosen = '[';
 		foreach ($dates as $d) {
 			if ($poll->getType() === 0) {
@@ -57,7 +57,7 @@ 
 		$title = $poll->getTitle();
 		$desc = $poll->getDescription();
 		if ($poll->getExpire() !== null) {
-			$expireTs = strtotime($poll->getExpire()) - 60*60*24; //remove one day, which has been added to expire at the end of a day
+			$expireTs = strtotime($poll->getExpire()) - 60 * 60 * 24; //remove one day, which has been added to expire at the end of a day
 			$expireStr = date('d.m.Y', $expireTs);
 		}
 		$access = $poll->getAccess();
@@ -171,7 +171,7 @@ 
 							<table id="selected-dates-table" class="choices">
 							</table>
 						</div>
-						<div id="text-select-container" <?php if(!$isUpdate || $poll->getType() === 0) print_unescaped('style="display:none;"'); ?> >
+						<div id="text-select-container" <?php if (!$isUpdate || $poll->getType() === 0) print_unescaped('style="display:none;"'); ?> >
 							<label for="text-title" class="input_title"><?php p($l->t('Text item')); ?></label>
 							<div class="input-group">
 								<input type="text" id="text-title" placeholder="<?php print_unescaped('Insert text...'); ?>" />

lib/Db/ParticipationTextMapper.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	public function findByPoll($pollId, $limit = null, $offset = null) {
 		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
+		return $this->findEntities($sql, [ $pollId ], $limit, $offset);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function findDistinctByUser($userId, $limit = null, $offset = null) {
 		$sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
-		return $this->findEntities($sql, [$userId], $limit, $offset);
+		return $this->findEntities($sql, [ $userId ], $limit, $offset);
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 */
 	public function findParticipantsByPoll($pollId, $limit = null, $offset = null) {
 		$sql = 'SELECT DISTINCT user_id FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
+		return $this->findEntities($sql, [ $pollId ], $limit, $offset);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function deleteByPoll($pollId) {
 		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
+		$this->execute($sql, [ $pollId ]);
 	}
 
 	/**
@@ -83,6 +83,6 @@ 
 	 */
 	public function deleteByPollAndUser($pollId, $userId) {
 		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
-		$this->execute($sql, [$pollId, $userId]);
+		$this->execute($sql, [ $pollId, $userId ]);
 	}
 }

lib/Db/ParticipationMapper.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	public function findDistinctByUser($userId, $limit = null, $offset = null) {
 		$sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
-		return $this->findEntities($sql, [$userId], $limit, $offset);
+		return $this->findEntities($sql, [ $userId ], $limit, $offset);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function findByPoll($pollId, $limit = null, $offset = null) {
 		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
+		return $this->findEntities($sql, [ $pollId ], $limit, $offset);
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 */
 	public function findParticipantsByPoll($pollId, $limit = null, $offset = null) {
 		$sql = 'SELECT DISTINCT user_id FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
+		return $this->findEntities($sql, [ $pollId ], $limit, $offset);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function deleteByPoll($pollId) {
 		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
+		$this->execute($sql, [ $pollId ]);
 	}
 
 	/**
@@ -83,6 +83,6 @@ 
 	 */
 	public function deleteByPollAndUser($pollId, $userId) {
 		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
-		$this->execute($sql, [$pollId, $userId]);
+		$this->execute($sql, [ $pollId, $userId ]);
 	}
 }

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);
 	}

templates/goto.tmpl.php

Spacing +39 added lines, -39 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();
@@ -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="column vote time has-tooltip" data-timestamp="' . $timestamp . '"data-value-utc="' . $dateElement->getDt() . '">');
 
 								print_unescaped('	<div class="date-box 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="column vote option">');
-								print_unescaped('	<div class="date-box column">' . preg_replace('/_\d+$/', '', $dateElement->getText()).'</div>');
+								print_unescaped('	<div class="date-box column">' . preg_replace('/_\d+$/', '', $dateElement->getText()) . '</div>');
 							}
 							print_unescaped('<div class="counter table-row">');
 							print_unescaped('	<div class="yes table-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 table-row (to vote)
 								if (!$expired) {
-									$userVoted = $others[$usr];
+									$userVoted = $others[ $usr ];
 									continue;
 								}
 							}
@@ -227,7 +227,7 @@ 
 								}
 								// look what user voted for this dts
 								$class = '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 = 'column poll-cell yes';
-											$total['yes'][$i_tot]++;
+											$total[ 'yes' ][ $i_tot ]++;
 										} else if ($vote->getType() === 0) {
 											$class = 'column poll-cell no';
-											$total['no'][$i_tot]++;
+											$total[ 'no' ][ $i_tot ]++;
 										} else if ($vote->getType() === 2) {
 											$class = '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="table-row user current-user">');
 						print_unescaped('	<div class="table-row first">');
 						print_unescaped('		<div class="user-cell table-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;
@@ -342,7 +342,7 @@ 
 
 		<div id="app-sidebar" class="detailsView scroll-container disappear">
 			<div class="close table-row">
-				<a id="closeDetails" class="close icon-close" href="#" alt="<?php $l->t('Close');?>"></a>
+				<a id="closeDetails" class="close icon-close" href="#" alt="<?php $l->t('Close'); ?>"></a>
 			</div>
 
 			<div class="header table-row">
@@ -356,9 +356,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>');
@@ -397,7 +397,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>
@@ -462,13 +462,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
@@ -492,7 +492,7 @@ 
 							<div class="authorRow user-cell table-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>