nextcloud / polls

tests/Unit/Db/ParticipationTextMapperTest.php

Indentation +54 added lines, -54 removed lines

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

tests/Unit/Db/ParticipationMapperTest.php

Indentation +54 added lines, -54 removed lines

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

tests/Unit/Db/EventMapperTest.php

Indentation +47 added lines, -47 removed lines

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

tests/bootstrap.php

Indentation +2 added lines, -2 removed lines

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

tests/Unit/Factories/NotificationFactory.php

Indentation +1 added lines, -1 removed lines

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

templates/create.tmpl.php

Braces +68 added lines, -20 removed lines

@@ -85,8 +85,11 @@ 
 						<span>
 						<?php if ($isUpdate): ?>
 							<?php p($l->t('Edit poll') . ' ' . $poll->getTitle()); ?>
-						<?php else: ?>
-						  <?php p($l->t('Create new poll')); ?>
+						<?php else {
+    : ?>
+						  <?php p($l->t('Create new poll'));
+}
+?>
 						<?php endif; ?>
 						</span>
 					</div>
@@ -96,11 +99,20 @@ 
 		<?php if ($isUpdate): ?>
 			<form name="finish_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.update_poll')); ?>" method="POST">
 				<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
-		<?php else: ?>
-			<form name="finish_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_poll')); ?>" method="POST">
+		<?php else {
+    : ?>
+			<form name="finish_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_poll'));
+}
+?>" method="POST">
 		<?php endif; ?>
-				<input type="hidden" name="chosenDates" id="chosenDates" value="<?php if (isset($chosen)) p($chosen); ?>" />
-				<input type="hidden" name="expireTs" id="expireTs" value="<?php if (isset($expireTs)) p($expireTs); ?>" />
+				<input type="hidden" name="chosenDates" id="chosenDates" value="<?php if (isset($chosen)) {
+    p($chosen);
+}
+?>" />
+				<input type="hidden" name="expireTs" id="expireTs" value="<?php if (isset($expireTs)) {
+    p($expireTs);
+}
+?>" />
 				<input type="hidden" name="userId" id="userId" value="<?php p($userId); ?>" />
 
 				<header class="row">
@@ -109,22 +121,40 @@ 
 				<div class="new_poll row">
 					<div class="col-50">
 						<label for="pollTitle" class="input_title"><?php p($l->t('Title')); ?></label>
-						<input type="text" class="input_field" id="pollTitle" name="pollTitle" value="<?php if (isset($title)) p($title); ?>" />
+						<input type="text" class="input_field" id="pollTitle" name="pollTitle" value="<?php if (isset($title)) {
+    p($title);
+}
+?>" />
 						<label for="pollDesc" class="input_title"><?php p($l->t('Description')); ?></label>
-						<textarea class="input_field" id="pollDesc" name="pollDesc"><?php if (isset($desc)) p($desc); ?></textarea>
+						<textarea class="input_field" id="pollDesc" name="pollDesc"><?php if (isset($desc)) {
+    p($desc);
+}
+?></textarea>
 
 						<label class="input_title"><?php p($l->t('Access')); ?></label>
 
-						<input type="radio" name="accessType" id="private" value="registered" class="radio" <?php if (!$isUpdate || $access === 'registered') print_unescaped('checked'); ?> />
+						<input type="radio" name="accessType" id="private" value="registered" class="radio" <?php if (!$isUpdate || $access === 'registered') {
+    print_unescaped('checked');
+}
+?> />
 						<label for="private"><?php p($l->t('Registered users only')); ?></label>
 
-						<input type="radio" name="accessType" id="hidden" value="hidden" class="radio" <?php if ($isUpdate && $access === 'hidden') print_unescaped('checked'); ?> />
+						<input type="radio" name="accessType" id="hidden" value="hidden" class="radio" <?php if ($isUpdate && $access === 'hidden') {
+    print_unescaped('checked');
+}
+?> />
 						<label for="hidden"><?php p($l->t('hidden')); ?></label>
 
-						<input type="radio" name="accessType" id="public" value="public" class="radio" <?php if ($isUpdate && $access === 'public') print_unescaped('checked'); ?> />
+						<input type="radio" name="accessType" id="public" value="public" class="radio" <?php if ($isUpdate && $access === 'public') {
+    print_unescaped('checked');
+}
+?> />
 						<label for="public"><?php p($l->t('Public access')); ?></label>
 
-						<input type="radio" name="accessType" id="select" value="select" class="radio" <?php if ($isUpdate && $access === 'select') print_unescaped('checked'); ?>>
+						<input type="radio" name="accessType" id="select" value="select" class="radio" <?php if ($isUpdate && $access === 'select') {
+    print_unescaped('checked');
+}
+?>>
 						<label for="select"><?php p($l->t('Select')); ?></label>
 						<span id="id_label_select">...</span>
 
@@ -140,9 +170,12 @@ 
 							</div>
 						</div>
 
