| 13,11 → 13,17 |
|---|
| * Utilisateur : |
| * identifiant (= courriel) de l'utilisateur récupéré via une identification HTTP. |
| * |
| * @author Jean-Pascal MILCENT <jpm@clapas.org> |
| * @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
| * @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
| * @version $Id$ |
| * @copyright © 2010, Jean-Pascal MILCENT |
| * @internal Mininum PHP version : 5.2 |
| * @category CEL |
| * @package Services |
| * @subpackage Images |
| * @version 0.1 |
| * @author Mathias CHOUET <mathias@tela-botanica.org> |
| * @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
| * @author Aurelien PERONNET <aurelien@tela-botanica.org> |
| * @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
| * @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
| * @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
| */ |
| class CelImageDoublon extends Cel { |
| |
| 67,7 → 73,6 |
|---|
| * Carte par défaut |
| */ |
| private function getDoublonHtml($parametres) { |
| |
| $widget = null; |
| $utilisateur_mail = Cel::getAuthIdentifiant(); |
| $utilisateur_infos = new User($this->config); |
| 88,13 → 93,13 |
|---|
| */ |
| private function getImagesDoublon($utilisateur) { |
| $doublons = null; |
| |
| if (isset($utilisateur)) { |
| // Un utilisateur en particulier |
| $requete = 'SELECT id_image, ordre, nom_original, md5 '. |
| 'FROM cel_images '. |
| "WHERE ce_utilisateur = '$utilisateur' "; |
| |
| $idUtilisateurP = Cel::db()->proteger($utilisateur); |
| $requete = 'SELECT id_image, ordre, nom_original, md5 '. |
| 'FROM cel_images '. |
| "WHERE ce_utilisateur = $idUtilisateurP ". |
| ' -- '.__FILE__.':'.__LINE__; |
| $images = Cel::db()->requeter($requete); |
| |
| // Traitement |
| 112,26 → 117,27 |
|---|
| if (!isset($doublons[$img['md5']])) { |
| $id_img = $md5[$img['md5']]['img_id']; |
| $doublons[$img['md5']][$id_img] = $md5[$img['md5']]; |
| $images_doublons_id[] = Cel::db()->quote($id_img); |
| $images_doublons_id[] = Cel::db()->proteger($id_img); |
| } |
| |
| $doublons[$img['md5']][$img['id_image']] = array( |
| 'url' => $this->getUrlImage($img['id_image'], 'CXS'), |
| 'obs_ordre' => array(), |
| 'img_ordre' => $img['ordre'], |
| 'img_id' => $img['id_image']); |
| 'url' => $this->getUrlImage($img['id_image'], 'CXS'), |
| 'obs_ordre' => array(), |
| 'img_ordre' => $img['ordre'], |
| 'img_id' => $img['id_image']); |
| $images_doublons_id[] = Cel::db()->quote($img['id_image']); |
| } |
| } |
| |
| if (count($images_doublons_id) > 0) { |
| $requete = 'SELECT cim.id_image, nom_original, md5, co.ordre AS ordre_obs '. |
| 'FROM cel_images AS cim '. |
| ' LEFT JOIN cel_obs AS co '. |
| ' ON (cim.ce_observation = co.id_observation) '. |
| "WHERE cim.ce_utilisateur = '$utilisateur' ". |
| ' AND cim.id_image IN ('.implode(',', $images_doublons_id).')'; |
| |
| $idsImgConcat = implode(',', $images_doublons_id); |
| $requete = 'SELECT cim.id_image, nom_original, md5, co.ordre AS ordre_obs '. |
| 'FROM cel_images AS cim '. |
| ' LEFT JOIN cel_obs AS co '. |
| ' ON (cim.ce_observation = co.id_observation) '. |
| "WHERE cim.ce_utilisateur = $idUtilisateurP ". |
| "AND cim.id_image IN ($idsImgConcat) ". |
| ' -- '.__FILE__.':'.__LINE__; |
| $infos = Cel::db()->requeter($requete); |
| |
| foreach ($infos as $info) { |
| 141,7 → 147,6 |
|---|
| } |
| } |
| } |
| |
| return $doublons; |
| } |
| } |