From 72ef665afe2802469c113d3a8e8657f506be17fa Mon Sep 17 00:00:00 2001 From: Bruno21 Date: Mon, 29 Jan 2018 10:27:36 +0100 Subject: [PATCH] Maj --- functions.php | 346 +++++++++++++++++++++++++++++++++++--------------- header.php | 1 + single.php | 108 ++++++++++++---- tpl-carte.php | 105 ++++++++------- 4 files changed, 383 insertions(+), 177 deletions(-) diff --git a/functions.php b/functions.php index 26c6584..e4627ed 100644 --- a/functions.php +++ b/functions.php @@ -1,12 +1,12 @@ $serial ) ); update_option( 'wr2x_pro_status', _( "Your subscription is manually enabled." ) ); update_option( 'wr2x_pro_serial', _( $serial ) ); set_transient( 'wr2x_validated', $serial, 3600 * 24 * 100 ); - +*/ function google_jquery() { if (!is_admin()) { @@ -592,11 +592,18 @@ function flickr_handler($atts, $content=null) { $links .= (($display_exif == true) ? "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] : '') . "
" : ''); if (($meta['longitude'] != "") && ($meta['latitude'] != "")) { - if ($meta['caption'] != "") $fichier = $meta['caption']; - else if ($meta['title'] != "") $fichier = $meta['title']; - //else $fichier = end(explode("/", $court)); - array_push($coord, array($meta['latitude'], $meta['longitude'], $fichier, $pid, $meta['desc'], $meta['wiki'])); + if ($meta['title'] != "") { + $caption = $meta['title']; + $requete_wiki = trim(clean_photo_name($caption)); + } + + $caption = $meta['title']; + $requete_wiki = trim(clean_photo_name($caption)); + + var_dump($caption, $requete_wiki, $meta['desc']); + + array_push($coord, array($meta['latitude'], $meta['longitude'], $caption, $pid, $meta['desc'], $meta['wiki'], $requete_wiki)); } return $links; @@ -738,7 +745,7 @@ function zenphoto_handler($atts, $content=null) { $zenphoto_img .= $zenphoto_link; $zenphoto_img .= '' . $img . ''; + $zenphoto_img .= ' srcset="' . $zenphoto_url . 'cache/' . $album . '/' . $img . ' _' . $size . '_watermark.jpg, ' . $zenphoto_url . 'albums/' . $album . '/'. $image . ' 2x" alt="' . $img . '" />'; $zenphoto_img .= ''; $zenphoto_img .= (($caption != "") ? '

' . $caption . '

' : ''); @@ -798,8 +805,16 @@ function zp_query_exif($zpimage) { if ($result = $mysqli->query($excquery)) { $exif = $result->fetch_row(); $result->close(); + } - + //mysqli_free_result($result); + + $mysqli->close(); + unset($mysqli); + + + //var_dump($exif); + /* Array ( @@ -863,10 +878,10 @@ Array } */ if ( ! empty( $exif[12] ) ) { - $v = unserialize($exif[12]); + $a = utf8_encode($exif[12]); + $v = unserialize($a); $caption = reset($v); - $meta['caption'] = utf8_encode($caption); - //var_dump($meta['caption']); + $meta['caption'] = $caption; } if ( ! empty( $exif[1] ) ) { @@ -886,7 +901,7 @@ Array } //title (ZP title (Titre) if ( ! empty( $exif[13] ) ) { - $z = $exif[13]; // str + $z = utf8_encode($exif[13]); //str $w = unserialize($z); // arr if ($w != false) $titre = reset($w); @@ -904,7 +919,7 @@ Array $meta['title'] = utf8_encode($titre); } if ( ! empty( $exif[16] ) ) { - $meta['orientation'] = $exif[16]; + $meta['orientation'] = utf8_encode($exif[16]); } if ( ! empty( $exif[6] ) ) { $lat = floatval(str_replace(",", ".", $exif[6])); @@ -929,6 +944,12 @@ Array //imageid $img = $exif[19]; + $mysqli = new mysqli($dbhost, $dbuser, $dbpassword, $dbtable); + if (mysqli_connect_errno()) { + printf("Échec de la connexion : %s\n", mysqli_connect_error()); + exit(); + } + $result2 = $mysqli->query("SELECT `tagid` FROM `" . $zp_prefix . "obj_to_tag` WHERE `type`='images' AND `objectid`='$img'"); if ($result2) { while ($row = $result2->fetch_row()) { @@ -937,6 +958,9 @@ Array if ($dbtag) $tags[] = utf8_encode(ucfirst($dbtag[0])); } } + $mysqli->close(); + unset($mysqli); + $meta['keywords'] = $tags; } @@ -973,12 +997,16 @@ function add_class_lightbox($content) { $post = get_post($val[5]); //var_dump($post); $slimbox_caption = esc_attr( $post->post_content ); + //post_title //Replace the instance with the lightbox and title(caption) references. Won't fail if caption is empty. $string = ''; $replace = ''; $content = str_replace( $string, $replace, $content); + //echo "val3
"; + //var_dump($val[3]); + // Recherche des données pour wikipédia //$attach = $matches[$i][5]; //$photo = wp_get_attachment_metadata( $attach ); @@ -997,27 +1025,31 @@ function add_class_lightbox($content) { $attach = $attribut['id']; $caption = ""; $capt = $attribut['caption']; - echo "capt: $capt
"; $title = $attribut['title']; - echo "title: $title
"; $alt = $attribut['alt']; $image = $attribut['url']; $description = $attribut['description']; - echo "description: $description
"; $thumbnail = $attribut['sizes']['thumbnail']; $thumbnailWiki = '' . $attribut['alt'] . ''; // ?????? //$gallery[] = $attach; - if ($capt != "") $caption = $capt; - elseif ($title != "") $caption = $title; + if ($capt != "") { + $caption = $capt; + $requete_wiki = trim(supp_entre_parenth($capt)); + } + elseif ($title != "") { + $caption = $title; + $requete_wiki = trim(clean_photo_name($title)); + } - var_dump($caption, $description); + + //var_dump($caption, $requete_wiki, $description, $thumbnailWiki); // On crée le tableau $coord qui regroupe toutes les données pour le waypoint (lat,long, titre, n° attachment, description, vignette) - array_push($coord, array(number_format($lat, 6), number_format($long, 6), $caption, $attach, $description, $thumbnailWiki)); + array_push($coord, array(number_format($lat, 6), number_format($long, 6), $caption, $attach, $description, $thumbnailWiki, $requete_wiki)); } //if @@ -1177,7 +1209,7 @@ function addexif ($content) { $pattern = '/
]*>(.*?)\<\/div>/'; //ok preg_match_all($pattern, $content, $matches, PREG_SET_ORDER); - + // Pour tous les DIV (attachment) on cherche les for ($i = 0; $i <= (count($matches) - 1); $i++) { @@ -1192,35 +1224,6 @@ function addexif ($content) { if (substr_count($court, "wordpress") > 0) { $meta = creator_get_exif( $court ); - //var_dump($meta); - /* - //var_dump($matches2); - - $attach = $matches[$i][2]; - $pid = $attach; - - //$attribut = wp_prepare_attachment_for_js( $image->ID ); - $attribut = wp_prepare_attachment_for_js( $attach ); - //var_dump($attribut); - - //$attach = $attribut['id']; - $caption = ""; - //$capt = $attribut['caption']; - //$title = $attribut['title']; - $alt = $attribut['alt']; - //$image = $attribut['url']; - $description = $attribut['description']; - $thumbnail = $attribut['sizes']['thumbnail']; - //$thumbnail = '' . $attribut['alt'] . ''; - $img_thumb_ZP_wiki = '' . $attribut['alt'] . ''; - - if ($capt != "") $caption = $capt; - elseif ($title != "") $caption = $title; - - // On crée le tableau $coord qui regroupe toutes les données pour le waypoint (lat,long, titre, n° attachment, description, vignette) - - //array_push($coord, array(number_format($lat, 6), number_format($long, 6), $caption, $attach, $description, $thumbnail)); - */ } elseif (substr_count($court, "zenphoto") > 0) { @@ -1233,18 +1236,52 @@ function addexif ($content) { } $exif_array = img_wp_exif( $meta ); - $exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] : '') . "
"; + //var_dump($exif_array); + + if (($meta['longitude'] != "") && ($meta['latitude'] != "")) { + + if ($meta['caption'] != "") { + $caption = $meta['caption']; + //$requete_wiki = $fichier; + $requete_wiki = trim(supp_entre_parenth($caption)); + } + elseif ($meta['title'] != "") { + $caption = $meta['title']; + //$requete_wiki = $fichier; + $requete_wiki = trim(clean_photo_name($caption)); + } + else { + $caption = end(explode("/", $court)); + $requete_wiki = trim(clean_photo_name($caption)); + } + + //var_dump($requete_wiki); + + //if ($zenphoto_coord == true) { + + $pid = ""; + $description = ""; + //var_dump($caption, $requete_wiki, $description, $img_thumb_ZP_wiki); + + + array_push($coord, array($meta['latitude'], $meta['longitude'], $caption, $pid, $description, $img_thumb_ZP_wiki, $requete_wiki)); + //$compt = count($coord) - 1; + //$cible = compt_mark($compt); + //} + + $zenphoto_coord = false; + + } + + //echo "cible:
"; + //var_dump($cible); + + $exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] . " " . $exif_array[3] : '') . "
"; + //$exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] : '') . "
"; $content = str_replace($matches[$i][0], $matches[$i][0] . $exifs, $content); $matches2 = array(); - if (($meta['longitude'] != "") && ($meta['latitude'] != "")) { - if ($meta['caption'] != "") $fichier = $meta['caption']; - else if ($meta['title'] != "") $fichier = $meta['title']; - else $fichier = end(explode("/", $court)); - - if ($zenphoto_coord == true) { - array_push($coord, array($meta['latitude'], $meta['longitude'], $fichier, $pid, $meta['caption'], $img_thumb_ZP_wiki)); - } - } + //$cible = ""; + } // for } // ($display_exif == true) @@ -1269,15 +1306,23 @@ function addexif ($content) { if (in_multiarray($court, $matches3) == false) { $meta = creator_get_exif( $court ); $exif_array = img_wp_exif( $meta ); - $exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] : '') . "
"; - $content = str_replace($matches4[$i][0], $matches4[$i][0] . $exifs, $content); if (($meta['longitude'] != "") && ($meta['latitude'] != "")) { if ($meta['caption'] != "") $fichier = $meta['caption']; - else if ($meta['title'] != "") $fichier = $meta['title']; + elseif ($meta['title'] != "") $fichier = $meta['title']; else $fichier = end(explode("/", $court)); //array_push($coord, array($meta['latitude'], $meta['longitude'], $fichier)); + //$compt = count($coord) - 1; + //$cible = compt_mark($compt); } + //var_dump($cible); + + $exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] . " " . $exif_array[3] : '') . "
"; + //$exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] : '') . "
"; + $content = str_replace($matches4[$i][0], $matches4[$i][0] . $exifs, $content); + + //$cible = ""; + } // if in_multiarray } //if wordpress @@ -1296,26 +1341,45 @@ function addexif ($content) { $zp_image = end($img); $zp_album = prev($img); - var_dump($zp_image, $zp_album); $img_thumb_ZP_wiki = thumb_ZP_wiki($zp_image, $zp_album); - var_dump($img_thumb_ZP_wiki); $meta = zp_query_exif( $zp_image ); $exif_array = img_wp_exif( $meta ); - $exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] : '') . "
"; + + if (($meta['longitude'] != "") && ($meta['latitude'] != "")) { + + if ($meta['caption'] != "") { + $caption = $meta['caption']; + //$requete_wiki = $fichier; + $requete_wiki = trim(supp_entre_parenth($caption)); + } + elseif ($meta['title'] != "") { + $caption = $meta['title']; + //$requete_wiki = $fichier; + $requete_wiki = trim(clean_photo_name($caption)); + } + else { + $caption = end(explode("/", $court)); + $requete_wiki = trim(clean_photo_name($caption)); + } + + $pid = ""; + $description = ""; + + //var_dump($caption, $requete_wiki, $description, $img_thumb_ZP_wiki); + + array_push($coord, array($meta['latitude'], $meta['longitude'], $caption, $pid, $description, $img_thumb_ZP_wiki, $requete_wiki)); + //$compt = count($coord) - 1; + //$cible = compt_mark($compt); + } + + $exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] . " " . $exif_array[3] : '') . "
"; + //$exifs = "
" . $exif_array[0] . (($display_gps == true) ? $exif_array[2] : '') . "
"; $content = str_replace($matches4[$i][0], $matches4[$i][0] . $exifs, $content); $exifs = ""; - if (($meta['longitude'] != "") && ($meta['latitude'] != "")) { - if ($meta['caption'] != "") $fichier = $meta['caption']; - else if ($meta['title'] != "") $fichier = $meta['title']; - else $fichier = end(explode("/", $court)); - $pid = ""; - echo "fichier: " . $fichier; - - array_push($coord, array($meta['latitude'], $meta['longitude'], $fichier, $pid, $meta['caption'], $img_thumb_ZP_wiki)); - - } + + } // if in_multiarray } // else zenphoto @@ -1369,6 +1433,31 @@ add_action('the_content','addexif'); */ function img_wp_exif( $exif_array ) { + + $exifInfo = ""; + $exifGPS = ""; + $geo_link = ""; + $cible = ""; + + + global $coord; + + +/* + + global $compt_marker; + $compt_marker++; + echo $compt_marker . "
"; + + $compt = $compt_marker; +*/ +/* +2 / bief de la ruine = 2 +1 / pont d'arc = 1 +3 / source d la loue = 3 +0 / cascade = 2 +*/ + /* Array ( @@ -1397,12 +1486,9 @@ Array ) */ - $exifInfo = ""; - $exifGPS = ""; - $geo_link = ""; - // Si données GPS: if ($exif_array['aperture'] != "") { + echo "EXIF
"; // bloc exif (avec icones) $exifInfo .= "" . date(__("F j, Y, g:i a",'CreatorThemeRes-child'),$exif_array['created_timestamp']) . ""; @@ -1440,13 +1526,30 @@ Array //$geo_link .= ''; $geo_link .= ''; $geo_link .= ''; + + $compt = (count($coord) -1); + echo "compt: " . $compt . "
"; + + $cible = compt_mark($compt); + + echo "GPS
"; + echo $exif_array['latitude'] . " " . $compt . "

"; + } - return array($exifInfo, $exifGPS, $geo_link); + return array($exifInfo, $exifGPS, $geo_link, $cible); } +function compt_mark( $compt_marker ) { + + $cible = ""; + + return $cible; + } + + /* * creator_get_exif: récupère les exifs (et données GPS) pour les images WP * @@ -1848,7 +1951,8 @@ function mapgallery( $attr ) { "; } */ - $cible = ""; + $cible = ""; + //$cible = ""; if ( $captiontag && trim($attribut['caption']) ) { $output .= " <{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'> @@ -2410,17 +2514,17 @@ function fmulticurl($query) { } /* nettoyage expressions à rechercher */ - /**/ + /* echo "requete avant clean_req_wiki
"; var_dump($query); - + */ $wiki = clean_req_wiki($query); //$wiki = $query; - /**/ + /* echo "requete apres clean_req_wiki
"; var_dump($wiki); - + */ /* constructions des requetes */ foreach ($wiki as &$val) { @@ -2501,8 +2605,8 @@ function fmulticurl($query) { } //for */ - echo "retour de la requete
"; - var_dump($obj); + //echo "retour de la requete
"; + //var_dump($obj); for ($a = 0; $a < count($obj); $a++){ /* @@ -2510,6 +2614,8 @@ function fmulticurl($query) { $req = " " . $req . " "; */ $req = $query[$a]; + $req = " " . $req . " "; + /* if (is_array($obj[$a])) { @@ -2527,9 +2633,13 @@ function fmulticurl($query) { foreach ($obj[$a][2] as $key => $val) { //if (stripos(substr($val, 0, 50), $req) !== false) echo "matche $key"; //echo "nettoyage du retour de la requete
"; - //var_dump($val, $req); + $l = substr($val, 0, 50); + + + //var_dump($req, $val, $l); if (stripos(substr($val, 0, 50), $req) === false) { + //echo "on supprime
"; unset($obj[$a][1][$key]); unset($obj[$a][3][$key]); unset($obj[$a][2][$key]); @@ -2544,7 +2654,7 @@ function fmulticurl($query) { //echo "retour de la function multicurl
"; //var_dump($obj); - + return $obj; } @@ -2584,32 +2694,52 @@ function safe_array_access($ar){ */ function clean_req_wiki ($req) { - $v = array(); + $q = array(); + $pat = "#_([^)]*)_#"; foreach($req as $val) { - //echo $val . " - "; - + $z = strip_tags($val); - + /* + $fichier = preg_match($pat, $z, $match1); + if ($fichier === 1) $h = $match1[1]; + else $h = $z; + */ + //$y= supp_article($z); $y= supprime_article($z); - + $x = str_to_noaccent($y); - //$w = addslashes($x); // mets pont d'arcole avant pont d'arc - //$v = strtolower($w); $v = str_replace(" ", "_", $x); - + $q[] = trim($v); + } - echo "
"; return $q; } +function clean_photo_name($str) { + $pat = "#_([^)]*)_#"; + + $fichier = preg_match($pat, $str, $match1); + if ($fichier === 1) $h = $match1[1]; + else $h = $z; + + return $h; + } + +function supp_entre_parenth($str) { + $pattern3 = "#\\([^)]*\\)#"; + + $m = preg_replace($pattern3, "", $str); + return $m; + } + /* * str_to_noaccent(): remplace les lettres accentuées par leur équivalent sans accent * @@ -2655,16 +2785,24 @@ function supprime_article($str) { $pattern = "#^(le|la|les|un|une|du|de|des|ce|ces|cette|cet)\s#mUis"; $pattern2 = "#^([l|d|s|t]')#mUis"; - $pattern3 = "#\\([^)]*\\)#"; + //$pattern3 = "#\\([^)]*\\)#"; $k = preg_replace($pattern, " ", $str); $l = preg_replace($pattern2, " ", $k); + return trim($l); - $m = preg_replace($pattern3, "", $l); - - return trim($m); + //$m = preg_replace($pattern3, "", $l); + //return trim($m); } +/* +function var_dump_pre($mixed = null) { + echo '
';
+  var_dump($mixed);
+  echo '
'; + return null; +} +*/ function preprint($s, $return=false) { $x = "
"; 
diff --git a/header.php b/header.php
index e8f832b..d89499f 100755
--- a/header.php
+++ b/header.php
@@ -74,6 +74,7 @@
 						
    
 							oNline Web Fonts */
 							$socials_img = array('data:image/svg+xml;base64,CjxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDEwMDAgMTAwMCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMTAwMCAxMDAwIiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPG1ldGFkYXRhPiBTdmcgVmVjdG9yIEljb25zIDogaHR0cDovL3d3dy5vbmxpbmV3ZWJmb250cy5jb20vaWNvbiA8L21ldGFkYXRhPgogIDxnPjxwYXRoIGQ9Ik04MjYuNywxMEgxNzMuNEM4My41LDEwLDEwLDgzLjUsMTAsMTczLjR2NjUzLjNDMTAsOTE2LjYsODMuNSw5OTAsMTczLjQsOTkwaDY1My40Yzg5LjgsMCwxNjMuMy03My41LDE2My4zLTE2My40VjE3My40Qzk5MCw4My41LDkxNi41LDEwLDgyNi43LDEweiBNMjg1LjYsNjUzLjFjLTg0LjYsMC0xNTMuMS02OC42LTE1My4xLTE1My4xYzAtODQuNiw2OC42LTE1My4xLDE1My4xLTE1My4xYzg0LjYsMCwxNTMuMSw2OC42LDE1My4xLDE1My4xQzQzOC44LDU4NC42LDM3MC4yLDY1My4xLDI4NS42LDY1My4xeiBNNzE0LjQsNjUzLjFjLTg0LjYsMC0xNTMuMS02OC42LTE1My4xLTE1My4xYzAtODQuNiw2OC42LTE1My4xLDE1My4xLTE1My4xUzg2Ny41LDQxNS40LDg2Ny41LDUwMEM4NjcuNSw1ODQuNiw3OTksNjUzLjEsNzE0LjQsNjUzLjF6IiBzdHlsZT0iZmlsbDojYTliN2I3Ij48L3BhdGg+PC9nPjwvc3ZnPgogIA==',
 							'data:image/svg+xml;base64,CjxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDEwMDAgMTAwMCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMTAwMCAxMDAwIiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPG1ldGFkYXRhPiBTdmcgVmVjdG9yIEljb25zIDogaHR0cDovL3d3dy5vbmxpbmV3ZWJmb250cy5jb20vaWNvbiA8L21ldGFkYXRhPgogIDxnPjxnPjxwYXRoIGQ9Ik04NzcuNSw4NTZsLTMuMywzLjNjLTQxLjIsNDEuNi04OC40LDczLjUtMTQxLjYsOTUuN2MtNTYuMSwyMy4zLTExMy45LDM1LTE3My40LDM1Yy02MC4yLDAtMTE3LjktMTEuNy0xNzMuNC0zNWMtNTQtMjMtMTAxLjItNTQuOS0xNDEuNi05NS43Yy00MS4yLTQwLjgtNzMuMS04Ny45LTk1LjctMTQxLjFjLTE1LjMtMzcuNi0yNS4yLTcyLTI5LjUtMTAzLjRjLTEuNS0xMC4yLDcuMy0xNi44LDI2LjMtMTkuN2MxOC42LTIuOSwyOC44LDAuNywzMC42LDEwLjljMC40LDAuNCwwLjUsMS4xLDAuNSwyLjJjNi42LDMyLjgsMTQuOSw2MS44LDI1LjIsODdjMTguMiw0NS4yLDQ1LjksODYuNCw4My4xLDEyMy42YzM1LjcsMzUuNyw3Ni45LDYzLjQsMTIzLjYsODMuMWM0OC4xLDIwLjQsOTguNCwzMC42LDE1MC45LDMwLjZjNTIuMSwwLDEwMi40LTEwLjIsMTUwLjktMzAuNmM0Ni43LTIwLjEsODcuNy00Ny44LDEyMy04My4xbDMuMy0zLjNjMy42LTMuNiw4LjItNC43LDEzLjctMy4zYzQuNCwxLjEsMTAuNCw1LjEsMTgsMTJDODgxLjQsODM3LjgsODg0LjUsODQ4LjQsODc3LjUsODU2TDg3Ny41LDg1NnogTTYxOS40LDUxOS43bC0zNi4xLDM2LjFsMzQuNSwzNC41YzcuNyw3LjcsNi40LDE2LjYtMy44LDI2LjhjLTYuMiw2LjItMTIsOS4zLTE3LjUsOS4zYy0zLjYsMC03LjEtMS44LTEwLjQtNS41bC0zMy45LTMzLjRsLTM2LjEsMzYuMWMtMS44LDEuOC00LjYsMi43LTguMiwyLjdjLTUuNSwwLTExLjEtMi45LTE3LTguOGwtMS4xLTEuMWMtNi42LTUuNS05LjgtMTAuOC05LjgtMTUuOWMwLTIuNiwxLjUtNS43LDQuNC05LjNsMzYuMS0zNS41bC0zNi4xLTM2LjFjLTUuOC01LjgtMy4zLTE0LDcuNy0yNC42YzYuNi02LjYsMTIuMi05LjgsMTctOS44YzIuMiwwLDQuNiwwLjksNy4xLDIuN2wzNS41LDM2LjFsMzUuNS0zNS41YzYuNi02LjIsMTUuMy0zLjgsMjYuMyw3LjFDNjIzLjIsNTA1LjUsNjI1LjMsNTEzLjUsNjE5LjQsNTE5LjdMNjE5LjQsNTE5Ljd6IE04NzcsNTUwLjljMCw0My04LjQsODQuNi0yNS4yLDEyNC43Yy0xNi40LDM4LjMtMzkuNCw3Mi4yLTY4LjksMTAxLjdjLTI5LjIsMjkuMi02My4zLDUyLjEtMTAyLjMsNjguOWMtMzksMTYuOC04MC42LDI1LjItMTI0LjcsMjUuMnMtODUuNy04LjQtMTI0LjctMjUuMmMtMzktMTYuOC03My4xLTM5LjctMTAyLjMtNjguOWMtMjkuOS0yOS45LTUyLjctNjMuOC02OC40LTEwMS43Yy01LjUtMTEuNy04LjItMTktOC4yLTIxLjloLTAuNWMtMy4zLTkuOCw0LjYtMTcuOSwyMy41LTI0LjFjMTguMi01LjgsMjkuMi0zLjYsMzIuOCw2LjZjMTMuNSwzNi4xLDMxLjIsNjYuNSw1Myw5MS4zaDAuNVY1NDFjMS4xLTQ5LjYsMTkuNy05MS45LDU1LjgtMTI2LjljMzguMy0zNy42LDg0LjQtNTYuMywxMzguNC01Ni4zYzUzLjYsMCw5OS40LDE4LjgsMTM3LjMsNTYuM2MzNy45LDM3LjYsNTYuOSw4Mi45LDU2LjksMTM2LjJjMCw1My42LTE5LjEsOTkuNC01Ny4xLDEzNy4zYy0zOC4xLDM3LjktODMuOCw1Ni45LTEzNyw1Ni45Yy0yMS4xLDAtNDEuNi0yLjktNjEuMy04LjhjLTEwLjItNC0xMi42LTE1LjEtNy4xLTMzLjRjNS44LTE4LjYsMTMuOS0yNi40LDI0LjEtMjMuNWw3LjcsMS42YzUuMSwxLjEsMTEsMi4yLDE3LjgsMy4zYzYuNywxLjEsMTIuMywxLjYsMTYuNywxLjZjMzcuOSwwLDcwLTEzLDk2LjMtMzkuMWMyNi4yLTI2LjEsMzkuNC01Ny45LDM5LjQtOTUuNGMwLTM2LjgtMTMuMS02OC0zOS40LTkzLjVjLTI1LjktMjUuOS01Ny44LTM4LjgtOTUuNy0zOC44Yy0zOSwwLTcxLjUsMTQuNi05Ny4zLDQzLjdjLTIzLjMsMjYuMy0zNSw1NS40LTM1LDg3LjV2MjI1LjljNDAuMSwyNC40LDg0LjIsMzYuNiwxMzIuMywzNi42YzM1LDAsNjguNy02LjcsMTAxLjItMjBjMzIuNC0xMy4zLDYwLjktMzIuMiw4NS4zLTU2LjZjMjQuNC0yNC40LDQzLjMtNTIuNyw1Ni42LTg0LjhjMTMuMy0zMi4xLDIwLTY1LjQsMjAtMTAwLjFjMC03Mi4yLTI1LjctMTM0LTc3LjEtMTg1LjRjLTUxLTUxLTExMi44LTc2LjYtMTg1LjQtNzYuNmMtNzIuOSwwLTEzNC45LDI1LjUtMTg1LjksNzYuNmMtMTkuMywxOS4zLTMzLjQsMzUuMi00Mi4xLDQ3LjZsLTEuMSwxLjFjLTIuOSw0LTUuMyw2LjgtNy4xLDguNWMtMS44LDEuNi01LjcsMy40LTExLjgsNS4ycy0xMywxLjMtMjEuMS0xLjZjLTcuNy0xLjgtMTQuMy00LjgtMjAtOWMtNS43LTQuMi04LjUtOS04LjUtMTQuNVYzMC44YzAtNS41LDEuOS0xMC4zLDUuNy0xNC41YzMuOC00LjIsOC44LTYuMywxNS02LjNoNDc5LjZjMTAuOSwwLDE2LjQsMTAsMTYuNCwzMC4xYzAsMjAuMS01LjUsMzAuMS0xNi40LDMwLjFIMzE0LjN2MjY0LjFoMC41YzE0LjYtMTUuMywzMy4yLTMwLjYsNTUuOC00NS45YzIyLjYtMTUuMyw0Mi4zLTI2LjQsNTkuMS0zMy40YzM5LjctMTYuOCw4MS44LTI1LjIsMTI2LjMtMjUuMmM0NC4xLDAsODUuNyw4LjQsMTI0LjcsMjUuMmMzOSwxNi44LDczLjEsMzkuNywxMDIuMyw2OC45YzI5LjUsMjkuNSw1Mi41LDYzLjQsNjguOSwxMDEuN0M4NjguNiw0NjYuNSw4NzcsNTA4LjIsODc3LDU1MC45TDg3Nyw1NTAuOXogTTg2MCwyMzMuMWMzLjMsMi45LDQuOSw2LjIsNC45LDkuOGMwLDMuNi0xLDYuOS0zLDkuOHMtNSw2LjctOSwxMS41Yy05LjUsOS41LTE2LjYsMTQuMi0yMS4zLDE0LjJjLTMuMywwLTYuMi0xLjMtOC44LTMuOGMtMzguNi0zMy4yLTc2LjQtNTcuNC0xMTMuMi03Mi43Yy00Ni43LTIwLjQtOTctMzAuNi0xNTAuOS0zMC42Yy00OC41LDAtOTYuMiw4LjktMTQzLjMsMjYuOGMtOS44LDMuNi0xOC0zLjEtMjQuNi0yMC4yYy0zLjMtOS4xLTQuNy0xNi00LjQtMjAuOGMxLjEtNS44LDQtOS41LDguOC0xMC45YzQ3LjQtMjAuOCwxMDEuOS0zMS4yLDE2My41LTMxLjJjNTkuOCwwLDExNy40LDExLjcsMTcyLjgsMzVDNzgxLjUsMTcxLjEsODI0LjMsMTk4LjgsODYwLDIzMy4xeiIgc3R5bGU9ImZpbGw6I2E5YjdiNyI+PC9wYXRoPjwvZz48L2c+PC9zdmc+CiAg',
 							//'data:image/svg+xml;base64,CjxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDEwMDAgMTAwMCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMTAwMCAxMDAwIiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPG1ldGFkYXRhPiBTdmcgVmVjdG9yIEljb25zIDogaHR0cDovL3d3dy5vbmxpbmV3ZWJmb250cy5jb20vaWNvbiA8L21ldGFkYXRhPgogIDxnPjxnPjxnPjxwYXRoIGQ9Ik03MzUuMiw0OTAuMWMtMTUuOSwyLjEtMjksMTAtNDEuNCwxOS41Yy0xMy44LDEwLjYtMjUuNCwyMy41LTM3LjMsMzZjLTEuNiwxLjctMC45LDIuNiwwLjMsMy45YzguNCw5LjQsMTcsMTguNSwyNi44LDI2LjRjMTYuMywxMy4xLDMzLjksMjMuMiw1NS40LDI1LjJjMjQuMiwyLjMsNDMuOC05LjEsNTIuNC0zMWMzLTcuNiw0LjMtMTUuNSw0LjMtMjQuOGMwLjEtMi4zLTAuMy01LjctMC43LTkuMUM3OTEuMiw1MDUuOCw3NjUuNiw0ODYuMSw3MzUuMiw0OTAuMXoiIHN0eWxlPSJmaWxsOiNhOWI3YjciPjwvcGF0aD48cGF0aCBkPSJNNTMzLjQsNTA4LjhjLTEwLjMtNy40LTIxLjItMTQtMzMuNi0xNy4yYy0xOS00LjctMzYuMy0yLTQ5LjgsMTMuNWMtMTAuNSwxMi0xNS41LDI2LjItMTUuNSw0My4xYzAuMSwxLjUsMC4zLDQsMC41LDYuNWMyLjEsMjMuNiwxNy44LDQxLjIsNDAuNiw0NS40YzEyLjUsMi4zLDI0LjcsMC42LDM2LjUtNGMyNS4yLTkuOCw0NC40LTI3LjUsNjItNDcuNGMxLjMtMS41LDAuNi0yLjItMC40LTMuMkM1NjEuMSw1MzIuNSw1NDguMyw1MTkuNSw1MzMuNCw1MDguOHoiIHN0eWxlPSJmaWxsOiNhOWI3YjciPjwvcGF0aD48cGF0aCBkPSJNNTAwLDEwQzIyOS40LDEwLDEwLDIyOS40LDEwLDUwMHMyMTkuNCw0OTAsNDkwLDQ5MHM0OTAtMjE5LjQsNDkwLTQ5MFM3NzAuNiwxMCw1MDAsMTB6IE03NDEuOCw2NjguMmMtMzEtMC40LTU3LjQtMTIuNC04MS42LTMwLjdjLTE1LjgtMTItMjkuMy0yNi4zLTQyLjMtNDEuMWMtMi4yLTIuNS0zLjItMy01LjgtMC4zYy0xMy4zLDEzLjgtMjUuOSwyOC4zLTQwLjgsNDAuNGMtMTguOSwxNS4zLTM5LjcsMjYuOS02NC4xLDMwLjJjLTQzLjEsNS45LTgwLjMtNS41LTEwOS4zLTM5LjNjLTYuNi03LjctMTEuNS0xNi40LTE1LjYtMjUuN2MtMC41LTEuMi0wLjctMi42LTItMy41Yy01LjcsMTIuMy0xMi43LDIzLjUtMjEuOSwzMy4zYy0yMy4yLDI0LjctNTEuOSwzNy42LTg1LjcsMzguOGMtMjQuNCwwLjktNDguNC0yLjMtNzAuNy0xMi44Yy0zNy4zLTE3LjctNTcuOS00Ny4yLTYwLjQtODguOGMtMC4yLTMuMiwwLjctNCwzLjgtNGMyMC4xLDAuMSw0MC4yLDAuMSw2MC4zLDBjMywwLDMuOSwwLjksNC40LDMuOGMzLjksMjIuOSwxNi4yLDM4LjksMzkuMyw0NC42YzMyLjIsOCw2MS44LTEwLjMsNzAuMy00My41YzUuNy0yMi4zLDMuMi00My43LTExLjYtNjIuM2MtOS44LTEyLjMtMjMuMi0xOC40LTM4LjgtMTkuNWMtMjIuNS0xLjYtNDEsNS44LTU0LjMsMjQuNmMtMS4yLDEuOC0yLjcsMi4yLTQuNywyLjJjLTE4LjEtMC4xLTM2LjItMC4xLTU0LjMsMGMtMy4xLDAtMy44LTAuOS0zLjItMy45YzkuNC01Mi4yLDE4LjctMTA0LjUsMjgtMTU2LjdjMS4zLTcuMSwyLjYtMTQuMywzLjctMjEuNWMwLjQtMi4zLDEuMy0zLjIsMy44LTMuMmM2MC4xLDAuMSwxMjAuMiwwLjEsMTgwLjQsMGMyLjksMCwzLjUsMC45LDMuNSwzLjZjLTAuMSwxNi4xLTAuMiwzMi4yLDAsNDguNGMwLDMuMy0wLjgsNC4yLTQuMiw0LjJjLTQzLjEtMC4xLTg2LjEsMC0xMjkuMi0wLjJjLTMuNiwwLTUuMiwwLjYtNS44LDQuNmMtMy44LDIyLjktOCw0NS44LTEyLDY4LjdjLTAuMiwxLTAuOSwyLjMsMC4yLDIuOWMxLjIsMC43LDEuOC0wLjcsMi41LTEuNGMxOS43LTE5LDQzLjgtMjQuOCw3MC40LTIzLjRjMjUuNSwxLjQsNDcuNCwxMC45LDY1LjMsMjkuMWM3LjUsNy42LDEzLjMsMTYuMywxOC4xLDI1LjljMC41LDEsMSwyLjEsMS45LDMuOWM1LjEtMTMuNCwxMS40LTI1LjEsMjAuMy0zNS4yYzE5LjUtMjIuMiw0NC4yLTM0LjIsNzMuNS0zNi45YzQxLjMtMy44LDc1LjMsMTIuMSwxMDUsMzkuM2MxMi4zLDExLjIsMjMuMiwyMy44LDMzLjksMzYuNmMyLjMsMi43LDMuMywzLDUuNywwLjFjMTMuOC0xNi40LDI3LjUtMzIuOCw0NC41LTQ2LjFjMTkuNi0xNS4zLDQxLjEtMjYuNCw2Ni4xLTI5LjNjNjEuOC03LjIsMTEzLjUsMjYuNCwxMjYuNiw5MC4yYzUuNSwyNi44LDMuOCw1My40LTUuNSw3OS4yQzgzMi41LDY0MS41LDc5Mi43LDY2OC44LDc0MS44LDY2OC4yeiIgc3R5bGU9ImZpbGw6I2E5YjdiNyI+PC9wYXRoPjwvZz48L2c+PGc+PC9nPjxnPjwvZz48Zz48L2c+PGc+PC9nPjxnPjwvZz48Zz48L2c+PGc+PC9nPjxnPjwvZz48Zz48L2c+PGc+PC9nPjxnPjwvZz48Zz48L2c+PGc+PC9nPjxnPjwvZz48Zz48L2c+PC9nPjwvc3ZnPgogIA==',
diff --git a/single.php b/single.php
index cc58064..99c42be 100755
--- a/single.php
+++ b/single.php
@@ -1,5 +1,36 @@
 save_run($xhprof_data, "myapp");
+echo "---------------\n".
+     "Assuming you have set up the http based UI for \n".
+     "XHProf at some address, you can view run at \n".
+     "http://dev.macbook-pro.local/index.php?run=$run_id&source=myapp\n".
+     "---------------\n";
+*/
+
 ?>
 
    
 	
    
@@ -15,12 +46,17 @@ get_header();
 
 				
 						
 				 0) ? "block" : "none") . ';">
    '; 
+				
+				var_dump($coord);
+				
 				if (count($coord) > 0) {
 					
 					$b = array();
@@ -28,10 +64,20 @@ get_header();
 					// Avec tous les titres, on crée la requete pour Wikipédia
 					
 					for ($a = 0; $a < count($coord); $a++){					
-						$short = $coord[$a][2]; // Titre
+						$short = $coord[$a][6]; // Titre
+						/*
+						Flickr: 2016-01-07_Renard_2905
+						WP:
+						ZP:
+						*/
 						$b[] = $short;
 						}				
 					
+					//var_dump($b);
+
+					//echo "coord avant requete Wikipedia";
+					//var_dump($coord);
+					
 					$wiki = fmulticurl($b);
 					
 					//On rajoute à $coord les données récupérées sur Wikipédia
@@ -40,13 +86,14 @@ get_header();
 						for ($c = 0; $c < count($wiki); $c++){
 							// [0] 1ere réponse, la plus pertinante
 							//array_push($coord[$c], $lettrine, $wiki[$c][1][0], $wiki[$c][2][0], $wiki[$c][3][0]);
+							// Requete - Texte Wikipedia - Url Wikipedia
 							array_push($coord[$c], $wiki[$c][1][0], $wiki[$c][2][0], $wiki[$c][3][0]);
 							//array_push($coord[$c], $wiki[$c][2][0], $wiki[$c][3][0]);
 							}
 						}
 					
-					echo "après requete Wikipedia";
-					var_dump($coord);
+					//echo "coord après requete Wikipedia";
+					//var_dump($coord);
 				?>
 
 
@@ -99,26 +146,33 @@ get_header();
 		" . $coord[$i][2] . "','
    " . $coord[$i][4] . "
    ', " . $coord[$i][0] . ", " . $coord[$i][1] . ",'" . $coord[$i][5] . "']" . (($i<$j) ? "," : "")."\r\n";
-			echo "['
    " . addslashes($coord[$i][2]) . "
    ','
    " . addslashes($coord[$i][4]) . "
    ', " . $coord[$i][0] . ", " . $coord[$i][1] . ",'" . addslashes($coord[$i][5]) . "','" . addslashes($coord[$i][7]) . "','" . $coord[$i][8] . "']" . (($i<$j) ? "," : "")."\r\n";
+			echo "['
    " . addslashes($coord[$i][2]) . "
    ','
    " . addslashes($coord[$i][4]) . "
    ', " . $coord[$i][0] . ", " . $coord[$i][1] . ",'" . addslashes($coord[$i][5]) . "','" . addslashes($coord[$i][8]) . "','" . $coord[$i][9] . "']" . (($i<$j) ? "," : "")."\r\n";
+			//echo "['
    " . addslashes($coord[$i][2]) . "
    ','
    " . addslashes($coord[$i][4]) . "
    ', " . $coord[$i][0] . ", " . $coord[$i][1] . ",'" . addslashes($coord[$i][5]) . "','" . (($coord[$i][8] != "") ? addslashes($coord[$i][8]) : addslashes($coord[$i][4])) . "','" . $coord[$i][9] . "']" . (($i<$j) ? "," : "")."\r\n";
 			}
