diff --git a/app/classes/Framadate/Collect_mail.php b/app/classes/Framadate/CollectMail.php
similarity index 91%
rename from app/classes/Framadate/Collect_mail.php
rename to app/classes/Framadate/CollectMail.php
index 8abc12e9e21fdff6e62d3b5525c576d3db47727e..155bee404e593372df88c4c2b5884415f48078b8 100644
--- a/app/classes/Framadate/Collect_mail.php
+++ b/app/classes/Framadate/CollectMail.php
@@ -20,16 +20,14 @@
namespace Framadate;
/**
- * Class Collect_mail
+ * Class CollectMail
*
* Is used to specify the poll's edition permissions.
* @TODO : wait to use the SplEnum
*
* @package Framadate
*/
-class Collect_mail { // extends SplEnum
- const __default = self::NO_COLLECT;
-
+class CollectMail { // extends SplEnum
const NO_COLLECT = 0;
const COLLECT = 1;
const COLLECT_REQUIRED = 2;
diff --git a/app/classes/Framadate/Form.php b/app/classes/Framadate/Form.php
index a277ecafe06e7d3d9ab8587dd5aa9766ceaa67a0..2f62012b0357f450c2463506d3da7ae34855ba5b 100644
--- a/app/classes/Framadate/Form.php
+++ b/app/classes/Framadate/Form.php
@@ -84,7 +84,7 @@ class Form
/**
* Tells if voters email addresses are collected or not.
- * @var \Framadate\Collect_mail
+ * @var \Framadate\CollectMail
*/
public $collect_users_mail;
@@ -93,9 +93,10 @@ class Form
*/
private $choices;
- public function __construct(){
+ public function __construct()
+ {
$this->editable = Editable::EDITABLE_BY_ALL;
- $this->collect_users_mail = Collect_mail::NO_COLLECT;
+ $this->collect_users_mail = CollectMail::NO_COLLECT;
$this->clearChoices();
}
diff --git a/app/classes/Framadate/Services/InputService.php b/app/classes/Framadate/Services/InputService.php
index a3e10d425647d4cb1fb7497f719f82b5dd10eeff..81dfe25c3ca1ae4a8f3da1eb344baba089a1be06 100644
--- a/app/classes/Framadate/Services/InputService.php
+++ b/app/classes/Framadate/Services/InputService.php
@@ -69,23 +69,23 @@ class InputService {
public function filterMail($mail) {
///////////////////////////////////////////////////////////////////////////////////////
// formatting
-
+
$mail = trim($mail);
-
+
///////////////////////////////////////////////////////////////////////////////////////
// e-mail validation
-
+
$resultat = FALSE;
-
+
$validator = new EmailValidator();
-
+
if ($validator->isValid($mail, new RFCValidation())) {
$resultat = $mail;
}
-
+
///////////////////////////////////////////////////////////////////////////////////////
// return
-
+
return $resultat;
}
@@ -115,8 +115,8 @@ class InputService {
return filter_var($editable, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => EDITABLE_CHOICE_REGEX]]);
}
- public function filterCollect_mail($collect_mail) {
- return filter_var($collect_mail, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => COLLECT_MAIL_CHOICE_REGEX]]);
+ public function filterCollectMail($collectMail) {
+ return filter_var($collectMail, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => COLLECT_MAIL_CHOICE_REGEX]]);
}
public function filterComment($comment) {
diff --git a/create_poll.php b/create_poll.php
index 5b7597a4a08aaf1f4e3fa1750f1c9bcbe15a8820..7b1c0a938b10fa04f948f3eca013ef2c10f30a9c 100644
--- a/create_poll.php
+++ b/create_poll.php
@@ -58,7 +58,6 @@ if ($goToStep2) {
$use_ValueMax = isset($_POST['use_ValueMax']) ? $inputService->filterBoolean($_POST['use_ValueMax']) : false;
$ValueMax = $use_ValueMax === true ? $inputService->filterValueMax($_POST['ValueMax']) : null;
- $collect_users_mail = isset($_POST['collect_users_mail']) ? $inputService->filterBoolean($_POST['collect_users_mail']) : false;
$use_customized_url = isset($_POST['use_customized_url']) ? $inputService->filterBoolean($_POST['use_customized_url']) : false;
$customized_url = $use_customized_url === true ? $inputService->filterId($_POST['customized_url']) : null;
$name = $inputService->filterName($_POST['name']);
@@ -69,7 +68,7 @@ if ($goToStep2) {
$receiveNewComments = isset($_POST['receiveNewComments']) ? $inputService->filterBoolean($_POST['receiveNewComments']) : false;
$hidden = isset($_POST['hidden']) ? $inputService->filterBoolean($_POST['hidden']) : false;
$use_password = filter_input(INPUT_POST, 'use_password', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
- $collect_users_mail = $inputService->filterCollect_mail($_POST['collect_users_mail']);
+ $collect_users_mail = $inputService->filterCollectMail($_POST['collect_users_mail']);
$use_password = filter_input(INPUT_POST, 'use_password', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
$password = isset($_POST['password']) ? $_POST['password'] : null;
$password_repeat = isset($_POST['password_repeat']) ? $_POST['password_repeat'] : null;
diff --git a/tpl/create_poll.tpl b/tpl/create_poll.tpl
index 19afac0ae2b1ab6f1b6d57d42ec6c1b3c3095c72..05efe44d0f527a44f25f8f691ced838355bf6c9e 100644
--- a/tpl/create_poll.tpl
+++ b/tpl/create_poll.tpl
@@ -325,7 +325,7 @@
</div>
</div>
</div>
-
+
{* Collect users email *}
<div class="form-group">
@@ -335,19 +335,19 @@
<div class="col-sm-8">
<div class="radio">
<label>
- <input type="radio" name="collect_users_mail" id="no_collect" {if $collect_users_mail==constant("Framadate\Collect_mail::NO_COLLECT")}checked{/if} value="{constant("Framadate\Collect_mail::NO_COLLECT")}">
+ <input type="radio" name="collect_users_mail" id="no_collect" {if $collect_users_mail==constant("Framadate\CollectMail::NO_COLLECT")}checked{/if} value="{constant("Framadate\CollectMail::NO_COLLECT")}">
{__('Step 1', 'Email addresses are not collected')}
</label>
<label>
- <input type="radio" name="collect_users_mail" {if $collect_users_mail==constant("Framadate\Collect_mail::COLLECT")}checked{/if} value="{constant("Framadate\Collect_mail::COLLECT")}">
+ <input type="radio" name="collect_users_mail" {if $collect_users_mail==constant("Framadate\CollectMail::COLLECT")}checked{/if} value="{constant("Framadate\CollectMail::COLLECT")}">
{__('Step 1', 'Email addresses are collected but not required')}
</label>
<label>
- <input type="radio" name="collect_users_mail" {if $collect_users_mail==constant("Framadate\Collect_mail::COLLECT_REQUIRED")}checked{/if} value="{constant("Framadate\Collect_mail::COLLECT_REQUIRED")}">
+ <input type="radio" name="collect_users_mail" {if $collect_users_mail==constant("Framadate\CollectMail::COLLECT_REQUIRED")}checked{/if} value="{constant("Framadate\CollectMail::COLLECT_REQUIRED")}">
{__('Step 1', 'Email addresses are required')}
</label>
<label>
- <input type="radio" disabled name="collect_users_mail" {if $collect_users_mail==constant("Framadate\Collect_mail::COLLECT_REQUIRED_VERIFIED")}checked{/if} value="{constant("Framadate\Collect_mail::COLLECT_REQUIRED_VERIFIED")}">
+ <input type="radio" disabled name="collect_users_mail" {if $collect_users_mail==constant("Framadate\CollectMail::COLLECT_REQUIRED_VERIFIED")}checked{/if} value="{constant("Framadate\CollectMail::COLLECT_REQUIRED_VERIFIED")}">
{__('Step 1', 'Email addresses are required and verified')}
</label>
</div>
@@ -360,12 +360,12 @@
</div>
</div>
</div>
-
+
</div> {* END div.form-group *}
-
+
</div> {* END div.collapse *}
-
-
+
+
<p class="text-right">
<button name="{$goToStep2}" value="{$poll_type}" type="submit"
class="btn btn-success">{__('Step 1', 'Go to step 2')}</button>
diff --git a/tpl/part/poll_info.tpl b/tpl/part/poll_info.tpl
index 09defafd854dd1a5755a9cb77a5855a6959e4545..3de7245cdbc7af37dcf4b8d0ba603f287513bfb3 100644
--- a/tpl/part/poll_info.tpl
+++ b/tpl/part/poll_info.tpl
@@ -233,19 +233,19 @@
</div>
</div>
<div id="collect_users_mail">
- {if $poll->collect_users_mail == constant("Framadate\Collect_mail::NO_COLLECT")}
+ {if $poll->collect_users_mail == constant("Framadate\CollectMail::NO_COLLECT")}
{$txt=__('PollInfo', 'Voters email adresses are not collected')}
- {else if $poll->collect_users_mail == constant("Framadate\Collect_mail::COLLECT")}
+ {else if $poll->collect_users_mail == constant("Framadate\CollectMail::COLLECT")}
{$txt=__('PollInfo', 'Voters email adresses are collected')}
- {else if $poll->collect_users_mail == constant("Framadate\Collect_mail::COLLECT_REQUIRED")}
+ {else if $poll->collect_users_mail == constant("Framadate\CollectMail::COLLECT_REQUIRED")}
{$txt=__('PollInfo', 'Voters email adresses are collected and required')}
- {else if $poll->collect_users_mail == constant("Framadate\Collect_mail::COLLECT_REQUIRED_VERIFIED")}
+ {else if $poll->collect_users_mail == constant("Framadate\CollectMail::COLLECT_REQUIRED_VERIFIED")}
{$txt=__('PollInfo', 'Voters email adresses are collected, required and verified')}
{else}
{$txt='Error'}
{/if}
<p><span class="glyphicon glyphicon-envelope"> </span> {$txt|html}</p>
-
+
</div>
{/if}
</div>
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index d317ec37cc36426658c21f4fdf4d0e62f33d4626..6ce6b38ef970a26cda8d53a112bf3d466b5676ed 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -30,7 +30,7 @@
class="btn btn-link btn-sm remove-column" title="{__('adminstuds', 'Remove the column')} {$slot->title|html}">
<i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
</a>
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT")}
<a href="{poll_url id=$admin_poll_id admin=true action='collect_mail' action_value=($headersDCount)}"
class="btn btn-link btn-sm collect-mail"
title="{__('adminstuds', 'Collect the emails of the polled users for the choice')} {$slot->title|html}">
@@ -68,8 +68,8 @@
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="hidden" name="edited_vote" value="{$vote->uniqId}"/>
<input type="text" id="name" name="name" value="{$vote->name|html}" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
- <input type="email" {if $poll->collect_users_mail != constant("Framadate\Collect_mail::COLLECT")} required {/if} id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT")}
+ <input type="email" {if $poll->collect_users_mail != constant("Framadate\CollectMail::COLLECT")} required {/if} id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
{/if}
</div>
</td>
@@ -112,13 +112,13 @@
{elseif !$hidden} {* Voted line *}
<tr>
- <th class="bg-info">{$vote->name|html}
+ <th class="bg-info" {if $accessGranted && $admin && $vote->mail}title="{$vote->mail|html}"{/if}>{$vote->name|html}
{if $active && !$expired && $accessGranted &&
(
$poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')
or $admin
or ($poll->editable == constant('Framadate\Editable::EDITABLE_BY_OWN') && $editedVoteUniqueId == $vote->uniqId)
- ) && $slots gt 4
+ ) && $slots|count gt 4
}
<span class="edit-username-left">
<a href="{if $admin}{poll_url id=$poll->admin_id vote_id=$vote->uniqId admin=true}{else}{poll_url id=$poll->id vote_id=$vote->uniqId}{/if}" class="btn btn-default btn-sm" title="{__f('Poll results', 'Edit the line: %s', $vote->name)|html}">
@@ -184,11 +184,11 @@
<div class="input-group input-group-sm">
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="text" id="name" name="name" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT")}
<input type="email" required id="mail" name="mail" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
{/if}
</div>
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT") && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT") && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
<div class="bg-danger">
<i class="glyphicon glyphicon-alert"> </i>
<label> {__('Poll results', 'Anyone will be able to access your email address after your vote')} </label>
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index a70ebaa11b5eb5ddb351059c0fb7b82945ef0871..0259c464943039b26d04acdd3df57f7b050db8ab 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -32,7 +32,7 @@
title="{__('adminstuds', 'Remove the column')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
<i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
</a>
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT")}
<a href="{poll_url id=$admin_poll_id admin=true action='collect_mail' action_value=($headersDCount)}"
class="btn btn-link btn-sm collect-mail"
title="{__('adminstuds', 'Collect the emails of the polled users for the choice')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
@@ -112,9 +112,9 @@
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="hidden" name="edited_vote" value="{$vote->uniqId}"/>
<input type="text" id="name" name="name" value="{$vote->name|html}" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
- <input type="email" {if $poll->collect_users_mail != constant("Framadate\Collect_mail::COLLECT")} required {/if} id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
- {/if}
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT")}
+ <input type="email" {if $poll->collect_users_mail != constant("Framadate\CollectMail::COLLECT")} required {/if} id="mail" name="mail" value="{$vote->mail|html}" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
+ {/if}
</div>
</td>
@@ -162,7 +162,7 @@
<tr>
{* Voted line *}
- <th class="bg-info">{$vote->name|html}
+ <th class="bg-info" {if $accessGranted && $admin}title="{$vote->mail|html}"{/if}>{$vote->name|html}
{if $active && !$expired && $accessGranted &&
(
$poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')
@@ -239,11 +239,11 @@
<div class="input-group input-group-sm">
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="text" id="name" name="name" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT")}
- <input type="email" {if $poll->collect_users_mail != constant("Framadate\Collect_mail::COLLECT")} required {/if} id="mail" name="mail" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT")}
+ <input type="email" {if $poll->collect_users_mail != constant("Framadate\CollectMail::COLLECT")} required {/if} id="mail" name="mail" class="form-control" title="{__('Generic', 'Your email address')}" placeholder="{__('Generic', 'Your email address')}" />
{/if}
</div>
- {if $poll->collect_users_mail != constant("Framadate\Collect_mail::NO_COLLECT") && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
+ {if $poll->collect_users_mail != constant("Framadate\CollectMail::NO_COLLECT") && $poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL')}
<div class="bg-danger">
<i class="glyphicon glyphicon-alert"> </i>
<label> {__('Poll results', 'Anyone will be able to access your email address after your vote')} </label>