Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 944 → Rev 945

/trunk/jrest/services/CelSyndicationImage.php
388,13 → 388,13
// Construction de la requête
$requete = 'SELECT * '.
'FROM cel_obs_images a '.
' INNER JOIN cel_inventory b '.
'FROM cel_obs_images AS a '.
' INNER JOIN cel_inventory AS b '.
' ON (a.coi_ce_observation = b.ordre AND a.coi_ce_utilisateur = b.identifiant) '.
' INNER JOIN cel_images c '.
' INNER JOIN cel_images AS c '.
' ON (a.coi_ce_image = c.ci_id_image AND a.coi_ce_utilisateur = c.ci_ce_utilisateur) '.
'WHERE '.(($this->etreFluxAdmin()) ? '' : ' b.transmission = 1 AND ').
' b.identifiant = c.ci_ce_utilisateur '.
'WHERE b.identifiant = c.ci_ce_utilisateur '.
(($this->etreFluxAdmin()) ? '' : ' b.transmission = 1 AND ').
' AND ';
if ($this->estUneRechercheGenerale()) {
520,7 → 520,9
}
$i++;
}
$where = rtrim($where,' AND '); $champs = rtrim($champs,' , '); $table = rtrim($table,' , ');
$where = rtrim($where,' AND ');
$champs = rtrim($champs,' , ');
$table = rtrim($table,' , ');
// Construction de la requête
$prerequete = "SELECT $champs FROM $table WHERE $where ";
604,7 → 606,9
}
$i++;
}
$where = rtrim($where,' AND '); $champs = rtrim($champs,' , '); $table = rtrim($table,' , ');
$where = rtrim($where, ' AND ');
$champs = rtrim($champs, ' , ');
$table = rtrim($table, ' , ');
// Construction de la requête
$prerequete = "SELECT $champs FROM $table WHERE $where ";