-			//array_push($coord, array(number_format($lat, 6), number_format($long, 6), $caption, $attach, $description, $thumbnail));
 			
+			(($coord[$i][8] != "") ? addslashes($coord[$i][8]) : addslashes($coord[$i][4]))
+			//array_push($coord, array($meta['latitude'], $meta['longitude'], $caption, $pid, $description, $img_thumb_ZP_wiki, $requete_wiki));
+
 			/*
 			locations[0] => $coord[2] => Titre (court)
 			locations[1] => $coord[4] => Description (long)
 			locations[2] => $coord[0] => Latitude
 			locations[3] => $coord[1] => Longitude
 			locations[4] => $coord[5] => 
-			locations[5] => $coord[7] => Texte Wikipedia
-			locations[6] => $coord[8] => Liens vers Wikipedia
+			locations[5] => $coord[8] => Texte Wikipedia
+			locations[6] => $coord[9] => Liens vers Wikipedia
 							$coord[3] => attachment
-							$coord[6] => <- requete wiki
+							$coord[6] => requete wiki ->
+							$coord[7] => <- requete wiki
 			*/
 			
 		?>
 		];
 
+		var wikiLink = '';
+		var contenuInfoBulle = [];
+
+
 		function MapApiLoaded() {
 
     		// Setup the different icons and shadows
@@ -162,6 +216,19 @@ get_header();
         		});
         
         		markers.push(marker);
