Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-30 05:16:28 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/transfer-sms' into develop

Browse source
This commit is contained in:
Romain Guerrero 2016-04-12 00:06:40 +02:00
commit 80011e0ce9
2 changed files with 53 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
controllers/internalConsole.php
View file

@ -403,9 +403,22 @@
{ {
foreach ($receiveds as $received) foreach ($receiveds as $received)
{ {
echo "Transfer d'un SMS du " . $received['send_by'] . " à l'email " . $user['email']; // vérifie en base si le numéro est trouvé parmis les contacts
$contact = $db->getContactFromNumber($received['send_by']);
$contact = $contact ? $contact[0] : null;
// si un contact a été trouvé et que l'option des informations de contact avancé est active
if ($contact && RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS) {
$expediteur = "de ";
$expediteur .= $contact['contacts_infos.first_name'] ? $contact['contacts_infos.first_name']." " : "";
$expediteur .= $contact['contacts_infos.last_name'] ? $contact['contacts_infos.last_name'] : $contact['contacts.name'];
$expediteur .= " (" . $received['send_by'] .")";
} else {
$expediteur = $contact ? sprintf("de %s (%s)", $contact['name'], $received['send_by']) : sprintf("du %s", $received['send_by']);
}
echo "Transfer d'un SMS " . $expediteur . " à l'email " . $user['email'];
$to = $user['email']; $to = $user['email'];
$subject = '[RaspiSMS] - Transfert d\'un SMS du ' . $received['send_by']; $subject = '[RaspiSMS] - Transfert d\'un SMS ' . $expediteur;
$message = "Le numéro " . $received['send_by'] . " vous a envoyé un SMS : \n" . $received['content']; $message = "Le numéro " . $received['send_by'] . " vous a envoyé un SMS : \n" . $received['content'];
$ok = mail($to, $subject, $message); $ok = mail($to, $subject, $message);

38
model/DataBase.php
View file

@ -290,6 +290,44 @@
return $this->runQuery($query, $params); return $this->runQuery($query, $params);
} }
/**
* Récupère le contact avec le numéro fourni
* @param $number : Le numéro
* @return string : Retourne le nom du contact ou null si il n'est pas trouvé
*/
public function getContactFromNumber($number)
{
if (RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS) {
$extended_contact_join = '
LEFT JOIN contacts_infos
ON (contacts_infos.id_contact = contacts.id)
';
$tableToDescribe = "contacts,contacts_infos";
} else {
$extended_contact_join = '';
$tableToDescribe = "contacts";
}
$fields = $this->describeTable($tableToDescribe);
// liste les champs disponibles pour ajouter des alias et éviter des problèmes en cas de colonnes avec le même nom
$fieldNames = array_keys($fields);
foreach ($fieldNames as $key => $fieldName) {
$fieldNames[$key] = $fieldName . " AS '" . $fieldName . "'";
}
$query = "SELECT " . implode(', ', $fieldNames) . "
FROM contacts
".$extended_contact_join."
WHERE contacts.number = (:number)";
$params = array(
'number' => $number,
);
return $this->runQuery($query, $params);
}
/******************************/ /******************************/
/* PARTIE DES REQUETES GROUPS */ /* PARTIE DES REQUETES GROUPS */
/******************************/ /******************************/