-						<input type="hidden" name="accessValues" id="accessValues" value="<?php if ($isUpdate && $access === 'select') p($accessTypes) ?>" />
+						<input type="hidden" name="accessValues" id="accessValues" value="<?php if ($isUpdate && $access === 'select') {
+    p($accessTypes) ?>" />
 
-						<input id="isAnonymous" name="isAnonymous" type="checkbox" class="checkbox" <?php $isAnonymous ? print_unescaped('value="true" checked') : print_unescaped('value="false"'); ?> />
+						<input id="isAnonymous" name="isAnonymous" type="checkbox" class="checkbox" <?php $isAnonymous ? print_unescaped('value="true" checked') : print_unescaped('value="false"');
+}
+?> />
 						<label for="isAnonymous" class="input_title"><?php p($l->t('Anonymous')) ?></label>
 
 						<div id="anonOptions" style="display:none;">
@@ -158,20 +191,32 @@ 
 					</div>
 					<div class="col-50">
 
-						<input type="radio" name="pollType" id="event" value="event" class="radio" <?php if (!$isUpdate || $poll->getType() === 0) print_unescaped('checked'); ?> />
+						<input type="radio" name="pollType" id="event" value="event" class="radio" <?php if (!$isUpdate || $poll->getType() === 0) {
+    print_unescaped('checked');
+}
+?> />
 						<label for="event"><?php p($l->t('Event schedule')); ?></label>
 
 						<!-- TODO texts to db -->
-						<input type="radio" name="pollType" id="text" value="text" class="radio" <?php if ($isUpdate && $poll->getType() === 1) print_unescaped('checked'); ?>>
+						<input type="radio" name="pollType" id="text" value="text" class="radio" <?php if ($isUpdate && $poll->getType() === 1) {
+    print_unescaped('checked');
+}
+?>>
 						<label for="text"><?php p($l->t('Text based')); ?></label>
 
-						<div id="date-select-container" <?php if ($isUpdate && $poll->getType() === 1) print_unescaped('style="display:none;"'); ?> >
+						<div id="date-select-container" <?php if ($isUpdate && $poll->getType() === 1) {
+    print_unescaped('style="display:none;"');
+}
+?> >
 							<label for="datetimepicker" class="input_title"><?php p($l->t('Dates')); ?></label>
 							<input id="datetimepicker" type="text" />
 							<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...'); ?>" />
@@ -187,8 +232,11 @@ 
 				<div class="form-actions">
 					<?php if ($isUpdate): ?>
 						<input type="submit" id="submit_finish_poll" class="button btn primary" value="<?php p($l->t('Update poll')); ?>" />
-					<?php else: ?>
-						<input type="submit" id="submit_finish_poll" class="button btn primary" value="<?php p($l->t('Create poll')); ?>" />
+					<?php else {
+    : ?>
+						<input type="submit" id="submit_finish_poll" class="button btn primary" value="<?php p($l->t('Create poll'));
+}
+?>" />
 					<?php endif; ?>
 					<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>" id="submit_cancel_poll" class="button"><?php p($l->t('Cancel')); ?></a>
 				</div>

Indentation +70 added lines, -70 removed lines

@@ -1,74 +1,74 @@
 <?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/>.
