From b819fff67cf49066683338f8550535a7ad3997f8 Mon Sep 17 00:00:00 2001 From: joekurta Date: Thu, 27 Aug 2015 16:50:41 +0200 Subject: [PATCH 1/6] User top menu fixed --- Resources/views/base.html.twig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig index b075762..8a3a2e7 100644 --- a/Resources/views/base.html.twig +++ b/Resources/views/base.html.twig @@ -39,16 +39,16 @@
{% if app.user %}
@@ -59,12 +59,12 @@ {% if is_granted ('ROLE_ADMIN') %}
  • Admin Interface
    • {% endif %} - {% if app.request.cookies.has('numOfPresentations') and app.request.cookies.get('numOfPresentations') > 0 and not is_granted ('ROLE_ADMIN')%} +
    {% endif %} From 7ce41109f9cc428eda40df8f8659cf87b39ae6cc Mon Sep 17 00:00:00 2001 From: joekurta Date: Tue, 1 Sep 2015 14:10:02 +0200 Subject: [PATCH 2/6] Questionnaire created --- Command/ActivationEmailsCommand.php | 6 +++--- Controller/PresentationAdminController.php | 6 +++--- Controller/SecurityController.php | 2 +- Controller/UserAdminController.php | 12 ++++++------ Resources/views/Email/questions.html.twig | 13 +++++++++++++ Resources/views/Presentation/index.html.twig | 6 +++--- 6 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 Resources/views/Email/questions.html.twig diff --git a/Command/ActivationEmailsCommand.php b/Command/ActivationEmailsCommand.php index e7bb8da..91a7804 100644 --- a/Command/ActivationEmailsCommand.php +++ b/Command/ActivationEmailsCommand.php @@ -26,12 +26,12 @@ protected function execute(InputInterface $input, OutputInterface $output) $user_email = $user->getEmail(); $emailHash = md5($this->getContainer()->getParameter('email_hash_prefix') . $user_email); $message = \Swift_Message::newInstance() - ->setSubject('Say hello to SummerCamp2015!') - ->setFrom('summercamp@netgen.hr') + ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') + ->setFrom('info@netgen.hr') ->setTo($user_email) ->setBody( $this->getContainer()->get('templating')->render( - 'LiveVotingBundle:Email:login.html.twig', + 'LiveVotingBundle:Email:questions.html.twig', array('emailHash' => $emailHash) ), 'text/html' diff --git a/Controller/PresentationAdminController.php b/Controller/PresentationAdminController.php index 8754d51..141b07a 100755 --- a/Controller/PresentationAdminController.php +++ b/Controller/PresentationAdminController.php @@ -38,8 +38,8 @@ public function indexAction($event_id) /** * @var $client JoindInClient */ - /*$client = $this->get('live_voting.joind_in_client'); - $joindInEvents = $client->obtainUserEvents(27355, true);*/ + $client = $this->get('live_voting.joind_in_client'); + $joindInEvents = $client->obtainUserEvents(27355, true); $that = $this; return $this->render('LiveVotingBundle:Presentation:index.html.twig', array( 'entities' => array_map( @@ -47,7 +47,7 @@ function($ent) use ($that) { return array($ent, $that->createEnableDisableForm($ent)->createView()); }, $entities), 'event' => $event, - /*'joindInEvents' => $joindInEvents*/ + 'joindInEvents' => $joindInEvents )); } diff --git a/Controller/SecurityController.php b/Controller/SecurityController.php index d399c56..ea08db8 100755 --- a/Controller/SecurityController.php +++ b/Controller/SecurityController.php @@ -55,7 +55,7 @@ public function userLoginAction(Request $request, $activateHash) $expires = time() + 60*60*24*183; $value = $this->generateCookieValue(get_class($user), $user->getUsername(), $expires, $user->getPassword()); - $return = $this->redirect($this->generateUrl('user_landing')); + $return = $this->redirect($this->generateUrl(/*user_landing*/'question', array('event_id' => '2'))); $return->headers->setCookie(new Cookie('userEditEnabled', '1', time()+60*60*24*90)); $presentations = $this->getDoctrine()->getRepository('LiveVotingBundle:Presentation')->findByUser($user); diff --git a/Controller/UserAdminController.php b/Controller/UserAdminController.php index 7605d90..b709016 100755 --- a/Controller/UserAdminController.php +++ b/Controller/UserAdminController.php @@ -265,12 +265,12 @@ public function loginEmailAction(Request $request) $user_email = $user->getEmail(); $emailHash = md5($this->container->getParameter('email_hash_prefix') . $user_email); $message = \Swift_Message::newInstance() - ->setSubject('Say hello to SummerCamp2015!') - ->setFrom('summercamp@netgen.hr') + ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') + ->setFrom('info@netgen.hr') ->setTo($user_email) ->setBody( $this->renderView( - 'LiveVotingBundle:Email:login.html.twig', + 'LiveVotingBundle:Email:questions.html.twig', array('emailHash' => $emailHash) ), 'text/html' @@ -296,12 +296,12 @@ public function oneUserLoginEmailAction(Request $request, $id) $user_email = $user->getEmail(); $emailHash = md5($this->container->getParameter('email_hash_prefix') . $user_email); $message = \Swift_Message::newInstance() - ->setSubject('Say hello to SummerCamp2015!') - ->setFrom('summercamp@netgen.hr') + ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') + ->setFrom('info@netgen.hr') ->setTo($user_email) ->setBody( $this->renderView( - 'LiveVotingBundle:Email:login.html.twig', + 'LiveVotingBundle:Email:questions.html.twig', array('emailHash' => $emailHash) ), 'text/html' diff --git a/Resources/views/Email/questions.html.twig b/Resources/views/Email/questions.html.twig new file mode 100644 index 0000000..37c72fc --- /dev/null +++ b/Resources/views/Email/questions.html.twig @@ -0,0 +1,13 @@ +Dear participant,

    + +Thank you for being a part of PHP & eZ Publish Summer Camp 2015!

    + +We want to make the next one even better, and to do that we need YOUR help. On this link you will find 19 short questions that you can answer to in a few minutes.

    + +Please make time to answer the questions - it helps us immensely to make your experience next year the best one yet!

    + +Also, if you have any other questions or suggestions for the next Summer Camp, send them to maja@netgen.hr - we value your opinion :)


    + +??To login, click following link.??

    + +Thank you for your help! \ No newline at end of file diff --git a/Resources/views/Presentation/index.html.twig b/Resources/views/Presentation/index.html.twig index b1d49a3..90fe945 100644 --- a/Resources/views/Presentation/index.html.twig +++ b/Resources/views/Presentation/index.html.twig @@ -52,9 +52,9 @@
    From 738a536a5a790b2466ebc3cd47d8ccd3c916723e Mon Sep 17 00:00:00 2001 From: joekurta Date: Tue, 1 Sep 2015 14:11:38 +0200 Subject: [PATCH 3/6] question template fix --- Resources/views/Email/questions.html.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/views/Email/questions.html.twig b/Resources/views/Email/questions.html.twig index 37c72fc..8016ada 100644 --- a/Resources/views/Email/questions.html.twig +++ b/Resources/views/Email/questions.html.twig @@ -8,6 +8,5 @@ Please make time to answer the questions - it helps us immensely to make Also, if you have any other questions or suggestions for the next Summer Camp, send them to maja@netgen.hr - we value your opinion :)


    -??To login, click following link.??

    Thank you for your help! \ No newline at end of file From 91c2103642cec0c435dbb3ebae5fdddde8ecb0bf Mon Sep 17 00:00:00 2001 From: joekurta Date: Tue, 1 Sep 2015 14:29:52 +0200 Subject: [PATCH 4/6] Security controller fixed --- Controller/SecurityController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/SecurityController.php b/Controller/SecurityController.php index ea08db8..b69c825 100755 --- a/Controller/SecurityController.php +++ b/Controller/SecurityController.php @@ -55,7 +55,7 @@ public function userLoginAction(Request $request, $activateHash) $expires = time() + 60*60*24*183; $value = $this->generateCookieValue(get_class($user), $user->getUsername(), $expires, $user->getPassword()); - $return = $this->redirect($this->generateUrl(/*user_landing*/'question', array('event_id' => '2'))); + $return = $this->redirect($this->generateUrl(/*user_landing*/'question', array('event_id' => '17'))); $return->headers->setCookie(new Cookie('userEditEnabled', '1', time()+60*60*24*90)); $presentations = $this->getDoctrine()->getRepository('LiveVotingBundle:Presentation')->findByUser($user); From 6c7a450042ea9730b0099ac4198749caf1f39e6b Mon Sep 17 00:00:00 2001 From: joekurta Date: Tue, 1 Sep 2015 15:55:14 +0200 Subject: [PATCH 5/6] Activation and questionnaire mail sending separated --- Command/ActivationEmailsCommand.php | 79 ++++++++++++++---- Controller/UserAdminController.php | 118 ++++++++++++++++++++------- Resources/config/routing.yml | 8 +- Resources/views/User/index.html.twig | 9 +- 4 files changed, 159 insertions(+), 55 deletions(-) diff --git a/Command/ActivationEmailsCommand.php b/Command/ActivationEmailsCommand.php index 91a7804..84666c0 100644 --- a/Command/ActivationEmailsCommand.php +++ b/Command/ActivationEmailsCommand.php @@ -13,8 +13,20 @@ class ActivationEmailsCommand extends ContainerAwareCommand protected function configure() { $this - ->setName('activation:send') + ->setName('email:send') ->setDescription('Send activation emails to all users') + ->addOption( + 'activation', + null, + InputOption::VALUE_NONE, + 'activation' + ) + ->addOption( + 'questions', + null, + InputOption::VALUE_NONE, + 'Questionnaire' + ) ; } @@ -22,23 +34,54 @@ protected function execute(InputInterface $input, OutputInterface $output) { $users = $this->getContainer()->get('doctrine')->getRepository('LiveVotingBundle:User')->findAll(); $num = 0; - foreach ($users as $user) { - $user_email = $user->getEmail(); - $emailHash = md5($this->getContainer()->getParameter('email_hash_prefix') . $user_email); - $message = \Swift_Message::newInstance() - ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') - ->setFrom('info@netgen.hr') - ->setTo($user_email) - ->setBody( - $this->getContainer()->get('templating')->render( - 'LiveVotingBundle:Email:questions.html.twig', - array('emailHash' => $emailHash) - ), - 'text/html' - ); - $this->getContainer()->get('mailer')->send($message); - $num++; + if ($input->getOption('activation')) + { + foreach ($users as $user) { + $user_email = $user->getEmail(); + $emailHash = md5($this->getContainer()->getParameter('email_hash_prefix') . $user_email); + + $message = \Swift_Message::newInstance() + ->setSubject('Say hello to Summer Camp 2015!') + ->setFrom('info@netgen.hr') + ->setTo($user_email) + ->setBody( + $this->getContainer()->get('templating')->render( + 'LiveVotingBundle:Email:login.html.twig', + array('emailHash' => $emailHash) + ), + 'text/html' + ); + $this->getContainer()->get('mailer')->send($message); + $num++; + } + $output->writeln('Activation mails have been sent to '.$num.' users'); + } + else if ($input->getOption('questions')) + { + foreach ($users as $user) { + $user_email = $user->getEmail(); + $emailHash = md5($this->getContainer()->getParameter('email_hash_prefix') . $user_email); + + $message = \Swift_Message::newInstance() + ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') + ->setFrom('info@netgen.hr') + ->setTo($user_email) + ->setBody( + $this->getContainer()->get('templating')->render( + 'LiveVotingBundle:Email:questions.html.twig', + array('emailHash' => $emailHash) + ), + 'text/html' + ); + $this->getContainer()->get('mailer')->send($message); + $num++; + } + $output->writeln('Questionnaire mails have been sent to '.$num.' users'); } - $output->writeln('Activation mail has been sent to '.$num.' users'); + else + { + $output->writeln('Must choose one optional argument: --activation or --questions'); + } + } } \ No newline at end of file diff --git a/Controller/UserAdminController.php b/Controller/UserAdminController.php index b709016..b65f524 100755 --- a/Controller/UserAdminController.php +++ b/Controller/UserAdminController.php @@ -258,32 +258,59 @@ public function processImportCsvAction(Request $request) ); } - public function loginEmailAction(Request $request) + public function loginEmailAction(Request $request, $typeOf) { $users = $this->getDoctrine()->getRepository('LiveVotingBundle:User')->findAll(); foreach ($users as $user) { $user_email = $user->getEmail(); $emailHash = md5($this->container->getParameter('email_hash_prefix') . $user_email); - $message = \Swift_Message::newInstance() - ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') - ->setFrom('info@netgen.hr') - ->setTo($user_email) - ->setBody( - $this->renderView( - 'LiveVotingBundle:Email:questions.html.twig', - array('emailHash' => $emailHash) - ), - 'text/html' - ); + if ($typeOf === '0') + { + $message = \Swift_Message::newInstance() + ->setSubject('Say hello to Summer Camp 2015!') + ->setFrom('info@netgen.hr') + ->setTo($user_email) + ->setBody( + $this->renderView( + 'LiveVotingBundle:Email:login.html.twig', + array('emailHash' => $emailHash) + ), + 'text/html' + ); + } + else if ($typeOf === '1') + { + $message = \Swift_Message::newInstance() + ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') + ->setFrom('info@netgen.hr') + ->setTo($user_email) + ->setBody( + $this->renderView( + 'LiveVotingBundle:Email:questions.html.twig', + array('emailHash' => $emailHash) + ), + 'text/html' + ); + } + $this->get('mailer')->send($message); } - $request->getSession()->getFlashBag()->add( - 'message', 'Emails have been sent to all users.' - ); + if ($typeOf === '0') + { + $request->getSession()->getFlashBag()->add( + 'message', 'Activations have been sent to all users.' + ); + } + else if ($typeOf === '1') + { + $request->getSession()->getFlashBag()->add( + 'message', 'Questionnaires have been sent to all users.' + ); + } return $this->redirect($this->generateUrl('admin_user')); } - public function oneUserLoginEmailAction(Request $request, $id) + public function oneUserLoginEmailAction(Request $request, $id, $typeOf) { $em = $this->getDoctrine()->getManager(); @@ -292,24 +319,53 @@ public function oneUserLoginEmailAction(Request $request, $id) if (!$user) { throw $this->createNotFoundException('Unable to find User entity.'); } - $user_email = $user->getEmail(); $emailHash = md5($this->container->getParameter('email_hash_prefix') . $user_email); - $message = \Swift_Message::newInstance() - ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') - ->setFrom('info@netgen.hr') - ->setTo($user_email) - ->setBody( - $this->renderView( - 'LiveVotingBundle:Email:questions.html.twig', - array('emailHash' => $emailHash) - ), - 'text/html' - ); + if ($typeOf === '0') + { + $message = \Swift_Message::newInstance() + ->setSubject('Say hello to Summer Camp 2015!') + ->setFrom('info@netgen.hr') + ->setTo($user_email) + ->setBody( + $this->renderView( + 'LiveVotingBundle:Email:login.html.twig', + array('emailHash' => $emailHash) + ), + 'text/html' + ); + } + else if ($typeOf === '1') + { + $message = \Swift_Message::newInstance() + ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire') + ->setFrom('info@netgen.hr') + ->setTo($user_email) + ->setBody( + $this->renderView( + 'LiveVotingBundle:Email:questions.html.twig', + array('emailHash' => $emailHash) + ), + 'text/html' + ); + } + + $this->get('mailer')->send($message); - $request->getSession()->getFlashBag()->add( - 'message', 'Email has been sent to '.$user_email - ); + if ($typeOf === '0') + { + $request->getSession()->getFlashBag()->add( + 'message', 'Activation has been sent to '.$user_email + ); + } + else if ($typeOf === '1') + { + $request->getSession()->getFlashBag()->add( + 'message', 'Questionnaire has been sent to '.$user_email + ); + } + + return $this->redirect($this->generateUrl('admin_user')); } } \ No newline at end of file diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 59c5cc6..052cf25 100755 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -194,9 +194,9 @@ email_login: path: /login/ send_email_login: - path: /admin/user/send_email_login - defaults: {_controller: LiveVotingBundle:UserAdmin:loginEmail} + path: /admin/user/send_email_login/{typeOf} + defaults: {_controller: LiveVotingBundle:UserAdmin:loginEmail, typeOf: null} send_one_email_login: - path: /admin/user/send_one_email_login/{id} - defaults: {_controller: LiveVotingBundle:UserAdmin:oneUserLoginEmail, id: null } + path: /admin/user/send_one_email_login/{typeOf}/{id} + defaults: {_controller: LiveVotingBundle:UserAdmin:oneUserLoginEmail, id: null, typeOf: null } diff --git a/Resources/views/User/index.html.twig b/Resources/views/User/index.html.twig index ff8fff4..e787e8b 100755 --- a/Resources/views/User/index.html.twig +++ b/Resources/views/User/index.html.twig @@ -20,6 +20,7 @@ Enabled Edit Activation Email + Questionnaire Email @@ -31,7 +32,10 @@ - + + + + {% endfor %} @@ -45,7 +49,8 @@ - + +
    {% endblock %} From 929d482634deec6683c303f176fdb36784441892 Mon Sep 17 00:00:00 2001 From: joekurta Date: Tue, 1 Sep 2015 16:28:45 +0200 Subject: [PATCH 6/6] Sending mails fixtures --- Controller/SecurityController.php | 11 +++++++++-- Resources/config/routing.yml | 4 ++-- Resources/views/Email/login.html.twig | 2 +- Resources/views/Email/questions.html.twig | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Controller/SecurityController.php b/Controller/SecurityController.php index b69c825..eb02b4a 100755 --- a/Controller/SecurityController.php +++ b/Controller/SecurityController.php @@ -23,7 +23,7 @@ class SecurityController extends Controller * @param Request $request * @return mixed */ - public function userLoginAction(Request $request, $activateHash) + public function userLoginAction(Request $request, $activateHash, $typeOf) { if($activateHash === null){ return $this->redirect($this->generateUrl('root')); @@ -55,7 +55,14 @@ public function userLoginAction(Request $request, $activateHash) $expires = time() + 60*60*24*183; $value = $this->generateCookieValue(get_class($user), $user->getUsername(), $expires, $user->getPassword()); - $return = $this->redirect($this->generateUrl(/*user_landing*/'question', array('event_id' => '17'))); + if ($typeOf === '0') + { + $return = $this->redirect($this->generateUrl('user_landing')); + } + else if ($typeOf === '1') + { + $return = $this->redirect($this->generateUrl('question', array('event_id' => '17'))); + } $return->headers->setCookie(new Cookie('userEditEnabled', '1', time()+60*60*24*90)); $presentations = $this->getDoctrine()->getRepository('LiveVotingBundle:Presentation')->findByUser($user); diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml index 052cf25..8617e7c 100755 --- a/Resources/config/routing.yml +++ b/Resources/config/routing.yml @@ -155,8 +155,8 @@ admin_presentation_publish: #USER LOGIN ROUTING# user_login: - path: /login/{activateHash} - defaults: { _controller: LiveVotingBundle:Security:userLogin, activateHash: null } + path: /login/{activateHash}/{typeOf} + defaults: { _controller: LiveVotingBundle:Security:userLogin, activateHash: null, typeOf: null } user_login_check: path: /login_check diff --git a/Resources/views/Email/login.html.twig b/Resources/views/Email/login.html.twig index da21b6b..08562d8 100644 --- a/Resources/views/Email/login.html.twig +++ b/Resources/views/Email/login.html.twig @@ -1,5 +1,5 @@

    Welcome to SummerCamp 2015!



    -To login, click following link.

    +To login, click following link.

    After login you can see live schedule, vote for sessions, post comments and etc. @ SummerCamp LiveVoting site! \ No newline at end of file diff --git a/Resources/views/Email/questions.html.twig b/Resources/views/Email/questions.html.twig index 8016ada..f9cc3a9 100644 --- a/Resources/views/Email/questions.html.twig +++ b/Resources/views/Email/questions.html.twig @@ -2,7 +2,7 @@ Dear participant,

    Thank you for being a part of PHP & eZ Publish Summer Camp 2015!

    -We want to make the next one even better, and to do that we need YOUR help. On this link you will find 19 short questions that you can answer to in a few minutes.

    +We want to make the next one even better, and to do that we need YOUR help. On this link you will find 19 short questions that you can answer to in a few minutes.

    Please make time to answer the questions - it helps us immensely to make your experience next year the best one yet!