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/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();

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()); ?>

templates/create.tmpl.php

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">

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')
+            ];
+        });
+    }
 }

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

lib/Db/NotificationMapper.php

Indentation +53 added lines, -53 removed lines

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

lib/Db/TextMapper.php

Indentation +24 added lines, -24 removed lines

@@ -28,30 +28,30 @@
 
 class TextMapper extends Mapper {
 
-	/**
-	 * TextMapper constructor.
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'polls_txts', '\OCA\Polls\Db\Text');
-	}
+    /**
+     * TextMapper constructor.
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'polls_txts', '\OCA\Polls\Db\Text');
+    }
 
-	/**
-	 * @param string $pollId
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Text[]
-	 */
-	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 Text[]
+     */
+    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]);
+    }
 }