max 360 days expiracy for creation poll

This commit is contained in:
Tykayn 2021-11-22 11:02:32 +01:00 committed by tykayn
parent a69c3ab1da
commit d3f3b75252
2 changed files with 7 additions and 4 deletions

View File

@ -1,7 +1,8 @@
nelmio_cors: nelmio_cors:
defaults: defaults:
origin_regex: true origin_regex: true
allow_origin: [ '%env(CORS_ALLOW_ORIGIN)%' ] # you can test locally with this value '^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$' # allow_origin: [ '%env(CORS_ALLOW_ORIGIN)%' ] # you can test locally with this value '^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
allow_origin: [ '^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$' ]
allow_methods: [ 'GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE' ] allow_methods: [ 'GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE' ]
allow_headers: [ '*' ] allow_headers: [ '*' ]
expose_headers: [ 'Authorization' ] expose_headers: [ 'Authorization' ]

View File

@ -265,7 +265,7 @@ class PollController extends EmailsController {
* requirements = {"creator"="\w+"} * requirements = {"creator"="\w+"}
* ) * )
* @param Request $request * @param Request $request
* * @description create a new poll
* @return JsonResponse * @return JsonResponse
*/ */
public function newPollAction( Request $request ) { public function newPollAction( Request $request ) {
@ -291,8 +291,10 @@ class PollController extends EmailsController {
// TODO check this one // TODO check this one
$newpoll->setAllowedAnswers( $data[ 'allowed_answers' ] ); $newpoll->setAllowedAnswers( $data[ 'allowed_answers' ] );
} }
$expiracyCalculated = $newpoll->addDaysToDate( new DateTime(), // define a maximum expiration
$data[ 'default_expiracy_days_from_now' ] ); $expiracyCalculated = min($newpoll->addDaysToDate( new DateTime(),
$data[ 'default_expiracy_days_from_now' ] ), $newpoll->addDaysToDate( new DateTime(),
360 ));
$newpoll->setExpiracyDate( $expiracyCalculated ); $newpoll->setExpiracyDate( $expiracyCalculated );
$emOwner = $this->getDoctrine()->getRepository( Owner::class ); $emOwner = $this->getDoctrine()->getRepository( Owner::class );