GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Poll] Removed/refactored unnecessary files, changed redirect to default parameters in new poll route

This commit is contained in:
Daniel 2020-12-14 15:47:51 +00:00 committed by Hugo Sales
parent c0d363e317
commit 1747e14824
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
3 changed files with 25 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
plugins/Poll/Controller/ShowPoll.php
View File

@ -1,71 +0,0 @@
<?php
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
namespace Plugin\Poll\Controller;
use App\Entity\Note;
use App\Entity\Poll;
use App\Util\Common;
use App\Util\Exception\NoSuchNoteException;
use App\Util\Exception\NotFoundException;
use Symfony\Component\HttpFoundation\Request;
/**
* Show a Poll
*
* @package GNUsocial
* @category PollPlugin
*
* @author Daniel Brandao <up201705812@fe.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
class ShowPoll
{
/**
* Show poll
*
* @param Request $request
* @param string $id poll id
*
* @throws NotFoundException poll does not exist
* @throws \App\Util\Exception\NoLoggedInUser user is not logged in
*
* @return array Template
*/
public function showPoll(Request $request, string $id)
{
$user = Common::ensureLoggedIn();
$poll = Poll::getFromId((int) $id);
if ($poll == null) {
throw new NotFoundException('Poll does not exist');
}
$note = Note::getFromId($poll->getNoteId());
if ($note == null || !$note->isVisibleTo($user)) {
throw new NoSuchNoteException();
}
return ['_template' => 'Poll/showpoll.html.twig', 'poll' => $poll];
}
}

69
plugins/Poll/Forms/PollResponseForm.php
View File

@ -1,69 +0,0 @@
<?php
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social 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.
//
// GNU social 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 GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
namespace Plugin\Poll\Forms;
use App\Core\Form;
use function App\Core\I18n\_m;
use App\Entity\Poll;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Form as SymfForm;
/**
* Form to respond a Poll
*
* @package GNUsocial
* @category PollPlugin
*
* @author Daniel Brandao <up201705812@fe.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
class PollResponseForm extends Form
{
/**
* Creates a radio form with the options given
*
* @param Poll $poll
* @param int $noteId
*
* @return SymfForm
*/
public static function make(Poll $poll,int $noteId): SymfForm
{
$opts = $poll->getOptionsArr();
$options = [];
for ($i = 1; $i <= count($opts); ++$i) {
$options[$opts[$i - 1]] = $i;
}
$formOptions = [
['Options' . $poll->getId(), ChoiceType::class, [
'choices' => $options,
'expanded' => true,
]],
['note_id', HiddenType::class, ['data' => $noteId]],
['pollresponse', SubmitType::class, ['label' => _m('Vote')]],
];
return parent::create($formOptions);
}
}

48
plugins/Poll/Poll.php
View File

@ -22,6 +22,8 @@ namespace Plugin\Poll;
use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Form;
use function App\Core\I18n\_m;
use App\Core\Module;
use App\Core\Router\RouteLoader;
use App\Entity\Note;
@ -31,27 +33,16 @@ use App\Util\Exception\InvalidFormException;
use App\Util\Exception\NotFoundException;
use App\Util\Exception\RedirectException;
use App\Util\Exception\ServerException;
use Plugin\Poll\Forms\PollResponseForm;
use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
/**
* Poll plugin main class
*
* @package GNUsocial
* @category PollPlugin
*
* @author Daniel Brandao <up201705812@fe.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
const ID_FMT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
/**
* Poll plugin main class
*
* @package GNUsocial
* @category PollPlugin
* @category Poll
*
* @author Daniel Brandao <up201705812@fe.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
@ -68,10 +59,7 @@ class Poll extends Module
*/
public function onAddRoute(RouteLoader $r): bool
{
$r->connect('newpollnum', 'main/poll/new/{num<\\d*>}', [Controller\NewPoll::class, 'newpoll']);
$r->connect('showpoll', 'main/poll/{id<\\d*>}',[Controller\ShowPoll::class, 'showpoll']);
$r->connect('answerpoll', 'main/poll/{id<\\d*>}/respond',[Controller\AnswerPoll::class, 'answerpoll']);
$r->connect('newpoll', 'main/poll/new', RedirectController::class, ['defaults' => ['route' => 'newpollnum', 'num' => 3]]);
$r->connect('newpoll', 'main/poll/new/{num<\\d+>?3}', [Controller\NewPoll::class, 'newpoll']);
return Event::next;
}
@ -85,9 +73,9 @@ class Poll extends Module
*/
public function onStartTwigPopulateVars(array &$vars): bool
{
$vars['tabs'] = [['title' => 'Poll',
'href' => 'newpoll',
]];
$vars['tabs'][] = ['title' => 'Poll',
'href' => 'newpoll',
];
return Event::next;
}
@ -129,7 +117,21 @@ class Poll extends Module
}
if (Common::isLoggedIn() && !PollResponse::exits($poll->getId(), Common::ensureLoggedIn()->getId())) {
$form = PollResponseForm::make($poll, $note->getId());
$opts = $poll->getOptionsArr();
$options = [];
for ($i = 1; $i <= count($opts); ++$i) {
$options[$opts[$i - 1]] = $i;
}
$formOptions = [
['Options' . $poll->getId(), ChoiceType::class, [
'choices' => $options,
'expanded' => true,
]],
['note_id', HiddenType::class, ['data' => $note->getId()]],
['pollresponse', SubmitType::class, ['label' => _m('Vote')]],
];
$form = Form::create($formOptions);
$formView = $form->createView();
$ret = self::noteActionHandle($request, $form, $note, 'pollresponse', /** TODO Documentation */ function ($note, $data) {
$user = Common::ensureLoggedIn();