Subversion Repositories eFlore/Applications.cel

Rev

Rev 1358 | Rev 1869 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1358 Rev 1765
Line 93... Line 93...
93 
			// Un utilisateur en particulier
 93 
			// Un utilisateur en particulier
94 
			$requete = 	'SELECT id_image, ordre, nom_original, md5 '.
 94 
			$requete = 	'SELECT id_image, ordre, nom_original, md5 '.
95 
						'FROM cel_images '.
 95 
						'FROM cel_images '.
96 
						"WHERE ce_utilisateur = '$utilisateur' ";
 96 
						"WHERE ce_utilisateur = '$utilisateur' ";
Line 97... Line 97...
97 
 
 97 
 
Line 98... Line 98...
98 
			$images = $this->executerRequete($requete);
 98 
			$images = Cel::db()->executerRequete($requete);
99 
 
 99 
 
100 
			// Traitement
 100 
			// Traitement
101 
			$doublons = array();
 101 
			$doublons = array();
Line 110... Line 110...
110 
						'img_id' => $img['id_image']);
 110 
						'img_id' => $img['id_image']);
111 
				} else {
 111 
				} else {
112 
					if (!isset($doublons[$img['md5']])) {
 112 
					if (!isset($doublons[$img['md5']])) {
113 
						$id_img = $md5[$img['md5']]['img_id'];
 113 
						$id_img = $md5[$img['md5']]['img_id'];
114 
						$doublons[$img['md5']][$id_img] = $md5[$img['md5']];
 114 
						$doublons[$img['md5']][$id_img] = $md5[$img['md5']];
115 
						$images_doublons_id[] = $this->bdd->quote($id_img);
 115 
						$images_doublons_id[] = Cel::db()->quote($id_img);
116 
					}
 116 
					}
Line 117... Line 117...
117 
 
 117 
 
118 
					$doublons[$img['md5']][$img['id_image']] = array(
 118 
					$doublons[$img['md5']][$img['id_image']] = array(
119 
							'url' => $this->getUrlImage($img['id_image'], 'CXS'),
119 
							'url' => $this->getUrlImage($img['id_image'], 'CXS'),
120 
							'obs_ordre' => array(),
 120 
							'obs_ordre' => array(),
121 
							'img_ordre' => $img['ordre'],
 121 
							'img_ordre' => $img['ordre'],
122 
							'img_id' => $img['id_image']);
 122 
							'img_id' => $img['id_image']);
123 
					$images_doublons_id[] = $this->bdd->quote($img['id_image']);
 123 
					$images_doublons_id[] = Cel::db()->quote($img['id_image']);
124 
				}
 124 
				}
Line 125... Line 125...
125 
			}
 125 
			}
126
126
Line 132... Line 132...
132 
							'	LEFT JOIN cel_obs AS co '.
 132 
							'	LEFT JOIN cel_obs AS co '.
133 
							'		ON (coi.id_observation = co.id_observation) '.
 133 
							'		ON (coi.id_observation = co.id_observation) '.
134 
							"WHERE cim.ce_utilisateur = '$utilisateur' ".
 134 
							"WHERE cim.ce_utilisateur = '$utilisateur' ".
135 
							'	AND cim.id_image IN ('.implode(',', $images_doublons_id).')';
 135 
							'	AND cim.id_image IN ('.implode(',', $images_doublons_id).')';
Line 136... Line 136...
136 
 
 136 
 
Line 137... Line 137...
137 
				$infos = $this->executerRequete($requete);
 137 
				$infos = Cel::db()->executerRequete($requete);
138
138
139 
				foreach ($infos as $info) {
 139 
				foreach ($infos as $info) {
140 
					if (isset($doublons[$info['md5']][$info['id_image']]) && ! $this->etreNull($info['ordre_obs'])) {
 140 
					if (isset($doublons[$info['md5']][$info['id_image']]) && ! $this->etreNull($info['ordre_obs'])) {