+
+
+        		if (locations[i][6] != '') {
+                 	wikiLink = '' + wikiUrl  + '';
+                 	}
+                contenuInfoBulle[i] = locations[i][0] + locations[i][4] + locations[i][1] + locations[i][5] + '
    ' + wikiLink;
+                	/* 
+                	locations[0] => $coord[2] => Titre (court)
+                	locations[4] => $coord[5] => 
+                	locations[1] => $coord[4] => Description (long)
+                	locations[5] => $coord[8] => Texte Wikipedia
+					locations[6] => $coord[9] => Liens vers Wikipedia
+                	*/
         	
 	        	var zoom = 1;
 				a = map.getZoom();
@@ -204,25 +271,17 @@ get_header();
 					
        			google.maps.event.addListener(marker, 'mousemove', (function (marker, i) {
             		return function () {
-
-                	//var contenuInfoBulle = locations[i][0] + locations[i][4] + locations[i][1];
-                 	//var contenuInfoBulle = locations[i][0] + '' + locations[i][4] + locations[i][5] + '';
+					
+					/*
                  	var wikiLink = ''
                  	if (locations[i][6] != '') {
-                 		wikiLink = '' + wikiUrl  + ''
+                 		wikiLink = '' + wikiUrl  + '';
                  		}
                  		
                		var contenuInfoBulle = locations[i][0] + locations[i][4] + locations[i][1] + locations[i][5] + '
    ' + wikiLink;
-
-                	/* 
-                	locations[0] => $coord[2] => Titre (court)
-                	locations[4] => $coord[5] => 
-                	locations[1] => $coord[4] => Description (long)
-                	locations[5] => $coord[7] => Texte Wikipedia
-					locations[6] => $coord[8] => Liens vers Wikipedia
-                	*/
+					*/
                 	
-                	infowindow.setContent(contenuInfoBulle);
+                	infowindow.setContent(contenuInfoBulle[i]);
                 	infowindow.open(map, marker);
            			}
  		       	})(marker, i));
