diff --git a/VERSION b/VERSION
index ddd44db..293fbd1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v3.2.6
+v3.2.4
diff --git a/controllers/internals/Console.php b/controllers/internals/Console.php
index 12f7e48..e2ef7b4 100644
--- a/controllers/internals/Console.php
+++ b/controllers/internals/Console.php
@@ -55,7 +55,7 @@ namespace controllers\internals;
*/
public function phone($id_phone)
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_phone = new \controllers\internals\Phone($bdd);
$phone = $internal_phone->get($id_phone);
@@ -74,7 +74,7 @@ namespace controllers\internals;
*/
public function user_exists(string $email)
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_user = new \controllers\internals\User($bdd);
$user = $internal_user->get_by_email($email);
@@ -89,7 +89,7 @@ namespace controllers\internals;
*/
public function user_id_exists(string $id)
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_user = new \controllers\internals\User($bdd);
$user = $internal_user->get($id);
@@ -111,7 +111,7 @@ namespace controllers\internals;
*/
public function create_update_user(string $email, string $password, bool $admin, ?string $api_key = null, string $status = \models\User::STATUS_ACTIVE, bool $encrypt_password = true)
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_user = new \controllers\internals\User($bdd);
$user = $internal_user->get_by_email($email);
@@ -146,7 +146,7 @@ namespace controllers\internals;
*/
public function update_user_status(string $id, string $status)
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_user = new \controllers\internals\User($bdd);
$user = $internal_user->get($id);
@@ -167,7 +167,7 @@ namespace controllers\internals;
*/
public function delete_user(string $id)
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_user = new \controllers\internals\User($bdd);
$success = $internal_user->delete($id);
@@ -180,7 +180,7 @@ namespace controllers\internals;
*/
public function clean_unused_medias()
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_media = new \controllers\internals\Media($bdd);
$medias = $internal_media->gets_unused();
@@ -198,7 +198,7 @@ namespace controllers\internals;
*/
public function quota_limit_alerting()
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_quota = new \controllers\internals\Quota($bdd);
$internal_quota->alerting_for_limit_close_and_reached();
}
@@ -208,7 +208,7 @@ namespace controllers\internals;
*/
public function renew_quotas()
{
- $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$internal_quota = new \controllers\internals\Quota($bdd);
$internal_quota->renew_quotas();
}
diff --git a/controllers/publics/SmsStop.php b/controllers/publics/SmsStop.php
index 3147da2..38dd40a 100644
--- a/controllers/publics/SmsStop.php
+++ b/controllers/publics/SmsStop.php
@@ -74,6 +74,13 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('SmsStop', 'list'));
}
+ if (!\controllers\internals\Tool::is_admin())
+ {
+ \FlashMessage\FlashMessage::push('danger', 'Vous devez être administrateur pour pouvoir supprimer un "STOP Sms" !');
+
+ return $this->redirect(\descartes\Router::url('SmsStop', 'list'));
+ }
+
$ids = $_GET['ids'] ?? [];
foreach ($ids as $id)
{
diff --git a/daemons/Launcher.php b/daemons/Launcher.php
index 63b29c2..3ab80bd 100644
--- a/daemons/Launcher.php
+++ b/daemons/Launcher.php
@@ -44,7 +44,7 @@ class Launcher extends AbstractDaemon
public function run()
{
//Create the internal controllers
- $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
$this->internal_phone = new \controllers\internals\Phone($this->bdd);
$this->start_sender_daemon();
diff --git a/daemons/Phone.php b/daemons/Phone.php
index 72c2eac..a6c7ba9 100644
--- a/daemons/Phone.php
+++ b/daemons/Phone.php
@@ -60,7 +60,7 @@ class Phone extends AbstractDaemon
$this->read_tick += 1;
- $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
//Send smss in queue
$this->send_smss();
diff --git a/daemons/Sender.php b/daemons/Sender.php
index 9aaa955..91eb3ee 100644
--- a/daemons/Sender.php
+++ b/daemons/Sender.php
@@ -94,7 +94,7 @@ class Sender extends AbstractDaemon
public function on_start()
{
$this->logger->info('Starting Sender with pid ' . getmypid());
- $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
+ $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, 'UTF8');
}
public function on_stop()
diff --git a/phinx.yml.dist b/phinx.yml.dist
index 3525e53..aad999e 100644
--- a/phinx.yml.dist
+++ b/phinx.yml.dist
@@ -12,6 +12,6 @@ environments:
user: '%APP_DATABASE_USER%'
pass: '%APP_DATABASE_PASS%'
port: 3306
- charset: utf8mb4
+ charset: utf8
version_order: creation
diff --git a/templates/smsstop/list.php b/templates/smsstop/list.php
index 3dd6dde..15cbcb5 100644
--- a/templates/smsstop/list.php
+++ b/templates/smsstop/list.php
@@ -40,7 +40,9 @@
Numéro
-
+
+
+