Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-20 16:37:48 +02:00
Code Issues Projects Releases Wiki Activity

Update received & scheduled

Browse source
This commit is contained in:
osaajani 2019-11-12 17:37:20 +01:00
parent f609fc175f
commit 23892f5983
20 changed files with 338 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

18
controllers/publics/Dashboard.php
View file

@ -52,13 +52,15 @@ namespace controllers\publics;
*/
public function show()
{
$id_user = $_SESSION['user']['id'];
//Recupération des nombres des 4 panneaux d'accueil
$nb_contacts = $this->internal_contact->count();
$nb_groups = $this->internal_group->count();
$nb_scheduleds = $this->internal_scheduled->count();
$nb_commands = $this->internal_command->count();
$nb_sendeds = $this->internal_sended->count();
$nb_receiveds = $this->internal_received->count();
$nb_contacts = $this->internal_contact->count($id_user);
$nb_groups = $this->internal_group->count($id_user);
$nb_scheduleds = $this->internal_scheduled->count($id_user);
$nb_commands = $this->internal_command->count($id_user);
$nb_sendeds = $this->internal_sended->count($id_user);
$nb_receiveds = $this->internal_received->count($id_user);
//Création de la date d'il y a une semaine
$now = new \DateTime();
@ -68,12 +70,12 @@ namespace controllers\publics;
//Récupération des 10 derniers Sms envoyés, Sms reçus et evenements enregistrés. Par date.
$sendeds = $this->internal_sended->get_lasts_by_date(10);
$receiveds = $this->internal_received->get_lasts_by_date(10);
$receiveds = $this->internal_received->get_lasts_for_user_by_date($id_user, 10);
$events = $this->internal_event->get_lasts_by_date(10);
//Récupération du nombre de Sms envoyés et reçus depuis les 7 derniers jours
$nb_sendeds_by_day = $this->internal_sended->count_by_day_since($formated_date);
$nb_receiveds_by_day = $this->internal_received->count_by_day_since($formated_date);
$nb_receiveds_by_day = $this->internal_received->count_for_user_by_day_since($id_user, $formated_date);
//On va traduire ces données pour les afficher en graphique
$array_area_chart = [];

3
controllers/publics/Discussion.php
View file

@ -162,6 +162,7 @@ namespace controllers\publics;
$now = new \DateTime();
$now = $now->format('Y-m-d H:i:s');
$id_user = $_SESSION['user']['id'];
$at = $now;
$text = $_POST['text'] ?? '';
$numbers = $_POST['numbers'] ?? false;
@ -175,7 +176,7 @@ namespace controllers\publics;
return false;
}
if (!$this->internal_scheduled->create($at, $text, false, false, $numbers))
if (!$this->internal_scheduled->create($id_user, $at, $text, false, false, $numbers))
{
$return['success'] = false;
$return['message'] = 'Impossible de créer le Sms';

76
controllers/publics/Received.php
View file

@ -18,6 +18,7 @@ namespace controllers\publics;
{
private $internal_received;
private $internal_contact;
private $internal_phone;
/**
* Cette fonction est appelée avant toute les autres :
@ -30,6 +31,7 @@ namespace controllers\publics;
$bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
$this->internal_received = new \controllers\internals\Received($bdd);
$this->internal_contact = new \controllers\internals\Contact($bdd);
$this->internal_phone = new \controllers\internals\Phone($bdd);
\controllers\internals\Tool::verifyconnect();
}
@ -43,7 +45,7 @@ namespace controllers\publics;
{
$page = (int) $page;
$limit = 25;
$receiveds = $this->internal_received->list($limit, $page);
$receiveds = $this->internal_received->list($_SESSION['user']['id'], $limit, $page);
foreach ($receiveds as $key => $received)
{
@ -58,6 +60,43 @@ namespace controllers\publics;
$this->render('received/list', ['receiveds' => $receiveds, 'page' => $page, 'limit' => $limit, 'nb_results' => \count($receiveds)]);
}
/**
* Delete Receiveds
* @param array int $_GET['ids'] : Ids of receiveds to delete
* @param mixed $csrf
*
* @return boolean;
*/
public function delete($csrf)
{
if (!$this->verify_csrf($csrf))
{
\FlashMessage\FlashMessage::push('danger', 'Jeton CSRF invalid !');
return $this->redirect(\descartes\Router::url('Received', 'list'));
}
$ids = $_GET['ids'] ?? [];
foreach ($ids as $id)
{
$received = $this->internal_received->get($id);
if (!$received)
{
continue;
}
$is_owner = (bool) $this->internal_phone->get_by_number_and_user($received['destination'], $_SESSION['user']['id']);
if (!$is_owner)
{
continue;
}
$this->internal_received->delete($id);
}
return $this->redirect(\descartes\Router::url('Received', 'list'));
}
/**
* Cette fonction retourne tous les Sms reçus aujourd'hui pour la popup.
*
@ -66,7 +105,7 @@ namespace controllers\publics;
public function popup()
{
$now = new \DateTime();
$receiveds = $this->internal_received->get_since_by_date($now->format('Y-m-d'));
$receiveds = $this->internal_received->get_since_by_date_for_user($now->format('Y-m-d'), $_SESSION['user']['id']);
foreach ($receiveds as $key => $received)
{
@ -93,37 +132,4 @@ namespace controllers\publics;
return true;
}
/**
* Cette fonction va supprimer une liste de receiveds.
*
* @param array int $_GET['ids'] : Les id des receivedes à supprimer
* @param mixed $csrf
*
* @return boolean;
*/
public function delete($csrf)
{
if (!$this->verify_csrf($csrf))
{
\FlashMessage\FlashMessage::push('danger', 'Jeton CSRF invalid !');
return $this->redirect(\descartes\Router::url('Received', 'list'));
}
if (!\controllers\internals\Tool::is_admin())
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez être administrateur pour effectuer cette action.');
return $this->redirect(\descartes\Router::url('Received', 'list'));
}
$ids = $_GET['ids'] ?? [];
foreach ($ids as $id)
{
$this->internal_received->delete($id);
}
return $this->redirect(\descartes\Router::url('Received', 'list'));
}
}

