From 3291ce743ba92eecdee1cad6c4739a8b9fe37544 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Mon, 12 Apr 2010 12:11:20 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20gestion=20des=20caract=C3=A8res=20?=
 =?UTF-8?q?de=20ponctuation=20et=20abbr=C3=A9viation,=20issue=20#0000243?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/identite/infogeo.php  |  7 ++++---
 includes/scoresws/identite.php | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/includes/identite/infogeo.php b/includes/identite/infogeo.php
index 645649b4b..076c4daca 100644
--- a/includes/identite/infogeo.php
+++ b/includes/identite/infogeo.php
@@ -2,10 +2,11 @@
 <div id="infogeo_txt" style="float:left;width:200px;padding:20px 0 0 20px;">
 <?php
 $google_map = './?page=referer&part=gmap&siret='.$siret.
-    '&url=http://maps.google.com/maps?f=q%26hl=fr%26geocode=%26q='.
+    '&url=http://maps.google.fr/maps?f=q%26hl=fr%26geocode=%26q='.
     $etab['AdresseNum'].',+'.
-    urlencode($etab['AdresseVoie']).'+'.
-    urlencode($etab['AdresseRue']).',+'.$etab['CP'].'+'.
+    urlencode(normaliseVoie($etab['AdresseVoie'])).'+'.
+    urlencode(htmlspecialchars_decode($etab['AdresseRue'], ENT_QUOTES)).
+    ',+'.$etab['CP'].'+'.
     urlencode($etab['Ville']);
 
 if ($etab['GeoPrecis']>0) {
diff --git a/includes/scoresws/identite.php b/includes/scoresws/identite.php
index 4050a1abc..6a3ed8350 100644
--- a/includes/scoresws/identite.php
+++ b/includes/scoresws/identite.php
@@ -728,14 +728,17 @@ function identite_statutsmodif($StatutsModif,$StatutsModifDepot)
 }
 
 function normaliseVoie($voie) {
-        switch (strtoupper($voie)) {
-                case 'BD':      case 'BVD':     return 'BOULEVARD';                     break;
-                case 'AV':      case 'AVE':     return 'AVENUE';                        break;
-                case 'PL':      case 'PLA':     return 'PLACE';                         break;
-                case 'ESP':                             return 'ESPLANADE';                     break;
-                //- 8E__ARRONDISSEMENT
-                default;                                return strtoupper($voie);       break;
-        }
+	switch (strtoupper($voie)) {
+		case 'BD':
+        case 'BVD': return 'BOULEVARD'; 		break;
+        case 'AV':
+        case 'AVE': return 'AVENUE'; 			break;
+        case 'PL':
+        case 'PLA': return 'PLACE'; 			break;
+        case 'ESP': return 'ESPLANADE'; 		break;
+        case 'CRS': return 'COURS';				break;
+        default: 	return strtoupper($voie); 	break;
+    }
 }
 
 function identite_autresiren($liste)