@@ -245,8 +304,7 @@ get_header();
 	    	}
     	
     	setTimeout(function() {
-    		/*infowindow.setContent(locations[cnt][0]);*/
-    		infowindow.setContent(contenuInfoBulle);
+    		infowindow.setContent(contenuInfoBulle[cnt]);
 	        infowindow.open(map, markers[cnt]);
     	}, 300);
 	} //jumpToMarker
@@ -261,7 +319,7 @@ get_header();
 		echo "
    ";
 		?>
diff --git a/tpl-carte.php b/tpl-carte.php
index c66b8ba..ea47264 100755
--- a/tpl-carte.php
+++ b/tpl-carte.php
@@ -55,7 +55,7 @@ $query_images = new WP_Query($query_images_args);
 							$description = $attribut['description'];
 							$thumbnail = $attribut['sizes']['thumbnail'];
 							//$thumbnail = '' . $attribut['alt'] . '';
-							$thumbnail = '\"'';
+							$thumbnailWiki = '' . $attribut['alt'] . '';
 							//echo $thumbnail;
 /*
     array (size=4)
@@ -68,14 +68,25 @@ $query_images = new WP_Query($query_images_args);
 */							
 							// ??????
 							$gallery[] = $attach;
-							
+							/*
 							if ($capt != "") $caption = $capt;
 							elseif ($title != "") $caption = $title;
+*/
+
+							if ($capt != "") {
+								$caption = $capt;
+								$requete_wiki = trim(supp_entre_parenth($capt));
+								}
+							elseif ($title != "") {
+								$caption = $title;
+								$requete_wiki = trim(clean_photo_name($title));
+								}
 
 							// On crée le tableau $coord qui regroupe toutes les données pour le waypoint (lat,long, titre, n° attachment, description, vignette)
 							
