nextcloud / polls

tests/Integration/AppTest.php

Indentation +10 added lines, -10 removed lines

@@ -28,16 +28,16 @@
 
 class AppTest extends TestCase {
 
-	private $container;
+    private $container;
 
-	public function setUp() {
-		parent::setUp();
-		$app = new App('polls');
-		$this->container = $app->getContainer();
-	}
+    public function setUp() {
+        parent::setUp();
+        $app = new App('polls');
+        $this->container = $app->getContainer();
+    }
 
-	public function testAppInstalled() {
-		$appManager = $this->container->query('OCP\App\IAppManager');
-		$this->assertTrue($appManager->isInstalled('polls'));
-	}
+    public function testAppInstalled() {
+        $appManager = $this->container->query('OCP\App\IAppManager');
+        $this->assertTrue($appManager->isInstalled('polls'));
+    }
 }

tests/Unit/Controller/PageControllerTest.php

Indentation +69 added lines, -69 removed lines

@@ -29,77 +29,77 @@
 
 class PageControllerTest extends PHPUnit_Framework_TestCase {
 
-	private $controller;
-	private $userId = 'john';
+    private $controller;
+    private $userId = 'john';
 
-	public function setUp() {
-		$request = $this->getMockBuilder('OCP\IRequest')
-			->disableOriginalConstructor()
-			->getMock();
-		$userManager = $this->getMockBuilder('OCP\IUserManager')
-			->disableOriginalConstructor()
-			->getMock();
-		$groupManager = $this->getMockBuilder('OCP\IGroupManager')
-			->disableOriginalConstructor()
-			->getMock();
-		$avatarManager = $this->getMockBuilder('OCP\IAvatarManager')
-			->disableOriginalConstructor()
-			->getMock();
-		$logger = $this->getMockBuilder('OCP\ILogger')
-			->disableOriginalConstructor()
-			->getMock();
-		$l10n = $this->getMockBuilder('OCP\IL10N')
-			->disableOriginalConstructor()
-			->getMock();
-		$urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')
-			->disableOriginalConstructor()
-			->getMock();
-		$commentMapper = $this->getMockBuilder('OCA\Polls\Db\CommentMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$dateMapper = $this->getMockBuilder('OCA\Polls\Db\DateMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$eventMapper = $this->getMockBuilder('OCA\Polls\Db\EventMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$notificationMapper = $this->getMockBuilder('OCA\Polls\Db\NotificationMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$participationMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$participationTextMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationTextMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$textMapper = $this->getMockBuilder('OCA\Polls\Db\TextMapper')
-			->disableOriginalConstructor()
-			->getMock();
+    public function setUp() {
+        $request = $this->getMockBuilder('OCP\IRequest')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $userManager = $this->getMockBuilder('OCP\IUserManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $groupManager = $this->getMockBuilder('OCP\IGroupManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $avatarManager = $this->getMockBuilder('OCP\IAvatarManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $logger = $this->getMockBuilder('OCP\ILogger')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $l10n = $this->getMockBuilder('OCP\IL10N')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $commentMapper = $this->getMockBuilder('OCA\Polls\Db\CommentMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dateMapper = $this->getMockBuilder('OCA\Polls\Db\DateMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $eventMapper = $this->getMockBuilder('OCA\Polls\Db\EventMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $notificationMapper = $this->getMockBuilder('OCA\Polls\Db\NotificationMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $participationMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $participationTextMapper = $this->getMockBuilder('OCA\Polls\Db\ParticipationTextMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $textMapper = $this->getMockBuilder('OCA\Polls\Db\TextMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-		$this->controller = new PageController(
-			'polls',
-			$request,
-			$userManager,
-			$groupManager,
-			$avatarManager,
-			$logger,
-			$l10n,
-			$urlGenerator,
-			$this->userId,
-			$commentMapper,
-			$dateMapper,
-			$eventMapper,
-			$notificationMapper,
-			$participationMapper,
-			$participationTextMapper,
-			$textMapper
-		);
-	}
+        $this->controller = new PageController(
+            'polls',
+            $request,
+            $userManager,
+            $groupManager,
+            $avatarManager,
+            $logger,
+            $l10n,
+            $urlGenerator,
+            $this->userId,
+            $commentMapper,
+            $dateMapper,
+            $eventMapper,
+            $notificationMapper,
+            $participationMapper,
+            $participationTextMapper,
+            $textMapper
+        );
+    }
 
-	public function testIndex() {
-		$result = $this->controller->index();
+    public function testIndex() {
+        $result = $this->controller->index();
 
-		$this->assertEquals('main.tmpl', $result->getTemplateName());
-		$this->assertTrue($result instanceof TemplateResponse);
-	}
+        $this->assertEquals('main.tmpl', $result->getTemplateName());
+        $this->assertTrue($result instanceof TemplateResponse);
+    }
 }

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');
@@ -34,7 +34,7 @@ 
 \OC_App::loadApp('polls');
 
 if (!class_exists('PHPUnit_Framework_TestCase')) {
-	require_once('PHPUnit/Autoload.php');
+    require_once('PHPUnit/Autoload.php');
 }
 
 OC_Hook::clear();

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	define('PHPUNIT_RUN', 1);
 }
 
-require_once(__DIR__.'/../../../lib/base.php');
+require_once(__DIR__ . '/../../../lib/base.php');
 
 // Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
 \OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');

templates/main.tmpl.php

Indentation +122 added lines, -122 removed lines

@@ -1,35 +1,35 @@ 
 <?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', 'start');
+    \OCP\Util::addStyle('polls', 'main');
+    \OCP\Util::addStyle('polls', 'list');
+    \OCP\Util::addScript('polls', 'start');
 
-	$userId = $_['userId'];
-	$userMgr = $_['userMgr'];
-	$urlGenerator = $_['urlGenerator'];
+    $userId = $_['userId'];
+    $userMgr = $_['userMgr'];
+    $urlGenerator = $_['urlGenerator'];
 ?>
 	<div id="app-content">
 		<div id="app-content-wrapper">
@@ -83,61 +83,61 @@ 
 
 				<?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');
+                        }
 
-						if ($poll->getExpire() != null) {
-							// $expiry_date = date('d.m.Y', strtotime($poll->getExpire()));
-							$expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
-							$expiry_style = ' progress';
-							if (date('U') > strtotime($poll->getExpire())) {
-								$expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire()));
-								$expiry_style = ' expired';
-							}
-						} else {
-							$expiry_style = ' endless';
-							$expiry_date = $l->t('Never');
-						}
+                        if ($poll->getExpire() != null) {
+                            // $expiry_date = date('d.m.Y', strtotime($poll->getExpire()));
+                            $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire())); // does not work, because relative_modified_date seems not to recognise future time diffs
+                            $expiry_style = ' progress';
+                            if (date('U') > strtotime($poll->getExpire())) {
+                                $expiry_date = OCP\relative_modified_date(strtotime($poll->getExpire()));
+                                $expiry_style = ' expired';
+                            }
+                        } else {
+                            $expiry_style = ' endless';
+                            $expiry_date = $l->t('Never');
+                        }
 