-	 *
-	 */
-
-	\OCP\Util::addStyle('polls', 'main');
-	\OCP\Util::addStyle('polls', 'createpoll');
-	\OCP\Util::addStyle('polls', 'vendor/jquery.datetimepicker');
-	\OCP\Util::addScript('polls', 'create_edit');
-	\OCP\Util::addScript('polls', 'vendor/jquery.datetimepicker.full.min');
-
-	$userId = $_['userId'];
-	/** @var \OCP\IUserManager $userMgr */
-	$userMgr = $_['userMgr'];
-	/** @var \OCP\IURLGenerator $urlGenerator */
-	$urlGenerator = $_['urlGenerator'];
-	$isUpdate = isset($_['poll']) && $_['poll'] !== null;
-	$isAnonymous = false;
-	$hideNames = false;
-
-	if ($isUpdate) {
-		/** @var OCA\Polls\Db\Event $poll */
-		$poll = $_['poll'];
-		$isAnonymous = $poll->getIsAnonymous();
-		$hideNames = $isAnonymous && $poll->getFullAnonymous();
-		/** @var OCA\Polls\Db\Date[]|OCA\Polls\Db\Text[] $dates */
-		$dates = $_['dates'];
-		$chosen = '[';
-		foreach ($dates as $d) {
-			if ($poll->getType() === 0) {
-				$chosen .= strtotime($d->getDt());
-			} else {
-				$chosen .= '"' . $d->getText() . '"';
-			}
-			$chosen .= ',';
-		}
-		$chosen = trim($chosen, ',');
-		$chosen .= ']';
-		$title = $poll->getTitle();
-		$desc = $poll->getDescription();
-		if ($poll->getExpire() !== null) {
-			$expireTs = strtotime($poll->getExpire());
-			$expireStr = date('d.m.Y', $expireTs);
-		}
-		$access = $poll->getAccess();
-		$accessTypes = $access;
-		if (
-			$access !== 'registered'
-			&& $access !== 'hidden' && $access !== 'public'
-		) {
-			$access = 'select';
-		}
-	}
+    /**
+     * @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/>.
+     *
+     */
+
+    \OCP\Util::addStyle('polls', 'main');
+    \OCP\Util::addStyle('polls', 'createpoll');
+    \OCP\Util::addStyle('polls', 'vendor/jquery.datetimepicker');
+    \OCP\Util::addScript('polls', 'create_edit');
+    \OCP\Util::addScript('polls', 'vendor/jquery.datetimepicker.full.min');
+
+    $userId = $_['userId'];
+    /** @var \OCP\IUserManager $userMgr */
+    $userMgr = $_['userMgr'];
+    /** @var \OCP\IURLGenerator $urlGenerator */
+    $urlGenerator = $_['urlGenerator'];
+    $isUpdate = isset($_['poll']) && $_['poll'] !== null;
+    $isAnonymous = false;
+    $hideNames = false;
+
+    if ($isUpdate) {
+        /** @var OCA\Polls\Db\Event $poll */
+        $poll = $_['poll'];
+        $isAnonymous = $poll->getIsAnonymous();
+        $hideNames = $isAnonymous && $poll->getFullAnonymous();
+        /** @var OCA\Polls\Db\Date[]|OCA\Polls\Db\Text[] $dates */
+        $dates = $_['dates'];
+        $chosen = '[';
+        foreach ($dates as $d) {
+            if ($poll->getType() === 0) {
+                $chosen .= strtotime($d->getDt());
+            } else {
+                $chosen .= '"' . $d->getText() . '"';
+            }
+            $chosen .= ',';
+        }
+        $chosen = trim($chosen, ',');
+        $chosen .= ']';
+        $title = $poll->getTitle();
+        $desc = $poll->getDescription();
+        if ($poll->getExpire() !== null) {
+            $expireTs = strtotime($poll->getExpire());
+            $expireStr = date('d.m.Y', $expireTs);
+        }
+        $access = $poll->getAccess();
+        $accessTypes = $access;
+        if (
+            $access !== 'registered'
+            && $access !== 'hidden' && $access !== 'public'
+        ) {
+            $access = 'select';
+        }
+    }
 ?>
 
 <div id="app">

Spacing +7 added lines, -7 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) {
@@ -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/CommentMapper.php

Indentation +34 added lines, -34 removed lines

@@ -28,41 +28,41 @@
 
 class CommentMapper extends Mapper {
 
-	/**
-	 * CommentMapper constructor.
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_comments', '\OCA\Polls\Db\Comment');
-	}
+    /**
+     * CommentMapper constructor.
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_comments', '\OCA\Polls\Db\Comment');
+    }
 
-	/**
-	 * @param string $userId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Comment[]
-	 */
-	public function findDistinctByUser($userId, $limit = null, $offset = null) {
-		$sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
-		return $this->findEntities($sql, [$userId], $limit, $offset);
-	}
+    /**
+     * @param string $userId
+     * @param int $limit
+     * @param int $offset
+     * @return Comment[]
+     */
+    public function findDistinctByUser($userId, $limit = null, $offset = null) {
+        $sql = 'SELECT DISTINCT * FROM ' . $this->getTableName() . ' WHERE user_id = ?';
+        return $this->findEntities($sql, [$userId], $limit, $offset);
+    }
 
-	/**
-	 * @param int $pollId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Comment[]
-	 */
-	public function findByPoll($pollId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ? ORDER BY Dt DESC';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
-	}
+    /**
+     * @param int $pollId
+     * @param int $limit
+     * @param int $offset
+     * @return Comment[]
+     */
+    public function findByPoll($pollId, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ? ORDER BY Dt DESC';
+        return $this->findEntities($sql, [$pollId], $limit, $offset);
+    }
 
-	/**
-	 * @param int $pollId
-	 */
-	public function deleteByPoll($pollId) {
-		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
-	}
+    /**
+     * @param int $pollId
+     */
+    public function deleteByPoll($pollId) {
+        $sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        $this->execute($sql, [$pollId]);
+    }
 }

lib/Db/Participation.php

Indentation +11 added lines, -11 removed lines

@@ -35,16 +35,16 @@
  * @method void setType(integer $value)
  */
 class Participation extends Model {
-	protected $dt;
-	protected $userId;
-	protected $pollId;
-	protected $type;
+    protected $dt;
+    protected $userId;
+    protected $pollId;
+    protected $type;
 
-	/**
-	 * Participation constructor.
-	 */
-	public function __construct() {
-		$this->addType('pollId', 'integer');
-		$this->addType('type', 'integer');
-	}
+    /**
+     * Participation constructor.
+     */
+    public function __construct() {
+        $this->addType('pollId', 'integer');
+        $this->addType('type', 'integer');
+    }
 }

lib/Db/NotificationMapper.php

Indentation +55 added lines, -55 removed lines

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