From 10ae91d23da41d8c0895f765d000a0d3be7f85e9 Mon Sep 17 00:00:00 2001 From: osaajani Date: Wed, 6 Nov 2019 17:46:28 +0100 Subject: [PATCH] fix few last --- controllers/internals/Console.php | 8 ++--- .../internals/{Sended.php => Sent.php} | 29 ++----------------- controllers/internals/SmsStop.php | 23 --------------- controllers/publics/Dashboard.php | 2 +- controllers/publics/Discussion.php | 2 +- controllers/publics/{Sended.php => Sent.php} | 9 +++--- controllers/publics/SmsStop.php | 2 -- templates/dashboard/show.php | 2 +- templates/incs/nav.php | 2 +- templates/sended/list.php | 6 ++-- todo.txt | 7 ++--- 11 files changed, 21 insertions(+), 71 deletions(-) rename controllers/internals/{Sended.php => Sent.php} (83%) rename controllers/publics/{Sended.php => Sent.php} (93%) diff --git a/controllers/internals/Console.php b/controllers/internals/Console.php index 3f9ec09..3079f7e 100755 --- a/controllers/internals/Console.php +++ b/controllers/internals/Console.php @@ -29,7 +29,7 @@ class Console extends \descartes\InternalController $this->model_command = new \models\Command($bdd); $this->model_database = new \models\DataBase($bdd); - $this->model_sended = new \models\Sended($bdd); + $this->model_sended = new \models\Sent($bdd); $this->model_smsstop = new \models\SmsStop($bdd); $this->model_received = new \models\Received($bdd); $this->model_user = new \models\User($bdd); @@ -242,7 +242,7 @@ class Console extends \descartes\InternalController if ('Failed' === trim($text)) { $this->model_sended->update($sended['id'], ['before_delivered' => 0, 'failed' => true]); - echo 'Sended Sms id ' . $sended['id'] . " pass to failed status\n"; + echo 'Sent Sms id ' . $sended['id'] . " pass to failed status\n"; continue; } @@ -251,14 +251,14 @@ class Console extends \descartes\InternalController if ($sended['before_delivered'] > 1) { $this->model_database->update($sended['id'], ['before_delivered' => $sended['before_delivered'] - 1]); - echo 'Sended Sms id ' . $sended['id'] . " before_delivered decrement\n"; + echo 'Sent Sms id ' . $sended['id'] . " before_delivered decrement\n"; continue; } //Si tout est bon, que nous avons assez d'accusés, nous validons ! $this->model_database->update($sended['id'], ['before_delivered' => 0, 'delivered' => true]); - echo 'Sended Sms id ' . $sended['id'] . " to delivered status\n"; + echo 'Sent Sms id ' . $sended['id'] . " to delivered status\n"; continue; } diff --git a/controllers/internals/Sended.php b/controllers/internals/Sent.php similarity index 83% rename from controllers/internals/Sended.php rename to controllers/internals/Sent.php index 69ee791..74b0d0b 100755 --- a/controllers/internals/Sended.php +++ b/controllers/internals/Sent.php @@ -15,13 +15,13 @@ namespace controllers\internals; /** * Classe des sendedes. */ - class Sended extends \descartes\InternalController + class Sent extends \descartes\InternalController { private $model_sended; public function __construct(\PDO $bdd) { - $this->model_sended = new \models\Sended($bdd); + $this->model_sended = new \models\Sent($bdd); } /** @@ -66,7 +66,7 @@ namespace controllers\internals; /** * Cette fonction retourne une liste des receivedes sous forme d'un tableau. * - * @param string $target : Le numéro de à qui est envoyé le message + * @param string $target : Le numéro auquel est envoyé le message * * @return array : La liste des sendeds */ @@ -101,29 +101,6 @@ namespace controllers\internals; return $this->model_sended->create($sended); } - /** - * Cette fonction met à jour une série de sendedes. - * - * @param mixed $sendeds - * - * @return int : le nombre de ligne modifiées - */ - public function update($sendeds) - { - $nb_update = 0; - foreach ($sendeds as $sended) - { - $result = $this->model_sended->update($sended['id'], $sended); - - if ($result) - { - ++$nb_update; - } - } - - return $nb_update; - } - /** * Cette fonction permet de compter le nombre de sendeds. * diff --git a/controllers/internals/SmsStop.php b/controllers/internals/SmsStop.php index 1704061..51993ae 100755 --- a/controllers/internals/SmsStop.php +++ b/controllers/internals/SmsStop.php @@ -98,27 +98,4 @@ namespace controllers\internals; { return $this->model_sms_stop->insert($smsstop); } - - /** - * Cette fonction met à jour une série de smsstopes. - * - * @param mixed $smsstops - * - * @return int : le nombre de ligne modifiées - */ - public function update($smsstops) - { - $nb_update = 0; - foreach ($smsstops as $smsstop) - { - $result = $this->model_sms_stop->update($smsstop['id'], $smsstop); - - if ($result) - { - ++$nb_update; - } - } - - return $nb_update; - } } diff --git a/controllers/publics/Dashboard.php b/controllers/publics/Dashboard.php index de0d849..862e99d 100755 --- a/controllers/publics/Dashboard.php +++ b/controllers/publics/Dashboard.php @@ -35,7 +35,7 @@ namespace controllers\publics; { $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD); - $this->internal_sended = new \controllers\internals\Sended($bdd); + $this->internal_sended = new \controllers\internals\Sent($bdd); $this->internal_received = new \controllers\internals\Received($bdd); $this->internal_contact = new \controllers\internals\Contact($bdd); $this->internal_group = new \controllers\internals\Group($bdd); diff --git a/controllers/publics/Discussion.php b/controllers/publics/Discussion.php index 0d97452..6a15452 100755 --- a/controllers/publics/Discussion.php +++ b/controllers/publics/Discussion.php @@ -32,7 +32,7 @@ namespace controllers\publics; { $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD); - $this->internal_sended = new \controllers\internals\Sended($bdd); + $this->internal_sended = new \controllers\internals\Sent($bdd); $this->internal_scheduled = new \controllers\internals\Scheduled($bdd); $this->internal_received = new \controllers\internals\Received($bdd); $this->internal_contact = new \controllers\internals\Contact($bdd); diff --git a/controllers/publics/Sended.php b/controllers/publics/Sent.php similarity index 93% rename from controllers/publics/Sended.php rename to controllers/publics/Sent.php index 194a941..2f3a2ba 100755 --- a/controllers/publics/Sended.php +++ b/controllers/publics/Sent.php @@ -15,7 +15,7 @@ namespace controllers\publics; /** * Page des sendeds. */ - class Sended extends \descartes\Controller + class Sent extends \descartes\Controller { private $internal_sended; @@ -28,7 +28,7 @@ namespace controllers\publics; public function __construct() { $bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD); - $this->internal_sended = new \controllers\internals\Sended($bdd); + $this->internal_sended = new \controllers\internals\Sent($bdd); \controllers\internals\Tool::verifyconnect(); } @@ -59,8 +59,7 @@ namespace controllers\publics; if (!$this->verify_csrf($csrf)) { \modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Jeton CSRF invalid !'); - - return $this->redirect(\descartes\Router::url('Sended', 'list')); + return $this->redirect(\descartes\Router::url('Sent', 'list')); } $ids = $_GET['ids'] ?? []; @@ -69,6 +68,6 @@ namespace controllers\publics; $this->internal_sended->delete($id); } - return $this->redirect(\descartes\Router::url('Sended', 'list')); + return $this->redirect(\descartes\Router::url('Sent', 'list')); } } diff --git a/controllers/publics/SmsStop.php b/controllers/publics/SmsStop.php index 0beb6f9..859000a 100755 --- a/controllers/publics/SmsStop.php +++ b/controllers/publics/SmsStop.php @@ -59,14 +59,12 @@ namespace controllers\publics; if (!$this->verify_csrf($csrf)) { \modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Jeton CSRF invalid !'); - return $this->redirect(\descartes\Router::url('SmsStop', 'list')); } if (!\controllers\internals\Tool::is_admin()) { \modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Vous devez être administrateur pour pouvoir supprimer un "STOP Sms" !'); - return $this->redirect(\descartes\Router::url('SmsStop', 'list')); } diff --git a/templates/dashboard/show.php b/templates/dashboard/show.php index 1acdcae..a2792a1 100755 --- a/templates/dashboard/show.php +++ b/templates/dashboard/show.php @@ -166,7 +166,7 @@
- Voir tous les SMS envoyés + Voir tous les SMS envoyés
diff --git a/templates/incs/nav.php b/templates/incs/nav.php index af9c4bd..670307e 100755 --- a/templates/incs/nav.php +++ b/templates/incs/nav.php @@ -55,7 +55,7 @@ Logs