Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'bug/sondage-avec-smtp-désactivé' into 'develop'

Browse Source 
correction : Adresse e-mail d'un sondage avec SMTP désactivé

See merge request framasoft/framadate!270
This commit is contained in:
Thomas Citharel 2018-04-03 09:27:37 +02:00
commit 72de7bff1c
1 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/classes/Framadate/Repositories/PollRepository.php
View File

@ -79,7 +79,7 @@ class PollRepository extends AbstractRepository {
} }
/** /**
* Search polls in databse. * Search polls in database.
* *
* @param array $search Array of search : ['id'=>..., 'title'=>..., 'name'=>..., 'mail'=>...] * @param array $search Array of search : ['id'=>..., 'title'=>..., 'name'=>..., 'mail'=>...]
* @param int $start The number of first entry to select * @param int $start The number of first entry to select
@ -88,28 +88,48 @@ class PollRepository extends AbstractRepository {
*/ */
public function findAll($search, $start, $limit) { public function findAll($search, $start, $limit) {
// Polls // Polls
$prepared = $this->prepare('
SELECT p.*,
(SELECT count(1) FROM `' . Utils::table('vote') . '` v WHERE p.id=v.poll_id) votes
FROM `' . Utils::table('poll') . '` p
WHERE (:id = "" OR p.id LIKE :id)
AND (:title = "" OR p.title LIKE :title)
AND (:name = "" OR p.admin_name LIKE :name)
AND (:mail = "" OR p.admin_mail LIKE :mail)
ORDER BY p.title ASC
LIMIT :start, :limit
');
$poll = $search['poll'] . '%'; $request = "";
$title = '%' . $search['title'] . '%'; $request .= "SELECT p.*,";
$name = '%' . $search['name'] . '%'; $request .= " (SELECT count(1) FROM `" . Utils::table('vote') . "` v WHERE p.id=v.poll_id) votes";
$mail = '%' . $search['mail'] . '%'; $request .= " FROM `" . Utils::table('poll') . "` p";
$prepared->bindParam(':id', $poll, PDO::PARAM_STR); $request .= " WHERE 1";
$prepared->bindParam(':title', $title, PDO::PARAM_STR);
$prepared->bindParam(':name', $name, PDO::PARAM_STR); $values = [];
$prepared->bindParam(':mail', $mail, PDO::PARAM_STR);
if (!empty($search["poll"])) {
$request .= " AND p.id LIKE :poll";
$values["poll"] = "{$search["poll"]}%";
}
$fields = [
// key of $search => column name
"title" => "title",
"name" => "admin_name",
"mail" => "admin_mail",
];
foreach ($fields as $searchKey => $columnName) {
if (empty($search[$searchKey])) {
continue;
}
$request .= " AND p.$columnName LIKE :$searchKey";
$values[$searchKey] = "%{$search[$searchKey]}%";
}
$request .= " ORDER BY p.title ASC";
$request .= " LIMIT :start, :limit";
$prepared = $this->prepare($request);
foreach ($values as $searchKey => $value) {
$prepared->bindParam(":$searchKey", $value, PDO::PARAM_STR);
}
$prepared->bindParam(':start', $start, PDO::PARAM_INT); $prepared->bindParam(':start', $start, PDO::PARAM_INT);
$prepared->bindParam(':limit', $limit, PDO::PARAM_INT); $prepared->bindParam(':limit', $limit, PDO::PARAM_INT);
$prepared->execute(); $prepared->execute();
return $prepared->fetchAll(); return $prepared->fetchAll();