-						for ($i = 0; $i < count($participated); $i++) {
-							if ($poll->getId() == intval($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() == intval($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() == intval($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() == intval($comments[$i]->getPollId())) {
+                                $commented_class = 'commented_yes';
+                                $commented_title = 'You commented';
+                                array_splice($comments, $i, 1);
+                                break;
+                            }
+                        }
+                    ?>
 
 
 					<div class="row table-body">
@@ -213,16 +213,16 @@ 
  * @return array with groups
  */
 function getGroups($userId) {
-	// $this->requireLogin();
-	if (class_exists('\OC_Group', true)) {
-		// 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);
+    // $this->requireLogin();
+    if (class_exists('\OC_Group', true)) {
+        // 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);
 }
 
 /**
@@ -231,42 +231,42 @@ 
  * @return boolean 
  */
 function userHasAccess($poll, $userId) {
-	if ($poll == null) {
-		return false;
-	}
-	$access = $poll->getAccess();
-	$owner = $poll->getOwner();
-	if (!User::isLoggedIn()) {
-		return false;
-	}
-	if ($access == 'public') {
-		return true;
-	}
-	if ($access == 'hidden') {
-		return true;
-	}
-	if ($access == 'registered') {
-		return true;
-	}
-	if ($owner == $userId) {
-		return true;
-	}
-	$user_groups = getGroups($userId);
+    if ($poll == null) {
+        return false;
+    }
+    $access = $poll->getAccess();
+    $owner = $poll->getOwner();
+    if (!User::isLoggedIn()) {
+        return false;
+    }
+    if ($access == 'public') {
+        return true;
+    }
+    if ($access == 'hidden') {
+        return true;
+    }
+    if ($access == 'registered') {
+        return true;
+    }
+    if ($owner == $userId) {
+        return true;
+    }
+    $user_groups = getGroups($userId);
 
-	$arr = explode(';', $access);
+    $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 +13 added lines, -13 removed lines

@@ -27,9 +27,9 @@ 
 	\OCP\Util::addStyle('polls', 'list');
 	\OCP\Util::addScript('polls', 'start');
 
-	$userId = $_['userId'];
-	$userMgr = $_['userMgr'];
-	$urlGenerator = $_['urlGenerator'];
+	$userId = $_[ 'userId' ];
+	$userMgr = $_[ 'userMgr' ];
+	$urlGenerator = $_[ 'urlGenerator' ];
 ?>
 	<div id="app-content">
 		<div id="app-content-wrapper">
@@ -48,7 +48,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>
@@ -81,7 +81,7 @@ 
 					 </div>
 				</div>
 
-				<?php foreach ($_['polls'] as $poll) : ?>
+				<?php foreach ($_[ 'polls' ] as $poll) : ?>
 					<?php
 						if (!userHasAccess($poll, $userId)) continue;
 						// direct url to poll
@@ -90,15 +90,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);
@@ -121,7 +121,7 @@ 
 						}
 
 						for ($i = 0; $i < count($participated); $i++) {
-							if ($poll->getId() == intval($participated[$i]->getPollId())) {
+							if ($poll->getId() == intval($participated[ $i ]->getPollId())) {
 								$participated_class = 'partic_yes';
 								$participated_title = 'You voted';
 								array_splice($participated, $i, 1);
@@ -130,7 +130,7 @@ 
 						}
 
 						for ($i = 0; $i < count($comments); $i++) {
-							if ($poll->getId() == intval($comments[$i]->getPollId())) {
+							if ($poll->getId() == intval($comments[ $i ]->getPollId())) {
 								$commented_class = 'commented_yes';
 								$commented_title = 'You commented';
 								array_splice($comments, $i, 1);
@@ -143,7 +143,7 @@ 
 					<div class="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 status or type of poll */ -->
+								<div class="thumbnail <?php p($expiry_style . " " . $commented_class . " " . $participated_class); ?>"></div>  <!-- Image to display status or type of poll */ -->
 								<a href="<?php p($pollUrl); ?>" class="wrapper group-1-1">
 									<div class="column name">						  <?php p($poll->getTitle()); ?></div>
 									<div class="column description">				   <?php p($poll->getDescription()); ?></div>
@@ -166,7 +166,7 @@ 
 												</button>
 											</li>
 											<li>
-												<a href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', ['hash' => $poll->getHash()])); ?>" class="menuitem action permanent" id="id_edit_<?php p($poll->getId()); ?>">
+												<a href="<?php p($urlGenerator->linkToRoute('polls.page.edit_poll', [ 'hash' => $poll->getHash() ])); ?>" class="menuitem action permanent" id="id_edit_<?php p($poll->getId()); ?>">
 													<span class="icon-rename"></span>
 													<span>Edit Poll</span>
 												</a>
@@ -220,7 +220,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 +15 added lines, -7 removed lines

@@ -53,14 +53,17 @@ 
 			<div class="icon-polls"></div>
 			<h2><?php p($l->t('No existing polls.')); ?></h2>
 		</div>
-	<?php else : ?>
+	<?php else {
+    : ?>
 			<div class="table has-controls">
 				<div class ="row table-header">
 
 					<div class="wrapper group-master">
 						<div class="wrapper group-1">
 							<div class="wrapper group-1-1">
-								<div class="column name">		<?php p($l->t('Title')); ?></div>
+								<div class="column name">		<?php p($l->t('Title'));
+}
+?></div>
 								<div class="column description"></div>
 							</div>
 							<div class="wrapper group-1-2">
@@ -83,7 +86,9 @@ 
 
 				<?php foreach ($_['polls'] as $poll) : ?>
 					<?php
-						if (!userHasAccess($poll, $userId)) continue;
+						if (!userHasAccess($poll, $userId)) {
+						    continue;
+						}
 						// direct url to poll
 						$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', array('hash' => $poll->getHash()));
 						$owner = $poll->getOwner();
@@ -259,12 +264,15 @@ 
 		if (strpos($item, 'group_') == 0) {
 			$grp = substr($item, 6);
 			foreach ($user_groups as $user_group) {
-				if ($user_group == $grp) return true;
+				if ($user_group == $grp) {
+				    return true;
+				}
 			}
-		}
-		else if (strpos($item, 'user_') == 0) {
+		} else if (strpos($item, 'user_') == 0) {
 			$usr = substr($item, 5);
-			if ($usr == $userId) return true;
+			if ($usr == $userId) {
+			    return true;
+			}
 		}
 	}
 	return false;

templates/create.tmpl.php

Braces +68 added lines, -20 removed lines

@@ -80,8 +80,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>
@@ -91,11 +94,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">
@@ -104,22 +116,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>
 
@@ -135,9 +165,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;">
@@ -153,20 +186,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...'); ?>" />
@@ -182,8 +227,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 +65 added lines, -65 removed lines

@@ -1,69 +1,69 @@
 <?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', 'jquery.datetimepicker');
-	\OCP\Util::addScript('polls', 'create_edit');
-	\OCP\Util::addScript('polls', 'vendor/jquery.datetimepicker.full.min');
-
-	$userId = $_['userId'];
-	$userMgr = $_['userMgr'];
-	$urlGenerator = $_['urlGenerator'];
-	$isUpdate = isset($_['poll']) && $_['poll'] != null;
-	$isAnonymous = false;
-	$hideNames = false;
-
-	if ($isUpdate) {
-		$poll = $_['poll'];
-		$isAnonymous = $poll->getIsAnonymous();
-		$hideNames = $isAnonymous && $poll->getFullAnonymous();
-		$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()) - 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();
-		$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', 'jquery.datetimepicker');
+    \OCP\Util::addScript('polls', 'create_edit');
+    \OCP\Util::addScript('polls', 'vendor/jquery.datetimepicker.full.min');
+
+    $userId = $_['userId'];
+    $userMgr = $_['userMgr'];
+    $urlGenerator = $_['urlGenerator'];
+    $isUpdate = isset($_['poll']) && $_['poll'] != null;
+    $isAnonymous = false;
+    $hideNames = false;
+
+    if ($isUpdate) {
+        $poll = $_['poll'];
+        $isAnonymous = $poll->getIsAnonymous();
+        $hideNames = $isAnonymous && $poll->getFullAnonymous();
+        $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()) - 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();
+        $accessTypes = $access;
+        if (   $access != 'registered' 
+            && $access != 'hidden' && $access != 'public'
+        ) {
+            $access = 'select';
+        }
+    }
 ?>
 
 <div id="app">

Spacing +9 added lines, -9 removed lines

@@ -27,18 +27,18 @@ 
 	\OCP\Util::addScript('polls', 'create_edit');
 	\OCP\Util::addScript('polls', 'vendor/jquery.datetimepicker.full.min');
 
-	$userId = $_['userId'];
-	$userMgr = $_['userMgr'];
-	$urlGenerator = $_['urlGenerator'];
-	$isUpdate = isset($_['poll']) && $_['poll'] != null;
+	$userId = $_[ 'userId' ];
+	$userMgr = $_[ 'userMgr' ];
+	$urlGenerator = $_[ 'urlGenerator' ];
+	$isUpdate = isset($_[ 'poll' ]) && $_[ 'poll' ] != null;
 	$isAnonymous = false;
 	$hideNames = false;
 
 	if ($isUpdate) {
-		$poll = $_['poll'];
+		$poll = $_[ 'poll' ];
 		$isAnonymous = $poll->getIsAnonymous();
 		$hideNames = $isAnonymous && $poll->getFullAnonymous();
-		$dates = $_['dates'];
+		$dates = $_[ 'dates' ];
 		$chosen = '[';
 		foreach ($dates as $d) {
 			if ($poll->getType() == '0') {
@@ -53,12 +53,12 @@ 
 		$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();
 		$accessTypes = $access;
-		if (   $access != 'registered' 
+		if ($access != 'registered' 
 			&& $access != 'hidden' && $access != 'public'
 		) {
 			$access = 'select';
@@ -166,7 +166,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...'); ?>" />

templates/goto.tmpl.php

Indentation +237 added lines, -237 removed lines

@@ -1,50 +1,50 @@ 
 <?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', 'vote');
-	\OCP\Util::addScript('polls', 'vote');
+    \OCP\Util::addStyle('polls', 'main');
+    \OCP\Util::addStyle('polls', 'vote');
+    \OCP\Util::addScript('polls', 'vote');
 	
-	$userId = $_['userId'];
-	$userMgr = $_['userMgr'];
-	$urlGenerator = $_['urlGenerator'];
-	$avaMgr = $_['avatarManager'];
+    $userId = $_['userId'];
+    $userMgr = $_['userMgr'];
+    $urlGenerator = $_['urlGenerator'];
+    $avaMgr = $_['avatarManager'];
 
-	$poll = $_['poll'];
-	$dates = $_['dates'];
-	$votes = $_['votes'];
-	$comments = $_['comments'];
-	$isAnonymous = $poll->getIsAnonymous() && $userId != $poll->getOwner();
-	$hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
-	$notification = $_['notification'];
+    $poll = $_['poll'];
+    $dates = $_['dates'];
+    $votes = $_['votes'];
+    $comments = $_['comments'];
+    $isAnonymous = $poll->getIsAnonymous() && $userId != $poll->getOwner();
+    $hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
+    $notification = $_['notification'];
 
-	if ($poll->getExpire() == null) {
-		$expired = false;
-	} else {
-		$expired = time() > strtotime($poll->getExpire());
-	}
+    if ($poll->getExpire() == null) {
+        $expired = false;
+    } else {
+        $expired = time() > strtotime($poll->getExpire());
+    }
 ?>
 
 <?php if($poll->getType() == '0') : ?>
@@ -55,19 +55,19 @@ 
 
 <?php
 if (   $poll->getDescription() != null 
-	&& $poll->getDescription() != ''
+    && $poll->getDescription() != ''
 ) {
-	$description = nl2br($poll->getDescription());
+    $description = nl2br($poll->getDescription());
 } else {
-	$description = $l->t('No description provided.');
+    $description = $l->t('No description provided.');
 }
 
 // init array for counting 'yes'-votes for each date
 $total_y = array();
 $total_n = array();
 for ($i = 0 ; $i < count($dates) ; $i++) {
-	$total_y[$i] = 0;
-	$total_n[$i] = 0;
+    $total_y[$i] = 0;
+    $total_n[$i] = 0;
 }
 $user_voted = array();
 
@@ -106,189 +106,189 @@ 
 						<table class="vote_table">
 							<thead>
 									<?php
-									if ($poll->getType() == '0') {
-										print_unescaped('<tr id="time-slots-header"><th class="first_header_cell" colspan="3"></th>');
-									} else {
-										print_unescaped('<tr id="vote-options-header"><th class="first_header_cell" colspan="3"></th>');
-										foreach ($dates as $el) {
-											print_unescaped('<th title="' . preg_replace('/_\d+$/', '', $el->getText()) . '" class="vote-option">' . preg_replace('/_\d+$/', '', $el->getText()) . '</th>');
-										}
-									}
-									print_unescaped('</tr>');
-									?>
+                                    if ($poll->getType() == '0') {
+                                        print_unescaped('<tr id="time-slots-header"><th class="first_header_cell" colspan="3"></th>');
+                                    } else {
+                                        print_unescaped('<tr id="vote-options-header"><th class="first_header_cell" colspan="3"></th>');
+                                        foreach ($dates as $el) {
+                                            print_unescaped('<th title="' . preg_replace('/_\d+$/', '', $el->getText()) . '" class="vote-option">' . preg_replace('/_\d+$/', '', $el->getText()) . '</th>');
+                                        }
+                                    }
+                                    print_unescaped('</tr>');
+                                    ?>
 							</thead>
 							<tbody class="votes">
 								<?php
-								if ($votes != null) {
-									//group by user
-									$others = array();
-									foreach ($votes as $vote) {
-										if (!isset($others[$vote->getUserId()])) {
-											$others[$vote->getUserId()] = array();
-										}
-										array_push($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 row (to vote)
-											if (!$expired) {
-												$user_voted = $others[$usr];
-												continue;
-											}
-										}
-										print_unescaped('<tr>');
-										print_unescaped('<td class="avatar-cell">');
-										if (	$userMgr->get($usr) != null 
-											&& !$isAnonymous && !$hideNames
-										) {
-											print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
-											print_unescaped('</td>');
-											print_unescaped('<td colspan="2" class="name">');
-											p($userMgr->get($usr)->getDisplayName());
-										} else {
-											if ($isAnonymous || $hideNames) {
-											print_unescaped('<div class="poll avatardiv" title="'.($userCnt).'"></div>');
-											print_unescaped('</td>');
-											print_unescaped('<td colspan="2" class="name">');
-											} else {
-												print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
-												print_unescaped('</td>');
-												print_unescaped('<td colspan="2" class="name">');
-												p($usr);
-											}
-										}
-										print_unescaped('</td>');
+                                if ($votes != null) {
+                                    //group by user
+                                    $others = array();
+                                    foreach ($votes as $vote) {
+                                        if (!isset($others[$vote->getUserId()])) {
+                                            $others[$vote->getUserId()] = array();
+                                        }
+                                        array_push($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 row (to vote)
+                                            if (!$expired) {
+                                                $user_voted = $others[$usr];
+                                                continue;
+                                            }
+                                        }
+                                        print_unescaped('<tr>');
+                                        print_unescaped('<td class="avatar-cell">');
+                                        if (	$userMgr->get($usr) != null 
+                                            && !$isAnonymous && !$hideNames
+                                        ) {
+                                            print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
+                                            print_unescaped('</td>');
+                                            print_unescaped('<td colspan="2" class="name">');
+                                            p($userMgr->get($usr)->getDisplayName());
+                                        } else {
+                                            if ($isAnonymous || $hideNames) {
+                                            print_unescaped('<div class="poll avatardiv" title="'.($userCnt).'"></div>');
+                                            print_unescaped('</td>');
+                                            print_unescaped('<td colspan="2" class="name">');
+                                            } else {
+                                                print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
+                                                print_unescaped('</td>');
+                                                print_unescaped('<td colspan="2" class="name">');
+                                                p($usr);
+                                            }
+                                        }
+                                        print_unescaped('</td>');
 
-										// loop over dts
-										$i_tot = 0;
-										foreach ($dates as $dt) {
-											if ($poll->getType() == '0') {
-												$date_id = strtotime($dt->getDt());
-												$poll_id = "pollid_" . $dt->getId();
-											} else {
-												$date_id = $dt->getText();
-												$poll_id = "pollid_" . $dt->getId();
-											}
-											// look what user voted for this dts
-											$found = false;
-											foreach ($others[$usr] as $vote) {
-												$voteVal = null;
-												if ($poll->getType() == '0') {
-													$voteVal = strtotime($vote->getDt());
-												} else {
-													$voteVal = $vote->getText();
-												}
-												if ($date_id == $voteVal) {
-													if ($vote->getType() == '1') {
-														$cl = 'poll-cell yes';
-														$total_y[$i_tot]++;
-													} else if ($vote->getType() == '0') {
-														$cl = 'poll-cell no';
-														$total_n[$i_tot]++;
-													} else if ($vote->getType() == '2') {
-														$cl = 'poll-cell maybe';
-													} else {
-														$cl = 'poll-cell unvoted';
-													}
-													$found = true;
-													break;
-												}
-											}
-											if (!$found) {
-												$cl = 'poll-cell unvoted';
-											}
-											// Make the td clickable
-											print_unescaped('<td class="' . $cl . '"><div></div></td>');
-											// Make the div clickable
-											// print_unescaped('<td><div class="' . $cl . '"></div></td>');
-											$i_tot++;
-										}
-										print_unescaped('</tr>');
-									}
-								}
-								$total_y_others = array_merge(array(), $total_y);
-								$total_n_others = array_merge(array(), $total_n);
-								if (!$expired) {
-									print_unescaped('<tr class="current-user">');
-									print_unescaped('<td class="avatar-cell">');
-									if (User::isLoggedIn()) {
-										print_unescaped('<div class="poll avatardiv" title="'.($userId).'"></div>');
-										print_unescaped('</td>');
-										print_unescaped('<td class="name">');
-										p($userMgr->get($userId)->getDisplayName());
-									} else {
-										print_unescaped('<div class="poll avatardiv" title="?"></div>');
-										print_unescaped('</td>');
-										print_unescaped('<td id="id_ac_detected" class="external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
-									}
-									print_unescaped('</td><td class="toggle-all toggle maybe"><div id="toggle" class=""></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
-									// print_unescaped('</td><td class="toggle-cell"><div id="toggle" class="toggle-all toggle maybe"></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
-									$i_tot = 0;
-									foreach ($dates as $dt) {
-										if ($poll->getType() == '0') {
-											$date_id = strtotime($dt->getDt());
-											$poll_id = "pollid_" . $dt->getId();
-										} else {
-											$date_id = $dt->getText();
-											$poll_id = "pollid_" . $dt->getId();
-										}
-										// see if user already has data for this event
-										$cl = 'poll-cell active unvoted ';
-										if (isset($user_voted)) {
-											foreach ($user_voted as $obj) {
-												$voteVal = null;
-												if($poll->getType() == '0') {
-													$voteVal = strtotime($obj->getDt());
-												} else {
-													$voteVal = $obj->getText();
-												}
-												if ($voteVal == $date_id) {
-													if ($obj->getType() == '1') {
-														$cl = 'poll-cell active yes';
-														$total_y[$i_tot]++;
-													} else if ($obj->getType() == '0') {
-														$cl = 'poll-cell active no';
-														$total_n[$i_tot]++;
-													} else if($obj->getType() == '2') {
-														$cl = 'poll-cell active maybe';
-													}
-													break;
-												}
-											}
-										}
-										// Make the td clickable
-										print_unescaped('<td id="' . $poll_id . '" class="cl_click ' . $cl . '" data-value="' . $date_id . '"><div></div></td>');
-										// Make the div clickable
-										// print_unescaped('<td><div id="' . $date_id . '" class="cl_click ' . $cl . '"></div></td>');
+                                        // loop over dts
+                                        $i_tot = 0;
+                                        foreach ($dates as $dt) {
+                                            if ($poll->getType() == '0') {
+                                                $date_id = strtotime($dt->getDt());
+                                                $poll_id = "pollid_" . $dt->getId();
+                                            } else {
+                                                $date_id = $dt->getText();
+                                                $poll_id = "pollid_" . $dt->getId();
+                                            }
+                                            // look what user voted for this dts
+                                            $found = false;
+                                            foreach ($others[$usr] as $vote) {
+                                                $voteVal = null;
+                                                if ($poll->getType() == '0') {
+                                                    $voteVal = strtotime($vote->getDt());
+                                                } else {
+                                                    $voteVal = $vote->getText();
+                                                }
+                                                if ($date_id == $voteVal) {
+                                                    if ($vote->getType() == '1') {
+                                                        $cl = 'poll-cell yes';
+                                                        $total_y[$i_tot]++;
+                                                    } else if ($vote->getType() == '0') {
+                                                        $cl = 'poll-cell no';
+                                                        $total_n[$i_tot]++;
+                                                    } else if ($vote->getType() == '2') {
+                                                        $cl = 'poll-cell maybe';
+                                                    } else {
+                                                        $cl = 'poll-cell unvoted';
+                                                    }
+                                                    $found = true;
+                                                    break;
+                                                }
+                                            }
+                                            if (!$found) {
+                                                $cl = 'poll-cell unvoted';
+                                            }
+                                            // Make the td clickable
+                                            print_unescaped('<td class="' . $cl . '"><div></div></td>');
+                                            // Make the div clickable
+                                            // print_unescaped('<td><div class="' . $cl . '"></div></td>');
+                                            $i_tot++;
+                                        }
+                                        print_unescaped('</tr>');
+                                    }
+                                }
+                                $total_y_others = array_merge(array(), $total_y);
+                                $total_n_others = array_merge(array(), $total_n);
+                                if (!$expired) {
+                                    print_unescaped('<tr class="current-user">');
+                                    print_unescaped('<td class="avatar-cell">');
+                                    if (User::isLoggedIn()) {
+                                        print_unescaped('<div class="poll avatardiv" title="'.($userId).'"></div>');
+                                        print_unescaped('</td>');
+                                        print_unescaped('<td class="name">');
+                                        p($userMgr->get($userId)->getDisplayName());
+                                    } else {
+                                        print_unescaped('<div class="poll avatardiv" title="?"></div>');
+                                        print_unescaped('</td>');
+                                        print_unescaped('<td id="id_ac_detected" class="external current-user"><input type="text" name="user_name" id="user_name" placeholder="' . $l->t('Your name here') . '" />');
+                                    }
+                                    print_unescaped('</td><td class="toggle-all toggle maybe"><div id="toggle" class=""></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
+                                    // print_unescaped('</td><td class="toggle-cell"><div id="toggle" class="toggle-all toggle maybe"></div><img class="svg" src="../../../../core/img/actions/play-next.svg" "="" alt=""></td>');
+                                    $i_tot = 0;
+                                    foreach ($dates as $dt) {
+                                        if ($poll->getType() == '0') {
+                                            $date_id = strtotime($dt->getDt());
+                                            $poll_id = "pollid_" . $dt->getId();
+                                        } else {
+                                            $date_id = $dt->getText();
+                                            $poll_id = "pollid_" . $dt->getId();
+                                        }
+                                        // see if user already has data for this event
+                                        $cl = 'poll-cell active unvoted ';
+                                        if (isset($user_voted)) {
+                                            foreach ($user_voted as $obj) {
+                                                $voteVal = null;
+                                                if($poll->getType() == '0') {
+                                                    $voteVal = strtotime($obj->getDt());
+                                                } else {
+                                                    $voteVal = $obj->getText();
+                                                }
+                                                if ($voteVal == $date_id) {
+                                                    if ($obj->getType() == '1') {
+                                                        $cl = 'poll-cell active yes';
+                                                        $total_y[$i_tot]++;
+                                                    } else if ($obj->getType() == '0') {
+                                                        $cl = 'poll-cell active no';
+                                                        $total_n[$i_tot]++;
+                                                    } else if($obj->getType() == '2') {
+                                                        $cl = 'poll-cell active maybe';
+                                                    }
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                        // Make the td clickable
+                                        print_unescaped('<td id="' . $poll_id . '" class="cl_click ' . $cl . '" data-value="' . $date_id . '"><div></div></td>');
+                                        // Make the div clickable
+                                        // print_unescaped('<td><div id="' . $date_id . '" class="cl_click ' . $cl . '"></div></td>');
 
-										$i_tot++;
-									}
-								}
-								?>
+                                        $i_tot++;
+                                    }
+                                }
+                                ?>
 							</tbody>
 							<tbody class="summary">
 								<?php
-									$diff_array = $total_y;
-									for($i = 0 ; $i < count($diff_array) ; $i++) {
-										$diff_array[$i] = ($total_y[$i] - $total_n[$i]);
-									}
-									$max_votes = max($diff_array);
-								?>
+                                    $diff_array = $total_y;
+                                    for($i = 0 ; $i < count($diff_array) ; $i++) {
+                                        $diff_array[$i] = ($total_y[$i] - $total_n[$i]);
+                                    }
+                                    $max_votes = max($diff_array);
+                                ?>
 								<tr class="total">
 									<th colspan="3"><?php p($l->t('Total')); ?></th>
 									<?php for ($i = 0 ; $i < count($dates) ; $i++) : ?>
 										<td class="total">
 											<?php
-											$classSuffix = "pollid_" . $dates[$i]->getId();
-											if (isset($total_y[$i])) {
-												$val = $total_y[$i];
-											} else {
-												$val = 0;
-											}
-											?>
+                                            $classSuffix = "pollid_" . $dates[$i]->getId();
+                                            if (isset($total_y[$i])) {
+                                                $val = $total_y[$i];
+                                            } else {
+                                                $val = 0;
+                                            }
+                                            ?>
 											<div id="id_y_<?php p($classSuffix); ?>" class="result-cell yes" data-value=<?php p(isset($total_y_others[$i]) ? $total_y_others[$i] : '0'); ?>>
 												<?php p($val); ?>
 											</div>
@@ -301,14 +301,14 @@ 
 								<tr class="best">
 									<th colspan="3"><?php p($l->t('Best option')); ?></th>
 									<?php
-									for ($i = 0; $i < count($dates); $i++) {
-										$check = '';
-										if ($total_y[$i] - $total_n[$i] == $max_votes) {
-											$check = 'icon-checkmark';
-										}
-										print_unescaped('<td class="win_row ' . $check . '" id="id_total_' . $i . '"></td>');
-									}
-									?>
+                                    for ($i = 0; $i < count($dates); $i++) {
+                                        $check = '';
+                                        if ($total_y[$i] - $total_n[$i] == $max_votes) {
+                                            $check = 'icon-checkmark';
+                                        }
+                                        print_unescaped('<td class="win_row ' . $check . '" id="id_total_' . $i . '"></td>');
+                                    }
+                                    ?>
 								</tr>
 							</tbody>
 						</table>
@@ -371,19 +371,19 @@ 
 								<div class="comment">
 									<div class="comment-header">
 										<?php
-										print_unescaped('<span class="comment-date">' . date('d.m.Y H:i:s', strtotime($comment->getDt())) . '</span>');
-										if ($isAnonymous || $hideNames) {
-											p('Anonymous');
-										} else {
-											if ($userMgr->get($comment->getUserId()) != null) {
-												p($userMgr->get($comment->getUserId())->getDisplayName());
-											} else {
-												print_unescaped('<i>');
-												p($comment->getUserId());
-												print_unescaped('</i>');
-											}
-										}
-										?>
+                                        print_unescaped('<span class="comment-date">' . date('d.m.Y H:i:s', strtotime($comment->getDt())) . '</span>');
+                                        if ($isAnonymous || $hideNames) {
+                                            p('Anonymous');
+                                        } else {
+                                            if ($userMgr->get($comment->getUserId()) != null) {
+                                                p($userMgr->get($comment->getUserId())->getDisplayName());
+                                            } else {
+                                                print_unescaped('<i>');
+                                                p($comment->getUserId());
+                                                print_unescaped('</i>');
+                                            }
+                                        }
+                                        ?>
 									</div>
 									<div class="wordwrap comment-content">
 										<?php p($comment->getComment()); ?>

Spacing +43 added lines, -43 removed lines

@@ -27,18 +27,18 @@ 
 	\OCP\Util::addStyle('polls', 'vote');
 	\OCP\Util::addScript('polls', 'vote');
 	
-	$userId = $_['userId'];
-	$userMgr = $_['userMgr'];
-	$urlGenerator = $_['urlGenerator'];
-	$avaMgr = $_['avatarManager'];
+	$userId = $_[ 'userId' ];
+	$userMgr = $_[ 'userMgr' ];
+	$urlGenerator = $_[ 'urlGenerator' ];
+	$avaMgr = $_[ 'avatarManager' ];
 
-	$poll = $_['poll'];
-	$dates = $_['dates'];
-	$votes = $_['votes'];
-	$comments = $_['comments'];
+	$poll = $_[ 'poll' ];
+	$dates = $_[ 'dates' ];
+	$votes = $_[ 'votes' ];
+	$comments = $_[ 'comments' ];
 	$isAnonymous = $poll->getIsAnonymous() && $userId != $poll->getOwner();
 	$hideNames = $poll->getIsAnonymous() && $poll->getFullAnonymous();
-	$notification = $_['notification'];
+	$notification = $_[ 'notification' ];
 
 	if ($poll->getExpire() == null) {
 		$expired = false;
@@ -47,14 +47,14 @@ 
 	}
 ?>
 
-<?php if($poll->getType() == '0') : ?>
-	<?php foreach($dates as $d) : ?>
+<?php if ($poll->getType() == '0') : ?>
+	<?php foreach ($dates as $d) : ?>
 		<input class="hidden-dates" type="hidden" value="<?php print_unescaped($d->getDt()); ?>" />
 	<?php endforeach ?>
 <?php endif ?>
 
 <?php
-if (   $poll->getDescription() != null 
+if ($poll->getDescription() != null 
 	&& $poll->getDescription() != ''
 ) {
 	$description = nl2br($poll->getDescription());
@@ -65,13 +65,13 @@ 
 // init array for counting 'yes'-votes for each date
 $total_y = array();
 $total_n = array();
-for ($i = 0 ; $i < count($dates) ; $i++) {
-	$total_y[$i] = 0;
-	$total_n[$i] = 0;
+for ($i = 0; $i < count($dates); $i++) {
+	$total_y[ $i ] = 0;
+	$total_n[ $i ] = 0;
 }
 $user_voted = array();
 
-$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
+$pollUrl = $urlGenerator->linkToRouteAbsolute('polls.page.goto_poll', [ 'hash' => $poll->getHash() ]);
 ?>
 
 <div id="app">
@@ -123,10 +123,10 @@ 
 									//group by user
 									$others = array();
 									foreach ($votes as $vote) {
-										if (!isset($others[$vote->getUserId()])) {
-											$others[$vote->getUserId()] = array();
+										if (!isset($others[ $vote->getUserId() ])) {
+											$others[ $vote->getUserId() ] = array();
 										}
-										array_push($others[$vote->getUserId()], $vote);
+										array_push($others[ $vote->getUserId() ], $vote);
 									}
 									$userCnt = 0;
 									foreach (array_keys($others) as $usr) {
@@ -135,26 +135,26 @@ 
 											// if poll expired, just put current user among the others;
 											// otherwise skip here to add current user as last row (to vote)
 											if (!$expired) {
-												$user_voted = $others[$usr];
+												$user_voted = $others[ $usr ];
 												continue;
 											}
 										}
 										print_unescaped('<tr>');
 										print_unescaped('<td class="avatar-cell">');
-										if (	$userMgr->get($usr) != null 
+										if ($userMgr->get($usr) != null 
 											&& !$isAnonymous && !$hideNames
 										) {
-											print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
+											print_unescaped('<div class="poll avatardiv" title="' . ($usr) . '"></div>');
 											print_unescaped('</td>');
 											print_unescaped('<td colspan="2" class="name">');
 											p($userMgr->get($usr)->getDisplayName());
 										} else {
 											if ($isAnonymous || $hideNames) {
-											print_unescaped('<div class="poll avatardiv" title="'.($userCnt).'"></div>');
+											print_unescaped('<div class="poll avatardiv" title="' . ($userCnt) . '"></div>');
 											print_unescaped('</td>');
 											print_unescaped('<td colspan="2" class="name">');
 											} else {
-												print_unescaped('<div class="poll avatardiv" title="'.($usr).'"></div>');
+												print_unescaped('<div class="poll avatardiv" title="' . ($usr) . '"></div>');
 												print_unescaped('</td>');
 												print_unescaped('<td colspan="2" class="name">');
 												p($usr);
@@ -174,7 +174,7 @@ 
 											}
 											// look what user voted for this dts
 											$found = false;
-											foreach ($others[$usr] as $vote) {
+											foreach ($others[ $usr ] as $vote) {
 												$voteVal = null;
 												if ($poll->getType() == '0') {
 													$voteVal = strtotime($vote->getDt());
@@ -184,10 +184,10 @@ 
 												if ($date_id == $voteVal) {
 													if ($vote->getType() == '1') {
 														$cl = 'poll-cell yes';
-														$total_y[$i_tot]++;
+														$total_y[ $i_tot ]++;
 													} else if ($vote->getType() == '0') {
 														$cl = 'poll-cell no';
-														$total_n[$i_tot]++;
+														$total_n[ $i_tot ]++;
 													} else if ($vote->getType() == '2') {
 														$cl = 'poll-cell maybe';
 													} else {
@@ -215,7 +215,7 @@ 
 									print_unescaped('<tr class="current-user">');
 									print_unescaped('<td class="avatar-cell">');
 									if (User::isLoggedIn()) {
-										print_unescaped('<div class="poll avatardiv" title="'.($userId).'"></div>');
+										print_unescaped('<div class="poll avatardiv" title="' . ($userId) . '"></div>');
 										print_unescaped('</td>');
 										print_unescaped('<td class="name">');
 										p($userMgr->get($userId)->getDisplayName());
@@ -240,7 +240,7 @@ 
 										if (isset($user_voted)) {
 											foreach ($user_voted as $obj) {
 												$voteVal = null;
-												if($poll->getType() == '0') {
+												if ($poll->getType() == '0') {
 													$voteVal = strtotime($obj->getDt());
 												} else {
 													$voteVal = $obj->getText();
@@ -248,11 +248,11 @@ 
 												if ($voteVal == $date_id) {
 													if ($obj->getType() == '1') {
 														$cl = 'poll-cell active yes';
-														$total_y[$i_tot]++;
+														$total_y[ $i_tot ]++;
 													} else if ($obj->getType() == '0') {
 														$cl = 'poll-cell active no';
-														$total_n[$i_tot]++;
-													} else if($obj->getType() == '2') {
+														$total_n[ $i_tot ]++;
+													} else if ($obj->getType() == '2') {
 														$cl = 'poll-cell active maybe';
 													}
 													break;
@@ -272,28 +272,28 @@ 
 							<tbody class="summary">
 								<?php
 									$diff_array = $total_y;
-									for($i = 0 ; $i < count($diff_array) ; $i++) {
-										$diff_array[$i] = ($total_y[$i] - $total_n[$i]);
+									for ($i = 0; $i < count($diff_array); $i++) {
+										$diff_array[ $i ] = ($total_y[ $i ] - $total_n[ $i ]);
 									}
 									$max_votes = max($diff_array);
 								?>
 								<tr class="total">
 									<th colspan="3"><?php p($l->t('Total')); ?></th>
-									<?php for ($i = 0 ; $i < count($dates) ; $i++) : ?>
+									<?php for ($i = 0; $i < count($dates); $i++) : ?>
 										<td class="total">
 											<?php
-											$classSuffix = "pollid_" . $dates[$i]->getId();
-											if (isset($total_y[$i])) {
-												$val = $total_y[$i];
+											$classSuffix = "pollid_" . $dates[ $i ]->getId();
+											if (isset($total_y[ $i ])) {
+												$val = $total_y[ $i ];
 											} else {
 												$val = 0;
 											}
 											?>
-											<div id="id_y_<?php p($classSuffix); ?>" class="result-cell yes" data-value=<?php p(isset($total_y_others[$i]) ? $total_y_others[$i] : '0'); ?>>
+											<div id="id_y_<?php p($classSuffix); ?>" class="result-cell yes" data-value=<?php p(isset($total_y_others[ $i ]) ? $total_y_others[ $i ] : '0'); ?>>
 												<?php p($val); ?>
 											</div>
-											<div id="id_n_<?php p($classSuffix); ?>" class="result-cell no" data-value=<?php p(isset($total_n_others[$i]) ? $total_n_others[$i] : '0'); ?>>
-												<?php p(isset($total_n[$i]) ? $total_n[$i] : '0'); ?>
+											<div id="id_n_<?php p($classSuffix); ?>" class="result-cell no" data-value=<?php p(isset($total_n_others[ $i ]) ? $total_n_others[ $i ] : '0'); ?>>
+												<?php p(isset($total_n[ $i ]) ? $total_n[ $i ] : '0'); ?>
 											</div>
 										</td>
 									<?php endfor; ?>
@@ -303,7 +303,7 @@ 
 									<?php
 									for ($i = 0; $i < count($dates); $i++) {
 										$check = '';
-										if ($total_y[$i] - $total_n[$i] == $max_votes) {
+										if ($total_y[ $i ] - $total_n[ $i ] == $max_votes) {
 											$check = 'icon-checkmark';
 										}
 										print_unescaped('<td class="win_row ' . $check . '" id="id_total_' . $i . '"></td>');
@@ -334,7 +334,7 @@ 
 						<div class="input-group-addon">
 							<span class="icon-share"></span><?php p($l->t('Link')); ?>
 						</div>
-						<input type="text" value="<?php p($pollUrl);?>" readonly="readonly">
+						<input type="text" value="<?php p($pollUrl); ?>" readonly="readonly">
 					</div>
 					<?php if ($expired) : ?>
 						<div id="expired_info">

Braces +14 added lines, -5 removed lines

@@ -323,7 +323,10 @@ 
 						</form>
 						<?php if (User::isLoggedIn()) : ?>
 						<span 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>
 						</span>
 						<?php endif; ?>
@@ -355,8 +358,11 @@ 
 									<a href="<?php p($urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); ?>"><?php p($l->t('Login')); ?></a>
 									<?php p($l->t('or')); ?>
 									<?php print_unescaped('<th id="id_ac_detected" class="external current-user"><input type="text" name="user_name_comm" id="user_name_comm" placeholder="' . $l->t('Your name here') . '" /></th>'); ?>
-								<?php else: ?>
-									<?php p($l->t('Logged in as') . ' ' . $userId); ?>
+								<?php else {
+    : ?>
+									<?php p($l->t('Logged in as') . ' ' . $userId);
+}
+?>
 								<?php endif; ?>
 									<textarea id="commentBox" name="commentBox"></textarea>
 									<p>
@@ -390,8 +396,11 @@ 
 									</div>
 								</div>
 							<?php endforeach; ?>
-						<?php else : ?>
-							<?php p($l->t('No comments yet. Be the first.')); ?>
+						<?php else {
+    : ?>
+							<?php p($l->t('No comments yet. Be the first.'));
+}
+?>
 						<?php endif; ?>
 					</div>
 				</div>

appinfo/routes.php

Indentation +13 added lines, -13 removed lines

@@ -23,17 +23,17 @@
 
 $app = new \OCA\Polls\AppInfo\Application();
 $app->registerRoutes($this, array(
-	'routes' => array(
-		array('name' => 'page#index', 'url' => '/', 'verb' => 'GET'),
-		array('name' => 'page#goto_poll', 'url' => '/poll/{hash}', 'verb' => 'GET'),
-		array('name' => 'page#edit_poll', 'url' => '/edit/{hash}', 'verb' => 'GET'),
-		array('name' => 'page#create_poll', 'url' => '/create', 'verb' => 'GET'),
-		array('name' => 'page#delete_poll', 'url' => '/delete', 'verb' => 'POST'),
-		array('name' => 'page#update_poll', 'url' => '/update', 'verb' => 'POST'),
-		array('name' => 'page#insert_poll', 'url' => '/insert', 'verb' => 'POST'),
-		array('name' => 'page#insert_vote', 'url' => '/insert/vote', 'verb' => 'POST'),
-		array('name' => 'page#insert_comment', 'url' => '/insert/comment', 'verb' => 'POST'),
-		array('name' => 'page#search', 'url' => '/search', 'verb' => 'POST'),
-		array('name' => 'page#get_display_name', 'url' => '/get/displayname', 'verb' => 'POST'),
-	)
+    'routes' => array(
+        array('name' => 'page#index', 'url' => '/', 'verb' => 'GET'),
+        array('name' => 'page#goto_poll', 'url' => '/poll/{hash}', 'verb' => 'GET'),
+        array('name' => 'page#edit_poll', 'url' => '/edit/{hash}', 'verb' => 'GET'),
+        array('name' => 'page#create_poll', 'url' => '/create', 'verb' => 'GET'),
+        array('name' => 'page#delete_poll', 'url' => '/delete', 'verb' => 'POST'),
+        array('name' => 'page#update_poll', 'url' => '/update', 'verb' => 'POST'),
+        array('name' => 'page#insert_poll', 'url' => '/insert', 'verb' => 'POST'),
+        array('name' => 'page#insert_vote', 'url' => '/insert/vote', 'verb' => 'POST'),
+        array('name' => 'page#insert_comment', 'url' => '/insert/comment', 'verb' => 'POST'),
+        array('name' => 'page#search', 'url' => '/search', 'verb' => 'POST'),
+        array('name' => 'page#get_display_name', 'url' => '/get/displayname', 'verb' => 'POST'),
+    )
 ));

lib/AppInfo/Application.php

Indentation +126 added lines, -126 removed lines

@@ -37,130 +37,130 @@
 
 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 ($c) use ($server) {
-			/** @var SimpleContainer $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 ($c) {
-			/** @var SimpleContainer $c */
-			return $c->query('ServerContainer')->getUserManager();
-		});
-
-		$container->registerService('GroupManager', function ($c) {
-			/** @var SimpleContainer $c */
-			return $c->query('ServerContainer')->getGroupManager();
-		});
-
-		$container->registerService('AvatarManager', function ($c) {
-			/** @var SimpleContainer $c */
-			return $c->query('ServerContainer')->getAvatarManager();
-		});
-
-		$container->registerService('Logger', function ($c) {
-			/** @var SimpleContainer $c */
-			return $c->query('ServerContainer')->getLogger();
-		});
-
-		$container->registerService('L10N', function ($c) {
-			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
-		});
-
-		$container->registerService('CommentMapper', function ($c) use ($server) {
-			/** @var SimpleContainer $c */
-			return new CommentMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('DateMapper', function ($c) use ($server) {
-			/** @var SimpleContainer $c */
-			return new DateMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('EventMapper', function ($c) use ($server) {
-			/** @var SimpleContainer $c */
-			return new EventMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('NotificationMapper', function ($c) use ($server) {
-			/** @var SimpleContainer $c */
-			return new NotificationMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('ParticipationMapper', function ($c) use ($server) {
-			/** @var SimpleContainer $c */
-			return new ParticipationMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('ParticipationTextMapper', function ($c) use ($server) {
-			/** @var SimpleContainer $c */
-			return new ParticipationTextMapper(
-				$server->getDatabaseConnection()
-			);
-		});
-
-		$container->registerService('TextMapper', function ($c) use ($server) {
-			/** @var SimpleContainer $c */
-			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-logo-polls.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 ($c) use ($server) {
+            /** @var SimpleContainer $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 ($c) {
+            /** @var SimpleContainer $c */
+            return $c->query('ServerContainer')->getUserManager();
+        });
+
+        $container->registerService('GroupManager', function ($c) {
+            /** @var SimpleContainer $c */
+            return $c->query('ServerContainer')->getGroupManager();
+        });
+
+        $container->registerService('AvatarManager', function ($c) {
+            /** @var SimpleContainer $c */
+            return $c->query('ServerContainer')->getAvatarManager();
+        });
+
+        $container->registerService('Logger', function ($c) {
+            /** @var SimpleContainer $c */
+            return $c->query('ServerContainer')->getLogger();
+        });
+
+        $container->registerService('L10N', function ($c) {
+            return $c->query('ServerContainer')->getL10N($c->query('AppName'));
+        });
+
+        $container->registerService('CommentMapper', function ($c) use ($server) {
+            /** @var SimpleContainer $c */
+            return new CommentMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('DateMapper', function ($c) use ($server) {
+            /** @var SimpleContainer $c */
+            return new DateMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('EventMapper', function ($c) use ($server) {
+            /** @var SimpleContainer $c */
+            return new EventMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('NotificationMapper', function ($c) use ($server) {
+            /** @var SimpleContainer $c */
+            return new NotificationMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('ParticipationMapper', function ($c) use ($server) {
+            /** @var SimpleContainer $c */
+            return new ParticipationMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('ParticipationTextMapper', function ($c) use ($server) {
+            /** @var SimpleContainer $c */
+            return new ParticipationTextMapper(
+                $server->getDatabaseConnection()
+            );
+        });
+
+        $container->registerService('TextMapper', function ($c) use ($server) {
+            /** @var SimpleContainer $c */
+            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-logo-polls.svg'),
+                'name' => $l10n->t('Polls')
+            ];
+        });
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -50,7 +50,7 @@ 
 		/**
 		 * Controllers
 		 */
-		$container->registerService('PageController', function ($c) use ($server) {
+		$container->registerService('PageController', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new PageController(
 				$c->query('AppName'),
@@ -72,73 +72,73 @@ 
 			);
 		});
 
-		$container->registerService('UserManager', function ($c) {
+		$container->registerService('UserManager', function($c) {
 			/** @var SimpleContainer $c */
 			return $c->query('ServerContainer')->getUserManager();
 		});
 
-		$container->registerService('GroupManager', function ($c) {
+		$container->registerService('GroupManager', function($c) {
 			/** @var SimpleContainer $c */
 			return $c->query('ServerContainer')->getGroupManager();
 		});
 
-		$container->registerService('AvatarManager', function ($c) {
+		$container->registerService('AvatarManager', function($c) {
 			/** @var SimpleContainer $c */
 			return $c->query('ServerContainer')->getAvatarManager();
 		});
 
-		$container->registerService('Logger', function ($c) {
+		$container->registerService('Logger', function($c) {
 			/** @var SimpleContainer $c */
 			return $c->query('ServerContainer')->getLogger();
 		});
 
-		$container->registerService('L10N', function ($c) {
+		$container->registerService('L10N', function($c) {
 			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
 		});
 
-		$container->registerService('CommentMapper', function ($c) use ($server) {
+		$container->registerService('CommentMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new CommentMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('DateMapper', function ($c) use ($server) {
+		$container->registerService('DateMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new DateMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('EventMapper', function ($c) use ($server) {
+		$container->registerService('EventMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new EventMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('NotificationMapper', function ($c) use ($server) {
+		$container->registerService('NotificationMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new NotificationMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('ParticipationMapper', function ($c) use ($server) {
+		$container->registerService('ParticipationMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new ParticipationMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('ParticipationTextMapper', function ($c) use ($server) {
+		$container->registerService('ParticipationTextMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new ParticipationTextMapper(
 				$server->getDatabaseConnection()
 			);
 		});
 
-		$container->registerService('TextMapper', function ($c) use ($server) {
+		$container->registerService('TextMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */
 			return new TextMapper(
 				$server->getDatabaseConnection()
@@ -151,7 +151,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 [

lib/Db/ParticipationMapper.php

Indentation +42 added lines, -42 removed lines

@@ -28,50 +28,50 @@
 
 class ParticipationMapper extends Mapper {
 
-	/**
-	 * ParticipationMapper constructor.
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_particip', '\OCA\Polls\Db\Participation');
-	}
+    /**
+     * ParticipationMapper constructor.
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_particip', '\OCA\Polls\Db\Participation');
+    }
 
-	/**
-	 * @param string $userId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Participation[]
-	 */
-	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 Participation[]
+     */
+    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 $pollId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Participation[]
-	 */
-	public function findByPoll($pollId, $limit = null, $offset = null) {
-		$sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		return $this->findEntities($sql, [$pollId], $limit, $offset);
-	}
+    /**
+     * @param string $pollId
+     * @param int $limit
+     * @param int $offset
+     * @return Participation[]
+     */
+    public function findByPoll($pollId, $limit = null, $offset = null) {
+        $sql = 'SELECT * FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        return $this->findEntities($sql, [$pollId], $limit, $offset);
+    }
 
-	/**
-	 * @param string $pollId
-	 */
-	public function deleteByPoll($pollId) {
-		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
-	}
+    /**
+     * @param string $pollId
+     */
+    public function deleteByPoll($pollId) {
+        $sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
+        $this->execute($sql, [$pollId]);
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param string $userId
-	 */
-	public function deleteByPollAndUser($pollId, $userId) {
-		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
-		$this->execute($sql, [$pollId, $userId]);
-	}
+    /**
+     * @param string $pollId
+     * @param string $userId
+     */
+    public function deleteByPollAndUser($pollId, $userId) {
+        $sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ? AND user_id = ?';
+        $this->execute($sql, [$pollId, $userId]);
+    }
 }

Spacing +4 added lines, -4 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);
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function deleteByPoll($pollId) {
 		$sql = 'DELETE FROM ' . $this->getTableName() . ' WHERE poll_id = ?';
-		$this->execute($sql, [$pollId]);
+		$this->execute($sql, [ $pollId ]);
 	}
 
 	/**
@@ -72,6 +72,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 ]);
 	}
 }