64
controllers/publics/Scheduled.php
View file

@ -17,6 +17,7 @@ namespace controllers\publics;
class Scheduled extends \descartes\Controller
{
private $internal_scheduled;
private $internal_phone;
/**
* Cette fonction est appelée avant toute les autres :
@ -28,6 +29,7 @@ namespace controllers\publics;
{
$bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
$this->internal_scheduled = new \controllers\internals\Scheduled($bdd);
$this->internal_phone = new \controllers\internals\Phone($bdd);
\controllers\internals\Tool::verifyconnect();
}
@ -40,7 +42,7 @@ namespace controllers\publics;
public function list($page = 0)
{
$page = (int) $page;
$scheduleds = $this->internal_scheduled->list(25, $page);
$scheduleds = $this->internal_scheduled->list($_SESSION['user']['id'], 25, $page);
$this->render('scheduled/list', ['scheduleds' => $scheduleds]);
}
@ -64,6 +66,12 @@ namespace controllers\publics;
$ids = $_GET['ids'] ?? [];
foreach ($ids as $id)
{
$scheduled = $this->internal_scheduled->get($id);
if (!$scheduled || $scheduled['id_user'] !== $_SESSION['user']['id'])
{
continue;
}
$this->internal_scheduled->delete($id);
}
@ -79,8 +87,11 @@ namespace controllers\publics;
$less_one_minute = new \DateInterval('PT1M');
$now->sub($less_one_minute);
$phones = $this->internal_phone->gets_for_user($_SESSION['user']['id']);
$this->render('scheduled/add', [
'now' => $now->format('Y-m-d H:i'),
'phones' => $phones,
]);
}
@ -93,11 +104,23 @@ namespace controllers\publics;
{
$ids = $_GET['ids'] ?? [];
if (!$ids)
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez choisir des messages à mettre à jour !');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
$phones = $this->internal_phone->gets_for_user($_SESSION['user']['id']);
$scheduleds = $this->internal_scheduled->gets($ids);
//Pour chaque message on ajoute les numéros, les contacts & les groups
foreach ($scheduleds as $key => $scheduled)
{
if (!$scheduled || $scheduled['id_user'] !== $_SESSION['user']['id'])
{
continue;
}
$scheduleds[$key]['numbers'] = [];
$scheduleds[$key]['contacts'] = [];
$scheduleds[$key]['groups'] = [];
@ -123,6 +146,7 @@ namespace controllers\publics;
$this->render('scheduled/edit', [
'scheduleds' => $scheduleds,
'phones' => $phones,
]);
}
@ -145,8 +169,11 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$id_user = $_SESSION['user']['id'];
$at = $_POST['at'] ?? false;
$text = $_POST['text'] ?? false;
$flash = $_POST['flash'] ?? false;
$origin = empty($_POST['origin']) ? null : $_POST['origin'];
$numbers = $_POST['numbers'] ?? [];
$contacts = $_POST['contacts'] ?? [];
$groups = $_POST['groups'] ?? [];
@ -182,15 +209,21 @@ namespace controllers\publics;
if (!$numbers && !$contacts && !$groups)
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez renseigner au moins un destinataire pour le Sms.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$scheduled_id = $this->internal_scheduled->create($at, $text, false, false, $numbers, $contacts, $groups);
if ($origin && !$this->internal_phone->get_by_number_and_user($origin, $_SESSION['user']['id']))
{
\FlashMessage\FlashMessage::push('danger', 'Ce numéro n\'existe pas ou vous n\'en êtes pas propriétaire.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$scheduled_id = $this->internal_scheduled->create($id_user, $at, $text, $origin, $flash, $numbers, $contacts, $groups);
if (!$scheduled_id)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer le Sms.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
@ -222,12 +255,23 @@ namespace controllers\publics;
foreach ($scheduleds as $id_scheduled => $scheduled)
{
$id_user = $_SESSION['user']['id'];
$at = $scheduled['at'] ?? false;
$text = $scheduled['text'] ?? false;
$origin = empty($scheduled['origin']) ? null : $scheduled['origin'];
$flash = $scheduled['flash'] ?? false;
$numbers = $scheduled['numbers'] ?? [];
$contacts = $scheduled['contacts'] ?? [];
$groups = $scheduled['groups'] ?? [];
$scheduled = $this->internal_scheduled->get($id_scheduled);
if (!$scheduled || $scheduled['id_user'] !== $id_user)
{
$all_update_ok = false;
continue;
}
if (empty($text))
{
$all_update_ok = false;
@ -245,7 +289,6 @@ namespace controllers\publics;
foreach ($numbers as $key => $number)
{
$number = \controllers\internals\Tool::parse_phone($number);
if (!$number)
{
unset($numbers[$key]);
@ -262,8 +305,15 @@ namespace controllers\publics;
continue;
}
if ($origin && !$this->internal_phone->get_by_number_and_user($origin, $_SESSION['user']['id']))
{
\FlashMessage\FlashMessage::push('danger', 'Ce numéro n\'existe pas ou vous n\'en êtes pas propriétaire.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$success = $this->internal_scheduled->update($id_scheduled, $text, $at, $numbers, $contacts, $groups);
$success = $this->internal_scheduled->update($id_scheduled, $id_user, $at, $text, $origin, $flash, $numbers, $contacts, $groups);
if (!$success)
{
$all_update_ok = false;
@ -275,12 +325,10 @@ namespace controllers\publics;
if (!$all_update_ok)
{
\FlashMessage\FlashMessage::push('danger', 'Certains SMS n\'ont pas pu êtres mis à jour.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
\FlashMessage\FlashMessage::push('success', 'Tous les SMS ont été mis à jour.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
}

3
controllers/publics/Setting.php
View file

@ -68,6 +68,9 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}
$settings = $this->internal_setting->gets_for_user($_SESSION['user']['id']);
$_SESSION['user']['settings'] = $settings;
\FlashMessage\FlashMessage::push('success', 'Le réglage a bien été mis à jour.');
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}