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

Revert "update queries for extended contacts"

Browse source 
This reverts commit b380a326b8.
This commit is contained in:
Romain Guerrero 2016-01-26 23:58:11 +01:00
parent b380a326b8
commit 1ff5822ac1
1 changed files with 866 additions and 903 deletions
Download patch file Download diff file Expand all files Collapse all files

47
model/DataBase.php
View file

@ -243,24 +243,13 @@
/** /**
* Récupère les contacts dont l'id fait partie de la liste fournie * Récupère les contacts dont l'id fait partie de la liste fournie
* @param array $contacts_ids = Tableau des id des contacts voulus * @param array $contacts_ids = Tableau des id des contacts voulus
* @param boolean $extended_contact : Mode de gestion des contacts avancés activé
* @return array : Retourne un tableau avec les contacts adaptés * @return array : Retourne un tableau avec les contacts adaptés
*/ */
public function getContactsIn($contacts_ids, $extended_contact = false) public function getContactsIn($contacts_ids)
{ {
if ($extended_contact) {
$extended_contact_join = '
LEFT JOIN contacts_infos as inf
ON (inf.id_contact = contacts.id)
';
} else {
$extended_contact_join = '';
}
$query = " $query = "
SELECT * SELECT *
FROM contacts FROM contacts
".$extended_contact_join."
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
@ -340,28 +329,15 @@
/** /**
* Retourne tous les contacts pour un groupe donnée * Retourne tous les contacts pour un groupe donnée
* @param int $id_group : L'id du groupe * @param int $id_group : L'id du groupe
* @param boolean $extended_contact : Mode de gestion des contacts avancés activé
* @return array : Tous les contacts compris dans le groupe * @return array : Tous les contacts compris dans le groupe
*/ */
public function getContactsForGroup($id_group, $extended_contact = false) public function getContactsForGroup($id_group)
{ {
if ($extended_contact) {
$contact_fields = 'inf.civility as civility, inf.first_name as first_name, inf.last_name as last_name, inf.birthday as birthday, inf.love_situation as love_situation';
$extended_contact_join = '
LEFT JOIN contacts_infos as inf
ON (inf.id_contact = con.id)
';
} else {
$contact_fields = 'con.name as name';
$extended_contact_join = '';
}
$query = ' $query = '
SELECT con.id as id, ' . $contact_fields . ', con.number as number SELECT con.id as id, con.name as name, con.number as number
FROM groups_contacts as g_c FROM groups_contacts as g_c
JOIN contacts as con JOIN contacts as con
ON (g_c.id_contact = con.id) ON (g_c.id_contact = con.id)
'.$extended_contact_join.'
WHERE(g_c.id_group = :id_group) WHERE(g_c.id_group = :id_group)
'; ';
@ -609,28 +585,15 @@
/** /**
* Retourne tous les contacts pour un sms programmé donnée * Retourne tous les contacts pour un sms programmé donnée
* @param int $id_sms : L'id du sms * @param int $id_sms : L'id du sms
* @param boolean $extended_contact : Mode de gestion des contacts avancés activé
* @return array : Tous les contacts compris dans le schedulede * @return array : Tous les contacts compris dans le schedulede
*/ */
public function getContactsForScheduled($id_scheduled, $extended_contact = false) public function getContactsForScheduled($id_scheduled)
{ {
$contact_fields = '';
$extended_contact_join = '';
if ($extended_contact) {
$contact_fields = ' inf.civility as civility, inf.first_name as first_name, inf.last_name as last_name, inf.birthday as birthday, inf.love_situation as love_situation';
$extended_contact_join = '
LEFT JOIN contacts_infos as inf
ON (inf.id_contact = con.id)
';
}
$query = ' $query = '
SELECT con.id as id, con.name as name, con.number as number'.$contact_fields.' SELECT con.id as id, con.name as name, con.number as number
FROM scheduleds_contacts as s_c FROM scheduleds_contacts as s_c
JOIN contacts as con JOIN contacts as con
ON (s_c.id_contact = con.id) ON (s_c.id_contact = con.id)
'.$extended_contact_join.'
WHERE(s_c.id_scheduled = :id_scheduled) WHERE(s_c.id_scheduled = :id_scheduled)
'; ';