Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 1903 → Rev 1904

/branches/v1.5-carbone/services/modules/0.1/syndication/Tags.php
167,28 → 167,31
* Retrouver les derniers votes image
* */
private function getDerniersVotesImage() {
$elements = array();
$idsTags = $this->getIdsDerniersVotesImage();
$idsTagsConcat = implode(', ', $idsTags);
$requete = 'SELECT DISTINCT id_tag, tag, date, '.
' do.id_observation, do.nom_sel, do.zone_geo, do.date_observation, di.id_image, '.
' duo.prenom AS auteur_prenom, duo.nom AS auteur_nom, duo.courriel AS auteur_courriel, '.
' du.prenom AS tagueur_prenom, du.nom AS tagueur_nom, du.courriel AS tagueur_courriel '.
'FROM del_image_tag AS dit '.
' INNER JOIN del_image AS di '.
' ON ce_image = id_image '.
' INNER JOIN del_observation AS do '.
' ON di.ce_observation = do.id_observation '.
' LEFT JOIN del_utilisateur AS duo '.
' ON do.ce_utilisateur = duo.id_utilisateur '.
' LEFT JOIN del_utilisateur AS du '.
' ON if((CHAR_LENGTH(dit.ce_utilisateur) <> 32),CAST(dit.ce_utilisateur AS unsigned),0) '.
' = du.id_utilisateur '.
'WHERE actif = 1 '.
" AND id_tag IN ($idsTagsConcat) ".
'ORDER BY date DESC '.
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite().' '.
' -- '.__FILE__.' : '.__LINE__;
$elements = $this->bdd->recupererTous($requete);
if (!empty($idsTags)) {
$idsTagsConcat = implode(', ', $idsTags);
$requete = 'SELECT DISTINCT id_tag, tag, date, '.
' do.id_observation, do.nom_sel, do.zone_geo, do.date_observation, di.id_image, '.
' duo.prenom AS auteur_prenom, duo.nom AS auteur_nom, duo.courriel AS auteur_courriel, '.
' du.prenom AS tagueur_prenom, du.nom AS tagueur_nom, du.courriel AS tagueur_courriel '.
'FROM del_image_tag AS dit '.
' INNER JOIN del_image AS di '.
' ON ce_image = id_image '.
' INNER JOIN del_observation AS do '.
' ON di.ce_observation = do.id_observation '.
' LEFT JOIN del_utilisateur AS duo '.
' ON do.ce_utilisateur = duo.id_utilisateur '.
' LEFT JOIN del_utilisateur AS du '.
' ON if((CHAR_LENGTH(dit.ce_utilisateur) <> 32),CAST(dit.ce_utilisateur AS unsigned),0) '.
' = du.id_utilisateur '.
'WHERE actif = 1 '.
" AND id_tag IN ($idsTagsConcat) ".
'ORDER BY date DESC '.
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite().' '.
' -- '.__FILE__.' : '.__LINE__;
$elements = $this->bdd->recupererTous($requete);
}
return $elements;
}
 
206,7 → 209,7
$resultats = $this->bdd->recupererTous($requete);
 
