From fadffdab108bef261c6c58c9fda2e3d5ee1b4afb Mon Sep 17 00:00:00 2001
From: osaajani <>
Date: Mon, 27 Dec 2021 20:25:23 +0100
Subject: [PATCH 1/2] extend suppression of smsstops to all users

---
 VERSION                         |  2 +-
 controllers/publics/SmsStop.php |  7 -------
 templates/smsstop/list.php      | 16 +++++-----------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/VERSION b/VERSION
index 293fbd1..f08544a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v3.2.4
+v3.2.5
diff --git a/controllers/publics/SmsStop.php b/controllers/publics/SmsStop.php
index 38dd40a..3147da2 100644
--- a/controllers/publics/SmsStop.php
+++ b/controllers/publics/SmsStop.php
@@ -74,13 +74,6 @@ 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/templates/smsstop/list.php b/templates/smsstop/list.php
index 15cbcb5..3dd6dde 100644
--- a/templates/smsstop/list.php
+++ b/templates/smsstop/list.php
@@ -40,9 +40,7 @@
                                         <thead>
                                             <tr>
                                                 <th>Numéro</th>
-                                                <?php if ($_SESSION['user']['admin'] ?? false) { ?>
-                                                    <th class="checkcolumn"><input type="checkbox" id="check-all"/></th>
-                                                <?php } ?>
+                                                <th class="checkcolumn"><input type="checkbox" id="check-all"/></th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -50,12 +48,10 @@
                                     </table>
                                 </div>
                                 <div>
-                                    <?php if ($_SESSION['user']['admin'] ?? false) { ?>
-                                        <div class="text-right col-xs-12 no-padding">
-                                            <strong>Action pour la séléction :</strong>
-                                            <button class="btn btn-default btn-confirm" type="submit" formaction="<?php echo \descartes\Router::url('SmsStop', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
-                                        </div>
-                                    <?php } ?>
+                                    <div class="text-right col-xs-12 no-padding">
+                                        <strong>Action pour la séléction :</strong>
+                                        <button class="btn btn-default btn-confirm" type="submit" formaction="<?php echo \descartes\Router::url('SmsStop', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                    </div>
                                 </div>
                             </form>
 						</div>
@@ -87,14 +83,12 @@ jQuery(document).ready(function ()
             {
                 data: 'number_formatted',
             }
-            <?php if ($_SESSION['user']['admin'] ?? false) { ?>
             ,{
                 data: 'id',
                 render: function (data, type, row, meta) {
                     return '<input name="ids[]" type="checkbox" value="' + data + '">';
                 },
             },
-            <?php } ?>
         ],
         "deferRender": true
     });

From bd3da737111a281aa9930ea6d5be63415dc83110 Mon Sep 17 00:00:00 2001
From: osaajani <>
Date: Wed, 29 Dec 2021 02:54:21 +0100
Subject: [PATCH 2/2] Change UTF8 to utf8mb4 to properly support utf8 in mysql

---
 VERSION                           |  2 +-
 controllers/internals/Console.php | 18 +++++++++---------
 daemons/Launcher.php              |  2 +-
 daemons/Phone.php                 |  2 +-
 daemons/Sender.php                |  2 +-
 phinx.yml.dist                    |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/VERSION b/VERSION
index f08544a..ddd44db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v3.2.5
+v3.2.6
diff --git a/controllers/internals/Console.php b/controllers/internals/Console.php
index e2ef7b4..12f7e48 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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $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, 'UTF8');
+            $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
             $internal_quota = new \controllers\internals\Quota($bdd);
             $internal_quota->renew_quotas();
         }
diff --git a/daemons/Launcher.php b/daemons/Launcher.php
index 3ab80bd..63b29c2 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, 'UTF8');
+        $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
         $this->internal_phone = new \controllers\internals\Phone($this->bdd);
 
         $this->start_sender_daemon();
diff --git a/daemons/Phone.php b/daemons/Phone.php
index a6c7ba9..72c2eac 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, 'UTF8');
+        $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
 
         //Send smss in queue
         $this->send_smss();
diff --git a/daemons/Sender.php b/daemons/Sender.php
index 91eb3ee..9aaa955 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, 'UTF8');
+        $this->bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
     }
 
     public function on_stop()
diff --git a/phinx.yml.dist b/phinx.yml.dist
index aad999e..3525e53 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: utf8
+        charset: utf8mb4
 
 version_order: creation