Fix all phpstan and php-cs-fixer errors

This commit is contained in:
osaajani 2019-10-30 00:17:10 +01:00
parent 117c18ddca
commit 485a0cb6fd
39 changed files with 994 additions and 1142 deletions

View file

@ -6,20 +6,19 @@ namespace controllers\publics;
*/
class Scheduled extends \descartes\Controller
{
private $internal_scheduled;
/**
* Cette fonction est appelée avant toute les autres :
* Elle vérifie que l'utilisateur est bien connecté
* @return void;
*/
public function _before()
public function __construct()
{
global $bdd;
$this->bdd = $bdd;
$bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
$this->internal_scheduled = new \controllers\internals\Scheduled($bdd);
$this->internalScheduled = new \controllers\internals\Scheduled($this->bdd);
$this->internalEvent = new \controllers\internals\Event($this->bdd);
\controllers\internals\Tool::verify_connect();
\controllers\internals\Tool::verifyconnect();
}
/**
@ -28,7 +27,7 @@ namespace controllers\publics;
public function list($page = 0)
{
$page = (int) $page;
$scheduleds = $this->internalScheduled->get_list(25, $page);
$scheduleds = $this->internal_scheduled->get_list(25, $page);
$this->render('scheduled/list', ['scheduleds' => $scheduleds]);
}
@ -39,17 +38,17 @@ namespace controllers\publics;
*/
public function delete($csrf)
{
if (!$this->verifyCSRF($csrf)) {
if (!$this->verify_csrf($csrf)) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Jeton CSRF invalid !');
return header('Location: ' . \descartes\Router::url('Scheduled', 'list'));
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
$ids = $_GET['ids'] ?? [];
foreach ($ids as $id) {
$this->internalScheduled->delete($id);
$this->internal_scheduled->delete($id);
}
return header('Location: ' . \descartes\Router::url('Scheduled', 'list'));
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
/**
@ -74,28 +73,28 @@ namespace controllers\publics;
{
$ids = $_GET['ids'] ?? [];
$scheduleds = $this->internalScheduled->get_by_ids($ids);
$scheduleds = $this->internal_scheduled->get_by_ids($ids);
//Pour chaque message on ajoute les numéros, les contacts & les groupes
//Pour chaque message on ajoute les numéros, les contacts & les groups
foreach ($scheduleds as $key => $scheduled) {
$scheduleds[$key]['numbers'] = [];
$scheduleds[$key]['contacts'] = [];
$scheduleds[$key]['groupes'] = [];
$scheduleds[$key]['groups'] = [];
$numbers = $this->internalScheduled->get_numbers($scheduled['id']);
$numbers = $this->internal_scheduled->get_numbers($scheduled['id']);
foreach ($numbers as $number) {
$scheduleds[$key]['numbers'][] = $number['number'];
}
$contacts = $this->internalScheduled->get_contacts($scheduled['id']);
$contacts = $this->internal_scheduled->get_contacts($scheduled['id']);
foreach ($contacts as $contact) {
$scheduleds[$key]['contacts'][] = (int) $contact['id'];
}
$groupes = $this->internalScheduled->get_groupes($scheduled['id']);
foreach ($groupes as $groupe) {
$scheduleds[$key]['groupes'][] = (int) $groupe['id'];
$groups = $this->internal_scheduled->get_groups($scheduled['id']);
foreach ($groups as $group) {
$scheduleds[$key]['groups'][] = (int) $group['id'];
}
}
@ -112,29 +111,29 @@ namespace controllers\publics;
* @param string $_POST['date'] : La date d'envoie du scheduled
* @param string $_POST['numbers'] : Les numeros de téléphone du scheduled
* @param string $_POST['contacts'] : Les contacts du scheduled
* @param string $_POST['groupes'] : Les groupes du scheduled
* @param string $_POST['groups'] : Les groups du scheduled
*/
public function create($csrf)
{
if (!$this->verifyCSRF($csrf)) {
if (!$this->verify_csrf($csrf)) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Jeton CSRF invalid !');
return header('Location: ' . \descartes\Router::url('Scheduled', 'add'));
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$date = $_POST['date'] ?? false;
$content = $_POST['content'] ?? false;
$numbers = $_POST['numbers'] ?? [];
$contacts = $_POST['contacts'] ?? [];
$groupes = $_POST['groupes'] ?? [];
$groups = $_POST['groups'] ?? [];
if (!$content) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Vous ne pouvez pas créer un SMS sans message.');
return header('Location: ' . \descartes\Router::url('Scheduled', 'add'));
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Vous ne pouvez pas créer un Sms sans message.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
if (!\controllers\internals\Tool::validate_date($date, 'Y-m-d H:i:s') && !\controllers\internals\Tool::validate_date($date, 'Y-m-d H:i')) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Vous devez fournir une date valide.');
return header('Location: ' . \descartes\Router::url('Scheduled', 'add'));
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
foreach ($numbers as $key => $number) {
@ -148,9 +147,9 @@ namespace controllers\publics;
$numbers[$key] = $number;
}
if (!$numbers && !$contacts && !$groupes) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Vous devez renseigner au moins un destinataire pour le SMS.');
return header('Location: ' . \descartes\Router::url('Scheduled', 'add'));
if (!$numbers && !$contacts && !$groups) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Vous devez renseigner au moins un destinataire pour le Sms.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$scheduled = [
@ -160,26 +159,26 @@ namespace controllers\publics;
'progress' => false,
];
if (!$scheduled_id = $this->internalScheduled->create($scheduled, $numbers, $contacts, $groupes)) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Impossible de créer le SMS.');
return header('Location: ' . \descartes\Router::url('Scheduled', 'add'));
if (!$scheduled_id = $this->internal_scheduled->create($scheduled, $numbers, $contacts, $groups)) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Impossible de créer le Sms.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('success', 'Le SMS a bien été créé pour le ' . $date . '.');
return header('Location: ' . \descartes\Router::url('Scheduled', 'list'));
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('success', 'Le Sms a bien été créé pour le ' . $date . '.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
/**
* Cette fonction met à jour une schedulede
* @param $csrf : Le jeton CSRF
* @param array $_POST['scheduleds'] : Un tableau des scheduledes avec leur nouvelle valeurs + les numbers, contacts et groupes liées
* @param array $_POST['scheduleds'] : Un tableau des scheduledes avec leur nouvelle valeurs + les numbers, contacts et groups liées
* @return boolean;
*/
public function update($csrf)
{
if (!$this->verifyCSRF($csrf)) {
if (!$this->verify_csrf($csrf)) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Jeton CSRF invalid !');
return header('Location: ' . \descartes\Router::url('Scheduled', 'list'));
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
$scheduleds = $_POST['scheduleds'] ?? [];
@ -191,7 +190,7 @@ namespace controllers\publics;
$content = $scheduled['content'] ?? false;
$numbers = $scheduled['numbers'] ?? [];
$contacts = $scheduled['contacts'] ?? [];
$groupes = $scheduled['groupes'] ?? [];
$groups = $scheduled['groups'] ?? [];
if (!$content) {
$all_update_ok = false;
@ -214,7 +213,7 @@ namespace controllers\publics;
$numbers[$key] = $number;
}
if (!$numbers && !$contacts && !$groupes) {
if (!$numbers && !$contacts && !$groups) {
$all_update_ok = false;
continue;
}
@ -229,21 +228,21 @@ namespace controllers\publics;
],
'numbers' => $numbers,
'contacts_ids' => $contacts,
'groupes_ids' => $groupes,
'groups_ids' => $groups,
];
if (!$this->internalScheduled->update([$scheduled])) {
if (!$this->internal_scheduled->update([$scheduled])) {
$all_update_ok = false;
continue;
}
}
if (!$all_update_ok) {
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Certains SMS n\'ont pas pu êtres mis à jour.');
return header('Location: ' . \descartes\Router::url('Scheduled', 'list'));
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('danger', 'Certains Sms n\'ont pas pu êtres mis à jour.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('success', 'Tous les SMS ont été mis à jour.');
return header('Location: ' . \descartes\Router::url('Scheduled', 'list'));
\modules\DescartesSessionMessages\internals\DescartesSessionMessages::push('success', 'Tous les Sms ont été mis à jour.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
}