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

Update sended, uniformize received

Browse source
This commit is contained in:
osaajani 2019-11-12 17:58:07 +01:00
parent 23892f5983
commit 65dacb5302
6 changed files with 67 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

21
models/Received.php
View file

@ -30,26 +30,23 @@ namespace models;
/**
* Return a list of sms where destination in array allowed_destinations
* @param array $allowed_destinations : Allowed destinations for sms
* @param int $limit : Nombre de résultat maximum à retourner
* @param int $offset : Nombre de résultat à ingnorer
* @param int $id_user : User id
* @param int $limit : Max results to return
* @param int $offset : Number of results to ignore
*/
public function list_for_destinations($allowed_destinations, $limit, $offset)
public function list_for_user($id_user, $limit, $offset)
{
$limit = (int) $limit;
$offset = (int) $offset;
$query = '
SELECT * FROM received
WHERE destination ';
WHERE destination IN (SELECT number FROM phone WHERE id_user = :id_user)
LIMIT ' . $limit . ' OFFSET ' . $offset;
//On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->_generate_in_from_array($allowed_destinations);
$query .= $generated_in['QUERY'];
$query .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
$params = $generated_in['PARAMS'];
$params = [
'id_user' => $id_user,
];
return $this->_run_query($query, $params);
}

24
models/Sended.php
View file

@ -31,14 +31,26 @@ namespace models;
}
/**
* Retourne une liste de sendedes sous forme d'un tableau.
*
* @param int $limit : Nombre de résultat maximum à retourner
* @param int $offset : Nombre de résultat à ingnorer
* Return a list of sms where destination in array allowed_destinations
* @param int $id_user : User id
* @param int $limit : Max results to return
* @param int $offset : Number of results to ignore
*/
public function list($limit, $offset)
public function list_for_user($id_user, $limit, $offset)
{
return $this->_select('sended', [], null, false, $limit, $offset);
$limit = (int) $limit;
$offset = (int) $offset;
$query = '
SELECT * FROM sended
WHERE origin IN (SELECT number FROM phone WHERE id_user = :id_user)
LIMIT ' . $limit . ' OFFSET ' . $offset;
$params = [
'id_user' => $id_user,
];
return $this->_run_query($query, $params);
}
/**