$idsTags = array();
if ($resultats != false && is_array($idsTags)) {
if ($resultats != false && is_array($resultats)) {
foreach ($resultats as $infos) {
$idsTags[] = $infos['id_tag'];
}
/branches/v1.5-carbone/services/modules/0.1/syndication/Votes.php
158,29 → 158,32
* Retrouver les derniers votes image
* */
private function getDerniersVotesImage() {
$elements = array();
$idsVotes = $this->getIdsDerniersVotesImage();
$idsVotesConcat = implode(', ', $idsVotes);
$requete = 'SELECT DISTINCT id_vote, ce_image, valeur, divo.date AS date_vote, '.
' duo.prenom AS observateur_prenom, duo.nom AS observateur_nom, '.
' duv.prenom AS votant_prenom, duv.nom AS votant_nom, '.
' do.id_observation, do.nom_sel, do.zone_geo, do.date_observation, dip.intitule '.
'FROM del_image_vote AS divo '.
' INNER JOIN del_image AS di '.
' ON divo.ce_image = di.id_image '.
' INNER JOIN del_observation AS do '.
' ON di.ce_observation = do.id_observation '.
' INNER JOIN del_image_protocole AS dip '.
' ON ce_protocole = id_protocole '.
' LEFT JOIN del_utilisateur AS duo '.
' ON do.ce_utilisateur = duo.id_utilisateur '.
' LEFT JOIN del_utilisateur AS duv '.
' ON if((CHAR_LENGTH(divo.ce_utilisateur) <> 32),CAST(divo.ce_utilisateur AS unsigned),0) '.
' = duv.id_utilisateur '.
"WHERE id_vote IN ($idsVotesConcat) ".
'ORDER BY divo.date DESC '.
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite().
' -- '.__FILE__.' : '.__LINE__;
$elements = $this->bdd->recupererTous($requete);
if (!empty($idsVotes)) {
$idsVotesConcat = implode(', ', $idsVotes);
$requete = 'SELECT DISTINCT id_vote, ce_image, valeur, divo.date AS date_vote, '.
' duo.prenom AS observateur_prenom, duo.nom AS observateur_nom, '.
' duv.prenom AS votant_prenom, duv.nom AS votant_nom, '.
' do.id_observation, do.nom_sel, do.zone_geo, do.date_observation, dip.intitule '.
'FROM del_image_vote AS divo '.
' INNER JOIN del_image AS di '.
' ON divo.ce_image = di.id_image '.
' INNER JOIN del_observation AS do '.
' ON di.ce_observation = do.id_observation '.
' INNER JOIN del_image_protocole AS dip '.
' ON ce_protocole = id_protocole '.
' LEFT JOIN del_utilisateur AS duo '.
' ON do.ce_utilisateur = duo.id_utilisateur '.
' LEFT JOIN del_utilisateur AS duv '.
' ON if((CHAR_LENGTH(divo.ce_utilisateur) <> 32),CAST(divo.ce_utilisateur AS unsigned),0) '.
' = duv.id_utilisateur '.
"WHERE id_vote IN ($idsVotesConcat) ".
'ORDER BY divo.date DESC '.
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite().
' -- '.__FILE__.' : '.__LINE__;
$elements = $this->bdd->recupererTous($requete);
}
return $elements;
}
 
198,7 → 201,7
$resultats = $this->bdd->recupererTous($requete);
 
$idsVotes = array();
if ($resultats != false && is_array($idsVotes)) {
if ($resultats != false && is_array($resultats)) {
foreach ($resultats as $infos) {
$idsVotes[] = $infos['id_vote'];
}
/branches/v1.5-carbone/services/modules/0.1/syndication/Commentaires.php
155,24 → 155,49
}
 
private function getDerniersCommentaires() {
$commentaires = array();
$idsCommentaires = $this->getIdsDerniersCommentaires();
if (!empty($idsCommentaires)) {
$idsCommentairesconcat = implode(', ', $idsCommentaires);
$requete = 'SELECT DISTINCT dc.*, '.
' dob.id_observation AS dob_id_observation, dob.ce_zone_geo AS dob_ce_zone_geo, '.
' dob.zone_geo AS dob_zone_geo, dob.date_observation AS dob_date_observation, dob.nom_sel AS dob_nom_sel, '.
' duo.prenom AS observateur_prenom, duo.nom AS observateur_nom, duo.courriel AS observateur_courriel '.
'FROM del_commentaire AS dc '.
' INNER JOIN del_observation AS dob '.
' ON dob.id_observation = dc.ce_observation '.
' LEFT JOIN del_utilisateur AS duo '.
' ON dob.ce_utilisateur = duo.id_utilisateur '.
"WHERE id_commentaire IN ($idsCommentairesconcat) ".
'ORDER BY dc.date DESC '.
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite().' '.
' -- '.__FILE__.' : '.__LINE__;
$commentaires = $this->bdd->recupererTous($requete);
}
return $commentaires;
}
 
private function getIdsDerniersCommentaires() {
$clauseWhere = $this->chargerClauseWhere();
$requete = 'SELECT DISTINCT dc.*, '.
' dob.id_observation AS dob_id_observation, dob.ce_zone_geo AS dob_ce_zone_geo, '.
' dob.zone_geo AS dob_zone_geo, dob.date_observation AS dob_date_observation, dob.nom_sel AS dob_nom_sel, '.
' duo.prenom AS observateur_prenom, duo.nom AS observateur_nom, duo.courriel AS observateur_courriel '.
$requete = 'SELECT DISTINCT dc.id_commentaire '.
'FROM del_commentaire AS dc '.
' INNER JOIN del_observation AS dob '.
' ON dob.id_observation = dc.ce_observation '.
' LEFT JOIN del_utilisateur AS duo '.
' ON dob.ce_utilisateur = duo.id_utilisateur '.
' INNER JOIN del_observation AS dob ON (dc.ce_observation = dob.id_observation) '.
' LEFT JOIN del_utilisateur AS duo ON (dob.ce_utilisateur = duo.id_utilisateur) '.
'WHERE proposition_initiale != 1 '.
($clauseWhere != '' ? "AND $clauseWhere " : '').
'ORDER BY dc.date DESC '.
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite().' '.
' -- '.__FILE__.' : '.__LINE__;
//echo $requete;
$resultats = $this->bdd->recupererTous($requete);
 
$elements = $this->bdd->recupererTous($requete);
return $elements;
$idsCommentaires = array();
if ($resultats != false && is_array($resultats)) {
foreach ($resultats as $infos) {
$idsCommentaires[] = $infos['id_commentaire'];
}
}
return $idsCommentaires;
}
 
/**
191,7 → 216,7
switch ($cleFiltre) {
case 'espece':
$valeurP = $this->bdd->proteger($valeur.'%');
$where[] = " dob.$champ LIKE $valeurP OR dc.$champ LIKE $valeurP ";
$where[] = " (dob.$champ LIKE $valeurP OR dc.$champ LIKE $valeurP) ";
break;
case 'auteur':
$where[] = $this->creerFiltreAuteur($valeur);
203,7 → 228,7
}
}
}
return (!empty($where)) ? implode('AND', $where) : '';
return (!empty($where)) ? implode(' AND ', $where) : '';
}
 
private function creerFiltreAuteur($auteurId) {
217,9 → 242,9
$whereAuteur = " dc.utilisateur_courriel LIKE $auteurIdMotif ";
} else {
$tableauNomPrenom = explode(' ', $auteurId, 2);
if (count($tableauNomPrenom) != 2) {
$whereAuteur = "(dc.utilisateur_nom LIKE $auteurIdMotif OR dc.utilisateur_prenom LIKE $auteurIdMotif) ";
} else {
if (count($tableauNomPrenom) == 1) {
$whereAuteur = " (dc.utilisateur_nom LIKE $auteurIdMotif OR dc.utilisateur_prenom LIKE $auteurIdMotif) ";
} else if (count($tableauNomPrenom) == 2) {
// on teste potentiellement un nom prenom ou bien un prénom nom
$nomMotif = $this->bdd->proteger($tableauNomPrenom[0].'%');
$prenomMotif = $this->bdd->proteger($tableauNomPrenom[1].'%');
227,7 → 252,7
$whereAuteur = ' ('.
"(dc.utilisateur_nom LIKE $nomMotif AND dc.utilisateur_prenom LIKE $prenomMotif) ".
'OR '.
"(dc.utilisateur_nom LIKE $nomMotif AND dc.utilisateur_prenom LIKE $prenomMotif) ".
"(dc.utilisateur_nom LIKE $prenomMotif AND dc.utilisateur_prenom LIKE $nomMotif) ".
') ';
}
}