| 72,28 → 72,28 |
|---|
| $preferences = $this->conteneur->getBdd()->proteger('%"mail_notification_mes_obs":"0"%'); |
| //TODO: optimiser la requête si beaucoup de mails sont envoyés |
| $requete = "SELECT * FROM del_observation AS do ". |
| "WHERE do.id_observation IN ". |
| "WHERE do.id_observation IN ". |
| "( ". |
| "SELECT dc.ce_observation ". |
| "FROM del_commentaire AS dc ". |
| "WHERE dc.ce_observation != '0' ". |
| "AND dc.id_commentaire NOT IN ". |
| "( ". |
| "SELECT dc.ce_observation ". |
| "FROM del_commentaire AS dc ". |
| "WHERE dc.ce_observation != '0' ". |
| "AND dc.id_commentaire NOT IN ". |
| " SELECT dc.id_commentaire ". |
| " FROM del_commentaire AS dc, del_observation AS dob". |
| " WHERE dc.nom_sel = dob.nom_sel ". |
| " AND dc.ce_utilisateur = dob.ce_utilisateur ". |
| " AND dc.ce_observation = dob.id_observation ". |
| ") ". |
| "AND dc.ce_utilisateur NOT IN ". |
| "( ". |
| " SELECT dc.id_commentaire ". |
| " FROM del_commentaire AS dc, del_observation AS dob". |
| " WHERE dc.nom_sel = dob.nom_sel ". |
| " AND dc.ce_utilisateur = dob.ce_utilisateur ". |
| " AND dc.ce_observation = dob.id_observation ". |
| " SELECT id_utilisateur ". |
| " FROM del_utilisateur_infos ". |
| " WHERE preferences LIKE $preferences ". |
| ") ". |
| "AND dc.ce_utilisateur NOT IN ". |
| "( ". |
| " SELECT id_utilisateur ". |
| " FROM del_utilisateur_infos ". |
| " WHERE preferences LIKE $preferences ". |
| ") ". |
| "AND TO_DAYS(NOW()) - TO_DAYS(dc.date) <= 1 ". |
| ") ". |
| "ORDER BY do.ce_utilisateur, do.id_observation "; |
| "AND TO_DAYS(NOW()) - TO_DAYS(dc.date) <= 1 ". |
| ") ". |
| "ORDER BY do.ce_utilisateur, do.id_observation "; |
| $observations = $this->conteneur->getBdd()->recupererTous($requete); |
| return $observations; |
| } |
| 144,7 → 144,7 |
|---|
| $liste_commentaires_formatee = array(); |
| foreach ($liste_commentaires as $commentaire) { |
| $id_obs = $commentaire['ce_observation']; |
| if(isset($this->correspondance_id_obs_auteurs[$commentaire['ce_observation']])) { |
| if (isset($this->correspondance_id_obs_auteurs[$commentaire['ce_observation']])) { |
| $auteur_obs = $this->correspondance_id_obs_auteurs[$commentaire['ce_observation']]; |
| $commentaire['auteur'] = $this->formaterAuteur($commentaire); |
| $this->observations_concernees[$auteur_obs][$id_obs]['commentaires'][] = $commentaire; |
| 195,7 → 195,8 |
|---|
| ); |
| |
| $ch = curl_init(); |
| $options = array(CURLOPT_URL => $url_requete, |
| $options = array( |
| CURLOPT_URL => $url_requete, |
| CURLOPT_HEADER => false, |
| CURLOPT_POST => 1, |
| CURLOPT_POSTFIELDS => $post, |