Subversion Repositories eFlore/Applications.cel

Rev

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

Rev 3820 Rev 3823
Line 52... Line 52...
52
		$criteres['dir'] = isset($_GET['dir']) ? $_GET['dir'] : self::dir_defaut;
52
		$criteres['dir'] = isset($_GET['dir']) ? $_GET['dir'] : self::dir_defaut;
Line 53... Line 53...
53
 
53
 
54
		$chercheur_images = new RechercheImage($this->config);
54
		$chercheur_images = new RechercheImage($this->config);
55
		$total = $chercheur_images->compterImages(null, $criteres);
55
		$total = $chercheur_images->compterImages(null, $criteres);
56
		$images = $chercheur_images->rechercherImagesJoinObservation(null, $criteres, $this->start, $this->limit);
56
		$images = $chercheur_images->rechercherImagesJoinObservation(null, $criteres, $this->start, $this->limit);
Line 57... Line 57...
57
        $images = $this->mettreEnForme($images);
57
		$images = $this->mettreEnForme($images);
58
		
58
		
59
		$resultat = array('total' => $total,'images' => $images);
59
		$resultat = array('total' => $total,'images' => $images);
Line 60... Line 60...
60
		$images_json = json_encode($resultat);
60
		$images_json = json_encode($resultat);
61
		$images_json = str_replace('\u0000','',$images_json);
61
		$images_json = str_replace('\u0000','',$images_json);
62
 
62
 
63
		header("content-type: application/json");
63
		header("content-type: application/json");
64
		print $images_json;
64
		print $images_json;
65
		exit();
65
		exit();
66
	}
66
	}
67
	public function mettreEnForme($images) {
67
	public function mettreEnForme($images) {
68
	    $retour = array();
68
		$retour = array();
69
	    foreach ($images as $id => $image) {     
69
		foreach ($images as $id => $image) {     
70
	       $retour[$id]['id_photo'] = $image['id_photo'];
70
		   $retour[$id]['id_photo'] = $image['id_photo'];
71
	       unset($image['id_photo']);
71
		   unset($image['id_photo']);
72
	       $retour[$id]['guid'] = $image['guid'];
72
		   $retour[$id]['guid'] = $image['guid'];
73
	       unset($image['guid']);
73
		   unset($image['guid']);
74
	       $retour[$id]['nom_original'] = $image['nom_original'];
74
		   $retour[$id]['nom_original'] = $image['nom_original'];
75
	       unset($image['nom_original']);
75
		   unset($image['nom_original']);
76
	       $retour[$id]['date_photo'] = $image['date_photo'];
76
		   $retour[$id]['date_photo'] = $image['date_photo'];
77
	       unset($image['date_photo']);
77
		   unset($image['date_photo']);
78
	       $retour[$id]['licence'] = $image['licence'];
78
		   $retour[$id]['licence'] = $image['licence'];
79
	       unset($image['licence']);
79
		   unset($image['licence']);
80
	       $retour[$id]['attribution'] = $image['attribution'];
80
		   $retour[$id]['attribution'] = $image['attribution'];
81
	       unset($image['attribution']);
81
		   unset($image['attribution']);
82
	       $retour[$id]['url_photo'] = $image['url_photo'];
82
		   $retour[$id]['url_photo'] = $image['url_photo'];
83
	       unset($image['url_photo']);
83
		   unset($image['url_photo']);
84
	       $retour[$id]['tags_photo'] = $image['tags_photo'];
84
		   $retour[$id]['tags_photo'] = $image['tags_photo'];
85
	       unset($image['tags_photo']);
85
		   unset($image['tags_photo']);
86
	       
86
		   
87
	       $retour[$id]["utilisateur"]['id_utilisateur'] = $image['id_utilisateur'];
87
		   $retour[$id]["utilisateur"]['id_utilisateur'] = $image['id_utilisateur'];
88
	       unset($image['id_utilisateur']);
88
		   unset($image['id_utilisateur']);
89
	       $retour[$id]["utilisateur"]['mail_utilisateur'] = $image['mail_utilisateur'];
89
		   $retour[$id]["utilisateur"]['mail_utilisateur'] = $image['mail_utilisateur'];
90
	       unset($image['mail_utilisateur']);
90
		   unset($image['mail_utilisateur']);
91
	       $retour[$id]["utilisateur"]['nom_utilisateur'] = $image['nom_utilisateur'];
91
		   $retour[$id]["utilisateur"]['nom_utilisateur'] = $image['nom_utilisateur'];
92
	       unset($image['nom_utilisateur']);
92
		   unset($image['nom_utilisateur']);
93
	       
93
		   
94
	       $retour[$id]['obs'] = $image;
94
		   $retour[$id]['obs'] = $image;
95
	    }
95
		}
96
	    return $retour;
96
		return $retour;