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

Use correct phone for response to discussion

Browse source
This commit is contained in:
osaajani 2020-01-11 17:27:07 +01:00
parent c4bc7d94c1
commit aee9fc847f
7 changed files with 104 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
controllers/internals/Received.php
View file

@ -213,4 +213,16 @@ namespace controllers\internals;
{
return $this->get_model()->get_since_by_date_for_origin_and_user($id_user, $date, $origin);
}
/**
* Find destination of last received message for an origin and user
* @param int $id_user : User id
* @param string $origin : Origin number
* @return array
*/
public function get_last_for_origin_and_user (int $id_user, string $origin)
{
return $this->get_model()->get_last_for_origin_and_user($id_user, $origin);
}
}

12
controllers/internals/Sended.php
View file

@ -172,4 +172,16 @@ namespace controllers\internals;
return $return;
}
/**
* Find last sended message for a destination and user
* @param int $id_user : User id
* @param string $destination : Destination number
* @return array
*/
public function get_last_for_destination_and_user (int $id_user, string $destination)
{
return $this->get_model()->get_last_for_destination_and_user($id_user, $destination);
}
}

24
controllers/publics/Discussion.php
View file

@ -70,9 +70,15 @@ namespace controllers\publics;
{
$contact = $this->internal_contact->get_by_number_and_user($_SESSION['user']['id'], $number);
$last_sended = $this->internal_sended->get_last_for_destination_and_user($_SESSION['user']['id'], $number);
$last_received = $this->internal_received->get_last_for_origin_and_user($_SESSION['user']['id'], $number);
$response_number = ($last_received['destination'] ?? $last_sended['origin'] ?? false);
$this->render('discussion/show', [
'number' => $number,
'contact' => $contact,
'response_number' => $response_number,
]);
}
@ -148,7 +154,8 @@ namespace controllers\publics;
*
* @param string $csrf : Le jeton csrf
* @param string $_POST['text'] : Le contenu du Sms
* @param string $_POST['numbers'] : Un tableau avec le numero des gens auxquel envoyer le sms
* @param string $_POST['destination'] : Number to send sms to
* @param string $_POST['origin'] : Number to send sms with
*
* @return string : json string Le statut de l'envoi
*/
@ -172,9 +179,10 @@ namespace controllers\publics;
$id_user = $_SESSION['user']['id'];
$at = $now;
$text = $_POST['text'] ?? '';
$numbers = $_POST['numbers'] ?? false;
$destination = $_POST['destination'] ?? false;
$origin = $_POST['origin'] ?? false;
if (!$numbers)
if (!$destination)
{
$return['success'] = false;
$return['message'] = 'Vous devez renseigner un numéro valide';
@ -183,7 +191,15 @@ namespace controllers\publics;
return false;
}
if (!$this->internal_scheduled->create($id_user, $at, $text, null, false, $numbers))
if (!$origin)
{
$origin = null;
}
//Destinations must be an array of number
$destinations = [$destination];
if (!$this->internal_scheduled->create($id_user, $at, $text, $origin, false, $destinations))
{
$return['success'] = false;
$return['message'] = 'Impossible de créer le Sms';