Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-22 09:26:27 +02:00
Code Issues Projects Releases Wiki Activity

all basic functionnalities working fine

Browse source
This commit is contained in:
osaajani 2019-11-10 17:32:59 +01:00
parent 1dfebd1df7
commit bb6f755ef2
21 changed files with 53 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
controllers/internals/Console.php
View file

@ -91,10 +91,10 @@ class Console extends \descartes\InternalController
$numbers = [];
//On récupère les numéros pour le Sms et on les ajoute
$target_numbers = $this->internal_scheduled->get_numbers($id_scheduled);
foreach ($target_numbers as $target_number)
$destination_numbers = $this->internal_scheduled->get_numbers($id_scheduled);
foreach ($destination_numbers as $destination_number)
{
$numbers[] = $target_number['number'];
$numbers[] = $destination_number['number'];
}
//On récupère les contacts, et on ajoute les numéros
@ -143,7 +143,7 @@ class Console extends \descartes\InternalController
$now = $now->format('Y-m-d H:i:s');
//On peut maintenant ajouter le Sms
if (!$id_sended = $this->model_sended->insert(['at' => $now, 'target' => $number, 'content' => $scheduled['content'], 'before_delivered' => ceil(mb_strlen($scheduled['content']) / 160)]))
if (!$id_sended = $this->model_sended->insert(['at' => $now, 'destination' => $number, 'content' => $scheduled['content'], 'before_delivered' => ceil(mb_strlen($scheduled['content']) / 160)]))
{
echo 'Impossible d\'inserer le sms pour le numero '.$number."\n";
}
@ -249,7 +249,7 @@ class Console extends \descartes\InternalController
$interval = new \DateInterval('PT12H');
$sinceDate = $now->sub($interval)->format('Y-m-d H:i:s');
if (!$sendeds = $this->model_sended->_select('sendeds', ['target' => $number, 'delivered' => false, 'failed' => false, '>at' => $sinceDate], 'at', false, 1))
if (!$sendeds = $this->model_sended->_select('sendeds', ['destination' => $number, 'delivered' => false, 'failed' => false, '>at' => $sinceDate], 'at', false, 1))
{
continue;
}

6
controllers/internals/Sended.php
View file

@ -66,14 +66,14 @@ namespace controllers\internals;
/**
* Cette fonction retourne une liste des receivedes sous forme d'un tableau.
*
* @param string $target : Le numéro auquel est envoyé le message
* @param string $destination : Le numéro auquel est envoyé le message
*
* @return array : La liste des sendeds
*/
public function get_by_target($target)
public function get_by_destination($destination)
{
//Recupération des sendeds
return $this->model_sended->get_by_target($target);
return $this->model_sended->get_by_destination($destination);
}
/**

19
controllers/publics/Discussion.php
View file

@ -88,7 +88,7 @@ namespace controllers\publics;
$now = new \DateTime();
$now = $now->format('Y-m-d H:i:s');
$sendeds = $this->internal_sended->get_by_target($number);
$sendeds = $this->internal_sended->get_by_destination($number);
$receiveds = $this->internal_received->get_by_origin($number);
$scheduleds = $this->internal_scheduled->get_before_date_for_number($now, $number);
@ -98,7 +98,7 @@ namespace controllers\publics;
{
$messages[] = [
'date' => htmlspecialchars($sended['at']),
'text' => htmlspecialchars($sended['content']),
'text' => htmlspecialchars($sended['text']),
'type' => 'sended',
'status' => ($sended['delivered'] ? 'delivered' : ($sended['failed'] ? 'failed' : '')),
];
@ -108,9 +108,9 @@ namespace controllers\publics;
{
$messages[] = [
'date' => htmlspecialchars($received['at']),
'text' => htmlspecialchars($received['content']),
'text' => htmlspecialchars($received['text']),
'type' => 'received',
'md5' => md5($received['at'].$received['content']),
'md5' => md5($received['at'].$received['text']),
];
}
@ -118,7 +118,7 @@ namespace controllers\publics;
{
$messages[] = [
'date' => htmlspecialchars($scheduled['at']),
'text' => htmlspecialchars($scheduled['content']),
'text' => htmlspecialchars($scheduled['text']),
'type' => 'inprogress',
];
}
@ -141,7 +141,7 @@ namespace controllers\publics;
* Cette fonction permet d'envoyer facilement un sms à un numéro donné.
*
* @param string $csrf : Le jeton csrf
* @param string $_POST['content'] : Le contenu du Sms
* @param string $_POST['text'] : Le contenu du Sms
* @param string $_POST['numbers'] : Un tableau avec le numero des gens auxquel envoyer le sms
*
* @return string : json string Le statut de l'envoi
@ -163,9 +163,8 @@ namespace controllers\publics;
$now = new \DateTime();
$now = $now->format('Y-m-d H:i:s');
$scheduled = [];
$scheduled['at'] = $now;
$scheduled['content'] = $_POST['content'] ?? '';
$at = $now;
$text = $_POST['text'] ?? '';
$numbers = $_POST['numbers'] ?? false;
if (!$numbers)
@ -177,7 +176,7 @@ namespace controllers\publics;
return false;
}
if (!$this->internal_scheduled->create($scheduled, $numbers))
if (!$this->internal_scheduled->create($at, $text, false, false, $numbers))
{
$return['success'] = false;
$return['message'] = 'Impossible de créer le Sms';