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

Fix bug where scheduled message was not removed when only target number has a stop sms or message is empty.

Browse source
This commit is contained in:
osaajani 2021-09-17 22:31:23 +02:00
parent e2bb00cc0c
commit 1dd8756d3b
3 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
controllers/internals/Scheduled.php
View file

@ -274,11 +274,11 @@ namespace controllers\internals;
/**
* Get all messages to send and the number to use to send theme.
*
* @return array : [['id_scheduled', 'text', 'id_phone', 'destination', 'flash', 'mms', 'medias'], ...]
* @return array : List of smss to send at this time per scheduled id ['1' => [['id_scheduled', 'text', 'id_phone', 'destination', 'flash', 'mms', 'medias'], ...], ...]
*/
public function get_smss_to_send()
{
$smss_to_send = [];
$smss_to_send_per_scheduled = [];
$internal_templating = new \controllers\internals\Templating();
$internal_setting = new \controllers\internals\Setting($this->bdd);
@ -297,6 +297,8 @@ namespace controllers\internals;
$scheduleds = $this->get_model()->gets_before_date($now);
foreach ($scheduleds as $scheduled)
{
$smss_to_send_per_scheduled[$scheduled['id']] = [];
if (!isset($users_settings[$scheduled['id_user']]))
{
$users_settings[$scheduled['id_user']] = [];
@ -487,11 +489,11 @@ namespace controllers\internals;
continue;
}
$smss_to_send[] = $message;
$smss_to_send_per_scheduled[$scheduled['id']][] = $message;
}
}
return $smss_to_send;
return $smss_to_send_per_scheduled;
}
/**