-							array_push($coord, array(number_format($lat, 6), number_format($long, 6), $caption, $attach, $description, $thumbnail));
-							
+							//array_push($coord, array(number_format($lat, 6), number_format($long, 6), $caption, $attach, $description, $thumbnail));
+							array_push($coord, array(number_format($lat, 6), number_format($long, 6), $caption, $attach, $description, $thumbnailWiki, $requete_wiki));
+			
 							} //if					
 						} //foreach
 						
@@ -106,8 +117,8 @@ $query_images = new WP_Query($query_images_args);
 					
 					if (count($coord) > 0) {
 					
-					echo "avant requete Wikipedia";
-					var_dump($coord);
+					//echo "avant requete Wikipedia";
+					//var_dump($coord);
 /*
   0 => 
     array (size=6)
@@ -123,7 +134,7 @@ $query_images = new WP_Query($query_images_args);
 					// Avec tous les titres, on crée la requete pour Wikipédia
 					
 					for ($a = 0; $a < count($coord); $a++){					
-						$short = $coord[$a][2]; // Titre
+						$short = $coord[$a][6]; // Titre
 						$b[] = $short;
 						}				
 					
@@ -137,8 +148,8 @@ $query_images = new WP_Query($query_images_args);
 							}
 						}
 					
-					echo "après requete Wikipedia";
-					var_dump($coord);
+					//echo "après requete Wikipedia";
+					//var_dump($coord);
 					
 				?>	
 
 					
 				
    
-		
-      				
    
+      				
    
       				
 				
    ";	
 				?>