diff --git a/INSTALL.odt b/INSTALL.odt
index d7cb0aba..2000f9ef 100644
Binary files a/INSTALL.odt and b/INSTALL.odt differ
diff --git "a/V\303\251lObs-documentation_utilisateurs.odt" "b/V\303\251lObs-documentation_utilisateurs.odt"
index ab888a0c..d7379dcc 100644
Binary files "a/V\303\251lObs-documentation_utilisateurs.odt" and "b/V\303\251lObs-documentation_utilisateurs.odt" differ
diff --git a/admin.php b/admin.php
index 021edb73..b9296d4b 100644
--- a/admin.php
+++ b/admin.php
@@ -28,14 +28,14 @@
 			<div class="loading-indicator">
 				<img alt="VelObs" src="resources/images/velobs.jpg" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/><?php echo INCLUDE_CODE_HTML_LOADING ?><br /><span id="loading-msg">Loading styles and images ...</span>
 			</div>
-			<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6" />
+			<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6.2" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/geoext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/gxtheme-gray.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/popup.css" />
-			<link rel="stylesheet" type="text/css" href="resources/css/admin.css?v1.6" />
-			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6" />
+			<link rel="stylesheet" type="text/css" href="resources/css/admin.css?v1.6.2" />
+			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6.2" />
 			<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />
 
 			<!--<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading Google Maps API...';</script> 
@@ -51,9 +51,9 @@
 	
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading language...';</script>
 			<script type="text/javascript" src="lib/js/framework/ext-3.4.0/src/locale/ext-lang-<?php echo $_SESSION['extension_language']; ?>.js"></script>
-			<script type="text/javascript" src="lib/js/translation_<?php echo $_SESSION['extension_language']; ?>.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/key.js.template?v1.6"></script>
-			<script type="text/javascript" src="lib/js/key.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/translation_<?php echo $_SESSION['extension_language']; ?>.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/key.js.template?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/key.js?v1.6.2"></script>
 			
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading extensions...';</script>
 			<script type="text/javascript" src="lib/js/framework/ux/GeoNamesSearchCombo.js"></script>
@@ -67,62 +67,63 @@
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading geometry...';</script>
 			
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading application...';</script>
-			<script type="text/javascript" src="lib/js/common.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/common.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.6.2"></script>
 		<?php 
 		switch ($_SESSION['type']) {
 			case '1':
 ?>
 
-			<script type="text/javascript" src="lib/js/admin/modeemploi1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/icon1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/config1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/status1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/users1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/priorite1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/commune1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/pole1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/quartier1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/basket.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poi1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/subcategory1.js?v1.6"></script>			
-			<script type="text/javascript" src="lib/js/admin/category1.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/main1.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/admin/modeemploi1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/icon1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/config1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/status1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/users1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/priorite1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/commune1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/pole1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/quartier1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/basket.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poi1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/subcategory1.js?v1.6.2"></script>			
+			<script type="text/javascript" src="lib/js/admin/category1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/users_link_pole1.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/main1.js?v1.6.2"></script>
 	 
 <?php			
 				break;
 			case '2':
 ?>
-			<script type="text/javascript" src="lib/js/admin/modeemploi2.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poi2.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/admin/modeemploi2.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poi2.js?v1.6.2"></script>
 			
-			<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/main2.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/main2.js?v1.6.2"></script>
 <?php
 				break;
 			case '3':
 ?>
-			<script type="text/javascript" src="lib/js/admin/modeemploi3.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poi3.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/main3.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/admin/modeemploi3.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poi3.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/main3.js?v1.6.2"></script>
 <?php
 				break;
 		    case '4':
 ?>
-            <script type="text/javascript" src="lib/js/admin/modeemploi4.js?v1.6"></script>
-            <script type="text/javascript" src="lib/js/admin/commune1.js?v1.6"></script>
-            <script type="text/javascript" src="lib/js/admin/pole1.js?v1.6"></script>
-            <script type="text/javascript" src="lib/js/admin/basket.js?v1.6"></script>
-            <script type="text/javascript" src="lib/js/admin/poi4.js?v1.6"></script>
-            <script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6"></script>
-            <script type="text/javascript" src="lib/js/admin/main4.js?v1.6"></script>
+            <script type="text/javascript" src="lib/js/admin/modeemploi4.js?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/admin/commune1.js?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/admin/pole1.js?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/admin/basket.js?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/admin/poi4.js?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/admin/main4.js?v1.6.2"></script>
 
 <?php
 		        break;
diff --git a/index.php b/index.php
index cf4f68bb..f8ce4118 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-		<title><?php echo PAGE_TITLE ?> v1.6</title>
+		<title><?php echo PAGE_TITLE ?> v1.6.2</title>
 		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
 	</head>
 	<body onunload="setCookie()">
@@ -15,14 +15,14 @@
 			<div class="loading-indicator">
                 <img alt="VelObs" src="resources/images/velobs.jpg" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/><?php echo INCLUDE_CODE_HTML_LOADING ?><br /><span id="loading-msg">Loading styles and images ...</span>
 			</div>
-			<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6" />
+			<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6.2" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/geoext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/gxtheme-gray.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/popup.css" />
-			<link rel="stylesheet" type="text/css" href="resources/css/public.css?v1.6" />
-			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6" />
+			<link rel="stylesheet" type="text/css" href="resources/css/public.css?v1.6.2" />
+			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6.2" />
 			<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />
 	
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading ExtJS...';</script>
@@ -35,14 +35,14 @@
 	
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading language...';</script>
 			<script type="text/javascript" src="lib/js/framework/ext-3.4.0/src/locale/ext-lang-fr.js"></script>
-			<script type="text/javascript" src="lib/js/translation_fr.js?v1.6"></script>
-            <script type="text/javascript" src="lib/js/key.js.template?v1.6"></script>
-            <script type="text/javascript" src="lib/js/key.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/translation_fr.js?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/key.js.template?v1.6.2"></script>
+            <script type="text/javascript" src="lib/js/key.js?v1.6.2"></script>
 			
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading extensions...';</script>
 			<script type="text/javascript" src="lib/js/framework/ux/GeoNamesSearchCombo.js"></script>
             <script type="text/javascript" src="lib/js/public/poidisplaystatus.js"></script>
-			<script type="text/javascript" src="lib/js/public/baselayerlist.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/public/baselayerlist.js?v1.6.2"></script>
 			<script type="text/javascript" src="lib/js/framework/ux/FileUploadField.js"></script>
 			<script type="text/javascript" src="lib/js/framework/ux/IconCombo.js"></script>
 	
@@ -51,10 +51,10 @@
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading application...';</script>
 			<script type="text/javascript" src="lib/js/public/credits.js"></script>
 			<script type="text/javascript" src="lib/js/framework/AnimatedCluster.js"></script>
-			<script type="text/javascript" src="lib/js/common.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/public/proposition.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/public/map.js?v1.6"></script>
-			<script type="text/javascript" src="lib/js/public/main.js?v1.6"></script>
+			<script type="text/javascript" src="lib/js/common.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/public/proposition.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/public/map.js?v1.6.2"></script>
+			<script type="text/javascript" src="lib/js/public/main.js?v1.6.2"></script>
 	 
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script> 
 		</div>
diff --git a/lib/js/admin/category1.js b/lib/js/admin/category1.js
index 98ee2571..80f274bd 100644
--- a/lib/js/admin/category1.js
+++ b/lib/js/admin/category1.js
@@ -92,7 +92,7 @@ var CategorysDataStore = new Ext.data.Store({
 			{ name: 'lib_category', type: 'string', mapping: 'lib_category'},
 			{ name: 'icon_category', type: 'string', mapping: 'icon_category'},
 			{ name: 'treerank_category', type: 'int', mapping: 'treerank_category'},
-			{ name: 'display_category', type: 'bool'}
+			{ name: 'display_category', type: 'bool'} 
 	]),
 	sortInfo: {field: 'lib_category', direction: 'ASC'}
 });
diff --git a/lib/js/admin/main1.js b/lib/js/admin/main1.js
index 21cc3d58..66ac5e80 100644
--- a/lib/js/admin/main1.js
+++ b/lib/js/admin/main1.js
@@ -116,6 +116,13 @@ Ext.onReady(function(){
             iconCls: 'fugue_users',
             tabCls: 'right-tab',
             items: UsersListingEditorGrid
+        }, {
+            id: 'users_link_pole',
+            layout: 'fit',
+            title: T_users_link_pole,
+            iconCls: 'fugue_users',
+            tabCls: 'right-tab',
+            items: UsersLinkListingEditorGrid
         }
         ],
 		listeners: {
@@ -134,6 +141,10 @@ Ext.onReady(function(){
 		        }else if (tab.id == "subcategory"){
 		        	SubCategorysDataStore.load({params: {start: 0, limit: 250}});
 		        	IconsDataStore.load({params: {start: 0, limit: 250}});
+		        }else if (tab.id == "users_link_pole"){
+		        	LinksDataStore.load({params: {start: 0, limit: 250}});
+		        }else if (tab.id == "config"){
+		        	IconsDataStore.load({params: {start: 0, limit: 250}});
 		        }
 		    }
 		}
diff --git a/lib/js/admin/mapadmin.js b/lib/js/admin/mapadmin.js
index ac89fde1..bcd27b9c 100644
--- a/lib/js/admin/mapadmin.js
+++ b/lib/js/admin/mapadmin.js
@@ -74,7 +74,7 @@ function getMarker() {
 	console.info('Dans mapadmin1.js getMarker '+tabcheckchild);
 	if (tabcheckchild != '') {
 		document.getElementById("loader").style.display = "block";
-		var uri = 'lib/php/admin/getMarker.php?listType='+tabcheckchild+'&dateLastModif='+dateLastModif+'&priority='+comboPrioritePOIMapItemMenu.getValue()+'&status='+StatusPOIFieldMapItemMenu.getValue()+'&displayObservationsToBeAnalyzedByComCom='+displayObservationsToBeAnalyzedByComCom+'&displayObservationsToBeAnalyzedByPole='+displayObservationsToBeAnalyzedByPole+'&commentToModerate='+displayObservationsWithCommentToModerate;
+		var uri = 'lib/php/admin/getMarker.php?listType='+tabcheckchild+'&dateLastModif='+dateLastModif+'&priority='+comboPrioritePOIMapItemMenu.getValue()+'&status='+StatusPOIFieldMapItemMenu.getValue()+'&displayObservationsToBeAnalyzedByComCom='+displayObservationsToBeAnalyzedByComCom+'&displayObservationsToBeAnalyzedByPole='+displayObservationsToBeAnalyzedByPole+'&commentToModerate='+displayObservationsWithCommentToModerate+'&nbSupportMinimum='+nbSupportMinimum;
 		OpenLayers.loadURL(uri, '', this, displayMarker);
 	}
 }
@@ -278,7 +278,7 @@ function createPopup(feature) {
 		collapse: false,
 		collapsible: false,
 		resizable: true,
-		width: 600,
+		width: 800,
 		height: 450,
 		anchored: true,               
 		autoScroll: true,
@@ -545,7 +545,12 @@ var mapAdminPanel = new GeoExt.MapPanel({
 	tbar: new Ext.Toolbar({
 		height: '20',
 		cls: 'x-panel-header',
-		items: arrayItemsMenuAdminMap
+		items: arrayItemsMenuTopAdminMap
+	}),
+	bbar: new Ext.Toolbar({
+		height: '20',
+		cls: 'x-panel-header',
+		items: arrayItemsMenuBottomAdminMap
 	})
 });
 
diff --git a/lib/js/admin/poi1.js b/lib/js/admin/poi1.js
index 75606e34..8743a772 100644
--- a/lib/js/admin/poi1.js
+++ b/lib/js/admin/poi1.js
@@ -398,7 +398,9 @@ function endDrag(feat) {
 
 
 var arrayItemsCenterPanel = [POIListingEditorGrid,PrioriteListingEditorGrid,StatusListingEditorGrid,BasketListingEditorGrid];
-var arrayItemsMenuAdminMap = ['Filtres : ',dateFieldModifiedSince, CancelDateFilterItem, '&', StatusPOIFieldMapItemMenu, CancelStatusFilterItem, '&',comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem,'&',checkboxDisplayObservationsWithCommentToModerate, ', ou ',searchObservationField,searchObservationButton,'->', comboALL];
+var arrayItemsMenuTopAdminMap = ['Filtres : ',dateFieldModifiedSince,CancelDateFilterItem,'&', StatusPOIFieldMapItemMenu,CancelStatusFilterItem,'&',comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&',checkboxDisplayObservationsWithCommentToModerate,'&',numberFieldNbSupport,CancelVoteFilterItem];
+var arrayItemsMenuBottomAdminMap = [searchObservationField,'->', comboALL];
+
 var arrayItemsPhotoManagement = [hiddenIdPOI,
                          		{
 	html: "<center><img id='photo' height='350' src='resources/images/logo_blank.png'/></center><br/>"
diff --git a/lib/js/admin/poi2.js b/lib/js/admin/poi2.js
index 028121c3..1a9d4b53 100644
--- a/lib/js/admin/poi2.js
+++ b/lib/js/admin/poi2.js
@@ -283,7 +283,10 @@ function saveThePOI(oGrid_event) {
 
 
 var arrayItemsCenterPanel = [POIListingEditorGrid];
-var arrayItemsMenuAdminMap = ['Filtres : ',dateFieldModifiedSince, CancelDateFilterItem, '&',StatusPOIFieldMapItemMenu, CancelStatusFilterItem, '&',comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem, '&',checkboxDisplayObservationsToBeAnalyzedByComCom,', ou ', searchObservationField,searchObservationButton, '->', comboALL];
+
+var arrayItemsMenuTopAdminMap = ['Filtres : ',dateFieldModifiedSince,CancelDateFilterItem,'&',StatusPOIFieldMapItemMenu,CancelStatusFilterItem,'&',comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&',checkboxDisplayObservationsToBeAnalyzedByComCom,'&',numberFieldNbSupport,CancelVoteFilterItem];
+var arrayItemsMenuBottomAdminMap = [searchObservationField, '->', comboALL];
+
 var arrayItemsPhotoManagement = [hiddenIdPOI,
 	{
 		html: "<center><img id='photo' height='350' src='resources/images/logo_blank.png'/></center><br/>"
diff --git a/lib/js/admin/poi3.js b/lib/js/admin/poi3.js
index c04db366..3aee0477 100644
--- a/lib/js/admin/poi3.js
+++ b/lib/js/admin/poi3.js
@@ -249,7 +249,10 @@ function saveThePOI(oGrid_event) {
 }
 
 var arrayItemsCenterPanel = [POIListingEditorGrid];
-var arrayItemsMenuAdminMap = ['Filtres : ',dateFieldModifiedSince, CancelDateFilterItem, '&',StatusPOIFieldMapItemMenu, CancelStatusFilterItem, '&',comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem, '&',checkboxDisplayObservationsToBeAnalyzedByPole, '->',', ou',searchObservationField,searchObservationButton, comboALL]
+
+var arrayItemsMenuTopAdminMap = ['Filtres : ',dateFieldModifiedSince,CancelDateFilterItem,'&',StatusPOIFieldMapItemMenu,CancelStatusFilterItem,'&',comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&',checkboxDisplayObservationsToBeAnalyzedByPole,'&',numberFieldNbSupport,CancelVoteFilterItem]
+var arrayItemsMenuBottomAdminMap = [searchObservationField, '->',comboALL]
+
 var arrayItemsPhotoManagement = [hiddenIdPOI,
                          		{
 	html: "<center><img id='photo' height='350' src='resources/images/logo_blank.png'/></center><br/>"
diff --git a/lib/js/admin/poi4.js b/lib/js/admin/poi4.js
index b1f9cebc..e80e0802 100644
--- a/lib/js/admin/poi4.js
+++ b/lib/js/admin/poi4.js
@@ -362,7 +362,10 @@ function endDrag(feat) {
 }
 
 var arrayItemsCenterPanel = [POIListingEditorGrid,BasketListingEditorGrid];
-var arrayItemsMenuAdminMap = ['Filtres : ',dateFieldModifiedSince, CancelDateFilterItem, '&', comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem, '&',checkboxDisplayObservationsWithCommentToModerate,'->', ', ou ',searchObservationField,searchObservationButton, comboALL];
+
+var arrayItemsMenuTopAdminMap = ['Filtres : ',dateFieldModifiedSince,CancelDateFilterItem,'&',StatusPOIFieldMapItemMenu,CancelStatusFilterItem,'&', comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&',checkboxDisplayObservationsWithCommentToModerate,'&',numberFieldNbSupport,CancelVoteFilterItem];
+var arrayItemsMenuBottomAdminMap = [searchObservationField, '->',comboALL];
+
 var arrayItemsPhotoManagement = [hiddenIdPOI,
                                  {
     html: "<center><img id='photo' height='350' src='resources/images/logo_blank.png'/></center><br/>"
diff --git a/lib/js/admin/poiCommon.js b/lib/js/admin/poiCommon.js
index de362aa8..50a65004 100644
--- a/lib/js/admin/poiCommon.js
+++ b/lib/js/admin/poiCommon.js
@@ -4,20 +4,8 @@ var idPOI; // <== need for photo
 var id;
 
 
-var searchObservationField = new Ext.form.TextField({
-	id: 'searchObservationField',
-	allowBlank: true,
-	anchor : '99%',
-	emptyText:'N° Observation',
-	width:90
-});
-var searchObservationButton = new Ext.Button({ text:'Afficher',
-	listeners: {
-		click: function() {
-			console.log('valeur obs = ' + searchObservationField.getValue());
-			getMarkerByID(searchObservationField.getValue());
-		}
-	}});
+
+
 var singleObservationIdToDisplay;
 function getMarkerByID(id) {
     clearMarker();
@@ -166,7 +154,6 @@ var PolePOIList2 = new Ext.data.JsonStore({
 		emptyText: 'Filter par priorité'
 	});
 
-
 //combobox in the moderation interface of the observation
 var StatusPOIField = new Ext.form.ComboBox({
     id:'StatusPOIField',
@@ -181,7 +168,6 @@ var StatusPOIField = new Ext.form.ComboBox({
     allowBlank: false,
     emptyText: ''
 });
-
 //combobox in the grid listing the observations
 	var comboStatusPOI = new Ext.form.ComboBox({
 		fieldLabel: T_status,
@@ -1282,11 +1268,12 @@ var communePOIList = new Ext.data.JsonStore({
 		var observationImagePanel = new Ext.Panel({
 			id:"observationImagePanel",
 			html: T_noPhoto,
-			width:200
+			width:250
 				});
 		//moderation window used in poix.js
 		var observationCommentsPanel = new Ext.Panel({
 			id:"observationCommentsPanel",
+			width:300,
 			html: T_noComment,
 			autoScroll:true
 				});
@@ -1436,11 +1423,11 @@ function createFeatureInModerationMap(X,Y,commune,pole,status,traiteParPole,tran
 		});
 		var moderationInterfaceWindow = new Ext.Window({
 		    title: T_record,
-		    height: 600,
-		    width: 975,
+		    height: 645,
+		    width: 1075,
 		    layout:'table',
 		    layoutConfig: {columns:3},
-		    defaults: {frame:true, height: 400},
+		    defaults: {frame:true, height: 390},
 		    modal: true,
 		    maximizable: true,
 		    items: [expandMapPanel,observationImagePanel,observationCommentsPanel],
diff --git a/lib/js/admin/poiCommonBeforeRender.js b/lib/js/admin/poiCommonBeforeRender.js
index f027c2a0..4f1e9e5a 100644
--- a/lib/js/admin/poiCommonBeforeRender.js
+++ b/lib/js/admin/poiCommonBeforeRender.js
@@ -182,7 +182,8 @@ var PhotoPOIModifSuppForm = new Ext.form.FormPanel({
 	            task: "EDITCOMMENTS",
 	            id_comment: oGrid_event.record.data.id_commentaires,
 	            text_comment: oGrid_event.record.data.text_commentaires,
-	            display_commentaires: oGrid_event.record.data.display_commentaires
+	            display_commentaires: oGrid_event.record.data.display_commentaires,
+	            beInformedField: oGrid_event.record.data.beInformedField,
 	        },
 	        success: function(response) {
 	            var result = eval(response.responseText);
diff --git a/lib/js/admin/status1.js b/lib/js/admin/status1.js
index 870f3a97..75e37ccf 100644
--- a/lib/js/admin/status1.js
+++ b/lib/js/admin/status1.js
@@ -5,23 +5,8 @@ var LibStatusField = new Ext.form.TextField({
 	allowBlank: false,
 	anchor : '95%'
 });
-//var colorStatusField = new Ext.form.TextField({
-//	id: 'colorStatusField',
-//	fieldLabel: T_color_status,
-//	maxLength: 50,
-//	allowBlank: false,
-//	anchor : '95%'
-//});
-
-//var colorStatusStore= new Ext.data.JsonStore({
-//    url: 'lib/php/admin/getStatus.php',
-//    root: 'status',
-//    fields: [
-//        {name: 'id_status'},
-//        {name: 'color_status'}
-//    ]
-//});
 
+//colors defined in key.js.template
 var colorStatusStore = new Ext.data.ArrayStore({
     // store configs
     autoDestroy: true,
@@ -37,7 +22,7 @@ var colorStatusStore = new Ext.data.ArrayStore({
 var colorStatusCombo = new Ext.form.ComboBox({
 	fieldLabel: T_color_status,
     store: colorStatusStore,
-    displayField: 'color_status',
+    displayField: 'color_status_display',
     valueField: 'color_status',
     forceSelection: true,
     editable: false,
@@ -49,7 +34,7 @@ var colorStatusCombo = new Ext.form.ComboBox({
 var colorStatusComboGrid = new Ext.form.ComboBox({
 	fieldLabel: T_color_status,
     store: colorStatusStore,
-    displayField: 'color_status',
+    displayField: 'color_status_display',
     valueField: 'color_status',
     forceSelection: true,
     editable: false,
@@ -113,7 +98,8 @@ var StatussDataStore = new Ext.data.Store({
 	},[
 			{ name: 'id_status', type: 'int', mapping: 'id_status'},
 			{ name: 'lib_status', type: 'string', mapping: 'lib_status'},
-			{ name: 'color_status', type: 'string', mapping: 'color_status'}
+			{ name: 'color_status', type: 'string', mapping: 'color_status'},
+			{ name: 'is_active_status', type: 'bool', mapping: 'is_active_status'}
 	]),
 	sortInfo: {field: 'lib_status', direction: 'ASC'}
 });
@@ -126,7 +112,12 @@ var identifiantStatus = new Ext.grid.Column({
 	hidden: false,
 	readOnly: true
 });
-
+var chkColumn_deactivate_status = new Ext.grid.CheckColumn({
+	header: T_active,
+	width: 80,
+	sortable: true,
+	dataIndex: 'is_active_status'
+});
 var StatussColumnModel = new Ext.grid.ColumnModel(
 	[identifiantStatus, { 
 			header: T_status, 
@@ -143,7 +134,7 @@ var StatussColumnModel = new Ext.grid.ColumnModel(
             width: 150,
             sortable: true,
             editor: colorStatusComboGrid
-        }
+        }, chkColumn_deactivate_status
 		]
 );
 StatussColumnModel.defaultSortable = true;
@@ -153,6 +144,7 @@ var StatusListingEditorGrid = new Ext.grid.EditorGridPanel({
 	iconCls: 'silk_rainbow',
 	id: 'StatusListingEditorGrid',
 	store: StatussDataStore,
+	plugins: [chkColumn_deactivate_status],
 	cm: StatussColumnModel,
 	clicksToEdit: 2,
 	selModel: new Ext.grid.RowSelectionModel({singleSelect: false}),
@@ -162,11 +154,11 @@ var StatusListingEditorGrid = new Ext.grid.EditorGridPanel({
 		displayInfo: true
 	}),
   tbar: [
-    /*{
+    {
 			text: T_addStatus,
 			handler: displayFormWindowStatus,
 			iconCls: 'silk_add'
-    }, '-', {
+    },/* '-', {
 			text: T_deleteSelection,
 			handler: confirmDeleteStatuss,
 			iconCls: 'silk_delete'
@@ -184,7 +176,7 @@ var StatusListingEditorGrid = new Ext.grid.EditorGridPanel({
 	]
 });
 StatusListingEditorGrid.on('afteredit', saveTheStatus);
-
+chkColumn_deactivate_status.on('click', saveTheStatusActive)
 function saveTheStatus(oGrid_event){
 	Ext.get('update').show();
 	Ext.Ajax.request({
@@ -197,8 +189,10 @@ function saveTheStatus(oGrid_event){
 			color_status: oGrid_event.record.data.color_status
 		},
 		success: function(response) {
-			var result = eval(response.responseText);
-			switch (result) {
+			var result = response.responseText;
+            var res = result.split(":");
+            console.log(result);
+            switch (Number(res[0])) {
 				case 1:
 					StatussDataStore.commitChanges();
 					StatusListingEditorGrid.selModel.clearSelections();
@@ -207,7 +201,7 @@ function saveTheStatus(oGrid_event){
 				case 2:
 					Ext.MessageBox.show({
 						title: T_careful,
-						msg: T_cantModifyField,
+						msg: T_cantModifyField + res[1],
 						buttons: Ext.MessageBox.OK,
 						icon: Ext.MessageBox.INFO
 					});
@@ -227,7 +221,49 @@ function saveTheStatus(oGrid_event){
 		}
 	});
 }
-
+function saveTheStatusActive(ctrlObj, eventObj, recordObj){
+    Ext.get('update').show();
+    Ext.Ajax.request({
+        waitMsg: T_pleaseWait,
+        url: 'lib/php/admin/database.php',
+        params: {
+            task: "UPDATESTATUS",
+            id_status: recordObj.data.id_status,
+            is_active_status: recordObj.data.is_active_status
+        },
+        success: function(response) {
+        	var result = response.responseText;
+            var res = result.split(":");
+            console.log(result);
+            switch (Number(res[0])) {
+                case 1:
+                    UsersDataStore.commitChanges();
+                    UsersListingEditorGrid.selModel.clearSelections();
+                    POIsDataStore.reload();
+                    break;
+                case 2:
+                    Ext.MessageBox.show({
+                        title: T_careful,
+                        msg: T_cantModifyField + res[1],
+                        buttons: Ext.MessageBox.OK,
+                        icon: Ext.MessageBox.INFO
+                    });
+                    break;
+            }
+            Ext.get('update').hide();
+        },
+        failure: function(response){
+            var result = response.responseText;
+            Ext.MessageBox.show({
+                title: T_careful,
+                msg: T_badConnect,
+                buttons: Ext.MessageBox.OK,
+                icon: Ext.MessageBox.ERROR
+            });
+            Ext.get('update').hide();
+        }
+    });
+}
 function confirmDeleteStatuss() {
 	if(StatusListingEditorGrid.selModel.getCount() == 1){
 		Ext.MessageBox.confirm(T_confirm,T_deleteRecord, deleteStatuss);
@@ -303,10 +339,11 @@ function deleteStatuss(btn) {
 
 function resetStatusForm() {
 	LibStatusField.setValue('');
+	colorStatusCombo.setValue('');
 }
 
 function isStatusFormValid() {
-	return(LibStatusField.isValid()
+	return(LibStatusField.isValid() && colorStatusCombo.isValid()
 	);
 }
 
@@ -327,7 +364,8 @@ function createTheStatus() {
 			url: 'lib/php/admin/database.php',
 			params: {
 				task: "CREATESTATUS",
-				lib_status:			LibStatusField.getValue()
+				lib_status:			LibStatusField.getValue(),
+				color_status:			colorStatusCombo.getValue()
 			}, 
 			success: function(response) {            
 				var result = eval(response.responseText);
diff --git a/lib/js/admin/userUpdate.js b/lib/js/admin/userUpdate.js
index 9be01647..f3374a91 100644
--- a/lib/js/admin/userUpdate.js
+++ b/lib/js/admin/userUpdate.js
@@ -32,8 +32,6 @@ var EmailUserUpdateField = new Ext.form.TextField({
     vtype: 'email'
 });
 
-
-
 var UserDataStore = new Ext.data.Store({
     id: 'UserDataStore',
     proxy: new Ext.data.HttpProxy({
@@ -50,10 +48,7 @@ var UserDataStore = new Ext.data.Store({
         { name: 'nom_users', type: 'string', mapping: 'nom_users'},
         { name: 'mail_users', type: 'email', mapping: 'mail_users'},
         { name: 'lib_users', type: 'string', mapping: 'lib_users'},
-//        { name: 'pass_users', type: 'string', mapping: 'pass_users'},
         { name: 'lib_usertype', type: 'string', mapping: 'lib_usertype'},
-        { name: 'lib_userpole', type: 'string', mapping: 'lib_userpole'},
-        { name: 'lib_territoire', type: 'string', mapping: 'lib_territoire'}
     ]),
     sortInfo: {field: 'id_users', direction: 'ASC'}
 });
@@ -125,26 +120,6 @@ var comboUsertypeUser = new Ext.form.TextField({
     emptyText: ''
 });
 
-
-var comboPoleUser = new Ext.form.TextField({
-    fieldLabel: T_pole,
-    displayField: 'lib_userpole',
-    valueField: 'id_userpole',
-    readOnly: true,
-    emptyText: ''
-});
-
-
-var comboTerritoireUser = new Ext.form.TextField({
-    fieldLabel: T_territoire,
-    displayField: 'lib_territoire',
-    valueField: 'id_territoire',
-    forceSelection: true,
-    readOnly: true,
-    editable: false,
-    emptyText: ''
-});
-
 var UsersColumnModel = new Ext.grid.ColumnModel(
     [identifiantUser, {
             header: T_nomusers,
@@ -186,20 +161,6 @@ var UsersColumnModel = new Ext.grid.ColumnModel(
             sortable: true,
             editor: comboUsertypeUser,
             readOnly: true
-        },{
-            header: T_pole,
-            dataIndex: 'lib_userpole',
-            width: 150,
-            sortable: true,
-            editor: comboPoleUser,
-            readOnly: true
-        },{
-            header: T_territoire,
-            dataIndex: 'lib_territoire',
-            width: 150,
-            sortable: true,
-            editor: comboTerritoireUser,
-            readOnly: true
         }
     ]
 );
diff --git a/lib/js/admin/users1.js b/lib/js/admin/users1.js
index cd1b0008..d76c5fbe 100644
--- a/lib/js/admin/users1.js
+++ b/lib/js/admin/users1.js
@@ -12,6 +12,7 @@ var UsertypeUserField = new Ext.form.ComboBox({
     store: UsertypeUserList2,
     displayField: 'lib_usertype',
     valueField: 'id_usertype',
+    anchor : '95%',
     forceSelection: true,
     editable: false,
     mode: 'remote',
@@ -31,11 +32,13 @@ var PoleUserList2 = new Ext.data.JsonStore({
 });
 
 var PoleUserField = new Ext.form.ComboBox({
+    id:'PoleUserField',
     fieldLabel: T_pole,
     store: PoleUserList2,
     displayField: 'lib_userpole',
     valueField: 'id_userpole',
     forceSelection: true,
+    anchor : '95%',
     editable: false,
     mode: 'remote',
     triggerAction: 'all',
@@ -58,6 +61,7 @@ var TerritoireUserField = new Ext.form.ComboBox({
     store: TerritoireUserList2,
     displayField: 'lib_territoire',
     valueField: 'id_territoire',
+    anchor : '95%',
     forceSelection: true,
     editable: false,
     mode: 'remote',
@@ -104,7 +108,7 @@ var UsersCreateForm = new Ext.FormPanel({
     labelAlign: 'top',
     bodyStyle: 'padding:5px',
     frame: true,
-    width: 350,
+    width: 400,
     items: [{
         layout: 'column',
         border: false,
@@ -158,8 +162,9 @@ var UsersDataStore = new Ext.data.Store({
         { name: 'lib_users', type: 'string', mapping: 'lib_users'},
 //        { name: 'pass_users', type: 'string', mapping: 'pass_users'},
         { name: 'lib_usertype', type: 'string', mapping: 'lib_usertype'},
-        { name: 'lib_userpole', type: 'string', mapping: 'lib_userpole'},
-        { name: 'lib_territoire', type: 'string', mapping: 'lib_territoire'}
+//        { name: 'lib_userpole', type: 'string', mapping: 'lib_userpole'},
+//        { name: 'lib_territoire', type: 'string', mapping: 'lib_territoire'},
+        { name: 'is_active_user', type: 'bool'}
     ]),
     sortInfo: {field: 'id_users', direction: 'ASC'}
 });
@@ -188,7 +193,10 @@ var resetPasswordButton = new Ext.grid.Column({
 	width: 110,
 	sortable: false,
 	renderer: function(value, metaData, record, rowIndex, colIndex, store) {
-        return '<button>'+T_resetPasswordButton+'</button>';
+        if (record.data.is_active_user){
+        	return '<button>'+T_resetPasswordButton+'</button>';
+        }
+		return T_inactive_status_user;
 	}
 	
 });
@@ -233,48 +241,11 @@ var comboUsertypeUser = new Ext.form.ComboBox({
     emptyText: ''
 });
 
-var poleUserList = new Ext.data.JsonStore({
-    url: 'lib/php/admin/getPoleUser.php',
-    root: 'userpole',
-    fields: [
-        {name: 'id_userpole'},
-        {name: 'lib_userpole'}
-    ]
-});
-
-var comboPoleUser = new Ext.form.ComboBox({
-    fieldLabel: T_pole,
-    store: poleUserList,
-    displayField: 'lib_userpole',
-    valueField: 'id_userpole',
-    forceSelection: true,
-    editable: false,
-    mode: 'remote',
-    triggerAction: 'all',
-    selectOnFocus: true,
-    emptyText: ''
-});
-
-var territoireUserList = new Ext.data.JsonStore({
-    url: 'lib/php/admin/getTerritoire.php',
-    root: 'userterritoire',
-    fields: [
-        {name: 'id_territoire'},
-        {name: 'lib_territoire'}
-    ]
-});
-
-var comboTerritoireUser = new Ext.form.ComboBox({
-    fieldLabel: T_territoire,
-    store: territoireUserList,
-    displayField: 'lib_territoire',
-    valueField: 'id_territoire',
-    forceSelection: true,
-    editable: false,
-    mode: 'remote',
-    triggerAction: 'all',
-    selectOnFocus: true,
-    emptyText: ''
+var chkColumn_deactivate = new Ext.grid.CheckColumn({
+	header: T_active,
+	width: 80,
+	sortable: true,
+	dataIndex: 'is_active_user'
 });
 
 var UsersColumnModel = new Ext.grid.ColumnModel(
@@ -315,27 +286,18 @@ var UsersColumnModel = new Ext.grid.ColumnModel(
             width: 150,
             sortable: true,
             editor: comboUsertypeUser
-        },{
-            header: T_pole,
-            dataIndex: 'lib_userpole',
-            width: 150,
-            sortable: true,
-            editor: comboPoleUser
-        },{
-            header: T_territoire,
-            dataIndex: 'lib_territoire',
-            width: 150,
-            sortable: true,
-            editor: comboTerritoireUser
         }
+        ,chkColumn_deactivate
     ]
 );
+
 UsersColumnModel.defaultSortable = true;
 
 var UsersListingEditorGrid = new Ext.grid.EditorGridPanel({
     id: 'UsersListingEditorGrid',
     store: UsersDataStore,
     cm: UsersColumnModel,
+    plugins: [chkColumn_deactivate],
     clicksToEdit: 2,
     selModel: new Ext.grid.RowSelectionModel({singleSelect: false}),
     bbar: new Ext.PagingToolbar({
@@ -362,7 +324,7 @@ var UsersListingEditorGrid = new Ext.grid.EditorGridPanel({
     ]
 });
 UsersListingEditorGrid.on('afteredit', saveTheUser);
-
+chkColumn_deactivate.on('click', saveTheUserActive)
 function saveTheUser(oGrid_event){
     Ext.get('update').show();
     Ext.Ajax.request({
@@ -376,7 +338,50 @@ function saveTheUser(oGrid_event){
             mail_users: oGrid_event.record.data.mail_users,
             num_pole: oGrid_event.record.data.lib_userpole,
             territoire_id_territoire: oGrid_event.record.data.lib_territoire,
-            usertype_id_usertype: oGrid_event.record.data.lib_usertype
+            usertype_id_usertype: oGrid_event.record.data.lib_usertype,
+            is_active_user: oGrid_event.record.data.is_active_user
+        },
+        success: function(response) {
+            var result = eval(response.responseText);
+            switch (result) {
+                case 1:
+                    UsersDataStore.commitChanges();
+                    UsersListingEditorGrid.selModel.clearSelections();
+                    POIsDataStore.reload();
+                    break;
+                case 2:
+                    Ext.MessageBox.show({
+                        title: T_careful,
+                        msg: T_cantModifyField,
+                        buttons: Ext.MessageBox.OK,
+                        icon: Ext.MessageBox.INFO
+                    });
+                    break;
+            }
+            Ext.get('update').hide();
+        },
+        failure: function(response){
+            var result = response.responseText;
+            Ext.MessageBox.show({
+                title: T_careful,
+                msg: T_badConnect,
+                buttons: Ext.MessageBox.OK,
+                icon: Ext.MessageBox.ERROR
+            });
+            Ext.get('update').hide();
+        }
+    });
+}
+
+function saveTheUserActive(ctrlObj, eventObj, recordObj){
+    Ext.get('update').show();
+    Ext.Ajax.request({
+        waitMsg: T_pleaseWait,
+        url: 'lib/php/admin/database.php',
+        params: {
+            task: "UPDATEUSER",
+            id_users: recordObj.data.id_users,
+            is_active_user: recordObj.data.is_active_user
         },
         success: function(response) {
             var result = eval(response.responseText);
@@ -488,7 +493,7 @@ function resetUserForm() {
 }
 
 function isUserFormValid() {
-    return(LoginUsersField.isValid() && PasswordUsersField.isValid() && NameUsersField.isValid() && EmailUsersField.isValid() && PoleUserField.isValid() && TerritoireUserField.isValid() && UsertypeUserField.isValid());
+	return(LoginUsersField.isValid() && PasswordUsersField.isValid() && NameUsersField.isValid() && EmailUsersField.isValid() && PoleUserField.isValid() && TerritoireUserField.isValid() && UsertypeUserField.isValid());
 }
 
 function displayFormWindowUser() {
@@ -538,6 +543,14 @@ function createTheUser() {
                             icon: Ext.MessageBox.INFO
                         });
                         break;
+                    case 3:
+                        Ext.MessageBox.show({
+                            title: T_pb,
+                            msg: T_addedUserFailed + T_addedUserFailedInconsistency,
+                            buttons: Ext.MessageBox.OK,
+                            icon: Ext.MessageBox.INFO
+                        });
+                        break;
                     default:
                         Ext.MessageBox.show({
                             title: T_careful,
diff --git a/lib/js/admin/users_link_pole1.js b/lib/js/admin/users_link_pole1.js
new file mode 100644
index 00000000..47793318
--- /dev/null
+++ b/lib/js/admin/users_link_pole1.js
@@ -0,0 +1,488 @@
+var UserList = new Ext.data.JsonStore({
+    url: 'lib/php/admin/getModeratorUsers.php',
+    root: 'users',
+    fields: [
+        {name: 'id_users'},
+        {name: 'lib_users'}
+    ]
+});
+
+var ModeratorUsersField = new Ext.form.ComboBox({
+    fieldLabel: T_moderator,
+    store: UserList,
+    displayField: 'lib_users',
+    valueField: 'id_users',
+    forceSelection: true,
+    anchor : '95%',
+    editable: false,
+    mode: 'remote',
+    triggerAction: 'all',
+    selectOnFocus: true,
+    allowBlank: false,
+    emptyText: ''
+});
+var PoleUserList2 = new Ext.data.JsonStore({
+    url: 'lib/php/admin/getPoleUser.php',
+    root: 'userpole',
+    fields: [
+        {name: 'id_userpole'},
+        {name: 'lib_userpole'}
+    ]
+});
+
+var PoleUserLinkField = new Ext.form.ComboBox({
+    id:'PoleUserLinkField',
+    fieldLabel: T_pole,
+    store: PoleUserList2,
+    displayField: 'lib_userpole',
+    valueField: 'id_userpole',
+    forceSelection: true,
+    anchor : '95%',
+    editable: false,
+    mode: 'remote',
+    triggerAction: 'all',
+    selectOnFocus: true,
+    allowBlank: false,
+    emptyText: ''
+});
+
+var LinkUserPoleCreateForm = new Ext.FormPanel({
+    labelAlign: 'top',
+    bodyStyle: 'padding:5px',
+    frame: true,
+    width: 400,
+    items: [{
+        layout: 'column',
+        border: false,
+        items:[{
+            columnWidth:1,
+            layout: 'form',
+            border: false,
+            items: [ModeratorUsersField,PoleUserLinkField]
+        }]
+    }],
+    buttons: [{
+        text: T_save,
+        handler: createLinkUserPole
+    },{
+        text: T_cancel,
+        handler: function(){
+        	LinkUserPoleCreateWindow.hide();
+        }
+    }]
+});
+
+var LinkUserPoleCreateWindow= new Ext.Window({
+    id: 'LinkUserPoleCreateWindow',
+    iconCls: 'silk_user_add',
+    title: T_addLinkUserPole,
+    closable: false,
+    border: false,
+    width: 350,
+    height: 220,
+    plain: true,
+    layout: 'fit',
+    modal: true,
+    items: LinkUserPoleCreateForm
+});
+
+var LinksDataStore = new Ext.data.Store({
+    id: 'LinksDataStore',
+    proxy: new Ext.data.HttpProxy({
+        url: 'lib/php/admin/database.php',
+        method: 'POST'
+    }),
+    baseParams: {task: 'LISTINGLINKUSERPOLE'},
+    reader: new Ext.data.JsonReader({
+        root: 'results',
+        totalProperty: 'total',
+        id: 'id'
+    },[
+    	{ name: 'user_link_pole_id', type: 'int', mapping: 'user_link_pole_id'},
+    	{ name: 'id_users', type: 'int', mapping: 'id_users'},
+        { name: 'lib_users', type: 'string', mapping: 'lib_users'},
+        { name: 'lib_pole', type: 'string', mapping: 'lib_pole'},
+        { name: 'lib_territoire', type: 'string', mapping: 'lib_territoire'}]),
+    sortInfo: {field: 'id_users', direction: 'ASC'}
+});
+
+var identifiantUser = new Ext.grid.Column({
+    header: '#',
+    dataIndex: 'user_link_pole_id',
+    width: 30,
+    sortable: true,
+    hidden: false,
+    readOnly: true
+});
+var libUser = new Ext.grid.Column({
+    header: 'Lib',
+    dataIndex: 'lib_users',
+    width: 70,
+    sortable: true,
+    hidden: false,
+    readOnly: true
+});
+
+
+var identifiantLinkUserPole = new Ext.grid.Column({
+    header: '#',
+    dataIndex: 'id_users',
+    width: 30,
+    sortable: true,
+    hidden: false,
+    readOnly: true
+});
+
+var poleUserList = new Ext.data.JsonStore({
+    url: 'lib/php/admin/getPoleUser.php',
+    root: 'userpole',
+    fields: [
+        {name: 'id_userpole'},
+        {name: 'lib_userpole'}
+    ]
+});
+
+var comboPoleUser = new Ext.form.ComboBox({
+    fieldLabel: T_pole,
+    store: poleUserList,
+    displayField: 'lib_userpole',
+    valueField: 'id_userpole',
+    forceSelection: true,
+    editable: false,
+    mode: 'remote',
+    triggerAction: 'all',
+    selectOnFocus: true,
+    emptyText: ''
+});
+
+var territoireUserList = new Ext.data.JsonStore({
+    url: 'lib/php/admin/getTerritoire.php',
+    root: 'userterritoire',
+    fields: [
+        {name: 'id_territoire'},
+        {name: 'lib_territoire'}
+    ]
+});
+
+var comboTerritoireUser = new Ext.form.ComboBox({
+    fieldLabel: T_territoire,
+    store: territoireUserList,
+    displayField: 'lib_territoire',
+    valueField: 'id_territoire',
+    forceSelection: true,
+    editable: false,
+    mode: 'remote',
+    triggerAction: 'all',
+    selectOnFocus: true,
+    emptyText: ''
+});
+
+//var chkColumn_deactivate = new Ext.grid.CheckColumn({
+//	header: T_active,
+//	width: 80,
+//	sortable: true,
+//	dataIndex: 'is_active_user'
+//});
+
+var LinksUserPoleColumnModel = new Ext.grid.ColumnModel(
+    [{
+            header: T_nomusers,
+            dataIndex: 'lib_users',
+            width: 150,
+            sortable: true,
+            editor: new Ext.form.TextField({
+                allowBlank: false,
+                maxLength: 200
+            })
+        },{
+            header: T_pole,
+            dataIndex: 'lib_pole',
+            width: 150,
+            sortable: true,
+            editor: comboPoleUser
+        },{
+            header: T_territoire,
+            dataIndex: 'lib_territoire',
+            width: 150,
+            sortable: true,
+            editor: comboTerritoireUser
+        }
+//        ,chkColumn_deactivate
+    ]
+);
+
+LinksUserPoleColumnModel.defaultSortable = true;
+
+var UsersLinkListingEditorGrid = new Ext.grid.EditorGridPanel({
+    id: 'UsersLinkListingEditorGrid',
+    store: LinksDataStore,
+    cm: LinksUserPoleColumnModel,
+    //plugins: [chkColumn_deactivate],
+    clicksToEdit: 2,
+    selModel: new Ext.grid.RowSelectionModel({singleSelect: false}),
+    bbar: new Ext.PagingToolbar({
+        pageSize: 500,
+        store: LinksDataStore,
+        displayInfo: true
+    }),
+    tbar: [
+        {
+            text: T_addLinkUserPole,
+            handler: displayFormWindowLinkUserPole,
+            iconCls: 'silk_add'
+        }, '-', {
+            text: T_deleteSelection,
+            handler: confirmDeleteLinkUserPole,
+            iconCls: 'silk_delete'
+        }, '-', {
+            text: T_unselect,
+            handler: function(){
+            	UsersLinkListingEditorGrid.selModel.clearSelections();
+            },
+            iconCls: 'silk_cross'
+        }
+    ]
+});
+//UsersLinkListingEditorGrid.on('afteredit', saveTheUser);
+////chkColumn_deactivate.on('click', saveTheUserActive)
+//function saveTheUser(oGrid_event){
+//    Ext.get('update').show();
+//    Ext.Ajax.request({
+//        waitMsg: T_pleaseWait,
+//        url: 'lib/php/admin/database.php',
+//        params: {
+//            task: "UPDATEUSER",
+//            id_users: oGrid_event.record.data.id_users,
+//            lib_users: oGrid_event.record.data.lib_users,
+//            num_pole: oGrid_event.record.data.lib_userpole,
+//            territoire_id_territoire: oGrid_event.record.data.lib_territoire,
+//        },
+//        success: function(response) {
+//            var result = eval(response.responseText);
+//            switch (result) {
+//                case 1:
+//                	LinksDataStore.commitChanges();
+//                    UsersListingEditorGrid.selModel.clearSelections();
+//                    POIsDataStore.reload();
+//                    break;
+//                case 2:
+//                    Ext.MessageBox.show({
+//                        title: T_careful,
+//                        msg: T_cantModifyField,
+//                        buttons: Ext.MessageBox.OK,
+//                        icon: Ext.MessageBox.INFO
+//                    });
+//                    break;
+//            }
+//            Ext.get('update').hide();
+//        },
+//        failure: function(response){
+//            var result = response.responseText;
+//            Ext.MessageBox.show({
+//                title: T_careful,
+//                msg: T_badConnect,
+//                buttons: Ext.MessageBox.OK,
+//                icon: Ext.MessageBox.ERROR
+//            });
+//            Ext.get('update').hide();
+//        }
+//    });
+//}
+
+//function saveTheUserActive(ctrlObj, eventObj, recordObj){
+//    Ext.get('update').show();
+//    Ext.Ajax.request({
+//        waitMsg: T_pleaseWait,
+//        url: 'lib/php/admin/database.php',
+//        params: {
+//            task: "UPDATEUSER",
+//            id_users: recordObj.data.id_users,
+//            is_active_user: recordObj.data.is_active_user
+//        },
+//        success: function(response) {
+//            var result = eval(response.responseText);
+//            switch (result) {
+//                case 1:
+//                    UsersDataStore.commitChanges();
+//                    UsersLinkListingEditorGrid.selModel.clearSelections();
+//                    POIsDataStore.reload();
+//                    break;
+//                case 2:
+//                    Ext.MessageBox.show({
+//                        title: T_careful,
+//                        msg: T_cantModifyField,
+//                        buttons: Ext.MessageBox.OK,
+//                        icon: Ext.MessageBox.INFO
+//                    });
+//                    break;
+//            }
+//            Ext.get('update').hide();
+//        },
+//        failure: function(response){
+//            var result = response.responseText;
+//            Ext.MessageBox.show({
+//                title: T_careful,
+//                msg: T_badConnect,
+//                buttons: Ext.MessageBox.OK,
+//                icon: Ext.MessageBox.ERROR
+//            });
+//            Ext.get('update').hide();
+//        }
+//    });
+//}
+
+function confirmDeleteLinkUserPole() {
+    if(UsersLinkListingEditorGrid.selModel.getCount() == 1){
+        Ext.MessageBox.confirm(T_confirm,T_deleteRecord, deleteLinkUserPole);
+    } else if(UsersLinkListingEditorGrid.selModel.getCount() > 1){
+        Ext.MessageBox.confirm(T_confirm,T_deleteRecords, deleteLinkUserPole);
+    } else {
+        Ext.MessageBox.show({
+            title: 'Uh oh...',
+            msg: T_cannotDeleteNothing,
+            buttons: Ext.MessageBox.OK,
+            icon: Ext.MessageBox.INFO
+        });
+    }
+}
+
+function deleteLinkUserPole(btn) {
+    if (btn=='yes'){
+        var selections = UsersLinkListingEditorGrid.selModel.getSelections();
+        var userz = [];
+        for(i = 0; i< UsersLinkListingEditorGrid.selModel.getCount(); i++){
+            userz.push(selections[i].json.user_link_pole_id);
+        }
+        var encoded_array = Ext.encode(userz);
+        Ext.get('update').show();
+        Ext.Ajax.request({
+            waitMsg: T_pleaseWait,
+            url: 'lib/php/admin/database.php',
+            params: {
+                task: "DELETELINKUSERPOLE",
+                ids: encoded_array
+            },
+            success: function(response) {
+            	var result = response.responseText;
+                var res = result.split(":");
+                resultCode = res[0];
+                switch (Number(resultCode)) {
+                    case 1:
+                    	LinksDataStore.reload();
+                        break;
+                    case 2:
+                        Ext.MessageBox.show({
+                            title: T_careful,
+                            msg: T_pb+ res[1],
+                            buttons: Ext.MessageBox.OK,
+                            icon: Ext.MessageBox.ERROR
+                        });
+                        UsersLinkListingEditorGrid.selModel.clearSelections();
+                        break;
+                    default:
+                        Ext.MessageBox.show({
+                            title: T_careful,
+                            msg: T_cannotDeleteSelection + res[1],
+                            buttons: Ext.MessageBox.OK,
+                            icon: Ext.MessageBox.ERROR
+                        });
+                        break;
+                }
+                Ext.get('update').hide();
+            },
+            failure: function(response) {
+                var result = response.responseText;
+                Ext.MessageBox.show({
+                    title: T_careful,
+                    msg: T_badConnect,
+                    buttons: Ext.MessageBox.OK,
+                    icon: Ext.MessageBox.ERROR
+                });
+                Ext.get('update').hide();
+            }
+        });
+    } else {
+    	UsersLinkListingEditorGrid.selModel.clearSelections();
+    }
+}
+
+function resetLinkUserPoleForm() {
+	ModeratorUsersField.setValue('');
+	PoleUserLinkField.setValue('');
+}
+
+function isLinkUserPoleFormValid() {
+    return(PoleUserLinkField.isValid() && ModeratorUsersField.isValid() );
+}
+
+function displayFormWindowLinkUserPole() {
+    if (!LinkUserPoleCreateWindow.isVisible()) {
+        resetLinkUserPoleForm();
+        LinkUserPoleCreateWindow.show();
+    } else {
+    	LinkUserPoleCreateWindow.toFront();
+    }
+}
+
+function createLinkUserPole() {
+	if (isLinkUserPoleFormValid()) {
+        Ext.get('update').show();
+        Ext.Ajax.request({
+            waitMsg: T_pleaseWait,
+            url: 'lib/php/admin/database.php',
+            params: {
+                task: "CREATELINKUSERPOLE",
+                id_user: ModeratorUsersField.getValue(),
+                num_pole: PoleUserLinkField.getValue(),
+                //territoire_id_territoire: TerritoireUserField.getValue(),
+            },
+            success: function(response) {
+            	var result = response.responseText;
+                var res = result.split(":");
+                console.log(result);
+                switch (Number(res[0])) {
+                    case 1:
+                        Ext.MessageBox.show({
+                            title: T_success,
+                            msg: T_addedLinkUserPoleSucceeded,
+                            buttons: Ext.MessageBox.OK,
+                            icon: Ext.MessageBox.INFO
+                        });
+                        LinksDataStore.reload();
+                        LinkUserPoleCreateWindow.hide();
+                        resetLinkUserPoleForm();
+                        break;
+                    case 2:
+                        Ext.MessageBox.show({
+                            title: T_pb,
+                            msg: T_addedLinkUserPoleFailed + res[1],
+                            buttons: Ext.MessageBox.OK,
+                            icon: Ext.MessageBox.INFO
+                        });
+                        break;
+                    default:
+                        Ext.MessageBox.show({
+                            title: T_careful,
+                            msg: T_addedLinkUserPoleFailed + res[1],
+                            buttons: Ext.MessageBox.OK,
+                            icon: Ext.MessageBox.WARNING
+                        });
+                        break;
+                }
+                Ext.get('update').hide();
+            },
+            failure: function(response) {
+                var result = response.responseText;
+                Ext.MessageBox.show({
+                    title: T_careful,
+                    msg: T_badConnect,
+                    buttons: Ext.MessageBox.OK,
+                    icon: Ext.MessageBox.ERROR
+                });
+                Ext.get('update').hide();
+            }
+        });
+    } else {
+        Ext.MessageBox.alert(T_careful, T_formUnvalid);
+    }
+}
\ No newline at end of file
diff --git a/lib/js/common.js b/lib/js/common.js
index 5d4caae0..65322d6c 100644
--- a/lib/js/common.js
+++ b/lib/js/common.js
@@ -1,6 +1,7 @@
 
 //field added to the map menus to filter by date
 var dateLastModif;
+var nbSupportMinimum = 0;
 var dateFieldModifiedSince = new Ext.form.DateField(
 {
     id: 'dateFieldModifiedSince',
@@ -23,81 +24,98 @@ var CancelDateFilterItem = new Ext.Button({
 	text:'',
 	handler: function() {
 	  dateFieldModifiedSince.reset();
-    dateLastModif ='1900-01-01';
+	  dateLastModif ='1900-01-01';
 		getMarker();
 	}
 });
-//field added to the map menus to filter by status
-var statusPOIList = new Ext.data.JsonStore({
-	  url: 'lib/php/admin/getStatus.php',
-	  root: 'status',
+var numberFieldNbSupport = new Ext.form.NumberField(
+		{
+		    id: 'numberFieldNbSupport',
+		    xtype: 'numberfield',
+		    width:'100px', 
+		    emptyText: "# votes minimum",
+		    listeners: {
+		        blur: function(field) {
+		        	console.log('nbSupportMinimum = %o',field.getValue());
+		        	nbSupportMinimum = field.getValue();
+		        	getMarker();
+		        },specialkey: function (field, e) {
+		            if (field.getValue() != 'null') {
+		                if (e.getKey() === e.ENTER || e.getKey() === e.TAB) {
+		                	nbSupportMinimum = field.getValue();
+		                	console.log('nbSupportMinimum = %o',field.getValue());
+		                	console.log(e.getKey());
+		                	getMarker();
+		                }
+		            }
+		        }
+		    }
+		});
+numberFieldNbSupport.on('afterrender', function(){
+	  Ext.QuickTips.register({ target: this.getEl(), text: 'N\'afficher que les observations qui ont plus de X votes' });
+	});
+var CancelVoteFilterItem = new Ext.Button({
+	id:'CancelVoteFilterItem',
+	iconCls: 'silk_cancel',
+	text:'',
+	handler: function() {
+		numberFieldNbSupport.reset();
+		nbSupportMinimum = 0;
+		getMarker();
+	}
+});
+var searchObservationField = new Ext.form.NumberField({
+	id: 'searchObservationField',
+	allowBlank: true,
+	anchor : '99%',
+	emptyText:'N° Observation à afficher',
+	width:150,
+	listeners: {
+        blur: function(field) {
+        	getMarkerByID(field.getValue());
+        },specialkey: function (field, e) {
+            if (field.getValue() != 'null') {
+                if (e.getKey() === e.ENTER || e.getKey() === e.TAB) {
+                	getMarkerByID(field.getValue()); 
+                }
+            }
+        }
+    }
+});
+searchObservationField.on('afterrender', function(){
+	  Ext.QuickTips.register({ target: this.getEl(), text: 'N\'afficher que l\'observation ayant le numéro X' });
+	});
+//priority displaying (given by the moderators)
+var prioritePOIList = new Ext.data.JsonStore({
+	  url: 'lib/php/admin/getPriorite.php',
+	  root: 'priorite',
 	  fields: [
-	    {name: 'id_status'},
-	    {name: 'lib_status'}
+	    {name: 'id_priorite'},
+	    {name: 'lib_priorite'}
 	  ]
 	});
-  
-  var StatusPOIFieldMapItemMenu = new Ext.form.ComboBox({
-      id:'StatusPOIFieldMapItemMenu',
-      fieldLabel: T_status,
-      store: statusPOIList,
-      displayField: 'lib_status',
-      valueField: 'id_status',
-      forceSelection: true,
-      mode: 'remote',
-      triggerAction: 'all',
-      selectOnFocus: true,
-      allowBlank: false,
-      editable:false,
-      emptyText: 'Filtrer par statut'
-  });
-  StatusPOIFieldMapItemMenu.on('afterrender', function(){
-  	  Ext.QuickTips.register({ target: StatusPOIFieldMapItemMenu.getEl(), text: 'N\'afficher que les observations avec le statut (donné par la collectivité) - se cumule avec les autres filtres.' });
-  });  
-  StatusPOIFieldMapItemMenu.on('select', function() {
-  	   console.log("Appel getMarker avec status = "+StatusPOIFieldMapItemMenu.getValue());
-  		getMarker();
-  });
-  var CancelStatusFilterItem = new Ext.Button({
-	   id:'CancelStatusFilterItem',
-	   iconCls: 'silk_cancel',
-	   text:'',
-	   handler: function() {
-	      StatusPOIFieldMapItemMenu.reset();
-		  	getMarker();
-	   }
-  });
-  
-  //field added to the map menus to filter by priority
-  var prioritePOIList = new Ext.data.JsonStore({
-  	  url: 'lib/php/admin/getPriorite.php',
-  	  root: 'priorite',
-  	  fields: [
-  	    {name: 'id_priorite'},
-  	    {name: 'lib_priorite'}
-  	  ]
-  	});
-  
-  	var comboPrioritePOIMapItemMenu = new Ext.form.ComboBox({
-  		fieldLabel: T_priorite,
-  		store: prioritePOIList,
-  		displayField: 'lib_priorite',
-  		valueField: 'id_priorite',
-  		forceSelection: true,
-  		editable: false,
-  		mode: 'remote',
-  		triggerAction: 'all',
-  		selectOnFocus: true,
-  		emptyText: 'Filtrer par priorité'
-  	});
-  	comboPrioritePOIMapItemMenu.on('select', function() {
-  		  console.log("Appel getMarker avec priorite = "+comboPrioritePOIMapItemMenu.getValue());
-  			getMarker();
-  		});
-  	comboPrioritePOIMapItemMenu.on('afterrender', function(){
-  		  Ext.QuickTips.register({ target: comboPrioritePOIMapItemMenu.getEl(), text: 'N\'afficher que les observations avec la prorité (donnée par le modérateur de l\'association) - se cumule avec les autres filtres.' });
-  		});
-      var CancelPrioriteFilterItem = new Ext.Button({
+
+	var comboPrioritePOIMapItemMenu = new Ext.form.ComboBox({
+		id: 'comboPrioritePOIMapItemMenu',
+		fieldLabel: T_priorite,
+		store: prioritePOIList,
+		displayField: 'lib_priorite',
+		valueField: 'id_priorite',
+		forceSelection: true,
+		editable: false,
+		mode: 'remote',
+		triggerAction: 'all',
+		selectOnFocus: true,
+		emptyText: 'Filtrer par priorité'
+	});
+	comboPrioritePOIMapItemMenu.on('select', function() {
+		   console.log("Appel getMarker avec priorite = "+comboPrioritePOIMapItemMenu.getValue());
+			getMarker();
+		});
+	comboPrioritePOIMapItemMenu.on('afterrender', function(){
+		  Ext.QuickTips.register({ target: comboPrioritePOIMapItemMenu.getEl(), text: 'N\'afficher que les observations avec la prorité (donnée par le modérateur de l\'association) - se cumule avec les autres filtres.' });
+		});
+	var CancelPrioriteFilterItem = new Ext.Button({
       	id:'CancelPrioriteFilterItem',
       	iconCls: 'silk_cancel',
       	text:'',
@@ -105,7 +123,49 @@ var statusPOIList = new Ext.data.JsonStore({
       		comboPrioritePOIMapItemMenu.reset();
       		getMarker();
       	}
-      });
+
+      });	
+	//Status displaying (given by the collectivity)
+	var statusPOIList = new Ext.data.JsonStore({
+		  url: 'lib/php/admin/getStatus.php',
+		  root: 'status',
+		  fields: [
+		    {name: 'id_status'},
+		    {name: 'lib_status'}
+		  ]
+		});
+	//combobox in the map filters
+	var StatusPOIFieldMapItemMenu = new Ext.form.ComboBox({
+	    id:'StatusPOIFieldMapItemMenu',
+	    fieldLabel: T_status,
+	    store: statusPOIList,
+	    displayField: 'lib_status',
+	    valueField: 'id_status',
+	    forceSelection: true,
+	    mode: 'remote',
+	    triggerAction: 'all',
+	    selectOnFocus: true,
+	    allowBlank: false,
+	    editable:false,
+	    emptyText: 'Filtrer par statut'
+	});
+	StatusPOIFieldMapItemMenu.on('afterrender', function(){
+		  Ext.QuickTips.register({ target: StatusPOIFieldMapItemMenu.getEl(), text: 'N\'afficher que les observations avec le statut (donné par la collectivité) - se cumule avec les autres filtres.' });
+		});  
+	StatusPOIFieldMapItemMenu.on('select', function() {
+		   console.log("Appel getMarker avec status = "+StatusPOIFieldMapItemMenu.getValue());
+			getMarker();
+		});
+	var CancelStatusFilterItem = new Ext.Button({
+		   id:'CancelStatusFilterItem',
+		   iconCls: 'silk_cancel',
+		   text:'',
+		   handler: function() {
+		      StatusPOIFieldMapItemMenu.reset();
+			  	getMarker();
+		   }
+	});
+
 function showTooltip(event){ 
 	var feature = event.feature; 
 	//Display Tooltip 
diff --git a/lib/js/key.js.template b/lib/js/key.js.template
index bddb38af..5479edf3 100644
--- a/lib/js/key.js.template
+++ b/lib/js/key.js.template
@@ -64,7 +64,7 @@ var ClusterStrategyNumberOfGroupedObservations = 6;
 var ClusterStrategyDistance = 30;
 
 
-
+//Color Management
 //pre-defined colors usable to link the status with. The color linked with a status is used to display the statistics and for the shadow of icons of the corresponding observations
 //to add a new color colorX oin this array
 //copy this array in key.js
@@ -73,10 +73,13 @@ var ClusterStrategyDistance = 30;
 //make sure to add a png image for the corresponding shadow shadowHover_colorX.png in the folder resources/icon
 
 //Be aware that an update of velobs will not keep the png files you added in resources/icon, you will have to copy them manually. Feel free to add your new colors in the velobs project on github (https://github.com/2p2r/velobs_web)
-var predefinedColorsForStatus = [['Vert','green'],['Noir','black'],['Rouge','red'],['Bleu','blue']];
+var predefinedColorsForStatus = [['Vert','green'],['Noir','black'],['Rouge','red'],['Bleu','blue'],['Marron','brown'],['Violet','purple']];
 
 //fields to inactivate for each role (have a look at the install.odt file which lists all the ids usable in thes arrays
 var arrayComponentsToDisableRole1Admin = ["latitude","longitude","emailPOIField","StatusPOIField","RespComcomPOIField", "RespPolePOIField","TraitePolePOIField","TransmissionPolePOIField"];
 var arrayComponentsToDisableRole2CommunauteCommunes = ["RespPolePOIField","latitude","longitude","emailPOIField","sendMailButton","SubCategoryPOIField", "DescPOIField", "PropPOIField", "RuePOIField", "ObsPOIField", "NumPOIField","PrioritePOIField","CommentFinalPOIField","ModerationPOIField","DisplayPOIField"];
 var arrayComponentsToDisableRole3PoleTechnique = ["latitude","longitude","emailPOIField","sendMailButton","SubCategoryPOIField", "CommunePOIField", "PolePOIField", "RespComcomPOIField", "DescPOIField", "PropPOIField", "RuePOIField", "ObsPOIField", "NumPOIField", "PrioritePOIField","CommentFinalPOIField","ModerationPOIField","DisplayPOIField"];
 var arrayComponentsToDisableRole4Moderateur = ["latitude","longitude","emailPOIField","StatusPOIField","RespComcomPOIField","RespPolePOIField","TraitePolePOIField","TransmissionPolePOIField"];
+
+//Allow to get the street of the observation given by the user while submitting a new observation
+var activateReverseGeocoding = true;
\ No newline at end of file
diff --git a/lib/js/public/map.js b/lib/js/public/map.js
index c55d565f..dec98452 100644
--- a/lib/js/public/map.js
+++ b/lib/js/public/map.js
@@ -107,7 +107,9 @@ function getMarker() {
 	if (tabcheckchild != '') {
 		console.log("before display block");
 		document.getElementById("loader").style.display = "block";
-		var uri = 'lib/php/public/getMarker.php?listType='+tabcheckchild+'&dateLastModif='+dateLastModif+'&status='+StatusPOIFieldMapItemMenu.getValue()+'&priorite='+comboPrioritePOIMapItemMenu.getValue();
+
+		var uri = 'lib/php/public/getMarker.php?listType='+tabcheckchild+'&dateLastModif='+dateLastModif+'&status='+StatusPOIFieldMapItemMenu.getValue()+'&priorite='+comboPrioritePOIMapItemMenu.getValue()+'&nbSupportMinimum='+nbSupportMinimum;
+
 		OpenLayers.loadURL(uri, '', this, displayMarker);
 
 	}
@@ -129,9 +131,14 @@ function displayMarkerAndCenterInPublicMap(response) {
 		publicMap.setCenter(new OpenLayers.LonLat(json.markers[0].lon, json.markers[0].lat).transform(new OpenLayers.Projection("EPSG:4326"), publicMap.getProjectionObject()), 15);
 		console.info('displayMarkerAndCenterInPublicMap ' + id);
 		var i = 0;
-		var comments = null;
+		var comments = '';
+		if (json.markers[i]['support']>0) {
+			comments += '<b>Nombre de votes pour cette fiche </b> : ' + json.markers[i]['support'];
+		}else {
+			comments += '<b>Nombre de votes pour cette fiche </b> : Soyez le ou la première à voter!!';
+		}
 		if (json.markers[i]['commentaires']!=null) {
-			comments = '<b>Commentaires :</b>';
+			comments += '<br /><b>Commentaires :</b>';
 			var j = 0;
 
 			while(json.markers[i]['commentaires'][j] != null) {
@@ -140,7 +147,7 @@ function displayMarkerAndCenterInPublicMap(response) {
 					comments += '<li>Ajouté le '+json.markers[i]['datecreation'][j] + ' : </li>';
 				}
 
-				comments += '<li>Commentaire : '+json.markers[i]['commentaires'][j] + '</li>';
+				comments += '<li><b>Commentaire</b> : '+json.markers[i]['commentaires'][j] + '</li>';
 				if (json.markers[i]['photos'][j] != ""){
 					comments += '<li>Photo associée <br /><img width="400" src="./resources/pictures/'+json.markers[i]['photos'][j]+'"/></li>';
 				}
@@ -149,6 +156,7 @@ function displayMarkerAndCenterInPublicMap(response) {
 			}
 			console.info('displayMarkerAndCenterInPublicMap ' + comments);
 		}
+		
 		createFeaturePublicMapAndOpen(id,lonlat.lon,lonlat.lat, json.markers[i].icon, json.markers[i].lib_priorite, json.markers[i].lib_status, json.markers[i].lib_subcategory, json.markers[i].desc, json.markers[i].prop, json.markers[i].iconCls, json.markers[i].id, json.markers[i].photo, json.markers[i].num, json.markers[i].rue, json.markers[i].commune, json.markers[i].repgt, json.markers[i].cmt, json.markers[i].date, json.markers[i].lastdatemodif_poi, comments);
 
 
@@ -173,9 +181,14 @@ function displayMarker(response) {
 		for (var i=0; i<json.markers.length; i++) {
 			var id = json.markers[i].id;
 			var lonlat = new OpenLayers.LonLat(json.markers[i].lon, json.markers[i].lat).transform(new OpenLayers.Projection("EPSG:4326"), publicMap.getProjectionObject());
-			var comments = null;
+			var comments = '';
+			if (json.markers[i]['support']>0) {
+				comments += '<b>Nombre de votes pour cette fiche </b> : ' + json.markers[i]['support'];
+			}else {
+				comments += '<b>Nombre de votes pour cette fiche </b> : Soyez le ou la première à voter!!';
+			}
 			if (json.markers[i]['commentaires']!= null) {
-				comments = '<b>Commentaires :</b>';
+				comments += '<br /><b>Commentaires :</b>';
 				var j = 0;
 				while(json.markers[i]['commentaires'][j] != null) {
 					comments += '<ul>';
@@ -191,6 +204,7 @@ function displayMarker(response) {
 					j++;
 				}
 			}
+			
 			var point = new OpenLayers.Geometry.Point(lonlat.lon,lonlat.lat);
 			var feat = new OpenLayers.Feature.Vector(point, null, null);
 
@@ -287,7 +301,7 @@ function createPopup(feature) {
 	if (!feature.cluster){
 		idPoiComment = featureToDisplay.attributes.id;
 		title = featureToDisplay.attributes.id + " " +featureToDisplay.attributes.lib_subcategory + ', '+ T_lastModificationDate + ' : ' + featureToDisplay.attributes.lastDateModif;
-
+		//htmlGeneral += "<table><tr><td>"+T_dateCreation+"</td><td> "+featureToDisplay.attributes.date+'</td></tr><tr><td>'+T_description+"</td><td> "+featureToDisplay.attributes.desc+'</td></tr></table>';
 		htmlGeneral += "<b>"+T_dateCreation+" :</b> "+featureToDisplay.attributes.date;
 		if (featureToDisplay.attributes.desc != '') {
 			htmlGeneral += "<br/><b>"+T_description+" :</b> "+featureToDisplay.attributes.desc;
@@ -322,7 +336,7 @@ function createPopup(feature) {
 		if (featureToDisplay.attributes.comments != null) {
 			htmlGeneral += '<br/>'+featureToDisplay.attributes.comments;
 		}
-		htmlGeneral += '<br/><div style="width:100%;"><button type="button" onclick="addComment()">Ajouter un commentaire et/ou une photo</button><a href="'+window.location.href.substring(0, window.location.href.lastIndexOf('/'))+'/admin.php?id='+featureToDisplay.attributes.id+'"><img src="./resources/icon/silk/script_save.png" style="float:right;" /></a></div>';
+		htmlGeneral += '<br/><div style="width:100%;"><button type="button" onclick="addComment()">Ajouter un commentaire</button> <button type="button" onclick="addSupport()">'+T_addVote+'</button><a href="'+window.location.href.substring(0, window.location.href.lastIndexOf('/'))+'/admin.php?id='+featureToDisplay.attributes.id+'"><img src="./resources/icon/silk/script_save.png" style="float:right;" /></a></div>';
 		htmlGeneral += '<br/>Lien direct vers cette observation : <a href="' + window.location.pathname.substring(0,window.location.pathname.lastIndexOf('/')) +'/index.php?id=' + featureToDisplay.attributes.id+'">'+featureToDisplay.attributes.id+'</a>';
 	}else{
 		title = featureToDisplay.cluster.length + ' observations proches dans ce regroupement';
@@ -391,6 +405,25 @@ var mailField = new Ext.form.TextField({
 	vtype: 'email',
 	anchor : '95%'
 });
+var mailSupportField = new Ext.form.TextField({
+	id: 'mailSupportField',
+	name: 'mailSupportField',
+	fieldLabel: T_email,
+	allowBlank: false,
+	maxLength: 200,
+	vtype: 'email',
+	anchor : '95%'
+});
+var beInformedField = new Ext.form.Checkbox({
+	id: 'beInformedField',
+	name: 'beInformedField',
+	fieldLabel: T_beInformed,
+});
+var beInformedSupportField = new Ext.form.Checkbox({
+	id: 'beInformedSupportField',
+	name: 'beInformedSupportField',
+	fieldLabel: T_beInformed,
+});
 var hiddenIdPOI3 = new Ext.form.Hidden({
 	id: 'hiddenIdPOI3',
 	name: 'id_poi'
@@ -400,7 +433,7 @@ var CommentCreateForm = new Ext.FormPanel({
 	bodyStyle: 'padding:5px',
 	frame: true,
 	fileUpload: true,
-	width: 350,
+	width: 450,
 	height:550,
 	autoScroll:true,
 	items: [{
@@ -410,16 +443,23 @@ var CommentCreateForm = new Ext.FormPanel({
 			columnWidth:1,
 			layout: 'form',
 			border: false,
-			items: [{
-				xtype: 'fileuploadfield',
-				id: 'form-file2',
-				emptyText: T_selectPhoto,
-				fieldLabel: T_photo,
-				name: 'photo-path',
-				buttonText: '',
-				buttonCfg: {
-					iconCls: 'fugue_folder-open-document'
-				}},CommentField, mailField]
+			items: [ {
+						xtype: 'fileuploadfield',
+						id: 'form-file2',
+						anchor : '95%',
+						emptyText: T_selectPhoto,
+						fieldLabel: T_photo,
+						name: 'photo-path',
+						buttonText: '',
+						buttonCfg: {
+							iconCls: 'fugue_folder-open-document'
+						}},CommentField, mailField, beInformedField,{
+					xtype: 'panel',
+					id: 'help',
+					html: "<p style=\"color:#555555\">Utilisez cette fonctionnalité pour apporter une information à cette observation (mise à jour, précision...). Une photo peut-être ajoutée pour illustrer le commentaire (et peut parler d'elle-même;))</p>" +
+					"<p style=\"color:#555555\">Si vous souhaitez être informé(e) par e-mail des nouveautés (nouveaux commentaires modérés, nouveaux ajouts de l'association et retours de la collectivité) concernant cette observation, cochez la case du bas du formulaire.</p>",
+					fieldLabel: T_helpComment,
+					name: 'help'}]
 		}]
 	}],
 	buttons: [{
@@ -476,7 +516,7 @@ var CommentCreateWindow= new Ext.Window({
 	title: T_addComment,
 	closable: false,
 	border: false,
-	width: 350,
+	width: 450,
 	height: 400,
 	plain: true,
 	layout: 'fit',
@@ -488,7 +528,93 @@ function addComment() {
 	CommentCreateWindow.show();
 }
 
+var SupportObservationForm = new Ext.FormPanel({
+	labelAlign: 'top',
+	bodyStyle: 'padding:5px',
+	frame: true,
+	width: 450,
+	height:550,
+	autoScroll:true,
+	items: [{
+		layout: 'column',
+		border: false,
+		items:[{
+			columnWidth:1,
+			layout: 'form',
+			border: false,
+			items: [ mailSupportField, beInformedSupportField,{
+					xtype: 'panel',
+					id: 'helpSupport',
+					html: "<p style=\"color:#555555\">Pour voter pour cette observation, renseignez votre adresse e-mail. Celle-ci est nécessaire pour limiter les abus. Cette information ne sera communiquée en aucun cas à une tierce personne. " +
+							"Le nombre de personnes qui supporte cette observation est affiché et pourra permettre de prioriser les demandes d'aménagements</p>" +
+							"<p style=\"color:#555555\">Si vous souhaitez être informé(e) par e-mail des nouveautés (nouveaux commentaires modérés, nouveaux ajouts de l'association et retours de la collectivité) concernant cette observation, cochez la case du bas du formulaire.</p>",
+					fieldLabel: T_helpComment,
+					name: 'help'}
+		] 
+	}]}],
+	buttons: [{
+		text: T_submit,
+		handler: function() {
+			if(SupportObservationForm.getForm().isValid()){
+				SupportObservationForm.getForm().submit({
+					waitMsg: T_pleaseWait,
+					url: 'lib/php/admin/database.php',
+					params: {
+						task: "CREATESUPPORT",
+						id_poi: idPoiComment
+					},
+					success: function(SupportObservationForm, o) {
+						console.log("SupportObservationForm success "+o.result.ok);
 
+						Ext.MessageBox.show({
+							title: T_transfertOK,
+							msg: o.result.ok,
+							buttons: Ext.Msg.OK,
+							icon: Ext.MessageBox.INFO,
+							iconCls: 'silk_tick'
+						});
+						SupportObservationWindow.hide();
+						mailSupportField.reset();
+						popup.hide();
+					},
+					failure: function(SupportObservationForm, o) {
+						console.log("SupportObservationForm echec "+o.result.pb);
+						Ext.MessageBox.show({
+							title: 'Hum ...',
+							msg: o.result.pb,
+							buttons: Ext.Msg.OK,
+							icon: Ext.MessageBox.ERROR,
+							iconCls: 'fugue_cross-script'
+						});
+					}
+				});
+			}
+		}
+	},{
+		text: T_cancel,
+		handler: function(){
+			SupportObservationWindow.hide();
+		}
+	}]
+});
+
+var SupportObservationWindow= new Ext.Window({
+	id: 'SupportObservationWindow',
+	iconCls: 'silk_comment_add',
+	title: T_addVote,
+	closable: false,
+	border: false,
+	width: 450,
+	height: 400,
+	plain: true,
+	layout: 'fit',
+	modal: true,
+	items: SupportObservationForm
+});
+
+function addSupport() {
+	SupportObservationWindow.show();
+}
 function createFeaturePublicMapAndOpen(id,X,Y,icon,lib_priorite,lib_status,lib_subcategory,desc,prop,iconCls,id,photo,num,rue,commune,repgt,cmt,date,lastDateModif,comments) {
 	var point = new OpenLayers.Geometry.Point(X,Y);
 	var feat = new OpenLayers.Feature.Vector(point, null, null);
@@ -678,21 +804,6 @@ var checkBoxDisplaylayerLimitesGeographiquesPoles = new Ext.form.Checkbox({
 		}
 	}
 });
-var searchObservationField = new Ext.form.TextField({
-	id: 'searchObservationField',
-	allowBlank: true,
-	anchor : '99%',
-	emptyText:'N° Observation',
-	width:90
-});
-var searchObservationButton = new Ext.Button({ text:'Afficher',
-	listeners: {
-		click: function() {
-			console.log('valeur obs = ' + searchObservationField.getValue());
-			getMarkerByID(searchObservationField.getValue());
-
-		}
-	}});
 
 //control geoext
 var maxExtent = new GeoExt.Action({
@@ -847,8 +958,15 @@ var mapGeoExtPanel = new GeoExt.MapPanel({
 	tbar: new Ext.Toolbar({
 		height: '20',
 		cls: 'x-panel-header',
-		items: [dateFieldModifiedSince, CancelDateFilterItem, '&nbsp;',StatusPOIFieldMapItemMenu, CancelStatusFilterItem, '&nbsp;',comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem, '&nbsp;', checkBoxdisplayLayerLimitesGeographiquesCommunes,' ',checkBoxDisplaylayerLimitesGeographiquesPoles, ' ',searchObservationField,searchObservationButton,'->' ,comboboxSelectMapLayer]
-	})
+
+		items: [dateFieldModifiedSince,CancelDateFilterItem,'&',StatusPOIFieldMapItemMenu,CancelStatusFilterItem, '&',comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&', numberFieldNbSupport,CancelVoteFilterItem]
+	}),
+	bbar: new Ext.Toolbar({
+	height: '20',
+	cls: 'x-panel-header',
+	items: [searchObservationField, ' ', checkBoxdisplayLayerLimitesGeographiquesCommunes,' ',checkBoxDisplaylayerLimitesGeographiquesPoles,'->' ,comboboxSelectMapLayer]
+})
+
 });
 
 //le border panel
@@ -1030,6 +1148,30 @@ function createFeatureAdd(X,Y) {
 		latitudeField.setValue(geom.y);
 		longitudeField.setValue(geom.x);
 		console.log('feat not yet defined ' + latitudeField.getValue() + ' ' + longitudeField.getValue());
+		if (activateReverseGeocoding){
+		PublicAddRueField.disable();
+		Ext.Ajax.request({
+			waitMsg: T_pleaseWait,
+			url: 'lib/php/public/getAdresse.php',
+			params: {
+				lon: longitudeField.getValue(),
+				lat: latitudeField.getValue()
+			},
+			success: function(response) {
+				console.log('address found = '+response.responseText);
+				PublicAddRueField.setValue(response.responseText);
+				PublicAddRueField.enable();
+			},
+			failure: function(response){
+				var result = response.responseText;
+				console.log('error getting address = '+response.responseText);
+				PublicAddRueField.enable();
+			}
+		});
+		
+	}
+	}else{
+		console.log('Reverse geocoding is deactivated, look at key.js.template to enable it');
 	}
 }
 
diff --git a/lib/js/translation_en.js b/lib/js/translation_en.js
index f04a1236..d9e7103b 100644
--- a/lib/js/translation_en.js
+++ b/lib/js/translation_en.js
@@ -243,10 +243,16 @@ var T_chooseDate = "Date of modif. of records";
 var T_reponsePole = "Response of the pole";
 var T_loginusers = "Login";
 var T_user = "User";
+var T_moderator = "Modérator";
 var T_users = "Users";
+var T_users_link_pole = "Link user/pole";
+var T_addLinkUserPole = "Add a user/pole link";
+var T_addedLinkUserPoleFailed = "The link user/pole has not been created.";
+var T_addedLinkUserPoleSucceeded = "The link user/pole has been created. ";
 var T_addUsers = "Add a user";
 var T_addedUserSuccess = "The user was added to the database successfully.";
 var T_addedUserFailed = "The user was not created.";
+var T_addedUserFailedInconsistency = "There is at least one inconsistency between the values selected in role, pole and territoire.";
 var T_modifyUserFailed = "The contact information was not modified.";
 var T_modifyUserSucceeded = "The contact information was modified.";
 var T_passusers = "Password";
@@ -265,6 +271,9 @@ var T_noComments = "No comment to moderate!";
 var T_text = "Text";
 var T_comment = "Comment";
 var T_addComment = "Add comment";
+var T_addVote = "Vote for this observation";
+var T_beInformed = "Check to receive this observation's updates";
+var T_helpComment = "Aide";
 var T_add = "Add";
 var T_addCommentSuccess = "Comment add with success. Waiting for moderation.";
 var T_photos = "Photos";
@@ -306,4 +315,6 @@ var T_noMarkerForNewObservation = 'The marker allowing to locate the observation
 var T_directLink = 'Direct link';
 var T_directLinks = 'Direct links';
 var T_modifiedSince = 'Modified since';
-var T_ObservationsToAnalyze = 'Observations to analyze';
\ No newline at end of file
+var T_ObservationsToAnalyze = 'Observations to analyze';
+var T_active = 'Is active?';
+var T_inactive_status_user = 'Inactive user';
\ No newline at end of file
diff --git a/lib/js/translation_fr.js b/lib/js/translation_fr.js
index 4a22980a..b9d7c3d4 100644
--- a/lib/js/translation_fr.js
+++ b/lib/js/translation_fr.js
@@ -26,8 +26,8 @@ var T_careful = "Attention";
 var T_cantModifyField = "Impossible de modifier ce champ !";
 var T_badConnect = "La connexion à la base de données a échoué.";
 var T_confirm = "Confirmation";
-var T_deleteRecord = "Voulez-vous supprimer cette observation ?";
-var T_deleteRecords = "Voulez-vous supprimer ces observations ?";
+var T_deleteRecord = "Voulez-vous supprimer cet enregistrement ?";
+var T_deleteRecords = "Voulez-vous supprimer ces enregistrements ?";
 var T_cannotDeleteNothing = "Vous ne pouvez pas supprimer ce que vous n'avez pas sélectionné ;)";
 var T_linkSubcategory = "Une ou plusieurs sous-catégories sont liées avec cette (ces) catégorie(s).<br/>Veuillez la (les) supprimer préalablement.";
 var T_cannotDeleteSelection = "Vous ne pouvez pas effacer cette sélection.";
@@ -242,10 +242,16 @@ var T_chooseDate = "Date de modif. observations";
 var T_reponsePole = "Réponse du pole concerné";
 var T_loginusers = "Login";
 var T_user = "Utilisateur";
+var T_moderator = "Modérateur";
 var T_users = "Utilisateurs";
+var T_users_link_pole = "Lien Modérateur/Pôle";
+var T_addLinkUserPole = "Ajouter un lien Modérateur/pôle";
+var T_addedLinkUserPoleFailed = "Le lien Modérateur/pôle n'a pas été créé.";
+var T_addedLinkUserPoleSucceeded = "Le lien Modérateur/pôle a été créé.";
 var T_addUsers = "Ajouter un utilisateur";
 var T_addedUserSuccess = "L'utilisateur a été ajouté en base de données avec succès.";
-var T_addedUserFailed = "L'utilisateur n'a pas été créé.";
+var T_addedUserFailed = "L'utilisateur n'a pas été créé. ";
+var T_addedUserFailedInconsistency = "Il y a au moins une incohérence entre les valeurs renseignées pour les champs role, pole et territoire.";
 var T_modifyUserFailed = "Les coordonnées n'ont pas été modifiées.";
 var T_modifyUserSucceeded = "Les coordonnées ont été modifiées.";
 var T_passusers = "Password";
@@ -265,6 +271,9 @@ var T_CommentsToManage = "Commentaires à modérer";
 var T_text = "Texte";
 var T_comment = "Commentaire";
 var T_addComment = "Ajouter un commentaire";
+var T_addVote = "Voter pour cette observation";
+var T_beInformed = "Cocher pour recevoir les mises à jour concernant cette fiche par e-mail";
+var T_helpComment = "Aide";
 var T_add = "Ajouter";
 var T_addCommentSuccess = "Commentaire ajouté avec succès. En attente de modération.";
 var T_photos = "Photos";
@@ -306,3 +315,5 @@ var T_directLink = 'Lien direct';
 var T_directLinks = 'Liens directs';
 var T_modifiedSince = 'Modifié depuis';
 var T_ObservationsToAnalyze = 'Observations à analyser';
+var T_active = 'Actif';
+var T_inactive_status_user = 'Compte inactif';
diff --git a/lib/php/admin/adminfunction.php b/lib/php/admin/adminfunction.php
index 33fdd216..0541cd66 100755
--- a/lib/php/admin/adminfunction.php
+++ b/lib/php/admin/adminfunction.php
@@ -1,1169 +1,1196 @@
 <?php
 include_once '../key.php';
 include_once '../commonfunction.php';
+
 /*
  * List of functions - getMarkerIcon - updateMarkerIcon - getCategory - updateCategory - createCategory - deleteCategorys - getSubCategory - updateSubCategory - createSubCategory - deleteSubCategorys - getPoi - updatePoi - deletePois - deletePoisCorbeille - getCommune - updateCommune - createCommune - deleteCommunes - getPole - updatePole - createPole - deletePoles - getQuartier - updateQuartier - createQuartier - deleteQuartiers - getPriorite - updatePriorite - createPriorite - deletePriorites - getStatus - updateStatus - createStatus - deleteStatuss - getUser - updateUser - createUser - deleteUsers - resetPhotoPoi - isModerate - updateGeoPoi - resetGeoPoi - updateGeoDefaultMap - createPublicPoi - isPropPublic - normalize - is_in_polygon - getNumPageIdParam - getComments - displayComment - editComment - getPhotos
- */ 
-
-
-	/*	Function name	: getMarkerIcon
-	 * 	Input			:
-	 * 	Output			:
-	 * 	Object			: populate icon grid
-	 * 	Date			: Jan. 18, 2012
-	 */
-
-	function getMarkerIcon($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM iconmarker ORDER BY id_iconmarker ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_icon'] = $row ['id_iconmarker'];
-					$arr [$i] ['lib_icon'] = $row ['name_iconmarker'];
-					$arr [$i] ['urllib_icon'] = $row ['urlname_iconmarker'];
-					$arr [$i] ['color_icon'] = $row ['color_iconmarker'];
-					$arr [$i] ['img_icon'] = 'resources/icon/marker/' . $arr [$i] ['urllib_icon'] . '.png';
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+ */
+
+/*
+ * Function name : getMarkerIcon
+ * Input :
+ * Output :
+ * Object : populate icon grid
+ * Date : Jan. 18, 2012
+ */
+function getMarkerIcon($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM iconmarker ORDER BY id_iconmarker ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_icon'] = $row['id_iconmarker'];
+                    $arr[$i]['lib_icon'] = $row['name_iconmarker'];
+                    $arr[$i]['urllib_icon'] = $row['urlname_iconmarker'];
+                    $arr[$i]['color_icon'] = $row['color_iconmarker'];
+                    $arr[$i]['img_icon'] = 'resources/icon/marker/' . $arr[$i]['urllib_icon'] . '.png';
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            mysql_free_result($result);
+            mysql_close($link);
+            
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name	: updateMarkerIcon Input			: Output			: success => '1' / failed => '2' Object			: update icon grid Date			: Jan. 19, 2012
+ * Function name : updateMarkerIcon Input : Output : success => '1' / failed => '2' Object : update icon grid Date : Jan. 19, 2012
  */
-function updateMarkerIcon() {
-	$id_iconmarker = $_POST ['id_icon'];
-	$name_iconmarker = $_POST ['lib_icon'];
-	$color_iconmarker = $_POST ['color_icon'];
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "UPDATE iconmarker SET name_iconmarker = '" . $name_iconmarker . "', color_iconmarker = '" . $color_iconmarker . "' WHERE id_iconmarker = " . $id_iconmarker;
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function updateMarkerIcon()
+{
+    $id_iconmarker = $_POST['id_icon'];
+    $name_iconmarker = $_POST['lib_icon'];
+    $color_iconmarker = $_POST['color_icon'];
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "UPDATE iconmarker SET name_iconmarker = '" . $name_iconmarker . "', color_iconmarker = '" . $color_iconmarker . "' WHERE id_iconmarker = " . $id_iconmarker;
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getCategory Input			: start, limit Output			: json categories Object			: populate category grid Date			: Jan. 18, 2012
+ * Function name : getCategory Input : start, limit Output : json categories Object : populate category grid Date : Jan. 18, 2012
  */
-function getCategory($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM category ORDER BY lib_category ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_category'] = $row ['id_category'];
-					$arr [$i] ['lib_category'] = stripslashes ( $row ['lib_category'] );
-					$arr [$i] ['icon_category'] = $row ['icon_category'];
-					$arr [$i] ['treerank_category'] = $row ['treerank_category'];
-					$arr [$i] ['display_category'] = $row ['display_category'];
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getCategory($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM category ORDER BY lib_category ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_category'] = $row['id_category'];
+                    $arr[$i]['lib_category'] = stripslashes($row['lib_category']);
+                    $arr[$i]['icon_category'] = $row['icon_category'];
+                    $arr[$i]['treerank_category'] = $row['treerank_category'];
+                    $arr[$i]['display_category'] = $row['display_category'];
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateCategory Input			: Output			: success => '1' / failed => '2' Object			: update category grid Date			: Jan. 18, 2012
+ * Function name : updateCategory Input : Output : success => '1' / failed => '2' Object : update category grid Date : Jan. 18, 2012
  */
-function updateCategory() {
-	$id_category = $_POST ['id_category'];
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (isset ( $_POST ['display_category'] )) {
-				$display_category = $_POST ['display_category'];
-				$sql = "UPDATE category SET display_category = $display_category WHERE id_category = $id_category";
-			} else {
-				$lib_category = mysql_real_escape_string ( $_POST ['lib_category'] );
-				$icon_category = mysql_real_escape_string ( $_POST ['icon_category'] );
-				$sql = "UPDATE category SET lib_category = '$lib_category', icon_category = '$icon_category' WHERE id_category = $id_category";
-			}
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function updateCategory()
+{
+    $id_category = $_POST['id_category'];
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (isset($_POST['display_category'])) {
+                $display_category = $_POST['display_category'];
+                $sql = "UPDATE category SET display_category = $display_category WHERE id_category = $id_category";
+            } else {
+                $lib_category = mysql_real_escape_string($_POST['lib_category']);
+                $icon_category = mysql_real_escape_string($_POST['icon_category']);
+                $sql = "UPDATE category SET lib_category = '$lib_category', icon_category = '$icon_category' WHERE id_category = $id_category";
+            }
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createCategory Input			: Output			: success => '1' / failed => '2' Object			: create category Date			: Jan. 19, 2012
+ * Function name : createCategory Input : Output : success => '1' / failed => '2' Object : create category Date : Jan. 19, 2012
  */
-function createCategory() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$lib_category = mysql_real_escape_string ( $_POST ['lib_category'] );
-			$icon_category = mysql_real_escape_string ( $_POST ['icon_category'] );
-			$display_category = $_POST ['display_category'];
-			
-			$sql = "SELECT max(treerank_category) AS max FROM category";
-			$result = mysql_query ( $sql );
-			if (mysql_result ( $result, 0 ) == NULL) {
-				$treerank_category = 0;
-			} else {
-				$treerank_category = mysql_result ( $result, 0 );
-				$treerank_category += 1;
-			}
-			
-			$sql = "INSERT INTO category (lib_category, icon_category, treerank_category, display_category) VALUES ('$lib_category', '$icon_category', $treerank_category, $display_category)";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function createCategory()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $lib_category = mysql_real_escape_string($_POST['lib_category']);
+            $icon_category = mysql_real_escape_string($_POST['icon_category']);
+            $display_category = $_POST['display_category'];
+            
+            $sql = "SELECT max(treerank_category) AS max FROM category";
+            $result = mysql_query($sql);
+            if (mysql_result($result, 0) == NULL) {
+                $treerank_category = 0;
+            } else {
+                $treerank_category = mysql_result($result, 0);
+                $treerank_category += 1;
+            }
+            
+            $sql = "INSERT INTO category (lib_category, icon_category, treerank_category, display_category) VALUES ('$lib_category', '$icon_category', $treerank_category, $display_category)";
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deleteCategorys Input			: Output			: success => '1' / failed => '2' Object			: delete category(s) Date			: Jan. 19, 2012
+ * Function name : deleteCategorys Input : Output : success => '1' / failed => '2' Object : delete category(s) Date : Jan. 19, 2012
  */
-function deleteCategorys() {
-	$ids = $_POST ['ids'];
-	$idcategorys = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idcategorys ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idcategorys ) == 1) {
-				$sql = "DELETE FROM category WHERE id_category = " . $idcategorys [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM category WHERE ";
-				for($i = 0; $i < sizeof ( $idcategorys ); $i ++) {
-					$sql = $sql . "id_category = " . $idcategorys [$i];
-					if ($i < sizeof ( $idcategorys ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deleteCategorys()
+{
+    $ids = $_POST['ids'];
+    $idcategorys = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idcategorys) < 1) {
+                echo '0';
+            } else if (sizeof($idcategorys) == 1) {
+                $sql = "DELETE FROM category WHERE id_category = " . $idcategorys[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM category WHERE ";
+                for ($i = 0; $i < sizeof($idcategorys); $i ++) {
+                    $sql = $sql . "id_category = " . $idcategorys[$i];
+                    if ($i < sizeof($idcategorys) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getSubCategory Input			: start, limit Output			: json subcategories Object			: populate subcategory grid Date			: Jan. 31, 2012
+ * Function name : getSubCategory Input : start, limit Output : json subcategories Object : populate subcategory grid Date : Jan. 31, 2012
  */
-function getSubCategory($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM subcategory INNER JOIN category ON (category.id_category = subcategory.category_id_category) ORDER BY treerank_subcategory ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_subcategory'] = $row ['id_subcategory'];
-					$arr [$i] ['lib_subcategory'] = stripslashes ( $row ['lib_subcategory'] );
-					$arr [$i] ['icon_subcategory'] = $row ['icon_subcategory'];
-					$arr [$i] ['lib_category'] = stripslashes ( $row ['lib_category'] );
-					$arr [$i] ['display_subcategory'] = $row ['display_subcategory'];
-					$arr [$i] ['proppublic_subcategory'] = $row ['proppublic_subcategory'];
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getSubCategory($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM subcategory INNER JOIN category ON (category.id_category = subcategory.category_id_category) ORDER BY treerank_subcategory ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_subcategory'] = $row['id_subcategory'];
+                    $arr[$i]['lib_subcategory'] = stripslashes($row['lib_subcategory']);
+                    $arr[$i]['icon_subcategory'] = $row['icon_subcategory'];
+                    $arr[$i]['lib_category'] = stripslashes($row['lib_category']);
+                    $arr[$i]['display_subcategory'] = $row['display_subcategory'];
+                    $arr[$i]['proppublic_subcategory'] = $row['proppublic_subcategory'];
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateSubCategory Input			: Output			: success => '1' / failed => '2' Object			: update subcategory grid Date			: Jan. 31, 2012
+ * Function name : updateSubCategory Input : Output : success => '1' / failed => '2' Object : update subcategory grid Date : Jan. 31, 2012
  */
-function updateSubCategory() {
-	$id_subcategory = $_POST ['id_subcategory'];
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (isset ( $_POST ['display_subcategory'] )) {
-				$display_subcategory = $_POST ['display_subcategory'];
-				$sql = "UPDATE subcategory SET display_subcategory = $display_subcategory WHERE id_subcategory = $id_subcategory";
-				$result = mysql_query ( $sql );
-			} else if (isset ( $_POST ['proppublic_subcategory'] )) {
-				$proppublic_subcategory = $_POST ['proppublic_subcategory'];
-				$sql = "UPDATE subcategory SET proppublic_subcategory = $proppublic_subcategory WHERE id_subcategory = $id_subcategory";
-				$result = mysql_query ( $sql );
-			} else {
-				$lib_subcategory = mysql_real_escape_string ( $_POST ['lib_subcategory'] );
-				$icon_subcategory = mysql_real_escape_string ( $_POST ['icon_subcategory'] );
-				if (is_numeric ( $_POST ['category_id_category'] )) {
-					$category_id_category = $_POST ['category_id_category'];
-					
-					$sql2 = "SELECT category_id_category FROM subcategory WHERE id_subcategory = " . $id_subcategory;
-					$result2 = mysql_query ( $sql2 );
-					
-					if (mysql_result ( $result2, 0 ) != $category_id_category) {
-						$sql3 = "SELECT max(treerank_subcategory) AS max FROM subcategory WHERE category_id_category = " . $category_id_category;
-						$result3 = mysql_query ( $sql3 );
-						if (mysql_result ( $result3, 0 ) != NULL) {
-							$treerank_subcategory = mysql_result ( $result3, 0 );
-							$treerank_subcategory += 1;
-						} else {
-							$treerank_subcategory = 0;
-						}
-						
-						// modifier les treerank des autres subcategories
-						$sql = "SELECT treerank_subcategory FROM subcategory WHERE id_subcategory = " . $id_subcategory;
-						$result = mysql_query ( $sql );
-						$currentTreerank = mysql_result ( $result, 0 );
-						$sql = "UPDATE subcategory SET treerank_subcategory = (treerank_subcategory - 1) WHERE category_id_category = " . mysql_result ( $result2, 0 ) . " AND id_subcategory <> " . $id_subcategory . " AND treerank_subcategory > " . $currentTreerank;
-						$result = mysql_query ( $sql );
-						
-						$sql = "UPDATE subcategory SET lib_subcategory = '$lib_subcategory', icon_subcategory = '$icon_subcategory', category_id_category = $category_id_category, treerank_subcategory = $treerank_subcategory WHERE id_subcategory = $id_subcategory";
-						$result = mysql_query ( $sql );
-					} else {
-						$sql = "UPDATE subcategory SET lib_subcategory = '$lib_subcategory', icon_subcategory = '$icon_subcategory', category_id_category = $category_id_category WHERE id_subcategory = $id_subcategory";
-						$result = mysql_query ( $sql );
-					}
-				} else {
-					$sql = "UPDATE subcategory SET lib_subcategory = '$lib_subcategory', icon_subcategory = '$icon_subcategory' WHERE id_subcategory = $id_subcategory";
-					$result = mysql_query ( $sql );
-				}
-			}
-			
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function updateSubCategory()
+{
+    $id_subcategory = $_POST['id_subcategory'];
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (isset($_POST['display_subcategory'])) {
+                $display_subcategory = $_POST['display_subcategory'];
+                $sql = "UPDATE subcategory SET display_subcategory = $display_subcategory WHERE id_subcategory = $id_subcategory";
+                $result = mysql_query($sql);
+            } else if (isset($_POST['proppublic_subcategory'])) {
+                $proppublic_subcategory = $_POST['proppublic_subcategory'];
+                $sql = "UPDATE subcategory SET proppublic_subcategory = $proppublic_subcategory WHERE id_subcategory = $id_subcategory";
+                $result = mysql_query($sql);
+            } else {
+                $lib_subcategory = mysql_real_escape_string($_POST['lib_subcategory']);
+                $icon_subcategory = mysql_real_escape_string($_POST['icon_subcategory']);
+                if (is_numeric($_POST['category_id_category'])) {
+                    $category_id_category = $_POST['category_id_category'];
+                    
+                    $sql2 = "SELECT category_id_category FROM subcategory WHERE id_subcategory = " . $id_subcategory;
+                    $result2 = mysql_query($sql2);
+                    
+                    if (mysql_result($result2, 0) != $category_id_category) {
+                        $sql3 = "SELECT max(treerank_subcategory) AS max FROM subcategory WHERE category_id_category = " . $category_id_category;
+                        $result3 = mysql_query($sql3);
+                        if (mysql_result($result3, 0) != NULL) {
+                            $treerank_subcategory = mysql_result($result3, 0);
+                            $treerank_subcategory += 1;
+                        } else {
+                            $treerank_subcategory = 0;
+                        }
+                        
+                        // modifier les treerank des autres subcategories
+                        $sql = "SELECT treerank_subcategory FROM subcategory WHERE id_subcategory = " . $id_subcategory;
+                        $result = mysql_query($sql);
+                        $currentTreerank = mysql_result($result, 0);
+                        $sql = "UPDATE subcategory SET treerank_subcategory = (treerank_subcategory - 1) WHERE category_id_category = " . mysql_result($result2, 0) . " AND id_subcategory <> " . $id_subcategory . " AND treerank_subcategory > " . $currentTreerank;
+                        $result = mysql_query($sql);
+                        
+                        $sql = "UPDATE subcategory SET lib_subcategory = '$lib_subcategory', icon_subcategory = '$icon_subcategory', category_id_category = $category_id_category, treerank_subcategory = $treerank_subcategory WHERE id_subcategory = $id_subcategory";
+                        $result = mysql_query($sql);
+                    } else {
+                        $sql = "UPDATE subcategory SET lib_subcategory = '$lib_subcategory', icon_subcategory = '$icon_subcategory', category_id_category = $category_id_category WHERE id_subcategory = $id_subcategory";
+                        $result = mysql_query($sql);
+                    }
+                } else {
+                    $sql = "UPDATE subcategory SET lib_subcategory = '$lib_subcategory', icon_subcategory = '$icon_subcategory' WHERE id_subcategory = $id_subcategory";
+                    $result = mysql_query($sql);
+                }
+            }
+            
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createSubCategory Input			: Output			: success => '1' / failed => '2' Object			: create subcategory Date			: Jan. 31, 2012
+ * Function name : createSubCategory Input : Output : success => '1' / failed => '2' Object : create subcategory Date : Jan. 31, 2012
  */
-function createSubCategory() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$lib_subcategory = mysql_real_escape_string ( $_POST ['lib_subcategory'] );
-			$icon_subcategory = mysql_real_escape_string ( $_POST ['icon_subcategory'] );
-			
-			$category_id_category = $_POST ['category_id_category'];
-			$display_subcategory = $_POST ['display_subcategory'];
-			$proppublic_subcategory = $_POST ['proppublic_subcategory'];
-			
-			$sql = "SELECT max(treerank_subcategory) AS max FROM subcategory WHERE category_id_category = " . $category_id_category;
-			$result = mysql_query ( $sql );
-			if (mysql_result ( $result, 0 ) != NULL) {
-				$treerank_subcategory = 0;
-			} else {
-				$treerank_subcategory = mysql_result ( $result, 0 );
-				$treerank_subcategory += 1;
-			}
-			
-			$sql = "INSERT INTO subcategory (lib_subcategory, icon_subcategory, treerank_subcategory, category_id_category, display_subcategory, proppublic_subcategory) VALUES ('$lib_subcategory', '$icon_subcategory', $treerank_subcategory, $category_id_category , $display_subcategory, $proppublic_subcategory)";
-			
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function createSubCategory()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $lib_subcategory = mysql_real_escape_string($_POST['lib_subcategory']);
+            $icon_subcategory = mysql_real_escape_string($_POST['icon_subcategory']);
+            
+            $category_id_category = $_POST['category_id_category'];
+            $display_subcategory = $_POST['display_subcategory'];
+            $proppublic_subcategory = $_POST['proppublic_subcategory'];
+            
+            $sql = "SELECT max(treerank_subcategory) AS max FROM subcategory WHERE category_id_category = " . $category_id_category;
+            $result = mysql_query($sql);
+            if (mysql_result($result, 0) != NULL) {
+                $treerank_subcategory = 0;
+            } else {
+                $treerank_subcategory = mysql_result($result, 0);
+                $treerank_subcategory += 1;
+            }
+            
+            $sql = "INSERT INTO subcategory (lib_subcategory, icon_subcategory, treerank_subcategory, category_id_category, display_subcategory, proppublic_subcategory) VALUES ('$lib_subcategory', '$icon_subcategory', $treerank_subcategory, $category_id_category , $display_subcategory, $proppublic_subcategory)";
+            
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deleteSubCategorys Input			: Output			: success => '1' / failed => '2' Object			: delete subcategory(s) Date			: Jan. 19, 2012
+ * Function name : deleteSubCategorys Input : Output : success => '1' / failed => '2' Object : delete subcategory(s) Date : Jan. 19, 2012
  */
-function deleteSubCategorys() {
-	$ids = $_POST ['ids'];
-	$idsubcategorys = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idsubcategorys ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idsubcategorys ) == 1) {
-				$sql = "DELETE FROM subcategory WHERE id_subcategory = " . $idsubcategorys [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM subcategory WHERE ";
-				for($i = 0; $i < sizeof ( $idsubcategorys ); $i ++) {
-					$sql = $sql . "id_subcategory = " . $idsubcategorys [$i];
-					if ($i < sizeof ( $idsubcategorys ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deleteSubCategorys()
+{
+    $ids = $_POST['ids'];
+    $idsubcategorys = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idsubcategorys) < 1) {
+                echo '0';
+            } else if (sizeof($idsubcategorys) == 1) {
+                $sql = "DELETE FROM subcategory WHERE id_subcategory = " . $idsubcategorys[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM subcategory WHERE ";
+                for ($i = 0; $i < sizeof($idsubcategorys); $i ++) {
+                    $sql = $sql . "id_subcategory = " . $idsubcategorys[$i];
+                    if ($i < sizeof($idsubcategorys) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name	: getPoi Input			: Output			: Object			: populate poi grid Date			: May 2, 2012
+ * Function name : getPoi Input : Output : Object : populate poi grid Date : May 2, 2012
  */
-function getPoi($start, $limit, $asc, $sort, $dir) {
-	switch (SGBD) {
-		case 'mysql' :
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - getPoi \n", 3, LOG_FILE );
-			}
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			$whereClause = ' delete_poi = FALSE ';
-			if (isset ( $_POST ["basket"] )) {
-				$whereClause = " delete_poi = TRUE ";
-			}
-			
-			if ($_SESSION ["type"] == 1 && isset ( $_POST ["priority"] )) {
-				$whereClause .= ' AND priorite.id_priorite = ' . $_POST ["priority"];
-			} elseif ($_SESSION ["type"] == 2) {
-				$whereClause .= ' AND moderation_poi = 1 
+function getPoi($start, $limit, $asc, $sort, $dir)
+{
+    switch (SGBD) {
+        case 'mysql':
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - getPoi \n", 3, LOG_FILE);
+            }
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            $whereClause = ' delete_poi = FALSE ';
+            if (isset($_POST["basket"])) {
+                $whereClause = " delete_poi = TRUE ";
+            }
+            
+            if ($_SESSION["type"] == 1 && isset($_POST["priority"])) {
+                $whereClause .= ' AND priorite.id_priorite = ' . $_POST["priority"];
+            } elseif ($_SESSION["type"] == 2) {
+                $whereClause .= ' AND moderation_poi = 1 
 							AND display_poi = 1 
-							AND commune_id_commune IN (' . str_replace ( ';', ',', $_SESSION ['territoire'] ) . ') AND delete_poi = FALSE 
+							AND commune_id_commune IN (' . str_replace(';', ',', $_SESSION['territoire']) . ') AND delete_poi = FALSE 
 							AND priorite.non_visible_par_collectivite = 0 ';
-			} elseif ($_SESSION ["type"] == 3) {
-				$whereClause .= ' AND moderation_poi = 1 
+            } elseif ($_SESSION["type"] == 3) {
+                $whereClause .= ' AND moderation_poi = 1 
 							AND display_poi = 1 
 							AND transmission_poi = 1 
 							AND delete_poi = FALSE 
-							AND poi.pole_id_pole = ' . $_SESSION ["pole"] . ' 
+							AND poi.pole_id_pole = ' . $_SESSION["pole"] . ' 
 							AND priorite.non_visible_par_collectivite = 0 ';
-			} elseif ($_SESSION ["type"] == 4) {
-				$whereClause .= ' AND poi.pole_id_pole = ' . $_SESSION ["pole"] . ' ';
-			}
-			$sql = "SELECT poi.*, subcategory.lib_subcategory, commune.lib_commune, pole.lib_pole, quartier.lib_quartier, priorite.lib_priorite, status.lib_status, x(poi.geom_poi) AS X, y(poi.geom_poi) AS Y FROM poi INNER JOIN subcategory ON (subcategory.id_subcategory = poi.subcategory_id_subcategory) INNER JOIN commune ON (commune.id_commune = poi.commune_id_commune) INNER JOIN pole ON (pole.id_pole = poi.pole_id_pole) INNER JOIN quartier ON (quartier.id_quartier = poi.quartier_id_quartier) INNER JOIN priorite ON (priorite.id_priorite = poi.priorite_id_priorite) INNER JOIN status ON (status.id_status = poi.status_id_status) WHERE $whereClause ";
-			
-			$sql .= " ORDER BY ";
-			if ($sort == '0' && $dir == '0') {
-				switch ($asc) {
-					case 'subcategory' :
-						$sql .= " lib_subcategory ASC";
-						break;
-					case 'lib' :
-						$sql .= " lib_poi ASC";
-						break;
-					default :
-						$sql .= " id_poi DESC";
-						break;
-				}
-			} else {
-				$sql .= $sort . " " . $dir;
-			}
-			
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - getPoi sql $sql retourne $nbrows (s'il n'y avait pas de limites)\n", 3, LOG_FILE );
-			}
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_poi'] = $row ['id_poi'];
-					$arr [$i] ['lib_poi'] = stripslashes ( $row ['lib_subcategory'] );
-					$arr [$i] ['adherent_poi'] = stripslashes ( $row ['adherent_poi'] );
-					$arr [$i] ['num_poi'] = stripslashes ( $row ['num_poi'] );
-					$arr [$i] ['rue_poi'] = stripslashes ( $row ['rue_poi'] );
-					$arr [$i] ['tel_poi'] = stripslashes ( $row ['tel_poi'] );
-					if ($_SESSION ["type"] == 4 || $_SESSION ["type"] == 1) {
-						$arr [$i] ['mail_poi'] = stripslashes ( $row ['mail_poi'] );
-					} else {
-						$arr [$i] ['mail_poi'] = "******";
-					}
-					$arr [$i] ['desc_poi'] = stripslashes ( $row ['desc_poi'] );
-					$arr [$i] ['prop_poi'] = stripslashes ( $row ['prop_poi'] );
-					$arr [$i] ['observationterrain_poi'] = stripslashes ( $row ['observationterrain_poi'] );
-					$arr [$i] ['reponse_collectivite_poi'] = stripslashes ( $row ['reponse_collectivite_poi'] );
-					$arr [$i] ['reponsepole_poi'] = stripslashes ( $row ['reponsepole_poi'] );
-					$arr [$i] ['commentfinal_poi'] = stripslashes ( $row ['commentfinal_poi'] );
-					$arr [$i] ['display_poi'] = $row ['display_poi'];
-					$arr [$i] ['fix_poi'] = $row ['fix_poi'];
-					$arr [$i] ['traiteparpole_poi'] = $row ['traiteparpole_poi'];
-					$arr [$i] ['moderation_poi'] = $row ['moderation_poi'];
-					$arr [$i] ['transmission_poi'] = $row ['transmission_poi'];
-					$arr [$i] ['photo_poi'] = $row ['photo_poi'];
-					$arr [$i] ['datecreation_poi'] = $row ['datecreation_poi'];
-					$arr [$i] ['datefix_poi'] = $row ['datefix_poi'];
-					$arr [$i] ['lib_subcategory'] = stripslashes ( $row ['lib_subcategory'] );
-					$arr [$i] ['lib_commune'] = stripslashes ( $row ['lib_commune'] );
-					$arr [$i] ['lib_pole'] = stripslashes ( $row ['lib_pole'] );
-					$arr [$i] ['lib_quartier'] = stripslashes ( $row ['lib_quartier'] );
-					$arr [$i] ['lib_priorite'] = stripslashes ( $row ['lib_priorite'] );
-					$arr [$i] ['lib_status'] = stripslashes ( $row ['lib_status'] );
-					$arr [$i] ['geolocatemode_poi'] = $row ['geolocatemode_poi'];
-					$arr [$i] ['longitude_poi'] = $row ['X'];
-					$arr [$i] ['latitude_poi'] = $row ['Y'];
-					$arr [$i] ['lastdatemodif_poi'] = $row ['lastdatemodif_poi'];
-					
-					$sql2 = "SELECT * FROM commentaires WHERE poi_id_poi = " . $row ['id_poi'];
-					$result2 = mysql_query ( $sql2 );
-					$nb2 = mysql_num_rows ( $result2 );
-					
-					$j = 0;
-					$comments = '<b>Commentaires</b><br />';
-					$acceptedCommentCount = 0;
-					while ( $row2 = mysql_fetch_array ( $result2 ) ) {
-						
-						if ($_SESSION ["type"] == 4 || $_SESSION ["type"] == 1) {
-							$color = 'green';
-							if ($row2 ['display_commentaires'] == 'Non modéré') {
-								$color = 'orange';
-							} else if ($row2 ['display_commentaires'] == 'Modéré refusé') {
-								$color = 'red';
-							}
-							$comments .= '<ul><li style="color:' . $color . ';">' . ($j+1) . '. ';
-							if ($row2 ['datecreation'] != '0000-00-00 00:00:00') {
-								$comments .= 'Ajouté le ' . $row2 ['datecreation'] . '';
-							} else {
-								$comments .= 'Ajouté le ?';
-							}
-							if ($row2 ['mail_commentaires'] != '') {
-								$comments .= ", par " . $row2 ['mail_commentaires'] . " : ";
-							} else {
-								$comments .= ', par ? : ';
-							}
-							
-							$comments .= nl2br ( $row2 ['text_commentaires'] ) . '</i></li>';
-							if ($row2 ['url_photo'] != "") {
-								$comments .= '<li><a href="./resources/pictures/' . $row2 ['url_photo'] . '" target="_blank">Photo associée</a></li>';
-							}
-							$comments .= '</ul><hr />';
-						} else if ($_SESSION ["type"] == 2 || $_SESSION ["type"] == 3) {
-							if ($row2 ['display_commentaires'] == 'Modéré accepté') {
-								$acceptedCommentCount ++;
-								$comments .= '<ul><li>' . $acceptedCommentCount . '. ';
-								if ($row2 ['datecreation'] != '0000-00-00 00:00:00') {
-									$comments .= 'Ajouté le ' . $row2 ['datecreation'] . ' : ';
-								} else {
-									$comments .= 'Ajouté le ? : ';
-								}
-								$comments .= nl2br ( $row2 ['text_commentaires'] ) . '</i></li>';
-								if ($row2 ['url_photo'] != "") {
-									$comments .= '<li><a href="./resources/pictures/' . $row2 ['url_photo'] . '" target="_blank">Photo associée</a></li>';
-								}
-								$comments .= '</ul><hr />';
-							}
-						}
-						
-						$j ++;
-					}
-					$arr [$i] ['num_comments'] = $j;
-					$arr [$i] ['num_accepted_comments'] = $acceptedCommentCount;
-					if ($j > 0) {
-						if ($_SESSION ["type"] == 4 || $_SESSION ["type"] == 1) {
-							$comments .= "Cliquer sur le bouton \"Commentaires\" ci-dessous pour le(s) modérer.";
-						} else {
-							$arr [$i] ['num_comments'] = $acceptedCommentCount;
-							if ($acceptedCommentCount > 0) {
-								$comments .= "Cliquer sur le bouton \"Commentaires\" ci-dessous pour le(s) afficher en vue tableau.";
-							} else {
-								$comments .= "Encore aucun commentaire associé";
-							}
-						}
-					} else {
-						$comments .= "Encore aucun commentaire associé";
-					}
-					$arr [$i] ['comments'] = stripslashes ( $comments );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+            } elseif ($_SESSION["type"] == 4) {
+                $whereClause .= ' AND poi.pole_id_pole IN (' . $_SESSION["pole"] . ') ';
+            }
+            $sql = "SELECT poi.*, subcategory.lib_subcategory, commune.lib_commune, pole.lib_pole, quartier.lib_quartier, priorite.lib_priorite, status.lib_status, x(poi.geom_poi) AS X, y(poi.geom_poi) AS Y FROM poi INNER JOIN subcategory ON (subcategory.id_subcategory = poi.subcategory_id_subcategory) INNER JOIN commune ON (commune.id_commune = poi.commune_id_commune) INNER JOIN pole ON (pole.id_pole = poi.pole_id_pole) INNER JOIN quartier ON (quartier.id_quartier = poi.quartier_id_quartier) INNER JOIN priorite ON (priorite.id_priorite = poi.priorite_id_priorite) INNER JOIN status ON (status.id_status = poi.status_id_status) WHERE $whereClause ";
+            
+            $sql .= " ORDER BY ";
+            if ($sort == '0' && $dir == '0') {
+                switch ($asc) {
+                    case 'subcategory':
+                        $sql .= " lib_subcategory ASC";
+                        break;
+                    case 'lib':
+                        $sql .= " lib_poi ASC";
+                        break;
+                    default:
+                        $sql .= " id_poi DESC";
+                        break;
+                }
+            } else {
+                $sql .= $sort . " " . $dir;
+            }
+            
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - getPoi sql $sql retourne $nbrows (s'il n'y avait pas de limites)\n", 3, LOG_FILE);
+            }
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_poi'] = $row['id_poi'];
+                    $arr[$i]['lib_poi'] = stripslashes($row['lib_subcategory']);
+                    $arr[$i]['adherent_poi'] = stripslashes($row['adherent_poi']);
+                    $arr[$i]['num_poi'] = stripslashes($row['num_poi']);
+                    $arr[$i]['rue_poi'] = stripslashes($row['rue_poi']);
+                    $arr[$i]['tel_poi'] = stripslashes($row['tel_poi']);
+                    if ($_SESSION["type"] == 4 || $_SESSION["type"] == 1) {
+                        $arr[$i]['mail_poi'] = stripslashes($row['mail_poi']);
+                    } else {
+                        $arr[$i]['mail_poi'] = "******";
+                    }
+                    $arr[$i]['desc_poi'] = stripslashes($row['desc_poi']);
+                    $arr[$i]['prop_poi'] = stripslashes($row['prop_poi']);
+                    $arr[$i]['observationterrain_poi'] = stripslashes($row['observationterrain_poi']);
+                    $arr[$i]['reponse_collectivite_poi'] = stripslashes($row['reponse_collectivite_poi']);
+                    $arr[$i]['reponsepole_poi'] = stripslashes($row['reponsepole_poi']);
+                    $arr[$i]['commentfinal_poi'] = stripslashes($row['commentfinal_poi']);
+                    $arr[$i]['display_poi'] = $row['display_poi'];
+                    $arr[$i]['fix_poi'] = $row['fix_poi'];
+                    $arr[$i]['traiteparpole_poi'] = $row['traiteparpole_poi'];
+                    $arr[$i]['moderation_poi'] = $row['moderation_poi'];
+                    $arr[$i]['transmission_poi'] = $row['transmission_poi'];
+                    $arr[$i]['photo_poi'] = $row['photo_poi'];
+                    $arr[$i]['datecreation_poi'] = $row['datecreation_poi'];
+                    $arr[$i]['datefix_poi'] = $row['datefix_poi'];
+                    $arr[$i]['lib_subcategory'] = stripslashes($row['lib_subcategory']);
+                    $arr[$i]['lib_commune'] = stripslashes($row['lib_commune']);
+                    $arr[$i]['lib_pole'] = stripslashes($row['lib_pole']);
+                    $arr[$i]['lib_quartier'] = stripslashes($row['lib_quartier']);
+                    $arr[$i]['lib_priorite'] = stripslashes($row['lib_priorite']);
+                    $arr[$i]['lib_status'] = stripslashes($row['lib_status']);
+                    $arr[$i]['geolocatemode_poi'] = $row['geolocatemode_poi'];
+                    $arr[$i]['longitude_poi'] = $row['X'];
+                    $arr[$i]['latitude_poi'] = $row['Y'];
+                    $arr[$i]['lastdatemodif_poi'] = $row['lastdatemodif_poi'];
+                    
+                    $sql2 = "SELECT * FROM commentaires WHERE poi_id_poi = " . $row['id_poi'];
+                    $result2 = mysql_query($sql2);
+                    $nb2 = mysql_num_rows($result2);
+                    
+                    $j = 0;
+                    $comments = '<b>Commentaires</b><br />';
+                    $acceptedCommentCount = 0;
+                    while ($row2 = mysql_fetch_array($result2)) {
+                        
+                        if ($_SESSION["type"] == 4 || $_SESSION["type"] == 1) {
+                            $color = 'green';
+                            if ($row2['display_commentaires'] == 'Non modéré') {
+                                $color = 'orange';
+                            } else if ($row2['display_commentaires'] == 'Modéré refusé') {
+                                $color = 'red';
+                            }
+                            $comments .= '<ul><li style="color:' . $color . ';">' . ($j + 1) . '. ';
+                            if ($row2['datecreation'] != '0000-00-00 00:00:00') {
+                                $comments .= 'Ajouté le ' . $row2['datecreation'] . '';
+                            } else {
+                                $comments .= 'Ajouté le ?';
+                            }
+                            if ($row2['mail_commentaires'] != '') {
+                                $comments .= ", par " . $row2['mail_commentaires'] . " : ";
+                            } else {
+                                $comments .= ', par ? : ';
+                            }
+                            
+                            $comments .= nl2br($row2['text_commentaires']) . '</i></li>';
+                            if ($row2['url_photo'] != "") {
+                                $comments .= '<li><a href="./resources/pictures/' . $row2['url_photo'] . '" target="_blank">Photo associée</a></li>';
+                            }
+                            $comments .= '</ul><hr />';
+                        } else if ($_SESSION["type"] == 2 || $_SESSION["type"] == 3) {
+                            if ($row2['display_commentaires'] == 'Modéré accepté') {
+                                $acceptedCommentCount ++;
+                                $comments .= '<ul><li>' . $acceptedCommentCount . '. ';
+                                if ($row2['datecreation'] != '0000-00-00 00:00:00') {
+                                    $comments .= 'Ajouté le ' . $row2['datecreation'] . ' : ';
+                                } else {
+                                    $comments .= 'Ajouté le ? : ';
+                                }
+                                $comments .= nl2br($row2['text_commentaires']) . '</i></li>';
+                                if ($row2['url_photo'] != "") {
+                                    $comments .= '<li><a href="./resources/pictures/' . $row2['url_photo'] . '" target="_blank">Photo associée</a></li>';
+                                }
+                                $comments .= '</ul><hr />';
+                            }
+                        }
+                        
+                        $j ++;
+                    }
+                    $arr[$i]['num_comments'] = $j;
+                    $arr[$i]['num_accepted_comments'] = $acceptedCommentCount;
+                    if ($j > 0) {
+                        if ($_SESSION["type"] == 4 || $_SESSION["type"] == 1) {
+                            $comments .= "Cliquer sur le bouton \"Commentaires\" ci-dessous pour le(s) modérer.";
+                        } else {
+                            $arr[$i]['num_comments'] = $acceptedCommentCount;
+                            if ($acceptedCommentCount > 0) {
+                                $comments .= "Cliquer sur le bouton \"Commentaires\" ci-dessous pour le(s) afficher en vue tableau.";
+                            } else {
+                                $comments .= "Encore aucun commentaire associé";
+                            }
+                        }
+                    } else {
+                        $comments .= "Encore aucun commentaire associé";
+                    }
+                    $arr[$i]['comments'] = stripslashes($comments);
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            mysql_free_result($result);
+            mysql_close($link);
+            
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updatePoi //methode appelée par poi1 à 4, quand quelqu'un modifie une information via la datatable sur l'interface d'administration Input			: Output			: success => '1' / pas de modification => 2 : failed => '3' Object			: update poi grid Date			: July 13, 2015
+ * Function name : updatePoi //methode appelée par poi1 à 4, quand quelqu'un modifie une information via la datatable sur l'interface d'administration Input : Output : success => '1' / pas de modification => 2 : failed => '3' Object : update poi grid Date : July 13, 2015
  */
-function updatePoi() {
-	$id_poi = stripslashes ( $_POST ['id_poi'] );
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$arrayObs = getObservationDetailsInArray ( $id_poi );
-			
-			$arrayDetailsAndUpdateSQL = getObservationDetailsInString ( $arrayObs );
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - Il y a " . count ( $arrayDetailsAndUpdateSQL ) . " infos chargées pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - updateObsBoolean " . $arrayDetailsAndUpdateSQL ['updateObsBoolean'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - sqlUpdate " . $arrayDetailsAndUpdateSQL ['sqlUpdate'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - detailObservationString " . $arrayDetailsAndUpdateSQL ['detailObservationString'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-			}
-			if ($arrayDetailsAndUpdateSQL ['updateObsBoolean']) {
-				$sql = "UPDATE poi SET " . $arrayDetailsAndUpdateSQL ['sqlUpdate'] . " WHERE id_poi = " . $id_poi;
-				
-				$mails = array ();
-				// usertype_id_usertype : 1=Admin, 2=comcom, 3=pole tech, 4=moderateur
-				// mail à la comcom si un pole a édité le champ 'Réponse pole'
-				$poleedit = 0;
-				if (isset( $_POST ['poleedit'] )){
-					$poleedit = mysql_real_escape_string ( $_POST ['poleedit'] );
-				}
-				
-				// mail aux comptes comcom du territoire concerné par l'observation et aux modérateurs
-				if ($poleedit == 1) {
-					$subject = 'Modification de l\'observation n°' . $arrayObs ['id_poi'] . ' par le pole ' . $arrayObs ['lib_pole'];
-					$message = 'Bonjour !
-Le pole ' . $arrayObs ['lib_pole'] . ' a modifié l\'observation n°' . $arrayObs ['id_poi'] . "\n";
-					$message .= "Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs ['id_poi'] . "\n" . $arrayDetailsAndUpdateSQL ['detailObservationString'] . "\n";
-					
-					$message .= "Cordialement, l'Association " . VELOBS_ASSOCIATION . " :)";
-					$whereClause = "(u.usertype_id_usertype = 2 AND u.territoire_id_territoire = " . $arrayObs ['territoire_id_territoire'] . ") OR (u.usertype_id_usertype = 4 AND u.num_pole = " . $arrayObs ['pole_id_pole'] . ")";
-					$mailsComComModo = getMailsToSend ( $whereClause, $subject, $message );
-				}
-				// Priorités et leur iD
-				// "1","Priorité 1"
-				// "2","Priorité 2"
-				// "4","A modérer"
-				// "6","Clôturé"
-				// "7","Refusé par l'association" : non affiché sur l'interface publique
-				// "8","Urgence" : non affiché sur l'interface publique
-				// "12","Refusé par la collectivité"
-				// "15","Doublon"
-				// on ne traite priorite_id_priorite que si il a été mis à jour
-				$checkModerateBoxOnPOIGrid = 0;
-				$updatePOI = 1; // flag permettant de savoir si on doit mettre à jour l'observation (en fonction de règles définies ci-dessous) et envoyer un mail au contributeur
-				$returnCode = 0;
-				if (isset ( $_POST ['priorite_id_priorite'] ) && is_numeric ( $_POST ['priorite_id_priorite'] ) && $arrayObs ['priorite_id_priorite'] != $_POST ['priorite_id_priorite']) {
-					$checkModerateBoxOnPOIGrid = 1;
-					$new_id_priorite = $_POST ['priorite_id_priorite'];
-					$sqlPriorite = "SELECT * FROM priorite WHERE id_priorite = " . $new_id_priorite;
-					$resultPriorite = mysql_query ( $sqlPriorite );
-					$priorite = mysql_fetch_array ( $resultPriorite );
-					$subject = $priorite ['priorite_sujet_email'];
-					$message = str_replace ( "#VELOBS_ASSOCIATION#", VELOBS_ASSOCIATION, $priorite ['priorite_corps_email'] ) . "\n" . $arrayDetailsAndUpdateSQL ['detailObservationString'] . "\n" . $signature;
-					if ($priorite ['besoin_commentaire_association'] && ($arrayObs ['commentfinal_poi'] == '' && $_POST ['commentfinal_poi'] == '')) {
-						$updatePOI = 0;
-						$returnCode = 10;
-					}
-					if ($updatePOI == 1 && $subject != "") {
-						$mailArray = [ 
-								$arrayObs ['mail_poi'],
-								'Contributeur',
-								$subject,
-								$message 
-						];
-						array_push ( $mails, $mailArray );
-					}
-				}
-				// si la modif a été faite par la comcom ou un pole technique
-				if (isset ( $_SESSION ['type'] ) && ($_SESSION ['type'] == 2 || $_SESSION ['type'] == 3)) {
-					// mail à l'association vélo pour prévenir d'une modif + mail au(x) responsable(s) du pole
-					$subject = 'Modification sur l\'observation n°' . $arrayObs ['id_poi'] . ' - ' . $arrayObs ['lib_pole'];
-					$message = 'Bonjour !
-La collectivité ou un pôle technique (compte ' . $_SESSION ['user'] . ') a modifié l\'observation n°' . $arrayObs ['id_poi'] . ' du pole ' . $arrayObs ['lib_pole'] . "\n
+function updatePoi()
+{
+    $id_poi = stripslashes($_POST['id_poi']);
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $arrayObs = getObservationDetailsInArray($id_poi);
+            
+            $arrayDetailsAndUpdateSQL = getObservationDetailsInString($arrayObs);
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - Il y a " . count($arrayDetailsAndUpdateSQL) . " infos chargées pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - updateObsBoolean " . $arrayDetailsAndUpdateSQL['updateObsBoolean'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sqlUpdate " . $arrayDetailsAndUpdateSQL['sqlUpdate'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - detailObservationString " . $arrayDetailsAndUpdateSQL['detailObservationString'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+            }
+            if ($arrayDetailsAndUpdateSQL['updateObsBoolean']) {
+                $sql = "UPDATE poi SET " . $arrayDetailsAndUpdateSQL['sqlUpdate'] . " WHERE id_poi = " . $id_poi;
+                
+                $mails = array();
+                // usertype_id_usertype : 1=Admin, 2=comcom, 3=pole tech, 4=moderateur
+                // mail à la comcom si un pole a édité le champ 'Réponse pole'
+                $poleedit = 0;
+                if (isset($_POST['poleedit'])) {
+                    $poleedit = mysql_real_escape_string($_POST['poleedit']);
+                }
+                
+                // mail aux comptes comcom du territoire concerné par l'observation et aux modérateurs
+                if ($poleedit == 1) {
+                    $subject = 'Modification de l\'observation n°' . $arrayObs['id_poi'] . ' par le pole ' . $arrayObs['lib_pole'];
+                    $message = 'Bonjour !
+Le pole ' . $arrayObs['lib_pole'] . ' a modifié l\'observation n°' . $arrayObs['id_poi'] . "\n";
+                    $message .= "Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs['id_poi'] . "\n" . $arrayDetailsAndUpdateSQL['detailObservationString'] . "\n";
+                    
+                    $message .= "Cordialement, l'Association " . VELOBS_ASSOCIATION . " :)";
+                    $whereClause = "(u.usertype_id_usertype = 2 AND ulp.territoire_id_territoire = " . $arrayObs['territoire_id_territoire'] . ") OR (u.usertype_id_usertype = 4 AND ulp.num_pole = " . $arrayObs['pole_id_pole'] . ")";
+                    $mailsComComModo = getMailsToSend($whereClause, $subject, $message);
+                }
+                // Priorités et leur iD
+                // "1","Priorité 1"
+                // "2","Priorité 2"
+                // "4","A modérer"
+                // "6","Clôturé"
+                // "7","Refusé par l'association" : non affiché sur l'interface publique
+                // "8","Urgence" : non affiché sur l'interface publique
+                // "12","Refusé par la collectivité"
+                // "15","Doublon"
+                // on ne traite priorite_id_priorite que si il a été mis à jour
+                $checkModerateBoxOnPOIGrid = 0;
+                $updatePOI = 1; // flag permettant de savoir si on doit mettre à jour l'observation (en fonction de règles définies ci-dessous) et envoyer un mail au contributeur
+                $returnCode = 0;
+                if (isset($_POST['priorite_id_priorite']) && is_numeric($_POST['priorite_id_priorite']) && $arrayObs['priorite_id_priorite'] != $_POST['priorite_id_priorite']) {
+                    $checkModerateBoxOnPOIGrid = 1;
+                    $new_id_priorite = $_POST['priorite_id_priorite'];
+                    $sqlPriorite = "SELECT * FROM priorite WHERE id_priorite = " . $new_id_priorite;
+                    $resultPriorite = mysql_query($sqlPriorite);
+                    $priorite = mysql_fetch_array($resultPriorite);
+                    $subject = $priorite['priorite_sujet_email'];
+                    $message = str_replace("#VELOBS_ASSOCIATION#", VELOBS_ASSOCIATION, $priorite['priorite_corps_email']) . "\n" . $arrayDetailsAndUpdateSQL['detailObservationString'] . "\n" . $signature;
+                    if ($priorite['besoin_commentaire_association'] && ($arrayObs['commentfinal_poi'] == '' && $_POST['commentfinal_poi'] == '')) {
+                        $updatePOI = 0;
+                        $returnCode = 10;
+                    }
+                    $mailsFollowers = getMailsToSendFromVotesAndComments($id_poi, $subject, "Vous recevez ce mail car vous avez souhaité suivre l'évolution de cette observation. Message envoyé à la personne qui a remonté l'observation : \n".$message);
+                    if ($updatePOI == 1 && $subject != "") {
+                        $mailArray = [
+                            $arrayObs['mail_poi'],
+                            'Contributeur',
+                            $subject,
+                            $message
+                        ];
+                        array_push($mails, $mailArray);
+                    }
+                }
+                // si la modif a été faite par la comcom ou un pole technique
+                if (isset($_SESSION['type']) && ($_SESSION['type'] == 2 || $_SESSION['type'] == 3)) {
+                    // mail à l'association vélo pour prévenir d'une modif + mail au(x) responsable(s) du pole
+                    $subject = 'Modification sur l\'observation n°' . $arrayObs['id_poi'] . ' - ' . $arrayObs['lib_pole'];
+                    $message = 'Bonjour !
+La collectivité ou un pôle technique (compte ' . $_SESSION['user'] . ') a modifié l\'observation n°' . $arrayObs['id_poi'] . ' du pole ' . $arrayObs['lib_pole'] . "\n
 Veuillez consulter l'interface d'administration pour consulter les informations relatives.
-Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs ['id_poi'] . "\n" . $arrayDetailsAndUpdateSQL ['detailObservationString'] . '
+Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs['id_poi'] . "\n" . $arrayDetailsAndUpdateSQL['detailObservationString'] . '
 ' . $signature;
-					// usertype_id_usertype : 1=Admin, 2=comcom, 3=pole tech, 4=moderateur
-					// mail aux admins velobs et aux modérateurs du pole concerné par l'observation
-					$whereClause = " u.usertype_id_usertype = 1 OR (u.usertype_id_usertype = 4 AND u.num_pole = " . $arrayObs ['pole_id_pole'] . ")";
-					$mailsAsso = getMailsToSend ( $whereClause, $subject, $message );
-				}
-				
-				// si une règle de modération n'est pas respectée, on ne met pas à jour l'observation et on n'evoie pas de mail, et on retourne un code d'erreur
-				if ($updatePOI == 0) {
-					echo $returnCode;
-				} else {
-					// on met à jour l'observation
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - sql " . $sql . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-					}
-					$result = mysql_query ( $sql );
-					// en cas d'erreur sur la requête,; on envoie un mail d'information à l'administrateur
-					if (! $result) {
-						if (DEBUG) {
-							error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " Erreur " . mysql_errno ( $link ) . " : " . mysql_error ( $link ), 3, LOG_FILE );
-						}
-						sendMail ( MAIL_FROM, "Erreur méthode updatePoi", "Erreur = " . mysql_error ( $link ) . ", requête = " . $sql );
-						echo '3';
-					} else {
-						// si la mise à jour de l'observation s'est bien déroulée, on envoie les mails
-						if (isset($mailsComComModo)) {
-							$succes = sendMails ( $mailsComComModo );
-						}
-						if (isset($mailsAsso)) {
-							$succes = sendMails ( $mailsAsso );
-						}
-						if (isset($mails)) {
-							$succes = sendMails ( $mails );
-						}
-						// on retourne un code de succès à l'interface
-						if ($checkModerateBoxOnPOIGrid) {
-							echo 4;
-						} else {
-							echo 1;
-						}
-					}
-				}
-				// }
-			} else {
-				// aucune mise à jour n'a été effectuée, car aucune information n'a été modifiée
-				echo 2;
-			}
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+                    // usertype_id_usertype : 1=Admin, 2=comcom, 3=pole tech, 4=moderateur
+                    // mail aux admins velobs et aux modérateurs du pole concerné par l'observation
+                    $whereClause = " u.usertype_id_usertype = 1 OR (u.usertype_id_usertype = 4 AND ulp.num_pole = " . $arrayObs['pole_id_pole'] . ")";
+                    $mailsAsso = getMailsToSend($whereClause, $subject, $message);
+                }
+                
+                // si une règle de modération n'est pas respectée, on ne met pas à jour l'observation et on n'evoie pas de mail, et on retourne un code d'erreur
+                if ($updatePOI == 0) {
+                    echo $returnCode;
+                } else {
+                    // on met à jour l'observation
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sql " . $sql . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                    }
+                    $result = mysql_query($sql);
+                    // en cas d'erreur sur la requête,; on envoie un mail d'information à l'administrateur
+                    if (! $result) {
+                        if (DEBUG) {
+                            error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Erreur " . mysql_errno($link) . " : " . mysql_error($link), 3, LOG_FILE);
+                        }
+                        sendMail(MAIL_FROM, "Erreur méthode updatePoi", "Erreur = " . mysql_error($link) . ", requête = " . $sql);
+                        echo '3';
+                    } else {
+                        // si la mise à jour de l'observation s'est bien déroulée, on envoie les mails
+                        if (isset($mailsComComModo)) {
+                            $succes = sendMails($mailsComComModo);
+                        }
+                        if (isset($mailsAsso)) {
+                            $succes = sendMails($mailsAsso);
+                        }
+                        if (isset($mails)) {
+                            $succes = sendMails($mails);
+                        }
+                        if (isset($mailsFollowers)) {
+                            $succes = sendMails($mailsFollowers);
+                        }
+                        // on retourne un code de succès à l'interface
+                        if ($checkModerateBoxOnPOIGrid) {
+                            echo 4;
+                        } else {
+                            echo 1;
+                        }
+                    }
+                }
+                // }
+            } else {
+                // aucune mise à jour n'a été effectuée, car aucune information n'a été modifiée
+                echo 2;
+            }
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deletePois Input			: Output			: success => '1' / failed => '2' Object			: delete poi(s) Date			: Jan. 22, 2012
+ * Function name : deletePois Input : Output : success => '1' / failed => '2' Object : delete poi(s) Date : Jan. 22, 2012
  */
-function deletePois() {
-	$ids = $_POST ['ids'];
-	$idpois = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idpois ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idpois ) == 1) {
-				$sql = "DELETE FROM poi WHERE id_poi = " . $idpois [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM poi WHERE ";
-				for($i = 0; $i < sizeof ( $idpois ); $i ++) {
-					$sql = $sql . "id_poi = " . $idpois [$i];
-					if ($i < sizeof ( $idpois ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deletePois()
+{
+    $ids = $_POST['ids'];
+    $idpois = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idpois) < 1) {
+                echo '0';
+            } else if (sizeof($idpois) == 1) {
+                $sql = "DELETE FROM poi WHERE id_poi = " . $idpois[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM poi WHERE ";
+                for ($i = 0; $i < sizeof($idpois); $i ++) {
+                    $sql = $sql . "id_poi = " . $idpois[$i];
+                    if ($i < sizeof($idpois) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deletePoisCorbeille Input			: Output			: success => '1' / failed => '2' Object			: delete poi(s) Date			: Jan. 22, 2012
+ * Function name : deletePoisCorbeille Input : Output : success => '1' / failed => '2' Object : delete poi(s) Date : Jan. 22, 2012
  */
-function deletePoisCorbeille() {
-	$ids = $_POST ['ids'];
-	$idpois = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idpois ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idpois ) == 1) {
-				// $sql = "DELETE FROM poi WHERE id_poi = ".$idpois[0];
-				$sql = "UPDATE poi SET delete_poi = TRUE WHERE id_poi = " . $idpois [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM poi WHERE ";
-				for($i = 0; $i < sizeof ( $idpois ); $i ++) {
-					/*
-					 * $sql = $sql . "id_poi = ".$idpois[$i]; if ($i < sizeof($idpois) - 1){ $sql = $sql . " OR "; }
-					 */
-					
-					$sql = "UPDATE poi SET delete_poi = TRUE WHERE id_poi = " . $idpois [$i];
-					$result = mysql_query ( $sql );
-				}
-				// $result = mysql_query($sql);
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deletePoisCorbeille()
+{
+    $ids = $_POST['ids'];
+    $idpois = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idpois) < 1) {
+                echo '0';
+            } else if (sizeof($idpois) == 1) {
+                // $sql = "DELETE FROM poi WHERE id_poi = ".$idpois[0];
+                $sql = "UPDATE poi SET delete_poi = TRUE WHERE id_poi = " . $idpois[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM poi WHERE ";
+                for ($i = 0; $i < sizeof($idpois); $i ++) {
+                    /*
+                     * $sql = $sql . "id_poi = ".$idpois[$i]; if ($i < sizeof($idpois) - 1){ $sql = $sql . " OR "; }
+                     */
+                    
+                    $sql = "UPDATE poi SET delete_poi = TRUE WHERE id_poi = " . $idpois[$i];
+                    $result = mysql_query($sql);
+                }
+                // $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getCommune Input			: start, limit Output			: json communes Object			: populate commune grid Date			: Jan. 24, 2012
+ * Function name : getCommune Input : start, limit Output : json communes Object : populate commune grid Date : Jan. 24, 2012
  */
-function getCommune($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM commune ORDER BY lib_commune ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_commune'] = $row ['id_commune'];
-					$arr [$i] ['lib_commune'] = stripslashes ( $row ['lib_commune'] );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getCommune($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM commune ORDER BY lib_commune ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_commune'] = $row['id_commune'];
+                    $arr[$i]['lib_commune'] = stripslashes($row['lib_commune']);
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateCommune Input			: Output			: success => '1' / failed => '2' Object			: update commune grid Date			: Jan. 24, 2012
+ * Function name : updateCommune Input : Output : success => '1' / failed => '2' Object : update commune grid Date : Jan. 24, 2012
  */
-function updateCommune() {
-	$id_commune = $_POST ['id_commune'];
-	$lib_commune = $_POST ['lib_commune'];
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "UPDATE commune SET lib_commune = '$lib_commune' WHERE id_commune = $id_commune";
-			$result = mysql_query ( $sql );
-			$sql = "UPDATE commune SET id_commune = $id_commune WHERE lib_commune = '$lib_commune'";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function updateCommune()
+{
+    $id_commune = $_POST['id_commune'];
+    $lib_commune = $_POST['lib_commune'];
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "UPDATE commune SET lib_commune = '$lib_commune' WHERE id_commune = $id_commune";
+            $result = mysql_query($sql);
+            $sql = "UPDATE commune SET id_commune = $id_commune WHERE lib_commune = '$lib_commune'";
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createCommune Input			: Output			: success => '1' / failed => '2' Object			: create commune Date			: Jan. 24, 2012
+ * Function name : createCommune Input : Output : success => '1' / failed => '2' Object : create commune Date : Jan. 24, 2012
  */
-function createCommune() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$lib_commune = mysql_real_escape_string ( $_POST ['lib_commune'] );
-			$id_commune = $_POST ['id_commune'];
-			
-			$sql = "INSERT INTO commune (lib_commune, id_commune) VALUES ('$lib_commune', $id_commune)";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function createCommune()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $lib_commune = mysql_real_escape_string($_POST['lib_commune']);
+            $id_commune = $_POST['id_commune'];
+            
+            $sql = "INSERT INTO commune (lib_commune, id_commune) VALUES ('$lib_commune', $id_commune)";
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deleteCommunes Input			: Output			: success => '1' / failed => '2' Object			: delete commune(s) Date			: Jan. 24, 2012
+ * Function name : deleteCommunes Input : Output : success => '1' / failed => '2' Object : delete commune(s) Date : Jan. 24, 2012
  */
-function deleteCommunes() {
-	$ids = $_POST ['ids'];
-	$idcitys = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idcitys ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idcitys ) == 1) {
-				$sql = "DELETE FROM commune WHERE id_commune = " . $idcitys [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM commune WHERE ";
-				for($i = 0; $i < sizeof ( $idcitys ); $i ++) {
-					$sql = $sql . "id_commune = " . $idcitys [$i];
-					if ($i < sizeof ( $idcitys ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deleteCommunes()
+{
+    $ids = $_POST['ids'];
+    $idcitys = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idcitys) < 1) {
+                echo '0';
+            } else if (sizeof($idcitys) == 1) {
+                $sql = "DELETE FROM commune WHERE id_commune = " . $idcitys[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM commune WHERE ";
+                for ($i = 0; $i < sizeof($idcitys); $i ++) {
+                    $sql = $sql . "id_commune = " . $idcitys[$i];
+                    if ($i < sizeof($idcitys) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getPole Input			: start, limit Output			: json poles Object			: populate pole grid Date			: May 2, 2012
+ * Function name : getPole Input : start, limit Output : json poles Object : populate pole grid Date : May 2, 2012
  */
-function getPole($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM pole ORDER BY lib_pole ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_pole'] = $row ['id_pole'];
-					$arr [$i] ['lib_pole'] = stripslashes ( $row ['lib_pole'] );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getPole($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM pole ORDER BY lib_pole ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_pole'] = $row['id_pole'];
+                    $arr[$i]['lib_pole'] = stripslashes($row['lib_pole']);
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updatePole Input			: Output			: success => '1' / failed => '2' Object			: update pole grid Date			: May 2, 2012
+ * Function name : updatePole Input : Output : success => '1' / failed => '2' Object : update pole grid Date : May 2, 2012
  */
-function updatePole() {
-	$id_pole = $_POST ['id_pole'];
-	$lib_pole = $_POST ['lib_pole'];
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "UPDATE pole SET lib_pole = '$lib_pole' WHERE id_pole = $id_pole";
-			$result = mysql_query ( $sql );
-			// $sql = "UPDATE pole SET id_pole = $id_pole WHERE lib_pole = '$lib_pole'";
-			// $result = mysql_query($sql);
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function updatePole()
+{
+    $id_pole = $_POST['id_pole'];
+    $lib_pole = $_POST['lib_pole'];
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "UPDATE pole SET lib_pole = '$lib_pole' WHERE id_pole = $id_pole";
+            $result = mysql_query($sql);
+            // $sql = "UPDATE pole SET id_pole = $id_pole WHERE lib_pole = '$lib_pole'";
+            // $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createPole Input			: Output			: success => '1' / failed => '2' Object			: create pole Date			: May 2, 2012
+ * Function name : createPole Input : Output : success => '1' / failed => '2' Object : create pole Date : May 2, 2012
  */
-function createPole() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$lib_pole = mysql_real_escape_string ( $_POST ['lib_pole'] );
-			$id_pole = $_POST ['id_pole'];
-			
-			$sql = "INSERT INTO pole (lib_pole, id_pole) VALUES ('$lib_pole', $id_pole)";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function createPole()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $lib_pole = mysql_real_escape_string($_POST['lib_pole']);
+            $id_pole = $_POST['id_pole'];
+            
+            $sql = "INSERT INTO pole (lib_pole, id_pole) VALUES ('$lib_pole', $id_pole)";
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deletePoles Input			: Output			: success => '1' / failed => '2' Object			: delete pole(s) Date			: May 2, 2012
+ * Function name : deletePoles Input : Output : success => '1' / failed => '2' Object : delete pole(s) Date : May 2, 2012
  */
-function deletePoles() {
-	$ids = $_POST ['ids'];
-	$idpoles = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idpoles ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idpoles ) == 1) {
-				$sql = "DELETE FROM pole WHERE id_pole = " . $idpoles [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM pole WHERE ";
-				for($i = 0; $i < sizeof ( $idpoles ); $i ++) {
-					$sql = $sql . "id_pole = " . $idpoles [$i];
-					if ($i < sizeof ( $idpoles ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deletePoles()
+{
+    $ids = $_POST['ids'];
+    $idpoles = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idpoles) < 1) {
+                echo '0';
+            } else if (sizeof($idpoles) == 1) {
+                $sql = "DELETE FROM pole WHERE id_pole = " . $idpoles[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM pole WHERE ";
+                for ($i = 0; $i < sizeof($idpoles); $i ++) {
+                    $sql = $sql . "id_pole = " . $idpoles[$i];
+                    if ($i < sizeof($idpoles) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getQuartier Input			: start, limit Output			: json quartiers Object			: populate quartier grid Date			: May 2, 2012
+ * Function name : getQuartier Input : start, limit Output : json quartiers Object : populate quartier grid Date : May 2, 2012
  */
-function getQuartier($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM quartier ORDER BY lib_quartier ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_quartier'] = $row ['id_quartier'];
-					$arr [$i] ['lib_quartier'] = stripslashes ( $row ['lib_quartier'] );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getQuartier($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM quartier ORDER BY lib_quartier ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_quartier'] = $row['id_quartier'];
+                    $arr[$i]['lib_quartier'] = stripslashes($row['lib_quartier']);
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateQuartier Input			: Output			: success => '1' / failed => '2' Object			: update quartier grid Date			: May 2, 2012
+ * Function name : updateQuartier Input : Output : success => '1' / failed => '2' Object : update quartier grid Date : May 2, 2012
  */
 
 // function updateQuartier() {
@@ -1195,7 +1222,7 @@ function getQuartier($start, $limit) {
 // }
 
 /*
- * Function name 	: createQuartier Input			: Output			: success => '1' / failed => '2' Object			: create quartier Date			: May 2, 2012
+ * Function name : createQuartier Input : Output : success => '1' / failed => '2' Object : create quartier Date : May 2, 2012
  */
 
 // function createQuartier() {
@@ -1225,7 +1252,7 @@ function getQuartier($start, $limit) {
 // }
 
 /*
- * Function name 	: deleteQuartiers Input			: Output			: success => '1' / failed => '2' Object			: delete quartier(s) Date			: May 2, 2012
+ * Function name : deleteQuartiers Input : Output : success => '1' / failed => '2' Object : delete quartier(s) Date : May 2, 2012
  */
 
 // function deleteQuartiers() {
@@ -1270,1018 +1297,1264 @@ function getQuartier($start, $limit) {
 // }
 
 /*
- * Function name 	: getPriorite Input			: start, limit Output			: json priorites Object			: populate priorite grid Date			: May 3, 2012
+ * Function name : getPriorite Input : start, limit Output : json priorites Object : populate priorite grid Date : May 3, 2012
  */
-function getPriorite($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM priorite ORDER BY lib_priorite ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_priorite'] = $row ['id_priorite'];
-					$arr [$i] ['lib_priorite'] = stripslashes ( $row ['lib_priorite'] );
-					$arr [$i] ['non_visible_par_collectivite'] = stripslashes ( $row ['non_visible_par_collectivite'] );
-					$arr [$i] ['non_visible_par_public'] = stripslashes ( $row ['non_visible_par_public'] );
-					$arr [$i] ['priorite_sujet_email'] = stripslashes ( $row ['priorite_sujet_email'] );
-					$arr [$i] ['priorite_corps_email'] = stripslashes ( $row ['priorite_corps_email'] );
-					$arr [$i] ['besoin_commentaire_association'] = stripslashes ( $row ['besoin_commentaire_association'] );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getPriorite($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM priorite ORDER BY lib_priorite ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_priorite'] = $row['id_priorite'];
+                    $arr[$i]['lib_priorite'] = stripslashes($row['lib_priorite']);
+                    $arr[$i]['non_visible_par_collectivite'] = stripslashes($row['non_visible_par_collectivite']);
+                    $arr[$i]['non_visible_par_public'] = stripslashes($row['non_visible_par_public']);
+                    $arr[$i]['priorite_sujet_email'] = stripslashes($row['priorite_sujet_email']);
+                    $arr[$i]['priorite_corps_email'] = stripslashes($row['priorite_corps_email']);
+                    $arr[$i]['besoin_commentaire_association'] = stripslashes($row['besoin_commentaire_association']);
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updatePriorite Input			: Output			: success => '1' / failed => '2' Object			: update priorite grid Date			: May 3, 2012
+ * Function name : updatePriorite Input : Output : success => '1' / failed => '2' Object : update priorite grid Date : May 3, 2012
  */
-function updatePriorite() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$id_priorite = mysql_real_escape_string ( $_POST ['id_priorite'] );
-			$lib_priorite = mysql_real_escape_string ( $_POST ['lib_priorite'] );
-			$non_visible_par_collectivite = mysql_real_escape_string ( $_POST ['non_visible_par_collectivite'] );
-			$non_visible_par_public = mysql_real_escape_string ( $_POST ['non_visible_par_public'] );
-			$priorite_sujet_email = mysql_real_escape_string ( $_POST ['priorite_sujet_email'] );
-			$priorite_corps_email = mysql_real_escape_string ( $_POST ['priorite_corps_email'] );
-			$besoin_commentaire_association = mysql_real_escape_string ( $_POST ['besoin_commentaire_association'] );
-			$sql = "UPDATE priorite SET lib_priorite = '$lib_priorite', 
+function updatePriorite()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $id_priorite = mysql_real_escape_string($_POST['id_priorite']);
+            $lib_priorite = mysql_real_escape_string($_POST['lib_priorite']);
+            $non_visible_par_collectivite = mysql_real_escape_string($_POST['non_visible_par_collectivite']);
+            $non_visible_par_public = mysql_real_escape_string($_POST['non_visible_par_public']);
+            $priorite_sujet_email = mysql_real_escape_string($_POST['priorite_sujet_email']);
+            $priorite_corps_email = mysql_real_escape_string($_POST['priorite_corps_email']);
+            $besoin_commentaire_association = mysql_real_escape_string($_POST['besoin_commentaire_association']);
+            $sql = "UPDATE priorite SET lib_priorite = '$lib_priorite', 
 					non_visible_par_collectivite = $non_visible_par_collectivite, 
 					non_visible_par_public = $non_visible_par_public,
 					priorite_sujet_email = '$priorite_sujet_email',
 					priorite_corps_email = '$priorite_corps_email',
 					besoin_commentaire_association = $besoin_commentaire_association
 					 WHERE id_priorite = $id_priorite";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createPriorite Input			: Output			: success => '1' / failed => '2' Object			: create priorite Date			: May 3, 2012
+ * Function name : createPriorite Input : Output : success => '1' / failed => '2' Object : create priorite Date : May 3, 2012
  */
-function createPriorite() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$lib_priorite = mysql_real_escape_string ( $_POST ['lib_priorite'] );
-			
-			$sql = "INSERT INTO priorite (lib_priorite) VALUES ('$lib_priorite')";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function createPriorite()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $lib_priorite = mysql_real_escape_string($_POST['lib_priorite']);
+            
+            $sql = "INSERT INTO priorite (lib_priorite) VALUES ('$lib_priorite')";
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deletePriorites Input			: Output			: success => '1' / failed => '2' Object			: delete priorite(s) Date			: May 3, 2012
+ * Function name : deletePriorites Input : Output : success => '1' / failed => '2' Object : delete priorite(s) Date : May 3, 2012
  */
-function deletePriorites() {
-	$ids = $_POST ['ids'];
-	$idpriorites = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idpriorites ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idpriorites ) == 1) {
-				$sql = "DELETE FROM priorite WHERE id_priorite = " . $idpriorites [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM priorite WHERE ";
-				for($i = 0; $i < sizeof ( $idpriorites ); $i ++) {
-					$sql = $sql . "id_priorite = " . $idpriorites [$i];
-					if ($i < sizeof ( $idpriorites ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deletePriorites()
+{
+    $ids = $_POST['ids'];
+    $idpriorites = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idpriorites) < 1) {
+                echo '0';
+            } else if (sizeof($idpriorites) == 1) {
+                $sql = "DELETE FROM priorite WHERE id_priorite = " . $idpriorites[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM priorite WHERE ";
+                for ($i = 0; $i < sizeof($idpriorites); $i ++) {
+                    $sql = $sql . "id_priorite = " . $idpriorites[$i];
+                    if ($i < sizeof($idpriorites) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getStatus Input			: start, limit Output			: json status Object			: populate status grid Date			: May 3, 2012
+ * Function name : getStatus Input : start, limit Output : json status Object : populate status grid Date : May 3, 2012
  */
-function getStatus($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT * FROM status ORDER BY lib_status ASC";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_status'] = $row ['id_status'];
-					$arr [$i] ['lib_status'] = stripslashes ( $row ['lib_status'] );
-					$arr [$i] ['color_status'] = stripslashes ( $row ['color_status'] );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getStatus($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT * FROM status ORDER BY lib_status ASC";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_status'] = $row['id_status'];
+                    $arr[$i]['lib_status'] = stripslashes($row['lib_status']);
+                    $arr[$i]['color_status'] = stripslashes($row['color_status']);
+                    $arr[$i]['is_active_status'] = stripslashes($row['is_active_status']);
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateStatus Input			: Output			: success => '1' / failed => '2' Object			: update status grid Date			: May 3, 2012
+ * Function name : updateStatus Input : Output : success => '1' / failed => '2' Object : update status grid Date : May 3, 2012
  */
-function updateStatus() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$id_status = mysql_real_escape_string ( $_POST ['id_status'] );
-			$lib_status = mysql_real_escape_string ( $_POST ['lib_status'] );
-			$color_status = mysql_real_escape_string ( $_POST ['color_status'] );
-			$sql = "UPDATE status SET lib_status = '$lib_status', color_status = '$color_status' WHERE id_status = $id_status";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function updateStatus()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            $id_status = mysql_real_escape_string($_POST['id_status']);
+            $sql = "UPDATE status SET ";
+            if (isset($_POST['lib_status']) && $_POST['lib_status'] != '') {
+                $sql .= "lib_status = '" . mysql_real_escape_string($_POST['lib_status']) . "',";
+            }
+            if (isset($_POST['color_status']) && $_POST['color_status'] != '') {
+                $sql .= "color_status = '" . mysql_real_escape_string($_POST['color_status']) . "',";
+            }
+            if (isset($_POST['is_active_status']) && $_POST['is_active_status'] != '') {
+                if ($_POST['is_active_status'] == 0) {
+                    $sqlNbPOI = "SELECT id_poi FROM poi WHERE status_id_status = $id_status";
+                    $resultNbPOI = mysql_query($sqlNbPOI);
+                    $nbrows = mysql_num_rows($resultNbPOI);
+                    //if obsevation exist with this status, do not allow to deactivate it
+                    if ($nbrows > 0) {
+                        echo '2: Erreur lors de la mise à jour du statut - vous ne pouvez pas le désactiver tant que des observations sont liées à ce statut';
+                    } else {
+                        $sql .= "is_active_status = '" . mysql_real_escape_string($_POST['is_active_status']) . "',";
+                    }
+                }
+            }
+            $sql = substr($sql, 0, - 1);
+            $sql .= " WHERE id_status = " .$id_status;
+            
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2:Erreur lors de la mise à jour du statut.';
+            } else {
+                echo '1:Mise à jour du statut effectuée';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createStatus Input			: Output			: success => '1' / failed => '2' Object			: create status Date			: May 3, 2012
+ * Function name : createStatus Input : Output : success => '1' / failed => '2' Object : create status Date : May 3, 2012
  */
-function createStatus() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$lib_status = mysql_real_escape_string ( $_POST ['lib_status'] );
-			
-			$sql = "INSERT INTO status (lib_status) VALUES ('$lib_status')";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function createStatus()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $lib_status = mysql_real_escape_string($_POST['lib_status']);
+            $color_status = mysql_real_escape_string($_POST['color_status']);
+            $sql = "INSERT INTO status (lib_status, color_status) VALUES ('$lib_status', '$color_status')";
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deleteStatuss Input			: Output			: success => '1' / failed => '2' Object			: delete statut(s) Date			: May 3, 2012
+ * Function name : deleteStatuss Input : Output : success => '1' / failed => '2' Object : delete statut(s) Date : May 3, 2012
  */
-function deleteStatuss() {
-	$ids = $_POST ['ids'];
-	$idstatuss = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idstatuss ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idstatuss ) == 1) {
-				$sql = "DELETE FROM status WHERE id_status = " . $idstatuss [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM status WHERE ";
-				for($i = 0; $i < sizeof ( $idstatuss ); $i ++) {
-					$sql = $sql . "id_status = " . $idstatuss [$i];
-					if ($i < sizeof ( $idstatuss ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deleteStatuss()
+{
+    $ids = $_POST['ids'];
+    $idstatuss = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idstatuss) < 1) {
+                echo '0';
+            } else if (sizeof($idstatuss) == 1) {
+                $sql = "DELETE FROM status WHERE id_status = " . $idstatuss[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM status WHERE ";
+                for ($i = 0; $i < sizeof($idstatuss); $i ++) {
+                    $sql = $sql . "id_status = " . $idstatuss[$i];
+                    if ($i < sizeof($idstatuss) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getUsers Input			: start, limit Output			: json status Object			: populate user grid Date			: July 9, 2015
+ * Function name : createLinkUserPole
+ * Input :
+ * Output : success => '1' / failed => '2'
+ * Object : create link betwwen user and pole
+ * Date : Jan 30 2019
  */
-function getUsers($start, $limit) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT users.*, usertype.lib_usertype, pole.lib_pole, territoire.lib_territoire FROM users INNER JOIN usertype ON (usertype.id_usertype = users.usertype_id_usertype) INNER JOIN pole ON (pole.id_pole = users.num_pole) INNER JOIN territoire ON (territoire.id_territoire = users.territoire_id_territoire) ORDER BY id_users ASC";
-			if (DEBUG) {
-				// error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - sql - " . $sql . "\n", 3, LOG_FILE );
-			}
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$sql .= " LIMIT " . $limit . " OFFSET " . $start;
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_users'] = $row ['id_users'];
-					$arr [$i] ['lib_users'] = stripslashes ( $row ['lib_users'] );
-					$arr [$i] ['pass_users'] = stripslashes ( $row ['pass_users'] );
-					$arr [$i] ['nom_users'] = stripslashes ( $row ['nom_users'] );
-					$arr [$i] ['mail_users'] = stripslashes ( $row ['mail_users'] );
-					$arr [$i] ['lib_usertype'] = stripslashes ( $row ['lib_usertype'] );
-					$arr [$i] ['lib_userpole'] = stripslashes ( $row ['lib_pole'] );
-					$arr [$i] ['lib_territoire'] = stripslashes ( $row ['lib_territoire'] );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			if (DEBUG) {
-				// error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - nbrows - " . $nbrows . "\n", 3, LOG_FILE );
-			}
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function createLinkUserPole()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $id_users = mysql_real_escape_string($_POST['id_user']);
+            $num_pole = $_POST['num_pole'];
+            
+            $sqlPole = "SELECT p.lib_pole, t.lib_territoire, t.id_territoire FROM pole p INNER JOIN territoire t ON t.id_territoire = p.territoire_id_territoire WHERE id_pole = $num_pole";
+            $resultPole = mysql_query($sqlPole);
+            $lib_pole = mysql_result($resultPole, 0, "lib_pole");
+            $lib_territoire = mysql_result($resultPole, 0, "lib_territoire");
+            $territoire_id_territoire = mysql_result($resultPole, 0, "id_territoire");
+            
+            $sql = "INSERT INTO users_link_pole (id_user, num_pole, territoire_id_territoire) VALUES ('$id_users', '$num_pole', '$territoire_id_territoire')";
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " creating link user/pole $sql\n", 3, LOG_FILE);
+            }
+            $result = mysql_query($sql);
+            $error = 0;
+            if (! $result) {
+                $error = 1;
+                echo '2:Erreur lors de l\'insertion du lien Modérateur/Pôle en base de données.';
+                if (mysql_errno($link) == 1062) {
+                    echo 'Ce lien existe déjà';
+                }
+            } else {
+                $sqlUser = "SELECT lib_users, mail_users FROM users WHERE id_users = $id_users";
+                $resultUser = mysql_query($sqlUser);
+                $lib_users = mysql_result($resultUser, 0, "lib_users");
+                $mail_users = mysql_result($resultUser, 0, "mail_users");
+                
+                $message = "Bonjour,
+Votre compte " . $lib_users . " est maintenant modérateur sur le pôle " . $lib_pole . " (territoire " . $lib_territoire . "). Vous pouvez vous connecter à l'interface d'administration à l'adresse :
+" . URL . "/admin.php
+En cas de question, vous pouvez trouver des informations sur https://github.com/2p2r/velobs_web. N'hésitez pas à envoyer un courriel à " . MAIL_ALIAS_OBSERVATION_ADHERENTS . " pour toute question sur VelObs.";
+                sendMail($mail_users, "Création lien compte modérateur / pôle", $message);
+                echo '1:OK';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
+
+function getLinksUserPole($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT ulp.user_link_pole_id, u.id_users, u.lib_users, t.lib_territoire, p.lib_pole FROM users_link_pole ulp INNER JOIN territoire t ON t.id_territoire = ulp.territoire_id_territoire INNER JOIN pole p on p.id_pole = ulp.num_pole INNER JOIN users u ON u.id_users = ulp.id_user ORDER BY u.lib_users ASC ";
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sql - " . $sql . "\n", 3, LOG_FILE);
+            }
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['user_link_pole_id'] = $row['user_link_pole_id'];
+                    $arr[$i]['id_users'] = $row['id_users'];
+                    $arr[$i]['lib_users'] = stripslashes($row['lib_users']);
+                    $arr[$i]['lib_territoire'] = stripslashes($row['lib_territoire']);
+                    $arr[$i]['lib_pole'] = stripslashes($row['lib_pole']);
+                    
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - nbrows - " . $nbrows . "\n", 3, LOG_FILE);
+            }
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
+}
+
 /*
- * Function name 	: getUser Output			: json status Object			: populate user grid Date			: March 17, 2018
+ * Function name : deleteLinkUserPole Input : Output : success => '1' / failed => '2' Object : delete link user / pole (s) Date : Jan 30, 2019
  */
-function getUser() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT users.*, usertype.lib_usertype, pole.lib_pole, territoire.lib_territoire FROM users INNER JOIN usertype ON (usertype.id_usertype = users.usertype_id_usertype) INNER JOIN pole ON (pole.id_pole = users.num_pole) INNER JOIN territoire ON (territoire.id_territoire = users.territoire_id_territoire) WHERE lib_users = '" . $_SESSION ['user'] . "'";
-			if (DEBUG) {
-				// error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - sql - " . $sql . "\n", 3, LOG_FILE );
-			}
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			$result = mysql_query ( $sql );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_users'] = $row ['id_users'];
-					$arr [$i] ['lib_users'] = stripslashes ( $row ['lib_users'] );
-					$arr [$i] ['pass_users'] = stripslashes ( $row ['pass_users'] );
-					$arr [$i] ['nom_users'] = stripslashes ( $row ['nom_users'] );
-					$arr [$i] ['mail_users'] = stripslashes ( $row ['mail_users'] );
-					$arr [$i] ['lib_usertype'] = stripslashes ( $row ['lib_usertype'] );
-					$arr [$i] ['lib_userpole'] = stripslashes ( $row ['lib_pole'] );
-					$arr [$i] ['lib_territoire'] = stripslashes ( $row ['lib_territoire'] );
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			if (DEBUG) {
-				// error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - nbrows - " . $nbrows . "\n", 3, LOG_FILE );
-			}
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deleteLinkUserPole()
+{
+    $ids = $_POST['ids'];
+    $idLinksUserPole = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            // Allow only moderator link to be deleted
+            $sqlSelectUser = "SELECT u.usertype_id_usertype FROM users u INNER JOIN users_link_pole ulp ON ulp.id_user = u.id_users WHERE ulp.user_link_pole_id = " . $idLinksUserPole[0];
+            $resultSelectUser = mysql_query($sqlSelectUser);
+            $usertype = mysql_result($resultSelectUser, 0);
+            mysql_free_result($resultSelectUser);
+            if ($usertype != 4) {
+                echo '0:Uniquement les comptes modérateurs peuvent être déliés d\'un pôle.';
+            } else {
+                if (sizeof($idLinksUserPole) < 1) {
+                    echo '0:Aucun lien modérateur/pôle ne semble avoir été fourni.';
+                } else if (sizeof($idLinksUserPole) == 1) {
+                    $sql = "DELETE FROM users_link_pole WHERE user_link_pole_id = " . $idLinksUserPole[0];
+                    $result = mysql_query($sql);
+                } else {
+                    $sql = "DELETE FROM users_link_pole WHERE ";
+                    for ($i = 0; $i < sizeof($idLinksUserPole); $i ++) {
+                        $sql = $sql . "user_link_pole_id = " . $idLinksUserPole[$i];
+                        if ($i < sizeof($idLinksUserPole) - 1) {
+                            $sql = $sql . " OR ";
+                        }
+                    }
+                    $result = mysql_query($sql);
+                }
+                if (! $result) {
+                    echo '2:Une erreur s\'est produite lors de la suppression du lien Modérateur/Pôle n° ' + $idLinksUserPole;
+                } else {
+                    echo '1:Le lien Modérateur/Pôle a bien été supprimé.';
+                }
+            }
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
-function resetUserPassword() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$userId = mysql_real_escape_string ( $_POST ['userId'] );
-			$userMail = mysql_real_escape_string ( $_POST ['userMail'] );
-			$userLogin = mysql_real_escape_string ( $_POST ['userLogin'] );
-			$chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-			$clearPassword = substr ( str_shuffle ( $chars ), 0, 8 );
-			$pass_users = create_password_hash ( $clearPassword, PASSWORD_BCRYPT );
-			
-			$sql = "UPDATE users SET pass_users = '$pass_users' WHERE id_users = $userId";
-			if (DEBUG) {
-				// error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - sql - " . $sql . ", mot de passe \n", 3, LOG_FILE );
-			}
-			
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-				$message = "Bonjour,
+
+/*
+ * Function name : getUsers Input : start, limit Output : json status Object : populate user grid Date : July 9, 2015
+ */
+function getUsers($start, $limit)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT users.*, usertype.lib_usertype FROM users INNER JOIN usertype ON (usertype.id_usertype = users.usertype_id_usertype) ORDER BY id_users ASC";
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sql - " . $sql . "\n", 3, LOG_FILE);
+            }
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $sql .= " LIMIT " . $limit . " OFFSET " . $start;
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_users'] = $row['id_users'];
+                    $arr[$i]['lib_users'] = stripslashes($row['lib_users']);
+                    $arr[$i]['pass_users'] = stripslashes($row['pass_users']);
+                    $arr[$i]['nom_users'] = stripslashes($row['nom_users']);
+                    $arr[$i]['mail_users'] = stripslashes($row['mail_users']);
+                    $arr[$i]['lib_usertype'] = stripslashes($row['lib_usertype']);
+                    $arr[$i]['is_active_user'] = stripslashes($row['is_active_user']);
+                    
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - nbrows - " . $nbrows . "\n", 3, LOG_FILE);
+            }
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
+}
+
+/*
+ * Function name : getUser Output : json status Object : populate user grid Date : March 17, 2018
+ */
+function getUser()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT users.*, usertype.lib_usertype FROM users INNER JOIN usertype ON (usertype.id_usertype = users.usertype_id_usertype) WHERE lib_users = '" . $_SESSION['user'] . "'";
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sql - " . $sql . "\n", 3, LOG_FILE);
+            }
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            $result = mysql_query($sql);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_users'] = $row['id_users'];
+                    $arr[$i]['lib_users'] = stripslashes($row['lib_users']);
+                    $arr[$i]['pass_users'] = stripslashes($row['pass_users']);
+                    $arr[$i]['nom_users'] = stripslashes($row['nom_users']);
+                    $arr[$i]['mail_users'] = stripslashes($row['mail_users']);
+                    $arr[$i]['lib_usertype'] = stripslashes($row['lib_usertype']);
+                    $arr[$i]['is_active_user'] = stripslashes($row['is_active_user']);
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - nbrows - " . $nbrows . "\n", 3, LOG_FILE);
+            }
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
+}
+
+function resetUserPassword()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $userId = mysql_real_escape_string($_POST['userId']);
+            $userMail = mysql_real_escape_string($_POST['userMail']);
+            $userLogin = mysql_real_escape_string($_POST['userLogin']);
+            $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+            $clearPassword = substr(str_shuffle($chars), 0, 8);
+            $pass_users = create_password_hash($clearPassword, PASSWORD_BCRYPT);
+            
+            $sql = "UPDATE users SET pass_users = '$pass_users' WHERE id_users = $userId";
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sql - " . $sql . ", mot de passe \n", 3, LOG_FILE);
+            }
+            
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+                $message = "Bonjour,
 Votre compte sur VelObs a été mis à jour. Vous pouvez vous connecter à l'interface d'administration à l'adresse :
 " . URL . "/admin.php
 					Vos identifiants sont :
 					- Login : $userLogin
 					- Mot de passe : " . $clearPassword . "
 					En cas de question, vous pouvez trouver des informations sur https://github.com/2p2r/velobs_web. N'hésitez pas à envoyer un courriel à " . MAIL_ALIAS_OBSERVATION_ADHERENTS . " pour toute question sur VelObs.";
-				sendMail ( $userMail, "Réinitialisation mote de passe sur VelObs", $message );
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+                sendMail($userMail, "Réinitialisation mote de passe sur VelObs", $message);
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateUser Input			: Output			: success => '1' / failed => '2' Object			: update user grid Date			: July 9, 2015
+ * Function name : updateUser Input : Output : success => '1' / failed => '2' Object : update user grid Date : July 9, 2015
  */
-function updateUser() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			$message = '';
-			$id_users = mysql_real_escape_string ( $_POST ['id_users'] );
-			$sql = "UPDATE users SET ";
-			if (isset ( $_POST ['lib_users'] ) && $_POST ['lib_users'] != '') {
-				$sql .= "lib_users = '" . mysql_real_escape_string ( $_POST ['lib_users'] ) . "',";
-				$message .= "	- Login : " . $_POST ['lib_users'] . "\n";
-			}
-			if (isset ( $_POST ['mail_users'] ) && $_POST ['mail_users'] != '') {
-				$mail_users = mysql_real_escape_string ( $_POST ['mail_users'] );
-				$sql .= "mail_users = '" . $mail_users . "',";
-				$message .= "	- Mail : " . $_POST ['mail_users'] . "\n";
-			}
-			if (isset ( $_POST ['nom_users'] ) && $_POST ['nom_users'] != '') {
-				$sql .= "nom_users = '" . mysql_real_escape_string ( $_POST ['nom_users'] ) . "',";
-				$message .= "	- Nom : " . $_POST ['nom_users'] . "\n";
-			}
-			if (isset ( $_POST ['pass_users'] ) && $_POST ['pass_users'] != '') {
-				$pass_users = create_password_hash ( $_POST ['pass_users'], PASSWORD_BCRYPT );
-				$sql .= "pass_users = '" . $pass_users . "',";
-				$message .= "	- Mot de passe : " . $_POST ['pass_users'] . "\n";
-			}
-			
-			if (isset($_POST ['territoire_id_territoire'] ) && is_numeric ( $_POST ['territoire_id_territoire'] )) {
-				$territoire_id_territoire = $_POST ['territoire_id_territoire'];
-				$sql .= " territoire_id_territoire = $territoire_id_territoire,";
-			}
-			if (isset($_POST ['usertype_id_usertype'] ) && is_numeric ( $_POST ['usertype_id_usertype'] )) {
-				$usertype_id_usertype = $_POST ['usertype_id_usertype'];
-				$sql .= "usertype_id_usertype = $usertype_id_usertype,";
-			}
-			if (isset($_POST ['num_pole'] ) && is_numeric ( $_POST ['num_pole'] )) {
-				$num_pole = $_POST ['num_pole'];
-				$sql .= " num_pole = $num_pole ,";
-			}
-			$sql = substr ( $sql, 0, - 1 );
-			$sql .= " WHERE id_users = " . mysql_real_escape_string ( $_POST ['id_users'] );
-			if (DEBUG) {
-				// error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - sql - " . $sql . " \n", 3, LOG_FILE );
-			}
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-				$message = "Bonjour,
+function updateUser()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            $message = '';
+            $id_users = mysql_real_escape_string($_POST['id_users']);
+            $sql = "UPDATE users SET ";
+            if (isset($_POST['lib_users']) && $_POST['lib_users'] != '') {
+                $sql .= "lib_users = '" . mysql_real_escape_string($_POST['lib_users']) . "',";
+                $message .= "	- Login : " . $_POST['lib_users'] . "\n";
+            }
+            if (isset($_POST['mail_users']) && $_POST['mail_users'] != '') {
+                $mail_users = mysql_real_escape_string($_POST['mail_users']);
+                $sql .= "mail_users = '" . $mail_users . "',";
+                $message .= "	- Mail : " . $_POST['mail_users'] . "\n";
+            }
+            if (isset($_POST['nom_users']) && $_POST['nom_users'] != '') {
+                $sql .= "nom_users = '" . mysql_real_escape_string($_POST['nom_users']) . "',";
+                $message .= "	- Nom : " . $_POST['nom_users'] . "\n";
+            }
+            if (isset($_POST['pass_users']) && $_POST['pass_users'] != '') {
+                $pass_users = create_password_hash($_POST['pass_users'], PASSWORD_BCRYPT);
+                $sql .= "pass_users = '" . $pass_users . "',";
+                $message .= "	- Mot de passe : " . $_POST['pass_users'] . "\n";
+            }
+            
+            if (isset($_POST['territoire_id_territoire']) && is_numeric($_POST['territoire_id_territoire'])) {
+                $territoire_id_territoire = $_POST['territoire_id_territoire'];
+                $sql .= " territoire_id_territoire = $territoire_id_territoire,";
+            }
+            if (isset($_POST['usertype_id_usertype']) && is_numeric($_POST['usertype_id_usertype'])) {
+                $usertype_id_usertype = $_POST['usertype_id_usertype'];
+                $sql .= "usertype_id_usertype = $usertype_id_usertype,";
+            }
+            if (isset($_POST['num_pole']) && is_numeric($_POST['num_pole'])) {
+                $num_pole = $_POST['num_pole'];
+                $sql .= " num_pole = $num_pole ,";
+            }
+            if (isset($_POST['is_active_user']) && $_POST['is_active_user'] != '') {
+                $is_active_user = $_POST['is_active_user'];
+                $sql .= " is_active_user = $is_active_user ,";
+            }
+            $sql = substr($sql, 0, - 1);
+            $sql .= " WHERE id_users = " . mysql_real_escape_string($_POST['id_users']);
+            if (DEBUG) {
+                // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sql - " . $sql . " \n", 3, LOG_FILE);
+            }
+            $result = mysql_query($sql);
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+                $message = "Bonjour,
 Votre compte sur VelObs a été mis à jour. Vous pouvez vous connecter à l'interface d'administration à l'adresse :
 " . URL . "/admin.php
 " . $message . "
 En cas de question, vous pouvez trouver des informations sur https://github.com/2p2r/velobs_web. N'hésitez pas à envoyer un courriel à " . MAIL_ALIAS_OBSERVATION_ADHERENTS . " pour toute question sur VelObs.";
-				sendMail ( $mail_users, "Modification coordonnées sur VelObs", $message );
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+                sendMail($mail_users, "Modification coordonnées sur VelObs", $message);
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createUser Input			: Output			: success => '1' / failed => '2' Object			: create user Date			: July 9, 2015
+ * Function name : createUser
+ * Input :
+ * Output : success => '1' / failed => '2'
+ * Object : create user
+ * Date : July 9, 2015
  */
-function createUser() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$lib_users = mysql_real_escape_string ( $_POST ['lib_users'] );
-			$nom_users = mysql_real_escape_string ( $_POST ['nom_users'] );
-			$pass_users = create_password_hash ( $_POST ['pass_users'], PASSWORD_BCRYPT );
-			$mail_users = mysql_real_escape_string ( $_POST ['mail_users'] );
-			
-			$usertype_id_usertype = $_POST ['usertype_id_usertype'];
-			$num_pole = $_POST ['num_pole'];
-			$territoire_id_territoire = $_POST ['territoire_id_territoire'];
-			
-			$sql = "INSERT INTO users (lib_users, nom_users, pass_users, mail_users, usertype_id_usertype, num_pole, territoire_id_territoire, language_id_language) VALUES ('$lib_users', '$nom_users', '$pass_users', '$mail_users', $usertype_id_usertype, $num_pole, $territoire_id_territoire, 1)";
-			$result = mysql_query ( $sql );
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			$message = "Bonjour,
-Vous disposez maintenant d'un compte sur velobs vous permettant de mettre à jour les observations enregistrées dans le système. Vous pouvez vous connecter à l'interface d'administration à l'adresse : 
+function createUser()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $lib_users = mysql_real_escape_string($_POST['lib_users']);
+            $nom_users = mysql_real_escape_string($_POST['nom_users']);
+            $pass_users = create_password_hash($_POST['pass_users'], PASSWORD_BCRYPT);
+            $mail_users = mysql_real_escape_string($_POST['mail_users']);
+            
+            $usertype_id_usertype = $_POST['usertype_id_usertype'];
+            $num_pole = $_POST['num_pole'];
+            $territoire_id_territoire = $_POST['territoire_id_territoire'];
+            
+            $sql = "INSERT INTO users (lib_users, nom_users, pass_users, mail_users, usertype_id_usertype, language_id_language) VALUES ('$lib_users', '$nom_users', '$pass_users', '$mail_users', $usertype_id_usertype, 1)";
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " creating user $sql\n", 3, LOG_FILE);
+            }
+            $result = mysql_query($sql);
+            $id_user = mysql_insert_id();
+            $error = 0;
+            if (! $result) {
+                $error = 1;
+                echo '2';
+            } else {
+                
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " id created user =  - " . $id_user . "\n", 3, LOG_FILE);
+                }
+                // TODO : check consistency between pole and territoire
+                
+                // Si le compte est un pole technhique ou un modérateur
+                if ($usertype_id_usertype == 3 || $usertype_id_usertype == 4) {
+                    $sqlCheck = "SELECT count(*) FROM pole WHERE id_pole = $num_pole AND territoire_id_territoire = $territoire_id_territoire";
+                    $resultCheck = mysql_query($sqlCheck);
+                    $link_pole_territoire_exists = mysql_result($resultCheck, 0);
+                    // si le lien pole/territoire n'existe pas, on affiche une erreur d'incohérence
+                    if ($link_pole_territoire_exists == 0) {
+                        echo 3;
+                        $error = 1;
+                    } else {
+                        $sqlUPL = "INSERT INTO users_link_pole (id_user, territoire_id_territoire, num_pole) VALUES ($id_user, $territoire_id_territoire, $num_pole)";
+                    }
+                    // Si le compte est administrateur
+                } else if ($usertype_id_usertype == 1) {
+                    
+                    $sqlUPL = "INSERT INTO users_link_pole (id_user, territoire_id_territoire, num_pole) VALUES ($id_user, 0, 9)";
+                } else {
+                    if ($territoire_id_territoire == 0) {
+                        $error = 1;
+                        echo 3;
+                    }
+                    $sqlUPL = "INSERT INTO users_link_pole (id_user, territoire_id_territoire, num_pole) VALUES ($id_user, $territoire_id_territoire, $num_pole)";
+                }
+            }
+            if (! $error) {
+                $result = mysql_query($sqlUPL);
+                $message = "Bonjour,
+Vous disposez maintenant d'un compte sur velobs vous permettant de mettre à jour les observations enregistrées dans le système. Vous pouvez vous connecter à l'interface d'administration à l'adresse :
 " . URL . "/admin.php
 Vos identifiants sont :
 	- Login : $lib_users
-	- Mot de passe : " . $_POST ['pass_users'] . "
+	- Mot de passe : " . $_POST['pass_users'] . "
 En cas de question, vous pouvez trouver des informations sur https://github.com/2p2r/velobs_web. N'hésitez pas à envoyer un courriel à " . MAIL_ALIAS_OBSERVATION_ADHERENTS . " pour toute question sur VelObs.";
-			sendMail ( $mail_users, "Création compte sur VelObs", $message );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+                sendMail($mail_users, "Création compte sur VelObs", $message);
+                echo '1';
+            }else{
+                
+                $result = mysql_query("DELETE FROM users WHERE id_users = " .$id_user );
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: deleteUsers Input			: Output			: success => '1' / failed => '2' Object			: delete user(s) Date			: July 9, 2015
+ * Function name : deleteUsers Input : Output : success => '1' / failed => '2' Object : delete user(s) Date : July 9, 2015
  */
-function deleteUsers() {
-	$ids = $_POST ['ids'];
-	$idusers = json_decode ( stripslashes ( $ids ) );
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			if (sizeof ( $idusers ) < 1) {
-				echo '0';
-			} else if (sizeof ( $idusers ) == 1) {
-				$sql = "DELETE FROM users WHERE id_users = " . $idusers [0];
-				$result = mysql_query ( $sql );
-			} else {
-				$sql = "DELETE FROM users WHERE ";
-				for($i = 0; $i < sizeof ( $idusers ); $i ++) {
-					$sql = $sql . "id_users = " . $idusers [$i];
-					if ($i < sizeof ( $idusers ) - 1) {
-						$sql = $sql . " OR ";
-					}
-				}
-				$result = mysql_query ( $sql );
-			}
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function deleteUsers()
+{
+    $ids = $_POST['ids'];
+    $idusers = json_decode(stripslashes($ids));
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            if (sizeof($idusers) < 1) {
+                echo '0';
+            } else if (sizeof($idusers) == 1) {
+                $sql = "DELETE FROM users WHERE id_users = " . $idusers[0];
+                $result = mysql_query($sql);
+            } else {
+                $sql = "DELETE FROM users WHERE ";
+                for ($i = 0; $i < sizeof($idusers); $i ++) {
+                    $sql = $sql . "id_users = " . $idusers[$i];
+                    if ($i < sizeof($idusers) - 1) {
+                        $sql = $sql . " OR ";
+                    }
+                }
+                $result = mysql_query($sql);
+            }
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: resetPhotoPoi Input			: Output			: success => '1' / failed => '2' Object			: reset photo Date			: Jan. 22, 2012
+ * Function name : resetPhotoPoi Input : Output : success => '1' / failed => '2' Object : reset photo Date : Jan. 22, 2012
  */
-function resetPhotoPoi() {
-	$id_poi = $_POST ['id_poi'];
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT photo_poi FROM poi WHERE id_poi = $id_poi";
-			$result = mysql_query ( $sql );
-			while ( $row = mysql_fetch_array ( $result ) ) {
-				unlink ( "../../../resources/pictures/" . $row ['photo_poi'] );
-			}
-			$sql = "UPDATE poi SET photo_poi = NULL WHERE id_poi = $id_poi";
-			$result = mysql_query ( $sql );
-			
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function resetPhotoPoi()
+{
+    $id_poi = $_POST['id_poi'];
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT photo_poi FROM poi WHERE id_poi = $id_poi";
+            $result = mysql_query($sql);
+            while ($row = mysql_fetch_array($result)) {
+                unlink("../../../resources/pictures/" . $row['photo_poi']);
+            }
+            $sql = "UPDATE poi SET photo_poi = NULL WHERE id_poi = $id_poi";
+            $result = mysql_query($sql);
+            
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateGeoPoi Input			: Output			: success => '1' / failed => '2' Object			: modif geo poi Date			: Jan. 23, 2012
+ * Function name : updateGeoPoi Input : Output : success => '1' / failed => '2' Object : modif geo poi Date : Jan. 23, 2012
  */
 // function updateGeoPoi() {
-// 	$id_poi = $_POST ['id_poi'];
-// 	$latitude_poi = $_POST ['latitude_poi'];
-// 	$longitude_poi = $_POST ['longitude_poi'];
-// 	switch (SGBD) {
-// 		case 'mysql' :
-// 			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-// 			mysql_select_db ( DB_NAME );
-// 			mysql_query ( "SET NAMES utf8mb4" );
-// 			$locations = getLocations ( $latitude_poi, $longitude_poi );
-// 			if (DEBUG) {
-// 				// error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
-// 				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - locations - " . $locations [0] . ", " . $locations [1] . ", " . $locations [2] . ", " . $locations [3] . "\n", 3, LOG_FILE );
-// 			}
-// 			$commune_id_commune = $locations [0];
-// 			$lib_commune = $locations [1];
-// 			$pole_id_pole = $locations [2];
-// 			$lib_pole = $locations [3];
-			
-// 			$lastdatemodif_poi = date ( "Y-m-d H:i:s" );
-// 			$sql = "UPDATE poi SET commune_id_commune = " . $commune_id_commune . ", pole_id_pole = " . $pole_id_pole . ", geom_poi = GeomFromText('POINT(" . $longitude_poi . " " . $latitude_poi . ")'), geolocatemode_poi = 1, lastdatemodif_poi = '$lastdatemodif_poi' WHERE id_poi = $id_poi";
-// 			$result = mysql_query ( $sql );
-			
-// 			if (! $result) {
-// 				echo '2';
-// 			} else {
-// 				// echo $sql2;
-// 				echo '1';
-// 			}
-			
-// 			mysql_free_result ( $result );
-// 			mysql_close ( $link );
-// 			break;
-// 		case 'postgresql' :
-// 			// TODO
-// 			break;
-// 	}
+// $id_poi = $_POST ['id_poi'];
+// $latitude_poi = $_POST ['latitude_poi'];
+// $longitude_poi = $_POST ['longitude_poi'];
+// switch (SGBD) {
+// case 'mysql' :
+// $link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
+// mysql_select_db ( DB_NAME );
+// mysql_query ( "SET NAMES utf8mb4" );
+// $locations = getLocations ( $latitude_poi, $longitude_poi );
+// if (DEBUG) {
+// // error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - " . getLocations($latitude_poi,$longitude_poi)[1]."\n", 3, LOG_FILE);
+// error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - locations - " . $locations [0] . ", " . $locations [1] . ", " . $locations [2] . ", " . $locations [3] . "\n", 3, LOG_FILE );
+// }
+// $commune_id_commune = $locations [0];
+// $lib_commune = $locations [1];
+// $pole_id_pole = $locations [2];
+// $lib_pole = $locations [3];
+
+// $lastdatemodif_poi = date ( "Y-m-d H:i:s" );
+// $sql = "UPDATE poi SET commune_id_commune = " . $commune_id_commune . ", pole_id_pole = " . $pole_id_pole . ", geom_poi = GeomFromText('POINT(" . $longitude_poi . " " . $latitude_poi . ")'), geolocatemode_poi = 1, lastdatemodif_poi = '$lastdatemodif_poi' WHERE id_poi = $id_poi";
+// $result = mysql_query ( $sql );
+
+// if (! $result) {
+// echo '2';
+// } else {
+// // echo $sql2;
+// echo '1';
+// }
+
+// mysql_free_result ( $result );
+// mysql_close ( $link );
+// break;
+// case 'postgresql' :
+// // TODO
+// break;
+// }
 // }
 
 /*
- * Function name 	: resetGeoPoi Input			: Output			: success => '1' / failed => '2' Object			: reset geo poi Date			: Jan. 23, 2012
+ * Function name : resetGeoPoi Input : Output : success => '1' / failed => '2' Object : reset geo poi Date : Jan. 23, 2012
  */
-function resetGeoPoi() {
-	$id_poi = $_POST ['id_poi'];
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "UPDATE poi SET geom_poi = NULL, geolocatemode_poi = NULL WHERE id_poi = $id_poi";
-			$result = mysql_query ( $sql );
-			
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function resetGeoPoi()
+{
+    $id_poi = $_POST['id_poi'];
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "UPDATE poi SET geom_poi = NULL, geolocatemode_poi = NULL WHERE id_poi = $id_poi";
+            $result = mysql_query($sql);
+            
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: updateGeoDefaultMap Input			: Output			: success => '1' / failed => '2' Object			: update geo map settings default Date			: Jan. 23, 2012
+ * Function name : updateGeoDefaultMap Input : Output : success => '1' / failed => '2' Object : update geo map settings default Date : Jan. 23, 2012
  */
-function updateGeoDefaultMap() {
-	$lat = $_POST ['lat'];
-	$lon = $_POST ['lon'];
-	$zoom = $_POST ['zoom'];
-	$baselayer = $_POST ['baselayer'];
-	
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "UPDATE configmap SET lat_configmap = " . $lat . ", lon_configmap = " . $lon . ", zoom_configmap = " . $zoom . ", baselayer_configmap = " . $baselayer . " WHERE id_configmap = 1";
-			$result = mysql_query ( $sql );
-			
-			if (! $result) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function updateGeoDefaultMap()
+{
+    $lat = $_POST['lat'];
+    $lon = $_POST['lon'];
+    $zoom = $_POST['zoom'];
+    $baselayer = $_POST['baselayer'];
+    
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "UPDATE configmap SET lat_configmap = " . $lat . ", lon_configmap = " . $lon . ", zoom_configmap = " . $zoom . ", baselayer_configmap = " . $baselayer . " WHERE id_configmap = 1";
+            $result = mysql_query($sql);
+            
+            if (! $result) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createPublicPoi Input			: Output			: success => '1' / failed => '2' Object			: create public poi Date			: May 8, 2012
+ * Function name : createPublicPoi Input : Output : success => '1' / failed => '2' Object : create public poi Date : May 8, 2012
  */
-function createPublicPoi() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$num_poi = mysql_real_escape_string ( $_POST ['num_poi'] );
-			$mail_poi = mysql_real_escape_string ( $_POST ['mail_poi'] );
-			$tel_poi = mysql_real_escape_string ( $_POST ['tel_poi'] );
-			$rue_poi = mysql_real_escape_string ( $_POST ['rue_poi'] );
-			$desc_poi = mysql_real_escape_string ( $_POST ['desc_poi'] );
-			$prop_poi = mysql_real_escape_string ( $_POST ['prop_poi'] );
-			$adherent_poi = mysql_real_escape_string ( $_POST ['adherent_poi'] );
-			$latitude_poi = $_POST ['latitude_poi'];
-			$longitude_poi = $_POST ['longitude_poi'];
-			$subcategory_id_subcategory = $_POST ['subcategory_id_subcategory'];
-			
-			$sql = "SELECT lib_subcategory FROM subcategory WHERE id_subcategory = " . $subcategory_id_subcategory;
-			$result = mysql_query ( $sql );
-			$row = mysql_fetch_assoc ( $result );
-			$lib_subcategory = mysql_real_escape_string ( $row ['lib_subcategory'] );
-			
-			// détermination de la commune et du pole concernés par croisement du polygone de la commune ave latitude et longitude
-			$commune_id_commune = 99999;
-			$pole_id_pole = 9;
-			$quartier_id_quartier = 99999;
-			$locations = getLocations ( $latitude_poi, $longitude_poi );
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - place locations - " . $locations [0] . ", " . $locations [1] . ", " . $locations [2] . ", " . $locations [3] . "\n", 3, LOG_FILE );
-			}
-			
-			$commune_id_commune = $locations [0];
-			$lib_commune = $locations [1];
-			$pole_id_pole = $locations [2];
-			$lib_pole = $locations [3];
-			if ($commune_id_commune == 99999) {
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " L'observation semble être dans une zone non couverte par velobs\n", 3, LOG_FILE );
-				}
-				$erreur = "L'observation semble être dans une zone non couverte par VelObs, si ce n'est pas le cas, merci de nous contacter à l'adresse " . MAIL_FROM;
-				$return ['success'] = false;
-				$return ['pb'] = $erreur;
-			}
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - isset(_FILES['photo-path']) - " . isset ( $_FILES ['photo-path'] ['name'] ) . "\n", 3, LOG_FILE );
-			}
-			// si une photo a été associée au commentaire, on la traite
-			if (! isset ( $erreur ) && isset ( $_FILES ['photo-path'] ) && $_FILES ['photo-path'] ['name'] != "") {
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " photo-path isset " . $_FILES ['photo-path'] . "\n", 3, LOG_FILE );
-				}
-				$dossier = '../../../resources/pictures/';
-				$fichier = basename ( $_FILES ['photo-path'] ['name'] );
-				$taille_maxi = 6291456;
-				$taille = filesize ( $_FILES ['photo-path'] ['tmp_name'] );
-				$extensions = array (
-						'.png',
-						'.gif',
-						'.jpg',
-						'.jpeg',
-						'.PNG',
-						'.GIF',
-						'.JPG',
-						'.JPEG' 
-				);
-				$extension = strrchr ( $_FILES ['photo-path'] ['name'], '.' );
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " l'extension du fichier est  " . $extension . "\n", 3, LOG_FILE );
-				}
-				if (! in_array ( $extension, $extensions )) {
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " l'extension !in_array \n", 3, LOG_FILE );
-					}
-					$erreur = getTranslation ( 1, 'ERROR' );
-					$return ['success'] = false;
-					$return ['pb'] = getTranslation ( 1, 'PICTUREPNGGIFJPGJPEG' );
-				}
-				
-				if ($taille > $taille_maxi) {
-					$erreur = getTranslation ( 1, 'ERROR' );
-					$return ['success'] = false;
-					$return ['pb'] = getTranslation ( 1, 'PICTURESIZE' );
-				}
-				
-				if (! isset ( $erreur )) {
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " pas d'erreur, on continue \n", 3, LOG_FILE );
-					}
-					$fichier = strtr ( $fichier, 'ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜÝàáâãäåçèéêëìíîïðòóôõöùúûüýÿ_', 'AAAAAACEEEEIIIIOOOOOUUUUYaaaaaaceeeeiiiioooooouuuuyy-' );
-					$fichier = preg_replace ( '/([^.a-z0-9]+)/i', '-', $fichier );
-					$fichier = 'poi_' . $fichier;
-					$pathphoto = $dossier . $fichier;
-					if (move_uploaded_file ( $_FILES ['photo-path'] ['tmp_name'], $pathphoto )) {
-						if (DEBUG) {
-							error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " dans move_uploaded_file \n", 3, LOG_FILE );
-						}
-						$size = getimagesize ( $pathphoto );
-						
-						if ($size [0] > 1024 || $size [1] > 1024) {
-							if ($size [0] > $size [1]) {
-								generate_image_thumbnail ( $pathphoto, $pathphoto, 1024, 768 );
-							} else {
-								generate_image_thumbnail ( $pathphoto, $pathphoto, 768, 1024 );
-							}
-						}
-						
-						$size = getimagesize ( $pathphoto );
-						$newnamefichier = $size [0] . 'x' . $size [1] . 'x' . $fichier;
-						$newpathphoto = $dossier . $newnamefichier;
-						rename ( $pathphoto, $newpathphoto );
-						$url_photo = $newnamefichier;
-						
-						$return ['success'] = true;
-						$return ['ok'] = getTranslation ( $_SESSION ['id_language'], 'PHOTOTRANSFERTDONE' );
-					} else {
-						$erreur = "Erreur lors du traitement de la photo.";
-						$return ['success'] = false;
-						$return ['pb'] = $erreur;
-					}
-				}
-			}
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - entre 2 " . $return ['success'] . " " . $return ['pb'] . "\n", 3, LOG_FILE );
-			}
-			// si une photo a été associée au commentaire et que tout s'est bien passé, ou bien s'il n'y avait pas de photo, on peut créer l'observation dans la base de données
-			if (! isset ( $erreur ) && ((isset ( $_FILES ['photo-path'] ['name'] ) && $return ['success'] == true) || (isset ( $_FILES ['photo-path'] ['name'] ) && $_FILES ['photo-path'] ['name'] == ''))) {
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - place locations - " . $commune_id_commune . ", " . $lib_commune . ", " . $pole_id_pole . ", " . $lib_pole . "\n", 3, LOG_FILE );
-				}
-				
-				$datecreation_poi = date ( 'Y-m-d H:i:s' );
-				
-				// si le mail de la personne qui soumet le POI est aussi un modérateur ou un administrateur, on positionne moderation_poi à vrai et on met la priorité à 1
-				$sql2 = "SELECT mail_users FROM users WHERE (usertype_id_usertype = 1 OR usertype_id_usertype = 4) AND mail_users LIKE '" . $mail_poi . "'";
-				$result2 = mysql_query ( $sql2 );
-				$num_rows2 = mysql_num_rows ( $result2 );
-				$priorityId = 1;
-				$moderationFlag = 1;
-				if ($num_rows2 == 0) {
-					$priorityId = 4;
-					$moderationFlag = 0;
-				}
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - place locations - " . $commune_id_commune . ", " . $lib_commune . ", " . $pole_id_pole . ", " . $lib_pole . "\n", 3, LOG_FILE );
-				}
-				$sql = "INSERT INTO poi (adherent_poi, priorite_id_priorite, quartier_id_quartier, pole_id_pole, lib_poi, mail_poi, tel_poi, num_poi, rue_poi, commune_id_commune, desc_poi, prop_poi, subcategory_id_subcategory, display_poi, fix_poi, datecreation_poi, geolocatemode_poi, moderation_poi, geom_poi, status_id_status, photo_poi) VALUES ('$adherent_poi', $priorityId, $quartier_id_quartier, $pole_id_pole, '$lib_subcategory', '$mail_poi', '$tel_poi', '$num_poi', '$rue_poi', $commune_id_commune, '$desc_poi', '$prop_poi', $subcategory_id_subcategory , TRUE, FALSE, '$datecreation_poi', 1, $moderationFlag, GeomFromText('POINT(" . $longitude_poi . " " . $latitude_poi . ")'), 5, '$url_photo')";
-				
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - createPublicPoi - Requete d'insertion sql = " . $sql . "\n", 3, LOG_FILE );
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " Erreur " . mysql_errno ( $link ) . " : " . mysql_error ( $link ) . "\n", 3, LOG_FILE );
-				}
-				$result = mysql_query ( $sql );
-				if ($result) {
-					$poiId = mysql_insert_id ();
-					$arrayObs = getObservationDetailsInArray ( $poiId );
-					$arrayDetailsAndUpdateSQL = getObservationDetailsInString ( $arrayObs );
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - Il y a " . count ( $arrayDetailsAndUpdateSQL ) . " infos chargées pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - updateObsBoolean " . $arrayDetailsAndUpdateSQL ['updateObsBoolean'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - sqlUpdate " . $arrayDetailsAndUpdateSQL ['sqlUpdate'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - detailObservationString " . $arrayDetailsAndUpdateSQL ['detailObservationString'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE );
-					}
-					$return ['success'] = true;
-					$return ['ok'] = "L'observation a été correctement ajoutée sous le numéro $poiId et est directement affichée (après rechargement de la page) puisque vous êtes référencé(e) comme modérateur ou administrateur de VelObs.";
-					
-					// si le contributeur n'est pas un modérateur ni un administrateur par ailleurs, on envoie des mails
-					if ($num_rows2 == 0) {
-						$return ['ok'] = "L'observation a bien été créée et est en attente de modération. Un courriel reprenant l'ensemble des informations de cette observation vous a été envoyé.";
-						
-						/* envoi d'un mail aux administrateurs de l'association et modérateurs */
-						$whereClause = "u.usertype_id_usertype = 1 OR (u.usertype_id_usertype = 4 AND u.num_pole = " . $arrayObs ['pole_id_pole'] . ")";
-						$subject = 'Nouvelle observation à modérer sur le pole ' . $arrayObs ['lib_pole'];
-						$message = "Bonjour !
-Une nouvelle observation a été ajoutée sur le pole " . $arrayObs ['lib_pole'] . ". Veuillez vous connecter à l'interface d'administration pour la modérer.
-Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs ['id_poi'] . "\n" . $arrayDetailsAndUpdateSQL ['detailObservationString'] . "\n";
-						$mails = array ();
-						$mails = getMailsToSend ( $whereClause, $subject, $message );
-						if (DEBUG) {
-							error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " Il y a " . count ( $mails ) . " mails à envoyer \n", 3, LOG_FILE );
-						}
-						// $succes = sendMails($mails);
-						
-						/* debut envoi d'un mail au contributeur */
-						$subject = 'Observation en attente de modération';
-						$message = "Bonjour !
-Vous venez d'ajouter une observation à VelObs et vous en remercions. Celle-ci devrait être administrée sous peu.\n" . $arrayDetailsAndUpdateSQL ['detailObservationString'] . "\n
+function createPublicPoi()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $num_poi = mysql_real_escape_string($_POST['num_poi']);
+            $mail_poi = mysql_real_escape_string($_POST['mail_poi']);
+            $tel_poi = mysql_real_escape_string($_POST['tel_poi']);
+            $rue_poi = mysql_real_escape_string($_POST['rue_poi']);
+            $desc_poi = mysql_real_escape_string($_POST['desc_poi']);
+            $prop_poi = mysql_real_escape_string($_POST['prop_poi']);
+            $adherent_poi = mysql_real_escape_string($_POST['adherent_poi']);
+            $latitude_poi = $_POST['latitude_poi'];
+            $longitude_poi = $_POST['longitude_poi'];
+            $subcategory_id_subcategory = $_POST['subcategory_id_subcategory'];
+            
+            $sql = "SELECT lib_subcategory FROM subcategory WHERE id_subcategory = " . $subcategory_id_subcategory;
+            $result = mysql_query($sql);
+            $row = mysql_fetch_assoc($result);
+            $lib_subcategory = mysql_real_escape_string($row['lib_subcategory']);
+            
+            // détermination de la commune et du pole concernés par croisement du polygone de la commune ave latitude et longitude
+            $commune_id_commune = 99999;
+            $pole_id_pole = 9;
+            $quartier_id_quartier = 99999;
+            $locations = getLocations($latitude_poi, $longitude_poi);
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - place locations - " . $locations[0] . ", " . $locations[1] . ", " . $locations[2] . ", " . $locations[3] . "\n", 3, LOG_FILE);
+            }
+            
+            $commune_id_commune = $locations[0];
+            $lib_commune = $locations[1];
+            $pole_id_pole = $locations[2];
+            $lib_pole = $locations[3];
+            if ($commune_id_commune == 99999) {
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " L'observation semble être dans une zone non couverte par velobs\n", 3, LOG_FILE);
+                }
+                $erreur = "L'observation semble être dans une zone non couverte par VelObs, si ce n'est pas le cas, merci de nous contacter à l'adresse " . MAIL_FROM;
+                $return['success'] = false;
+                $return['pb'] = $erreur;
+            }
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - isset(_FILES['photo-path']) - " . isset($_FILES['photo-path']['name']) . "\n", 3, LOG_FILE);
+            }
+            // si une photo a été associée au commentaire, on la traite
+            if (! isset($erreur) && isset($_FILES['photo-path']) && $_FILES['photo-path']['name'] != "") {
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " photo-path isset " . $_FILES['photo-path'] . "\n", 3, LOG_FILE);
+                }
+                $dossier = '../../../resources/pictures/';
+                $fichier = basename($_FILES['photo-path']['name']);
+                $taille_maxi = 6291456;
+                $taille = filesize($_FILES['photo-path']['tmp_name']);
+                $extensions = array(
+                    '.png',
+                    '.gif',
+                    '.jpg',
+                    '.jpeg',
+                    '.PNG',
+                    '.GIF',
+                    '.JPG',
+                    '.JPEG'
+                );
+                $extension = strrchr($_FILES['photo-path']['name'], '.');
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " l'extension du fichier est  " . $extension . "\n", 3, LOG_FILE);
+                }
+                if (! in_array($extension, $extensions)) {
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " l'extension !in_array \n", 3, LOG_FILE);
+                    }
+                    $erreur = getTranslation(1, 'ERROR');
+                    $return['success'] = false;
+                    $return['pb'] = getTranslation(1, 'PICTUREPNGGIFJPGJPEG');
+                }
+                
+                if ($taille > $taille_maxi) {
+                    $erreur = getTranslation(1, 'ERROR');
+                    $return['success'] = false;
+                    $return['pb'] = getTranslation(1, 'PICTURESIZE');
+                }
+                
+                if (! isset($erreur)) {
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " pas d'erreur, on continue \n", 3, LOG_FILE);
+                    }
+                    $fichier = strtr($fichier, 'ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜÝàáâãäåçèéêëìíîïðòóôõöùúûüýÿ_', 'AAAAAACEEEEIIIIOOOOOUUUUYaaaaaaceeeeiiiioooooouuuuyy-');
+                    $fichier = preg_replace('/([^.a-z0-9]+)/i', '-', $fichier);
+                    $fichier = 'poi_' . $fichier;
+                    $pathphoto = $dossier . $fichier;
+                    if (move_uploaded_file($_FILES['photo-path']['tmp_name'], $pathphoto)) {
+                        if (DEBUG) {
+                            error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " dans move_uploaded_file \n", 3, LOG_FILE);
+                        }
+                        $size = getimagesize($pathphoto);
+                        
+                        if ($size[0] > 1024 || $size[1] > 1024) {
+                            if ($size[0] > $size[1]) {
+                                generate_image_thumbnail($pathphoto, $pathphoto, 1024, 768);
+                            } else {
+                                generate_image_thumbnail($pathphoto, $pathphoto, 768, 1024);
+                            }
+                        }
+                        
+                        $size = getimagesize($pathphoto);
+                        $newnamefichier = $size[0] . 'x' . $size[1] . 'x' . $fichier;
+                        $newpathphoto = $dossier . $newnamefichier;
+                        rename($pathphoto, $newpathphoto);
+                        $url_photo = $newnamefichier;
+                        
+                        $return['success'] = true;
+                        $return['ok'] = getTranslation($_SESSION['id_language'], 'PHOTOTRANSFERTDONE');
+                    } else {
+                        $erreur = "Erreur lors du traitement de la photo.";
+                        $return['success'] = false;
+                        $return['pb'] = $erreur;
+                    }
+                }
+            }
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - entre 2 " . $return['success'] . " " . $return['pb'] . "\n", 3, LOG_FILE);
+            }
+            // si une photo a été associée au commentaire et que tout s'est bien passé, ou bien s'il n'y avait pas de photo, on peut créer l'observation dans la base de données
+            if (! isset($erreur) && ((isset($_FILES['photo-path']['name']) && $return['success'] == true) || (isset($_FILES['photo-path']['name']) && $_FILES['photo-path']['name'] == ''))) {
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - place locations - " . $commune_id_commune . ", " . $lib_commune . ", " . $pole_id_pole . ", " . $lib_pole . "\n", 3, LOG_FILE);
+                }
+                
+                $datecreation_poi = date('Y-m-d H:i:s');
+                
+                // si le mail de la personne qui soumet le POI est aussi un modérateur ou un administrateur, on positionne moderation_poi à vrai et on met la priorité à 1
+                $sql2 = "SELECT mail_users FROM users WHERE (usertype_id_usertype = 1 OR usertype_id_usertype = 4) AND mail_users LIKE '" . $mail_poi . "'";
+                $result2 = mysql_query($sql2);
+                $num_rows2 = mysql_num_rows($result2);
+                $priorityId = 1;
+                $moderationFlag = 1;
+                if ($num_rows2 == 0) {
+                    $priorityId = 4;
+                    $moderationFlag = 0;
+                }
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - place locations - " . $commune_id_commune . ", " . $lib_commune . ", " . $pole_id_pole . ", " . $lib_pole . "\n", 3, LOG_FILE);
+                }
+                $sql = "INSERT INTO poi (adherent_poi, priorite_id_priorite, quartier_id_quartier, pole_id_pole, lib_poi, mail_poi, tel_poi, num_poi, rue_poi, commune_id_commune, desc_poi, prop_poi, subcategory_id_subcategory, display_poi, fix_poi, datecreation_poi, geolocatemode_poi, moderation_poi, geom_poi, status_id_status, photo_poi) VALUES ('$adherent_poi', $priorityId, $quartier_id_quartier, $pole_id_pole, '$lib_subcategory', '$mail_poi', '$tel_poi', '$num_poi', '$rue_poi', $commune_id_commune, '$desc_poi', '$prop_poi', $subcategory_id_subcategory , TRUE, FALSE, '$datecreation_poi', 1, $moderationFlag, GeomFromText('POINT(" . $longitude_poi . " " . $latitude_poi . ")'), 5, '$url_photo')";
+                
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - createPublicPoi - Requete d'insertion sql = " . $sql . "\n", 3, LOG_FILE);
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Erreur " . mysql_errno($link) . " : " . mysql_error($link) . "\n", 3, LOG_FILE);
+                }
+                $result = mysql_query($sql);
+                if ($result) {
+                    $poiId = mysql_insert_id();
+                    $arrayObs = getObservationDetailsInArray($poiId);
+                    $arrayDetailsAndUpdateSQL = getObservationDetailsInString($arrayObs);
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - Il y a " . count($arrayDetailsAndUpdateSQL) . " infos chargées pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - updateObsBoolean " . $arrayDetailsAndUpdateSQL['updateObsBoolean'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - sqlUpdate " . $arrayDetailsAndUpdateSQL['sqlUpdate'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - detailObservationString " . $arrayDetailsAndUpdateSQL['detailObservationString'] . " pour l'update de l'obs $id_poi \n", 3, LOG_FILE);
+                    }
+                    $return['success'] = true;
+                    $return['ok'] = "L'observation a été correctement ajoutée sous le numéro $poiId et est directement affichée (après rechargement de la page) puisque vous êtes référencé(e) comme modérateur ou administrateur de VelObs.";
+                    
+                    // si le contributeur n'est pas un modérateur ni un administrateur par ailleurs, on envoie des mails
+                    if ($num_rows2 == 0) {
+                        $return['ok'] = "L'observation a bien été créée et est en attente de modération. Un courriel reprenant l'ensemble des informations de cette observation vous a été envoyé.";
+                        
+                        /* envoi d'un mail aux administrateurs de l'association et modérateurs */
+                        $whereClause = "u.usertype_id_usertype = 1 OR (u.usertype_id_usertype = 4 AND ulp.num_pole = " . $arrayObs['pole_id_pole'] . ")";
+                        $subject = 'Nouvelle observation à modérer sur le pole ' . $arrayObs['lib_pole'];
+                        $message = "Bonjour !
+Une nouvelle observation a été ajoutée sur le pole " . $arrayObs['lib_pole'] . ". Veuillez vous connecter à l'interface d'administration pour la modérer.
+Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs['id_poi'] . "\n" . $arrayDetailsAndUpdateSQL['detailObservationString'] . "\n";
+                        $mails = array();
+                        $mails = getMailsToSend($whereClause, $subject, $message);
+                        if (DEBUG) {
+                            error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Il y a " . count($mails) . " mails à envoyer \n", 3, LOG_FILE);
+                        }
+                        // $succes = sendMails($mails);
+                        
+                        /* debut envoi d'un mail au contributeur */
+                        $subject = 'Observation en attente de modération';
+                        $message = "Bonjour !
+Vous venez d'ajouter une observation à VelObs et vous en remercions. Celle-ci devrait être administrée sous peu.\n" . $arrayDetailsAndUpdateSQL['detailObservationString'] . "\n
 Cordialement, l'Association " . VELOBS_ASSOCIATION . " :)";
-						$mailArray = [ 
-								$arrayObs ['mail_poi'],
-								"Soumetteur",
-								$subject,
-								$message 
-						];
-						array_push ( $mails, $mailArray );
-					}
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - Il y a " . count ( $mails ) . " mails à envoyer\n", 3, LOG_FILE );
-					}
-					$succes = sendMails ( $mails );
-				} else {
-					
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " Erreur " . mysql_errno ( $link ) . " : " . mysql_error ( $link ) . "\n", 3, LOG_FILE );
-					}
-					sendMail ( MAIL_FROM, "Erreur méthode createPublicPoi", "Erreur = " . mysql_error ( $link ) . ", requête = " . $sql );
-					$return ['success'] = false;
-					$return ['pb'] = "Erreur lors de l'ajout de l'observation, un mail a été envoyé aux administrateurs. Veuillez nous excuser pour ce dysfonctionnement.";
-				}
-			} else {
-				
-				$infoPOI = "Repere : $num_poi\nMail : $mail_poi\nTel : $tel_poi\nRue : $rue_poi\nDescription : $desc_poi\nProposition : $prop_poi\nNom : $adherent_poi\nLatitude : $latitude_poi\nLongitude : $longitude_poi\n Categorie : $subcategory_id_subcategory";
-				sendMail ( MAIL_FROM, "Erreur méthode createPublicPoi", "Erreur = " . $return ['pb'] . "\n" . $infoPOI );
-				$return ['success'] = false;
-				$return ['pb'] = "Erreur lors de l'ajout de l'observation : " . $return ['pb'];
-			}
-			// retourne le résultat du traitement du commentaire
-			echo json_encode ( $return );
-			mysql_close ( $link );
-			
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+                        $mailArray = [
+                            $arrayObs['mail_poi'],
+                            "Soumetteur",
+                            $subject,
+                            $message
+                        ];
+                        array_push($mails, $mailArray);
+                    }
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - Il y a " . count($mails) . " mails à envoyer\n", 3, LOG_FILE);
+                    }
+                    $succes = sendMails($mails);
+                } else {
+                    
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Erreur " . mysql_errno($link) . " : " . mysql_error($link) . "\n", 3, LOG_FILE);
+                    }
+                    sendMail(MAIL_FROM, "Erreur méthode createPublicPoi", "Erreur = " . mysql_error($link) . ", requête = " . $sql);
+                    $return['success'] = false;
+                    $return['pb'] = "Erreur lors de l'ajout de l'observation, un mail a été envoyé aux administrateurs. Veuillez nous excuser pour ce dysfonctionnement.";
+                }
+            } else {
+                
+                $infoPOI = "Repere : $num_poi\nMail : $mail_poi\nTel : $tel_poi\nRue : $rue_poi\nDescription : $desc_poi\nProposition : $prop_poi\nNom : $adherent_poi\nLatitude : $latitude_poi\nLongitude : $longitude_poi\n Categorie : $subcategory_id_subcategory";
+                sendMail(MAIL_FROM, "Erreur méthode createPublicPoi", "Erreur = " . $return['pb'] . "\n" . $infoPOI);
+                $return['success'] = false;
+                $return['pb'] = "Erreur lors de l'ajout de l'observation : " . $return['pb'];
+            }
+            // retourne le résultat du traitement du commentaire
+            echo json_encode($return);
+            mysql_close($link);
+            
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: isPropPublic Input			: Output			: success => '1' / failed => '2' Object			: display proposition in public map Date			: Jan. 31, 2012
+ * Function name : isPropPublic Input : Output : success => '1' / failed => '2' Object : display proposition in public map Date : Jan. 31, 2012
  */
-function isPropPublic() {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$sql = "SELECT id_subcategory FROM subcategory WHERE proppublic_subcategory = 1";
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			
-			if ($nbrows > 0) {
-				echo '1';
-			} else {
-				echo '2';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function isPropPublic()
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $sql = "SELECT id_subcategory FROM subcategory WHERE proppublic_subcategory = 1";
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            
+            if ($nbrows > 0) {
+                echo '1';
+            } else {
+                echo '2';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: getNumPageIdParam Input			: id record, usertype and number of record per page in the store Output			: number of page to load Object			: set the right page in the store to popup the edit map Date			: July 25, 2015
+ * Function name : getNumPageIdParam Input : id record, usertype and number of record per page in the store Output : number of page to load Object : set the right page in the store to popup the edit map Date : July 25, 2015
  */
-function getNumPageIdParam($idToFind, $usertype, $numRecordPerPage) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$line = - 1;
-			switch ($usertype) {
-				case '1' :
-					$sql = "SELECT poi.id_poi FROM poi WHERE delete_poi = FALSE ORDER BY id_poi DESC";
-					$result = mysql_query ( $sql );
-					
-					$i = 0;
-					while ( $row = mysql_fetch_array ( $result ) ) {
-						$i ++;
-						if ($idToFind == $row ['id_poi']) {
-							$line = $i;
-						}
-					}
-					
-					if ($line != - 1) {
-						$numerofpage = ceil ( $line / $numRecordPerPage );
-						echo '' . $numerofpage . '';
-					} else {
-						echo '-1';
-					}
-					
-					break;
-				case '2' :
-					$sql = "SELECT poi.id_poi 
+function getNumPageIdParam($idToFind, $usertype, $numRecordPerPage)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $line = - 1;
+            switch ($usertype) {
+                case '1':
+                    $sql = "SELECT poi.id_poi FROM poi WHERE delete_poi = FALSE ORDER BY id_poi DESC";
+                    $result = mysql_query($sql);
+                    
+                    $i = 0;
+                    while ($row = mysql_fetch_array($result)) {
+                        $i ++;
+                        if ($idToFind == $row['id_poi']) {
+                            $line = $i;
+                        }
+                    }
+                    
+                    if ($line != - 1) {
+                        $numerofpage = ceil($line / $numRecordPerPage);
+                        echo '' . $numerofpage . '';
+                    } else {
+                        echo '-1';
+                    }
+                    
+                    break;
+                case '2':
+                    $sql = "SELECT poi.id_poi 
 								FROM poi 
 								INNER JOIN subcategory ON (subcategory.id_subcategory = poi.subcategory_id_subcategory) 
 								INNER JOIN commune ON (commune.id_commune = poi.commune_id_commune) 
@@ -2290,30 +2563,30 @@ function getNumPageIdParam($idToFind, $usertype, $numRecordPerPage) {
 								INNER JOIN priorite ON (priorite.id_priorite = poi.priorite_id_priorite) 
 								INNER JOIN status ON (status.id_status = poi.status_id_status) 
 								WHERE moderation_poi = 1 
-									AND commune_id_commune IN (" . str_replace ( ';', ',', $_SESSION ['territoire'] ) . ") 
+									AND commune_id_commune IN (" . str_replace(';', ',', $_SESSION['territoire']) . ") 
 									AND delete_poi = FALSE 
 									AND priorite.non_visible_par_collectivite = 0 
 								ORDER BY id_poi DESC";
-					$result = mysql_query ( $sql );
-					
-					$i = 0;
-					while ( $row = mysql_fetch_array ( $result ) ) {
-						$i ++;
-						if ($idToFind == $row ['id_poi']) {
-							$line = $i;
-						}
-					}
-					
-					if ($line != - 1) {
-						$numerofpage = ceil ( $line / $numRecordPerPage );
-						echo '' . $numerofpage . '';
-					} else {
-						echo '-1';
-					}
-					
-					break;
-				case '3' :
-					$sql = "SELECT poi.id_poi 
+                    $result = mysql_query($sql);
+                    
+                    $i = 0;
+                    while ($row = mysql_fetch_array($result)) {
+                        $i ++;
+                        if ($idToFind == $row['id_poi']) {
+                            $line = $i;
+                        }
+                    }
+                    
+                    if ($line != - 1) {
+                        $numerofpage = ceil($line / $numRecordPerPage);
+                        echo '' . $numerofpage . '';
+                    } else {
+                        echo '-1';
+                    }
+                    
+                    break;
+                case '3':
+                    $sql = "SELECT poi.id_poi 
 								FROM poi 
 								INNER JOIN subcategory ON (subcategory.id_subcategory = poi.subcategory_id_subcategory) 
 								INNER JOIN commune ON (commune.id_commune = poi.commune_id_commune) 
@@ -2321,30 +2594,30 @@ function getNumPageIdParam($idToFind, $usertype, $numRecordPerPage) {
 								INNER JOIN quartier ON (quartier.id_quartier = poi.quartier_id_quartier) 
 								INNER JOIN priorite ON (priorite.id_priorite = poi.priorite_id_priorite) 
 								WHERE moderation_poi = 1 
-									AND pole_id_pole = " . $_SESSION ['pole'] . " 
+									AND pole_id_pole IN (" . $_SESSION['pole'] . ") 
 									AND transmission_poi = 1 
 									AND delete_poi = FALSE 
 								ORDER BY id_poi DESC";
-					$result = mysql_query ( $sql );
-					
-					$i = 0;
-					while ( $row = mysql_fetch_array ( $result ) ) {
-						$i ++;
-						if ($idToFind == $row ['id_poi']) {
-							$line = $i;
-						}
-					}
-					
-					if ($line != - 1) {
-						$numerofpage = ceil ( $line / $numRecordPerPage );
-						echo '' . $numerofpage . '';
-					} else {
-						echo '-1';
-					}
-					
-					break;
-				case '4' :
-					$sql = "SELECT poi.*, 
+                    $result = mysql_query($sql);
+                    
+                    $i = 0;
+                    while ($row = mysql_fetch_array($result)) {
+                        $i ++;
+                        if ($idToFind == $row['id_poi']) {
+                            $line = $i;
+                        }
+                    }
+                    
+                    if ($line != - 1) {
+                        $numerofpage = ceil($line / $numRecordPerPage);
+                        echo '' . $numerofpage . '';
+                    } else {
+                        echo '-1';
+                    }
+                    
+                    break;
+                case '4':
+                    $sql = "SELECT poi.*, 
 									subcategory.lib_subcategory, 
 									commune.lib_commune, 
 									pole.lib_pole, 
@@ -2360,390 +2633,488 @@ function getNumPageIdParam($idToFind, $usertype, $numRecordPerPage) {
 								INNER JOIN quartier ON (quartier.id_quartier = poi.quartier_id_quartier) 
 								INNER JOIN priorite ON (priorite.id_priorite = poi.priorite_id_priorite) 
 								INNER JOIN status ON (status.id_status = poi.status_id_status) 
-								WHERE pole_id_pole = " . $_SESSION ['pole'] . " 
+								WHERE pole_id_pole IN (" . $_SESSION['pole'] . ") 
 									AND delete_poi = FALSE 
 								ORDER BY id_poi DESC";
-					$result = mysql_query ( $sql );
-					
-					$i = 0;
-					while ( $row = mysql_fetch_array ( $result ) ) {
-						$i ++;
-						if ($idToFind == $row ['id_poi']) {
-							$line = $i;
-						}
-					}
-					
-					if ($line != - 1) {
-						$numerofpage = ceil ( $line / $numRecordPerPage );
-						echo '' . $numerofpage . '';
-					} else {
-						echo '-1';
-					}
-					break;
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+                    $result = mysql_query($sql);
+                    
+                    $i = 0;
+                    while ($row = mysql_fetch_array($result)) {
+                        $i ++;
+                        if ($idToFind == $row['id_poi']) {
+                            $line = $i;
+                        }
+                    }
+                    
+                    if ($line != - 1) {
+                        $numerofpage = ceil($line / $numRecordPerPage);
+                        echo '' . $numerofpage . '';
+                    } else {
+                        echo '-1';
+                    }
+                    break;
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: normalize Input			: string Output			: normalize string Object			: remove accent Date			: Feb. 2, 2012
+ * Function name : normalize Input : string Output : normalize string Object : remove accent Date : Feb. 2, 2012
  */
-function normalize($string) {
-	$table = array (
-			'Š' => 'S',
-			'š' => 's',
-			'Đ' => 'Dj',
-			'đ' => 'dj',
-			'Ž' => 'Z',
-			'ž' => 'z',
-			'Č' => 'C',
-			'č' => 'c',
-			'Ć' => 'C',
-			'ć' => 'c',
-			'À' => 'A',
-			'Á' => 'A',
-			'Â' => 'A',
-			'Ã' => 'A',
-			'Ä' => 'A',
-			'Å' => 'A',
-			'Æ' => 'A',
-			'Z' => 'C',
-			'È' => 'E',
-			'É' => 'E',
-			'Ê' => 'E',
-			'Ë' => 'E',
-			'Ì' => 'I',
-			'Í' => 'I',
-			'Î' => 'I',
-			'Ï' => 'I',
-			'Ñ' => 'N',
-			'Ò' => 'O',
-			'Ó' => 'O',
-			'Ô' => 'O',
-			'Õ' => 'O',
-			'Ö' => 'O',
-			'Ø' => 'O',
-			'Ù' => 'U',
-			'Ú' => 'U',
-			'Û' => 'U',
-			'Ü' => 'U',
-			'Ý' => 'Y',
-			'Þ' => 'B',
-			'ß' => 'Ss',
-			'à' => 'a',
-			'á' => 'a',
-			'â' => 'a',
-			'ã' => 'a',
-			'ä' => 'a',
-			'å' => 'a',
-			'æ' => 'a',
-			'Z' => 'c',
-			'è' => 'e',
-			'é' => 'e',
-			'ê' => 'e',
-			'ë' => 'e',
-			'ì' => 'i',
-			'í' => 'i',
-			'î' => 'i',
-			'ï' => 'i',
-			'ð' => 'o',
-			'ñ' => 'n',
-			'ò' => 'o',
-			'ó' => 'o',
-			'ô' => 'o',
-			'õ' => 'o',
-			'ö' => 'o',
-			'ø' => 'o',
-			'ù' => 'u',
-			'ú' => 'u',
-			'û' => 'u',
-			'ý' => 'y',
-			'ý' => 'y',
-			'þ' => 'b',
-			'ÿ' => 'y',
-			'Ŕ' => 'R',
-			'ŕ' => 'r' 
-	);
-	
-	return strtr ( $string, $table );
+function normalize($string)
+{
+    $table = array(
+        'Š' => 'S',
+        'š' => 's',
+        'Đ' => 'Dj',
+        'đ' => 'dj',
+        'Ž' => 'Z',
+        'ž' => 'z',
+        'Č' => 'C',
+        'č' => 'c',
+        'Ć' => 'C',
+        'ć' => 'c',
+        'À' => 'A',
+        'Á' => 'A',
+        'Â' => 'A',
+        'Ã' => 'A',
+        'Ä' => 'A',
+        'Å' => 'A',
+        'Æ' => 'A',
+        'Z' => 'C',
+        'È' => 'E',
+        'É' => 'E',
+        'Ê' => 'E',
+        'Ë' => 'E',
+        'Ì' => 'I',
+        'Í' => 'I',
+        'Î' => 'I',
+        'Ï' => 'I',
+        'Ñ' => 'N',
+        'Ò' => 'O',
+        'Ó' => 'O',
+        'Ô' => 'O',
+        'Õ' => 'O',
+        'Ö' => 'O',
+        'Ø' => 'O',
+        'Ù' => 'U',
+        'Ú' => 'U',
+        'Û' => 'U',
+        'Ü' => 'U',
+        'Ý' => 'Y',
+        'Þ' => 'B',
+        'ß' => 'Ss',
+        'à' => 'a',
+        'á' => 'a',
+        'â' => 'a',
+        'ã' => 'a',
+        'ä' => 'a',
+        'å' => 'a',
+        'æ' => 'a',
+        'Z' => 'c',
+        'è' => 'e',
+        'é' => 'e',
+        'ê' => 'e',
+        'ë' => 'e',
+        'ì' => 'i',
+        'í' => 'i',
+        'î' => 'i',
+        'ï' => 'i',
+        'ð' => 'o',
+        'ñ' => 'n',
+        'ò' => 'o',
+        'ó' => 'o',
+        'ô' => 'o',
+        'õ' => 'o',
+        'ö' => 'o',
+        'ø' => 'o',
+        'ù' => 'u',
+        'ú' => 'u',
+        'û' => 'u',
+        'ý' => 'y',
+        'ý' => 'y',
+        'þ' => 'b',
+        'ÿ' => 'y',
+        'Ŕ' => 'R',
+        'ŕ' => 'r'
+    );
+    
+    return strtr($string, $table);
 }
 
 /*
- * Function name 	: is_in_polygon Input			: tableau de latitudes, tableau de longitudes, latitude et longitude du point à chercher, nombre de points Output			: 0 si pas dans le polygone, 1 si dans le polygone Object			: find point in polygon Date			: Nov. 30, 2012
+ * Function name : is_in_polygon Input : tableau de latitudes, tableau de longitudes, latitude et longitude du point à chercher, nombre de points Output : 0 si pas dans le polygone, 1 si dans le polygone Object : find point in polygon Date : Nov. 30, 2012
  */
-function is_in_polygon($points_polygon, $vertices_x, $vertices_y, $longitude_x, $latitude_y) {
-	$i = $j = $c = 0;
-	for($i = 0, $j = $points_polygon; $i < $points_polygon; $j = $i ++) {
-		if ((($vertices_y [$i] > $latitude_y != ($vertices_y [$j] > $latitude_y)) && ($longitude_x < ($vertices_x [$j] - $vertices_x [$i]) * ($latitude_y - $vertices_y [$i]) / ($vertices_y [$j] - $vertices_y [$i]) + $vertices_x [$i])))
-			$c = ! $c;
-	}
-	return $c;
+function is_in_polygon($points_polygon, $vertices_x, $vertices_y, $longitude_x, $latitude_y)
+{
+    $i = $j = $c = 0;
+    for ($i = 0, $j = $points_polygon; $i < $points_polygon; $j = $i ++) {
+        if ((($vertices_y[$i] > $latitude_y != ($vertices_y[$j] > $latitude_y)) && ($longitude_x < ($vertices_x[$j] - $vertices_x[$i]) * ($latitude_y - $vertices_y[$i]) / ($vertices_y[$j] - $vertices_y[$i]) + $vertices_x[$i])))
+            $c = ! $c;
+    }
+    return $c;
 }
 
 /*
- * Function name 	: getComments Input			: id Output			: json Object			: get comments per ID Date			: Dec. 13, 2015
+ * Function name : getComments Input : id Output : json Object : get comments per ID Date : Dec. 13, 2015
  */
-function getComments($id_poi) {
-	switch (SGBD) {
-		case 'mysql' :
-			
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			$whereAppend = '';
-			if ($_SESSION ["type"] == 3 || $_SESSION ["type"] == 2) { // is communaute de communes or pole technique
-				$whereAppend = ' AND display_commentaires = \'Modéré accepté\'';
-			}
-			$sql = "SELECT * FROM commentaires WHERE poi_id_poi = " . $id_poi . " " . $whereAppend;
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . ", SESSION type = " . $_SESSION ["type"] . ", $sql \n", 3, LOG_FILE );
-			}
-			$result = mysql_query ( $sql );
-			$nbrows = mysql_num_rows ( $result );
-			
-			$i = 0;
-			if ($nbrows > 0) {
-				while ( $row = mysql_fetch_array ( $result ) ) {
-					$arr [$i] ['id_commentaires'] = $row ['id_commentaires'];
-					$arr [$i] ['text_commentaires'] = stripslashes ( $row ['text_commentaires'] );
-					$arr [$i] ['display_commentaires'] = $row ['display_commentaires'];
-					$arr [$i] ['url_photo'] = $row ['url_photo'];
-					$arr [$i] ['datecreation'] = $row ['datecreation'];
-					if ($_SESSION ["type"] == 4 || $_SESSION ["type"] == 1) {
-						$arr [$i] ['mail_commentaires'] = stripslashes ( $row ['mail_commentaires'] );
-					}else{
-						$arr [$i] ['mail_commentaires'] = "******";
-					}
-					$i ++;
-				}
-				echo '({"total":"' . $nbrows . '","results":' . json_encode ( $arr ) . '})';
-			} else {
-				echo '({"total":"0", "results":""})';
-			}
-			
-			mysql_free_result ( $result );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function getComments($id_poi)
+{
+    switch (SGBD) {
+        case 'mysql':
+            
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            $whereAppend = '';
+            if ($_SESSION["type"] == 3 || $_SESSION["type"] == 2) { // is communaute de communes or pole technique
+                $whereAppend = ' AND display_commentaires = \'Modéré accepté\'';
+            }
+            $sql = "SELECT * FROM commentaires WHERE poi_id_poi = " . $id_poi . " " . $whereAppend;
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . ", SESSION type = " . $_SESSION["type"] . ", $sql \n", 3, LOG_FILE);
+            }
+            $result = mysql_query($sql);
+            $nbrows = mysql_num_rows($result);
+            
+            $i = 0;
+            if ($nbrows > 0) {
+                while ($row = mysql_fetch_array($result)) {
+                    $arr[$i]['id_commentaires'] = $row['id_commentaires'];
+                    $arr[$i]['text_commentaires'] = stripslashes($row['text_commentaires']);
+                    $arr[$i]['display_commentaires'] = $row['display_commentaires'];
+                    $arr[$i]['url_photo'] = $row['url_photo'];
+                    $arr[$i]['datecreation'] = $row['datecreation'];
+                    if ($_SESSION["type"] == 4 || $_SESSION["type"] == 1) {
+                        $arr[$i]['mail_commentaires'] = stripslashes($row['mail_commentaires']);
+                    } else {
+                        $arr[$i]['mail_commentaires'] = "******";
+                    }
+                    $i ++;
+                }
+                echo '({"total":"' . $nbrows . '","results":' . json_encode($arr) . '})';
+            } else {
+                echo '({"total":"0", "results":""})';
+            }
+            
+            mysql_free_result($result);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: editComment Input			: id_comment, text_comment Output			: json Object			: edit comments per ID Date			: Dec. 13, 2015
+ * Function name : editComment Input : id_comment, text_comment Output : json Object : edit comments per ID Date : Dec. 13, 2015
  */
-function editComment($id_comment, $text_comment, $status_comment) {
-	switch (SGBD) {
-		case 'mysql' :
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$text = mysql_real_escape_string ( $text_comment );
-			$status = mysql_real_escape_string ( $status_comment );
-			$lastdatemodif_poi = date ( "Y-m-d H:i:s" );
-			$sql = "UPDATE commentaires SET text_commentaires = '$text', display_commentaires = '$status', lastdatemodif_comment = '$lastdatemodif_poi',lastmodif_user_comment = ".$_SESSION ['id_users']." WHERE id_commentaires = $id_comment";
-			
-			$result = mysql_query ( $sql );
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . ", $sql \n", 3, LOG_FILE );
-			}
-			
-			$sql = "SELECT poi_id_poi FROM commentaires WHERE id_commentaires = " . $id_comment;
-			$res = mysql_query ( $sql );
-			$row = mysql_fetch_row ( $res );
-			$id_poi = $row [0];
-			
-			
-			$sql3 = "UPDATE poi SET lastdatemodif_poi = '$lastdatemodif_poi', lastmodif_user_poi = ".$_SESSION ['id_users']." WHERE id_poi = $id_poi";
-			$result3 = mysql_query ( $sql3 );
-			
-			if (! $result || ! $result3) {
-				echo '2';
-			} else {
-				echo '1';
-			}
-			
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+function editComment($id_comment, $text_comment, $status_comment)
+{
+    switch (SGBD) {
+        case 'mysql':
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $text = mysql_real_escape_string($text_comment);
+            $status = mysql_real_escape_string($status_comment);
+            $lastdatemodif_poi = date("Y-m-d H:i:s");
+            $sql = "UPDATE commentaires SET text_commentaires = '$text', display_commentaires = '$status', lastdatemodif_comment = '$lastdatemodif_poi',lastmodif_user_comment = " . $_SESSION['id_users'] . " WHERE id_commentaires = $id_comment";
+            
+            $result = mysql_query($sql);
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . ", $sql  \n", 3, LOG_FILE);
+            }
+            
+            $sql = "SELECT c.poi_id_poi, p.mail_poi FROM commentaires c INNER JOIN poi p ON p.id_poi = c.poi_id_poi WHERE c.id_commentaires = " . $id_comment;
+            $res = mysql_query($sql);
+            $id_poi = mysql_result($res, 0, "poi_id_poi");
+            $mail_poi = mysql_result($res, 0, "mail_poi");
+            $sql3 = "UPDATE poi SET lastdatemodif_poi = '$lastdatemodif_poi', lastmodif_user_poi = " . $_SESSION['id_users'] . " WHERE id_poi = $id_poi";
+            $result3 = mysql_query($sql3);
+            
+            if (! $result || ! $result3) {
+                echo '2';
+            } else {
+                echo '1';
+            }
+            
+            if ($status == 'Modéré accepté'){
+                $subject = 'Nouveau commentaire validé sur l\'observation ' . $id_poi;
+                $message = "Bonjour !
+Un nouveau commentaire a été validé sur l'observation n° $id_poi.
+Lien vers l'observation : " . URL . '/index.php?id=' . $id_poi . "\n";
+                $mailsFollowers = array();
+                $mailsFollowers = getMailsToSendFromVotesAndComments($id_poi, $subject, "Vous recevez ce mail car vous avez souhaité suivre l'évolution de cette observation. Message envoyé à la personne qui a remonté l'observation : \n".$message);
+            
+                $mails = array();
+                
+                /* debut envoi d'un mail au contributeur */
+                $mailArray = [
+                    $mail_poi,
+                    "Soumetteur",
+                    $subject,
+                    $message
+                ];
+                array_push($mails, $mailArray);
+                
+                if (isset($mailsFollowers)) {
+                    $succes = sendMails($mailsFollowers);
+                }
+                if (isset($mails)) {
+                    $succes = sendMails($mails);
+                }
+            }
+            
+            
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 /*
- * Function name 	: createPublicComment Output			: json Object			: add comment on POI Date			: Dec. 13, 2015
+ * Function name : createPublicComment Output : json Object : add comment on POI Date : Dec. 13, 2015
  */
-function createPublicComment() {
-	switch (SGBD) {
-		case 'mysql' :
-			if (DEBUG) {
-				error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . "\n", 3, LOG_FILE );
-			}
-			$link = mysql_connect ( DB_HOST, DB_USER, DB_PASS );
-			mysql_select_db ( DB_NAME );
-			mysql_query ( "SET NAMES utf8mb4" );
-			
-			$id_poi = $_POST ['id_poi'];
-			$text = mysql_real_escape_string ( $_POST ['text_comment'] );
-			$mail_commentaires = mysql_real_escape_string ( $_POST ['mail_comment'] );
-			$url_photo = '';
-			$return = array();
-			// si une photo a été associée au commentaire, on la traite
-			if (isset ( $_FILES ['photo-path'] ) && $_FILES ['photo-path'] ['name'] != "") {
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " photo-path isset " . $_FILES ['photo-path'] ['name'] . "\n", 3, LOG_FILE );
-				}
-				$dossier = '../../../resources/pictures/';
-				$fichier = basename ( $_FILES ['photo-path'] ['name'] );
-				$taille_maxi = 6291456;
-				$taille = filesize ( $_FILES ['photo-path'] ['tmp_name'] );
-				$extensions = array (
-						'.png',
-						'.gif',
-						'.jpg',
-						'.jpeg',
-						'.PNG',
-						'.GIF',
-						'.JPG',
-						'.JPEG' 
-				);
-				$extension = strrchr ( $_FILES ['photo-path'] ['name'], '.' );
-				
-				if (! in_array ( $extension, $extensions )) {
-					$erreur = getTranslation ( $_SESSION ['id_language'], 'ERROR' );
-					$return ['success'] = false;
-					$return ['pb'] = getTranslation ( $_SESSION ['id_language'], 'PICTUREPNGGIFJPGJPEG' );
-				}
-				
-				if ($taille > $taille_maxi) {
-					$erreur = getTranslation ( $_SESSION ['id_language'], 'ERROR' );
-					$return ['success'] = false;
-					$return ['pb'] = getTranslation ( $_SESSION ['id_language'], 'PICTURESIZE' );
-				}
-				
-				if (! isset ( $erreur )) {
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " pas d'erreur, on continue \n", 3, LOG_FILE );
-					}
-					$fichier = strtr ( $fichier, 'ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜÝàáâãäåçèéêëìíîïðòóôõöùúûüýÿ_', 'AAAAAACEEEEIIIIOOOOOUUUUYaaaaaaceeeeiiiioooooouuuuyy-' );
-					$fichier = preg_replace ( '/([^.a-z0-9]+)/i', '-', $fichier );
-					$fichier = 'poi_' . $id_poi . '_' . $fichier;
-					$pathphoto = $dossier . $fichier;
-					if (move_uploaded_file ( $_FILES ['photo-path'] ['tmp_name'], $pathphoto )) {
-						if (DEBUG) {
-							error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " dans move_uploaded_file \n", 3, LOG_FILE );
-						}
-						$size = getimagesize ( $pathphoto );
-						
-						if ($size [0] > 1024 || $size [1] > 1024) {
-							if ($size [0] > $size [1]) {
-								generate_image_thumbnail ( $pathphoto, $pathphoto, 1024, 768 );
-							} else {
-								generate_image_thumbnail ( $pathphoto, $pathphoto, 768, 1024 );
-							}
-						}
-						
-						$size = getimagesize ( $pathphoto );
-						$newnamefichier = $size [0] . 'x' . $size [1] . 'x' . $fichier;
-						$newpathphoto = $dossier . $newnamefichier;
-						rename ( $pathphoto, $newpathphoto );
-						$url_photo = $newnamefichier;
-						
-						$return ['success'] = true;
-						$return ['ok'] = getTranslation ( $_SESSION ['id_language'], 'PHOTOTRANSFERTDONE' );
-					} else {
-						$return ['success'] = false;
-						$return ['pb'] = "Erreur lors du traitement de la photo.";
-					}
-				}
-			}
-			
-			// si une photo a été associée au commentaire et que tout s'est bien passé, ou bien s'il n'y avaotr pas de photo, on peut crer le commentaire dans la base de données
-			if ((isset ( $_FILES ['photo-path'] ['name'] ) && isset($return ['success']) && $return ['success'] == true) || (isset ( $_FILES ['photo-path'] ['name'] ) && $_FILES ['photo-path'] ['name'] == "")) {
-				// si le mail est un administrateur ou un modérateur alors on bypasse la modération
-				$sql2 = "SELECT id_users FROM users WHERE (usertype_id_usertype = 1 OR usertype_id_usertype = 4) AND mail_users LIKE '" . $mail_commentaires . "'";
-				$result2 = mysql_query ( $sql2 );
-				$num_rows2 = mysql_num_rows ( $result2 );
-				$displayFlag = 'Modéré accepté';
-				if ($num_rows2 == 0) {
-					$displayFlag = 'Non modéré';
-				}
-				$sql = "INSERT INTO commentaires (text_commentaires, display_commentaires, mail_commentaires, poi_id_poi,url_photo) VALUES ('$text', '$displayFlag', '$mail_commentaires',$id_poi,'$url_photo')";
-				$result = mysql_query ( $sql );
-				if (DEBUG) {
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " " . $_POST ['task'] . ", sql : $sql\n", 3, LOG_FILE );
-					error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " Erreur " . mysql_errno ( $link ) . " : " . mysql_error ( $link ) . "\n", 3, LOG_FILE );
-				}
-				$id_commentaire = mysql_insert_id ();
-				
-				if (! $result) {
-					$return ['success'] = false;
-					$return ['pb'] = "Erreur lors de l'ajout du commentaire.";
-				} else {
-					$lastdatemodif_poi = date ( "Y-m-d H:i:s" );
-					$sql3 = "UPDATE poi SET lastdatemodif_poi = '$lastdatemodif_poi', lastmodif_user_poi = ".$_SESSION ['id_users']." WHERE id_poi = $id_poi";
-					if (DEBUG) {
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " sql $sql3 \n", 3, LOG_FILE );
-						error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " Erreur " . mysql_errno ( $link ) . " : " . mysql_error ( $link ) . "\n", 3, LOG_FILE );
-					}
-					$result3 = mysql_query ( $sql3 );
-					$return ['success'] = true;
-					$return ['ok'] = "Le commentaire a été correctement ajouté et est directement affiché (après rechargement de la page) puisque vous êtes référencé(e) comme modérateur ou administrateur de VelObs.";
-					// si le contributeur n'est pas un modérateur ni un administrateur par ailleurs, on envoie des mails
-					if ($num_rows2 == 0) {
-						$return ['ok'] = "Le commentaire a été correctement ajouté et est en attente de modération. Merci pour votre aide.";
-						$arrayObs = getObservationDetailsInArray ( $id_poi );
-						$arrayDetailsAndUpdateSQL = getObservationDetailsInString ( $arrayObs );
-						$newCommentInfo = "Nouveau commentaire : $text \nPosté par $mail_commentaires \n";
-						if ($url_photo != "") {
-							$newCommentInfo .= "Photo : " . URL . "/resources/pictures/" . $url_photo . "\n";
-						}
-						/* envoi d'un mail aux administrateurs de l'association et modérateurs */
-						$whereClause = "u.usertype_id_usertype = 1 OR (u.usertype_id_usertype = 4 AND u.num_pole = " . $arrayObs ['pole_id_pole'] . ")";
-						$subject = 'Nouveau commentaire à modérer sur le pole ' . $arrayObs ['lib_pole'];
-						$message = "Bonjour !
-Un nouveau commentaire a été ajouté sur le pole " . $arrayObs ['lib_pole'] . ". Veuillez vous connecter à l'interface d'administration pour le modérer (cliquer sur le bouton \"Commentaires\", en bas à droite, une fois les détails de l'observation affichés).
-Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs ['id_poi'] . "\n" . $newCommentInfo . $arrayDetailsAndUpdateSQL ['detailObservationString'] . "\n";
-						$mails = array ();
-						$mails = getMailsToSend ( $whereClause, $subject, $message );
-						
-						/* debut envoi d'un mail au contributeur */
-						$subject = 'Commentaire en attente de modération';
-						$message = "Bonjour !
-Vous venez d'ajouter un commentaire à l'observation " . $arrayObs ['id_poi'] . " sur VelObs et nous vous en remercions. Celui-ci devrait être administré sous peu.\n" . $newCommentInfo . $arrayDetailsAndUpdateSQL ['detailObservationString'] . "\n
+function createPublicComment()
+{
+    switch (SGBD) {
+        case 'mysql':
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . "\n", 3, LOG_FILE);
+            }
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $id_poi = $_POST['id_poi'];
+            $text = mysql_real_escape_string($_POST['text_comment']);
+            $mail_commentaires = mysql_real_escape_string($_POST['mail_comment']);
+            $follow = mysql_real_escape_string($_POST['beInformedField']);
+            if ($follow == 'on') {
+                $follow = 1;
+            }else{
+                $follow = 0;
+            }
+            $url_photo = '';
+            $return = array();
+            // si une photo a été associée au commentaire, on la traite
+            if (isset($_FILES['photo-path']) && $_FILES['photo-path']['name'] != "") {
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " photo-path isset " . $_FILES['photo-path']['name'] . "\n", 3, LOG_FILE);
+                }
+                $dossier = '../../../resources/pictures/';
+                $fichier = basename($_FILES['photo-path']['name']);
+                $taille_maxi = 6291456;
+                $taille = filesize($_FILES['photo-path']['tmp_name']);
+                $extensions = array(
+                    '.png',
+                    '.gif',
+                    '.jpg',
+                    '.jpeg',
+                    '.PNG',
+                    '.GIF',
+                    '.JPG',
+                    '.JPEG'
+                );
+                $extension = strrchr($_FILES['photo-path']['name'], '.');
+                
+                if (! in_array($extension, $extensions)) {
+                    $erreur = getTranslation($_SESSION['id_language'], 'ERROR');
+                    $return['success'] = false;
+                    $return['pb'] = getTranslation($_SESSION['id_language'], 'PICTUREPNGGIFJPGJPEG');
+                }
+                
+                if ($taille > $taille_maxi) {
+                    $erreur = getTranslation($_SESSION['id_language'], 'ERROR');
+                    $return['success'] = false;
+                    $return['pb'] = getTranslation($_SESSION['id_language'], 'PICTURESIZE');
+                }
+                
+                if (! isset($erreur)) {
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " pas d'erreur, on continue \n", 3, LOG_FILE);
+                    }
+                    $fichier = strtr($fichier, 'ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜÝàáâãäåçèéêëìíîïðòóôõöùúûüýÿ_', 'AAAAAACEEEEIIIIOOOOOUUUUYaaaaaaceeeeiiiioooooouuuuyy-');
+                    $fichier = preg_replace('/([^.a-z0-9]+)/i', '-', $fichier);
+                    $fichier = 'poi_' . $id_poi . '_' . $fichier;
+                    $pathphoto = $dossier . $fichier;
+                    if (move_uploaded_file($_FILES['photo-path']['tmp_name'], $pathphoto)) {
+                        if (DEBUG) {
+                            error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " dans move_uploaded_file \n", 3, LOG_FILE);
+                        }
+                        $size = getimagesize($pathphoto);
+                        
+                        if ($size[0] > 1024 || $size[1] > 1024) {
+                            if ($size[0] > $size[1]) {
+                                generate_image_thumbnail($pathphoto, $pathphoto, 1024, 768);
+                            } else {
+                                generate_image_thumbnail($pathphoto, $pathphoto, 768, 1024);
+                            }
+                        }
+                        
+                        $size = getimagesize($pathphoto);
+                        $newnamefichier = $size[0] . 'x' . $size[1] . 'x' . $fichier;
+                        $newpathphoto = $dossier . $newnamefichier;
+                        rename($pathphoto, $newpathphoto);
+                        $url_photo = $newnamefichier;
+                        
+                        $return['success'] = true;
+                        $return['ok'] = getTranslation($_SESSION['id_language'], 'PHOTOTRANSFERTDONE');
+                    } else {
+                        $return['success'] = false;
+                        $return['pb'] = "Erreur lors du traitement de la photo.";
+                    }
+                }
+            }
+            
+            // si une photo a été associée au commentaire et que tout s'est bien passé, ou bien s'il n'y avaotr pas de photo, on peut crer le commentaire dans la base de données
+            if ((isset($_FILES['photo-path']['name']) && isset($return['success']) && $return['success'] == true) || (isset($_FILES['photo-path']['name']) && $_FILES['photo-path']['name'] == "")) {
+                // si le mail est un administrateur ou un modérateur alors on bypasse la modération
+                $sql2 = "SELECT id_users FROM users WHERE (usertype_id_usertype = 1 OR usertype_id_usertype = 4) AND mail_users LIKE '" . $mail_commentaires . "'";
+                $result2 = mysql_query($sql2);
+                $num_rows2 = mysql_num_rows($result2);
+                $displayFlag = 'Modéré accepté';
+                if ($num_rows2 == 0) {
+                    $displayFlag = 'Non modéré';
+                }
+                $sql = "INSERT INTO commentaires (text_commentaires, display_commentaires, mail_commentaires, poi_id_poi,url_photo) VALUES ('$text', '$displayFlag', '$mail_commentaires',$id_poi,'$url_photo')";
+                $result = mysql_query($sql);
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " " . $_POST['task'] . ", sql : $sql\n", 3, LOG_FILE);
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Erreur " . mysql_errno($link) . " : " . mysql_error($link) . "\n", 3, LOG_FILE);
+                }
+                $id_commentaire = mysql_insert_id();
+                
+                if (! $result) {
+                    $return['success'] = false;
+                    $return['pb'] = "Erreur lors de l'ajout du commentaire.";
+                } else {
+                    $lastdatemodif_poi = date("Y-m-d H:i:s");
+                    $sql3 = "UPDATE poi SET lastdatemodif_poi = '$lastdatemodif_poi', lastmodif_user_poi = " . $_SESSION['id_users'] . " WHERE id_poi = $id_poi";
+                    if (DEBUG) {
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " sql $sql3 \n", 3, LOG_FILE);
+                        error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Erreur " . mysql_errno($link) . " : " . mysql_error($link) . "\n", 3, LOG_FILE);
+                    }
+                    $result3 = mysql_query($sql3);
+                    $return['success'] = true;
+                    $return['ok'] = "Le commentaire a été correctement ajouté et est directement affiché (après rechargement de la page) puisque vous êtes référencé(e) comme modérateur ou administrateur de VelObs.";
+                    // si le contributeur n'est pas un modérateur ni un administrateur par ailleurs, on envoie des mails
+                    if ($num_rows2 == 0) {
+                        $return['ok'] = "Le commentaire a été correctement ajouté et est en attente de modération. Merci pour votre aide.";
+                        $arrayObs = getObservationDetailsInArray($id_poi);
+                        $arrayDetailsAndUpdateSQL = getObservationDetailsInString($arrayObs);
+                        $newCommentInfo = "Nouveau commentaire : $text \nPosté par $mail_commentaires \n";
+                        if ($url_photo != "") {
+                            $newCommentInfo .= "Photo : " . URL . "/resources/pictures/" . $url_photo . "\n";
+                        }
+                        /* envoi d'un mail aux administrateurs de l'association et modérateurs */
+                        $whereClause = "u.usertype_id_usertype = 1 OR (u.usertype_id_usertype = 4 AND ulp.num_pole = " . $arrayObs['pole_id_pole'] . ")";
+                        $subject = 'Nouveau commentaire à modérer sur le pole ' . $arrayObs['lib_pole'];
+                        $message = "Bonjour !
+Un nouveau commentaire a été ajouté sur le pole " . $arrayObs['lib_pole'] . ". Veuillez vous connecter à l'interface d'administration pour le modérer (cliquer sur le bouton \"Commentaires\", en bas à droite, une fois les détails de l'observation affichés).
+Lien vers la modération : " . URL . '/admin.php?id=' . $arrayObs['id_poi'] . "\n" . $newCommentInfo . $arrayDetailsAndUpdateSQL['detailObservationString'] . "\n";
+                        $mails = array();
+                        $mails = getMailsToSend($whereClause, $subject, $message);
+                        
+                        /* debut envoi d'un mail au contributeur */
+                        $subject = 'Commentaire en attente de modération';
+                        $message = "Bonjour !
+Vous venez d'ajouter un commentaire à l'observation " . $arrayObs['id_poi'] . " sur VelObs et nous vous en remercions. Celui-ci devrait être administré sous peu.\n" . $newCommentInfo . $arrayDetailsAndUpdateSQL['detailObservationString'] . "\n
 Cordialement, l'Association " . VELOBS_ASSOCIATION . " :)";
-						$mailArray = [ 
-								$mail_commentaires,
-								"Soumetteur",
-								$subject,
-								$message 
-						];
-						array_push ( $mails, $mailArray );
-						if (DEBUG) {
-							error_log ( date ( "Y-m-d H:i:s" ) . " " . __FUNCTION__ . " - Il y a " . count ( $mails ) . " mails à envoyer\n", 3, LOG_FILE );
-						}
-						$succes = sendMails ( $mails );
-					}
-				}
-			}
-			
-			// retourne le résultat du traitement du commentaire
-			echo json_encode ( $return );
-			mysql_close ( $link );
-			break;
-		case 'postgresql' :
-			// TODO
-			break;
-	}
+                        $mailArray = [
+                            $mail_commentaires,
+                            "Soumetteur",
+                            $subject,
+                            $message
+                        ];
+                        array_push($mails, $mailArray);
+                        if (DEBUG) {
+                            error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " - Il y a " . count($mails) . " mails à envoyer\n", 3, LOG_FILE);
+                        }
+                        $succes = sendMails($mails);
+                    }
+                }
+            }
+            
+            // retourne le résultat du traitement du commentaire
+            echo json_encode($return);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
+}
+
+/*
+ * Function name : createSupport Output : json Object : add support on POI Date : Jan 30 2019
+ */
+function createSupport()
+{
+    switch (SGBD) {
+        case 'mysql':
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . "\n", 3, LOG_FILE);
+            }
+            $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+            mysql_select_db(DB_NAME);
+            mysql_query("SET NAMES utf8mb4");
+            
+            $id_poi = $_POST['id_poi'];
+            $follow = mysql_real_escape_string($_POST['beInformedSupportField']);
+            if ($follow == 'on') {
+                $follow = 1;
+            }else{
+                $follow = 0;
+            }
+            $mail = mysql_real_escape_string($_POST['mailSupportField']);
+            $return = array();
+            // si une photo a été associée au commentaire et que tout s'est bien passé, ou bien s'il n'y avaotr pas de photo, on peut crer le commentaire dans la base de données
+            // si le mail est un administrateur ou un modérateur alors on bypasse la modération
+            $sql = "INSERT INTO support_poi (poi_poi_id, support_poi_mail, support_poi_follow) VALUES ($id_poi,'$mail', '$follow')";
+            $result = mysql_query($sql);
+            if (DEBUG) {
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " " . $_POST['task'] . ", sql : $sql\n", 3, LOG_FILE);
+                error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Erreur " . mysql_errno($link) . " : " . mysql_error($link) . "\n", 3, LOG_FILE);
+            }
+            
+            if (! $result) {
+                $return['success'] = false;
+                $return['pb'] = "Erreur lors de l'ajout du vote. Ce lien existe sans doute déjà.";
+            } else {
+                $lastdatemodif_poi = date("Y-m-d H:i:s");
+                $sql3 = "UPDATE poi SET lastdatemodif_poi = '$lastdatemodif_poi', lastmodif_user_poi = " . $_SESSION['id_users'] . " WHERE id_poi = $id_poi";
+                if (DEBUG) {
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " sql $sql3 \n", 3, LOG_FILE);
+                    error_log(date("Y-m-d H:i:s") . " " . __FUNCTION__ . " Erreur " . mysql_errno($link) . " : " . mysql_error($link) . "\n", 3, LOG_FILE);
+                }
+                $result3 = mysql_query($sql3);
+                $return['success'] = true;
+                $return['ok'] = "Votre vote a été correctement ajouté, nous vous remercions.";
+                if ($follow) {
+                    $return['ok'] .= " Vous serez averti(e) à chaque mise à jour de cette fiche.";
+                } else {
+                    $return['ok'] .= " Vous avez choisi de ne pas être averti(e) à chaque mise à jour de cette fiche.";
+                }
+            }
+            // retourne le résultat du traitement du commentaire
+            echo json_encode($return);
+            mysql_close($link);
+            break;
+        case 'postgresql':
+            // TODO
+            break;
+    }
 }
 
 // When you need to hash a password, just feed it to the function
@@ -2758,26 +3129,29 @@ function createPublicComment() {
 // http://stackoverflow.com/questions/536584/non-random-salt-for-password-hashes/536756#536756
 //
 // Here is a imlementation for PHP 5.5 and older:
-function create_password_hash($strPassword, $numAlgo = 1, $arrOptions = array()) {
-	if (function_exists ( 'password_hash' )) {
-		// php >= 5.5
-		$hash = password_hash ( $strPassword, $numAlgo, $arrOptions );
-	} else {
-		$salt = mcrypt_create_iv ( 22, MCRYPT_DEV_URANDOM );
-		$salt = base64_encode ( $salt );
-		$salt = str_replace ( '+', '.', $salt );
-		$hash = crypt ( $strPassword, '$2y$10$' . $salt . '$' );
-	}
-	return $hash;
+function create_password_hash($strPassword, $numAlgo = 1, $arrOptions = array())
+{
+    if (function_exists('password_hash')) {
+        // php >= 5.5
+        $hash = password_hash($strPassword, $numAlgo, $arrOptions);
+    } else {
+        $salt = mcrypt_create_iv(22, MCRYPT_DEV_URANDOM);
+        $salt = base64_encode($salt);
+        $salt = str_replace('+', '.', $salt);
+        $hash = crypt($strPassword, '$2y$10$' . $salt . '$');
+    }
+    return $hash;
 }
-function verify_password_hash($strPassword, $strHash) {
-	if (function_exists ( 'password_verify' )) {
-		// php >= 5.5
-		$boolReturn = password_verify ( $strPassword, $strHash );
-	} else {
-		$strHash2 = crypt ( $strPassword, $strHash );
-		$boolReturn = $strHash == $strHash2;
-	}
-	return $boolReturn;
+
+function verify_password_hash($strPassword, $strHash)
+{
+    if (function_exists('password_verify')) {
+        // php >= 5.5
+        $boolReturn = password_verify($strPassword, $strHash);
+    } else {
+        $strHash2 = crypt($strPassword, $strHash);
+        $boolReturn = $strHash == $strHash2;
+    }
+    return $boolReturn;
 }
 ?>
diff --git a/lib/php/admin/database.php b/lib/php/admin/database.php
index 760ad311..df01f8be 100644
--- a/lib/php/admin/database.php
+++ b/lib/php/admin/database.php
@@ -194,6 +194,15 @@
 		case "LISTINGUSER" :
 			getUsers ( $start, $limit );
 			break;
+		case "CREATELINKUSERPOLE" :
+		    createLinkUserPole ();
+		    break;
+		case "LISTINGLINKUSERPOLE" :
+		    getLinksUserPole ( $start, $limit );
+		    break;
+		case "DELETELINKUSERPOLE" :
+		    deleteLinkUserPole ();
+		    break;
 		case "UPDATEUSER" :
 			updateUser ();
 			break;
@@ -215,11 +224,17 @@
 			getComments ( $id_poi );
 			break;
 		case "EDITCOMMENTS" :
-			editComment ( $_POST ['id_comment'], $_POST ['text_comment'], $_POST ['display_commentaires'] );
+		    editComment ( $_POST ['id_comment'], $_POST ['text_comment'], $_POST ['display_commentaires']);
 			break;
 		case "CREATEPUBLICCOMMENTS" :
 			createPublicComment ();
 			break;
+		case "CREATESUPPORT" :
+		    if (DEBUG) {
+		        error_log(date("Y-m-d H:i:s") . " Before createSupport() \n", 3, LOG_FILE);
+		    }
+		    createSupport ();
+		    break;
 		case "LISTINGPHOTOS" :
 			getComments ( $id_poi );
 			break;
@@ -240,6 +255,12 @@
 		case "CREATEPUBLICCOMMENTS" :
 			createPublicComment ();
 			break;
+		case "CREATESUPPORT" :
+		    if (DEBUG) {
+		        error_log(date("Y-m-d H:i:s") . " Before createSupport() \n", 3, LOG_FILE);
+		    }
+		    createSupport ();
+		    break;
 	}
 }
 ?>
diff --git a/lib/php/admin/getJsonTree.php b/lib/php/admin/getJsonTree.php
index e438896c..5f815b5e 100644
--- a/lib/php/admin/getJsonTree.php
+++ b/lib/php/admin/getJsonTree.php
@@ -16,7 +16,7 @@
 			
 			if ($_SESSION ['role'] == 3) { // pole technique
 				$whereClauseSQL = " display_subcategory = TRUE 
-						 	AND p.pole_id_pole = " . $_SESSION ['pole'] . " 
+						 	AND p.pole_id_pole IN (" . $_SESSION ['pole'] . ") 
 						 	AND priorite.non_visible_par_collectivite = 0  
 						 	AND delete_poi = FALSE 
 						 	AND p.geom_poi IS NOT NULL 	
@@ -26,7 +26,7 @@
 						 	AND p.transmission_poi = TRUE ";
 			} else if ($_SESSION ['role'] == 4) { // moderateur
 				$whereClauseSQL = " display_subcategory = TRUE 
-						 	AND p.pole_id_pole = " . $_SESSION ['pole'] . " 
+						 	AND p.pole_id_pole IN (" . $_SESSION ['pole'] . " )
 						 	AND p.delete_poi = FALSE 
 						 	AND p.geom_poi IS NOT NULL 
 						 	AND p.display_poi = TRUE 
@@ -76,8 +76,6 @@
 				if (DEBUG) {
 					error_log ( date ( "Y-m-d H:i:s" ) . " - admin/getJsonTree.php $sqlSubCategory\n", 3, LOG_FILE );
 				}
-				// $sql2 = "SELECT ,
-				// COUNT(poi.id_poi) as nb_poi, subcategory.* FROM subcategory WHERE display_subcategory = TRUE AND category_id_category = ".$row['id_category']." ORDER BY treerank_subcategory ASC";
 				$result2 = mysql_query ( $sqlSubCategory );
 				if (mysql_num_rows ( $result2 ) > 0) {
 					$json .= "leaf: false,";
@@ -107,7 +105,6 @@
 			mysql_free_result ( $result );
 			mysql_free_result ( $result2 );
 			mysql_close ( $link );
-			
 			break;
 		case 'postgresql' :
 			// TODO
diff --git a/lib/php/admin/getMarker.php b/lib/php/admin/getMarker.php
index 97b6292e..95e13c07 100644
--- a/lib/php/admin/getMarker.php
+++ b/lib/php/admin/getMarker.php
@@ -73,11 +73,11 @@
 			} elseif ($_SESSION ["type"] == 3) { // is pole technique
 				$sqlappend .= ' AND moderation_poi = 1  
 						AND transmission_poi = 1 
-						AND poi.pole_id_pole = ' . $_SESSION ["pole"] . ' 
+						AND poi.pole_id_pole IN (' . $_SESSION ["pole"] . ') 
 						AND priorite.non_visible_par_collectivite = 0 ';
 				$whereSelectCommentAppend = ' AND display_commentaires = \'Modéré accepté\' ';
 			} elseif ($_SESSION ["type"] == 4) { // is moderateur
-				$sqlappend .= ' AND poi.pole_id_pole = ' . $_SESSION ["pole"] . ' ';
+				$sqlappend .= ' AND poi.pole_id_pole IN (' . $_SESSION ["pole"] . ') ';
 			}
 			
 			if (isset ( $_GET ["status"] ) && $_GET ["status"] != '') { // filter by status given by the collectivity
@@ -92,7 +92,15 @@
 					error_log ( date ( "Y-m-d H:i:s" ) . " - admin/getMarker.php datesqlappend = " . $datesqlappend . "\n", 3, LOG_FILE );
 				}
 			}
-			$sql .= $sqlappend . $datesqlappend;
+
+			if (DEBUG) {
+			    error_log ( date ( "Y-m-d H:i:s" ) . " - admin/getMarker.php nbSupportMinimum = " . $_GET ["nbSupportMinimum"] . "\n", 3, LOG_FILE );
+			}
+			if (isset ( $_GET ["nbSupportMinimum"] ) && $_GET ["nbSupportMinimum"] != '' && $_GET ["nbSupportMinimum"] > 0) { // filter by status given by the collectivity
+			    $sqlappend .= ' AND poi.id_poi IN (select poi_poi_id from support_poi group by poi_poi_id having count(*) >= '.$_GET ["nbSupportMinimum"].')';
+			}
+			$sql .= $datesqlappend . $sqlappend;
+
 			if (DEBUG) {
 				error_log ( date ( "Y-m-d H:i:s" ) . " - admin/getMarker.php sql = $sql\n", 3, LOG_FILE );
 			}
@@ -212,9 +220,15 @@
 				} else {
 					$comments .= "Encore aucun commentaire associé";
 				}
-				
+				//Récupération du soutien
+				$sqlSupport = "SELECT count(*) FROM support_poi WHERE poi_poi_id = " . $row ['id_poi'];
+				$resultSupport = mysql_query ( $sqlSupport );
+				$nb_support = mysql_result($resultSupport,0);
+				$comments .= '<br /><b>Nombre de votes pour cette fiche </b> : ' . $nb_support;
 				$arr [$i] ['comments'] = stripslashes ( $comments );
-				
+				if (DEBUG && isset ( $_GET ['id'] )) {
+				    error_log ( date ( "Y-m-d H:i:s" ) . " - admin/getMarker.php retour json avec comment for id ". $_GET ['id']." $comments\n", 3, LOG_FILE );
+				}
 				$i ++;
 			}
 			if (DEBUG) {
diff --git a/lib/php/admin/getModeratorUsers.php b/lib/php/admin/getModeratorUsers.php
new file mode 100644
index 00000000..8082f9ae
--- /dev/null
+++ b/lib/php/admin/getModeratorUsers.php
@@ -0,0 +1,31 @@
+<?php
+	session_start();
+	include_once '../key.php';
+
+	if (isset($_SESSION['user'])) {
+		switch (SGBD) {
+			case 'mysql':
+				$link = mysql_connect(DB_HOST,DB_USER,DB_PASS);
+				mysql_select_db(DB_NAME);
+				mysql_query("SET NAMES utf8mb4");
+				
+				$sql = "SELECT id_users, lib_users, nom_users, mail_users FROM users WHERE is_active_user = TRUE AND usertype_id_usertype = 4 ORDER BY lib_users ASC";
+				$result = mysql_query($sql);
+				$i = 0;
+				while ($row = mysql_fetch_array($result)){
+					$arr[$i]['id_users'] = $row['id_users'];
+					$arr[$i]['lib_users'] = stripslashes($row['lib_users']." (".$row['nom_users']." - " . $row['mail_users'].")");
+					$i++;
+				}
+				echo '({"users":'.json_encode($arr).'})';
+
+				mysql_free_result($result);
+				mysql_close($link);
+				break;
+			case 'postgresql':
+				// TODO
+				break;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/lib/php/admin/getPoleUser.php b/lib/php/admin/getPoleUser.php
index 7f0904e7..fa0fae71 100644
--- a/lib/php/admin/getPoleUser.php
+++ b/lib/php/admin/getPoleUser.php
@@ -9,12 +9,12 @@
 				mysql_select_db(DB_NAME);
 				mysql_query("SET NAMES utf8mb4");
 				
-				$sql = "SELECT id_pole, lib_pole FROM pole WHERE id_pole <> 9 ORDER BY lib_pole ASC";
+				$sql = "SELECT p.id_pole, p.lib_pole, t.lib_territoire FROM pole p INNER JOIN territoire t ON t.id_territoire = p.territoire_id_territoire WHERE p.id_pole <> 9 ORDER BY t.lib_territoire, p.lib_pole ASC";
 				$result = mysql_query($sql);
 				$i = 0;
 				while ($row = mysql_fetch_array($result)){
 					$arr[$i]['id_userpole'] = $row['id_pole'];
-					$arr[$i]['lib_userpole'] = stripslashes($row['lib_pole']);
+					$arr[$i]['lib_userpole'] = stripslashes($row['lib_pole'] . " - " . $row['lib_territoire']);
 					$i++;
 				}
 				echo '({"userpole":'.json_encode($arr).'})';
diff --git a/lib/php/admin/getStatus.php b/lib/php/admin/getStatus.php
index 59a4670d..00c8e3de 100644
--- a/lib/php/admin/getStatus.php
+++ b/lib/php/admin/getStatus.php
@@ -9,13 +9,14 @@
 				mysql_select_db(DB_NAME);
 				mysql_query("SET NAMES utf8mb4");
 				
-				$sql = "SELECT id_status, lib_status, color_status FROM status ORDER BY lib_status ASC";
+				$sql = "SELECT id_status, lib_status, color_status, is_active_status FROM status WHERE is_active_status = true ORDER BY lib_status ASC";
 				$result = mysql_query($sql);
 				$i = 0;
 				while ($row = mysql_fetch_array($result)){
 					$arr[$i]['id_status'] = $row['id_status'];
 					$arr[$i]['lib_status'] = stripslashes($row['lib_status']);
 					$arr[$i]['color_status'] = stripslashes($row['color_status']);
+					$arr[$i]['is_active_status'] = stripslashes($row['is_active_status']);
 					$i++;
 				}
 				echo '({"status":'.json_encode($arr).'})';
diff --git a/lib/php/admin/login.php b/lib/php/admin/login.php
index 21ad4a78..ddb02d10 100644
--- a/lib/php/admin/login.php
+++ b/lib/php/admin/login.php
@@ -2,7 +2,7 @@
 	session_start();
 	include_once '../key.php';
 	include_once 'adminfunction.php';
-	
+	 
 	switch (SGBD) {
 		case 'mysql':
 			$link = mysql_connect(DB_HOST,DB_USER,DB_PASS);
@@ -13,8 +13,14 @@
             }
 			$pseudo = mysql_real_escape_string($_POST['login']);
 			$pass = mysql_real_escape_string($_POST['password']);
+			
 			$sql = "SELECT users.*, language.* FROM users INNER JOIN language ON (language.id_language = users.language_id_language) WHERE lib_users = '".$pseudo."'";
-			//$sql = "SELECT users.*, language.* FROM users INNER JOIN language ON (language.id_language = users.language_id_language) WHERE lib_users = '".$pseudo."' AND pass_users = '".$pass."'";
+			$result = mysql_query("SHOW COLUMNS FROM `users` LIKE 'is_active_users'");
+			$exists = (mysql_num_rows($result))?TRUE:FALSE;
+			
+			if($exists){
+			    $sql .= " AND is_active_user = true";
+			}
 			
 			$result = mysql_query($sql);
 			if (!$result) {
@@ -24,7 +30,42 @@
 			} else {
 				if (mysql_num_rows($result) != 0) {
 					while ($row = mysql_fetch_array($result)) {
-						if (verify_password_hash($_POST['password'],$row['pass_users'])){
+					    if (verify_password_hash($_POST['password'],$row['pass_users'])){
+					        $sqlLinkUserPoles = "SELECT users_link_pole.* FROM users_link_pole WHERE id_user = ".$row['id_users'];
+					        $resultLinkUserPoles = mysql_query($sqlLinkUserPoles);
+					        $full_id_territoires = '';
+					        $poles = '';
+					        if (!$resultLinkUserPoles) {
+					            $arr['msg'] = 'Invalid request : '.mysql_error()."\n";
+					            //$arr['msg'] .= 'Request : '.$sql;
+					            $arr['success'] = FALSE;
+					        } else {
+					            while ($rowLinkUserPoles = mysql_fetch_array($resultLinkUserPoles)) {
+					                $poles .= $rowLinkUserPoles['num_pole'].',';
+					                //si l'utilisateur fait partie d'une communauté de commune
+					                if ($row['usertype_id_usertype'] == 2) {
+					                    $sql2 = "SELECT ids_territoire FROM territoire WHERE id_territoire = ".$rowLinkUserPoles['territoire_id_territoire'];
+					                    $result2 = mysql_query($sql2);
+					                    
+					                    while ($row2 = mysql_fetch_array($result2)) {
+					                        $full_id_territoires .= $row2['ids_territoire'].',';
+					                    }
+					                    if (DEBUG) {
+					                        error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - commonfunction.php, full_id_territoires " . $full_id_territoires . " \n", 3, LOG_FILE );
+					                    }
+					                    $full_id_territoires = substr ( $full_id_territoires, 0, - 1 );
+					                    $_SESSION['territoire'] = $full_id_territoires;
+					                }//si l'utilisateur fait partie d'un pole technique ou est responsable pole 2P2R
+					                else if (($row['usertype_id_usertype'] == 3) || ($row['usertype_id_usertype'] == 4)) {
+					                    $_SESSION['territoire'] = 0;
+					                }
+					                $_SESSION['header_logo'] = $row['territoire_id_territoire'];
+					            }
+					            if (DEBUG) {
+					                error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - commonfunction.php, pole " . $poles . " \n", 3, LOG_FILE );
+					            }
+					            $poles = substr ( $poles, 0, - 1 );
+					        }
 						$arr['id_users'] = $row['id_users'];
 						$arr['type_users'] = $row['usertype_id_usertype'];
 						$arr['who'] = $row['lib_users'];
@@ -32,29 +73,28 @@
 						$arr['mail_users'] = $row['mail_users'];
 						//$arr['role_users'] = $row['role_users'];
 						$arr['nom_users'] = $row['nom_users'];
-						$arr['territoire_users'] = $row['territoire_id_territoire'];
 
 						$arr['success'] = TRUE;
 						$_SESSION['id_users'] = $row['id_users'];
 						$_SESSION['user'] = $row['lib_users'];
-						$_SESSION['pole'] = $row['num_pole'];
+						$_SESSION['pole'] = $poles;
 
 						$_SESSION['mail'] = $row['mail_users'];
 						$_SESSION['role'] = $row['usertype_id_usertype'];
 						$_SESSION['nom'] = $row['nom_users'];
 						//si l'utilisateur fait partie d'une communauté de commune
-                        if ($row['usertype_id_usertype'] == 2) {
-                            $sql2 = "SELECT ids_territoire FROM territoire WHERE id_territoire = ".$row['territoire_id_territoire'];
-                        	$result2 = mysql_query($sql2);
-                        	while ($row2 = mysql_fetch_array($result2)) {
-                        	    $_SESSION['territoire'] = $row2['ids_territoire'];
-                        	}
-                        }//si l'utilisateur fait partie d'un pole technique ou est responsable pole 2P2R
-                        else if (($row['usertype_id_usertype'] == 3) || ($row['usertype_id_usertype'] == 4)) {
-                            $_SESSION['territoire'] = 0;
-                        }
+//                         if ($row['usertype_id_usertype'] == 2) {
+//                             $sql2 = "SELECT ids_territoire FROM territoire WHERE id_territoire = ".$row['territoire_id_territoire'];
+//                         	$result2 = mysql_query($sql2);
+//                         	while ($row2 = mysql_fetch_array($result2)) {
+//                         	    $_SESSION['territoire'] = $row2['ids_territoire'];
+//                         	}
+//                         }//si l'utilisateur fait partie d'un pole technique ou est responsable pole 2P2R
+//                         else if (($row['usertype_id_usertype'] == 3) || ($row['usertype_id_usertype'] == 4)) {
+//                             $_SESSION['territoire'] = 0;
+//                         }
 
-                        $_SESSION['header_logo'] = $row['territoire_id_territoire'];
+                        
 
 						$_SESSION['type'] = $row['usertype_id_usertype'];
 						$_SESSION['id_language'] = $row['language_id_language'];
diff --git a/lib/php/commonfunction.php b/lib/php/commonfunction.php
index 86765a25..3ec8f74e 100644
--- a/lib/php/commonfunction.php
+++ b/lib/php/commonfunction.php
@@ -271,164 +271,166 @@ function getObservationDetailsInString($arrayObservation){
 		$sqlUpdate = '';
 		$updateObservationBoolean = 0;
 		
-		
 		$arrayColumns = array();
 		$numberOfColumns = 0;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'subcategory_id_subcategory' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'subcategory_id_subcategory' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Catégorie : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Catégorie' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'integer' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'rue_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'rue_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Nom de la voie : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Nom de la voie' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'num_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'num_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Repère : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Repère' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'pole_id_pole' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'pole_id_pole' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Pôle : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Pôle' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'integer' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'commune_id_commune' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'commune_id_commune' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Commune : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Commune' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'integer' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'desc_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'desc_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Description du problème : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Description du problème' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'prop_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'prop_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Proposition : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Proposition' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'observationterrain_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'observationterrain_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Commentaire de terrain de l\'association : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Commentaire de terrain de l\'association' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'priorite_id_priorite' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'priorite_id_priorite' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Priorité définie par l\'association : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Priorité définie par l\'association' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'integer' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'moderation_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'moderation_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Observation modérée : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Observation modérée' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'boolean' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'display_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'display_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Observation affichée sur l\'interface publique (valable si la priorité le permet) : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Observation affichée sur l\'interface publique (valable si la priorité le permet)' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'boolean' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'reponse_collectivite_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'reponse_collectivite_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Réponse de la collectivité : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Réponse de la collectivité' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'status_id_status' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'status_id_status' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Statut positionné par la collectivité : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Statut positionné par la collectivité' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'integer' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'transmission_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'transmission_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# La collectivité a transmis l\'observation au pôle technique : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'La collectivité a transmis l\'observation au pôle technique' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'boolean' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'reponsepole_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'reponsepole_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Réponse du pôle technique : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Réponse du pôle technique' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'traiteparpole_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'traiteparpole_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Le pôle a traité l\'observation : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Le pôle a traité l\'observation' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'boolean' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'commentfinal_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'commentfinal_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Commentaire final de l\'association : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Commentaire final de l\'association' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'datefix_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'datefix_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Date de clôture de l\'observation : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Date de clôture de l\'observation' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'Date' ;
 // 		$numberOfColumns++;
 // 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'fix_poi' ;
 // 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'fix_poi' ;
-// 		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# fix_poi (?) : ' ;
+// 		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'fix_poi (?)' ;
 // 		$arrayColumns[$numberOfColumns]['dataType'] = 'boolean' ;
 		$numberOfColumns++;
 		//info personne qui a remonté l'observationr
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'adherent_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'adherent_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Nom du contributeur : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Nom du contributeur' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'mail_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'mail_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Mail du contributeur : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Mail du contributeur' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'mail' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'tel_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'tel_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Téléphone du contributeur : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Téléphone du contributeur' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'string' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'mailsentuser_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'mailsentuser_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Mail envoyé au contributeur : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Mail envoyé au contributeur' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'boolean' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'delete_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'delete_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Observation supprimée : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Observation supprimée' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'boolean' ;
 		$numberOfColumns++;
 		//informations générales observation
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'datecreation_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'datecreation_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Date de création de l\'observation : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Date de création de l\'observation' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'Date' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'lastdatemodif_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'lastdatemodif_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Date de dernière modification : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Date de dernière modification' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'Date' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'geolocatemode_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'geolocatemode_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Mode de géolocalisation utilisé : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Mode de géolocalisation utilisé' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'integer' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'latitude_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'latitude_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Latitude observation : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Latitude observation' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'position' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'longitude_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'longitude_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Longitude observation : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Longitude observation' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'position' ;
 		$numberOfColumns++;
 		$arrayColumns[$numberOfColumns]['columnSQL'] = 'photo_poi' ;
 		$arrayColumns[$numberOfColumns]['columnPOST'] = 'photo_poi' ;
-		$arrayColumns[$numberOfColumns]['columnIntitule'] = '# Photo : ' ;
+		$arrayColumns[$numberOfColumns]['columnIntitule'] = 'Photo' ;
 		$arrayColumns[$numberOfColumns]['dataType'] = 'photo' ;
 		
 		
-		
+		$DetailObservation .='<table>';
+		$DetailObservation .='<thead><tr><td>Champ</td><td>Valeur initialie</td><td>Valeur modifiée</td></tr></thead>';
 		for ($i = 0; $i < count($arrayColumns); $i++) {
+		    $DetailObservation .='<tr>';
+		    $DetailObservation .='<td>'. $arrayColumns [$i] ['columnIntitule'].'</td>';
 			$columnUpdated = 0;
 			if (DEBUG) {
 				error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - commonfunction.php, traitement de " . $arrayColumns[$i]['columnSQL'] . " \n", 3, LOG_FILE );
@@ -438,6 +440,7 @@ function getObservationDetailsInString($arrayObservation){
 					if (DEBUG) {
 						error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - commonfunction.php, " . $arrayColumns [$i] ['columnSQL'] . ", boolean\n", 3, LOG_FILE );
 					}
+					
 					$OldValue = (strlen($arrayObservation[$arrayColumns[$i]['columnSQL']]) > 0)?$arrayObservation[$arrayColumns[$i]['columnSQL']]:0;
 					switch ($_POST [$arrayColumns [$i] ['columnPOST']]){
 						case 'false':
@@ -578,8 +581,9 @@ function getObservationDetailsInString($arrayObservation){
 								$OldValue = "?";
 								break;
 						}
-					}
-					$DetailObservation .= "       ".$arrayColumns [$i] ['columnIntitule'] . "\"" .((strlen ( $OldValue ) > 0) ?  $OldValue : "Non Renseigné") . "\" remplacé par \"" . $NewValue . "\"\n";
+					}
+					$DetailObservation .='<td>'. ((strlen ( $OldValue ) > 0) ?  $OldValue : "Non Renseigné").'</td><td>'.$NewValue.'</td>';
+					//$DetailObservation .= "       ".$arrayColumns [$i] ['columnIntitule'] . "\"" .((strlen ( $OldValue ) > 0) ?  $OldValue : "Non Renseigné") . "\" remplacé par \"" . $NewValue . "\"\n";
 					
 					$updateObservationBoolean = 1;
 				} 
@@ -640,21 +644,23 @@ function getObservationDetailsInString($arrayObservation){
 								break;
 						}
 					}
-					$DetailObservation .= $arrayColumns [$i] ['columnIntitule'] . "\"" . ((strlen ( $OldValue ) > 0) ? $OldValue : "Non Renseigné") . "\"\n";
+					//$DetailObservation .= $arrayColumns [$i] ['columnIntitule'] . "\"" . ((strlen ( $OldValue ) > 0) ? $OldValue : "Non Renseigné") . "\"\n";
+					$DetailObservation .='<td>'. ((strlen ( $OldValue ) > 0) ?  $OldValue : "Non Renseigné").'</td><td></td>';
+					
 				}
+				$DetailObservation .='</tr>';
 		}
+		$DetailObservation .="</table>\n";
 		if (DEBUG) {
 			error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - commonfunction.php, sqlUpdate " . $sqlUpdate . " \n", 3, LOG_FILE );
 			error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - commonfunction.php, updateObservationBoolean " . $updateObservationBoolean . " \n", 3, LOG_FILE );
 		}
-		$DetailObservation .= "# Lien direct vers l'observation (non visible sur la carte tant que la modération n'a pas été effectuée) : ".URL.'?id='.$arrayObservation['id_poi'];
-		$helpReadingDetailsOfPOI = '';
+		$DetailObservation .= "Lien direct vers l'observation (non visible sur la carte tant que la modération n'a pas été effectuée) : ".URL.'?id='.$arrayObservation['id_poi'];
 		if ($sqlUpdate != ""){
-			$helpReadingDetailsOfPOI = "(les lignes avec un alinéa correspondent aux informations modifiées)";
 			$lastdatemodif_poi = date("Y-m-d H:i:s");
 			$sqlUpdate = " lastdatemodif_poi = '$lastdatemodif_poi', lastmodif_user_poi = ".$_SESSION ['id_users']." ".$sqlUpdate;
 		}
-		$DetailObservation = "------------- Détails de l'observation ------------- \n" . $helpReadingDetailsOfPOI."\n# Numéro observation : ". $arrayObservation['id_poi']."\n".$DetailObservation;
+		$DetailObservation = "------------- Détails de l'observation numéro : ". $arrayObservation['id_poi']."-------------\n".$DetailObservation;
 		$arrayDetailsAndUpdateSQL=array();
 		$arrayDetailsAndUpdateSQL['updateObsBoolean'] = $updateObservationBoolean;
 		$arrayDetailsAndUpdateSQL['sqlUpdate'] = $sqlUpdate;
@@ -670,7 +676,7 @@ function getObservationDetailsInString($arrayObservation){
 	* 	Date			: septembre 19 2017
 	*/
 	function getMailsToSend($whereClauseSelectionUsers, $subject, $message){
-		$sql = "SELECT u.mail_users, ut.lib_usertype, u.lib_users FROM users u inner join usertype ut on ut.id_usertype = u.usertype_id_usertype WHERE " . $whereClauseSelectionUsers;
+		$sql = "SELECT u.mail_users, ut.lib_usertype, u.lib_users FROM users u inner join users_link_pole ulp on ulp.id_user = u.id_users inner join usertype ut on ut.id_usertype = u.usertype_id_usertype WHERE " . $whereClauseSelectionUsers;
 		if (DEBUG){
 			error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " requete de recuperation des mails des utilisateurs ". $sql . " \n", 3, LOG_FILE);
 		}
@@ -691,6 +697,54 @@ function getMailsToSend($whereClauseSelectionUsers, $subject, $message){
 		}
 		return $mails;
 	}
+	/*	Function name	: getMailsToSend
+	 * 	Input			: $whereClauseSelectionUsers : constraint to get e-mail of users
+	 * 	Input			: $subject of the e-mail to be sent to the selected users
+	 * 	Input			: $message, body of the e-mail to be sent to the selected users
+	 * 	Output			: $mails, an array containing e-mails, user status, subject and message
+	 * 	Object			: get the e-mail adresses and link th e subject and message to be sent
+	 * 	Date			: septembre 19 2017
+	 */
+	function getMailsToSendFromVotesAndComments($id_poi, $subject, $message){
+	    $mails = array();
+	    
+	    $sqlComment = "SELECT distinct(mail_commentaires) FROM commentaires WHERE poi_id_poi = $id_poi AND comment_poi_follow = 1";
+	    if (DEBUG){
+	        error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " requete de recuperation des mails des utilisateurs ayant voté ". $sqlComment . " \n", 3, LOG_FILE);
+	    }
+	    $resultComment = mysql_query($sqlComment);
+	    
+	    if ($resultComment){
+	        if (DEBUG){
+	            error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " Récupération des mails à envoyer \n", 3, LOG_FILE);
+	        }
+	        while ($row2 = mysql_fetch_array($resultComment)) {
+	            $mailArray = [$row2['mail_commentaires'],"", $subject, $message ];
+	            array_push($mails,$mailArray);
+	        }
+	        
+	    }
+	    
+	    $sqlVote = "SELECT distinct(support_poi_mail) FROM support_poi WHERE poi_poi_id = $id_poi AND support_poi_follow = 1";
+	    if (DEBUG){
+	        error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " requete de recuperation des mails des utilisateurs ayant voté ". $sqlVote . " \n", 3, LOG_FILE);
+	    }
+	    $resultVote = mysql_query($sqlVote);
+	    if ($resultVote){
+	        if (DEBUG){
+	            error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " Récupération des mails à envoyer \n", 3, LOG_FILE);
+	        }
+	        while ($row2 = mysql_fetch_array($resultVote)) {
+	            $mailArray = [$row2['support_poi_mail'],"", $subject, $message ];
+	            array_push($mails,$mailArray);
+	        }
+	        
+	    }
+	    if (DEBUG){
+	        error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " Il y a ". count($mails) . " mails à envoyer pour les followers \n", 3, LOG_FILE);
+	    }
+	    return $mails;
+	}
 	/*	Function name	: sendMails
 	 * 	Input			: array $mailsArray (created with getMailsToSend)
 	* 	Output			: true
@@ -716,13 +770,13 @@ function sendMails($mailsArray){
 	function sendMail ($to, $subject, $body){
 		$headers = 'From: '. MAIL_FROM . "\r\n" .
 				'Reply-To: ' . MAIL_REPLY_TO ."\r\n" .
-				'Content-Type: text/plain; charset=UTF-8' . "\r\n" .
+				'Content-Type: text/html; charset=UTF-8' . "\r\n" .
 				'X-Mailer: PHP/' . phpversion();
 		if (DEBUG){
 			error_log(date("Y-m-d H:i:s") . " " .__FUNCTION__ . " - commonfunction.php - Mail avec comme sujet = ".MAIL_SUBJECT_PREFIX . ' '.$subject ." et envoyé à " . $to ."\n", 3, LOG_FILE);
 		}
-	
-		mail($to, MAIL_SUBJECT_PREFIX . ' '.$subject, $body, $headers);
+		$body = "<html><head><style>table, td {border: 1px solid black;border-collapse: collapse;}tr:nth-child(odd) {background: #CCCCCC;}thead{background-color:#D0E3FA;font-weight: bold;}</style><title>".$subject."</title></head><body>".$body."</body></html>";
+		mail($to, MAIL_SUBJECT_PREFIX . ' '.$subject, nl2br($body), $headers);
 		//mail($to, MAIL_SUBJECT_PREFIX . ' '.$subject, $body);
 	
 	}
diff --git a/lib/php/public/getAdresse.php b/lib/php/public/getAdresse.php
new file mode 100644
index 00000000..b1788c2b
--- /dev/null
+++ b/lib/php/public/getAdresse.php
@@ -0,0 +1,32 @@
+<?php
+include_once '../key.php';
+if (isset ( $_POST ['lat']) && isset ( $_POST ['lon']) ){
+    if (DEBUG) {
+        error_log(date("Y-m-d H:i:s") . " - public/getAdresse.php \n", 3, LOG_FILE);
+    }
+    $url = 'https://api-adresse.data.gouv.fr/reverse/?lon=' . $_POST['lon'] . '&lat=' . $_POST['lat'];
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)');
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+    curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+    $data = curl_exec($ch);
+    $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    curl_close($ch);
+    if (DEBUG) {
+        error_log(date("Y-m-d H:i:s") . " - public/getAdresse.php $data \n", 3, LOG_FILE);
+    }
+    
+    $obj = json_decode($data, true);
+    if ($obj != null){
+        //var_dump($obj['features']);
+    }
+    echo $obj['features'][0]['properties']['name'];
+}else{
+	    if (DEBUG) {
+	        error_log ( date ( "Y-m-d H:i:s" ) . " - public/getAdresse.php sans GET \n", 3, LOG_FILE );
+	    }
+	echo "pas GET";
+	}
+?>
\ No newline at end of file
diff --git a/lib/php/public/getJsonStats.php b/lib/php/public/getJsonStats.php
index 35dce283..0c72c8e7 100644
--- a/lib/php/public/getJsonStats.php
+++ b/lib/php/public/getJsonStats.php
@@ -13,6 +13,7 @@
 			
 			$sql = "SELECT s.id_status 
 					FROM status AS s
+                    WHERE s.is_active_status = true
 					ORDER BY s.lib_status ASC";
 		
 			$result = mysql_query($sql);
@@ -37,7 +38,7 @@
 							AND p.pole_id_pole = ' . $_SESSION ["pole"] . ' 
 							AND priorite.non_visible_par_collectivite = 0 ';
 				} elseif ($_SESSION ["type"] == 4) { // is moderateur
-					$sqlappend .= ' AND p.pole_id_pole = ' . $_SESSION ["pole"] . ' ';
+					$sqlappend .= ' AND p.pole_id_pole IN (' . $_SESSION ["pole"] . ') ';
 				}
 				if (DEBUG){
 					error_log(date("Y-m-d H:i:s") . " - getJsonStats.php ".$_SESSION["type"]."\n", 3, LOG_FILE);
diff --git a/lib/php/public/getMarker.php b/lib/php/public/getMarker.php
index 2f1d5e97..fb791379 100644
--- a/lib/php/public/getMarker.php
+++ b/lib/php/public/getMarker.php
@@ -54,7 +54,9 @@
 			if (isset($_GET ['priorite']) && $_GET ['priorite'] != "") {
 				$sqlappend .= " AND priorite.id_priorite =  " . mysql_real_escape_string($_GET ['priorite']);
 			} 
-			
+			if (isset ( $_GET ["nbSupportMinimum"] ) && $_GET ["nbSupportMinimum"] != '' && $_GET ["nbSupportMinimum"] > 0) { // filter by status given by the collectivity
+			    $sqlappend .= ' AND poi.id_poi IN (select poi_poi_id from support_poi group by poi_poi_id having count(*) >= '.$_GET ["nbSupportMinimum"].')';
+			}
 			$sqlappend .= $datesqlappend . $statussqlappend;
 		}
 		$sql .= $sqlappend;
@@ -86,6 +88,7 @@
 			$arr [$i] ['lon'] = $row ['X'];
 			$arr [$i] ['mail_poi'] = stripslashes ( $row ['mail_poi'] );
 			$arr [$i] ['lastdatemodif_poi'] = $row ['lastdatemodif_poi'];
+			//récupération des commentaires
 			$sql2 = "SELECT * FROM commentaires WHERE poi_id_poi = " . $row ['id_poi'] . " AND display_commentaires = 'Modéré accepté'";
 			$result2 = mysql_query ( $sql2 );
 			$j = 0;
@@ -98,6 +101,10 @@
 			}
 			$arr [$i] ['num_comments'] =$j;
 			$arr [$i] ['num_accepted_comments'] =$j;
+			//Récupération du soutien
+			$sqlSupport = "SELECT count(*) FROM support_poi WHERE poi_poi_id = " . $row ['id_poi'];
+			$resultSupport = mysql_query ( $sqlSupport );
+			$arr [$i] ['support'] = mysql_result($resultSupport,0);
 			$i ++;
 		}
 		if (DEBUG) {
diff --git a/resources/icon/shadowHover_brown.png b/resources/icon/shadowHover_brown.png
new file mode 100644
index 00000000..b2661bcb
Binary files /dev/null and b/resources/icon/shadowHover_brown.png differ
diff --git a/resources/icon/shadowHover_purple.png b/resources/icon/shadowHover_purple.png
new file mode 100644
index 00000000..995e143a
Binary files /dev/null and b/resources/icon/shadowHover_purple.png differ
diff --git a/resources/sql/install.sql b/resources/sql/install.sql
index 81dbf405..d1bbd569 100644
--- a/resources/sql/install.sql
+++ b/resources/sql/install.sql
@@ -100,28 +100,90 @@ CREATE TABLE `usertype` (
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_unicode_ci AUTO_INCREMENT=1;
 
 
-CREATE TABLE `users` (
-`id_users` int(11) NOT NULL AUTO_INCREMENT,
-  `lib_users` varchar(100) DEFAULT NULL,
-  `pass_users` varchar(100) DEFAULT NULL,
-  `num_pole` int(11) NOT NULL,
+CREATE TABLE IF NOT EXISTS `users` (
+  `id_users` int(11) NOT NULL,
+  `lib_users` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `pass_users` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `usertype_id_usertype` int(11) DEFAULT NULL,
   `language_id_language` int(11) DEFAULT NULL,
-  `territoire_id_territoire` int(11) DEFAULT NULL,
-  `mail_users` varchar(255) NOT NULL,
-  `nom_users` varchar(255) NOT NULL,
-  PRIMARY KEY (`id_users`), 
-  KEY `usertype_id_usertype` (`usertype_id_usertype`), 
-  KEY `language_id_language` (`language_id_language`), 
-  KEY `territoire_id_territoire` (`territoire_id_territoire`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_unicode_ci AUTO_INCREMENT=1;
+  `mail_users` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `nom_users` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `is_active_user` tinyint(1) DEFAULT '1'
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+--
+-- Index pour les tables exportées
+--
+
+--
+-- Index pour la table `users`
+--
+ALTER TABLE `users`
+  ADD PRIMARY KEY (`id_users`),
+  ADD KEY `usertype_id_usertype` (`usertype_id_usertype`),
+  ADD KEY `language_id_language` (`language_id_language`);
 
+--
+-- AUTO_INCREMENT pour les tables exportées
+--
+
+--
+-- AUTO_INCREMENT pour la table `users`
+--
+ALTER TABLE `users`
+  MODIFY `id_users` int(11) NOT NULL AUTO_INCREMENT;
+--
+-- Contraintes pour les tables exportées
+--
 
+--
+-- Contraintes pour la table `users`
+--
 ALTER TABLE `users`
-ADD CONSTRAINT `users_ibfk_1` FOREIGN KEY (`usertype_id_usertype`) REFERENCES `usertype` (`id_usertype`) ON DELETE CASCADE ON UPDATE CASCADE,
-ADD CONSTRAINT `users_ibfk_2` FOREIGN KEY (`language_id_language`) REFERENCES `language` (`id_language`) ON DELETE CASCADE ON UPDATE CASCADE,
-ADD CONSTRAINT `users_ibfk_3` FOREIGN KEY (`territoire_id_territoire`) REFERENCES `territoire` (`id_territoire`);
+  ADD CONSTRAINT `users_ibfk_1` FOREIGN KEY (`usertype_id_usertype`) REFERENCES `usertype` (`id_usertype`) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `users_ibfk_2` FOREIGN KEY (`language_id_language`) REFERENCES `language` (`id_language`) ON DELETE CASCADE ON UPDATE CASCADE;
+
 
+CREATE TABLE IF NOT EXISTS `users_link_pole` (
+  `user_link_pole_id` int(11) NOT NULL,
+  `id_user` int(11) NOT NULL,
+  `territoire_id_territoire` int(11) NOT NULL,
+  `num_pole` int(11) NOT NULL
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='link between users and territoires/poles';
+
+--
+-- Index pour les tables exportées
+--
+
+--
+-- Index pour la table `users_link_pole`
+--
+ALTER TABLE `users_link_pole`
+  ADD PRIMARY KEY (`user_link_pole_id`),
+  ADD KEY `id_user` (`id_user`),
+  ADD KEY `territoire_id_territoire` (`territoire_id_territoire`),
+  ADD KEY `num_pole` (`num_pole`);
+
+--
+-- AUTO_INCREMENT pour les tables exportées
+--
+
+--
+-- AUTO_INCREMENT pour la table `users_link_pole`
+--
+ALTER TABLE `users_link_pole`
+  MODIFY `user_link_pole_id` int(11) NOT NULL AUTO_INCREMENT;
+--
+-- Contraintes pour les tables exportées
+--
+
+--
+-- Contraintes pour la table `users_link_pole`
+--
+ALTER TABLE `users_link_pole`
+  ADD CONSTRAINT `poles_FK` FOREIGN KEY (`num_pole`) REFERENCES `pole` (`id_pole`),
+  ADD CONSTRAINT `territoires_FK` FOREIGN KEY (`territoire_id_territoire`) REFERENCES `territoire` (`id_territoire`),
+  ADD CONSTRAINT `users_FK` FOREIGN KEY (`id_user`) REFERENCES `users` (`id_users`);
 
 CREATE TABLE IF NOT EXISTS `priorite` (
   `id_priorite` int(11) NOT NULL,
@@ -153,14 +215,14 @@ CREATE TABLE `quartier` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_unicode_ci AUTO_INCREMENT=1;
 INSERT INTO `quartier` (`id_quartier`, `lib_quartier`) VALUES (99999, 'Inutile');
 
-CREATE TABLE `status` (
-`id_status` int(11) NOT NULL AUTO_INCREMENT,
-  `lib_status` varchar(100) DEFAULT NULL,
+CREATE TABLE IF NOT EXISTS `status` (
+  `id_status` int(11) NOT NULL,
+  `lib_status` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `color_status` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_active_status` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id_status`)
 ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_unicode_ci AUTO_INCREMENT=1;
 
-
 CREATE TABLE `iconmarker` (
 `id_iconmarker` int(11) NOT NULL AUTO_INCREMENT,
   `name_iconmarker` varchar(100) DEFAULT NULL,
@@ -332,8 +394,9 @@ CREATE TABLE IF NOT EXISTS `comment_history` (
   `url_photo` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `mail_commentaires` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `poi_id_poi` int(11) NOT NULL,
+  `comment_poi_follow` tinyint(1) NOT NULL DEFAULT '0',
   `lastdatemodif_comment` date DEFAULT NULL,
-  `lastmodif_user_poi` int(11) DEFAULT NULL,
+  `lastmodif_user_comment` int(11) DEFAULT NULL,
   `history_id` int(11) NOT NULL,
   `history_date` timestamp NULL DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -371,6 +434,7 @@ CREATE TABLE IF NOT EXISTS `commentaires` (
   `url_photo` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `mail_commentaires` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `poi_id_poi` int(11) NOT NULL,
+  `comment_poi_follow` tinyint(1) NOT NULL DEFAULT '0',
   `lastdatemodif_comment` date DEFAULT NULL,
   `lastmodif_user_comment` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -404,6 +468,46 @@ ALTER TABLE `commentaires`
 ALTER TABLE `commentaires`
   MODIFY `id_commentaires` int(11) NOT NULL AUTO_INCREMENT;
 
+
+CREATE TABLE IF NOT EXISTS `support_poi` (
+  `support_poi_id` int(11) NOT NULL,
+  `poi_poi_id` int(11) NOT NULL,
+  `support_poi_mail` varchar(100) NOT NULL,
+  `support_poi_follow` tinyint(1) NOT NULL,
+  `support_poi_creationdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+--
+-- Index pour les tables exportées
+--
+
+--
+-- Index pour la table `support_poi`
+--
+ALTER TABLE `support_poi`
+  ADD PRIMARY KEY (`support_poi_id`),
+  ADD UNIQUE KEY `poi_poi_id_2` (`poi_poi_id`,`support_poi_mail`),
+  ADD KEY `support_poi_mail` (`support_poi_mail`),
+  ADD KEY `poi_poi_id` (`poi_poi_id`);
+
+--
+-- AUTO_INCREMENT pour les tables exportées
+--
+
+--
+-- AUTO_INCREMENT pour la table `support_poi`
+--
+ALTER TABLE `support_poi`
+  MODIFY `support_poi_id` int(11) NOT NULL AUTO_INCREMENT;
+--
+-- Contraintes pour les tables exportées
+--
+
+--
+-- Contraintes pour la table `support_poi`
+--
+ALTER TABLE `support_poi`
+  ADD CONSTRAINT `support_poi_FK` FOREIGN KEY (`poi_poi_id`) REFERENCES `poi` (`id_poi`);
 --
 -- Data DDL
 --
@@ -473,9 +577,10 @@ INSERT INTO `usertype` (`id_usertype`, `lib_usertype`) VALUES
 (3, 'Pôle technique'),
 (4, 'Responsable pôle modérateur');
 
-INSERT INTO `users` (`id_users`, `lib_users`, `pass_users`, `num_pole`, `usertype_id_usertype`, `language_id_language`, `territoire_id_territoire`, `mail_users`, `nom_users`) VALUES
-(1, 'admin', '$2y$10$LF2rVDO53KwRIzrb8BqoK.dVKa3kY2crgwWVl/NpRFUNtflClGJrG', 12, 1, 1, 0, 'test@velobs.org', 'Administrateur VelObs');
-
+INSERT INTO `users` (`id_users`, `lib_users`, `pass_users`, `usertype_id_usertype`, `language_id_language`, `mail_users`, `nom_users`) VALUES
+(1, 'admin', '$2y$10$LF2rVDO53KwRIzrb8BqoK.dVKa3kY2crgwWVl/NpRFUNtflClGJrG', 1, 1, 'test@velobs.org', 'Administrateur VelObs');
+INSERT INTO `users_link_pole` (`id_user`, `territoire_id_territoire`, `num_pole`) VALUES
+(1, 0, 12);
 
 --
 -- Contenu de la table `priorite`
diff --git a/resources/upgrade/upgradeSQL-V1_6_2.php b/resources/upgrade/upgradeSQL-V1_6_2.php
new file mode 100644
index 00000000..1b9d060f
--- /dev/null
+++ b/resources/upgrade/upgradeSQL-V1_6_2.php
@@ -0,0 +1,119 @@
+<?php
+include_once '../../lib/php/key.php';
+session_start();
+
+if (isset($_SESSION['type']) && $_SESSION['type'] == 1) {
+   
+    $link = mysql_connect(DB_HOST, DB_USER, DB_PASS);
+    mysql_select_db(DB_NAME);
+    mysql_query("SET NAMES utf8mb4");
+    if (DEBUG) {
+        error_log(date("Y-m-d H:i:s") . " Entering upgradeSQL.php \n", 3, LOG_FILE);
+    }
+    echo "Alter users table<br />\n";
+    $sqlUpdate = "ALTER TABLE `users` ADD `is_active_user` boolean DEFAULT TRUE AFTER `nom_users`";
+    $resultUpdate = mysql_query($sqlUpdate);
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+   
+    $sqlUpdate = "CREATE TABLE IF NOT EXISTS `users_link_pole` (
+        `user_link_pole_id` int(11) NOT NULL,
+        `id_user` int(11) NOT NULL,
+        `territoire_id_territoire` int(11) NOT NULL,
+        `num_pole` int(11) NOT NULL
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='link between users and territoires/poles';";
+    
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `users_link_pole`
+        ADD PRIMARY KEY (`user_link_pole_id`),
+        ADD KEY `id_user` (`id_user`),
+        ADD KEY `territoire_id_territoire` (`territoire_id_territoire`),
+        ADD KEY `num_pole` (`num_pole`);";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `users_link_pole`
+        MODIFY `user_link_pole_id` int(11) NOT NULL AUTO_INCREMENT;";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `users_link_pole`
+        ADD CONSTRAINT `poles_FK` FOREIGN KEY (`num_pole`) REFERENCES `pole` (`id_pole`),
+        ADD CONSTRAINT `territoires_FK` FOREIGN KEY (`territoire_id_territoire`) REFERENCES `territoire` (`id_territoire`),
+        ADD CONSTRAINT `users_FK` FOREIGN KEY (`id_user`) REFERENCES `users` (`id_users`);";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    $sql = "SELECT * FROM users";
+    $result = mysql_query($sql);
+    if (! $result) {
+        echo 'Requête invalide : ' . mysql_error();
+    } else {
+        while ($row = mysql_fetch_array($result)) {
+            echo "Inserting " . $row['id_users'] . " in link_users_pole table<br />";
+            $sqlUpdate = "INSERT INTO users_link_pole (id_user, territoire_id_territoire,num_pole) VALUES(" . $row['id_users'] . ", " . $row['territoire_id_territoire'] . ", " . $row['num_pole'] . ")";
+            $resultUpdate = mysql_query($sqlUpdate);
+            echo $sqlUpdate . " : " . $resultUpdate . " - " . mysql_error($link)."<br />";
+            mysql_free_result($resultUpdate);
+        }
+    }
+    mysql_free_result($result);
+    echo "Alter users table, renaming columns<br />\n";
+    $sqlUpdate = "ALTER TABLE users CHANGE COLUMN num_pole num_pole_toDelete int(11);";
+    $resultUpdate = mysql_query($sqlUpdate);
+    echo $sqlUpdate . " : " . $resultUpdate . " - " . mysql_error($link)."<br />";
+    $sqlUpdate = "alter table `users` drop foreign key `users_ibfk_3`";
+    $resultUpdate = mysql_query($sqlUpdate);
+    echo $sqlUpdate . " : " . $resultUpdate . " - " . mysql_error($link)."<br />";
+    $sqlUpdate = "ALTER TABLE users change territoire_id_territoire territoire_id_territoire_toDelete int(11);";
+    $resultUpdate = mysql_query($sqlUpdate);
+    echo $sqlUpdate . " : " . $resultUpdate . " - " . mysql_error($link)."<br />";
+    
+      
+    echo "Create support_poi table<br />\n";
+    $sqlUpdate = "CREATE TABLE IF NOT EXISTS `support_poi` (
+        `support_poi_id` int(11) NOT NULL,
+        `poi_poi_id` int(11) NOT NULL,
+        `support_poi_mail` varchar(100) NOT NULL,
+        `support_poi_follow` tinyint(1) NOT NULL,
+        `support_poi_creationdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;";
+        
+
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `support_poi`
+        ADD PRIMARY KEY (`support_poi_id`),
+        ADD UNIQUE KEY `poi_poi_id_2` (`poi_poi_id`,`support_poi_mail`),
+        ADD KEY `support_poi_mail` (`support_poi_mail`),
+        ADD KEY `poi_poi_id` (`poi_poi_id`);";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `support_poi` MODIFY `support_poi_id` int(11) NOT NULL AUTO_INCREMENT;";
+
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `support_poi` ADD CONSTRAINT `support_poi_FK` FOREIGN KEY (`poi_poi_id`) REFERENCES `poi` (`id_poi`);";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `status` ADD `is_active_status` BOOLEAN NOT NULL DEFAULT TRUE AFTER `color_status`";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `commentaires` ADD `comment_poi_follow` BOOLEAN NOT NULL DEFAULT FALSE AFTER `poi_id_poi`";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    
+    $sqlUpdate = " ALTER TABLE `comment_history` ADD `comment_poi_follow` BOOLEAN NOT NULL DEFAULT FALSE AFTER `poi_id_poi`";
+    $resultUpdate = mysql_query ( $sqlUpdate );
+    echo $sqlUpdate . " : " . $resultUpdate . "<br />";
+    mysql_close($link);
+} else {
+    echo "Vous n'êtes pas autorisé(e) à exécuter ce script. Vous devez être administrateur";
+}
+?>
+