From 98f14c487ab7e358d517743a28b018737341914e Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Thu, 25 Dec 2014 01:11:06 +0100
Subject: [PATCH] Enable poll deletion + improve random generator
---
app/classes/Framadate/Services/AdminPollService.php | 6 ++++--
app/classes/Framadate/Services/PollService.php | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php
index c506dfc7..4445ef6f 100644
--- a/app/classes/Framadate/Services/AdminPollService.php
+++ b/app/classes/Framadate/Services/AdminPollService.php
@@ -77,10 +77,12 @@ class AdminPollService {
function deleteEntirePoll($poll_id) {
$poll = $this->connect->findPollById($poll_id);
$this->logService->log("DELETE_POLL", "id:$poll->poll_id, format:$poll->format, admin:$poll->admin_name, mail:$poll->admin_mail");
- /*$this->connect->deleteVotesByPollId($poll_id);
+
+ // Delete the entire poll
+ $this->connect->deleteVotesByPollId($poll_id);
$this->connect->deleteCommentsByPollId($poll_id);
$this->connect->deleteSlotsByPollId($poll_id);
- $this->connect->deleteByPollId($poll_id);*/
+ $this->connect->deleteByPollId($poll_id);
return true;
}
diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php
index 25a4b2e3..7edcdf00 100644
--- a/app/classes/Framadate/Services/PollService.php
+++ b/app/classes/Framadate/Services/PollService.php
@@ -176,9 +176,9 @@ class PollService {
// TODO Better random ?
$string = '';
$chaine = 'abcdefghijklmnopqrstuvwxyz123456789';
- srand((double)microtime() * 1000000);
+ mt_srand();
for ($i = 0; $i < $car; $i++) {
- $string .= $chaine[rand() % strlen($chaine)];
+ $string .= $chaine[mt_rand() % strlen($chaine)];
}
return $string;
--
GitLab