From 8b3eaac7175cae1acbda77901975f501d0fbed03 Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Tue, 7 Apr 2015 23:17:26 +0200
Subject: [PATCH] Fixes after merge
---
app/classes/Framadate/FramaDB.php | 250 ------------------
.../Framadate/Repositories/PollRepository.php | 4 +-
.../Framadate/Repositories/VoteRepository.php | 17 +-
.../Framadate/Services/PollService.php | 8 +-
exportcsv.php | 2 +-
5 files changed, 8 insertions(+), 273 deletions(-)
diff --git a/app/classes/Framadate/FramaDB.php b/app/classes/Framadate/FramaDB.php
index db0b7447..7c5101b2 100644
--- a/app/classes/Framadate/FramaDB.php
+++ b/app/classes/Framadate/FramaDB.php
@@ -79,256 +79,6 @@ class FramaDB {
return $this->pdo->query($sql);
}
- function findPollById($poll_id) {
- $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE id = ?');
-
- $prepared->execute([$poll_id]);
- $poll = $prepared->fetch();
- $prepared->closeCursor();
-
- return $poll;
- }
-
- function updatePoll($poll) {
- $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=?, hidden=? WHERE id = ?');
-
- return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active, $poll->editable, $poll->hidden, $poll->id]);
- }
-
- function allCommentsByPollId($poll_id) {
- $prepared = $this->prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id');
- $prepared->execute(array($poll_id));
-
- return $prepared->fetchAll();
- }
-
- function allUserVotesByPollId($poll_id) {
- $prepared = $this->prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id');
- $prepared->execute(array($poll_id));
-
- return $prepared->fetchAll();
- }
-
- function allSlotsByPollId($poll_id) {
- $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? ORDER BY title');
- $prepared->execute(array($poll_id));
-
- return $prepared->fetchAll();
- }
-
- function insertDefaultVote($poll_id, $insert_position) {
- $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), "0", SUBSTRING(choices, ?)) WHERE poll_id = ?');
-
- return $prepared->execute([$insert_position, $insert_position + 1, $poll_id]);
- }
-
- function insertVote($poll_id, $name, $choices, $token) {
- $prepared = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices, uniqId) VALUES (?,?,?,?)');
- $prepared->execute([$poll_id, $name, $choices, $token]);
-
- $newVote = new \stdClass();
- $newVote->poll_id = $poll_id;
- $newVote->id = $this->pdo->lastInsertId();
- $newVote->name = $name;
- $newVote->choices = $choices;
- $newVote->uniqId = $token;
-
- return $newVote;
- }
-
- function deleteVote($poll_id, $vote_id) {
- $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND id = ?');
-
- return $prepared->execute([$poll_id, $vote_id]);
- }
-
- /**
- * Delete all votes of a given poll.
- *
- * @param $poll_id int The ID of the given poll.
- * @return bool|null true if action succeeded.
- */
- function deleteVotesByPollId($poll_id) {
- $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ?');
-
- return $prepared->execute([$poll_id]);
- }
-
- /**
- * Delete all votes made on given moment index.
- *
- * @param $poll_id int The ID of the poll
- * @param $index int The index of the vote into the poll
- * @return bool|null true if action succeeded.
- */
- function deleteVotesByIndex($poll_id, $index) {
- $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTR(choices, 1, ?), SUBSTR(choices, ?)) WHERE poll_id = ?');
-
- return $prepared->execute([$index, $index + 2, $poll_id]);
- }
-
- /**
- * Find the slot into poll for a given datetime.
- *
- * @param $poll_id int The ID of the poll
- * @param $datetime int The datetime of the slot
- * @return mixed Object The slot found, or null
- */
- function findSlotByPollIdAndDatetime($poll_id, $datetime) {
- $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND SUBSTRING_INDEX(title, \'@\', 1) = ?');
-
- $prepared->execute([$poll_id, $datetime]);
- $slot = $prepared->fetch();
- $prepared->closeCursor();
-
- return $slot;
- }
-
- /**
- * Insert a new slot into a given poll.
- *
- * @param $poll_id int The ID of the poll
- * @param $title mixed The title of the slot
- * @param $moments mixed|null The moments joined with ","
- * @return bool true if action succeeded
- */
- function insertSlot($poll_id, $title, $moments) {
- $prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?,?,?)');
-
- return $prepared->execute([$poll_id, $title, $moments]);
- }
-
- /**
- * Update a slot into a poll.
- *
- * @param $poll_id int The ID of the poll
- * @param $datetime int The datetime of the slot to update
- * @param $newMoments mixed The new moments
- * @return bool|null true if action succeeded.
- */
- function updateSlot($poll_id, $datetime, $newMoments) {
- $prepared = $this->prepare('UPDATE `' . Utils::table('slot') . '` SET moments = ? WHERE poll_id = ? AND title = ?');
-
- return $prepared->execute([$newMoments, $poll_id, $datetime]);
- }
-
- /**
- * Delete a entire slot from a poll.
- *
- * @param $poll_id int The ID of the poll
- * @param $datetime mixed The datetime of the slot
- */
- function deleteSlot($poll_id, $datetime) {
- $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND title = ?');
- $prepared->execute([$poll_id, $datetime]);
- }
-
- function deleteSlotsByPollId($poll_id) {
- $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ?');
-
- return $prepared->execute([$poll_id]);
- }
-
- /**
- * Delete all comments of a given poll.
- *
- * @param $poll_id int The ID of the given poll.
- * @return bool|null true if action succeeded.
- */
- function deleteCommentsByPollId($poll_id) {
- $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ?');
-
- return $prepared->execute([$poll_id]);
- }
-
- function updateVote($poll_id, $vote_id, $name, $choices) {
- $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = ?, name = ? WHERE poll_id = ? AND id = ?');
-
- return $prepared->execute([$choices, $name, $poll_id, $vote_id]);
- }
-
- function insertComment($poll_id, $name, $comment) {
- $prepared = $this->prepare('INSERT INTO `' . Utils::table('comment') . '` (poll_id, name, comment) VALUES (?,?,?)');
-
- return $prepared->execute([$poll_id, $name, $comment]);
- }
-
- function deleteComment($poll_id, $comment_id) {
- $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND id = ?');
-
- return $prepared->execute([$poll_id, $comment_id]);
- }
-
- function deletePollById($poll_id) {
- $prepared = $this->prepare('DELETE FROM `' . Utils::table('poll') . '` WHERE id = ?');
-
- return $prepared->execute([$poll_id]);
- }
-
- /**
- * Find old polls. Limit: 20.
- *
- * @return array Array of old polls
- */
- public function findOldPolls() {
- $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE DATE_ADD(`end_date`, INTERVAL ' . PURGE_DELAY . ' DAY) < NOW() AND `end_date` != 0 LIMIT 20');
- $prepared->execute([]);
-
- return $prepared->fetchAll();
- }
-
- /**
- * Search polls in databse.
- *
- * @param array $search Array of search : ['id'=>..., 'title'=>..., 'name'=>...]
- * @return array The found polls
- */
- public function findAllPolls($search) {
- // 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)
- ORDER BY p.title ASC
- ');
-
- $poll = $search['poll'] . '%';
- $title = '%' . $search['title'] . '%';
- $name = '%' . $search['name'] . '%';
- $prepared->bindParam(':id', $poll, PDO::PARAM_STR);
- $prepared->bindParam(':title', $title, PDO::PARAM_STR);
- $prepared->bindParam(':name', $name, PDO::PARAM_STR);
- $prepared->execute();
-
- return $prepared->fetchAll();
- }
-
- /**
- * Get the total number of polls in databse.
- *
- * @return int The number of polls
- */
- public function countPolls() {
- // Total count
- $stmt = $this->query('SELECT count(1) nb FROM `' . Utils::table('poll') . '`');
- $count = $stmt->fetch();
- $stmt->closeCursor();
-
- return $count->nb;
- }
-
- public function countVotesByPollId($poll_id) {
- $prepared = $this->prepare('SELECT count(1) nb FROM `' . Utils::table('vote') . '` WHERE poll_id = ?');
-
- $prepared->execute([$poll_id]);
- $result = $prepared->fetch();
- $prepared->closeCursor();
-
- return $result->nb;
-}
public function lastInsertId() {
return $this->pdo->lastInsertId();
}
diff --git a/app/classes/Framadate/Repositories/PollRepository.php b/app/classes/Framadate/Repositories/PollRepository.php
index 76013e9e..b8e913b3 100644
--- a/app/classes/Framadate/Repositories/PollRepository.php
+++ b/app/classes/Framadate/Repositories/PollRepository.php
@@ -38,9 +38,9 @@ class PollRepository extends AbstractRepository {
}
function update($poll) {
- $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=? WHERE id = ?');
+ $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=?, hidden=? WHERE id = ?');
- return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active, $poll->editable, $poll->id]);
+ return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active, $poll->editable, $poll->hidden, $poll->id]);
}
function deleteById($poll_id) {
diff --git a/app/classes/Framadate/Repositories/VoteRepository.php b/app/classes/Framadate/Repositories/VoteRepository.php
index 467dd0a7..8f42b9d0 100644
--- a/app/classes/Framadate/Repositories/VoteRepository.php
+++ b/app/classes/Framadate/Repositories/VoteRepository.php
@@ -23,15 +23,16 @@ class VoteRepository extends AbstractRepository {
return $prepared->execute([$insert_position, $insert_position + 1, $poll_id]);
}
- function insert($poll_id, $name, $choices) {
- $prepared = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices) VALUES (?,?,?)');
- $prepared->execute([$poll_id, $name, $choices]);
+ function insert($poll_id, $name, $choices, $token) {
+ $prepared = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices, uniqId) VALUES (?,?,?,?)');
+ $prepared->execute([$poll_id, $name, $choices, $token]);
$newVote = new \stdClass();
$newVote->poll_id = $poll_id;
$newVote->id = $this->lastInsertId();
$newVote->name = $name;
$newVote->choices = $choices;
+ $newVote->uniqId = $token;
return $newVote;
}
@@ -73,14 +74,4 @@ class VoteRepository extends AbstractRepository {
return $prepared->execute([$choices, $name, $poll_id, $vote_id]);
}
- public function countByPollId($poll_id) {
- $prepared = $this->prepare('SELECT count(1) nb FROM `' . Utils::table('vote') . '` WHERE poll_id = ?');
-
- $prepared->execute([$poll_id]);
- $result = $prepared->fetch();
- $prepared->closeCursor();
-
- return $result->nb;
- }
-
}
diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php
index 9416e3eb..93205b3b 100644
--- a/app/classes/Framadate/Services/PollService.php
+++ b/app/classes/Framadate/Services/PollService.php
@@ -78,9 +78,7 @@ class PollService {
function addVote($poll_id, $name, $choices) {
$choices = implode($choices);
$token = $this->random(16);
- return $this->connect->insertVote($poll_id, $name, $choices, $token);
-
- return $this->voteRepository->insert($poll_id, $name, $choices);
+ return $this->voteRepository->insert($poll_id, $name, $choices, $token);
}
function addComment($poll_id, $name, $comment) {
@@ -91,10 +89,6 @@ class PollService {
}
}
- public function countVotesByPollId($poll_id) {
- return $this->voteRepository->countByPollId($poll_id);
- }
-
/**
* @param Form $form
* @return string
diff --git a/exportcsv.php b/exportcsv.php
index 81801df2..f5b5d0b3 100644
--- a/exportcsv.php
+++ b/exportcsv.php
@@ -43,7 +43,7 @@ $pollService = new PollService($connect, $logService);
/* ---- */
if (!empty($_GET['poll'])) {
- $poll_id = filter_input(INPUT_GET, 'poll', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '/^[a-z0-9]+$/']]);
+ $poll_id = filter_input(INPUT_GET, 'poll', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
$poll = $pollService->findById($poll_id);
}
--
GitLab