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

move some fonts to dir with 's' because some external developper is an incompetent motherfucker, update all intl number, because they also are motherfuckers

Browse source
This commit is contained in:
osaajani 2019-11-10 16:53:47 +01:00
parent 3934dba4f9
commit 29cd7edd5d
13 changed files with 72 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

27
controllers/internals/Scheduled.php
View file

@ -98,8 +98,15 @@ namespace controllers\internals;
*
* @return mixed bool|int : false si echec, sinon l'id du nouveau scheduled inséré
*/
public function create($scheduled, $numbers = [], $contacts_ids = [], $groups_ids = [])
public function create($at, $text, $flash = false, $progress = false, $numbers = [], $contacts_ids = [], $groups_ids = [])
{
$scheduled = [
'at' => $at,
'text' => $text,
'flash' => $flash,
'progress' => $progress,
];
if (!$id_scheduled = $this->model_scheduled->insert($scheduled))
{
$date = date('Y-m-d H:i:s');
@ -134,7 +141,7 @@ namespace controllers\internals;
* @param array $contacts_ids : Les ids des contact auquels envoyer le scheduled
* @param array $groups_ids : Les ids des group auxquels envoyer le scheduled
* @param mixed $id
* @param mixed $content
* @param mixed $text
* @param mixed $at
* @param mixed $contact_ids
* @param mixed $flash
@ -142,11 +149,11 @@ namespace controllers\internals;
*
* @return int : le nombre de ligne modifiées
*/
public function update($id, $content, $at, $numbers = [], $contact_ids = [], $groups_ids = [], $flash = false, $progress = false)
public function update($id, $text, $at, $numbers = [], $contact_ids = [], $groups_ids = [], $flash = false, $progress = false)
{
$scheduled = [
'at' => $at,
'content' => $content,
'text' => $text,
'flash' => $flash,
'progress' => $progress,
];
@ -157,19 +164,19 @@ namespace controllers\internals;
$this->model_scheduled->delete_scheduled_contacts($id);
$this->model_scheduled->delete_scheduled_groups($id);
foreach ($scheduled['number'] as $number)
foreach ($numbers as $number)
{
$this->model_scheduled->insert_scheduled_number($scheduled['scheduled']['id'], $number);
$this->model_scheduled->insert_scheduled_number($id, $number);
}
foreach ($scheduled['contact_ids'] as $contact_id)
foreach ($contact_ids as $contact_id)
{
$this->model_scheduled->insert_scheduled_contact($scheduled['scheduled']['id'], $contact_id);
$this->model_scheduled->insert_scheduled_contact($id, $contact_id);
}
foreach ($scheduled['group_ids'] as $group_id)
foreach ($groups_ids as $group_id)
{
$this->model_scheduled->insert_scheduled_group($scheduled['scheduled']['id'], $group_id);
$this->model_scheduled->insert_scheduled_group($id, $group_id);
}
return (bool) $success;

44
controllers/publics/Scheduled.php
View file

@ -142,27 +142,24 @@ namespace controllers\publics;
if (!$this->verify_csrf($csrf))
{
\FlashMessage\FlashMessage::push('danger', 'Jeton CSRF invalid !');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$date = $_POST['date'] ?? false;
$content = $_POST['content'] ?? false;
$at = $_POST['at'] ?? false;
$text = $_POST['text'] ?? false;
$numbers = $_POST['numbers'] ?? [];
$contacts = $_POST['contacts'] ?? [];
$groups = $_POST['groups'] ?? [];
if (!$content)
if (empty($text))
{
\FlashMessage\FlashMessage::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'))
if (!\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i:s') && !\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i'))
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez fournir une date valide.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
@ -173,36 +170,28 @@ namespace controllers\publics;
if (!$number)
{
unset($numbers[$key]);
continue;
}
$numbers[$key] = $number;
}
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 = [
'at' => $date,
'content' => $content,
'flash' => false,
'progress' => false,
];
if (!$scheduled_id = $this->internal_scheduled->create($scheduled, $numbers, $contacts, $groups))
$scheduled_id = $this->internal_scheduled->create($at, $text, false, false, $numbers, $contacts, $groups);
if (!$scheduled_id)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer le Sms.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
\FlashMessage\FlashMessage::push('success', 'Le Sms a bien été créé pour le '.$date.'.');
\FlashMessage\FlashMessage::push('success', 'Le Sms a bien été créé pour le ' . $at . '.');
return $this->redirect(\descartes\Router::url('Scheduled', 'list'));
}
@ -229,23 +218,21 @@ namespace controllers\publics;
foreach ($scheduleds as $id_scheduled => $scheduled)
{
$date = $scheduled['date'] ?? false;
$content = $scheduled['content'] ?? false;
$at = $scheduled['at'] ?? false;
$text = $scheduled['text'] ?? false;
$numbers = $scheduled['numbers'] ?? [];
$contacts = $scheduled['contacts'] ?? [];
$groups = $scheduled['groups'] ?? [];
if (!$content)
if (empty($text))
{
$all_update_ok = false;
continue;
}
if (!\controllers\internals\Tool::validate_date($date, 'Y-m-d H:i:s') && !\controllers\internals\Tool::validate_date($date, 'Y-m-d H:i'))
if (!\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i:s') && !\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i'))
{
$all_update_ok = false;
continue;
}
@ -256,7 +243,6 @@ namespace controllers\publics;
if (!$number)
{
unset($numbers[$key]);
continue;
}
@ -266,15 +252,13 @@ namespace controllers\publics;
if (!$numbers && !$contacts && !$groups)
{
$all_update_ok = false;
continue;
}
$success = $this->internal_scheduled->update($id_scheduled, $content, $date, $numbers, $contacts, $groups);
$success = $this->internal_scheduled->update($id_scheduled, $text, $at, $numbers, $contacts, $groups);
if (!$success)
{
$all_update_ok = false;
continue;
}
}
@ -282,12 +266,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'));
}
}