From 4cada49ce18b753cb4cde06aafc087fff27a7f37 Mon Sep 17 00:00:00 2001
From: Kenji ITO <mystralkk@gmail.com>
Date: Fri, 17 Mar 2017 21:28:07 +0900
Subject: [PATCH 1/3] Fixed some errors with PHP-7

---
 admin/icons.php                   |    4 +-
 admin/import_export.php           |    3 +-
 admin/index.php                   |    9 +-
 admin/map_edit.php                |    8 +-
 admin/marker_edit.php             |   16 +-
 admin/overlay_edit.php            |    9 +-
 admin/overlay_group_edit.php      |    7 +-
 functions.inc                     | 3619 +++++++++++++++--------------
 install_defaults.php              |    2 +-
 language/english.php              |    2 +-
 language/french_france_utf-8.php  |    2 +-
 public_html/index.php             |    9 +-
 public_html/js/mapiconmaker.js    |   10 +-
 public_html/js/markerclusterer.js |    2 +-
 public_html/map_detail.php        |   13 +-
 public_html/maps.css              |   99 +-
 public_html/markers.php           |   32 +-
 public_html/users_map.php         |  270 ++-
 18 files changed, 2070 insertions(+), 2046 deletions(-)

diff --git a/admin/icons.php b/admin/icons.php
index 54ba181..36f89fb 100644
--- a/admin/icons.php
+++ b/admin/icons.php
@@ -347,7 +347,7 @@ function MAPS_deleteIconImage ($image)
 				$msg = $LANG_MAPS_1['deletion_fail'];
 			}
 			// delete complete, return to icon list
-			echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/icons.php?msg=$msg");
+			COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/icons.php?msg=$msg");
 
 			exit();
 			break;;
@@ -397,7 +397,7 @@ function MAPS_deleteIconImage ($image)
 				MAPS_saveIconImage($_REQUEST, $_FILES, $id);
 			}
 			// save complete, return to icons list
-			echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/icons.php?msg=" . urlencode($msg));
+			COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/icons.php?msg=" . urlencode($msg));
 			exit();
 			break;
 			
diff --git a/admin/import_export.php b/admin/import_export.php
index 4f9397c..2097fe8 100644
--- a/admin/import_export.php
+++ b/admin/import_export.php
@@ -128,8 +128,7 @@ function MAPS_importCSV ($FILES = '', $map_id, $separator=';', $fields, $valid =
 	if($map_id == '') return MAPS_message('Map ID is missing');
 	
 	if ( !in_array($separator, array(',','tab',';')) ) {
-	    echo COM_refresh($_CONF['site_admin_url'] . '/plugins/maps/import_export.php');
-		exit();
+	    COM_redirect($_CONF['site_admin_url'] . '/plugins/maps/import_export.php');
 	}
 
 	if ($valid == false) {
diff --git a/admin/index.php b/admin/index.php
index ae13062..e43a572 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -193,21 +193,18 @@ function plugin_getListField_maps($fieldname, $fieldvalue, $A, $icon_arr)
 		
 	//Create a new marker for admin
     case 'edit' :
-	    echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php");
-        exit();
+	    COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php");
         break;
 		
 	//Edit marker sumission
     case 'editsubmission' :
         $id = $_REQUEST['id'];
-	    echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php?mode=editsubmission&amp;mkid=$id");
-        exit();
+	    COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php?mode=editsubmission&amp;mkid=$id");
         break;
 
     case 'setgeolocation' :
 	    MAPS_setGeoLocation();
-	    echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=" . urlencode($LANG_MAPS_1['set_geo_location']));
-        exit();
+	    COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=" . urlencode($LANG_MAPS_1['set_geo_location']));
         break;
 
     default :	
diff --git a/admin/map_edit.php b/admin/map_edit.php
index c31bf9c..509a586 100644
--- a/admin/map_edit.php
+++ b/admin/map_edit.php
@@ -457,8 +457,7 @@ function()
         $msg = $LANG_MAPS_1['deletion_fail'];
     }
 		// delete complete, return to map list
-        echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=$msg");
-        exit();
+        COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=$msg");
         break;
 
     case 'save':
@@ -558,8 +557,7 @@ function()
             $msg = $LANG_MAPS_1['save_success'];
         }
         // save complete, return to map list
-        echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/index.php?msg=$msg");
-        exit();
+        COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/index.php?msg=$msg");
         break;
 
     case 'edit':
@@ -575,7 +573,7 @@ function()
 			}
             $display .= getMapForm($A);
         } else {
-            echo COM_refresh($_CONF['site_url']);
+            COM_redirect($_CONF['site_url']);
         }
         break;
 
diff --git a/admin/marker_edit.php b/admin/marker_edit.php
index 06bfd2f..da913c6 100644
--- a/admin/marker_edit.php
+++ b/admin/marker_edit.php
@@ -439,7 +439,7 @@ function getMarkerForm($marker = array()) {
 	
 	$_SCRIPTS->setJavaScriptLibrary('jquery');
 	$_SCRIPTS->setJavaScriptFile('maps_simplecolor', '/' . $_MAPS_CONF['maps_folder'] . '/js/simple-color.js');
-	$js = LB . '<script  type="text/javascript" src= "https://maps.googleapis.com/maps/api/js?key=' . $_MAPS_CONF['google_api_key'] . '&sensor=false"> </script>
+	$js = LB . '
     <script type="text/javascript">
 	jQuery(document).ready(
         function()
@@ -579,9 +579,9 @@ function copyText()
 				$msg = $LANG_MAPS_1['deletion_fail'];
 			}
 			// delete complete, return to map list
-			echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/markers.php?msg=$msg");
+			COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/markers.php?msg=$msg");
 		} else {
-		    echo COM_refresh($_CONF['site_url'] . "/admin/moderation.php");
+		    COM_redirect($_CONF['site_url'] . "/admin/moderation.php");
 		}
         exit();
         break;
@@ -771,8 +771,7 @@ function copyText()
 			DB_delete($_TABLES['maps_submission'], 'mkid', $mkid);
         }
         // save complete, return to markers list
-        echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/markers.php?msg=" . urlencode($msg));
-        exit();
+        COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/markers.php?msg=" . urlencode($msg));
         break;
 
     /* this case is currently not used... future expansion? */
@@ -788,7 +787,7 @@ function copyText()
             $A = DB_fetchArray($res);
             $display .= getMarkerForm($A);
         } else {
-            echo COM_refresh($_CONF['site_url']);
+            COM_redirect($_CONF['site_url']);
         }
         break;
 	
@@ -800,14 +799,13 @@ function copyText()
 			
 			$nRows  = DB_numRows($res);
 		    if ($nRows < 1) {
-			    //echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
-			    //exit ();
+			    //COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
 		    }
 			
             $A = DB_fetchArray($res);
             $display .= getMarkerForm($A);
         } else {
-            echo COM_refresh($_CONF['site_url']);
+            COM_redirect($_CONF['site_url']);
         }
         break;
 
diff --git a/admin/overlay_edit.php b/admin/overlay_edit.php
index 195b4a1..f88c93d 100644
--- a/admin/overlay_edit.php
+++ b/admin/overlay_edit.php
@@ -316,9 +316,7 @@ function MAPS_selectGroupOverlays ($selected)
 			$msg = $LANG_MAPS_1['deletion_fail'];
 		}
 		// delete complete, return to map list
-		echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?msg=$msg");
-
-        exit();
+		COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?msg=$msg");
         break;
 
     case 'save':
@@ -366,8 +364,7 @@ function MAPS_selectGroupOverlays ($selected)
 			MAPS_saveOverlayImage($_REQUEST, $_FILES, $oid);
 		}
         // save complete, return to overlays list
-        echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?msg=" . urlencode($msg));
-        exit();
+        COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?msg=" . urlencode($msg));
         break;
 
     case 'edit':
@@ -378,7 +375,7 @@ function MAPS_selectGroupOverlays ($selected)
             $A = DB_fetchArray($res);
             $display .= MAPS_getOverlayForm($A);
         } else {
-            echo COM_refresh($_CONF['site_url']);
+            COM_redirect($_CONF['site_url']);
         }
         break;
 	
diff --git a/admin/overlay_group_edit.php b/admin/overlay_group_edit.php
index 65f32a3..10f1049 100644
--- a/admin/overlay_group_edit.php
+++ b/admin/overlay_group_edit.php
@@ -131,7 +131,7 @@ function MAPS_getGroupOverlayForm($group = array()) {
 			$msg = $LANG_MAPS_1['deletion_fail'];
 		}
 		// delete complete, return to map list
-		echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?mode=groups&amp;msg=$msg");
+		COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?mode=groups&amp;msg=$msg");
 
         exit();
         break;
@@ -164,8 +164,7 @@ function MAPS_getGroupOverlayForm($group = array()) {
         }
 		
         // save complete, return to overlays list
-        echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?mode=groups&amp;msg=" . urlencode($msg));
-        exit();
+        COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?mode=groups&amp;msg=" . urlencode($msg));
         break;
 
     case 'edit':
@@ -176,7 +175,7 @@ function MAPS_getGroupOverlayForm($group = array()) {
             $A = DB_fetchArray($res);
             $display .= MAPS_getGroupOverlayForm($A);
         } else {
-            echo COM_refresh($_CONF['site_url']);
+            COM_redirect($_CONF['site_url']);
         }
         break;
 	
diff --git a/functions.inc b/functions.inc
index 28990db..88a5670 100644
--- a/functions.inc
+++ b/functions.inc
@@ -33,8 +33,8 @@
 // +---------------------------------------------------------------------------+
 
 /**
-* @package Maps
-*/
+ * @package Maps
+ */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die ('This file can not be used on its own.');
@@ -55,14 +55,14 @@ if (file_exists($langfile)) {
 /**
  * Load our config
  */
-require_once $_CONF['path_system'].'classes/config.class.php';
+require_once $_CONF['path_system'] . 'classes/config.class.php';
 $c = config::get_instance();
 $_MAPS_CONF = $c->get_config('maps');
 
 /*
 * Include specific Maps config file
 */
-require_once $_CONF['path'].'plugins/maps/maps.php';
+require_once $_CONF['path'] . 'plugins/maps/maps.php';
 
 // +---------------------------------------------------------------------------+
 // | Geeklog Plugin API Implementation                                         |
@@ -72,117 +72,114 @@ require_once $_CONF['path'].'plugins/maps/maps.php';
 function plugin_getheadercode_maps()
 {
     global $_MAPS_CONF, $_SCRIPTS, $_PLUGINS;
-	
-    $_SCRIPTS->setJavaScriptLibrary('jquery');   
-    $_SCRIPTS->setJavaScript('<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?key=' . $_MAPS_CONF['google_api_key'] . '&amp;libraries=adsense"></script>', false, false);
-    
+
+    $_SCRIPTS->setJavaScriptLibrary('jquery');
+    $_SCRIPTS->setJavaScript('<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?key=' . $_MAPS_CONF['google_api_key'] . '&amp;libraries=adsense"></script>', false, false);
+
     //Maps for calendar plugin
+    $str = '';
     $url = COM_getCurrentURL();
-    
-    if ( ( stripos($url, 'calendar/index.php') !== FALSE  || stripos($url, 'event.php') !== FALSE && $_GET['eid'] != '') && in_array('calendar', $_PLUGINS) && $_MAPS_CONF['display_events_map'] )
-    {
-       
-        
+
+    if ((stripos($url, 'calendar/index.php') !== false || stripos($url, 'event.php') !== false && $_GET['eid'] != '') && in_array('calendar', $_PLUGINS) && $_MAPS_CONF['display_events_map']) {
+
+
         $js_events_map = MAPS_displayEventsMap(false);
         $_SCRIPTS->setJavaScript($js_events_map, false, false);
-        
-        if (stripos($url, 'calendar/index.php') !== FALSE ) {
-            $str .= '    jQuery(document).ready(function() {' . LB;
+
+        if (stripos($url, 'calendar/index.php') !== false) {
+            $str = '    jQuery(document).ready(function() {' . LB;
             $str .= '        jQuery(\'.cal-header\').after(\'<div id="map_contener_mevents"><div id="map_canvas_mevents"></div></div>\');' . LB;
             $str .= '    });' . LB;
         }
 
-        if (stripos($url, 'event.php') !== FALSE && $_GET['eid'] != '') {
+        if (stripos($url, 'event.php') !== false && $_GET['eid'] != '') {
             // get eid
-            $eid = addslashes ($_GET['eid']);
+            $eid = addslashes($_GET['eid']);
             $str .= '    jQuery(document).ready(function() {' . LB;
             $js_one_event = MAPS_displayEventsMap(false, $eid);
             $_SCRIPTS->setJavaScript($js_one_event, false, false);
 
-            if ($eid != '')  $str .= '        jQuery(\'.location\').append(\'<div style="margin:10px 0px;" id="map_contener_mevents"><div id="map_canvas_mevents"></div></div>\');' . LB;
+            if ($eid != '') $str .= '        jQuery(\'.location\').append(\'<div style="margin:10px 0;" id="map_contener_mevents"><div id="map_canvas_mevents"></div></div>\');' . LB;
             $str .= '    });' . LB;
         }
     }
 
-	$_SCRIPTS->setJavaScript($str, true, true);
+    $_SCRIPTS->setJavaScript($str, true, true);
 
     return;
 }
 
-function MAPS_getheadercode () {
-    
+function MAPS_getheadercode()
+{
+
     global $_CONF, $_MAPS_CONF, $_SCRIPTS;
-    
-	$_SCRIPTS->setCSSFile('maps_css', '/' . $_MAPS_CONF['maps_folder'] . '/maps.css');
-	$_SCRIPTS->setCSSFile('datepicker_ui', '/layout/' . $_CONF['theme'] . '/jquery_ui/jquery.ui.datepicker.css');
+
+    $_SCRIPTS->setCSSFile('maps_css', '/' . $_MAPS_CONF['maps_folder'] . '/maps.css');
+    $_SCRIPTS->setCSSFile('datepicker_ui', '/layout/' . $_CONF['theme'] . '/jquery_ui/jquery.ui.datepicker.css');
     $_SCRIPTS->setJavaScriptFile('maps_iconmaker', '/' . $_MAPS_CONF['maps_folder'] . '/js/mapiconmaker.js', false);
 
 }
 
 /**
-* Returns doc uri for Geeklog-1.6.0 or later
-*/
-function plugin_getdocumentationurl_maps() {
-    
+ * Returns doc uri for Geeklog-1.6.0 or later
+ */
+function plugin_getdocumentationurl_maps()
+{
+
     return 'http://geeklog.fr/downloads/index.php/maps';
 }
 
 /**
-* Returns the item(s) for this plugin that should appear on the main menu
-*
-* NOTE: this MUST return the url/value pairs in the following format
-* $<arrayname>[<label>] = <url>
-*
-* @return   mixed   menu entry, or boolean false if disabled / hidden
-*
-*/
+ * Returns the item(s) for this plugin that should appear on the main menu
+ * NOTE: this MUST return the url/value pairs in the following format
+ * $<arrayname>[<label>] = <url>
+ *
+ * @return   mixed   menu entry, or boolean false if disabled / hidden
+ */
 function plugin_getmenuitems_maps()
 {
-    global $_CONF, $_MAPS_CONF, $LANG_MAPS_1;
-    
-    $menuitems ='';
-    
+    global $_MAPS_CONF, $LANG_MAPS_1;
+
+    $menuitems = array();
+
     if ($_MAPS_CONF['hide_maps_menu'] == 0) {
         $url = $_MAPS_CONF['site_url'] . '/index.php';
         $menuitems[$LANG_MAPS_1['plugin_name']] = $url;
     }
+
     return $menuitems;
 }
 
 /**
-* Geeklog is asking us to provide any items that show up in the type
-* drop-down on search.php.  Let's users search for links.
-*
-* @return   array   (plugin name/entry title) pair for the dropdown
-*
-*/
+ * Geeklog is asking us to provide any items that show up in the type
+ * drop-down on search.php.  Let's users search for links.
+ *
+ * @return   array   (plugin name/entry title) pair for the dropdown
+ */
 
 function plugin_searchtypes_maps()
 {
     global $LANG_MAPS_1;
 
-    $tmp['maps'] = $LANG_MAPS_1['plugin_name'];
-
-    return $tmp;
+    return array('maps' => $LANG_MAPS_1['plugin_name']);
 }
 
 
 /**
-* This searches for entries matching the user query and returns an array for the
-* header and table rows back to search.php where it will be formated and printed
-*
-* @param    string  $query      Keywords user is looking for
-* @param    date    $datestart  Start date to get results for
-* @param    date    $dateend    End date to get results for
-* @param    string  $topic      The topic they were searching in
-* @param    string  $type       Type of items they are searching, or 'all' (deprecated)
-* @param    int     $author     Get all results by this author
-* @param    string  $keyType    search key type: 'all', 'phrase', 'any'
-* @param    int     $page       page number of current search (deprecated)
-* @param    int     $perpage    number of results per page (deprecated)
-* @return   object              search result object
-*
-*/
+ * This searches for entries matching the user query and returns an array for the
+ * header and table rows back to search.php where it will be formated and printed
+ *
+ * @param    string $query     Keywords user is looking for
+ * @param    date   $datestart Start date to get results for
+ * @param    date   $dateend   End date to get results for
+ * @param    string $topic     The topic they were searching in
+ * @param    string $type      Type of items they are searching, or 'all' (deprecated)
+ * @param    int    $author    Get all results by this author
+ * @param    string $keyType   search key type: 'all', 'phrase', 'any'
+ * @param    int    $page      page number of current search (deprecated)
+ * @param    int    $perpage   number of results per page (deprecated)
+ * @return   object              search result object
+ */
 
 function plugin_dopluginsearch_maps($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage)
 {
@@ -201,8 +198,8 @@ function plugin_dopluginsearch_maps($query, $datestart, $dateend, $topic, $type,
         if (!empty($delim)) {
             $DS = explode($delim, $datestart);
             $DE = explode($delim, $dateend);
-            $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
-            $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
+            $startdate = mktime(0, 0, 0, $DS[1], $DS[2], $DS[0]);
+            $enddate = mktime(23, 59, 59, $DE[1], $DE[2], $DE[0]);
             $sql .= "AND ( UNIX_TIMESTAMP(created) BETWEEN '$startdate' AND '$enddate' ) ";
         }
     }
@@ -212,7 +209,7 @@ function plugin_dopluginsearch_maps($query, $datestart, $dateend, $topic, $type,
 
     $search = new SearchCriteria('maps', $LANG_MAPS_1['plugin_name']);
     $columns = array('name', 'description');
-    list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
+    list($sql, $ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
     $search->setSQL($sql);
     $search->setFTSQL($ftsql);
     $search->setRank(3);
@@ -222,200 +219,206 @@ function plugin_dopluginsearch_maps($query, $datestart, $dateend, $topic, $type,
 
 
 /**
-* Implements autotags
-*
-* @param    string  $op         operation to perform
-* @param    string  $content    item (e.g. story text), including the autotag
-* @param    array   $autotag    parameters used in the autotag
-* @param    mixed               tag names (for $op='tagname') or formatted content
-*
-*/
+ * Implements autotags
+ *
+ * @param    string $op                 operation to perform
+ * @param    string $content            item (e.g. story text), including the autotag
+ * @param    array  $autotag            parameters used in the autotag
+ * @param           mixed               tag names (for $op='tagname') or formatted content
+ */
 
 function plugin_autotags_maps($op, $content = '', $autotag = '')
 {
     global $_CONF, $_MAPS_CONF, $_TABLES, $LANG_MAPS_1, $_SCRIPTS;
 
+    $skip = 0;
+    $width = '';
+    $height = '';
+    $zoom = '';
+    $address = '';
+
     switch ($op) {
 
-    case 'tagname':
-        $retval = array ('geo', 'maps', 'marker');
-        break;
-		
-	case 'description' :
-        $retval = array (
-            'maps' => $LANG_MAPS_1['autotag_desc_maps'],
-			'geo' => $LANG_MAPS_1['autotag_desc_geo'],
-			'marker' => $LANG_MAPS_1['autotag_desc_marker']
+        case 'tagname':
+            $retval = array('geo', 'maps', 'marker');
+            break;
+
+        case 'description' :
+            $retval = array(
+                'maps'   => $LANG_MAPS_1['autotag_desc_maps'],
+                'geo'    => $LANG_MAPS_1['autotag_desc_geo'],
+                'marker' => $LANG_MAPS_1['autotag_desc_marker'],
             );
-		break;
-		
-    case 'parse':
-        $HTML = '';
-        MAPS_getheadercode();
-        switch( $autotag['tag'] ) {
-            case 'geo' :
-                $option = COM_applyFilter($autotag['parm1']);
-                switch ($option) {
-					case 'map':
-						if ($_MAPS_CONF['google_api_key'] == '' ||
-							$_MAPS_CONF['url_geocode'] == '') {
-							break;
-						}
-						
-						$px = explode (' ', trim ($autotag['parm2']));
-						if (is_array ($px)) {
-							foreach ($px as $part) {
-								if (substr ($part, 0, 5) == 'zoom:') {
-									$a = explode (':', $part);
-									$zoom = $a[1];
-									$skip++;
-								} else if (substr ($part, 0, 6) == 'width:') {
-									$a = explode (':', $part);
-									$width = $a[1];
-									$skip++;
-								} else if (substr ($part, 0, 7) == 'height:') {
-									$a = explode (':', $part);
-									$height = $a[1];
-									$skip++;
-								} else {
-									break;
-								}
-							}
-							if ($skip != 0) {
-								if (count ($px) > $skip) {
-									for ($i = 0; $i < $skip; $i++) {
-										array_shift ($px);
-									}
-									$address = trim (implode (' ', $px));
-								} else {
-									$address = '';
-								}
-							} else {
-								$address = trim ($autotag['parm2']);
-							}
-						}
-						
-						if (! empty($address)) {
-							//update mysql 5.1
-							MAPS_getDBCoords($gid, $address, $lat, $lng) ;
-							if ($lat == 0 || $lng == 0)
-								break;
-							$T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-							$T->set_file('page', 'geo.thtml');
-							//randomise to avoid duplicate map number
-							$rid = mt_rand (1000,9999);
-							$T->set_var('gid', $rid);
-							$T->set_var('address', addslashes($address));
-							$lat = str_replace(",",".",$lat);
-							$lng = str_replace(",",".",$lng);
-							$T->set_var('lat', $lat);
-							$T->set_var('lng', $lng);
-
-							$T->set_var('map_type', $_MAPS_CONF['map_type_geotag']);
-							if ($width != '') {
-								$T->set_var('map_width_geotag', $width);
-							} else {
-							$T->set_var('map_width_geotag', $_MAPS_CONF['map_width_geotag']);
-							}
-							if ($height != '') {
-								$T->set_var('map_height_geotag', $height);
-							} else {
-							$T->set_var('map_height_geotag', $_MAPS_CONF['map_height_geotag']);
-							}
-							if ($zoom != '') {
-								$T->set_var('zoom', $zoom);
-							} else {
-								$T->set_var('zoom', $_MAPS_CONF['map_zoom_geotag']);
-							}
-							
-							if ( $_MAPS_CONF['show_directions_geo'] == 0) {
-							$T->set_var('show_directions_geo', 'none');
-							} else {
-							$T->set_var('show_directions_geo', 'block');
-							}
-							$T->set_var('error_address_empty', $LANG_MAPS_1['error_address_empty']);
-							$T->set_var('error_invalid_address', $LANG_MAPS_1['error_invalid_address']);
-							$T->set_var('error_google_error', $LANG_MAPS_1['error_google_error']);
-							$T->set_var('error_no_map_info', $LANG_MAPS_1['error_no_map_info']);
-							
-							//Ads
-							
-						    $ads = MAPS_getAds ($rid);
-						
-							$T->set_var('ads', $ads);
-							
-							$T->set_var('need_directions', $LANG_MAPS_1['need_directions']);
-							$T->set_var('get_directions', $LANG_MAPS_1['get_directions']);
-							$T->set_var('value', htmlentities($LANG_MAPS_1['value_directions'], ENT_QUOTES));
-						
-							$T->parse('output','page');
-							$HTML = $T->finish($T->get_var('output'));
-							}
-						break;
+            break;
+
+        case 'parse':
+            $HTML = '';
+            MAPS_getheadercode();
+            switch ($autotag['tag']) {
+                case 'geo' :
+                    $option = COM_applyFilter($autotag['parm1']);
+                    switch ($option) {
+                        case 'map':
+                            if ($_MAPS_CONF['google_api_key'] == '' ||
+                                $_MAPS_CONF['url_geocode'] == ''
+                            ) {
+                                break;
+                            }
+
+                            $px = explode(' ', trim($autotag['parm2']));
+                            if (is_array($px)) {
+                                foreach ($px as $part) {
+                                    if (substr($part, 0, 5) == 'zoom:') {
+                                        $a = explode(':', $part);
+                                        $zoom = $a[1];
+                                        $skip++;
+                                    } else if (substr($part, 0, 6) == 'width:') {
+                                        $a = explode(':', $part);
+                                        $width = $a[1];
+                                        $skip++;
+                                    } else if (substr($part, 0, 7) == 'height:') {
+                                        $a = explode(':', $part);
+                                        $height = $a[1];
+                                        $skip++;
+                                    } else {
+                                        break;
+                                    }
+                                }
+                                if ($skip != 0) {
+                                    if (count($px) > $skip) {
+                                        for ($i = 0; $i < $skip; $i++) {
+                                            array_shift($px);
+                                        }
+                                        $address = trim(implode(' ', $px));
+                                    } else {
+                                        $address = '';
+                                    }
+                                } else {
+                                    $address = trim($autotag['parm2']);
+                                }
+                            }
+
+                            if (!empty($address)) {
+                                //update mysql 5.1
+                                MAPS_getDBCoords($gid, $address, $lat, $lng);
+                                if ($lat == 0 || $lng == 0)
+                                    break;
+                                $T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
+                                $T->set_file('page', 'geo.thtml');
+                                //randomise to avoid duplicate map number
+                                $rid = mt_rand(1000, 9999);
+                                $T->set_var('gid', $rid);
+                                $T->set_var('address', addslashes($address));
+                                $lat = str_replace(",", ".", $lat);
+                                $lng = str_replace(",", ".", $lng);
+                                $T->set_var('lat', $lat);
+                                $T->set_var('lng', $lng);
+
+                                $T->set_var('map_type', $_MAPS_CONF['map_type_geotag']);
+                                if ($width != '') {
+                                    $T->set_var('map_width_geotag', $width);
+                                } else {
+                                    $T->set_var('map_width_geotag', $_MAPS_CONF['map_width_geotag']);
+                                }
+                                if ($height != '') {
+                                    $T->set_var('map_height_geotag', $height);
+                                } else {
+                                    $T->set_var('map_height_geotag', $_MAPS_CONF['map_height_geotag']);
+                                }
+                                if ($zoom != '') {
+                                    $T->set_var('zoom', $zoom);
+                                } else {
+                                    $T->set_var('zoom', $_MAPS_CONF['map_zoom_geotag']);
+                                }
+
+                                if ($_MAPS_CONF['show_directions_geo'] == 0) {
+                                    $T->set_var('show_directions_geo', 'none');
+                                } else {
+                                    $T->set_var('show_directions_geo', 'block');
+                                }
+                                $T->set_var('error_address_empty', $LANG_MAPS_1['error_address_empty']);
+                                $T->set_var('error_invalid_address', $LANG_MAPS_1['error_invalid_address']);
+                                $T->set_var('error_google_error', $LANG_MAPS_1['error_google_error']);
+                                $T->set_var('error_no_map_info', $LANG_MAPS_1['error_no_map_info']);
+
+                                //Ads
+
+                                $ads = MAPS_getAds($rid);
+
+                                $T->set_var('ads', $ads);
+
+                                $T->set_var('need_directions', $LANG_MAPS_1['need_directions']);
+                                $T->set_var('get_directions', $LANG_MAPS_1['get_directions']);
+                                $T->set_var('value', htmlentities($LANG_MAPS_1['value_directions'], ENT_QUOTES));
+
+                                $T->parse('output', 'page');
+                                $HTML = $T->finish($T->get_var('output'));
+                            }
+                            break;
                     } // switch($option)
-                break;
-				
-            case 'maps' :
-                $mid = COM_applyFilter($autotag['parm1']);
-				$px = explode (' ', trim ($autotag['parm2']));
-					if (is_array ($px)) {
-						foreach ($px as $part) {
-							if (substr ($part, 0, 5) == 'zoom:') {
-								$a = explode (':', $part);
-								$zoom = $a[1];
-								$skip++;
-							} else {
-								break;
-							}
-						}
-						if ($skip != 0) {
-							if (count ($px) > $skip) {
-								for ($i = 0; $i < $skip; $i++) {
-									array_shift ($px);
-								}
-								$address = trim (implode (' ', $px));
-							} else {
-								$address = '';
-							}
-						} else {
-							$address = trim ($autotag['parm2']);
-						}
-					}
-                if ( !empty($mid) && $mid > 0 ) {
-                    $HTML = MAPS_getMap($mid, $zoom, $address);
-                } else if ($mid == 0) {
-                    $HTML = MAPS_getGlobalMap($zoom, $address);
-                }
-                break;
-                
-            case 'marker' :
-                
-                $mkid = COM_applyFilter($autotag['parm1']);
-                if (! empty($mkid)) {
-                    $sql = "SELECT * FROM {$_TABLES['maps_markers']} WHERE mkid = {$mkid} LIMIT 1";
-                    $res = DB_query($sql, 0);
-                    $A = DB_fetchArray($res);
-                    if (!SEC_hasAccess2($A)) {
-                        $HTML ='';
-                    } else if($A['mid']!=''){
-                        // marker exists and access is ok
-						$HTML = MAPS_getMarkerDetail($A['mid'], $mkid, 1);
-                    }  else {
-						$HTML ='';
-					}
-                } else {
-                    $HTML ='';
-                }
-                break;
-                } //switch autotag
-            
+                    break;
+
+                case 'maps' :
+                    $mid = COM_applyFilter($autotag['parm1']);
+                    $px = explode(' ', trim($autotag['parm2']));
+                    if (is_array($px)) {
+                        foreach ($px as $part) {
+                            if (substr($part, 0, 5) == 'zoom:') {
+                                $a = explode(':', $part);
+                                $zoom = $a[1];
+                                $skip++;
+                            } else {
+                                break;
+                            }
+                        }
+                        if ($skip != 0) {
+                            if (count($px) > $skip) {
+                                for ($i = 0; $i < $skip; $i++) {
+                                    array_shift($px);
+                                }
+                                $address = trim(implode(' ', $px));
+                            } else {
+                                $address = '';
+                            }
+                        } else {
+                            $address = trim($autotag['parm2']);
+                        }
+                    }
+                    if (!empty($mid) && $mid > 0) {
+                        $HTML = MAPS_getMap($mid, $zoom, $address);
+                    } else if ($mid == 0) {
+                        $HTML = MAPS_getGlobalMap($zoom, $address);
+                    }
+                    break;
+
+                case 'marker' :
+
+                    $mkid = COM_applyFilter($autotag['parm1']);
+                    if (!empty($mkid)) {
+                        $sql = "SELECT * FROM {$_TABLES['maps_markers']} WHERE mkid = {$mkid} LIMIT 1";
+                        $res = DB_query($sql, 0);
+                        $A = DB_fetchArray($res);
+                        if (!SEC_hasAccess2($A)) {
+                            $HTML = '';
+                        } else if ($A['mid'] != '') {
+                            // marker exists and access is ok
+                            $HTML = MAPS_getMarkerDetail($A['mid'], $mkid, 1);
+                        } else {
+                            $HTML = '';
+                        }
+                    } else {
+                        $HTML = '';
+                    }
+                    break;
+            } //switch autotag
+
             //Replace the autotag with the map
             $retval = str_replace($autotag['tagstr'], $HTML, $content);
             break;
 
-    default:
-        $retval = $content;
-        break;
+        default:
+            $retval = $content;
+            break;
 
     }   // switch ($op)
 
@@ -423,96 +426,102 @@ function plugin_autotags_maps($op, $content = '', $autotag = '')
 }
 
 //Return code for ads from google adsense
-function MAPS_getAds ($mid) {
-    
-	global $_MAPS_CONF;
-	
-	if ($_MAPS_CONF['AdsOnMap'] == 1) {
-		
-		$ads = "  var adUnitDiv_$mid = document.createElement('div');" . LB;
-		$ads .= "  var adUnitOptions_$mid = {" . LB;
-		$ads .= "	format: google.maps.adsense.AdFormat.HALF_BANNER," . LB;
-		$ads .= "	position: google.maps.ControlPosition.RIGHT_BOTTOM," . LB;
-		$ads .= "	backgroundColor: '#ffffff'," . LB;
-		$ads .= "	borderColor: '#eeeeee'," . LB;
-		$ads .= "	titleColor: '#cccccc'," . LB;
-		$ads .= "	textColor: '#666666'," . LB;
-		$ads .= "	urlColor: '#009900'," . LB;
-		$ads .= "	map: map{$mid}," . LB;
-		$ads .= "	visible: true," . LB;
-		$ads .= "	publisherId: '{$_MAPS_CONF['publisher_id']}'," . LB;
-		
-		if ($_MAPS_CONF['channel_id'] != '') $ads .= "	channelNumber: '{$_MAPS_CONF['channel_id']}'" . LB;
-		
-		$ads .= "  }" . LB;
-		$ads .= "  adUnit_$mid = new google.maps.adsense.AdUnit(adUnitDiv_$mid, adUnitOptions_$mid);" . LB;
+function MAPS_getAds($mid)
+{
+    global $_MAPS_CONF;
+
+    $ads = '';
+
+    if ($_MAPS_CONF['AdsOnMap'] == 1) {
+        $ads = "  var adUnitDiv_$mid = document.createElement('div');" . LB;
+        $ads .= "  var adUnitOptions_$mid = {" . LB;
+        $ads .= "	format: google.maps.adsense.AdFormat.HALF_BANNER," . LB;
+        $ads .= "	position: google.maps.ControlPosition.RIGHT_BOTTOM," . LB;
+        $ads .= "	backgroundColor: '#ffffff'," . LB;
+        $ads .= "	borderColor: '#eeeeee'," . LB;
+        $ads .= "	titleColor: '#cccccc'," . LB;
+        $ads .= "	textColor: '#666666'," . LB;
+        $ads .= "	urlColor: '#009900'," . LB;
+        $ads .= "	map: map{$mid}," . LB;
+        $ads .= "	visible: true," . LB;
+        $ads .= "	publisherId: '{$_MAPS_CONF['publisher_id']}'," . LB;
+
+        if ($_MAPS_CONF['channel_id'] != '') $ads .= "	channelNumber: '{$_MAPS_CONF['channel_id']}'" . LB;
+
+        $ads .= "  }" . LB;
+        $ads .= "  adUnit_$mid = new google.maps.adsense.AdUnit(adUnitDiv_$mid, adUnitOptions_$mid);" . LB;
+
+    }
 
-	}
-	return $ads;
+    return $ads;
 }
- 
+
 /**
-* Add a block on user profile to display a map if user location is set
-*
-*/
-function plugin_profileblocksdisplay_maps ($uid)
+ * Add a block on user profile to display a map if user location is set
+
+ */
+function plugin_profileblocksdisplay_maps($uid)
 {
     global $_CONF, $_MAPS_CONF, $_TABLES, $LANG_MAPS_1, $_SCRIPTS;
-    
+
     $retval = '';
     $gid = '';
-    
+    $ads = '';
+    $lat = 0.9;
+    $lng = 0.0;
+
     $_SCRIPTS->setJavaScriptLibrary('jquery');
-    $_SCRIPTS->setJavaScript('<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?key=' . $_MAPS_CONF['google_api_key'] . '&amp;libraries=adsense"></script>');
-    
+//    $_SCRIPTS->setJavaScript('<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?key=' . $_MAPS_CONF['google_api_key'] . '&amp;libraries=adsense"></script>');
+
     if ($_MAPS_CONF['display_geo_profile'] == 0 || $_MAPS_CONF['google_api_key'] == '' ||
-    $_MAPS_CONF['url_geocode'] == '') {
+        $_MAPS_CONF['url_geocode'] == ''
+    ) {
         return $retval;
     } else {
-    	//check if address is in the db
-		$sql = "SELECT location FROM {$_TABLES['userinfo']} WHERE uid = '$uid'";
-		list($address) = DB_fetchArray(DB_query($sql));
-
-		if (! empty($address)) {
-			//upaded for mysql 5.1
-			MAPS_getDBCoords($gid, $address, $lat, $lng) ;
-			$address = addslashes($address);
-			$T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-			$T->set_file('page', 'geo_profile.thtml');
-			$T->set_var('gid', $gid);
-			$T->set_var('address', addslashes($address));
-            
-			$lat = str_replace(",",".",$lat);
-			$lng = str_replace(",",".",$lng);
-			$T->set_var('lat', $lat);
-			$T->set_var('lng', $lng);
-			
-			$T->set_var('map_type', $_MAPS_CONF['global_type']);
-			$T->set_var('key', $_MAPS_CONF['google_api_key']);
+        //check if address is in the db
+        $sql = "SELECT location FROM {$_TABLES['userinfo']} WHERE uid = '$uid'";
+        list($address) = DB_fetchArray(DB_query($sql));
+
+        if (!empty($address)) {
+            //upaded for mysql 5.1
+            MAPS_getDBCoords($gid, $address, $lat, $lng);
+            $address = addslashes($address);
+            $T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
+            $T->set_file('page', 'geo_profile.thtml');
+            $T->set_var('gid', $gid);
+            $T->set_var('address', addslashes($address));
+
+            $lat = str_replace(",", ".", $lat);
+            $lng = str_replace(",", ".", $lng);
+            $T->set_var('lat', $lat);
+            $T->set_var('lng', $lng);
 
-			$T->set_var('map_width_geotag', $_MAPS_CONF['map_width_profile']);
-			$T->set_var('map_height_geotag', $_MAPS_CONF['map_height_profile']);
-			$T->set_var('zoom', $_MAPS_CONF['zoom_profile']);
-			
-			if ( $_MAPS_CONF['show_directions_profile'] == 0) {
-				$T->set_var('show_directions_geo', 'none');
-			} else {
-			$T->set_var('show_directions_geo', 'block');
-			}
-			
-			//Ads			
-			$ads = MAPS_getAds ($gid);
-			
-			$T->set_var('need_directions', $LANG_MAPS_1['need_directions']);
-			$T->set_var('get_directions', $LANG_MAPS_1['get_directions']);
-			$T->parse('output','page');
-            
-			$retval .= COM_startBlock( $LANG_MAPS_1['profile_title'] );
-			$retval .= $T->finish($T->get_var('output'));
+            $T->set_var('map_type', $_MAPS_CONF['global_type']);
+            $T->set_var('key', $_MAPS_CONF['google_api_key']);
+
+            $T->set_var('map_width_geotag', $_MAPS_CONF['map_width_profile']);
+            $T->set_var('map_height_geotag', $_MAPS_CONF['map_height_profile']);
+            $T->set_var('zoom', $_MAPS_CONF['zoom_profile']);
+
+            if ($_MAPS_CONF['show_directions_profile'] == 0) {
+                $T->set_var('show_directions_geo', 'none');
+            } else {
+                $T->set_var('show_directions_geo', 'block');
+            }
+
+            //Ads
+            $ads = MAPS_getAds($gid);
+
+            $T->set_var('need_directions', $LANG_MAPS_1['need_directions']);
+            $T->set_var('get_directions', $LANG_MAPS_1['get_directions']);
+            $T->parse('output', 'page');
+
+            $retval .= COM_startBlock($LANG_MAPS_1['profile_title']);
+            $retval .= $T->finish($T->get_var('output'));
             $retval .= COM_endBlock();
-		}
+        }
     }
-    
+
     $js = "
             
         jQuery(document).ready(function () {
@@ -616,18 +625,17 @@ function plugin_profileblocksdisplay_maps ($uid)
                 setTimeout('window.scrollBy(0,map_height{$gid})', 500);
             }
         });";
-        
-     $_SCRIPTS->setJavaScript($js , true);
- 
+
+    $_SCRIPTS->setJavaScript($js, true);
+
     return $retval;
 }
 
 /**
-* Return plugin entry for "Command and Control" (moderation.php)
-*
-* @return  array  Array containing (plugin name, admin url, url of plugin icon)
-*
-*/
+ * Return plugin entry for "Command and Control" (moderation.php)
+ *
+ * @return  array  Array containing (plugin name, admin url, url of plugin icon)
+ */
 function plugin_cclabel_maps()
 {
     global $_CONF, $LANG_MAPS_1;
@@ -643,10 +651,10 @@ function plugin_cclabel_maps()
 }
 
 /**
-* Return plugin entry for the Admins Only block
-*
-* @return array Array containing (plugin name, plugin admin url, # of plugin items or '')
-*/
+ * Return plugin entry for the Admins Only block
+ *
+ * @return array Array containing (plugin name, plugin admin url, # of plugin items or '')
+ */
 function plugin_getadminoption_maps()
 {
     global $_CONF, $LANG_MAPS_1, $_TABLES;
@@ -658,15 +666,14 @@ function plugin_getadminoption_maps()
 }
 
 /**
-* Returns the URL of the plugin's icon
-*
-* @return   string      URL of the icon
-*
-*/
+ * Returns the URL of the plugin's icon
+ *
+ * @return   string      URL of the icon
+ */
 function plugin_geticon_maps()
 {
     global $_CONF;
-    
+
     return $_CONF['site_admin_url'] . '/plugins/maps/images/maps.png';
 }
 
@@ -687,17 +694,16 @@ function plugin_chkVersion_maps()
 }
 
 /**
-* Update the plugin
-*
-* @return   int     Number of message to display or true for success
-*
-*/
+ * Update the plugin
+ *
+ * @return   int     Number of message to display or true for success
+ */
 function plugin_upgrade_maps()
 {
-    global $_CONF, $_TABLES, $_MAPS_CONF;
+    global $_CONF, $_TABLES, $_MAPS_CONF, $_MAPS_DEFAULT;
 
     $installed_version = DB_getItem($_TABLES['plugins'], 'pi_version',
-                                    "pi_name = 'maps'");
+        "pi_name = 'maps'");
     $code_version = plugin_chkVersion_maps();
     if ($installed_version == $code_version) {
         // nothing to do
@@ -708,39 +714,39 @@ function plugin_upgrade_maps()
     require_once $_CONF['path'] . 'plugins/maps/install_defaults.php';
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
-    if (! plugin_compatible_with_this_version_maps('maps')) {
+    if (!plugin_compatible_with_this_version_maps('maps')) {
         return 3002;
     }
 
     // other update code goes here
-    switch( $installed_version ) {
+    switch ($installed_version) {
         case "1.0" :
             DB_query("INSERT INTO {$_TABLES['vars']} (`name`, `value`) VALUES ('globalMapHits', '0')");
-        
+
         case "1.0.1" :
             DB_query("ALTER TABLE {$_TABLES['maps_markers']}
             ADD cat INT(6) default '0' after name
             ");
-            
+
             DB_query("CREATE TABLE {$_TABLES['maps_markers_cat']} (
             cid INT auto_increment,
             category VARCHAR(32) NOT NULL,
             PRIMARY KEY (cid)
             ) ENGINE=MyISAM
-            ",1);
-            
+            ", 1);
+
             DB_query("CREATE TABLE {$_TABLES['maps_markers_values']} (
             marker BIGINT NOT NULL,
             field INT NOT NULL,
             value TEXT
             ) ENGINE=MyISAM
-            ",1);
-        
+            ", 1);
+
         case "1.0.2" :
             DB_query("ALTER TABLE {$_TABLES['maps_submission']}
             ADD cat INT(6) default '0' after name
             ");
-            
+
             DB_query("CREATE TABLE {$_TABLES['maps_markers_fields']} (
             fid INT auto_increment,
             cat_id INT NOT NULL,
@@ -755,31 +761,31 @@ function plugin_upgrade_maps()
             perm_anon tinyint(1) unsigned NOT NULL default '2',
             PRIMARY KEY (fid)
             ) ENGINE=MyISAM
-            ",1);
-        
+            ", 1);
+
         case "1.0.3" :
-		case "1.0.4" :
+        case "1.0.4" :
             $c = config::get_instance();
-            $c->add('infos_label', $_MAPS_DEFAULT['infos_label'], 
+            $c->add('infos_label', $_MAPS_DEFAULT['infos_label'],
                 'text', 1, 40, 0, 400, true, $_MAPS_DEFAULT['pi_name']);
-		case "1.0.5" :
+        case "1.0.5" :
         case "1.0.6" :
-        case "1.0.7" :		
-		case "1.0.8" :          
-		case "1.0.9" :
-		    $c = config::get_instance();
-			$c->add('zoom_profile', $_MAPS_DEFAULT['zoom_profile'], 
+        case "1.0.7" :
+        case "1.0.8" :
+        case "1.0.9" :
+            $c = config::get_instance();
+            $c->add('zoom_profile', $_MAPS_DEFAULT['zoom_profile'],
                 'text', 1, 10, 0, 55, true, $_MAPS_DEFAULT['pi_name']);
-		    DB_query("ALTER TABLE {$_TABLES['maps_markers']}
+            DB_query("ALTER TABLE {$_TABLES['maps_markers']}
 			ADD mk_default tinyint(1) unsigned NOT NULL default '1' AFTER mid,
             ADD mk_pcolor VARCHAR(7) NOT NULL default '#666666' AFTER mk_default,
             ADD mk_scolor VARCHAR(7) NOT NULL default '#666666' AFTER mk_pcolor,
             ADD mk_label char(1) AFTER mk_scolor,
             ADD mk_label_color tinyint(1) unsigned NOT NULL default '0' AFTER mk_label
             ");
-			
-		case "1.1" :
-			DB_query("CREATE TABLE {$_TABLES['maps_overlays']} (
+
+        case "1.1" :
+            DB_query("CREATE TABLE {$_TABLES['maps_overlays']} (
 			  oid INT NOT NULL AUTO_INCREMENT,
 			  o_mapid INT NOT NULL,
 			  o_image VARCHAR(255),
@@ -792,20 +798,20 @@ function plugin_upgrade_maps()
 			) ENGINE=MyISAM
 			");
 
-			DB_query("CREATE TABLE {$_TABLES['maps_map_overlay']} (
+            DB_query("CREATE TABLE {$_TABLES['maps_map_overlay']} (
 				mo_id int(11) NOT NULL auto_increment,
 				mo_mid int(11),
 				mo_oid int(11),
 				PRIMARY KEY (mo_id)
 			) ENGINE=MyISAM
 			");
-		
-		case "1.1.1" :
-		    DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
+
+        case "1.1.1" :
+            DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
 			ADD o_name VARCHAR(255)
 			");
-		case "1.1.2" :
-		    DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
+        case "1.1.2" :
+            DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
 			DROP o_sw_latlng,
 			DROP o_ne_latlng,
 			ADD o_sw_lat FLOAT( 10, 6 ) NOT NULL,
@@ -813,202 +819,203 @@ function plugin_upgrade_maps()
 			ADD o_ne_lat FLOAT( 10, 6 ) NOT NULL,
 			ADD o_ne_lng FLOAT( 10, 6 ) NOT NULL
 			");
-		case "1.1.3" :
-		    DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
+        case "1.1.3" :
+            DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
 			DROP o_mapid
 			");
-		case "1.1.4" :
-		    DB_query("CREATE TABLE {$_TABLES['maps_map_icons']} (
+        case "1.1.4" :
+            DB_query("CREATE TABLE {$_TABLES['maps_map_icons']} (
 			  icon_id SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT,
 			  icon_name VARCHAR(255),
 			  icon_image VARCHAR(255),
 			  PRIMARY KEY (icon_id)
 			) ENGINE=MyISAM
 			");
-			
-		case "1.1.5" :
-		    DB_query("ALTER TABLE {$_TABLES['maps_markers']}
+
+        case "1.1.5" :
+            DB_query("ALTER TABLE {$_TABLES['maps_markers']}
 			ADD mk_icon smallint(5) unsigned default '0' AFTER mk_label_color
 			");
-			
-		case "1.1.6" :
+
+        case "1.1.6" :
             $c = config::get_instance();
-            $c->add('use_cluster', $_MAPS_DEFAULT['use_cluster'], 
+            $c->add('use_cluster', $_MAPS_DEFAULT['use_cluster'],
                 'select', 1, 8, 3, 6, true, $_MAPS_DEFAULT['pi_name']);
-				
-		case "1.1.7" :
-		    DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
+
+        case "1.1.7" :
+            DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
 			ADD o_order smallint(5) unsigned NOT NULL default '1'
 			");
-		case "1.1.8":
-		case "1.2.0":
-		case "1.2.1":
+        case "1.1.8":
+        case "1.2.0":
+        case "1.2.1":
             DB_query("CREATE TABLE {$_TABLES['maps_overlays_groups']} (
                 o_group_id SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT,
                 o_group_name VARCHAR(255),
                 PRIMARY KEY (o_group_id)
                 ) ENGINE=MyISAM
-                ");		
-		case "1.2.2":
-		    DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
+                ");
+        case "1.2.2":
+            DB_query("ALTER TABLE {$_TABLES['maps_overlays']}
 			ADD o_group SMALLINT(5) NOT NULL DEFAULT '0' AFTER o_name
 			");
-		
+
         case "1.2.3":
-		    //Migrate to google maps api v2 to v3
-			$res = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE 1 = 1");
-			while ($map = DB_fetchArray($res)) {
-			    $type = 'ROADMAP';
-				if ($map['type'] == 'G_SATELLITE_MAP') $type = 'SATELLITE';
-				if ($map['type'] == 'G_PHYSICAL_MAP ') $type = 'TERRAIN';
-				if ($map['type'] == 'G_HYBRID_MAP') $type = 'HYBRID';
-				DB_query("UPDATE {$_TABLES['maps_maps']} SET type = '$type' WHERE mid = {$map['mid']}");
-				COM_errorLog( "Updated map {$map['name']} to type $type", 1 );
-			}
-			$c = config::get_instance();
-			$type = 'ROADMAP';
-			if ($_MAPS_CONF['global_type'] == 'G_SATELLITE_MAP') $type = 'SATELLITE';
-			if ($_MAPS_CONF['global_type'] == 'G_PHYSICAL_MAP ') $type = 'TERRAIN';
-			if ($_MAPS_CONF['global_type'] == 'G_HYBRID_MAP') $type = 'HYBRID';
+            //Migrate to google maps api v2 to v3
+            $res = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE 1 = 1");
+            while ($map = DB_fetchArray($res)) {
+                $type = 'ROADMAP';
+                if ($map['type'] == 'G_SATELLITE_MAP') $type = 'SATELLITE';
+                if ($map['type'] == 'G_PHYSICAL_MAP ') $type = 'TERRAIN';
+                if ($map['type'] == 'G_HYBRID_MAP') $type = 'HYBRID';
+                DB_query("UPDATE {$_TABLES['maps_maps']} SET type = '$type' WHERE mid = {$map['mid']}");
+                COM_errorLog("Updated map {$map['name']} to type $type", 1);
+            }
+            $c = config::get_instance();
+            $type = 'ROADMAP';
+            if ($_MAPS_CONF['global_type'] == 'G_SATELLITE_MAP') $type = 'SATELLITE';
+            if ($_MAPS_CONF['global_type'] == 'G_PHYSICAL_MAP ') $type = 'TERRAIN';
+            if ($_MAPS_CONF['global_type'] == 'G_HYBRID_MAP') $type = 'HYBRID';
             $c->set('global_type', $type, $_MAPS_DEFAULT['pi_name']);
-            $c->set('url_geocode', 'http://maps.googleapis.com/maps/api/geocode/json?address=%address%&sensor=false', $_MAPS_DEFAULT['pi_name']);
-			
-			COM_errorLog( "Updated map config to type $type", 1 );
-			
-			//Drop unused tables
-			DB_query("DROP TABLE IF EXISTS {$_TABLES['maps_markers_fields']}, {$_TABLES['maps_markers_values']}, {$_TABLES['maps_markers_cat']}");
-			
-			//Remove cat field from markers table
-			DB_query("ALTER TABLE {$_TABLES['maps_markers']} DROP cat");
-			
-			//Change type of the description markers 
-			DB_query("ALTER TABLE {$_TABLES['maps_markers']} MODIFY description TEXT NOT NULL default '';");
-			
-		case '1.3.0':
-		    DB_query("ALTER TABLE {$_TABLES['maps_submission']} MODIFY description TEXT NOT NULL default '';");
-			DB_query("ALTER TABLE {$_TABLES['maps_submission']}
+            $c->set('url_geocode', '//maps.googleapis.com/maps/api/geocode/json?address=%address%&sensor=false', $_MAPS_DEFAULT['pi_name']);
+
+            COM_errorLog("Updated map config to type $type", 1);
+
+            //Drop unused tables
+            DB_query("DROP TABLE IF EXISTS {$_TABLES['maps_markers_fields']}, {$_TABLES['maps_markers_values']}, {$_TABLES['maps_markers_cat']}");
+
+            //Remove cat field from markers table
+            DB_query("ALTER TABLE {$_TABLES['maps_markers']} DROP cat");
+
+            //Change type of the description markers
+            DB_query("ALTER TABLE {$_TABLES['maps_markers']} MODIFY description TEXT NOT NULL default '';");
+
+        case '1.3.0':
+            DB_query("ALTER TABLE {$_TABLES['maps_submission']} MODIFY description TEXT NOT NULL default '';");
+            DB_query("ALTER TABLE {$_TABLES['maps_submission']}
 			ADD mk_default tinyint(1) unsigned NOT NULL default '1' AFTER mid
             ");
-			
-		case '1.3.1':
-		case '1.3.2':
-		    DB_query("ALTER TABLE {$_TABLES['maps_markers']}
+
+        case '1.3.1':
+        case '1.3.2':
+            DB_query("ALTER TABLE {$_TABLES['maps_markers']}
 			ADD type varchar(20) NOT NULL default '' AFTER hits
             ");
-			DB_query("ALTER TABLE {$_TABLES['maps_markers']}
+            DB_query("ALTER TABLE {$_TABLES['maps_markers']}
 			ADD url varchar(255) NOT NULL default '' AFTER hits
             ");
-			DB_query("ALTER TABLE {$_TABLES['maps_submission']}
+            DB_query("ALTER TABLE {$_TABLES['maps_submission']}
 			ADD type varchar(20) NOT NULL default '' AFTER hits
             ");
-			DB_query("ALTER TABLE {$_TABLES['maps_submission']}
+            DB_query("ALTER TABLE {$_TABLES['maps_submission']}
 			ADD url varchar(255) NOT NULL default '' AFTER hits
             ");
 
-		case '1.3.3':
-		case '1.3.4':
-			DB_query("ALTER TABLE {$_TABLES['maps_maps']}
+        case '1.3.3':
+        case '1.3.4':
+            DB_query("ALTER TABLE {$_TABLES['maps_maps']}
 			ADD mmk_default tinyint(1) unsigned NOT NULL default '1' AFTER footer
             ");
-			DB_query("ALTER TABLE {$_TABLES['maps_maps']}
+            DB_query("ALTER TABLE {$_TABLES['maps_maps']}
 			ADD mmk_icon smallint(5) unsigned default '0' AFTER label_color
             ");
-			
-			$c = config::get_instance();
-			$c->add('display_events_map', true, 
+
+            $c = config::get_instance();
+            $c->add('display_events_map', true,
                 'select', 1, 8, 3, 8, true, $_MAPS_DEFAULT['pi_name']);
-		case '1.3.5':
+        case '1.3.5':
         case '1.4.0':
-			
+
         default :
             // update plugin version number
             DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$installed_version' WHERE pi_name = 'maps'");
-			COM_errorLog( "Updated maps plugin from v$installed_version to v$code_version", 1 );
-            
+            COM_errorLog("Updated maps plugin from v$installed_version to v$code_version", 1);
+
             //move public_html/maps to custom folder if needed
             if ($_MAPS_CONF['maps_folder'] != 'maps' && $_MAPS_CONF['maps_folder'] != '') {
-                if ( rename($_CONF['path_html'] . $_MAPS_CONF['maps_folder'],$_CONF['path_html'] . $_MAPS_CONF['maps_folder'].'_old') ) {
-                     COM_errorLog("MAPS - Renamed {$_MAPS_CONF['maps_folder']} folder." );
+                if (rename($_CONF['path_html'] . $_MAPS_CONF['maps_folder'], $_CONF['path_html'] . $_MAPS_CONF['maps_folder'] . '_old')) {
+                    COM_errorLog("MAPS - Renamed {$_MAPS_CONF['maps_folder']} folder.");
                 } else {
-                    COM_errorLog("MAPS - Can't rename {$_MAPS_CONF['maps_folder']} folder." );
+                    COM_errorLog("MAPS - Can't rename {$_MAPS_CONF['maps_folder']} folder.");
                 }
-                sleep (5);
-                if( rename($_CONF['path_html'] . 'maps',$_CONF['path_html'] . $_MAPS_CONF['maps_folder']) ) {
-                     COM_errorLog("MAPS - Moved maps files to {$_MAPS_CONF['maps_folder']} folder." );
+                sleep(5);
+                if (rename($_CONF['path_html'] . 'maps', $_CONF['path_html'] . $_MAPS_CONF['maps_folder'])) {
+                    COM_errorLog("MAPS - Moved maps files to {$_MAPS_CONF['maps_folder']} folder.");
                 } else {
-                    COM_errorLog("MAPS - Can't move maps files to {$_MAPS_CONF['maps_folder']} folder." );
+                    COM_errorLog("MAPS - Can't move maps files to {$_MAPS_CONF['maps_folder']} folder.");
                     // For ftp update
-                    rename($_CONF['path_html'] . $_MAPS_CONF['maps_folder'].'_old', $_CONF['path_html'] . $_MAPS_CONF['maps_folder']);
-                    COM_errorLog("MAPS - Check your {$_MAPS_CONF['maps_folder']} folder." );
+                    rename($_CONF['path_html'] . $_MAPS_CONF['maps_folder'] . '_old', $_CONF['path_html'] . $_MAPS_CONF['maps_folder']);
+                    COM_errorLog("MAPS - Check your {$_MAPS_CONF['maps_folder']} folder.");
                 }
-                MAPS_delTree($_CONF['path_html'] . $_MAPS_CONF['maps_folder'].'_old');
+                MAPS_delTree($_CONF['path_html'] . $_MAPS_CONF['maps_folder'] . '_old');
             }
-            
-            
+
+
             /* This code is for statistics ONLY */
-            $message =  'Completed maps plugin upgrade: ' . date('m d Y',time()) . "   AT " . date('H:i', time()) . "\n";
+            $message = 'Completed maps plugin upgrade: ' . date('m d Y', time()) . "   AT " . date('H:i', time()) . "\n";
             $message .= 'Site: ' . $_CONF['site_url'] . ' and Sitename: ' . $_CONF['site_name'] . "\n";
-            COM_mail("ben@geeklog.fr","Updated maps plugin from v$installed_version to v$code_version",$message);
+            COM_mail("ben@geeklog.fr", "Updated maps plugin from v$installed_version to v$code_version", $message);
     }
+
     return true;
 }
 
-function MAPS_delTree($dir) {
-   $files = array_diff(scandir($dir), array('.','..'));
+function MAPS_delTree($dir)
+{
+    $files = array_diff(scandir($dir), array('.', '..'));
     foreach ($files as $file) {
-      (is_dir("$dir/$file") && !is_link($dir)) ? MAPS_delTree("$dir/$file") : unlink("$dir/$file");
+        (is_dir("$dir/$file") && !is_link($dir)) ? MAPS_delTree("$dir/$file") : unlink("$dir/$file");
     }
+
     return rmdir($dir);
-} 
+}
 
 /**
-* Automatic uninstall function for plugins
-*
-* This code is automatically uninstalling the plugin.
-* It passes an array to the core code function that removes
-* tables, groups, features and php blocks from the tables.
-* Additionally, this code can perform special actions that cannot be
-* foreseen by the core code (interactions with other plugins for example)
-*
-* @return   array   Plugin information
-*
-*/
+ * Automatic uninstall function for plugins
+ * This code is automatically uninstalling the plugin.
+ * It passes an array to the core code function that removes
+ * tables, groups, features and php blocks from the tables.
+ * Additionally, this code can perform special actions that cannot be
+ * foreseen by the core code (interactions with other plugins for example)
+ *
+ * @return   array   Plugin information
+ */
 function plugin_autouninstall_maps()
 {
-    $out = array (
+    $out = array(
         /* give the name of the tables, without $_TABLES[] */
-        'tables' => array('maps_maps', 
-		                  'maps_geo', 
-						  'maps_markers', 
-						  'maps_submission',
-						  'maps_overlays',
-						  'maps_map_overlay',
-						  'maps_map_icons',
-						  'maps_overlays_groups'
-						  ),
+        'tables'     => array('maps_maps',
+            'maps_geo',
+            'maps_markers',
+            'maps_submission',
+            'maps_overlays',
+            'maps_map_overlay',
+            'maps_map_icons',
+            'maps_overlays_groups',
+        ),
         /* give the full name of the group, as in the db */
-        'groups' => array('Maps Admin'),
+        'groups'     => array('Maps Admin'),
         /* give the full name of the feature, as in the db */
-        'features' => array('maps.admin'),
+        'features'   => array('maps.admin'),
         /* give the full name of the block, including 'phpblock_', etc */
         'php_blocks' => array(),
         /* give all vars with their name */
-        'vars' => array('globalMapHits')
+        'vars'       => array('globalMapHits'),
     );
 
     return $out;
 }
 
 /**
-*   Looks up coordinates from Google for the given address.
-*   Requires that the 'url_geocode' value is configured, and that there
-*   is a valid Google Maps API key configured.
-*
-*   @param  string  $address    Address to look up
-*   @param  float   &$lat       Reference to latitude value
-*   @param  float   &$lng       Reference to longitude value
-*   @return int     HTTP code, or an integer indicating the reason
-*/
+ *   Looks up coordinates from Google for the given address.
+ *   Requires that the 'url_geocode' value is configured, and that there
+ *   is a valid Google Maps API key configured.
+ *
+ * @param  string $address Address to look up
+ * @param  float  &$lat    Reference to latitude value
+ * @param  float  &$lng    Reference to longitude value
+ * @return int     HTTP code, or an integer indicating the reason
+ */
 //update to mysql 5.1
 function MAPS_getCoords($address, &$lat, &$lng)
 {
@@ -1017,147 +1024,144 @@ function MAPS_getCoords($address, &$lat, &$lng)
     // Check for valid Google config items
     if (empty($_MAPS_CONF['url_geocode']) || empty($_MAPS_CONF['google_api_key'])) {
         COM_errorLog('MAPS - Google config items is not valid. url geocode: ' . $_MAPS_CONF['url_geocode'] . ' | API key: ' . $_MAPS_CONF['google_api_key']);
-		return 0;
+
+        return 0;
     }
-	
+
     $timeout = 30;
     $patterns = array(
-        '/%address%/'
+        '/%address%/',
     );
-	
+
     $replacements = array(
-        urlencode($address)
+        urlencode($address),
     );
-	
+
     $url = preg_replace($patterns, $replacements, $_MAPS_CONF['url_geocode']);
 
-	if(function_exists(curl_init)) {
-		
-		$ch = @curl_init();
-		@curl_setopt($ch, CURLOPT_URL, $url);
-		@curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
-		@curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-		$response = @curl_exec ($ch);
-		@curl_close ($ch);
-		unset($ch);
-		
-	} else if (ini_get('allow_url_fopen') == 0) {
-        
-		// Parse the url for fsockopen
-		$fsockurl = @parse_url($url);
-		$response = '';
-		if(empty($fsockurl['port']))
-		{
-			$fsockurl['port'] = 80;
-		}
-		if(!empty($fsockurl['query']))
-		{
-			$fsockurl['path'].="?" . $fsockurl['query'];
-		}
-		// Make the request
-		$fsock = @fsockopen($fsockurl['host'],  $fsockurl['port'], $errno, $errstr, $timeout);
-		
-		if($fsock||!is_resource($fsock))
-		{
-			@fputs($fsock, "GET " . $fsockurl['path'] . " HTTP/1.0\r\n");
-			@fputs($fsock, "HOST: " . $fsockurl['host'] . "\r\n");
-			@fputs($fsock, "Connection: close\r\n\r\n");
-			while ((!@feof($fsock)))
-			{
-				// Load data as long as there is data and the connection didn't time out
-				$response = @fgets($fsock, 1024);
-			}
+    if (is_callable('curl_init')) {
 
-			@fclose($fsock);
-			unset($fsockurl, $fsock);
-		}
-		
-	} else if (ini_get('allow_url_fopen') == 1){
-		
-		$response = @file_get_contents($url);
-		if ($response == '') {
-		    COM_errorLog('MAPS geocoder: empty response by url fopen from ' . $url);
-			return false;
-		}
-	} else {
-	    
-		COM_errorLog('MAPS geocoder: error to get data from google');
-		return false;
-	}
-	
-	$json_result = json_decode($response, true);
-	
-	$geo_result =  $json_result->results[0];
+        $ch = @curl_init();
+        @curl_setopt($ch, CURLOPT_URL, $url);
+        @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        @curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+        $response = @curl_exec($ch);
+        @curl_close($ch);
+        unset($ch);
+
+    } else if (ini_get('allow_url_fopen') == 0) {
+
+        // Parse the url for fsockopen
+        $fsockurl = @parse_url($url);
+        $response = '';
+        if (empty($fsockurl['port'])) {
+            $fsockurl['port'] = 80;
+        }
+        if (!empty($fsockurl['query'])) {
+            $fsockurl['path'] .= "?" . $fsockurl['query'];
+        }
+        // Make the request
+        $fsock = @fsockopen($fsockurl['host'], $fsockurl['port'], $errno, $errstr, $timeout);
+
+        if ($fsock || !is_resource($fsock)) {
+            @fputs($fsock, "GET " . $fsockurl['path'] . " HTTP/1.0\r\n");
+            @fputs($fsock, "HOST: " . $fsockurl['host'] . "\r\n");
+            @fputs($fsock, "Connection: close\r\n\r\n");
+            while ((!@feof($fsock))) {
+                // Load data as long as there is data and the connection didn't time out
+                $response = @fgets($fsock, 1024);
+            }
+
+            @fclose($fsock);
+            unset($fsockurl, $fsock);
+        }
+
+    } else if (ini_get('allow_url_fopen') == 1) {
+
+        $response = @file_get_contents($url);
+        if ($response == '') {
+            COM_errorLog('MAPS geocoder: empty response by url fopen from ' . $url);
+
+            return false;
+        }
+    } else {
+
+        COM_errorLog('MAPS geocoder: error to get data from google');
+
+        return false;
+    }
+
+    $json_result = json_decode($response, true);
+
+    $geo_result = $json_result->results[0];
 
     $lat = $json_result['results'][0]['geometry']['location']['lat'];
     $lng = $json_result['results'][0]['geometry']['location']['lng'];
-	
-	$trace = debug_backtrace();
+
+    $trace = debug_backtrace();
     $caller = array_shift($trace);
-	COM_errorLog('MAPS geocoder: ' . $address .  ' call by ' . $caller['function'] . ' |' . $lat . '|' . $lng);
-    
-	return true;
+    COM_errorLog('MAPS geocoder: ' . $address . ' call by ' . $caller['function'] . ' |' . $lat . '|' . $lng);
+
+    return true;
 }
 
 /**
-*   Looks up coordinates from DB for the given address.
-*
-*   @param  string  $address    Address to look up
-*   @return int     HTTP code, or an integer indicating the reason
-*/
+ *   Looks up coordinates from DB for the given address.
+ *
+ * @param  string $address Address to look up
+ * @return int     HTTP code, or an integer indicating the reason
+ */
 //Updated to mysql 5.1
 function MAPS_getDBCoords(&$gid, $address, &$lat, &$lng)
 {
     global $_TABLES, $_MAPS_CONF;
-    
+
     $table = $_TABLES['maps_geo'];
     $address = addslashes($address);
-    
+
     //check if address is in the db
     $sql = "SELECT gid,lat,lng,geo FROM $table WHERE geo = '$address' LIMIT 1";
-    
-    list($gid,$lat,$lng,$geo) = DB_fetchArray(DB_query($sql));
 
-    if ( empty($lat) ) {
+    list($gid, $lat, $lng, $geo) = DB_fetchArray(DB_query($sql));
+
+    if (empty($lat)) {
         //Geoencode the address
         //Updated to mysql 5.1
         $map = MAPS_getCoords($address, $lat, $lng);
-        $lat = str_replace(",",".",$lat);
-        $lng = str_replace(",",".",$lng);
-        
+        $lat = str_replace(",", ".", $lat);
+        $lng = str_replace(",", ".", $lng);
+
         //Store the result for the next time
-		if ($lat =='' ) $lat =0;
-		if ($lng =='' ) $lng =0;
-		if ($geo == '') {
-		    //Creation
+        if ($lat == '') $lat = 0;
+        if ($lng == '') $lng = 0;
+        if ($geo == '') {
+            //Creation
             $sql = "INSERT INTO $table (geo,lat,lng) VALUES ('" . $address . "','" . addslashes($lat) . "','" . addslashes($lng) . "')";
-		} else {
-		    //update
-			$geo = addslashes($geo);
-			$sql = "UPDATE $table SET lat = '" . addslashes($lat) . "', lng = '" . addslashes($lng) . "' WHERE geo = '$geo'";
-			//COM_errorLog("MAPS - Update geo: " . stripslashes($geo));
-		}
+        } else {
+            //update
+            $geo = addslashes($geo);
+            $sql = "UPDATE $table SET lat = '" . addslashes($lat) . "', lng = '" . addslashes($lng) . "' WHERE geo = '$geo'";
+            //COM_errorLog("MAPS - Update geo: " . stripslashes($geo));
+        }
         DB_query($sql);
-        
+
         //Callback gid
         $sql = "SELECT gid,lat,lng FROM $table WHERE geo = '$address' LIMIT 1";
-        list($gid,$lat,$lng) = DB_fetchArray(DB_query($sql));
+        list($gid, $lat, $lng) = DB_fetchArray(DB_query($sql));
     }
 
-    $lat = (float)$lat;
-    $lng = (float)$lng;
-    
-    return;
+    $lat = (float) $lat;
+    $lng = (float) $lng;
 }
 
 /**
  * Returns user menu display
- *
  * Generates the user menu from the template and returns the result as a string of HTML
  *
  * @return string HTML of user menu
  */
-function MAPS_user_menu() {
+function MAPS_user_menu()
+{
     global $_CONF, $_MAPS_CONF, $LANG_MAPS_1, $_MAPS_CONF;
 
     $display = '<p>';
@@ -1168,21 +1172,21 @@ function MAPS_user_menu() {
     $menu->set_var('maps_url', $_MAPS_CONF['site_url']);
     $menu->set_var('site_url', $_CONF['site_url']);
     $menu->set_var('maps', $LANG_MAPS_1['user_home']);
-    
+
     //Check for submission rights
     if ($_MAPS_CONF['marker_submission'] == 1) {
         $menu->set_var('submit_marker', ' | <a href="' . $_CONF['site_url'] . '/submit.php?type=maps">' . $LANG_MAPS_1['submit_marker'] . '</a>');
-		//Check for login users
-		if (!COM_isAnonUser()) {
-		    $menu->set_var('my_markers', ' | <a href="' . $_MAPS_CONF['site_url'] . '/markers.php">' . $LANG_MAPS_1['my_markers'] . '</a>');
-		} else {
-		    $menu->set_var('my_markers', '');
-		}
+        //Check for login users
+        if (!COM_isAnonUser()) {
+            $menu->set_var('my_markers', ' | <a href="' . $_MAPS_CONF['site_url'] . '/markers.php">' . $LANG_MAPS_1['my_markers'] . '</a>');
+        } else {
+            $menu->set_var('my_markers', '');
+        }
     } else {
         $menu->set_var('submit_marker', '');
-		$menu->set_var('my_markers', '');
+        $menu->set_var('my_markers', '');
     }
-    
+
     if (SEC_hasRights('maps.admin')) {
         $menu->set_var('admin', ' | ' . '<a href="' . $_CONF['site_url'] . '/admin/plugins/maps/index.php">' . $LANG_MAPS_1['admin'] . '</a>');
     } else {
@@ -1198,13 +1202,13 @@ function MAPS_user_menu() {
 
 /**
  * Returns admin menu display
- *
  * Generates the admin menu from the template and returns the result as a string of HTML
  *
  * @return string HTML of admin menu
  * @todo add support for pending (physical) transaction, not fully implemented
  */
-function MAPS_admin_menu() {
+function MAPS_admin_menu()
+{
     global $_CONF, $_TABLES, $LANG_MAPS_1;
 
     $display = '<p>';
@@ -1216,9 +1220,9 @@ function MAPS_admin_menu() {
     $menu->set_var('site_url', $_CONF['site_url']);
     $menu->set_var('admin_home', $LANG_MAPS_1['maps']);
     $menu->set_var('markers', $LANG_MAPS_1['markers']);
-	$menu->set_var('icons', $LANG_MAPS_1['icons']);
-	$menu->set_var('overlays', $LANG_MAPS_1['overlays']);
-	$menu->set_var('import_export', $LANG_MAPS_1['import_export']);
+    $menu->set_var('icons', $LANG_MAPS_1['icons']);
+    $menu->set_var('overlays', $LANG_MAPS_1['overlays']);
+    $menu->set_var('import_export', $LANG_MAPS_1['import_export']);
     $menu->set_var('geocoder', $LANG_MAPS_1['geocoder']);
     $menu->set_var('set_user_geo', $LANG_MAPS_1['set_user_geo']);
     $menu->set_var('configuration', $LANG_MAPS_1['configuration']);
@@ -1233,7 +1237,6 @@ function MAPS_admin_menu() {
 
 /**
  * Filters submitted variables
- *
  * Uses geeklog functions to filter submitted variables for illegal content.  Any editing is
  * done in place and no value is returned
  *
@@ -1241,7 +1244,8 @@ function MAPS_admin_menu() {
  * @param array &$arr reference to associative array of variable name => value
  */
 
-function MAPS_filterVars($vars, &$arr) {
+function MAPS_filterVars($vars, &$arr)
+{
     // cycle through each variable applying the appropriate filter
     foreach ($vars as $var => $type) {
         switch ($type) {
@@ -1258,7 +1262,7 @@ function MAPS_filterVars($vars, &$arr) {
                 break;
 
             case 'int':
-                $arr[$var] = (int)$arr[$var];
+                $arr[$var] = (int) $arr[$var];
                 break;
             case 'alpha':
             default:
@@ -1277,9 +1281,9 @@ function MAPS_geocoding()
     $T->set_var('geocoder', $LANG_MAPS_1['geocoder']);
     $T->set_var('geocoder_text', $LANG_MAPS_1['geocoder_text']);
     $T->set_var('go', $LANG_MAPS_1['go']);
-    $T->parse('output','block');
+    $T->parse('output', 'block');
     $HTML = $T->finish($T->get_var('output'));
-    
+
     return $HTML;
 }
 
@@ -1289,7 +1293,7 @@ function MAPS_geocoding()
 */
 function MAPS_recurseMaps($sel)
 {
-    global $_CONF, $_TABLES,$LANG_MAPS_1;
+    global $_CONF, $_TABLES, $LANG_MAPS_1;
 
     $str = '';
 
@@ -1307,9 +1311,9 @@ function MAPS_recurseMaps($sel)
         return '';
 
     while ($row = DB_fetchArray($result, false)) {
-	    $markers = DB_count($_TABLES['maps_markers'],'mid',$row['mid']);
-		($markers > 1) ? $unit = $LANG_MAPS_1['xmarkers'] : $unit = $LANG_MAPS_1['1marker'];
-        $txt = $row['mid']. '. ' . stripslashes($row['name']) . ' ('. $markers . ' ' . $unit . ')';
+        $markers = DB_count($_TABLES['maps_markers'], 'mid', $row['mid']);
+        ($markers > 1) ? $unit = $LANG_MAPS_1['xmarkers'] : $unit = $LANG_MAPS_1['1marker'];
+        $txt = $row['mid'] . '. ' . stripslashes($row['name']) . ' (' . $markers . ' ' . $unit . ')';
         if ($row['mid'] == $sel) {
             $selected = 'selected="selected" ';
             $style = 'style="font-weight:bold; background:grey;"';
@@ -1323,35 +1327,38 @@ function MAPS_recurseMaps($sel)
         $str .= "</option>\n";
 
     }
+
     return $str;
 }
 
 // display a map
 
-function MAPS_getMap ($mid, $zoom='', $address='')
+function MAPS_getMap($mid, $zoom = '', $address = '')
 {
     global $_CONF, $_TABLES, $_MAPS_CONF, $LANG_MAPS_1, $_SCRIPTS, $LANG_LOGIN, $_SCRIPTS;
-    
+
     $retval = '';
+    $js = '';
+
     $res = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE mid = '{$mid}'");
 
     // count number of returned results, if unexpected redirect to maps list
     if (DB_numRows($res) != 1) {
-        //echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
-		COM_errorLog('MAPS: Error when trying to display map number #' .  $mid . ' on page ' .  $_SERVER['HTTP_HOST'] );
-        return;
+        // COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
+        COM_errorLog('MAPS: Error when trying to display map number #' . $mid . ' on page ' . $_SERVER['HTTP_HOST']);
+
+        return '';
     }
-    
-	//$_SCRIPTS->setJavaScriptFile('maps_iconmaker2', '/' . $_MAPS_CONF['maps_folder'] . '/js/mapiconmaker.js', false,false);
-	
+
+    //$_SCRIPTS->setJavaScriptFile('maps_iconmaker2', '/' . $_MAPS_CONF['maps_folder'] . '/js/mapiconmaker.js', false,false);
+
     $A = DB_fetchArray($res);
     foreach ($A as $i => $value) {
-              $A[$i] = stripslashes($value);
-            }
+        $A[$i] = stripslashes($value);
+    }
 
     if ((($A['active'] == 0)) && !SEC_hasRights('maps.admin')) {
         return $retval;
-        exit();
     }
     if ($A['description'] != '') {
         $more_title = ' >> ' . $A['description'];
@@ -1361,37 +1368,41 @@ function MAPS_getMap ($mid, $zoom='', $address='')
 
     // Ensure user has the rights to access this map
     if ((!SEC_hasAccess($A['owner_id'], $A['group_id'], $A['perm_owner'],
-                $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) && COM_isAnonUser()) {
-        $retval .= COM_startBlock ($LANG_LOGIN[1], '',
-                                    COM_getBlockTemplate ('_msg_block', 'header'));
+                $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) && COM_isAnonUser()
+    ) {
+        $retval .= COM_startBlock($LANG_LOGIN[1], '',
+            COM_getBlockTemplate('_msg_block', 'header'));
 
         $login = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-        $login->set_file (array ('login'=>'submitloginrequired.thtml'));
-        $login->set_var ( 'xhtml', XHTML );
-        $login->set_var ('site_url', $_CONF['site_url']);
-        $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
-        $login->set_var ('layout_url', $_CONF['layout_url']);
-        $login->set_var ('lang_login', $LANG_LOGIN[3]);
-        $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
-        
+        $login->set_file(array('login' => 'submitloginrequired.thtml'));
+        $login->set_var('xhtml', XHTML);
+        $login->set_var('site_url', $_CONF['site_url']);
+        $login->set_var('site_admin_url', $_CONF['site_admin_url']);
+        $login->set_var('layout_url', $_CONF['layout_url']);
+        $login->set_var('lang_login', $LANG_LOGIN[3]);
+        $login->set_var('lang_newuser', $LANG_LOGIN[4]);
+
         if ($A['perm_members'] == 2) {
-            $login->set_var ('login_message', $LANG_LOGIN[2]);
+            $login->set_var('login_message', $LANG_LOGIN[2]);
         } else {
-            $login->set_var ('login_message', $LANG_MAPS_1['must_belong_to'] . ' ' . SEC_getGroupDropdown($A['group_id'], $access = ''));
+            $login->set_var('login_message', $LANG_MAPS_1['must_belong_to'] . ' ' . SEC_getGroupDropdown($A['group_id'], $access = ''));
         }
-        
-        $login->parse ('output', 'login');
-        $retval .= $login->finish ($login->get_var('output'));
-        $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-		return $retval;
+
+        $login->parse('output', 'login');
+        $retval .= $login->finish($login->get_var('output'));
+        $retval .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+
+        return $retval;
     } elseif (!SEC_hasAccess($A['owner_id'], $A['group_id'], $A['perm_owner'],
-                $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) {
-        $retval = COM_startBlock($LANG_MAPS_1['private_access'],'','blockheader-message.thtml');
+            $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3
+    ) {
+        $retval = COM_startBlock($LANG_MAPS_1['private_access'], '', 'blockheader-message.thtml');
         $retval .= $LANG_MAPS_1['must_belong_to'] . ' ' . SEC_getGroupDropdown($A['group_id'], $access = '');
         $retval .= COM_endBlock('blockfooter-message.thtml');
-		return $retval;
+
+        return $retval;
     } else {
-							
+
         $T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
         $T->set_file('page', 'map.thtml');
         $T->set_var('mid', $A['mid']);
@@ -1399,35 +1410,35 @@ function MAPS_getMap ($mid, $zoom='', $address='')
         if ($A['description'] != '') {
             $T->set_var('description', '<p>' . stripslashes($A['description']) . '</p>');
         } else {
-        $T->set_var('description', '');
+            $T->set_var('description', '');
         }
         if ($A['header'] != '') {
             $header = PLG_replaceTags($A['header']);
             $T->set_var('header', $header);;
         } else {
-        $T->set_var('header', '');
+            $T->set_var('header', '');
         }
         if ($A['footer'] != '') {
             $footer = PLG_replaceTags($A['footer']);
             $T->set_var('footer', $footer);
         } else {
-        $T->set_var('footer', '');
+            $T->set_var('footer', '');
         }
-		if ($address != '') {
-		    // Updated to mysql 5.1
-			MAPS_getDBCoords($gid, $address, $lat, $lng);
-			$T->set_var('address', addslashes($address));
-            $lat = str_replace(",",".",$lat);
-            $lng = str_replace(",",".",$lng);
+        if ($address != '') {
+            // Updated to mysql 5.1
+            MAPS_getDBCoords($gid, $address, $lat, $lng);
+            $T->set_var('address', addslashes($address));
+            $lat = str_replace(",", ".", $lat);
+            $lng = str_replace(",", ".", $lng);
             $T->set_var('lat', $lat);
             $T->set_var('lng', $lng);
-		} else {
+        } else {
             $T->set_var('address', addslashes($A['geo']));
-            $lat = str_replace(",",".",$A['lat']);
-            $lng = str_replace(",",".",$A['lng']);
+            $lat = str_replace(",", ".", $A['lat']);
+            $lng = str_replace(",", ".", $A['lng']);
             $T->set_var('lat', $lat);
             $T->set_var('lng', $lng);
-		}
+        }
         $T->set_var('primaryColor', $A['primary_color']);
         $T->set_var('stroke_color', $A['stroke_color']);
         if ($A['label_color'] == '1') {
@@ -1438,40 +1449,40 @@ function MAPS_getMap ($mid, $zoom='', $address='')
 
         $T->set_var('label_color', $label_color);
         $T->set_var('label', $A['label']);
-		if ($zoom != '' && is_numeric($zoom)) { 
+        if ($zoom != '' && is_numeric($zoom)) {
             $T->set_var('zoom', $zoom);
-		} else {
-		    $T->set_var('zoom', $A['zoom']);
-			$zoom = $A['zoom'];
-		}
+        } else {
+            $T->set_var('zoom', $A['zoom']);
+            $zoom = $A['zoom'];
+        }
         $T->set_var('goog_api_key', $_MAPS_CONF['google_api_key']);
         $T->set_var('map_type', $A['type']);
         $T->set_var('map_width', $A['width']);
         $T->set_var('map_height', $A['height']);
-        
+
         $sql = "SELECT m.* 
                 FROM {$_TABLES['maps_markers']} AS m
                 WHERE m.mid = {$A['mid']} AND active = 1 AND hidden = 0
                 ";
 
-		//markers
-		$jsmarkers = 'var markers = [];';
-		$jsmarkers .= MAPS_getMarkers($sql, $A['primary_color'], $A['stroke_color'], $A['label'], $label_color, 0, $A['name'], $A['mid'], $A);
-		if ($_MAPS_CONF['use_cluster'] == 0 ) {	
-			$T->set_var('markerclusterer', '');	
-		} else {
-			$T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
-			$jsmarkers .= LB . '				var markerCluster' . $A['mid'] . ' = new MarkerClusterer(map' . $A['mid'] . ', markers);' . LB;
-		}		
-        
+        //markers
+        $jsmarkers = 'var markers = [];';
+        $jsmarkers .= MAPS_getMarkers($sql, $A['primary_color'], $A['stroke_color'], $A['label'], $label_color, 0, $A['name'], $A['mid'], $A);
+        if ($_MAPS_CONF['use_cluster'] == 0) {
+            $T->set_var('markerclusterer', '');
+        } else {
+            $T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
+            $jsmarkers .= LB . '				var markerCluster' . $A['mid'] . ' = new MarkerClusterer(map' . $A['mid'] . ', markers);' . LB;
+        }
+
         $T->set_var('markers', $jsmarkers);
-		
+
         //Ads			
-		$ads = MAPS_getAds ($A['mid']);
-		$T->set_var('ads', $ads);
-		
-		//overlays
-		$o_sql = "SELECT DISTINCT
+        $ads = MAPS_getAds($A['mid']);
+        $T->set_var('ads', $ads);
+
+        //overlays
+        $o_sql = "SELECT DISTINCT
 	            *
             FROM {$_TABLES['maps_map_overlay']} AS mo
 			LEFT JOIN {$_TABLES['maps_overlays']} AS o
@@ -1481,80 +1492,81 @@ function MAPS_getMap ($mid, $zoom='', $address='')
 			WHERE mo.mo_mid={$mid}
 			ORDER BY o.o_order
 			";
-	    //TODO order by group and order
-		$o_res = DB_query($o_sql);
-		$o_i = 1;
-		$o_listener = LB . "google.maps.event.addListener(map{$mid}, 'zoom_changed', function() {" . LB ;
-		$o_listener .= "var zoom = map{$mid}.getZoom();" . LB ;
-		$overlays_checkboxes = '';
-		$overlay_group = '';
-
-		while ($overlay = DB_fetchArray($o_res)) {
-			$overlays .= LB . "var imageBounds{$o_i} = new google.maps.LatLngBounds(" . LB;
-			$overlays .= "new google.maps.LatLng({$overlay['o_sw_lat']},{$overlay['o_sw_lng']})," . LB;
-			$overlays .= "new google.maps.LatLng({$overlay['o_ne_lat']},{$overlay['o_ne_lng']}));" . LB;
-			
-			$overlays .= "var overlay{$o_i} = new google.maps.GroundOverlay(" . LB;
-			$overlays .= "\"{$_MAPS_CONF['images_overlay_url']}{$overlay['o_image']}\"," . LB;
-			$overlays .= "imageBounds{$o_i});" . LB;
-			$overlays .= "alloverlays[{$o_i}] = overlay{$o_i};" . LB;
-			$overlays .= "zoommin[{$o_i}] = {$overlay['o_zoom_min']};" . LB;
-			$overlays .= "zoommax[{$o_i}] = {$overlay['o_zoom_max']};" . LB;
-			$overlays .= "var zoominit{$mid} = {$zoom};" . LB;
-			$overlays .= "if ( zoominit{$mid} > ({$overlay['o_zoom_min']}-1) && zoominit{$mid} < ({$overlay['o_zoom_max']}+1) ) {" . LB;
-			$overlays .= "    ToogleOverlays('overlay{$o_i}', {$o_i}, {$mid});" . LB;
-			$overlays .= "}" . LB;
-			
-			$o_listener .= "    if ( zoom < {$overlay['o_zoom_min']} || zoom > {$overlay['o_zoom_max']} ) {" . LB;
-			//$o_listener .= "        map{$mid}.removeOverlay(overlay{$o_i});" . LB;
-			$o_listener .= "        overlay{$o_i}.setMap(null);" . LB;
-			$o_listener .= "    }" . LB;
-			
-			$o_listener .= "    if ( zoom > ({$overlay['o_zoom_min']}-1) && zoom < ({$overlay['o_zoom_max']}+1)) {" . LB;
-			$o_listener .= "    ToogleOverlays('overlay{$o_i}', {$o_i}, {$mid});" . LB;
-			$o_listener .= "    }" . LB;
-			
-			//Overlays group
-			if ( ($overlay['o_group_id'] != $overlay_group) && $overlay_group == '') {
-			    $arr_it = 0;
-				$overlay_group = $overlay['o_group_id'];
-				$js .=  "var overlay_group_{$overlay_group} = new Array();" . LB;
-				if ($overlay_group != 0) {
-				    //parentCheckBox
-					$overlays_checkboxes .= LB . '<fieldset>' . LB . '<input class="parentCheckBox" id="group_' . $overlay_group . '" onClick="ToogleOverlaysGroup(overlay_group_' 
-					. $overlay_group . 	', ' . $overlay_group . ', ' . $mid . ');" checked="checked" type="checkbox" ' . XHTML . '> <strong>' 
-					. $overlay['o_group_name'] . '</strong><br' . XHTML .'>' . LB;
-				}
-			} else if ($overlay['o_group_id'] != $overlay_group) {
-			    $arr_it = 0;
-			    $overlay_group = $overlay['o_group_id'];
-				$js .=  "var overlay_group_{$overlay_group} = new Array();" . LB;
-			    $overlays_checkboxes .= LB . '</fieldset>' . LB . '<fieldset>' . LB . '<input class="parentCheckBox" id="group_' . $overlay_group 
-				. '" onClick="ToogleOverlaysGroup(overlay_group_'.  $overlay_group . ', ' . $overlay_group . ', ' 
-				. $mid . ');" checked="checked" type="checkbox" ' . XHTML . '> <strong>' . $overlay['o_group_name'] . '</strong><br' . XHTML .'>';
-			}
-            
-			//childCheckBox
-			$overlays_checkboxes .= LB . '&nbsp;&nbsp;&nbsp;&nbsp;<input class="childCheckBox" name="overlay' . $overlay_group . '" id="overlay' . $o_i . '" onClick="ToogleOverlays(\'overlay'. $o_i .
-    			'\', ' . $o_i . ', '. $mid . ')" checked="checked" type="checkbox" ' . XHTML . '> ' . COM_getTooltip($overlay['o_name'], '<img src="' . $_MAPS_CONF['site_url'] . '/timthumb.php?src='
-				. $_MAPS_CONF['images_overlay_url'] . $overlay['o_image'] . '&amp;w=200&amp;q=70&amp;zc=1" alt="" />', '', $overlay['o_name'], $template = 'help') . '<br' . XHTML .'>' . LB;
-			
-			if ($overlay_group != '') $js .=  "overlay_group_{$overlay_group}[{$arr_it}] = {$o_i};" . LB;
-			
-			$arr_it++;
-			$o_i++;
-		}
-		if ( $overlay_group != '') {
-		    $overlays_checkboxes .= LB. '</fieldset>';
-		}
-		$o_listener .= "});" . LB . LB;
-		
-		//overlays checkboxes
-		if ($overlays_checkboxes != '') {
-			$overlays_checkboxes = '<p><a style="text-decoration: none;" onClick="elementToggle(\'overlays_checkboxes\'); return false;" href="#">
+        //TODO order by group and order
+        $o_res = DB_query($o_sql);
+        $o_i = 1;
+        $o_listener = LB . "google.maps.event.addListener(map{$mid}, 'zoom_changed', function() {" . LB;
+        $o_listener .= "var zoom = map{$mid}.getZoom();" . LB;
+        $overlays_checkboxes = '';
+        $overlay_group = '';
+        $arr_it = 0;
+
+        while ($overlay = DB_fetchArray($o_res)) {
+            $overlays = LB . "var imageBounds{$o_i} = new google.maps.LatLngBounds(" . LB;
+            $overlays .= "new google.maps.LatLng({$overlay['o_sw_lat']},{$overlay['o_sw_lng']})," . LB;
+            $overlays .= "new google.maps.LatLng({$overlay['o_ne_lat']},{$overlay['o_ne_lng']}));" . LB;
+
+            $overlays .= "var overlay{$o_i} = new google.maps.GroundOverlay(" . LB;
+            $overlays .= "\"{$_MAPS_CONF['images_overlay_url']}{$overlay['o_image']}\"," . LB;
+            $overlays .= "imageBounds{$o_i});" . LB;
+            $overlays .= "alloverlays[{$o_i}] = overlay{$o_i};" . LB;
+            $overlays .= "zoommin[{$o_i}] = {$overlay['o_zoom_min']};" . LB;
+            $overlays .= "zoommax[{$o_i}] = {$overlay['o_zoom_max']};" . LB;
+            $overlays .= "var zoominit{$mid} = {$zoom};" . LB;
+            $overlays .= "if ( zoominit{$mid} > ({$overlay['o_zoom_min']}-1) && zoominit{$mid} < ({$overlay['o_zoom_max']}+1) ) {" . LB;
+            $overlays .= "    ToogleOverlays('overlay{$o_i}', {$o_i}, {$mid});" . LB;
+            $overlays .= "}" . LB;
+
+            $o_listener .= "    if ( zoom < {$overlay['o_zoom_min']} || zoom > {$overlay['o_zoom_max']} ) {" . LB;
+            //$o_listener .= "        map{$mid}.removeOverlay(overlay{$o_i});" . LB;
+            $o_listener .= "        overlay{$o_i}.setMap(null);" . LB;
+            $o_listener .= "    }" . LB;
+
+            $o_listener .= "    if ( zoom > ({$overlay['o_zoom_min']}-1) && zoom < ({$overlay['o_zoom_max']}+1)) {" . LB;
+            $o_listener .= "    ToogleOverlays('overlay{$o_i}', {$o_i}, {$mid});" . LB;
+            $o_listener .= "    }" . LB;
+
+            //Overlays group
+            if (($overlay['o_group_id'] != $overlay_group) && $overlay_group == '') {
+                $arr_it = 0;
+                $overlay_group = $overlay['o_group_id'];
+                $js = "var overlay_group_{$overlay_group} = new Array();" . LB;
+                if ($overlay_group != 0) {
+                    //parentCheckBox
+                    $overlays_checkboxes .= LB . '<fieldset>' . LB . '<input class="parentCheckBox" id="group_' . $overlay_group . '" onClick="ToogleOverlaysGroup(overlay_group_'
+                        . $overlay_group . ', ' . $overlay_group . ', ' . $mid . ');" checked="checked" type="checkbox" ' . XHTML . '> <strong>'
+                        . $overlay['o_group_name'] . '</strong><br' . XHTML . '>' . LB;
+                }
+            } else if ($overlay['o_group_id'] != $overlay_group) {
+                $arr_it = 0;
+                $overlay_group = $overlay['o_group_id'];
+                $js = "var overlay_group_{$overlay_group} = new Array();" . LB;
+                $overlays_checkboxes .= LB . '</fieldset>' . LB . '<fieldset>' . LB . '<input class="parentCheckBox" id="group_' . $overlay_group
+                    . '" onClick="ToogleOverlaysGroup(overlay_group_' . $overlay_group . ', ' . $overlay_group . ', '
+                    . $mid . ');" checked="checked" type="checkbox" ' . XHTML . '> <strong>' . $overlay['o_group_name'] . '</strong><br' . XHTML . '>';
+            }
+
+            //childCheckBox
+            $overlays_checkboxes .= LB . '&nbsp;&nbsp;&nbsp;&nbsp;<input class="childCheckBox" name="overlay' . $overlay_group . '" id="overlay' . $o_i . '" onClick="ToogleOverlays(\'overlay' . $o_i .
+                '\', ' . $o_i . ', ' . $mid . ')" checked="checked" type="checkbox" ' . XHTML . '> ' . COM_getTooltip($overlay['o_name'], '<img src="' . $_MAPS_CONF['site_url'] . '/timthumb.php?src='
+                    . $_MAPS_CONF['images_overlay_url'] . $overlay['o_image'] . '&amp;w=200&amp;q=70&amp;zc=1" alt="" />', '', $overlay['o_name'], $template = 'help') . '<br' . XHTML . '>' . LB;
+
+            if ($overlay_group != '') $js .= "overlay_group_{$overlay_group}[{$arr_it}] = {$o_i};" . LB;
+
+            $arr_it++;
+            $o_i++;
+        }
+        if ($overlay_group != '') {
+            $overlays_checkboxes .= LB . '</fieldset>';
+        }
+        $o_listener .= "});" . LB . LB;
+
+        //overlays checkboxes
+        if ($overlays_checkboxes != '') {
+            $overlays_checkboxes = '<p><a style="text-decoration: none;" onClick="elementToggle(\'overlays_checkboxes\'); return false;" href="#">
 			<b>' . $LANG_MAPS_1['show_hide_overlays'] . '</b></a></p><div id="overlays_checkboxes" style="display:none;">' . LB . $overlays_checkboxes . LB . '</div>';
-			
-			$js .= LB . "function ToogleOverlays(ov, ovid, mapid) {
+
+            $js .= LB . "function ToogleOverlays(ov, ovid, mapid) {
 				var o_on = window.document.getElementById(ov);
 				fmap = map[mapid];
 				foverlay = alloverlays[ovid];
@@ -1573,8 +1585,8 @@ function MAPS_getMap ($mid, $zoom='', $address='')
 
 				}
 			}" . LB;
-			
-			$js .= LB . "function ToogleOverlaysGroup(ovg, ovgid, mapid) {
+
+            $js .= LB . "function ToogleOverlaysGroup(ovg, ovgid, mapid) {
 				var overlayGroupName = 'group_' + ovgid;
 				var og_on = window.document.getElementById(overlayGroupName);
 				fmap = map[mapid];
@@ -1606,10 +1618,10 @@ function MAPS_getMap ($mid, $zoom='', $address='')
 					}
 				}
 			}" . LB;
-			
-			//Thanks to http://jsfiddle.net/wfMXv/2/
-            
-			$jquery = "jQuery(document).ready(function(){
+
+            //Thanks to http://jsfiddle.net/wfMXv/2/
+
+            $jquery = "jQuery(document).ready(function(){
 				jQuery(\":checkbox\").click(function(){
 					var top_name = jQuery(this).attr(\"class\");
 					var top_checked = jQuery(this).attr(\"checked\");
@@ -1623,8 +1635,8 @@ function MAPS_getMap ($mid, $zoom='', $address='')
 					});
 				});
 				});";
-				
-			$jquery = "    $(document).ready(
+
+            $jquery = "    $(document).ready(
 				function() {
 				//clicking the parent checkbox should check or uncheck all child checkboxes
 				$(\".parentCheckBox\").click(
@@ -1651,22 +1663,22 @@ function MAPS_getMap ($mid, $zoom='', $address='')
 				);
 				}
 				);";
-			
-			$_SCRIPTS->setJavaScript($jquery, true);
-			
-			$T->set_var('overlays_js', $js);
-			$T->set_var('overlays_checkboxes', $overlays_checkboxes);
-		} else {
-		    $T->set_var('overlays_checkboxes', '');
-		}
-		
-		$T->set_var('overlays', $o_listener . $overlays);
-		
+
+            $_SCRIPTS->setJavaScript($jquery, true);
+
+            $T->set_var('overlays_js', $js);
+            $T->set_var('overlays_checkboxes', $overlays_checkboxes);
+        } else {
+            $T->set_var('overlays_checkboxes', '');
+        }
+
+        $T->set_var('overlays', $o_listener . $overlays);
+
         //Date and hits
         $update = COM_getUserDateTimeFormat($A['modified']);
         $T->set_var('date_and_hits', $LANG_MAPS_1['last_modification'] . ' ' . $update[0] . ' | ' . $A['hits'] . ' ' . $LANG_MAPS_1['hits']);
 
-        if (SEC_hasRights('maps.admin')){
+        if (SEC_hasRights('maps.admin')) {
             $T->set_var('edit_button', '<form id="edit_map" action="' . $_CONF['site_admin_url'] . '/plugins/maps/map_edit.php" method="POST">
             <div style="float:right"> <input type="image" src="' . $_CONF['site_admin_url'] . '/plugins/maps/images/edit.png" name="submit" align="absmiddle" /></div>
             <input type="hidden" name="mode" value="edit" /><input type="hidden" name="mid" value="' . $mid . '" />
@@ -1675,67 +1687,68 @@ function MAPS_getMap ($mid, $zoom='', $address='')
             $T->set_var('edit_button', '');
         }
 
-        $T->parse('output','page');
+        $T->parse('output', 'page');
         $retval = $T->finish($T->get_var('output'));
-        
+
         hitMap($A['mid']);
-        
+
         return $retval;
     }
 }
 
-function MAPS_getGlobalMap ( $zoom='', $address='', $pagelist=false ) {
+function MAPS_getGlobalMap($zoom = '', $address = '', $pagelist = false)
+{
 
     global $_TABLES, $LANG_MAPS_1, $_MAPS_CONF, $_CONF;
-    
+
     if ($_MAPS_CONF['global_map'] == 1) {
         $res = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE 1=1 LIMIT 1");
 
         //Global map is set on mid=1. 
-		//TODO change this
+        //TODO change this
         $A = DB_fetchArray($res);
 
         $T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
         $T->set_file('page', 'map.thtml');
         $T->set_var('mid', '0');
-		if ($pagelist) {
+        if ($pagelist) {
             $T->set_var('name', '');
             $T->set_var('description', '');
-		} else {
-		    $T->set_var('name', $LANG_MAPS_1['global_map']);
+        } else {
+            $T->set_var('name', $LANG_MAPS_1['global_map']);
             $T->set_var('description', '<p>' . $LANG_MAPS_1['info_global_map'] . '</p>');
-		}
+        }
         $T->set_var('header', '');
         $T->set_var('footer', '');
 
         //address from global map
         $T->set_var('address', addslashes($A['geo']));
-        $lat = str_replace(",",".",$A['lat']);
-        $lng = str_replace(",",".",$A['lng']);
+        $lat = str_replace(",", ".", $A['lat']);
+        $lng = str_replace(",", ".", $A['lng']);
         $T->set_var('lat', $lat);
         $T->set_var('lng', $lng);
-		
-        if ($zoom == '' ) $T->set_var('zoom', $_MAPS_CONF['global_zoom']); else $T->set_var('zoom', $zoom);
+
+        if ($zoom == '') $T->set_var('zoom', $_MAPS_CONF['global_zoom']); else $T->set_var('zoom', $zoom);
 
         $T->set_var('map_type', $_MAPS_CONF['global_type']);
         $T->set_var('map_width', $_MAPS_CONF['global_width']);
         $T->set_var('map_height', $_MAPS_CONF['global_height']);
-                
-        $nRows  = DB_numRows($res);
+
+        $nRows = DB_numRows($res);
         $jsmarkers = 'var markers = [];';
-        
+
         //Global map
-        
+
         $res_maps = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE 1=1 ORDER BY mid ASC");
         //Check if there at least 1 map
-        $nRows_maps  = DB_numRows($res_maps);
+        $nRows_maps = DB_numRows($res_maps);
+
+        //markers
 
-		//markers
-        
         //Select color and label for each marker	
-        for ( $i=0; $i < $nRows_maps; $i++ ) {	
+        for ($i = 0; $i < $nRows_maps; $i++) {
             $maps[$i] = DB_fetchArray($res_maps);
-            if ((($A['active'] == 0)  || ($A['hidden'] == 1)) && !SEC_hasRights('maps.admin')) {
+            if ((($A['active'] == 0) || ($A['hidden'] == 1)) && !SEC_hasRights('maps.admin')) {
                 continue;
             }
             $item = $maps[$i]['mid'];
@@ -1748,543 +1761,544 @@ function MAPS_getGlobalMap ( $zoom='', $address='', $pagelist=false ) {
                 $label_color = '#000000';
             }
             $sql = "SELECT * FROM {$_TABLES['maps_markers']} WHERE mid=$item";
-            $jsmarkers .= MAPS_getMarkers($sql,$primary_color,$stroke_color,$marker_label, $label_color, 1, $maps[$i]['name'],0, $maps[$i]);
+            $jsmarkers .= MAPS_getMarkers($sql, $primary_color, $stroke_color, $marker_label, $label_color, 1, $maps[$i]['name'], 0, $maps[$i]);
         }
-        
-		if ($_MAPS_CONF['use_cluster'] == 0 ) {	
-			$T->set_var('markerclusterer', '');	
-		} else {
-			$T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
-			$jsmarkers .= LB . '				var markerCluster0 = new MarkerClusterer(map0, markers);' . LB; 
-		}
-        
-		$T->set_var('markers', $jsmarkers);
-		
-		//Ads			
-		$ads = MAPS_getAds (0);
-		$T->set_var('ads', $ads);
+
+        if ($_MAPS_CONF['use_cluster'] == 0) {
+            $T->set_var('markerclusterer', '');
+        } else {
+            $T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
+            $jsmarkers .= LB . '				var markerCluster0 = new MarkerClusterer(map0, markers);' . LB;
+        }
+
+        $T->set_var('markers', $jsmarkers);
+
+        //Ads
+        $ads = MAPS_getAds(0);
+        $T->set_var('ads', $ads);
 
         $T->set_var('edit_button', '');
 
-        $T->parse('output','page');
-        $retval .= $T->finish($T->get_var('output'));
-        
+        $T->parse('output', 'page');
+        $retval = $T->finish($T->get_var('output'));
+
         hitMap(0);
-        
+
         return $retval;
     } else {
-        echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
+        echo COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
     }
-    
+
 }
 
-function MAPS_getMarkers ($sql, $primaryColor, $strokecolor, $label, $label_color, $global, $mapname='', $mapid='', $map = array() )
-{  
+function MAPS_getMarkers($sql, $primaryColor, $strokecolor, $label, $label_color, $global, $mapname = '', $mapid = '', $map = array())
+{
     global $_TABLES, $LANG_MAPS_1, $_MAPS_CONF, $_CONF;
-	$map2  = $map;
-    
+    $map2 = $map;
 
-    $markers =  '' . LB;
-  
-    if($sql != '') {
-		$res_markers = DB_query($sql);
-		
-		$nRows  = DB_numRows($res_markers);
 
-		for ( $i=0; $i < $nRows; $i++ ) {
-			$marker = DB_fetchArray($res_markers);
-			if (SEC_hasAccess2($marker)) {
-				$markers .= MAPS_renderMarker($marker, $primaryColor, $strokecolor, $label, $label_color,
-				$mapname, $marker_fields[$marker['mkid']], '', $mapid, true, $map2 );
-			}
-		}
-	} else {
-	
-	}
-      
-  return $markers;
+    $markers = '' . LB;
+
+    if ($sql != '') {
+        $res_markers = DB_query($sql);
+
+        $nRows = DB_numRows($res_markers);
+
+        for ($i = 0; $i < $nRows; $i++) {
+            $marker = DB_fetchArray($res_markers);
+            if (SEC_hasAccess2($marker)) {
+                $markers .= MAPS_renderMarker($marker, $primaryColor, $strokecolor, $label, $label_color,
+                    $mapname, '', '', $mapid, true, $map2);
+            }
+        }
+    } else {
+
+    }
+
+    return $markers;
 }
 
 // $infos display or not infowindow
 
-function MAPS_renderMarker ($marker, $primaryColor, $strokecolor, $label, $label_color, $mapname='', $field_tab, $category='', $mapid=0, $infos=true, $map3)
+function MAPS_renderMarker($marker, $primaryColor, $strokecolor, $label, $label_color, $mapname = '', $field_tab, $category = '', $mapid = 0, $infos = true, $map3)
 {
     global $_CONF, $_MAPS_CONF, $LANG_MAPS_1, $_TABLES, $_USER;
-    
-	$use_icon = $map3['mmk_default']; // 0 false, 1 true
-	$icon_id = $map3['mmk_icon'];
+
+    $use_icon = $map3['mmk_default']; // 0 false, 1 true
+    $icon_id = $map3['mmk_icon'];
 
     //$category is not in use maps plugin v1.3
-	
-	$mkid = $marker['mkid'];
+
+    $mkid = $marker['mkid'];
     $marker['name'] = stripslashes($marker['name']);
-	
-	if (!MAPS_checkMarkervalidity($marker)) return;
-    
-    if ( ($marker['hidden'] == 1 && !SEC_hasRights('maps.admin') || $marker['active'] == 0) ) return;
-    if ( $marker['hidden'] == 1  && SEC_hasRights('maps.admin') ) $marker['name'] = $LANG_MAPS_1['marker_hidden'] . ' ' . $marker['name'];
-    
-	//custom marker priority on marker
+
+    if (!MAPS_checkMarkervalidity($marker)) return;
+
+    if (($marker['hidden'] == 1 && !SEC_hasRights('maps.admin') || $marker['active'] == 0)) return;
+    if ($marker['hidden'] == 1 && SEC_hasRights('maps.admin')) $marker['name'] = $LANG_MAPS_1['marker_hidden'] . ' ' . $marker['name'];
+
+    //custom marker priority on marker
     if ($marker['mk_default'] == 0) {
-	    
-		//custom icon
-	    if ($marker['mk_icon'] > 0) {
-		    // icon use an image
-		    $icon = DB_getItem($_TABLES['maps_map_icons'],'icon_image',"icon_id={$marker['mk_icon']}");
-			$image_path = $_MAPS_CONF['path_icons_images'] . $icon;
-			list($width, $height, $type, $attr)= getimagesize($image_path); 
-			if (file_exists($image_path) && $width != '' & $height != '') {
-			    // Creating a new marker  
-			    $markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-				     position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+
+        //custom icon
+        if ($marker['mk_icon'] > 0) {
+            // icon use an image
+            $icon = DB_getItem($_TABLES['maps_map_icons'], 'icon_image', "icon_id={$marker['mk_icon']}");
+            $image_path = $_MAPS_CONF['path_icons_images'] . $icon;
+            list($width, $height, $type, $attr) = getimagesize($image_path);
+            if (file_exists($image_path) && $width != '' & $height != '') {
+                // Creating a new marker
+                $markers = LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+				     position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 					 map:map' . $mapid . ',
-					 title: "' .  $marker['name'] . '",
+					 title: "' . $marker['name'] . '",
 					 animation: google.maps.Animation.DROP,
 					 icon: "' . $_MAPS_CONF['images_icons_url'] . $icon . '"
-					 });' . LB ;
-			} else {
-			    $markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-				     position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+					 });' . LB;
+            } else {
+                $markers = LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+				     position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 					 map:map' . $mapid . ',
 					 animation: google.maps.Animation.DROP,
-					 title: "' .  $marker['name'] . '"
-					 });' . LB ;
-			}
+					 title: "' . $marker['name'] . '"
+					 });' . LB;
+            }
         } else {
             //Use custom colors		
-			$primaryColor = substr ( $marker['mk_pcolor'] ,1, 6 );
-			$strokecolor = substr ( $marker['mk_scolor'] ,1, 6 );
-			if ($marker['mk_label_color'] == 1) {
-				$label_color = 'FFFFFF';
-			} else {
-				$label_color = '000000';
-			}
-			$label = $marker['mk_label'];
+            $primaryColor = substr($marker['mk_pcolor'], 1, 6);
+            $strokecolor = substr($marker['mk_scolor'], 1, 6);
+            if ($marker['mk_label_color'] == 1) {
+                $label_color = 'FFFFFF';
+            } else {
+                $label_color = '000000';
+            }
+            $label = $marker['mk_label'];
 
-			// Creating a new marker  
-			$markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-				     position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+            // Creating a new marker
+            $markers = LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+				     position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 					 map:map' . $mapid . ',
-					 title: "' .  $marker['name'] . '",
+					 title: "' . $marker['name'] . '",
 					 animation: google.maps.Animation.DROP,
-					 icon: "http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=' . $label . '|' . $primaryColor . '|' . $label_color . '"
-					 });' . LB ; 
-		}
-    }  else if ($use_icon == '0' && $icon_id != '0') {
-		// icon use an image
-		$icon = DB_getItem($_TABLES['maps_map_icons'],'icon_image',"icon_id={$icon_id}");
-		$image_path = $_MAPS_CONF['path_icons_images'] . $icon;
-		list($width, $height, $type, $attr)= getimagesize($image_path); 
-		if (file_exists($image_path) && $width != '' & $height != '') {
-			// Creating a new marker  
-			$markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-				 position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+					 icon: "//chart.apis.google.com/chart?chst=d_map_pin_letter&chld=' . $label . '|' . $primaryColor . '|' . $label_color . '"
+					 });' . LB;
+        }
+    } else if ($use_icon == '0' && $icon_id != '0') {
+        // icon use an image
+        $icon = DB_getItem($_TABLES['maps_map_icons'], 'icon_image', "icon_id={$icon_id}");
+        $image_path = $_MAPS_CONF['path_icons_images'] . $icon;
+        list($width, $height, $type, $attr) = getimagesize($image_path);
+        if (file_exists($image_path) && $width != '' & $height != '') {
+            // Creating a new marker
+            $markers = LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+				 position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 				 map:map' . $mapid . ',
-				 title: "' .  $marker['name'] . '",
+				 title: "' . $marker['name'] . '",
 				 animation: google.maps.Animation.DROP,
 				 icon: "' . $_MAPS_CONF['images_icons_url'] . $icon . '"
-				 });' . LB ;
-		} else {
-			$markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-				 position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+				 });' . LB;
+        } else {
+            $markers = LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+				 position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 				 map:map' . $mapid . ',
 				 animation: google.maps.Animation.DROP,
-				 title: "' .  $marker['name'] . '"
-				 });' . LB ;
-		}
-	}  else if ($use_icon == '0') {
-		// icon use custom colors
-		// Creating a new marker 		
-		$primaryColor = substr ( $primaryColor ,1, 6 );
-		$strokecolor = substr ( $strokecolor ,1, 6 );
+				 title: "' . $marker['name'] . '"
+				 });' . LB;
+        }
+    } else if ($use_icon == '0') {
+        // icon use custom colors
+        // Creating a new marker
+        $primaryColor = substr($primaryColor, 1, 6);
+        $strokecolor = substr($strokecolor, 1, 6);
 
-		$label_color = substr ( $label_color ,1, 6 );
+        $label_color = substr($label_color, 1, 6);
 
-		//https://developers.google.com/chart/image/docs/gallery/dynamic_icons
-		($primaryColor != '') ? $icon = LB . 'icon: "http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=' . $label . '|' . $primaryColor . '|' . $label_color . '"' : $icon = ''; 
-		
-		$markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-				     position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+        //https://developers.google.com/chart/image/docs/gallery/dynamic_icons
+        ($primaryColor != '') ? $icon = LB . 'icon: "//chart.apis.google.com/chart?chst=d_map_pin_letter&chld=' . $label . '|' . $primaryColor . '|' . $label_color . '"' : $icon = '';
+
+        $markers = LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+				     position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 					 map:map' . $mapid . ',
 					 animation: google.maps.Animation.DROP,
-					 title: "' .  $marker['name'] . '", ' . $icon . '
-					 });' . LB ;
-	} else {
-		// Creating a new marker  
-		$primaryColor = substr ( $primaryColor ,1, 6 );
-		$strokecolor = substr ( $strokecolor ,1, 6 );
+					 title: "' . $marker['name'] . '", ' . $icon . '
+					 });' . LB;
+    } else {
+        // Creating a new marker
+        $primaryColor = substr($primaryColor, 1, 6);
+        $strokecolor = substr($strokecolor, 1, 6);
 
-		$label_color = substr ( $label_color ,1, 6 );
+        $label_color = substr($label_color, 1, 6);
 
-		//https://developers.google.com/chart/image/docs/gallery/dynamic_icons
-		($primaryColor != '') ? $icon = LB . 'icon: "http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=' . $label . '|' . $primaryColor . '|' . $label_color . '"' : $icon = ''; 
-		
-		$markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-				     position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+        //https://developers.google.com/chart/image/docs/gallery/dynamic_icons
+        ($primaryColor != '') ? $icon = LB . 'icon: "//chart.apis.google.com/chart?chst=d_map_pin_letter&chld=' . $label . '|' . $primaryColor . '|' . $label_color . '"' : $icon = '';
+
+        $markers = LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+				     position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 					 map:map' . $mapid . ',
 					 animation: google.maps.Animation.DROP,
-					 title: "' .  $marker['name'] . '", ' . $icon . '
-					 });' . LB ;
+					 title: "' . $marker['name'] . '", ' . $icon . '
+					 });' . LB;
     }
-    
+
     // Content for infowindow
-	if ( $mapid >= 0 && is_numeric($mapid) ) {
-		$presentation = '';
-		if (file_exists($_CONF['path_data'] . 'maps_data/templates/presentation_tab.thtml')) {
-		    $template = COM_newTemplate($_CONF['path_data'] . 'maps_data/templates');
-		} else {
-    		$template = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-		}
-		$template->set_file(array('presentation' => 'presentation_tab.thtml'));
-		
-		//Limited marker
-		$limited = '';
-		if ( $marker['validity'] == 1 && SEC_hasRights('maps.admin') && ( strtotime($marker['validity_end']) > time() || strtotime($marker['validity_start']) < time() ) ) $limited = ' <span style="color:red">Limited</span>';
-		
-		$template->set_var('name', '<strong><span style="text-transform:uppercase;">' . addslashes($marker['name']) . '</span></strong>' . $limited);
-		
-		//description
-		(strlen($marker['description'])>150) ? $dots = '...' : $dots = '' ;
-		($marker['description'] != '') ? $description = '<p>' . preg_replace( "/\r|\n/", "", nl2br(mb_substr ( $marker['description'] ,0, 150 ))) . $dots . '</p>' : '';
-		$template->set_var('description', PLG_replaceTags(stripslashes($description)));
-		
-		//Ressources
-		$ressources = '';
-		$arr = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-
-		foreach ($arr as $value) {
-		    //For custom presentation_tab.thtml
-			$template->set_var('item_'. $value . '_label', $_MAPS_CONF['item_'. $value]);
-			$template->set_var('item_'. $value, PLG_replaceTags(stripslashes($marker['item_'. $value])));
-			if ($_MAPS_CONF['item_'. $value] != '' && $marker['item_'. $value] != '') {
-				$ressources .= '<h3>' . $_MAPS_CONF['item_'. $value] . '</h3>';
-				$ressources .= '<p>' . PLG_replaceTags($marker['item_'. $value]) . '</p>';
-			}
-		}
-		$template->set_var('ressources', $ressources);
-	
-		//Read more  
-		$read_more_url = '';
-		$lang_read_more = $LANG_MAPS_1['read_more'];
-
-		if ($marker['url'] == '') {
-		    $read_more_url = $_MAPS_CONF['site_url'] .'/markers.php?mode=show&mkid=' . $marker['mkid'] . '&mid=' . $marker['mid'];
-		} else {
-		    $read_more_url = $_CONF['site_url'] . '/' . $marker['url'];
-		    $funcname =  'MAPS_ReadMore_' . $marker['type'];
-			if (function_exists( $funcname ) ) $lang_read_more = $funcname(); 
-		}
-		
-		$template->set_var('read_more', '<a href="' . $read_more_url . '">' . $lang_read_more . '</a></p>');
+    if ($mapid >= 0 && is_numeric($mapid)) {
+        $presentation = '';
+        if (file_exists($_CONF['path_data'] . 'maps_data/templates/presentation_tab.thtml')) {
+            $template = COM_newTemplate($_CONF['path_data'] . 'maps_data/templates');
+        } else {
+            $template = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
+        }
+        $template->set_file(array('presentation' => 'presentation_tab.thtml'));
+
+        //Limited marker
+        $limited = '';
+        if ($marker['validity'] == 1 && SEC_hasRights('maps.admin') && (strtotime($marker['validity_end']) > time() || strtotime($marker['validity_start']) < time())) $limited = ' <span style="color:red">Limited</span>';
+
+        $template->set_var('name', '<strong><span style="text-transform:uppercase;">' . addslashes($marker['name']) . '</span></strong>' . $limited);
 
-		//Map
-		$mid = $marker['mid'];
-		$template->set_var('map', '<p>' . $LANG_MAPS_1['on_map'] . ' <a href="'. $_MAPS_CONF['site_url'] .'/index.php?mode=map&mid=' . $marker['mid'] . '&name=' . stripslashes($mapname) . '&query_limit=500">' . stripslashes($mapname) . '</a></p>');
+        //description
+        (strlen($marker['description']) > 150) ? $dots = '...' : $dots = '';
+        ($marker['description'] != '') ? $description = '<p>' . preg_replace("/\r|\n/", "", nl2br(mb_substr($marker['description'], 0, 150))) . $dots . '</p>' : '';
+        $template->set_var('description', PLG_replaceTags(stripslashes($description)));
+
+        //Ressources
+        $ressources = '';
+        $arr = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        foreach ($arr as $value) {
+            //For custom presentation_tab.thtml
+            $template->set_var('item_' . $value . '_label', $_MAPS_CONF['item_' . $value]);
+            $template->set_var('item_' . $value, PLG_replaceTags(stripslashes($marker['item_' . $value])));
+            if ($_MAPS_CONF['item_' . $value] != '' && $marker['item_' . $value] != '') {
+                $ressources .= '<h3>' . $_MAPS_CONF['item_' . $value] . '</h3>';
+                $ressources .= '<p>' . PLG_replaceTags($marker['item_' . $value]) . '</p>';
+            }
+        }
+        $template->set_var('ressources', $ressources);
+
+        //Read more
+        $read_more_url = '';
+        $lang_read_more = $LANG_MAPS_1['read_more'];
+
+        if ($marker['url'] == '') {
+            $read_more_url = $_MAPS_CONF['site_url'] . '/markers.php?mode=show&mkid=' . $marker['mkid'] . '&mid=' . $marker['mid'];
+        } else {
+            $read_more_url = $_CONF['site_url'] . '/' . $marker['url'];
+            $funcname = 'MAPS_ReadMore_' . $marker['type'];
+            if (function_exists($funcname)) $lang_read_more = $funcname();
+        }
+
+        $template->set_var('read_more', '<a href="' . $read_more_url . '">' . $lang_read_more . '</a></p>');
+
+        //Map
+        $mid = $marker['mid'];
+        $template->set_var('map', '<p>' . $LANG_MAPS_1['on_map'] . ' <a href="' . $_MAPS_CONF['site_url'] . '/index.php?mode=map&mid=' . $marker['mid'] . '&name=' . stripslashes($mapname) . '&query_limit=500">' . stripslashes($mapname) . '</a></p>');
 
         //Edit link
-		if (SEC_hasRights('maps.admin') || $_USER['uid'] == $marker['owner_id']) {
-			$template->set_var('edit', ' <a href="'. $_MAPS_CONF['site_url'] . '/markers.php?mode=edit&amp;mkid=' . $marker['mkid'] . '">' . $LANG_MAPS_1['edit_button'] . '</a>');
-		} else {
-			$template->set_var('edit', '');
-		}		
+        if (SEC_hasRights('maps.admin') || $_USER['uid'] == $marker['owner_id']) {
+            $template->set_var('edit', ' <a href="' . $_MAPS_CONF['site_url'] . '/markers.php?mode=edit&amp;mkid=' . $marker['mkid'] . '">' . $LANG_MAPS_1['edit_button'] . '</a>');
+        } else {
+            $template->set_var('edit', '');
+        }
 
-		$presentation .= $template->parse('output', 'presentation');
-		
-		$markers .= LB . '				var infowindow' . $marker['mkid'] . ' = new google.maps.InfoWindow({
+        $presentation .= $template->parse('output', 'presentation');
+
+        $markers .= LB . '				var infowindow' . $marker['mkid'] . ' = new google.maps.InfoWindow({
 			  content: \'' . addslashes($presentation) . '\'
 		  });' . LB;
-		
-		// Adding a click-event to the marker  
-		$markers .= LB . '				google.maps.event.addListener(marker' . $marker['mkid'] . ', \'click\', function() {
-			infowindow' . $marker['mkid'] . '.open(map' . $mapid . ',marker' . $marker['mkid'] .');
+
+        // Adding a click-event to the marker
+        $markers .= LB . '				google.maps.event.addListener(marker' . $marker['mkid'] . ', \'click\', function() {
+			infowindow' . $marker['mkid'] . '.open(map' . $mapid . ',marker' . $marker['mkid'] . ');
 		  });' . LB;
 
-	} else {
-	    if ( $mapid == 'events' &&  $infos ) 
-		{
-			//Display infoWindow for events map
-			$presentation = '';
-			$template = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-			$template->set_file(array('presentation_event' => 'presentation_tab_event.thtml'));
-			
-			$template->set_var('name', '<strong><span style="text-transform:uppercase;">' . $marker['name'] . '</span></strong>');
-			
-			//description
-            (strlen($marker['description'])>150) ? $dots = '...' : $dots = '' ;
-			($marker['description'] != '') ? $description = '<p>' . preg_replace( "/\r|\n/", "", nl2br(mb_substr ( $marker['description'] ,0, 150 ))) . $dots . '</p>' : '';
-			$template->set_var('description', $description);
-			
-			//Read more  
-			$template->set_var('read_more', '<a href="'. $_CONF['site_url'] .'/calendar/event.php?eid=' . $marker['mkid'] . '">' . $LANG_MAPS_1['read_more'] . '</a></p>');
+    } else {
+        if ($mapid == 'events' && $infos) {
+            //Display infoWindow for events map
+            $presentation = '';
+            $template = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
+            $template->set_file(array('presentation_event' => 'presentation_tab_event.thtml'));
 
-			//Map
-			$template->set_var('map', '');	
+            $template->set_var('name', '<strong><span style="text-transform:uppercase;">' . $marker['name'] . '</span></strong>');
 
-			$presentation .= $template->parse('output', 'presentation_event');
-			
-			$markers .= LB . '				var infowindow' . $marker['mkid'] . ' = new google.maps.InfoWindow({
+            //description
+            (strlen($marker['description']) > 150) ? $dots = '...' : $dots = '';
+            ($marker['description'] != '') ? $description = '<p>' . preg_replace("/\r|\n/", "", nl2br(mb_substr($marker['description'], 0, 150))) . $dots . '</p>' : '';
+            $template->set_var('description', $description);
+
+            //Read more
+            $template->set_var('read_more', '<a href="' . $_CONF['site_url'] . '/calendar/event.php?eid=' . $marker['mkid'] . '">' . $LANG_MAPS_1['read_more'] . '</a></p>');
+
+            //Map
+            $template->set_var('map', '');
+
+            $presentation .= $template->parse('output', 'presentation_event');
+
+            $markers .= LB . '				var infowindow' . $marker['mkid'] . ' = new google.maps.InfoWindow({
 				  content: \'' . addslashes($presentation) . '\'
 			  });' . LB;
-			
-			// Adding a click-event to the marker  
-			$markers .= LB . '				google.maps.event.addListener(marker' . $marker['mkid'] . ', \'click\', function() {
-				infowindow' . $marker['mkid'] . '.open(map' . $mapid . ',marker' . $marker['mkid'] .');
+
+            // Adding a click-event to the marker
+            $markers .= LB . '				google.maps.event.addListener(marker' . $marker['mkid'] . ', \'click\', function() {
+				infowindow' . $marker['mkid'] . '.open(map' . $mapid . ',marker' . $marker['mkid'] . ');
 			  });' . LB;
-		}
-		
-	}
-	
+        }
+
+    }
+
     // Add marker to map
-    if ( $_MAPS_CONF['use_cluster'] == 1 ) {
-        $markers .= '				    markers.push(marker' . $marker['mkid'] .');' . LB;
-	}
+    if ($_MAPS_CONF['use_cluster'] == 1) {
+        $markers .= '				    markers.push(marker' . $marker['mkid'] . ');' . LB;
+    }
 
     return $markers;
 }
 
 function MAPS_checkMarkervalidity($marker)
 {
-    if ( !SEC_hasAccess2($marker) ) return false;
-	
-	if ( $marker['validity'] == 1 && ! SEC_hasRights('maps.admin')) {
-	    if ( strtotime($marker['validity_end']) > time() || strtotime($marker['validity_start']) < time() ) return false;
-	}
-	
-	return true;
+    if (!SEC_hasAccess2($marker)) return false;
+
+    if ($marker['validity'] == 1 && !SEC_hasRights('maps.admin')) {
+        if (strtotime($marker['validity_end']) > time() || strtotime($marker['validity_start']) < time()) return false;
+    }
+
+    return true;
 }
 
-function MAPS_selectedMarkers($width, $height, $zoom, $mkids=array()) {
-    
-	global $_TABLES;
-	
-	//Center the map in the centre of the markers
-	$allmkid = rtrim(implode(', ', $mkids), ', ');
-	$sql = "SELECT mk.*, ma.mmk_default, ma.mmk_icon, ma.name as mapname, ma.primary_color, ma.stroke_color, ma.label, ma.label_color  FROM {$_TABLES['maps_markers']} AS mk
+function MAPS_selectedMarkers($width, $height, $zoom, $mkids = array())
+{
+
+    global $_TABLES;
+
+    //Center the map in the centre of the markers
+    $allmkid = rtrim(implode(', ', $mkids), ', ');
+    $sql = "SELECT mk.*, ma.mmk_default, ma.mmk_icon, ma.name as mapname, ma.primary_color, ma.stroke_color, ma.label, ma.label_color  FROM {$_TABLES['maps_markers']} AS mk
 	    LEFT JOIN {$_TABLES['maps_maps']} AS ma ON mk.mid = ma.mid
 	    WHERE mkid IN ({$allmkid})";
-	$res = DB_query($sql);
-	if (!$res) return '';
-	while ($A = DB_fetchArray($res, false)) {
-		$markers[] = $A;
-		$lat = $lat + $A['lat'];
-		$lng = $lng + $A['lng'];
-		$i++;
-	}
-	$lat = $lat / $i;
-	$lng = $lng / $i;
-
-	return MAPS_getMarkerDetail (0, $markers, 1, $width, $height, $zoom, $lat, $lng);
+    $res = DB_query($sql);
+    if (!$res) return '';
+
+    $lat = 0.0;
+    $lng = 0.0;
+    $i = 0;
+    $markers = array();
+
+    while ($A = DB_fetchArray($res, false)) {
+        $markers[] = $A;
+        $lat = $lat + $A['lat'];
+        $lng = $lng + $A['lng'];
+        $i++;
+    }
+    $lat = $lat / $i;
+    $lng = $lng / $i;
+
+    return MAPS_getMarkerDetail(0, $markers, 1, $width, $height, $zoom, $lat, $lng);
 }
 
 // $mkid unique marker id or array of markers datas
-function MAPS_getMarkerDetail ($mid=0, $mkid, $autotag=0, $mapwidth ='100%', $mapheight='300px', $mapzoom='10', $lat='0', $lng='0')
+function MAPS_getMarkerDetail($mid = 0, $mkid, $autotag = 0, $mapwidth = '100%', $mapheight = '300px', $mapzoom = '10', $lat = '0', $lng = '0')
 {
     global $_TABLES, $LANG_MAPS_1, $_MAPS_CONF, $_CONF;
 
     $retval = '';
-	
-	//One marker
-	if ($mid > 0) {
-		//Map info
-		$res_map = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE mid=$mid LIMIT 1");
-		
-		if (DB_numRows($res_map) < 1) {
-			echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
-			exit ();
-		}
-		
-		$A = DB_fetchArray($res_map);
-		
-		// Ensure user has the rights to access this map
-		if (!SEC_hasAccess2($A)) return;
-		
-		$primaryColor = $A['primary_color'];
-		$strokecolor = $A['stroke_color'];
-		if ($A['label_color'] == 1) {
-			$label_color = '#FFFFFF';
-		} else {
-			$label_color = '#000000';
-		}
-		$label = $A['label'];
-    
-		//marker info
-		$markers =  '' . LB;
-		$sql = "SELECT * FROM {$_TABLES['maps_markers']} WHERE mkid=$mkid LIMIT 1";
-		$res_markers = DB_query($sql);
-		$marker = DB_fetchArray($res_markers);
-		
-		//check marker validity
-		if( !MAPS_checkMarkervalidity($marker) ) return $LANG_MAPS_1['marker_limited'];
 
-		if ( !defined('MAPS_PAGE_TITLE') ) define( 'MAPS_PAGE_TITLE', stripslashes($marker['name']));
-		
-		$markers = MAPS_renderMarker ($marker, $primaryColor, $strokecolor, $label, $label_color, $A['name'],
-									$marker_fields[$mkid], '', $mkid, true, $A);
+    //One marker
+    if ($mid > 0) {
+        //Map info
+        $res_map = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE mid=$mid LIMIT 1");
 
-		$T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-		
-		if ($autotag==0) {
-			$T->set_file('page', 'map.thtml');
-		} else {
-			$T->set_file('page', 'map_autotag.thtml');
-		}
-		$T->set_var('mid', $mkid);
-		$T->set_var('name', '');
-		$T->set_var('description', '');
-		$T->set_var('header', '');
-		$T->set_var('footer', '');
-
-		//address from marker
-		$T->set_var('address', addslashes($marker['address']));
-		$lat = str_replace(",",".",$marker['lat']);
-		$lng = str_replace(",",".",$marker['lng']);
-		$T->set_var('lat', $lat);
-		$T->set_var('lng', $lng);
-		$T->set_var('zoom', $_MAPS_CONF['detail_zoom']);
-
-		$T->set_var('map_type', $_MAPS_CONF['global_type']);
-		$T->set_var('map_width', $_MAPS_CONF['global_width']);
-		
-		$T->set_var('map_height', $_MAPS_CONF['map_height_geotag']);
-		
-		//directions
-		$gid = $marker['mkid'];
-		$T->set_var('gid', $gid); 
-		$value = htmlentities($LANG_MAPS_1['value_directions'], ENT_QUOTES);
-		
-		$T->set_var('directions_input', '<div id="map_directions">
+        if (DB_numRows($res_map) < 1) {
+            COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
+        }
+
+        $A = DB_fetchArray($res_map);
+
+        // Ensure user has the rights to access this map
+        if (!SEC_hasAccess2($A)) return;
+
+        $primaryColor = $A['primary_color'];
+        $strokecolor = $A['stroke_color'];
+        if ($A['label_color'] == 1) {
+            $label_color = '#FFFFFF';
+        } else {
+            $label_color = '#000000';
+        }
+        $label = $A['label'];
+
+        //marker info
+        $markers = '' . LB;
+        $sql = "SELECT * FROM {$_TABLES['maps_markers']} WHERE mkid=$mkid LIMIT 1";
+        $res_markers = DB_query($sql);
+        $marker = DB_fetchArray($res_markers);
+
+        //check marker validity
+        if (!MAPS_checkMarkervalidity($marker)) return $LANG_MAPS_1['marker_limited'];
+
+        if (!defined('MAPS_PAGE_TITLE')) define('MAPS_PAGE_TITLE', stripslashes($marker['name']));
+
+        $markers = MAPS_renderMarker($marker, $primaryColor, $strokecolor, $label, $label_color, $A['name'], '', '', $mkid, true, $A);
+
+        $T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
+
+        if ($autotag == 0) {
+            $T->set_file('page', 'map.thtml');
+        } else {
+            $T->set_file('page', 'map_autotag.thtml');
+        }
+        $T->set_var('mid', $mkid);
+        $T->set_var('name', '');
+        $T->set_var('description', '');
+        $T->set_var('header', '');
+        $T->set_var('footer', '');
+
+        //address from marker
+        $T->set_var('address', addslashes($marker['address']));
+        $lat = str_replace(",", ".", $marker['lat']);
+        $lng = str_replace(",", ".", $marker['lng']);
+        $T->set_var('lat', $lat);
+        $T->set_var('lng', $lng);
+        $T->set_var('zoom', $_MAPS_CONF['detail_zoom']);
+
+        $T->set_var('map_type', $_MAPS_CONF['global_type']);
+        $T->set_var('map_width', $_MAPS_CONF['global_width']);
+
+        $T->set_var('map_height', $_MAPS_CONF['map_height_geotag']);
+
+        //directions
+        $gid = $marker['mkid'];
+        $T->set_var('gid', $gid);
+        $value = htmlentities($LANG_MAPS_1['value_directions'], ENT_QUOTES);
+
+        $T->set_var('directions_input', '<div id="map_directions">
 			<small>&nbsp; ' . $LANG_MAPS_1['need_directions'] . '<br />
 			<input type="text" id="from_address' . $gid . '" value="' . $value . '" onfocus="if (this.value==\'' . $value . '\')this.value=\'\';" onblur="if(this.value==\'\')this.value=\'' . $value . '\';" size="30" style="width:200px;"/>
-			<input type="button" value="' . $LANG_MAPS_1['get_directions'] . '"  onClick="get_directions' . $gid .'();" />
+			<input type="button" value="' . $LANG_MAPS_1['get_directions'] . '"  onClick="get_directions' . $gid . '();" />
 			</small>
 		  </div>');
-		  
-		$T->set_var('current_address', addslashes($marker['address'])); 
-		
-		//markers
-		$jsmarkers = 'var markers = [];';
-		$jsmarkers .= $markers;
-		if ($_MAPS_CONF['use_cluster'] == 0 ) {	
-				$T->set_var('markerclusterer', '');	
-		} else {
-				$T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
 
-				$jsmarkers .= LB . '				var markerCluster = new MarkerClusterer(map' . $mkid .  ', markers);' . LB;
+        $T->set_var('current_address', addslashes($marker['address']));
 
-		}
-		
-		$T->set_var('markers', $jsmarkers);
-		
-		//Ads			
-		$ads = MAPS_getAds ($mkid);
-		$T->set_var('ads', $ads);
+        //markers
+        $jsmarkers = 'var markers = [];';
+        $jsmarkers .= $markers;
+        if ($_MAPS_CONF['use_cluster'] == 0) {
+            $T->set_var('markerclusterer', '');
+        } else {
+            $T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
 
-		//Todo edit button
-		$T->set_var('edit_button', '');
+            $jsmarkers .= LB . '				var markerCluster = new MarkerClusterer(map' . $mkid . ', markers);' . LB;
 
-		$T->parse('output','page');
-		$retval .= $T->finish($T->get_var('output'));
-	} else {
-	    //Selected markers
+        }
+
+        $T->set_var('markers', $jsmarkers);
+
+        //Ads
+        $ads = MAPS_getAds($mkid);
+        $T->set_var('ads', $ads);
+
+        //Todo edit button
+        $T->set_var('edit_button', '');
+
+        $T->parse('output', 'page');
+        $retval .= $T->finish($T->get_var('output'));
+    } else {
+        //Selected markers
         $randid = rand();
-		$markers =  '' . LB;
-		
-		foreach ($mkid as $mkinfos) {
+        $markers = '' . LB;
 
-			//check marker validity
-			if( !MAPS_checkMarkervalidity($mkinfos) ) continue;
+        foreach ($mkid as $mkinfos) {
 
-			if ( !defined('MAPS_PAGE_TITLE') ) define( 'MAPS_PAGE_TITLE', '');
-			
-			$primaryColor = $mkinfos['primary_color'];
-			$strokecolor = $mkinfos['stroke_color'];
-			if ($mkinfos['label_color'] == 1) {
-				$label_color = '#FFFFFF';
-			} else {
-				$label_color = '#000000';
-			}
-			$label = $mkinfos['label'];
-			
-			$markers .= MAPS_renderMarker ($mkinfos, $primaryColor, $strokecolor, $label, $label_color, $mkinfos['mapname'], '', '', $randid, true, $mkinfos);
-		}
+            //check marker validity
+            if (!MAPS_checkMarkervalidity($mkinfos)) continue;
 
-		$T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-		
-		if ($autotag==0) {
-			$T->set_file('page', 'map.thtml');
-		} else {
-			$T->set_file('page', 'map_autotag.thtml');
-		}
-		$T->set_var('mid', $randid);
-		$T->set_var('name', '');
-		$T->set_var('description', '');
-		$T->set_var('header', '');
-		$T->set_var('footer', '');
-		$T->set_var('address', '');
-		$T->set_var('lat', $lat);
-		$T->set_var('lng', $lng);
-		$T->set_var('zoom', $mapzoom);
-
-		$T->set_var('map_type', $_MAPS_CONF['global_type']);
-		$T->set_var('map_width', $mapwidth);
-		
-		$T->set_var('map_height', $mapheight);
-		
-		//directions
-		$T->set_var('gid', ''); 
-		$value = htmlentities($LANG_MAPS_1['value_directions'], ENT_QUOTES);
-		
-		$T->set_var('directions_input', '');
-		  
-		$T->set_var('current_address', ''); 
-		
-		//markers
-		$jsmarkers = 'var markers = [];';
-		$jsmarkers .= $markers;
-		if ($_MAPS_CONF['use_cluster'] == 0 ) {	
-				$T->set_var('markerclusterer', '');	
-		} else {
-				$T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
+            if (!defined('MAPS_PAGE_TITLE')) define('MAPS_PAGE_TITLE', '');
 
-				$jsmarkers .= LB . '				var markerCluster = new MarkerClusterer(map' . $randid .  ', markers);' . LB;
+            $primaryColor = $mkinfos['primary_color'];
+            $strokecolor = $mkinfos['stroke_color'];
+            if ($mkinfos['label_color'] == 1) {
+                $label_color = '#FFFFFF';
+            } else {
+                $label_color = '#000000';
+            }
+            $label = $mkinfos['label'];
 
-		}
-		
-		$T->set_var('markers', $jsmarkers);
-		
-		//Ads			
-		$ads = MAPS_getAds ($randid);
-		$T->set_var('ads', $ads);
+            $markers .= MAPS_renderMarker($mkinfos, $primaryColor, $strokecolor, $label, $label_color, $mkinfos['mapname'], '', '', $randid, true, $mkinfos);
+        }
+
+        $T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
+
+        if ($autotag == 0) {
+            $T->set_file('page', 'map.thtml');
+        } else {
+            $T->set_file('page', 'map_autotag.thtml');
+        }
+        $T->set_var('mid', $randid);
+        $T->set_var('name', '');
+        $T->set_var('description', '');
+        $T->set_var('header', '');
+        $T->set_var('footer', '');
+        $T->set_var('address', '');
+        $T->set_var('lat', $lat);
+        $T->set_var('lng', $lng);
+        $T->set_var('zoom', $mapzoom);
+
+        $T->set_var('map_type', $_MAPS_CONF['global_type']);
+        $T->set_var('map_width', $mapwidth);
+
+        $T->set_var('map_height', $mapheight);
+
+        //directions
+        $T->set_var('gid', '');
+        $value = htmlentities($LANG_MAPS_1['value_directions'], ENT_QUOTES);
+
+        $T->set_var('directions_input', '');
+
+        $T->set_var('current_address', '');
+
+        //markers
+        $jsmarkers = 'var markers = [];';
+        $jsmarkers .= $markers;
+        if ($_MAPS_CONF['use_cluster'] == 0) {
+            $T->set_var('markerclusterer', '');
+        } else {
+            $T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
 
-		//Edit button
-		$T->set_var('edit_button', '');
+            $jsmarkers .= LB . '				var markerCluster = new MarkerClusterer(map' . $randid . ', markers);' . LB;
+
+        }
+
+        $T->set_var('markers', $jsmarkers);
+
+        //Ads
+        $ads = MAPS_getAds($randid);
+        $T->set_var('ads', $ads);
+
+        //Edit button
+        $T->set_var('edit_button', '');
+
+        $T->parse('output', 'page');
+        $retval .= $T->finish($T->get_var('output'));
+    }
 
-		$T->parse('output','page');
-		$retval .= $T->finish($T->get_var('output'));
-	}
-    
     return $retval;
-    
+
 }
 
 /**
-*
-* Checks that the current user has the rights to moderate the
-* plugin, returns true if this is the case, false otherwise
-*
-* @return        boolean       Returns true if moderator
-*
-*/
+ * Checks that the current user has the rights to moderate the
+ * plugin, returns true if this is the case, false otherwise
+ *
+ * @return        boolean       Returns true if moderator
+ */
 function plugin_ismoderator_maps()
 {
     return SEC_hasRights('maps.admin');
 }
 
 /**
-*
-* Counts the items that are submitted
-*
-*/
+ * Counts the items that are submitted
+
+ */
 function plugin_submissioncount_maps()
 {
     global $_TABLES;
@@ -2293,49 +2307,47 @@ function plugin_submissioncount_maps()
 }
 
 /**
-* Shows marker submission form or diverts to marker editor if admin calls in
-*
-*/
-function plugin_submit_maps($marker='')
+ * Shows marker submission form or diverts to marker editor if admin calls in
+
+ */
+function plugin_submit_maps($marker = '')
 {
     global $_CONF, $_MAPS_CONF, $LANG12, $LANG_MAPS_1, $LANG_LOGIN, $_SCRIPTS;
 
     if (SEC_hasRights('maps.admin')) {
-	    echo COM_refresh ($_CONF['site_admin_url'] . '/plugins/maps/marker_edit.php');
-        exit;
-	}
-	
-	//set default for geocoder
-	$marker['lat'] = '37.4217913';
-	$marker['lng'] = '-122.08371390000002';
-	
-	COM_clearSpeedlimit ($_CONF['speedlimit'], 'submit');
+        COM_redirect($_CONF['site_admin_url'] . '/plugins/maps/marker_edit.php');
+    }
+
+    //set default for geocoder
+    $marker['lat'] = '37.4217913';
+    $marker['lng'] = '-122.08371390000002';
+
+    COM_clearSpeedlimit($_CONF['speedlimit'], 'submit');
 
     if ($_MAPS_CONF['marker_submission'] == 0) {
         return $LANG_MAPS_1['submission_disabled'];
     }
-    
+
     // Ensure user has the rights to access this page
-	// TODO use geeklog built-in login form
-	
+    // TODO use geeklog built-in login form
+
     if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) || ($_MAPS_CONF['maps_login_required'] == 1) || ($_MAPS_CONF['submit_login_required'] == 1))) {
-        $display .= COM_siteHeader('');
-		$display .= MAPS_user_menu();
-        $display .= COM_startBlock ($LANG_LOGIN[1], '',
-                                    COM_getBlockTemplate ('_msg_block', 'header'));
+        $display = MAPS_user_menu();
+        $display .= COM_startBlock($LANG_LOGIN[1], '',
+            COM_getBlockTemplate('_msg_block', 'header'));
         $login = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-        $login->set_file (array ('login'=>'submitloginrequired.thtml'));
-        $login->set_var ( 'xhtml', XHTML );
-        $login->set_var ('login_message', $LANG_LOGIN[2]);
-        $login->set_var ('site_url', $_CONF['site_url']);
-        $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
-        $login->set_var ('layout_url', $_CONF['layout_url']);
-        $login->set_var ('lang_login', $LANG_LOGIN[3]);
-        $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
-        $login->parse ('output', 'login');
-        $display .= $login->finish ($login->get_var('output'));
-        $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-        $display .= COM_siteFooter();
+        $login->set_file(array('login' => 'submitloginrequired.thtml'));
+        $login->set_var('xhtml', XHTML);
+        $login->set_var('login_message', $LANG_LOGIN[2]);
+        $login->set_var('site_url', $_CONF['site_url']);
+        $login->set_var('site_admin_url', $_CONF['site_admin_url']);
+        $login->set_var('layout_url', $_CONF['layout_url']);
+        $login->set_var('lang_login', $LANG_LOGIN[3]);
+        $login->set_var('lang_newuser', $LANG_LOGIN[4]);
+        $login->parse('output', 'login');
+        $display .= $login->finish($login->get_var('output'));
+        $display .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+        $display = COM_createHTMLDocument($display);
         COM_output($display);
         exit;
     }
@@ -2350,9 +2362,9 @@ function plugin_submit_maps($marker='')
 
     $template->set_var('lang_preview', $LANG12[32]);
     $template->set_var('lang_save', $LANG12[8]);
-    
+
     $template->set_var('arrow', '<img src="' . $_MAPS_CONF['site_url'] . '/images/arrow.png" alt=""align="absmiddle">&nbsp;');
-    
+
     //informations
     $template->set_var('informations', $LANG_MAPS_1['informations']);
     $template->set_var('name_label', $LANG_MAPS_1['marker_name_label']);
@@ -2369,10 +2381,11 @@ function plugin_submit_maps($marker='')
     $template->set_var('mid', $marker['mid']);
     $map_options = MAPS_recurseMaps($marker['mid']);
     if ($map_options == '') {
-        $display .= COM_startBlock($LANG_MAPS_1['error'],'','blockheader-message.thtml');
+        $display = COM_startBlock($LANG_MAPS_1['error'], '', 'blockheader-message.thtml');
         $display .= $LANG_MAPS_1['maps_empty'];
         $display .= COM_endBlock('blockfooter-message.thtml');
-        return ;
+
+        return;
     }
     $template->set_var('map_options', $map_options);
     $template->set_var('created_label', $LANG_MAPS_1['marker_created']);
@@ -2387,98 +2400,98 @@ function plugin_submit_maps($marker='')
     $template->set_var('presentation_tab', $LANG_MAPS_1['presentation_tab']);
     $template->set_var('description_label', $LANG_MAPS_1['description_label']);
     $template->set_var('description', $marker['description']);
-    
+
     $template->set_var('street_label', $LANG_MAPS_1['street_label']);
     if ($_MAPS_CONF['street'] == 1) {
-      $template->set_var('street', '<input type="text" name="street" value="' . $marker['street'] . '" size="80" maxlength="255">');
+        $template->set_var('street', '<input type="text" name="street" value="' . $marker['street'] . '" size="80" maxlength="255">');
     } else {
-      $template->set_var('street', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('street', $LANG_MAPS_1['not_use_see_config']);
     }
-    
+
     $template->set_var('code_label', $LANG_MAPS_1['code_label']);
     if ($_MAPS_CONF['code'] == 1) {
-      $template->set_var('code', '<input type="text" name="code" value="' . $marker['code'] . '" size="10" maxlength="10">');
+        $template->set_var('code', '<input type="text" name="code" value="' . $marker['code'] . '" size="10" maxlength="10">');
     } else {
-      $template->set_var('code', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('code', $LANG_MAPS_1['not_use_see_config']);
     }
-    
+
     $template->set_var('city_label', $LANG_MAPS_1['city_label']);
     if ($_MAPS_CONF['city'] == 1) {
-      $template->set_var('city', '<input type="text" name="city" value="' . $marker['city'] . '" size="80" maxlength="255">');
+        $template->set_var('city', '<input type="text" name="city" value="' . $marker['city'] . '" size="80" maxlength="255">');
     } else {
-      $template->set_var('city', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('city', $LANG_MAPS_1['not_use_see_config']);
     }
-    
+
     $template->set_var('state_label', $LANG_MAPS_1['state_label']);
     if ($_MAPS_CONF['state'] == 1) {
-      $template->set_var('state', '<input type="text" name="state" value="' . $marker['state'] . '" size="80" maxlength="255">');
+        $template->set_var('state', '<input type="text" name="state" value="' . $marker['state'] . '" size="80" maxlength="255">');
     } else {
-      $template->set_var('state', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('state', $LANG_MAPS_1['not_use_see_config']);
     }
-    
+
     $template->set_var('country_label', $LANG_MAPS_1['country_label']);
     if ($_MAPS_CONF['country'] == 1) {
-      $template->set_var('country', '<input type="text" name="country" value="' . $marker['country'] . '" size="80" maxlength="255">');
+        $template->set_var('country', '<input type="text" name="country" value="' . $marker['country'] . '" size="80" maxlength="255">');
     } else {
-      $template->set_var('country', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('country', $LANG_MAPS_1['not_use_see_config']);
     }
-    
+
     $template->set_var('tel_label', $LANG_MAPS_1['tel_label']);
     if ($_MAPS_CONF['tel'] == 1) {
-      $template->set_var('tel', '<input type="text" name="tel" value="' . $marker['tel'] . '" size="20" maxlength="20">');
+        $template->set_var('tel', '<input type="text" name="tel" value="' . $marker['tel'] . '" size="20" maxlength="20">');
     } else {
-      $template->set_var('tel', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('tel', $LANG_MAPS_1['not_use_see_config']);
     }
-    
+
     $template->set_var('fax_label', $LANG_MAPS_1['fax_label']);
     if ($_MAPS_CONF['fax'] == 1) {
-      $template->set_var('fax', '<input type="text" name="fax" value="' . $marker['fax'] . '" size="20" maxlength="20">');
+        $template->set_var('fax', '<input type="text" name="fax" value="' . $marker['fax'] . '" size="20" maxlength="20">');
     } else {
-      $template->set_var('fax', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('fax', $LANG_MAPS_1['not_use_see_config']);
     }
-    
+
     $template->set_var('web_label', $LANG_MAPS_1['web_label']);
     if ($_MAPS_CONF['web'] == 1) {
-      $template->set_var('web', '<input type="text" name="web" value="' . $marker['web'] . '" size="80" maxlength="255">');
+        $template->set_var('web', '<input type="text" name="web" value="' . $marker['web'] . '" size="80" maxlength="255">');
     } else {
-      $template->set_var('web', $LANG_MAPS_1['not_use_see_config']);
+        $template->set_var('web', $LANG_MAPS_1['not_use_see_config']);
     }
 
     //Tab ressources
     $template->set_var('ressources_tab', $LANG_MAPS_1['ressources_tab']);
     $template->set_var('max_char', $LANG_MAPS_1['max_char']);
-    
+
     $arr = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-    $ressources ='';
+    $ressources = '';
     foreach ($arr as $value) {
-        if ($_MAPS_CONF['item_'. $value] == '') {
-            $template->set_var('item_'. $value . '_label', '');
-            $template->set_var('item_'. $value, '');
+        if ($_MAPS_CONF['item_' . $value] == '') {
+            $template->set_var('item_' . $value . '_label', '');
+            $template->set_var('item_' . $value, '');
             $ressources .= '';
         } else {
-            $template->set_var('item_'. $value . '_label', $_MAPS_CONF['item_'. $value]);
-            $template->set_var('item_'. $value, $marker['item_'. $value]);
-            $ressources .= '<p>' . $_MAPS_CONF['item_'. $value] . ' <input type"text" name="item_' . $value . '" size="80" maxlength="255" value="' . $marker['item_'. $value] . '"></p>';
+            $template->set_var('item_' . $value . '_label', $_MAPS_CONF['item_' . $value]);
+            $template->set_var('item_' . $value, $marker['item_' . $value]);
+            $ressources .= '<p>' . $_MAPS_CONF['item_' . $value] . ' <input type"text" name="item_' . $value . '" size="80" maxlength="255" value="' . $marker['item_' . $value] . '"></p>';
         }
     }
     if ($ressources == '') {
         $ressources = $LANG_MAPS_1['empty_ressources'];
     }
     $template->set_var('ressources', $ressources);
-    
+
     //Form validation
     $template->set_var('save_button', $LANG_MAPS_1['save_button']);
     $template->set_var('delete_button', $LANG_MAPS_1['delete_button']);
     $template->set_var('lang_save', $LANG12[8]);
     if (is_numeric($marker['mkid'])) {
-        $template->set_var('mkid', '<input type="hidden" name="mkid" value="' . $marker['mkid'] .'" />');
+        $template->set_var('mkid', '<input type="hidden" name="mkid" value="' . $marker['mkid'] . '" />');
     } else {
         $template->set_var('mkid', '');
     }
-	
-	$_SCRIPTS->setJavaScriptLibrary('jquery');
-	
-	$js = LB . '
+
+    $_SCRIPTS->setJavaScriptLibrary('jquery');
+
+    $js = LB . '
     <script type="text/javascript">	
 		
 		var geocoder = new google.maps.Geocoder();
@@ -2497,8 +2510,8 @@ function plugin_submit_maps($marker='')
 				
 			var marker = new google.maps.Marker({
 			  map: map,
-			  position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
-			  title: "' .  $marker['name'] . '",
+			  position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
+			  title: "' . $marker['name'] . '",
 			  draggable:true,
               animation: google.maps.Animation.DROP,
 			});
@@ -2566,36 +2579,33 @@ function plugin_submit_maps($marker='')
 			var t1 = document.getElementById(\'geoaddress\').value;
 			document.getElementById(\'address\').value = t1;
 		}
-		</script>' . LB. LB;
-		
-	$_SCRIPTS->setJavaScript($js, false);
-	
+		</script>' . LB . LB;
+
+    $_SCRIPTS->setJavaScript($js, false);
+
     return $template->parse('output', 'form');
 }
 
 /**
-* Check marker submission form for missing fields
-* and Saves a marker submission
-*
-* @param    array   $A  Data for that submission
-* @return   string      HTML redirect
-*
-*/
+ * Check marker submission form for missing fields
+ * and Saves a marker submission
+ *
+ * @param    array $A Data for that submission
+ * @return   string      HTML redirect
+ */
 function plugin_savesubmission_maps($A)
 {
     global $_TABLES, $_USER, $LANG_MAPS_1, $_MAPS_CONF;
 
-    $retval = '';
-    
     // check for missing fields
     if (empty($A['name']) || empty($A['address'])) {
         COM_resetSpeedlimit($type = 'submit');
-        $retval = COM_siteHeader ('menu')
-            . COM_startBlock($LANG_MAPS_1['error'],'','blockheader-message.thtml')
+        $retval = COM_siteHeader('menu')
+            . COM_startBlock($LANG_MAPS_1['error'], '', 'blockheader-message.thtml')
             . $LANG_MAPS_1['missing_field']
             . COM_endBlock('blockfooter-message.thtml')
             . plugin_submit_maps($A)
-            . COM_siteFooter ();
+            . COM_siteFooter();
 
         return $retval;
     }
@@ -2608,163 +2618,162 @@ function plugin_savesubmission_maps($A)
 
     if ($_MAPS_CONF['marker_submission'] == 1) {
         if ($A['from'] > $A['to']) {
-            $display .= COM_startBlock($LANG_MAPS_1['error'],'','blockheader-message.thtml');
+            $display = COM_startBlock($LANG_MAPS_1['error'], '', 'blockheader-message.thtml');
             $display .= $LANG_MAPS_1['date_issue'];
             $display .= COM_endBlock('blockfooter-message.thtml');
             $A['validity_start'] = $A['from'];
             $A['validity_end'] = $A['to'];
             $display .= getMarkerForm($A);
-            break;
+
+            return COM_createHTMLDocument($display);
         }
-        
+
         // prepare strings for insertion
         $A['created'] = date("YmdHis");
         $A['modified'] = date("YmdHis");
 
         $A['from'] = date("Ymd");
         $A['to'] = date("Ymd");
-        
+
         // lat, lng can only contain numbers and a decimal
         if (empty($A['lat']) || empty($A['lng'])) {
             $address = $A['address'];
             // Updated to mysql 5.1
-			// $coords = MAPS_getCoords($address, &$lat, &$lng);
-			$coords = MAPS_getCoords($address, $lat, $lng);
+            // $coords = MAPS_getCoords($address, &$lat, &$lng);
+            $coords = MAPS_getCoords($address, $lat, $lng);
         } else {
-            $lat = addslashes ($A['lat']);
-            $lng = addslashes ($A['lng']);
+            $lat = addslashes($A['lat']);
+            $lng = addslashes($A['lng']);
         }
-        
+
         // Convert array values to numeric permission values
         if (is_array($A['perm_owner']) OR is_array($A['perm_group']) OR is_array($A['perm_members']) OR is_array($A['perm_anon'])) {
-            list($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']) = SEC_getPermissionValues($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
+            list($A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon']) = SEC_getPermissionValues($A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon']);
         }
-        $mkid = addslashes (COM_makeSid ());
-        
-        $A['name'] = addslashes ($A['name']);
-        $A['description'] = addslashes ($A['description']);
-        $A['address'] = addslashes ($A['address']);
-        $A['mid'] = addslashes ($A['mid']);
-        $A['remark'] = addslashes ($A['remark']);
-        $A['street'] = addslashes ($A['street']);
-        $A['city'] = addslashes ($A['city']);
-        $A['code'] = addslashes ($A['code']);
-        $A['state'] = addslashes ($A['state']);
-        $A['country'] = addslashes ($A['country']);
-        $A['tel'] = addslashes ($A['tel']);
-        $A['fax'] = addslashes ($A['fax']);
-        $A['web'] = addslashes ($A['web']);
-        $A['item_1'] = addslashes ($A['item_1']);
-        $A['item_2'] = addslashes ($A['item_2']);
-        $A['item_3'] = addslashes ($A['item_3']);
-        $A['item_4'] = addslashes ($A['item_4']);
-        $A['item_5'] = addslashes ($A['item_5']);
-        $A['item_6'] = addslashes ($A['item_6']);
-        $A['item_7'] = addslashes ($A['item_7']);
-        $A['item_8'] = addslashes ($A['item_8']);
-        $A['item_9'] = addslashes ($A['item_9']);
-        $A['item_10'] = addslashes ($A['item_10']);
-        
+        $mkid = addslashes(COM_makeSid());
+
+        $A['name'] = addslashes($A['name']);
+        $A['description'] = addslashes($A['description']);
+        $A['address'] = addslashes($A['address']);
+        $A['mid'] = addslashes($A['mid']);
+        $A['remark'] = addslashes($A['remark']);
+        $A['street'] = addslashes($A['street']);
+        $A['city'] = addslashes($A['city']);
+        $A['code'] = addslashes($A['code']);
+        $A['state'] = addslashes($A['state']);
+        $A['country'] = addslashes($A['country']);
+        $A['tel'] = addslashes($A['tel']);
+        $A['fax'] = addslashes($A['fax']);
+        $A['web'] = addslashes($A['web']);
+        $A['item_1'] = addslashes($A['item_1']);
+        $A['item_2'] = addslashes($A['item_2']);
+        $A['item_3'] = addslashes($A['item_3']);
+        $A['item_4'] = addslashes($A['item_4']);
+        $A['item_5'] = addslashes($A['item_5']);
+        $A['item_6'] = addslashes($A['item_6']);
+        $A['item_7'] = addslashes($A['item_7']);
+        $A['item_8'] = addslashes($A['item_8']);
+        $A['item_9'] = addslashes($A['item_9']);
+        $A['item_10'] = addslashes($A['item_10']);
+
         $sql = "'{$mkid}', '{$A['name']}', "
-             . "'{$A['description']}', "
-             . "'{$A['created']}', "
-             . "'{$A['modified']}', "
-             . "'0', "
-             . "'0', "	
-             . "'{$A['from']}', "
-             . "'{$A['to']}', "			 
-             . "'1', "
-             . "'0', "
-             . "'{$A['address']}', "
-             . "'{$lat}', "
-             . "'{$lng}', "
-             . "'{$A['mid']}', "
-             . "'{$A['remark']}', "
-             . "'{$A['street']}', "
-             . "'{$A['city']}', "
-             . "'{$A['code']}', "
-             . "'{$A['state']}', "
-             . "'{$A['country']}', "
-             . "'{$A['tel']}', "
-             . "'{$A['fax']}', "
-             . "'{$A['web']}', "
-             . "'{$A['item_1']}', "
-             . "'{$A['item_2']}', "
-             . "'{$A['item_3']}', "
-             . "'{$A['item_4']}', "
-             . "'{$A['item_5']}', "
-             . "'{$A['item_6']}', "
-             . "'{$A['item_7']}', "
-             . "'{$A['item_8']}', "
-             . "'{$A['item_9']}', "
-             . "'{$A['item_10']}', "
-             . "'{$_USER['uid']}', "
-             . "'{$A['group_id']}', "
-             . "'{$_MAPS_CONF['default_permissions'][0]}', "
-             . "'{$_MAPS_CONF['default_permissions'][1]}', "
-             . "'{$_MAPS_CONF['default_permissions'][2]}', "
-             . "'{$_MAPS_CONF['default_permissions'][3]}', "
-             . "'1', "
-			 . "'1'";
-        
-        DB_save ($_TABLES['maps_submission'],
-                'mkid, name, description, created, modified, payed, validity, validity_start, validity_end, active, hidden, address, lat, lng, mid, remark, street, city, code, state, country, tel, fax, web, item_1, item_2, item_3, item_4, item_5, item_6, item_7, item_8, item_9, item_10, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon, submission, mk_default',
-                "{$sql}");
-        
+            . "'{$A['description']}', "
+            . "'{$A['created']}', "
+            . "'{$A['modified']}', "
+            . "'0', "
+            . "'0', "
+            . "'{$A['from']}', "
+            . "'{$A['to']}', "
+            . "'1', "
+            . "'0', "
+            . "'{$A['address']}', "
+            . "'{$lat}', "
+            . "'{$lng}', "
+            . "'{$A['mid']}', "
+            . "'{$A['remark']}', "
+            . "'{$A['street']}', "
+            . "'{$A['city']}', "
+            . "'{$A['code']}', "
+            . "'{$A['state']}', "
+            . "'{$A['country']}', "
+            . "'{$A['tel']}', "
+            . "'{$A['fax']}', "
+            . "'{$A['web']}', "
+            . "'{$A['item_1']}', "
+            . "'{$A['item_2']}', "
+            . "'{$A['item_3']}', "
+            . "'{$A['item_4']}', "
+            . "'{$A['item_5']}', "
+            . "'{$A['item_6']}', "
+            . "'{$A['item_7']}', "
+            . "'{$A['item_8']}', "
+            . "'{$A['item_9']}', "
+            . "'{$A['item_10']}', "
+            . "'{$_USER['uid']}', "
+            . "'{$A['group_id']}', "
+            . "'{$_MAPS_CONF['default_permissions'][0]}', "
+            . "'{$_MAPS_CONF['default_permissions'][1]}', "
+            . "'{$_MAPS_CONF['default_permissions'][2]}', "
+            . "'{$_MAPS_CONF['default_permissions'][3]}', "
+            . "'1', "
+            . "'1'";
+
+        DB_save($_TABLES['maps_submission'],
+            'mkid, name, description, created, modified, payed, validity, validity_start, validity_end, active, hidden, address, lat, lng, mid, remark, street, city, code, state, country, tel, fax, web, item_1, item_2, item_3, item_4, item_5, item_6, item_7, item_8, item_9, item_10, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon, submission, mk_default',
+            "{$sql}");
+
         if (DB_error()) {
-            return COM_refresh($_MAPS_CONF['site_url'] . '/index.php?msg=3');
+            return COM_redirect($_MAPS_CONF['site_url'] . '/index.php?msg=3');
         } else {
             //Send notification to admin		
-            MAPS_sendNotification ($A);
-            return COM_refresh($_MAPS_CONF['site_url'] . '/index.php?msg=1');
+            MAPS_sendNotification($A);
+
+            return COM_redirect($_MAPS_CONF['site_url'] . '/index.php?msg=1');
         }
     } else {
-        return COM_refresh($_MAPS_CONF['site_url'] . '/index.php?msg=2');
+        return COM_redirect($_MAPS_CONF['site_url'] . '/index.php?msg=2');
     }
 }
 
 
 /**
-* Send an email notification for a new submission.
-*
-* @param    array   $A      submission data
-*
-*/
-function MAPS_sendNotification ($data, $modification = false)
+ * Send an email notification for a new submission.
+ *
+ * @param    array $A submission data
+ */
+function MAPS_sendNotification($data, $modification = false)
 {
     global $_CONF, $_MAPS_CONF, $LANG_MAPS_EMAIL, $LANG08, $_TABLES;
 
-    $name = stripslashes ($data['name']);
+    $name = stripslashes($data['name']);
     $description = stripslashes($data['description']);
     $map = DB_getItem($_TABLES['maps_maps'], 'name', "mid = '{$data['mid']}'");
 
     ($modification) ? $action = $LANG_MAPS_EMAIL['marker_modification'] : $action = $LANG_MAPS_EMAIL['new_marker'];
-	$mailbody = "$action\n\n"
-              . "{$LANG_MAPS_EMAIL['name']} $name\n"
-              . "{$LANG_MAPS_EMAIL['description']} $description\n\n"
-              . "{$LANG_MAPS_EMAIL['on_map']} $map\n\n";
+    $mailbody = "$action\n\n"
+        . "{$LANG_MAPS_EMAIL['name']} $name\n"
+        . "{$LANG_MAPS_EMAIL['description']} $description\n\n"
+        . "{$LANG_MAPS_EMAIL['on_map']} $map\n\n";
 
 
-    ($modification) ?  $mailbody .= $_MAPS_CONF['site_url'] . '/markers.php?mode=show&mkid=' . $data['mkid'] . '&mid=' . $data['mid'] : $mailbody .= "{$LANG_MAPS_EMAIL['submissions']} >> {$_CONF['site_admin_url']}/moderation.php>\n\n";
+    ($modification) ? $mailbody .= $_MAPS_CONF['site_url'] . '/markers.php?mode=show&mkid=' . $data['mkid'] . '&mid=' . $data['mid'] : $mailbody .= "{$LANG_MAPS_EMAIL['submissions']} >> {$_CONF['site_admin_url']}/moderation.php>\n\n";
 
-    ($modification) ?  $mailsubject = $_CONF['site_name'] . ' ' . $LANG_MAPS_EMAIL['marker_modification'] : $mailsubject = $_CONF['site_name'] . ' ' . $LANG_MAPS_EMAIL['marker_submissions'];
+    ($modification) ? $mailsubject = $_CONF['site_name'] . ' ' . $LANG_MAPS_EMAIL['marker_modification'] : $mailsubject = $_CONF['site_name'] . ' ' . $LANG_MAPS_EMAIL['marker_submissions'];
 
     $mailbody .= "\n------------------------------\n";
     $mailbody .= "\n$LANG08[34]\n";
     $mailbody .= "\n------------------------------\n";
 
-    COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody);
+    COM_mail($_CONF['site_mail'], $mailsubject, $mailbody);
 }
 
 /**
-* returns list of moderation values
-*
-* The array returned contains (in order): the row 'id' label, main plugin
-* table, moderation fields (comma seperated), and plugin submission table
-*
-* @return       array        Returns array of useful moderation values
-*
-*/
+ * returns list of moderation values
+ * The array returned contains (in order): the row 'id' label, main plugin
+ * table, moderation fields (comma seperated), and plugin submission table
+ *
+ * @return       array        Returns array of useful moderation values
+ */
 function plugin_moderationvalues_maps()
 {
     global $_TABLES;
@@ -2773,8 +2782,8 @@ function plugin_moderationvalues_maps()
 }
 
 /**
-* Returns SQL & Language texts to moderation.php
-*/
+ * Returns SQL & Language texts to moderation.php
+ */
 function plugin_itemlist_maps()
 {
     global $_TABLES, $LANG_MAPS_1;
@@ -2783,8 +2792,8 @@ function plugin_itemlist_maps()
         $plugin = new Plugin();
         $plugin->submissionlabel = $LANG_MAPS_1['markers_submissions'];
         $plugin->submissionhelpfile = 'http://geeklog.fr/wiki/plugins:maps#moderation';
-        $plugin->getsubmissionssql = "SELECT mkid AS id, name, created, address FROM " 
-                                   . $_TABLES['maps_submission'];
+        $plugin->getsubmissionssql = "SELECT mkid AS id, name, created, address FROM "
+            . $_TABLES['maps_submission'];
         $plugin->addSubmissionHeading($LANG_MAPS_1['name']);
         $plugin->addSubmissionHeading($LANG_MAPS_1['created']);
         $plugin->addSubmissionHeading($LANG_MAPS_1['address']);
@@ -2794,52 +2803,49 @@ function plugin_itemlist_maps()
 }
 
 /**
-* Performs plugin exclusive work for items approved by moderation
-*
-* While moderation.php handles the actual move from maps_submission
-* to maps_markers tables, within the function we handle all other approval
-* relate tasks
-*
-* @param      string       $id      Identifying string
-* @return     string       Any wanted HTML output
-*
-*/
+ * Performs plugin exclusive work for items approved by moderation
+ * While moderation.php handles the actual move from maps_submission
+ * to maps_markers tables, within the function we handle all other approval
+ * relate tasks
+ *
+ * @param      string $id Identifying string
+ * @return     string       Any wanted HTML output
+ */
 
 function plugin_moderationapprove_maps($id)
 {
     global $_TABLES, $_USER, $_CONF;
 
-    $result = DB_query("SELECT * FROM " . $_TABLES['groups'] 
-                     . " WHERE grp_name = 'Maps Admin'");
-    $group  = DB_fetchArray($result);
-    
+    $result = DB_query("SELECT * FROM " . $_TABLES['groups']
+        . " WHERE grp_name = 'Maps Admin'");
+    $group = DB_fetchArray($result);
+
     $sql = "UPDATE " . $_TABLES['maps_markers'] . " SET active = 1, submission = 0, group_id = " . $group['grp_id'] . " WHERE mkid = '$id'";
     $result = DB_query($sql);
 
     if (DB_error()) {
-       return 'Error';
+        return 'Error';
     }
+
     return '';
 }
 
 /**
-* Performs plugin exclusive work for items deleted by moderation
-*
-* While moderation.php handles the actual removal from <plugin>submission
-* table, within this function we handle all other deletion
-* relate tasks
-*
-* @param      string       $id      Identifying string
-* @return     string       Any wanted HTML output
-*
-*/
+ * Performs plugin exclusive work for items deleted by moderation
+ * While moderation.php handles the actual removal from <plugin>submission
+ * table, within this function we handle all other deletion
+ * relate tasks
+ *
+ * @param      string $id Identifying string
+ * @return     string       Any wanted HTML output
+ */
 
 function plugin_moderationdelete_maps($id)
 {
     global $_TABLES;
 }
 
-function hitMap ($map)
+function hitMap($map)
 {
     global $_TABLES;
     // increment hit counter for map
@@ -2850,16 +2856,16 @@ function hitMap ($map)
     }
 }
 
-function hitMarker ($mkid)
+function hitMarker($mkid)
 {
     global $_TABLES;
-    
-	// increment hit counter for marker
+
+    // increment hit counter for marker
     DB_query("UPDATE {$_TABLES['maps_markers']} SET hits = hits + 1 WHERE mkid = '$mkid'");
 
 }
 
-function updateMap ($map)
+function updateMap($map)
 {
     global $_TABLES;
     // update modification date for a map
@@ -2868,197 +2874,195 @@ function updateMap ($map)
 }
 
 /**
-* Returns the user option for this plugin
-*
-* Adds the plugin to the user menu
-*
-* Universal Plugin:  modify/uncomment use it
-*
-* @return   array   Array containing (plugin name, plugin user url, 0)
-*
-*/
-function plugin_getuseroption_maps() 
+ * Returns the user option for this plugin
+ * Adds the plugin to the user menu
+ * Universal Plugin:  modify/uncomment use it
+ *
+ * @return   array   Array containing (plugin name, plugin user url, 0)
+ */
+function plugin_getuseroption_maps()
 {
     global $_MAPS_CONF, $LANG_MAPS_1;
- 
-    if ($_MAPS_CONF['marker_submission']==1) return array($LANG_MAPS_1['my_markers'], $_MAPS_CONF['site_url'] . '/markers.php', 0);
+
+    if ($_MAPS_CONF['marker_submission'] == 1) return array($LANG_MAPS_1['my_markers'], $_MAPS_CONF['site_url'] . '/markers.php', 0);
 }
 
-function MAPS_message ($message, $title='')
+function MAPS_message($message, $title = '')
 {
     global $LANG_MAPS_MESSAGE;
-    
+
     $retval = '';
     if (!empty($message)) {
-        $retval = COM_startBlock(($title == '')? $LANG_MAPS_MESSAGE['message'] : $title, '', 'blockheader-message.thtml');
+        $retval = COM_startBlock(($title == '') ? $LANG_MAPS_MESSAGE['message'] : $title, '', 'blockheader-message.thtml');
         $retval .= stripslashes($message);
         $retval .= COM_endBlock('blockfooter-message.thtml');
     }
+
     return $retval;
 }
 
-function MAPS_ViewMarkerInfos ($mkid) 
+function MAPS_ViewMarkerInfos($mkid)
 {
     global $LANG_MAPS_1, $_TABLES, $_CONF, $_MAPS_CONF, $_USER;
-    
+
     if ($mkid == '') return;
-    
+
     $sql = "SELECT * FROM {$_TABLES['maps_markers']} WHERE mkid=$mkid LIMIT 1";
     $res_markers = DB_query($sql);
     $marker = DB_fetchArray($res_markers);
-    
-    if(!MAPS_checkMarkervalidity($marker)) return;
-    
+
+    if (!MAPS_checkMarkervalidity($marker)) return;
+
     // Presentation tab
     $presentation = '';
     $template = new Template($_CONF['path'] . 'plugins/maps/templates');
     $template->set_file(array('presentation' => 'marker.thtml'));
-	
-	//Limited marker
-	$limited = '';
-	if ( $marker['validity'] == 1 && SEC_hasRights('maps.admin') && ( strtotime($marker['validity_end']) > time() || strtotime($marker['validity_start']) < time() ) ) $limited = ' <span style="color:red">Limited</span>';
-	
+
+    //Limited marker
+    $limited = '';
+    if ($marker['validity'] == 1 && SEC_hasRights('maps.admin') && (strtotime($marker['validity_end']) > time() || strtotime($marker['validity_start']) < time())) $limited = ' <span style="color:red">Limited</span>';
+
     $template->set_var('name', '<span style=\"text-transform:uppercase;\">' . stripslashes($marker['name']) . '</span> ' . $limited);
-    
-	//ressources tab
+
+    //ressources tab
     $ressources = '';
     $arr = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-        
+
     //payed marker
-    if ( $_MAPS_CONF['monetize'] == 0 ) {
+    if ($_MAPS_CONF['monetize'] == 0) {
         if ($marker['description'] != '') {
-        $description = nl2br(stripslashes($marker['description']));
-        $description = str_replace("\n", "", $description);
-        $description = str_replace("\r", "", $description);
-        $template->set_var('description', '<p>' . $description . '</p>');
+            $description = nl2br(stripslashes($marker['description']));
+            $description = str_replace("\n", "", $description);
+            $description = str_replace("\r", "", $description);
+            $template->set_var('description', '<p>' . $description . '</p>');
         } else {
-        $template->set_var('description', '');
+            $template->set_var('description', '');
         }
 
         if ($_MAPS_CONF['street'] == 1 && $marker['street'] != '') {
-          $template->set_var('street',  '<p><strong>' . $LANG_MAPS_1['street_label'] . '</strong> ' . stripslashes($marker['street']) . '</p>');
+            $template->set_var('street', '<p><strong>' . $LANG_MAPS_1['street_label'] . '</strong> ' . stripslashes($marker['street']) . '</p>');
         } else {
-          $template->set_var('street', '');
+            $template->set_var('street', '');
         }
-        
+
         if ($_MAPS_CONF['code'] == 1 && $marker['code'] != '') {
-          $template->set_var('code',  '<strong>' . $LANG_MAPS_1['code_label'] . '</strong> ' . $marker['code']);
+            $template->set_var('code', '<strong>' . $LANG_MAPS_1['code_label'] . '</strong> ' . $marker['code']);
         } else {
-          $template->set_var('code', '');
+            $template->set_var('code', '');
         }
-        
+
         if ($_MAPS_CONF['city'] == 1 && $marker['city'] != '') {
-          $template->set_var('city',  '<strong>' . $LANG_MAPS_1['city_label'] . '</strong> ' . stripslashes($marker['city']));
+            $template->set_var('city', '<strong>' . $LANG_MAPS_1['city_label'] . '</strong> ' . stripslashes($marker['city']));
         } else {
-          $template->set_var('city', '');
+            $template->set_var('city', '');
         }
-        
+
         if ($_MAPS_CONF['state'] == 1 && $marker['state'] != '') {
-          $template->set_var('state',  '<p><strong>' . $LANG_MAPS_1['state_label'] . '</strong> ' . $marker['state'] . '</p>');
+            $template->set_var('state', '<p><strong>' . $LANG_MAPS_1['state_label'] . '</strong> ' . $marker['state'] . '</p>');
         } else {
-          $template->set_var('state', '');
+            $template->set_var('state', '');
         }
-        
+
         if ($_MAPS_CONF['country'] == 1 && $marker['country'] != '') {
-          $template->set_var('country',  '<p><strong>' . $LANG_MAPS_1['country_label'] . '</strong> ' . stripslashes($marker['country']) . '</p>');
+            $template->set_var('country', '<p><strong>' . $LANG_MAPS_1['country_label'] . '</strong> ' . stripslashes($marker['country']) . '</p>');
         } else {
-          $template->set_var('country', '');
+            $template->set_var('country', '');
         }
-        
+
         if ($_MAPS_CONF['tel'] == 1 && $marker['tel'] != '') {
-          $template->set_var('tel', '<p><strong>' . $LANG_MAPS_1['tel_label'] . '</strong> ' . $marker['tel'] . '</p>');
+            $template->set_var('tel', '<p><strong>' . $LANG_MAPS_1['tel_label'] . '</strong> ' . $marker['tel'] . '</p>');
         } else {
-          $template->set_var('tel', '');
+            $template->set_var('tel', '');
         }
-        
+
         if ($_MAPS_CONF['fax'] == 1 && $marker['fax'] != '') {
-          $template->set_var('fax', '<p><strong>' . $LANG_MAPS_1['fax_label'] . '</strong> ' . $marker['fax'] . '</p>');
+            $template->set_var('fax', '<p><strong>' . $LANG_MAPS_1['fax_label'] . '</strong> ' . $marker['fax'] . '</p>');
         } else {
-          $template->set_var('fax', '');
+            $template->set_var('fax', '');
         }
-        
+
         if ($_MAPS_CONF['web'] == 1 && $marker['web'] != '') {
-          $template->set_var('web', '<p><strong>' . $LANG_MAPS_1['web_label'] . '</strong> ' . MAPS_convertLinkToUrl($marker['web']) . '</p>');
+            $template->set_var('web', '<p><strong>' . $LANG_MAPS_1['web_label'] . '</strong> ' . MAPS_convertLinkToUrl($marker['web']) . '</p>');
         } else {
-          $template->set_var('web', '');
+            $template->set_var('web', '');
         }
-        
+
         //Ressources tab
         foreach ($arr as &$value) {
-            if ($_MAPS_CONF['item_'. $value] == '') {
+            if ($_MAPS_CONF['item_' . $value] == '') {
                 $ressources .= '';
             } else {
-                if ($marker['item_'. $value] != ''){
-                    $content = str_replace(array("\r\n", "\n", "\r", "  "), '', addslashes($marker['item_'. $value]));
-                    $ressources .= '<p><strong>' . $_MAPS_CONF['item_'. $value] . '</strong></p><p>' . stripslashes($content) . '</p>';
-                } 
+                if ($marker['item_' . $value] != '') {
+                    $content = str_replace(array("\r\n", "\n", "\r", "  "), '', addslashes($marker['item_' . $value]));
+                    $ressources .= '<p><strong>' . $_MAPS_CONF['item_' . $value] . '</strong></p><p>' . stripslashes($content) . '</p>';
+                }
             }
         }
-    } elseif (($marker['payed'] == 1 ) && ($_MAPS_CONF['monetize'] == 1)) {
+    } elseif (($marker['payed'] == 1) && ($_MAPS_CONF['monetize'] == 1)) {
         if ($marker['description'] != '') {
-        $template->set_var('description', '<p>' . stripslashes($marker['description']) . '</p>');
+            $template->set_var('description', '<p>' . stripslashes($marker['description']) . '</p>');
         } else {
-        $template->set_var('description', '');
+            $template->set_var('description', '');
         }
         if ($_MAPS_CONF['street'] == 1 && $marker['street'] != '') {
-          $template->set_var('street', stripslashes($marker['street']) . '&nbsp;');
+            $template->set_var('street', stripslashes($marker['street']) . '&nbsp;');
         } else {
-          $template->set_var('street', '');
+            $template->set_var('street', '');
         }
         if ($_MAPS_CONF['code'] == 1 && $marker['code'] != '') {
-          $template->set_var('code', $marker['code'] . '&nbsp;');
+            $template->set_var('code', $marker['code'] . '&nbsp;');
         } else {
-          $template->set_var('code', '');
+            $template->set_var('code', '');
         }
         if ($_MAPS_CONF['city'] == 1 && $marker['city'] != '') {
-          $template->set_var('city', stripslashes($marker['city']) . '&nbsp;');
+            $template->set_var('city', stripslashes($marker['city']) . '&nbsp;');
         } else {
-          $template->set_var('city', '');
+            $template->set_var('city', '');
         }
         if ($_MAPS_CONF['state'] == 1 && $marker['state'] != '') {
-          $template->set_var('state', $marker['state'] . '&nbsp;');
+            $template->set_var('state', $marker['state'] . '&nbsp;');
         } else {
-          $template->set_var('state', '');
+            $template->set_var('state', '');
         }
         if ($_MAPS_CONF['country'] == 1 && $marker['country'] != '') {
-          $template->set_var('country', stripslashes($marker['country']) . '&nbsp;');
-        } else {
-          $template->set_var('country', '');
-        }
-        if ($count == 0) {
-          $template->set_var('space', '');
+            $template->set_var('country', stripslashes($marker['country']) . '&nbsp;');
         } else {
-          $template->set_var('space', '<br'. XHTML . '>' . '<br'. XHTML . '>');
+            $template->set_var('country', '');
         }
+//        if ($count == 0) {
+            $template->set_var('space', '');
+//        } else {
+//            $template->set_var('space', '<br' . XHTML . '>' . '<br' . XHTML . '>');
+//        }
         if ($_MAPS_CONF['tel'] == 1 && $marker['tel'] != '') {
-          $template->set_var('tel', '<p>' . $LANG_MAPS_1['tel_label'] . ' ' . $marker['tel'] . '</p>');
+            $template->set_var('tel', '<p>' . $LANG_MAPS_1['tel_label'] . ' ' . $marker['tel'] . '</p>');
         } else {
-          $template->set_var('tel', '');
+            $template->set_var('tel', '');
         }
         if ($_MAPS_CONF['fax'] == 1 && $marker['fax'] != '') {
-          $template->set_var('fax', '<p>' . $LANG_MAPS_1['fax_label'] . ' ' . $marker['fax'] . '</p>');
+            $template->set_var('fax', '<p>' . $LANG_MAPS_1['fax_label'] . ' ' . $marker['fax'] . '</p>');
         } else {
-          $template->set_var('fax', '');
+            $template->set_var('fax', '');
         }
         if ($_MAPS_CONF['web'] == 1 && $marker['web'] != '') {
-          $template->set_var('web', '<p>' . $LANG_MAPS_1['web_label'] . ' ' . $marker['web'] . '</p>');
+            $template->set_var('web', '<p>' . $LANG_MAPS_1['web_label'] . ' ' . $marker['web'] . '</p>');
         } else {
-          $template->set_var('web', '');
+            $template->set_var('web', '');
         }
         //Ressources tab
         foreach ($arr as &$value) {
-            if ($_MAPS_CONF['item_'. $value] == '') {
+            if ($_MAPS_CONF['item_' . $value] == '') {
                 $ressources .= '';
             } else {
-                if ($marker['item_'. $value] != '') {
-                    $content = str_replace(array("\r\n", "\n", "\r", "  "), '', addslashes($marker['item_'. $value]));
-                    $ressources .= '<p><strong>' . $_MAPS_CONF['item_'. $value] . '</strong></p><p>' . stripslashes($content) . '</p>';
-                } 
+                if ($marker['item_' . $value] != '') {
+                    $content = str_replace(array("\r\n", "\n", "\r", "  "), '', addslashes($marker['item_' . $value]));
+                    $ressources .= '<p><strong>' . $_MAPS_CONF['item_' . $value] . '</strong></p><p>' . stripslashes($content) . '</p>';
+                }
             }
         }
     } else {
         if ($marker['description'] != '') {
-        $template->set_var('description', '<p>' . stripslashes($marker['description']) . '</p>');
+            $template->set_var('description', '<p>' . stripslashes($marker['description']) . '</p>');
         } else {
             $template->set_var('description', '');
         }
@@ -3074,330 +3078,371 @@ function MAPS_ViewMarkerInfos ($mkid)
         //Ressources tab
         $ressources = '';
     }
-    
+
     $template->set_var('ressources', $ressources);
-    
+
     //Edit link
     if (SEC_hasRights('maps.admin') || $_USER['uid'] == $marker['owner_id']) {
-        $template->set_var('edit', ' | <a href="'. $_MAPS_CONF['site_url'] . '/markers.php?mode=edit&amp;mkid=' . $marker['mkid'] . '">' . $LANG_MAPS_1['edit_button'] . '</a>');
+        $template->set_var('edit', ' | <a href="' . $_MAPS_CONF['site_url'] . '/markers.php?mode=edit&amp;mkid=' . $marker['mkid'] . '">' . $LANG_MAPS_1['edit_button'] . '</a>');
     } else {
         $template->set_var('edit', '');
     }
 
     //Map
     $mapname = DB_getItem($_TABLES['maps_maps'], 'name', "mid={$marker['mid']}");
-    $template->set_var('map', ' | ' . $LANG_MAPS_1['from_map'] . ' <a href="' . $_MAPS_CONF['site_url'] . '/index.php?mode=map&amp;mid=' . $marker['mid'] . '&name=' . urlencode($mapname) . '">' . stripslashes($mapname) . '</a>');	
-	
-	//Owner
-	$profile_url = $_CONF['site_url']
-                     . '/users.php?mode=profile&amp;uid=' . $marker['owner_id'];
+    $template->set_var('map', ' | ' . $LANG_MAPS_1['from_map'] . ' <a href="' . $_MAPS_CONF['site_url'] . '/index.php?mode=map&amp;mid=' . $marker['mid'] . '&name=' . urlencode($mapname) . '">' . stripslashes($mapname) . '</a>');
+
+    //Owner
+    $profile_url = $_CONF['site_url']
+        . '/users.php?mode=profile&amp;uid=' . $marker['owner_id'];
     $profile = COM_createLink(COM_getDisplayName($marker['owner_id']), $profile_url);
-	$template->set_var('owner', $LANG_MAPS_1['from_owner'] . ' ' . $profile);
-    
+    $template->set_var('owner', $LANG_MAPS_1['from_owner'] . ' ' . $profile);
+
     //Update
     $update = COM_getUserDateTimeFormat($marker['modified']);
     $template->set_var('update', '<br' . XHTML . '>' . $LANG_MAPS_1['last_modification'] . ' ' . $update[0] . ' ' . ' | ' . $marker['hits'] . ' ' . $LANG_MAPS_1['hits']);
-    
+
     //Report
-    $template->set_var('report', '<a href="'. $_CONF['site_url'] .'/profiles.php?uid=2&amp;subject=' . $LANG_MAPS_1['report_subject'] . $marker['mkid'] . '">' .$LANG_MAPS_1['report'] . '</a>');
-	
-	//Print
-    $template->set_var('print', '<a href="'. $_MAPS_CONF['site_url'] . '/markers.php?mode=print&amp;mid=' . $marker['mid'] . '&amp;mkid=' . $marker['mkid'] . '">' .$LANG_MAPS_1['print'] . '</a> | ');
-	
-	//directions
-	$gid = $marker['mkid'];
-	$template->set_var('directions_table_result', '<a name="directions_' . $gid .'_table" id="directions_' . $gid .'_table"></a>
-	 <div id="directions' . $gid .'"></div>');
+    $template->set_var('report', '<a href="' . $_CONF['site_url'] . '/profiles.php?uid=2&amp;subject=' . $LANG_MAPS_1['report_subject'] . $marker['mkid'] . '">' . $LANG_MAPS_1['report'] . '</a>');
+
+    //Print
+    $template->set_var('print', '<a href="' . $_MAPS_CONF['site_url'] . '/markers.php?mode=print&amp;mid=' . $marker['mid'] . '&amp;mkid=' . $marker['mkid'] . '">' . $LANG_MAPS_1['print'] . '</a> | ');
+
+    //directions
+    $gid = $marker['mkid'];
+    $template->set_var('directions_table_result', '<a name="directions_' . $gid . '_table" id="directions_' . $gid . '_table"></a>
+	 <div id="directions' . $gid . '"></div>');
 
     $presentation .= $template->parse('output', 'presentation');
-    $retval .= $presentation;
-	
-	hitMarker ($mkid);
-    
-	return $retval;
+    $retval = $presentation;
+
+    hitMarker($mkid);
+
+    return $retval;
 }
 
-function MAPS_convertLinkToUrl ($url, $lenght=35) {	
-	
-	global $_CONF;
-	
-	if (!preg_match("~^(?:f|ht)tps?://~i", $url)) {
-        $newurl = "http://" . $url;
+function MAPS_convertLinkToUrl($url, $lenght = 35)
+{
+
+    global $_CONF;
+
+    if (!preg_match("~^(?:f|ht)tps?://~i", $url)) {
+        $newurl = "//" . $url;
     } else {
-	    $newurl = $url;
-	}
-	
-	//name
-	$parse = parse_url($newurl);
-	($parse['host'] != '' ) ? $name = $parse['host'] : $name = $url;
-	
-	//Target
-	(strpos($newurl,$_CONF['site_url']) !== false) ? $target = '' : $target = '_blank';
-
-	// convert link to url
+        $newurl = $url;
+    }
+
+    //name
+    $parse = parse_url($newurl);
+    ($parse['host'] != '') ? $name = $parse['host'] : $name = $url;
+
+    //Target
+    (strpos($newurl, $_CONF['site_url']) !== false) ? $target = '' : $target = '_blank';
+
+    // convert link to url
     $link = preg_replace("/((http:\/\/|https:\/\/)[^ |<)
-    ]+)/e", "'<a href=\"$1\" target=\"$target\">'. ((strlen(\"$name\")>=" . $lenght . " ? substr(\"$name\",0," . $lenght . ").'... ':\"$name\")).'</a> '", $newurl );
-	
-	return $link ;	
+    ]+)/e", "'<a href=\"$1\" target=\"$target\">'. ((strlen(\"$name\")>=" . $lenght . " ? substr(\"$name\",0," . $lenght . ").'... ':\"$name\")).'</a> '", $newurl);
+
+    return $link;
 }
 
 /**
-* List all markers that the user has access to
-*
-* @retun    string      HTML for the list
-*
-*/
+ * List all markers that the user has access to
+ *
+ * @retun    string      HTML for the list
+ */
 function MAPS_ListMarkers($mid = '')
 {
     global $_CONF, $_MAPS_CONF, $_TABLES, $_IMAGE_TYPE, $LANG_ADMIN, $LANG_MAPS_1;
 
     if ($mid == '') return;
     $mid = addslashes($mid);
-    
+
     require_once $_CONF['path_system'] . 'lib-admin.php';
 
     $retval = '';
-    
-    if (DB_count($_TABLES['maps_markers']) == 0){
-    return $retval = '';
+
+    if (DB_count($_TABLES['maps_markers']) == 0) {
+        return $retval = '';
     }
 
     $header_arr = array(      // display 'text' and use table field 'field'
         array('text' => $LANG_MAPS_1['name'], 'field' => 'name', 'sort' => true),
         array('text' => $LANG_MAPS_1['code'], 'field' => 'code', 'sort' => true),
-        array('text' => $LANG_MAPS_1['city'], 'field' => 'city', 'sort' => true)
+        array('text' => $LANG_MAPS_1['city'], 'field' => 'city', 'sort' => true),
     );
     $defsort_arr = array('field' => 'code', 'direction' => 'asc');
 
     $text_arr = array(
         'has_extras' => true,
-        'form_url' => $_MAPS_CONF['site_url'] . '/index.php?mode=markers&mid=' . $mid
+        'form_url'   => $_MAPS_CONF['site_url'] . '/index.php?mode=markers&mid=' . $mid,
     );
-    
-	if ($mid == 0) {
-		$sql = "SELECT
+
+    if ($mid == 0) {
+        $sql = "SELECT
                 *
             FROM {$_TABLES['maps_markers']}
             WHERE active = 1 AND hidden = 0
             ";
-		$map_name = $LANG_MAPS_1['global_map'];
-	} else {
-		$sql = "SELECT
+        $map_name = $LANG_MAPS_1['global_map'];
+    } else {
+        $sql = "SELECT
                 *
             FROM {$_TABLES['maps_markers']}
             WHERE mid = {$mid} AND active = 1 AND hidden = 0
             ";
-		$map_name = DB_getItem($_TABLES['maps_maps'],'name', "mid = {$mid}");
-	}
+        $map_name = DB_getItem($_TABLES['maps_maps'], 'name', "mid = {$mid}");
+    }
 
     $query_arr = array(
         'table'          => 'maps_markers',
         'sql'            => $sql,
-        'query_fields'   => array('name','code','city'),
-        'default_filter' => COM_getPermSQL ('AND', 0, 2)
+        'query_fields'   => array('name', 'code', 'city'),
+        'default_filter' => COM_getPermSQL('AND', 0, 2),
     );
 
     $retval .= '<p><a style="text-decoration: none;" onClick="elementToggle(\'markers_list\'); return false;" href="#">
-			' . $LANG_MAPS_1['viewing_markers'] . ' ' . $map_name .  '</a></p>';
+			' . $LANG_MAPS_1['viewing_markers'] . ' ' . $map_name . '</a></p>';
     $retval .= '<div id="markers_list" style="display:none;">' . ADMIN_list('markers', 'MAPS_getListField_markersList',
-                          $header_arr, $text_arr, $query_arr, $defsort_arr) . '</div>';
+            $header_arr, $text_arr, $query_arr, $defsort_arr) . '</div>';
 
     return $retval;
 }
 
 /**
-*   Get an individual field for the markers screen.
-*
-*   @param  string  $fieldname  Name of field (from the array, not the db)
-*   @param  mixed   $fieldvalue Value of the field
-*   @param  array   $A          Array of all fields from the database
-*   @param  array   $icon_arr   System icon array
-*   @param  object  $EntryList  This entry list object
-*   @return string              HTML for field display in the table
-*/
+ *   Get an individual field for the markers screen.
+ *
+ * @param  string $fieldname  Name of field (from the array, not the db)
+ * @param  mixed  $fieldvalue Value of the field
+ * @param  array  $A          Array of all fields from the database
+ * @param  array  $icon_arr   System icon array
+ * @param  object $EntryList  This entry list object
+ * @return string              HTML for field display in the table
+ */
 function MAPS_getListField_markersList($fieldname, $fieldvalue, $A, $icon_arr)
 {
     global $_CONF, $_MAPS_CONF, $LANG_ADMIN, $LANG_MAPS_1, $LANG_STATIC, $_TABLES;
 
-    switch($fieldname) {
+    switch ($fieldname) {
         case "name":
-            $map_title = ucwords(strtolower(stripslashes ($A['name'])));
+            $map_title = ucwords(strtolower(stripslashes($A['name'])));
             $url = $_MAPS_CONF['site_url'] .
-                                 '/markers.php?mode=show&amp;mkid=' . $A['mkid'] . '&amp;mid=' . $A['mid'];
+                '/markers.php?mode=show&amp;mkid=' . $A['mkid'] . '&amp;mid=' . $A['mid'];
             $retval = COM_createLink($map_title, $url);
             break;
-		case "city":
-            $city = ucwords(strtolower(stripslashes ($A['city'])));
+        case "city":
+            $city = ucwords(strtolower(stripslashes($A['city'])));
             $retval = $city;
             break;
         default:
             $retval = stripslashes($fieldvalue);
             break;
     }
+
     return $retval;
 }
 
-function MAPS_setGeoLocation ()
+function MAPS_setGeoLocation()
 {
     global $_CONF, $_TABLES, $_MAPS_CONF;
-	
-	$sql = "SELECT info.location 
+
+    $sql = "SELECT info.location 
 			FROM {$_TABLES['userinfo']} AS info 
 			WHERE info.location <> ''
 		";
-		
-	$locations = DB_query($sql);
-		
-	$nRows  = DB_numRows($locations);
-	
-    for ( $i=0; $i < $nRows; $i++ ) {
+
+    $locations = DB_query($sql);
+
+    $nRows = DB_numRows($locations);
+
+    for ($i = 0; $i < $nRows; $i++) {
         $geo = DB_fetchArray($locations);
-		MAPS_getDBCoords($gid, $geo['location'], $lat, $lng) ;
-	}
-	
-	return;
+        MAPS_getDBCoords($gid, $geo['location'], $lat, $lng);
+    }
+
+    return;
 }
 
-function MAPS_displayEventsMap ($output=true, $event_id='')
+function MAPS_displayEventsMap($output = true, $event_id = '')
 {
-	global $_TABLES, $_CONF, $_MAPS_CONF, $LANG_MAPS_1, $LANG_CAL_1;
+    global $_TABLES, $_CONF, $_MAPS_CONF, $LANG_MAPS_1, $LANG_CAL_1;
 
     $retval = '';
-	
-	//map settings
-	$res = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE 1=1 LIMIT 1");
-
-	//event map is set on mid=1. 
-	//TODO change this
-	$A = DB_fetchArray($res);
-
-	$T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
-	if ($output) {
-    	$T->set_file('page', 'map_autotag.thtml');
-	} else {
-	    $T->set_file('page', 'map_only_script.thtml');
-	}
-	$T->set_var('mid', 'events');
-	$T->set_var('name', $LANG_MAPS_1['events_map']);
-	$T->set_var('description', '<p>' . $LANG_MAPS_1['info_events_map'] . '</p>');
-	
-	$T->set_var('header', '');
-	$T->set_var('footer', '');
-
-	//address from global map
-	$T->set_var('address', addslashes($A['geo']));
-	$lat = str_replace(",",".",$A['lat']);
-	$lng = str_replace(",",".",$A['lng']);
-
-	$T->set_var('map_type', $_MAPS_CONF['global_type']);
-	$T->set_var('map_width', $_MAPS_CONF['global_width']);
-	
-			
-	$jsmarkers = 'var markers = [];';
 
-	if ($event_id == '') {
-	    if ($lat == '') $lat = 0;
-	    if ($lng == '') $lng = 0;
-    	$T->set_var('lat', $lat);
-	    $T->set_var('lng', $lng);
+    //map settings
+    $res = DB_query("SELECT * FROM {$_TABLES['maps_maps']} WHERE 1=1 LIMIT 1");
+
+    //event map is set on mid=1.
+    //TODO change this
+    $A = DB_fetchArray($res);
+
+    $T = COM_newTemplate($_CONF['path'] . 'plugins/maps/templates');
+    if ($output) {
+        $T->set_file('page', 'map_autotag.thtml');
+    } else {
+        $T->set_file('page', 'map_only_script.thtml');
+    }
+    $T->set_var('mid', 'events');
+    $T->set_var('name', $LANG_MAPS_1['events_map']);
+    $T->set_var('description', '<p>' . $LANG_MAPS_1['info_events_map'] . '</p>');
+
+    $T->set_var('header', '');
+    $T->set_var('footer', '');
+
+    //address from global map
+    $T->set_var('address', addslashes($A['geo']));
+    $lat = str_replace(",", ".", $A['lat']);
+    $lng = str_replace(",", ".", $A['lng']);
+
+    $T->set_var('map_type', $_MAPS_CONF['global_type']);
+    $T->set_var('map_width', $_MAPS_CONF['global_width']);
+
+
+    $jsmarkers = 'var markers = [];';
+
+    if ($event_id == '') {
+        if ($lat == '') $lat = 0;
+        if ($lng == '') $lng = 0;
+        $T->set_var('lat', $lat);
+        $T->set_var('lng', $lng);
         $T->set_var('zoom', $_MAPS_CONF['global_zoom']);
-		$T->set_var('map_height', $_MAPS_CONF['global_height']);
-		
-		//select all coming events
-	    $result = DB_query("SELECT * FROM {$_TABLES['events']} WHERE TO_DAYS(dateend) >= TO_DAYS(NOW()) ");
-	} else {
-	    //TODO make this configurable
+        $T->set_var('map_height', $_MAPS_CONF['global_height']);
+
+        //select all coming events
+        $result = DB_query("SELECT * FROM {$_TABLES['events']} WHERE TO_DAYS(dateend) >= TO_DAYS(NOW()) ");
+    } else {
+        //TODO make this configurable
 
         $T->set_var('zoom', 8);
-	    $T->set_var('map_height', '300px');
-		
-		$result = DB_query("SELECT * FROM {$_TABLES['events']} WHERE eid='$event_id'");
-	}
+        $T->set_var('map_height', '300px');
 
-	$nrows = DB_numRows($result);
-	
-	if ($nrows > 0) {
-		
-		for ($i = 0;$i < $nrows; $i++) {
-			
-			$B = DB_fetchArray($result);
-			
-			$access = SEC_hasAccess($B['owner_id'],$B['group_id'],$B['perm_owner'],$B['perm_group'],$B['perm_members'],$B['perm_anon']);
-			
-			if ($access > 0 && $B['location']!='') {
-				
-				//markers
-				$marker['mkid'] = $B['eid'];
-				$marker['hidden'] = 0;
-				$marker['active'] = 1;
-				$marker['name'] = $B['title'];
-				
-				//start and end time
-				$thestart = COM_getUserDateTimeFormat($B['datestart'] . ' ' . $B['timestart']);
+        $result = DB_query("SELECT * FROM {$_TABLES['events']} WHERE eid='$event_id'");
+    }
+
+    $nrows = DB_numRows($result);
+
+    if ($nrows > 0) {
+
+        for ($i = 0; $i < $nrows; $i++) {
+
+            $B = DB_fetchArray($result);
+
+            $access = SEC_hasAccess($B['owner_id'], $B['group_id'], $B['perm_owner'], $B['perm_group'], $B['perm_members'], $B['perm_anon']);
+
+            if ($access > 0 && $B['location'] != '') {
+
+                //markers
+                $marker['mkid'] = $B['eid'];
+                $marker['hidden'] = 0;
+                $marker['active'] = 1;
+                $marker['name'] = $B['title'];
+
+                //start and end time
+                $thestart = COM_getUserDateTimeFormat($B['datestart'] . ' ' . $B['timestart']);
                 $theend = COM_getUserDateTimeFormat($B['dateend'] . ' ' . $B['timeend']);
-				if ($B['allday'] == 0) {
-					$event_start = $LANG_MAPS_1['from_cal'] . ' ' . $thestart[0];
-					$event_end = ' ' . $LANG_MAPS_1['to_cal'] . ' ' . $theend[0];
-					if ($thestart[0] == $theend[0]) $event_end = '';
-				} else {
-					$event_start = $LANG_MAPS_1['from_cal'] . ' ' . strftime($_CONF['shortdate'], $thestart[1]);
-    				$event_end = ' ' . $LANG_MAPS_1['to_cal'] . ' ' . strftime($_CONF['shortdate'], $theend[1]);
-					if ($thestart[1] == $theend[1]) {
-					    $event_start = $LANG_MAPS_1['from_cal'] . ' ' . strftime($_CONF['shortdate'], $thestart[1]);
-						$event_end = '';
-					}
-				}
-				
-				if ($event_id == '') $marker['description'] = '<p><small>' . $event_start . $event_end . '</small></p>' . $B['description'];
-				
-				$marker['payed'] = 0;
-				$marker['mk_default'] = 1;
-				$marker['validity'] = 0;
-				$marker['perm_owner'] = 2;
-				$marker['perm_group'] = 2;
-				$marker['perm_members'] = 2;
-				$marker['perm_anon'] = 2;
-				
-				MAPS_getDBCoords($gid, $B['location'], $lat, $lng) ;
-				$marker['lat'] = str_replace(",",".",$lat);
-                $marker['lng'] = str_replace(",",".",$lng);
-					
-				$primary_color = '';
-				$stroke_color = '';
-				$marker_label = '';
-				$label_color = '';
-
-				if ($event_id == '') {
-				    $jsmarkers .= MAPS_renderMarker($marker,$primary_color,$stroke_color,$marker_label, $label_color, $LANG_MAPS_1['events_map'],'','','events', true, array());			
-				} else {
-				    $T->set_var('lat', $marker['lat']);
-	                $T->set_var('lng', $marker['lng']);
-				    $jsmarkers .= MAPS_renderMarker($marker,$primary_color,$stroke_color,$marker_label, $label_color, $LANG_MAPS_1['events_map'],'','','events', false, array());	
-				}
-					
-			}
-		}
-	}
-	
-	if ($_MAPS_CONF['use_cluster'] == 0 ) {	
-		$T->set_var('markerclusterer', '');	
-	} else {
-		$T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
-		$jsmarkers .= LB . '				var markerCluster_events = new MarkerClusterer(mapevents, markers);' . LB; 
-	}
-	
-	$T->set_var('markers', $jsmarkers);
-	
-	//Ads			
-	$ads = MAPS_getAds ('events');
-	$T->set_var('ads', $ads);
-
-	$T->set_var('edit_button', '');
-
-	$T->parse('output','page');
-	$retval .= $T->finish($T->get_var('output'));
-	
+                if ($B['allday'] == 0) {
+                    $event_start = $LANG_MAPS_1['from_cal'] . ' ' . $thestart[0];
+                    $event_end = ' ' . $LANG_MAPS_1['to_cal'] . ' ' . $theend[0];
+                    if ($thestart[0] == $theend[0]) $event_end = '';
+                } else {
+                    $event_start = $LANG_MAPS_1['from_cal'] . ' ' . strftime($_CONF['shortdate'], $thestart[1]);
+                    $event_end = ' ' . $LANG_MAPS_1['to_cal'] . ' ' . strftime($_CONF['shortdate'], $theend[1]);
+                    if ($thestart[1] == $theend[1]) {
+                        $event_start = $LANG_MAPS_1['from_cal'] . ' ' . strftime($_CONF['shortdate'], $thestart[1]);
+                        $event_end = '';
+                    }
+                }
+
+                if ($event_id == '') $marker['description'] = '<p><small>' . $event_start . $event_end . '</small></p>' . $B['description'];
+
+                $marker['payed'] = 0;
+                $marker['mk_default'] = 1;
+                $marker['validity'] = 0;
+                $marker['perm_owner'] = 2;
+                $marker['perm_group'] = 2;
+                $marker['perm_members'] = 2;
+                $marker['perm_anon'] = 2;
+
+                MAPS_getDBCoords($gid, $B['location'], $lat, $lng);
+                $marker['lat'] = str_replace(",", ".", $lat);
+                $marker['lng'] = str_replace(",", ".", $lng);
+
+                $primary_color = '';
+                $stroke_color = '';
+                $marker_label = '';
+                $label_color = '';
+
+                if ($event_id == '') {
+                    $jsmarkers .= MAPS_renderMarker($marker, $primary_color, $stroke_color, $marker_label, $label_color, $LANG_MAPS_1['events_map'], '', '', 'events', true, array());
+                } else {
+                    $T->set_var('lat', $marker['lat']);
+                    $T->set_var('lng', $marker['lng']);
+                    $jsmarkers .= MAPS_renderMarker($marker, $primary_color, $stroke_color, $marker_label, $label_color, $LANG_MAPS_1['events_map'], '', '', 'events', false, array());
+                }
+
+            }
+        }
+    }
+
+    if ($_MAPS_CONF['use_cluster'] == 0) {
+        $T->set_var('markerclusterer', '');
+    } else {
+        $T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
+        $jsmarkers .= LB . '				var markerCluster_events = new MarkerClusterer(mapevents, markers);' . LB;
+    }
+
+    $T->set_var('markers', $jsmarkers);
+
+    //Ads
+    $ads = MAPS_getAds('events');
+    $T->set_var('ads', $ads);
+
+    $T->set_var('edit_button', '');
+
+    $T->parse('output', 'page');
+    $retval .= $T->finish($T->get_var('output'));
+
     return $retval;
 }
 
-?>
\ No newline at end of file
+if (!is_callable('COM_createHTMLDocument')) {
+    function COM_createHTMLDocument(&$content, array $information = array())
+    {
+        // Retrieve required variables from information array
+        $what = isset($information['what']) ? $information['what'] : 'menu';
+        $pageTitle = isset($information['pagetitle']) ? $information['pagetitle'] : '';
+        $headerCode = isset($information['headercode']) ? $information['headercode'] : '';
+        $rightBlock = isset($information['rightblock']) ? $information['rightblock'] : -1;
+        $custom = isset($information['custom']) ? $information['custom'] : '';
+
+        return COM_siteHeader($what, $pageTitle, $headerCode) . $content
+            . COM_siteFooter($rightBlock, $custom);
+    }
+}
+
+if (!is_callable('COM_redirect')) {
+    function COM_redirect($url)
+    {
+        global $_CONF;
+
+        if (!headers_sent($file, $line)) {
+            $url = str_ireplace('&amp;', '&', $url);
+            header('Location: ' . $url);
+        }
+
+        if (isset($_CONF['rootdebug']) && $_CONF['rootdebug']) {
+            // for debugging
+            COM_errorLog(
+                sprintf(
+                    '%1$s failed to redirect to "%2$s".  Headers were already sent at line %3$d of "%4$s".',
+                    __FUNCTION__, $url, $line, $file
+                )
+            );
+        }
+
+        // Send out HTML meta tags in case header('Location: some_url') fails
+        @header('Content-Type: text/html; charset=' . COM_getCharset());
+        echo "<html><head><meta http-equiv=\"refresh\" content=\"0; URL={$url}\"></head></html>" . PHP_EOL;
+        die(1);
+    }
+}
diff --git a/install_defaults.php b/install_defaults.php
index 5c3228f..ab1f188 100644
--- a/install_defaults.php
+++ b/install_defaults.php
@@ -75,7 +75,7 @@
 
 //Google maps API
 $_MAPS_DEFAULT['google_api_key'] = '';   // User must supply their own
-$_MAPS_DEFAULT['url_MAPScode']  = 'http://maps.googleapis.com/maps/api/geocode/json?address=%address%&sensor=false';
+$_MAPS_DEFAULT['url_MAPScode']  = '//maps.googleapis.com/maps/api/geocode/json?address=%address%&sensor=false';
 
 // Set the default permissions
 $_MAPS_DEFAULT['default_permissions'] =  array (3, 3, 2, 2);
diff --git a/language/english.php b/language/english.php
index a351df8..1049a24 100644
--- a/language/english.php
+++ b/language/english.php
@@ -55,7 +55,7 @@
     'map'                   => 'map',
     'online'                => 'online',
     'google_maps_API'       => '<a href="">Google Maps API</a>',
-    'need_google_api'       => 'You need a <a href="http://code.google.com/apis/maps/signup.html" target="_blank">Google Maps API</a> to start.',
+    'need_google_api'       => 'You need a <a href="//code.google.com/apis/maps/signup.html" target="_blank">Google Maps API</a> to start.',
     'profile_title'         => 'Geolocalisation',
     'buy_marker'            => 'Buy a marker',
     'menu_label'            => 'Maps administration',
diff --git a/language/french_france_utf-8.php b/language/french_france_utf-8.php
index e1961eb..10110e3 100644
--- a/language/french_france_utf-8.php
+++ b/language/french_france_utf-8.php
@@ -55,7 +55,7 @@
     'map'                   => 'carte',
     'online'                => 'en ligne',
     'google_maps_API'       => '<a href="">Google Maps API</a>',
-    'need_google_api'       => 'Attention, vous avez besoin d\'une <a href="http://code.google.com/apis/maps/signup.html" target="_blank">API Google Maps</a> pour commencer.',
+    'need_google_api'       => 'Attention, vous avez besoin d\'une <a href="//code.google.com/apis/maps/signup.html" target="_blank">API Google Maps</a> pour commencer.',
     'profile_title'         => 'Géolocalisation',
     'buy_marker'            => 'Acheter un  marqueur',
     'menu_label'            => 'Administration du plugin Maps',
diff --git a/public_html/index.php b/public_html/index.php
index 7edc625..6337fce 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -39,8 +39,7 @@
 
 // take user back to the homepage if the plugin is not active
 if (!in_array('maps', $_PLUGINS)) {
-    echo COM_refresh($_CONF['site_url'] . '/index.php');
-    exit;
+    COM_redirect($_CONF['site_url'] . '/index.php');
 }
 
 MAPS_getheadercode();
@@ -272,21 +271,21 @@ function MAPS_displayFrontPage ()
 			$display .= MAPS_getGlobalMap();
  
 		} else {
-			echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
+			COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
 		}
         break;
 	case 'markers':
 	    if ( ($_REQUEST['mid'] >= 0) ) {
 		    $display .= MAPS_ListMarkers($_REQUEST['mid']);
 		} else {
-			echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
+			COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
 		}
 	    break;
 	case 'marker':
 	    if ( isset($_REQUEST['mkid']) && $_REQUEST['mkid'] != '' && function_exists('MAPS_proViewMarker') ) {
 		    $display .= MAPS_proViewMarker($_REQUEST['mkid']);
 		} else {
-			echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
+			COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
 		}
 	    break;
 
diff --git a/public_html/js/mapiconmaker.js b/public_html/js/mapiconmaker.js
index 3d3fdca..3bf65d4 100644
--- a/public_html/js/mapiconmaker.js
+++ b/public_html/js/mapiconmaker.js
@@ -79,7 +79,7 @@ MapIconMaker.createMarkerIcon = function (opts) {
     var strokeColor = opts.strokeColor || "#000000";
     var cornerColor = opts.cornerColor || "#ffffff";
 
-    var baseUrl = "http://chart.apis.google.com/chart?cht=mm";
+    var baseUrl = "//chart.apis.google.com/chart?cht=mm";
     var iconUrl = baseUrl + "&chs=" + width + "x" + height +
         "&chco=" + cornerColor.replace("#", "") + "," +
         primaryColor.replace("#", "") + "," +
@@ -92,7 +92,7 @@ MapIconMaker.createMarkerIcon = function (opts) {
     icon.anchor = new google.maps.Point(width / 2, height);
     icon.size = new google.maps.Size(width, height);
 
-    shadow.url = 'http://maps.gstatic.com/mapfiles/shadow50.png';
+    shadow.url = '//maps.gstatic.com/mapfiles/shadow50.png';
     shadow.anchor = new google.maps.Point(width / 2, height);
     shadow.size = new google.maps.Size(Math.floor(width * 1.6), height);
     shadow.scaledSize = new google.maps.Size(Math.floor(width * 1.6), height);
@@ -143,7 +143,7 @@ MapIconMaker.createFlatIcon = function (opts) {
     var shape = opts.shape || "circle";
     var shapeCode = (shape === "circle") ? "it" : "itr";
 
-    var baseUrl = "http://chart.apis.google.com/chart?cht=" + shapeCode;
+    var baseUrl = "//chart.apis.google.com/chart?cht=" + shapeCode;
     var iconUrl = baseUrl + "&chs=" + width + "x" + height +
         "&chco=" + primaryColor.replace("#", "") + "," +
         shadowColor.replace("#", "") + "ff,ffffff01" +
@@ -200,7 +200,7 @@ MapIconMaker.createLabeledMarkerIcon = function (opts) {
     var addStar = opts.addStar || false;
 
     var pinProgram = (addStar) ? "pin_star" : "pin";
-    var baseUrl = "http://chart.apis.google.com/chart?cht=d&chdp=mapsapi&chl=";
+    var baseUrl = "//chart.apis.google.com/chart?cht=d&chdp=mapsapi&chl=";
     var iconUrl = baseUrl + pinProgram + "'i\\" + "'[" + label +
         "'-2'f\\" + "hv'a\\]" + "h\\]o\\" +
         primaryColor.replace("#", "") + "'fC\\" +
@@ -221,7 +221,7 @@ MapIconMaker.createLabeledMarkerIcon = function (opts) {
     icon.url = iconUrl + "&ext=.png";
     icon.size = new google.maps.Size(width, height);
 
-    shadow.url = 'http://maps.gstatic.com/mapfiles/shadow50.png';
+    shadow.url = '//maps.gstatic.com/mapfiles/shadow50.png';
     shadow.anchor = new google.maps.Point(width / 2, height);
     shadow.size = new google.maps.Size(Math.floor(width * 1.6), height);
     shadow.scaledSize = new google.maps.Size(Math.floor(width * 1.6), height);
diff --git a/public_html/js/markerclusterer.js b/public_html/js/markerclusterer.js
index d6c4dce..1c7d092 100644
--- a/public_html/js/markerclusterer.js
+++ b/public_html/js/markerclusterer.js
@@ -192,7 +192,7 @@ function MarkerClusterer(map, opt_markers, opt_options) {
  * @private
  */
 MarkerClusterer.prototype.MARKER_CLUSTER_IMAGE_PATH_ =
-    'http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/' +
+    '//google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/' +
     'images/m';
 
 
diff --git a/public_html/map_detail.php b/public_html/map_detail.php
index efbc795..5967484 100644
--- a/public_html/map_detail.php
+++ b/public_html/map_detail.php
@@ -39,8 +39,7 @@
 
 // take user back to the homepage if the plugin is not active
 if (!in_array('maps', $_PLUGINS)) {
-    echo COM_refresh($_CONF['site_url'] . '/index.php');
-    exit;
+    COM_redirect($_CONF['site_url'] . '/index.php');
 }
 
 MAPS_getheadercode();
@@ -51,10 +50,8 @@
 
 // Ensure user has the rights to access this page
 if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) || ($_MAPS_CONF['maps_login_required'] == 1))) {
-	$display .= COM_siteHeader('');
 	$display .= MAPS_user_menu();
-    $display .= COM_startBlock ($LANG_LOGIN[1], '',
-                                COM_getBlockTemplate ('_msg_block', 'header'));
+    $display .= COM_startBlock ($LANG_LOGIN[1], '', COM_getBlockTemplate ('_msg_block', 'header'));
     $login = new Template($_CONF['path'] . 'plugins/maps/templates');
     $login->set_file (array ('login'=>'submitloginrequired.thtml'));
     $login->set_var ( 'xhtml', XHTML );
@@ -67,7 +64,7 @@
     $login->parse ('output', 'login');
     $display .= $login->finish ($login->get_var('output'));
     $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-    $display .= COM_siteFooter();
+    $display = COM_createHTMLDocument($display);
     COM_output($display);
     exit;
 }
@@ -86,11 +83,9 @@
     //Display the Global Map 
 	$display .= MAPS_getGlobalMap();
 } else {
-    echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
+    COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
 }
 
 $display .= COM_siteFooter();
 
 echo $display;
-
-?>
diff --git a/public_html/maps.css b/public_html/maps.css
index 084a836..b8161b0 100644
--- a/public_html/maps.css
+++ b/public_html/maps.css
@@ -1,94 +1,101 @@
 /*CSS for Maps plugin*/
 .colorSwatch {
-    border: 1px solid #000000; 
-    font-family: Verdana; 
-    font-size: 10px; 
+    border: 1px solid #000000;
+    font-family: Verdana;
+    font-size: 10px;
     text-decoration: none;
-  }
+}
 
 /*Marker Submission */
 #map_contener_submission {
-	padding:5px;
-	border: 1px solid #333;
-	background: #FFFFFF;
+    padding: 5px;
+    border: 1px solid #333;
+    background: #FFFFFF;
 }
+
 /* Map form */
 form#map-form legend {
-  display: block!important;
-  color:#00f;
-  background-color:#ddd
+    display: block !important;
+    color: #00f;
+    background-color: #ddd
 }
+
 fieldset {
-  margin-bottom:1em;
+    margin-bottom: 1em;
 }
+
 fieldset p {
-  padding:5px;
-  margin:0px;
-  margin-top:5px;
-  margin-bottom:0px;
+    padding: 5px;
+    margin: 5px 0 0;
 }
+
 fieldset legend {
-  font-size:0.9em;
+    font-size: 0.9em;
 }
 
 /*Tabs*/
 ul.tabNavigation {
-  list-style: none;
-  margin: 0;
-  padding: 0;
+    list-style: none;
+    margin: 0;
+    padding: 0;
 }
 
 ul.tabNavigation li {
-  display: inline;
-  font-weight:bold;
+    display: inline;
+    font-weight: bold;
 }
 
 ul.tabNavigation li a {
-  padding: 3px 10px;
-  background-color: #ddd;
-  color: #333;
-  text-decoration: none;
-  border-top: 1px solid #ccc;
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #ccc;
+    padding: 3px 10px;
+    background-color: #ddd;
+    color: #333;
+    text-decoration: none;
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc;
 }
+
 ul.tabNavigation li a.selected {
-  padding: 3px 10px;
-  background-color: #999;
-  color: #FFF;
-  text-decoration: none;
+    padding: 3px 10px;
+    background-color: #999;
+    color: #FFF;
+    text-decoration: none;
 }
+
 ul.tabNavigation li a:hover {
-  background-color: #999;
-  color: #FFF;
+    background-color: #999;
+    color: #FFF;
 }
 
 ul.tabNavigation li a:focus {
-  outline: 0;
+    outline: 0;
 }
 
 div.tabs > div {
-  padding: 0px 10px 10px 10px;
-  margin-top: 3px;
-  border: 1px solid #bbb;
+    padding: 0 10px 10px 10px;
+    margin-top: 3px;
+    border: 1px solid #bbb;
 }
 
 div.tabs > div h2 {
-  margin-top: 0;
+    margin-top: 0;
 }
 
 #overlays_checkboxes {
-  padding-top:10px;
-  font-size:x-small;
+    padding-top: 10px;
+    font-size: x-small;
 }
+
 #maps_list {
-  padding:5px;
+    padding: 5px;
 }
+
 #ui-datepicker-div {
-  background:white;
-  border:1px solid #DDD;
-  padding:15px;
+    background: white;
+    border: 1px solid #DDD;
+    padding: 15px;
 }
+
 .user_menu {
-    padding-top:10px;
+    padding-top: 10px;
 }
\ No newline at end of file
diff --git a/public_html/markers.php b/public_html/markers.php
index 023fca4..9446eee 100644
--- a/public_html/markers.php
+++ b/public_html/markers.php
@@ -39,7 +39,7 @@
 
 // take user back to the homepage if the plugin is not active
 if (!in_array('maps', $_PLUGINS)) {
-    echo COM_refresh($_CONF['site_url'] . '/index.php');
+    COM_redirect($_CONF['site_url'] . '/index.php');
     exit;
 }
 
@@ -48,9 +48,7 @@
 // Ensure user has the rights to access this page
 
 if (COM_isAnonUser() && $_MAPS_CONF['maps_login_required'] == 1) {
-	$display .= COM_siteHeader('');
-	$display .= MAPS_user_menu();
-
+	$display = MAPS_user_menu();
 	$display .= COM_startBlock ($LANG_LOGIN[1], '',
 								COM_getBlockTemplate ('_msg_block', 'header'));
 	$login = new Template($_CONF['path'] . 'plugins/maps/templates');
@@ -65,8 +63,7 @@
 	$login->parse ('output', 'login');
 	$display .= $login->finish ($login->get_var('output'));
 	$display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-
-    $display .= COM_siteFooter();
+    $display = COM_createHTMLDocument($display);
     COM_output($display);
     exit;
 }
@@ -205,7 +202,7 @@ function MAPS_listUserMarkers()
 */
 function plugin_getListField_userMarkers($fieldname, $fieldvalue, $A, $icon_arr)
 {
-    global $_CONF, $_MAPS_CONF, $LANG_ADMIN, $LANG_STATIC, $_TABLES;
+    global $_CONF, $_MAPS_CONF, $LANG_MAPS_1, $LANG_ADMIN, $LANG_STATIC, $_TABLES;
 
     switch($fieldname) {
         case "edit":
@@ -550,7 +547,7 @@ function getUserMarkerForm($marker = array()) {
 	
 	$_SCRIPTS->setJavaScriptLibrary('jquery');
 	$_SCRIPTS->setJavaScriptFile('maps_simplecolor', '/' . $_MAPS_CONF['maps_folder'] . '/js/simple-color.js');
-	$js = LB . '<script  type="text/javascript" src= "https://maps.googleapis.com/maps/api/js?key=' . $_MAPS_CONF['google_api_key'] . '&sensor=false"> </script>
+	$js = LB . '
     <script type="text/javascript">
 	jQuery(document).ready(
         function()
@@ -682,7 +679,7 @@ function copyText()
 switch ($_REQUEST['mode']) {
     case 'edit':
 	    if (SEC_hasRights('maps.admin')) {
-			    echo COM_refresh($_CONF['site_admin_url'] . '/plugins/maps/marker_edit.php?mode=edit&amp;mkid='. $_REQUEST['mkid'] );
+			    COM_redirect($_CONF['site_admin_url'] . '/plugins/maps/marker_edit.php?mode=edit&amp;mkid='. $_REQUEST['mkid'] );
 				exit();
 		}
 		// Get the marker to edit and display the form
@@ -698,13 +695,13 @@ function copyText()
             $A = DB_fetchArray($res);			
 			
 			if (($A['owner_id'] != $_USER['uid']) OR ($_MAPS_CONF['marker_edition'] == 0) OR  $A['free_marker'] != 1) {
-			    echo COM_refresh($_CONF['site_url']);
+			    COM_redirect($_CONF['site_url']);
 				exit();
 			}
 			
             $display .= getUserMarkerForm($A);
         } else {
-            echo COM_refresh($_CONF['site_url']);
+            COM_redirect($_CONF['site_url']);
 			exit();
         }
         break;
@@ -730,8 +727,7 @@ function copyText()
 		$A = DB_fetchArray($res);
 		
 		if (($A['owner_id'] != $_USER['uid']) OR ($_MAPS_CONF['marker_edition'] == 0) OR $A['free_marker'] != 1) {
-			echo COM_refresh($_CONF['site_url']);
-			exit();
+			COM_redirect($_CONF['site_url']);
 		}
 		$_REQUEST['mid'] = $A['mid'];
 		
@@ -797,11 +793,7 @@ function copyText()
             $msg = $LANG_MAPS_1['save_success'];
         }
         // save complete, return to markers list
-        echo COM_refresh($_MAPS_CONF['site_url'] . '/markers.php?mode=show&mkid=' . $_REQUEST['mkid'] . '&mid=' . $_REQUEST['mid'] . '&msg=' . urlencode($msg));
-        exit();
-		
-        break;
-		
+        COM_redirect($_MAPS_CONF['site_url'] . '/markers.php?mode=show&mkid=' . $_REQUEST['mkid'] . '&mid=' . $_REQUEST['mid'] . '&msg=' . urlencode($msg));
 		break;
 	 
 	case 'show':
@@ -815,7 +807,7 @@ function copyText()
 			}
             $display .= MAPS_ViewMarkerInfos($_REQUEST['mkid']);
         } else {
-		    echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php' );
+		    COM_redirect($_MAPS_CONF['site_url'] . '/index.php' );
 		}
         break;
 		
@@ -829,7 +821,7 @@ function copyText()
 			COM_output($display);
 			exit();
         } else {
-		    echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php' );
+		    COM_redirect($_MAPS_CONF['site_url'] . '/index.php' );
 		}
         break;
 
diff --git a/public_html/users_map.php b/public_html/users_map.php
index e023fd0..82e6d73 100644
--- a/public_html/users_map.php
+++ b/public_html/users_map.php
@@ -32,14 +32,14 @@
 // +---------------------------------------------------------------------------+
 
 /**
-* @package Maps
-*/
+ * @package Maps
+ */
 
 require_once '../lib-common.php';
 
 // take user back to the homepage if the plugin is not active
 if (!in_array('maps', $_PLUGINS)) {
-    echo COM_refresh($_CONF['site_url'] . '/index.php');
+    COM_redirect($_CONF['site_url'] . '/index.php');
     exit;
 }
 
@@ -47,66 +47,65 @@
 
 // Ensure user has the rights to access this page
 if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) || ($_MAPS_CONF['maps_login_required'] == 1))) {
-	$display .= COM_siteHeader('');
-	$display .= MAPS_user_menu();
-    $display .= COM_startBlock ($LANG_LOGIN[1], '',
-                                COM_getBlockTemplate ('_msg_block', 'header'));
+    $display = MAPS_user_menu();
+    $display .= COM_startBlock($LANG_LOGIN[1], '',
+        COM_getBlockTemplate('_msg_block', 'header'));
     $login = new Template($_CONF['path'] . 'plugins/maps/templates');
-    $login->set_file (array ('login'=>'submitloginrequired.thtml'));
-    $login->set_var ( 'xhtml', XHTML );
-    $login->set_var ('login_message', $LANG_LOGIN[2]);
-    $login->set_var ('site_url', $_CONF['site_url']);
-    $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
-    $login->set_var ('layout_url', $_CONF['layout_url']);
-    $login->set_var ('lang_login', $LANG_LOGIN[3]);
-    $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
-    $login->parse ('output', 'login');
-    $display .= $login->finish ($login->get_var('output'));
-    $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-    $display .= COM_siteFooter();
+    $login->set_file(array('login' => 'submitloginrequired.thtml'));
+    $login->set_var('xhtml', XHTML);
+    $login->set_var('login_message', $LANG_LOGIN[2]);
+    $login->set_var('site_url', $_CONF['site_url']);
+    $login->set_var('site_admin_url', $_CONF['site_admin_url']);
+    $login->set_var('layout_url', $_CONF['layout_url']);
+    $login->set_var('lang_login', $LANG_LOGIN[3]);
+    $login->set_var('lang_newuser', $LANG_LOGIN[4]);
+    $login->parse('output', 'login');
+    $display .= $login->finish($login->get_var('output'));
+    $display .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+    $display = COM_createHTMLDocument($display);
     COM_output($display);
     exit;
 }
 
-function getUsersMap () {
+function getUsersMap()
+{
 
     global $_TABLES, $LANG_MAPS_1, $_MAPS_CONF, $_CONF, $_USER;
-		
-	// Ensure user has the rights to access this map
-	if ($_MAPS_CONF['users_map'] == 0) {
-		echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
-		exit ();
-	}
-	
-	$T = new Template($_CONF['path'] . 'plugins/maps/templates');
-	$T->set_file('page', 'map.thtml');
-	$T->set_var('mid', '0');
-	$T->set_var('name', $LANG_MAPS_1['users_map']);
-	$T->set_var('description', '<p>' . $LANG_MAPS_1['info_users_map'] . '</p>');
-	$T->set_var('header', '');
-	$T->set_var('footer', '');
-	
-	//Users maps is set by default on 0,0. Todo make it configurable 
-	$T->set_var('address', '');
-	$T->set_var('lat', 0);
-	$T->set_var('lng', 0);
-	$T->set_var('zoom', $_MAPS_CONF['global_zoom']);
-	$T->set_var('goog_api_key', $_MAPS_CONF['google_api_key']);
-	$T->set_var('map_type', $_MAPS_CONF['global_type']);
-	$T->set_var('map_width', $_MAPS_CONF['global_width']);
-	$T->set_var('map_height', $_MAPS_CONF['global_height']);
-	
-	$T->set_var('primaryColor', '');
-	$T->set_var('stroke_color', '');
-	if ($_MAPS_CONF['label_color'] == 1) {
-		$label_color = '#FFFFFF';
-	} else {
-		$label_color = '#000000';
-	}
-	$T->set_var('label_color', $label_color);
-	$T->set_var('label', '');
-
-	$sql = "
+
+    // Ensure user has the rights to access this map
+    if ($_MAPS_CONF['users_map'] == 0) {
+        COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
+    }
+
+    $T = new Template($_CONF['path'] . 'plugins/maps/templates');
+    $T->set_file('page', 'map.thtml');
+    $T->set_var('mid', '0');
+    $T->set_var('name', $LANG_MAPS_1['users_map']);
+    $T->set_var('description', '<p>' . $LANG_MAPS_1['info_users_map'] . '</p>');
+    $T->set_var('header', '');
+    $T->set_var('footer', '');
+
+    //Users maps is set by default on 0,0. Todo make it configurable
+    $T->set_var('address', '');
+    $T->set_var('lat', 0);
+    $T->set_var('lng', 0);
+    $T->set_var('zoom', $_MAPS_CONF['global_zoom']);
+    $T->set_var('goog_api_key', $_MAPS_CONF['google_api_key']);
+    $T->set_var('map_type', $_MAPS_CONF['global_type']);
+    $T->set_var('map_width', $_MAPS_CONF['global_width']);
+    $T->set_var('map_height', $_MAPS_CONF['global_height']);
+
+    $T->set_var('primaryColor', '');
+    $T->set_var('stroke_color', '');
+    if ($_MAPS_CONF['label_color'] == 1) {
+        $label_color = '#FFFFFF';
+    } else {
+        $label_color = '#000000';
+    }
+    $T->set_var('label_color', $label_color);
+    $T->set_var('label', '');
+
+    $sql = "
 	    SELECT info.uid, info.location, info.about, geo.lat, geo.lng, user.username, user.fullname, user.photo, user.regdate 
 	    FROM {$_TABLES['userinfo']} AS info 
 		INNER JOIN {$_TABLES['maps_geo']} AS geo 
@@ -115,42 +114,42 @@ function getUsersMap () {
 		ON user.uid = info.uid 
 		WHERE info.location <> ''
 	";
-	
-	$user_marker = DB_query($sql);
-	
+
+    $user_marker = DB_query($sql);
+
     //Build markers  
-    $nRows  = DB_numRows($user_marker);
-	
-	$markers = 'var markers = [];';	
-	
-	if ( $_MAPS_CONF['use_cluster'] == 0 ) {
-	    $T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
-	} else {
-	    $T->set_var('markerclusterer', '');
-	}
-	
-    for ( $i=0; $i < $nRows; $i++ ) {
-        
-		$marker = DB_fetchArray($user_marker);
-		
-	    $marker['mkid'] = $marker['uid'];
-
-		//icon
-		$markers .= LB . '';
-		
-		if ( $marker['photo'] != '' && file_exists($_CONF['path_images'] . 'userphotos/' . $marker['photo']) ) {
-		
-		    $markers .= LB . 'var image' . $marker['mkid'] . ' = {
+    $nRows = DB_numRows($user_marker);
+
+    $markers = 'var markers = [];';
+
+    if ($_MAPS_CONF['use_cluster'] == 0) {
+        $T->set_var('markerclusterer', "<script src=\"{$_MAPS_CONF['site_url']}/js/markerclusterer.js\" type=\"text/javascript\"></script>");
+    } else {
+        $T->set_var('markerclusterer', '');
+    }
+
+    for ($i = 0; $i < $nRows; $i++) {
+
+        $marker = DB_fetchArray($user_marker);
+
+        $marker['mkid'] = $marker['uid'];
+
+        //icon
+        $markers .= LB . '';
+
+        if ($marker['photo'] != '' && file_exists($_CONF['path_images'] . 'userphotos/' . $marker['photo'])) {
+
+            $markers .= LB . 'var image' . $marker['mkid'] . ' = {
 				url: "' . $_MAPS_CONF['site_url'] . '/timthumb.php?src='
-				. $_CONF['site_url'] . '/' . substr($_CONF['path_images'], strlen($_CONF['path_html']), -1) . '/userphotos/' . $marker['photo'] . '&w=30&h=30&q=90",
+                . $_CONF['site_url'] . '/' . substr($_CONF['path_images'], strlen($_CONF['path_html']), -1) . '/userphotos/' . $marker['photo'] . '&w=30&h=30&q=90",
 				size: new google.maps.Size(30,30),
 				// The origin for this image
 				origin: new google.maps.Point(0,0),
 				// The anchor for this image
 				anchor: new google.maps.Point(15, 30)
 			};';
-		} else {
-     		$markers .= LB . 'var image' . $marker['mkid'] . ' = {
+        } else {
+            $markers .= LB . 'var image' . $marker['mkid'] . ' = {
 				url: "' . $_MAPS_CONF['site_url'] . '/images/usermarker.png",
 				size: new google.maps.Size(37, 37),
 				// The origin for this image
@@ -158,71 +157,70 @@ function getUsersMap () {
 				// The anchor for this image
 				anchor: new google.maps.Point(17,37)
 			};';
-		}
-		
-		$markers .= LB . '				var marker' . $marker['mkid'] .' = new google.maps.Marker({
-		 position: new google.maps.LatLng('. $marker['lat']. ', '. $marker['lng'] .'),
+        }
+
+        $markers .= LB . '				var marker' . $marker['mkid'] . ' = new google.maps.Marker({
+		 position: new google.maps.LatLng(' . $marker['lat'] . ', ' . $marker['lng'] . '),
 		 map:map0,
-		 title: "' .  $marker['username'] . '",
+		 title: "' . $marker['username'] . '",
 		 animation: google.maps.Animation.DROP,
 		 icon: image' . $marker['mkid'] . '
-		 });' . LB ;
-		 
-		//Infowindow link to user profile
-		$bio = '';
-		if ($marker['about'] != '') $bio = preg_replace( "/\r|\n/", "", nl2br(substr ( $marker['about'] ,0, 150 ))) . '...<br' .  XHTML . '>';
-		$presentation = '<div style="overflow:auto;width:250px;height:150px"><p><strong><span style="text-transform:uppercase;">' . $marker['username'] . '</span></strong></p>' . $bio;
-		$presentation .= '<a href="'. $_CONF['site_url'] .'/users.php?mode=profile&uid=' . $marker['uid'] . '">' . $LANG_MAPS_1['read_more'] . '</a>';
-		$presentation .= '</div>';
-		
-		$markers .= '				var infowindow' . $marker['mkid'] . ' = new google.maps.InfoWindow({
+		 });' . LB;
+
+        //Infowindow link to user profile
+        $bio = '';
+        if ($marker['about'] != '') $bio = preg_replace("/\r|\n/", "", nl2br(substr($marker['about'], 0, 150))) . '...<br' . XHTML . '>';
+        $presentation = '<div style="overflow:auto;width:250px;height:150px"><p><strong><span style="text-transform:uppercase;">' . $marker['username'] . '</span></strong></p>' . $bio;
+        $presentation .= '<a href="' . $_CONF['site_url'] . '/users.php?mode=profile&uid=' . $marker['uid'] . '">' . $LANG_MAPS_1['read_more'] . '</a>';
+        $presentation .= '</div>';
+
+        $markers .= '				var infowindow' . $marker['mkid'] . ' = new google.maps.InfoWindow({
 			  content: \'' . addslashes($presentation) . '\'
 		  });' . LB;
-		
-		// Adding a click-event to the marker  
-		$markers .= '				google.maps.event.addListener(marker' . $marker['mkid'] . ', \'click\', function() {
-			infowindow' . $marker['mkid'] . '.open(map0,marker' . $marker['mkid'] .');
+
+        // Adding a click-event to the marker
+        $markers .= '				google.maps.event.addListener(marker' . $marker['mkid'] . ', \'click\', function() {
+			infowindow' . $marker['mkid'] . '.open(map0,marker' . $marker['mkid'] . ');
 		  });' . LB;
 
-		// Add marker to map
-		if ( $_MAPS_CONF['use_cluster'] == 1 ) {
-		    $markers .= '				    markers.push(marker' . $marker['mkid'] .');' . LB;
-		}
-		
-	}
-	
-	$markers .= LB . '				var markerCluster = new MarkerClusterer(map0, markers);' . LB; 
-	
-	//Ads	
-	$ads = MAPS_getAds (0);
-	$T->set_var('ads', $ads);
-							
-	$T->set_var('markers', $markers);
-
-	$T->set_var('edit_button', '');
-
-	$T->parse('output','page');
-	$retval .= $T->finish($T->get_var('output'));
-	
-	return $retval;
-}
+        // Add marker to map
+        if ($_MAPS_CONF['use_cluster'] == 1) {
+            $markers .= '				    markers.push(marker' . $marker['mkid'] . ');' . LB;
+        }
 
-// MAIN
+    }
+
+    $markers .= LB . '				var markerCluster = new MarkerClusterer(map0, markers);' . LB;
+
+    //Ads
+    $ads = MAPS_getAds(0);
+    $T->set_var('ads', $ads);
+
+    $T->set_var('markers', $markers);
 
-$display = '';
+    $T->set_var('edit_button', '');
 
-$display .= COM_siteHeader('menu', $LANG_MAPS_1['users_map']);
-$display .= MAPS_user_menu();
+    $T->parse('output', 'page');
+    $retval = $T->finish($T->get_var('output'));
+
+    return $retval;
+}
+
+// MAIN
+$display = MAPS_user_menu();
 
 if ($_MAPS_CONF['users_map'] == 1) {
     //Display the Users Map 
-	$display .= getUsersMap();
+    $display .= getUsersMap();
 } else {
-    echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
+    COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
 }
 
-$display .= COM_siteFooter();
-
-echo $display;
-
-?>
+$display = COM_createHTMLDocument(
+    $display,
+    array(
+        'what'      => 'menu',
+        'pagetitle' => $LANG_MAPS_1['users_map'],
+    )
+);
+COM_output($display);

From 3671980b17b0d03d8c1f574142d1e06307f57f57 Mon Sep 17 00:00:00 2001
From: Ivy <komma@ivywe.co.jp>
Date: Sat, 18 Mar 2017 16:27:11 +0900
Subject: [PATCH 2/3] add Japanese language file

---
 language/japanese_utf-8.php | 476 ++++++++++++++++++++++++++++++++++++
 1 file changed, 476 insertions(+)
 create mode 100644 language/japanese_utf-8.php

diff --git a/language/japanese_utf-8.php b/language/japanese_utf-8.php
new file mode 100644
index 0000000..5acc464
--- /dev/null
+++ b/language/japanese_utf-8.php
@@ -0,0 +1,476 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | Maps Plugin 1.4                                                           |
+// +---------------------------------------------------------------------------+
+// | japanese_utf-8.php                                                        |
+// |                                                                           |
+// | Japanese language file                                                    |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2010 by the following authors:                              |
+// |                                                                           |
+// | Authors: ::Ben                                                            |
+// | Translated:: Ivy                                                          |
+// +---------------------------------------------------------------------------+
+// | Created with the Geeklog Plugin Toolkit.                                  |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | This program is free software; you can redistribute it and/or             |
+// | modify it under the terms of the GNU General Public License               |
+// | as published by the Free Software Foundation; either version 2            |
+// | of the License, or (at your option) any later version.                    |
+// |                                                                           |
+// | This program is distributed in the hope that it will be useful,           |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
+// | GNU General Public License for more details.                              |
+// |                                                                           |
+// | You should have received a copy of the GNU General Public License         |
+// | along with this program; if not, write to the Free Software Foundation,   |
+// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+/**
+* @package Maps
+*/
+
+/**
+* Import Geeklog plugin messages for reuse
+*
+* @global array $LANG32
+*/
+global $LANG32;
+
+// +---------------------------------------------------------------------------+
+// | Array Format:                                                             |
+// | $LANGXX[YY]:  $LANG - variable name                                       |
+// |               XX    - specific array name                                 |
+// |               YY    - phrase id or number                                 |
+// +---------------------------------------------------------------------------+
+
+$LANG_MAPS_1 = array(
+    'plugin_name'           => 'Maps',
+    'plugin_doc'            => 'インストール、アップグレードと利用方法のドキュメントは',
+    'map'                   => 'マップ',
+    'online'                => 'こちら',
+    'google_maps_API'       => '<a href="">Google Maps API</a>',
+    'need_google_api'       => 'まずはじめに、<a href="http://code.google.com/apis/maps/signup.html" target="_blank">Google Maps API</a>をコンフィギュレーションにセットしてください。',
+    'profile_title'         => '位置情報',
+    'buy_marker'            => 'マーカーを購入',
+    'menu_label'            => 'マップ管理',
+    'admin_home'            => 'ホーム',
+    'user_home'             => 'すべてのマップ',
+    'maps'                  => 'マップ',
+    'markers'               => 'マーカー',
+    'maps_label'            => 'マップ',
+    'create_map'            => 'マップを作成する',
+    'create_marker'         => 'マーカーを作成する',
+    'map_edit'              => 'マップ編集:',
+    'marker_edit'           => 'マーカー編集:',
+    'deletion_succes'       => '削除成功',
+    'deletion_fail'         => '削除失敗',
+    'error'                 => 'エラー',
+    'save_fail'             => '保存エラー',
+    'save_success'          => '保存完了',
+    'missing_field'         => '未入力フィールドがあります...',
+    'geocoder'              => 'Geoコーダー',
+    'geocoder_text'         => '住所を入力してください。そしてマーカーをロケーションにドラッグしてください。緯度・軽度が表示されます。',
+    'go'                    => '実行!',
+    'name_label'            => 'マップ名: ',
+    'marker_name_label'     => 'マーカー名: ',
+    'description_label'     => '詳細:',
+    'ok_button'             => 'Ok',
+    'edit_button'           => '編集',
+    'save_button'           => '保存',
+    'delete_button'         => '削除',
+    'yes'                   => 'はい',
+    'no'                    => 'いいえ',
+    'required_field'        => '入力必須',
+    'address_label'         => '住所: ',
+    'message'               => 'メッセージ',
+    'general_settings'      => '一般設定',
+    'map_width'             => 'マップの横幅 (% または px, 最小 550px): ',
+    'map_height'            => 'マップの高さ (px のみ, 最小 350px): ',
+    'map_zoom'              => 'マップズーム (0-21): ',
+    'map_type'              => 'マップタイプ: ',
+    'active'                => 'マップ有効: ',
+    'hidden'                => 'マップ非表示: ',
+    'marker_active'         => 'マーカー有効: ',
+    'marker_hidden'         => 'マーカー非表示: ',
+    'free_marker'           => 'フリーマーカー許可: ',
+    'paid_marker'           => 'ペイドマーカー許可: ',
+    'error_address_empty'   => '住所を先に入力してください。',
+    'error_invalid_address' => 'この住所をただしく認識できません。市区町村名と番地はただしいでしょうか?',
+    'error_google_error'    => '処理できませんでした。もう一度処理してください。',
+    'error_no_map_info'     => '残念ながらマップ情報を表示できません。',
+    'need_directions'       => '方向が必要ですか? あなたの住所を入力してください:',
+    'get_directions'        => '方向をGET  ',
+    'maps_list'             => 'マップリスト',
+    'you_can'               => '',
+    'user_maps_list'        => 'データベースにマップリストがあります。',
+    'markers_list'          => 'マーカーリスト',
+    'no_map'                => 'マップがありません。マップを作成した後マーカーを登録してください。',
+    'no_map_user'           => '残念ながら有効なマップがデータベースに登録されていません。',
+    'value_directions'      => '例） 国名　市区町村名　番地', // No quote here please
+    'id'                    => 'ID',
+    'name'                  => '名称',
+    'description'           => '詳細',
+    'active_field'          => '有効',
+    'hidden_field'          => '非表示',
+    'title_display'         => 'マップページを表示',
+    'map_header_label'      => '任意のマップヘッダ',
+    'map_footer_label'      => '任意のマップフッタ',
+    'header_footer'         => 'ヘッダとフッタ',
+    'informations'          => 'インフォメーション',
+    'must_belong_to'        => 'マップへのアクセスに必要なグループ登録:',
+    'private_access'        => 'プライベートアクセス',
+    'marker_label'          => 'マーカー',
+    'primary_color_label'   => 'プライマリーカラー',
+    'stroke_color_label'    => 'ストロークカラー',
+    'label'                 => 'ラベル',
+    'label_color'           => 'ラベルカラー',
+    'black'                 => 'ブラック',
+    'white'                 => 'ホワイト',
+    'payed'                 => 'ペイドマーカー:',
+    'lat'                   => '緯度:',
+    'lng'                   => '経度:',
+    'ressources_tab'        => 'リソースタブ',
+    'presentation'          => 'プレゼンテーション',
+    'ressources'            => 'リソース',
+    'presentation_tab'      => 'プレゼンテーションタブ',
+    'empty_ressources'      => 'リソースラベルが空です。少なくともひとつ、登録してください。コンフィギュレーションを参照してください。',
+    'empty_for_geo'         => '住所からの自動計測をするなら、緯度経度は空白にしてください。',
+    'select_marker_map'     => 'マーカーを表示するマップを選んでください。',
+    'remark'                => '注意',
+    'marker_created'        => 'マーカー作成:',
+    'map_created'           => 'マップ作成:',
+    'modified'              => '最終編集日:',
+    'marker_validity'       => '有効期限を利用:',
+    'maps_empty'            => '先にマップを作成してください。',
+    'from'                  => 'From:',
+    'to'                    => 'To:',
+    'date_issue'            => '終了タグが開始タグの前にあります。すぐチェックしてください!',
+    'max_char'              => '最大文字数。',
+    'street_label'          => '番地:',
+    'code_label'            => '〒:',
+    'city_label'            => '市:',
+    'state_label'           => '都道府県:',
+    'country_label'         => '国:',
+    'tel_label'             => 'Tel:',
+    'fax_label'             => 'Fax:',
+    'web_label'             => 'Web:',
+    'not_use_see_config'    => '利用していません。コンフィギュレーションを参照してください。',
+    //global maps
+    'global_map'            => 'グローバルマップ',
+    'info_global_map'       => 'これはひとつのマップにすべてのマーカーを表示したものです。',
+    'users_map'             => 'サイトユーザのマップ',
+    'info_users_map'        => 'これはサイトユーザのマップです。あなたのプロフィールの位置情報を追加することで表示されます。',
+    //Submission
+    'address'               => '住所',
+    'created'               => '日時',
+    'submit_marker'         => 'マーカーを投稿する',
+    'submit_marker_text'    => '<p><ol><li>ロケーションマーカーを登録してください。<li>すべてのフィールドを入力してください。<li>投稿が承認されるまでお待ちください。</ol></p>',
+    'markers_submissions'   => 'マーカーを登録',
+    'submission_disabled'   => 'マーカーの登録申請ができませんでした。',
+    'go'                    => '入力した住所の位置情報を取得する',
+    //date and hits
+    'last_modification'     => '最終編集日時:',
+    'hits'                  => 'ヒット',
+    //user marker
+    'member'                => 'メンバー',
+    'location'              => '位置: ',
+    'regdate'               => 'メンバー登録日: ',
+    'about'                 => 'アバウト',
+    'my_markers'            => 'マイマーカー',
+    'payed_label'           => 'ペイド',
+    'from_label'            => 'バリディティ from',
+    'to_label'              => 'バリディティ to',
+    'no_marker'             => 'マーカーが未登録のようです。サイトのミスだと思われる場合にはサイトの管理者にお問い合わせください。',
+    'marker_detail'         => 'マーカー詳細',
+    'admin_can'             => 'マップ管理者としてあなたは',
+    'create_map'            => 'マップ新規作成',
+    'set_user_geo'          => 'ユーザーのGeoをセット',
+    'set_geo_location'      => 'システムチェックとすべてのGeoロケーションのセット OK',
+    'records'               => 'レコード',
+    'report'                => 'マーカーレポート',
+    'report_subject'        => 'マーカーのレポート',
+    'edit_marker_text'      => '<p><ol><li>ロケーションマーカーをセット<li>入力フィールドに入力<li>それでＯＫです。</ol></p>',
+    'admin'                 => '管理画面',
+    'category_label'        => 'カテゴリ:',
+    'choose_category'       => '-- カテゴリを選択 --',
+    'categories'            => 'カテゴリ',
+    'categories_list'       => 'カテゴリリスト',
+    'cat_edit'              => 'カテゴリ編集:',
+    'cat_name_label'        => 'カテゴリ名:',
+    'create_cat'            => 'カテゴリ新規作成',
+    'field_list'            => 'フィールドリスト',
+    'addfield'              => 'フィールドを追加',
+    'field_name'            => 'フィールド名',
+    'field_order'           => '順番',
+    'field_autotag'         => '自動タグ',
+    'field_rights'          => 'パーミッション',
+    'field_edit'            => '編集',
+    'valid'                 => '有効',
+    'editing_field'         => 'フィールド編集',
+    'category'              => 'カテゴリ',
+    'map_label'             => 'マップ',
+    'colon'                 => ':', //Add space before and after if needed
+    'view_map'              => 'マップを見る',
+    'view_markers'          => 'マーカーを見る',
+    'code'                  => '郵便番号',
+    'city'                  => '市',
+    'viewing_markers'       => 'ここはマップのマーカー',
+    'details'               => '詳細',
+    'view_details'          => '詳細をみる',
+    'print'                 => 'プリント',
+	'to_complete'           => '完了する',
+	'autotag_desc_maps'     => '[maps: xx] - id=XX　を指定して マップを表示する。',
+	'autotag_desc_geo'      => '[geo: map width:XX height:YY zoom:ZZ location] - 位置情報 (street, city, country)を中心としたマップを表示する。オプションは、幅と高さをピクセル指定 (例 400px) とズーム (0 から 21)。',
+	'autotag_desc_marker'   => '[marker: xx] - マーカーを id=XX で指定して表示する。',
+	//v1.1
+	'marker_customisation'  => 'マーカーカスタマイズ',
+	'mk_default'            => 'デフォルトのマーカーを使う',
+	'overlays'              => 'オーバーレイ',
+	'overlays_list'         => 'オーバーレイ一覧',
+	'create_overlay'        => 'オーバーレイ新規作成',
+	'edit_overlay_text'     => 'オーバーレイ編集:',
+	'overlay_name_label'    => 'オーバーレイ名:',
+	'overlay_presentation'  => 'オーバーレイ画像は緯度・経度を指定して張り付けられます。ドラッグ、ズームに応じてオーバーレイが切り替わります。',
+	'overlay_active'        => 'オーバーレイアクティブ:',
+	'zoom_min_label'        => 'ズーム 最小:',
+	'zoom_max_label'        => 'ズーム 最大:',
+	'image_message'         => '画像ファイルを選んでください。',
+	'image_replace'         => '画像ファイルをアップロードして置き換え:',
+	'image'                 => '画像',
+	'sw_lat'                => '南西 緯度:',
+    'sw_lng'                => '南西 経度:',
+	'ne_lat'                => '北東 緯度:',
+    'ne_lng'                => '北東 経度:',
+	'overlay_not_writable'  => 'オーバーレイフォルダ書き込み化: オーバーレイ用のフォルダを作成して書き込み可能に設定してください。',
+	'map_tab'               => 'マップ',
+	'overlays_tab'          => 'オーバーレイ',
+	'add_overlay'           => 'オーバーレイ追加',
+	'remove_overlay'        => 'オーバーレイ削除',
+	'overlay_label'         => 'オーバーレイ',
+	'import_export'         => 'インポート/エクスポート',
+	'import'                => 'インポート',
+	'export'                => 'エクスポート',
+	'select_file'           => '.csvファイルを選んでください。',
+	'import_message'        => 'マーカーを追加したいマップを選んで, マーカーファイルを選び, データのセパレータとインポートしたいフィールドをチェックしてください。',
+	'markers_added'         => 'マーカーをマップに追加:',
+	'export_message'        => 'マーカーをエクスポートしたいマップを選んで, マーカーファイルを選び, データのセパレータとインポートしたいフィールドをチェックしてください。',
+	'no_marker_to_export'   => 'このマップにはエクスポートするマーカーがありませんでした。',
+	'icons'                 => 'アイコン',
+	'icons_not_writable'    => 'アイコンフォルダ書き込み不可: アイコンフォルダを作成して書き込み可能にしてください。',
+	'icons_list'            => 'アイコン一覧',
+	'create_icon'           => 'アイコン新規作成',
+	'icon_edit'             => 'アイコン編集',
+	'icon_presentation'     => 'マーカーで表示するアイコンをアップロードできます。', 
+	'icon_name_label'       => 'アイコン名',
+	'xmarkers'              => 'マーカー',
+	'1marker'               => 'マーカー',
+	'choose_icon'           => 'このマーカーのアイコンを選べます。優先アイコンはカラーアイコンです。',
+	'no_icon'               => 'アイコン無し',
+	'separator'             => 'セパレータ',
+	'markers_to_add'        => 'すべてのフィールドの値をチェックして、マーカーを追加するマップを選んでください。:',
+	'choose_fields_import'  => 'フィールドを選んでインポート',
+	'choose_fields_export'  => 'フィールドを選んでエクスポート',
+	'checkall'              => 'すべてチェック',
+	'order'                 => '順番',
+	'move'                  => '移動',
+	'name_missing'          => '少なくともCSVファイル名がありません。',
+	'need_address'          => 'マーカー作成のためには少なくとも住所または緯度・経度が必要です。CSVファイルをチェックしてください。',
+	'manage_groups'         => 'オーバーレイ管理',
+	'create_group'          => 'オーバーレイグループを作成する',
+	'group_edit'            => 'グループ編集:',
+	'group_overlay_presentation' => 'オーバーレイグループの名前を編集できます。',
+	'group_overlay_name_label'   => 'オーバーレイグループ名',
+	'group_label'           => 'グループ (オプション)',
+	'choose_group'          => 'グループ選択',
+	'group'                 => 'グループ',
+	//v1.3
+	'geo_fail'              => '住所の入力エラーです。',
+	'on_map'                => '地図上',
+	'read_more'             => '詳しくはこちら',
+	'from_map'              => '地図から',
+	'show_hide_overlays'    => 'オーバーレイ 表示 / 非表示',
+	'fields_presentation'   => 'カテゴリの編集またはフィールドを追加する。',
+	'overlays_added'        => '地図にオーバーレイを追加する',
+	'overlays_to_add'       => '地図にオーバーレイを追加',
+	'marker_modification'   => 'マーカーの編集',
+	'from_owner'            => 'から',
+	'marker_limited'        => 'マーカー制限です',
+	'events_map'            => 'イベントマップ',
+	'info_events_map'       => '',
+	'from_cal'              => 'From',
+	'to_cal'                => 'to',
+	'on_cal'                => 'On',
+    //v1.4
+    'configuration'         => 'コンフィギュレーション',
+
+);
+
+$LANG_MAPS_MESSAGE = array(
+    'message'               => 'システムからのメッセージ',
+    'add_new_field'         => 'フィールドが新たに作成されました。',
+    'save_field'            => 'フィールドが新たに保存されました。',
+    'delete_field'          => 'フィールドが削除されました。',
+);
+
+$LANG_MAPS_EMAIL = array(
+    'hello_admin'           => 'ようこそ、管理者さん,',
+    'new_marker'            => '承認待ちのマーカーが作成されました。',
+    'name'                  => '名称:',
+    'on_map'                => 'マップ上:',
+    'submissions'           => '投稿: ',
+    'marker_submissions'    => 'マーカーの投稿',
+    'description'           => '説明:',
+);
+
+// Messages for the plugin upgrade
+$PLG_maps_MESSAGE3002 = $LANG32[9]; // "requires a newer version of Geeklog"
+
+$PLG_maps_MESSAGE1  = "マーカー登録ありがとう！ {$_CONF['site_name']}. 投稿はスタッフに通知されました。";
+$PLG_maps_MESSAGE2  = "マーカーの投稿は終了しました。";
+$PLG_maps_MESSAGE3  = "エラーです。マーカーを保存できません。";
+
+/**
+*   Localization of the Admin Configuration UI
+*   @global array $LANG_configsections['maps']
+*/
+$LANG_configsections['maps'] = array(
+    'label' => 'Maps',
+    'title' => 'Maps'
+);
+
+/**
+*   Configuration system prompt strings
+*   @global array $LANG_confignames['maps']
+*/
+$LANG_confignames['maps'] = array(
+    'maps_folder'           => 'マップの公開フォルダ',
+    'hide_maps_menu'        => 'マップメニューを非表示',
+    'maps_login_required'   => 'マップ　ログイン要求',
+    'autofill_coord'        => '自動的に未入力緯度経度をセットする',
+    'display_geo_profile'   => 'プロフィール geo ロケーリゼーション',
+    'map_type_profile'      => 'プロフィールマップタイプ',
+    'map_type_geotag'       => 'geo マップ自動タグ タイプ',
+    'show_directions_geo'   => 'geo 自動タグに方向を表示する',
+    'show_directions_profile' => 'プロフィールに方向を表示する',
+    'map_width_geotag'      => 'geo マップ自動タグ 幅 (単位指定: % または px)',
+    'map_height_geotag'     => 'geo マップ自動タグ 高さ (単位指定: px のみ)',
+    'map_zoom_geotag'       => 'geo マップ自動タグ ズーム (0-21)',
+    'map_width_profile'     => 'プロフィールマップの幅　(単位指定: % または px)',
+    'map_height_profile'    => 'プロフィールマップの高さ (単位指定: px のみ)',
+    'AdsOnMap'              => 'マップにgoogle adsを表示',
+    'publisher_id'          => '公開 id',
+    'channel_id'            => 'あなたのチャンネル',
+    'maxAdsOnMap'           => 'マップ上の最大ads数', 
+    'show_map'              => 'Google Mapを見る',
+    'google_api_key'        => 'Google Maps API Key',
+    'url_geocode'           => 'Google GeoコーディングサービスのURL',
+    'map_width'             => 'マップの横幅のデフォルト(with % or px)',
+    'map_height'            => 'マップの高さのデフォルト(with px only)',
+    'map_zoom'              => 'マップズームのデフォルト(0-21)',
+    'map_type'              => 'マップタイプのデフォルト',
+    'default_permissions'   => 'パーミッションのデフォルト',
+    'map_main_header'       => 'メインページヘッダ, autotag welcome',
+    'map_main_footer'       => 'メインページフッタ, autotag welcome',
+    'map_geo'               => 'すべてのプロフィールでマップを作成する',
+    'map_markers'           => 'すべてのマーカーでマップを作成する',
+    'map_active'            => 'マップは有効',
+    'map_hidden'            => 'マップは非表示',
+    'free_markers'          => 'マップはフリーマーカーを許可',
+    'paid_markers'          => 'マップはペイドマーカーを許可 (Paypalプラグイン要)',
+    'street'                => '番地情報を使用',
+    'code'                  => '郵便番号情報を使用',
+    'city'                  => '市区町村情報を使用',
+    'state'                 => '都道府県情報を使用',
+    'country'               => '国情報を使用',
+    'tel'                   => 'TEL情報を使用',
+    'fax'                   => 'FAX情報を使用',
+    'web'                   => 'Web情報を使用',
+    'item_1'                => 'リソース #1 label',
+    'item_2'                => 'リソース #2 label',
+    'item_3'                => 'リソース #3 label',
+    'item_4'                => 'リソース #4 label',
+    'item_5'                => 'リソース #5 label',
+    'item_6'                => 'リソース #6 label',
+    'item_7'                => 'リソース #7 label',
+    'item_8'                => 'リソース #8 label',
+    'item_9'                => 'リソース #9 label',
+    'item_10'               => 'リソース #10 label',
+    'label_color'           => 'ラベルカラー',
+    'star_primary_color'    => 'スタープライマリーカラー',
+    'star_stroke_color'     => 'スターストロークカラー',
+    'marker_active'         => 'マーカー有効をデフォルト',
+    'marker_hidden'         => 'マーカー非表示をデフォルト',
+    'marker_payed'          => 'マーカーペイドをデフォルト',
+    'marker_validity'       => 'マーカーバリディティをデフォルト',
+    'monetize'              => 'マーカー収益化',
+    'marker_submission'     => 'マーカー投稿を許可',
+    'users_map'             => 'サイトユーザのアクティブマップ',
+    'global_map'            => 'アクティブグローバルマップ',
+    'global_type'           => 'グローバルマップ タイプ',    
+    'global_width'          => 'グローバルマップ 横幅',
+    'global_height'         => 'グローバルマップ 高さ',
+    'global_zoom'           => 'グローバルマップ ズーム (0-21)',
+    'detail_zoom'           => 'マーカー詳細 ズームm (0-21)',
+    'submit_login_required' => 'マーカー投稿にログインが必要',
+    'marker_edition'        => 'マーカー編集',
+    'infos_label'           => 'インフォラベル (プロバージョン)',
+	'use_cluster'           => 'マーカークラスターを利用する',
+	'zoom_profile'          => 'ユーザープロファイルのマップのズーム (0-21)',
+	'display_events_map'    => 'イベントマップを表示する',
+);
+
+/**
+*   Configuration system subgroup strings
+*   @global array $LANG_configsubgroups['maps']
+*/
+$LANG_configsubgroups['maps'] = array(
+    'sg_main' => 'メイン設定',
+    'sg_display' => '表示設定'
+);
+
+/**
+*   Configuration system fieldset names
+*   @global array $LANG_fs['maps']
+*/
+$LANG_fs['maps'] = array(
+    'fs_main'            => '一般設定',
+    'fs_ads'             => 'Google Ads設定',
+    'fs_google'          => 'Google API設定',
+    'fs_permissions'     => 'デフォルトパーミッション',
+    'fs_display'         => 'マップ',
+    'fs_global_map'      => 'グローバルマップ',
+    'fs_display_profile' => 'プロフィール',
+    'fs_display_geo'     => 'geo自動タグ',
+    'fs_map_default'     => 'マップデフォルト設定',
+    'fs_marker_default'  => 'マーカーデフォルト設定',
+ );
+
+/**
+*   Configuration system selection strings
+*   Note: entries 0, 1, and 12 are the same as in 
+*   $LANG_configselects['Core']
+*
+*   @global array $LANG_configselects['maps']
+*/
+$LANG_configselects['maps'] = array(
+    0 => array('はい' => 1, 'いいえ' => 0),
+    1 => array('はい' => TRUE, 'いいえ' => FALSE),
+    3 => array('はい' => 1, 'いいえ' => 0),
+    4 => array('オン' => 1, 'オフ' => 0),
+    5 => array('ページトップ' => 1, '注目記事の下' => 2, 'ページの下' => 3),
+    10 => array('5' => 5, '10' => 10, '25' => 25, '50' => 50),
+    11 => array('マイル' => 'miles', 'キロメータ' => 'km'),
+    12 => array('アクセス不可' => 0, '表示' => 2, '表示・編集' => 3),
+    20 => array('ノーマル' => 'G_NORMAL_MAP', 'サテライトマップ' => 'G_SATELLITE_MAP', '航空写真' => 'G_PHYSICAL_MAP ', '地図＋写真' => 'G_HYBRID_MAP', '地形' => 'G_AERIAL_HYBRID_MAP'),
+    30 => array('白' => 1, '黒' => 0),
+    31 => array('一時的' => 1, 'パーマネント' => 0),
+);
+
+?>

From d2534f364b45f8e37284caf31064897529589d9a Mon Sep 17 00:00:00 2001
From: Ivy <komma@ivywe.co.jp>
Date: Sat, 18 Mar 2017 16:29:20 +0900
Subject: [PATCH 3/3] add {templatelocation} to templates

---
 templates/admin_menu.thtml          | 4 ++++
 templates/edit_map_end.thtml        | 3 +++
 templates/edit_map_item.thtml       | 4 ++++
 templates/edit_map_start.thtml      | 4 ++++
 templates/geo.thtml                 | 6 +++++-
 templates/geo_profile.thtml         | 6 +++++-
 templates/geocoder.thtml            | 3 +++
 templates/group_overlay_form.thtml  | 8 ++++++--
 templates/icon_form.thtml           | 6 +++++-
 templates/import_export_form.thtml  | 6 +++++-
 templates/list_map_end.thtml        | 3 +++
 templates/list_map_item.thtml       | 6 +++++-
 templates/list_map_start.thtml      | 4 ++++
 templates/map.thtml                 | 6 +++++-
 templates/map_autotag.thtml         | 6 +++++-
 templates/map_form.thtml            | 6 +++++-
 templates/map_only_script.thtml     | 4 ++++
 templates/marker.thtml              | 3 +++
 templates/marker_detail.thtml       | 4 ++++
 templates/marker_form.thtml         | 6 +++++-
 templates/marker_submit_form.thtml  | 5 ++++-
 templates/marker_user_form.thtml    | 6 +++++-
 templates/overlay_form.thtml        | 6 +++++-
 templates/submitloginrequired.thtml | 4 ++++
 templates/user_menu.thtml           | 5 +++++
 25 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/templates/admin_menu.thtml b/templates/admin_menu.thtml
index b5c049a..edc73c4 100644
--- a/templates/admin_menu.thtml
+++ b/templates/admin_menu.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <div class="user_menu">
  <a href="{site_url}/admin/plugins/maps/index.php">{admin_home}</a> | 
  <a href="{site_url}/admin/plugins/maps/markers.php">{markers}</a> |
@@ -11,3 +13,5 @@
  <input type="hidden" name="conf_group" value="maps"></form>
 
 </div>
+
+{# end {templatelocation} #}
diff --git a/templates/edit_map_end.thtml b/templates/edit_map_end.thtml
index 3e5645e..b7b8bd5 100644
--- a/templates/edit_map_end.thtml
+++ b/templates/edit_map_end.thtml
@@ -1,2 +1,5 @@
+{# begin {templatelocation} #}
+
 </table>
 
+{# end {templatelocation} #}
diff --git a/templates/edit_map_item.thtml b/templates/edit_map_item.thtml
index 48fb541..5e4c4b4 100644
--- a/templates/edit_map_item.thtml
+++ b/templates/edit_map_item.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
  <tr>
   <td valign="top" style="width:100%;">
    <b><a onClick="elementToggle('map-detail{mid}'); return false;" href="#">{name}</a>&nbsp;</b>
@@ -8,3 +10,5 @@
   <td valign="top">{edit_button}
   </td>
  </tr>
+
+{# end {templatelocation} #}
diff --git a/templates/edit_map_start.thtml b/templates/edit_map_start.thtml
index 43acbe5..1f356f5 100644
--- a/templates/edit_map_start.thtml
+++ b/templates/edit_map_start.thtml
@@ -1 +1,5 @@
+{# begin {templatelocation} #}
+
 <table class="map-list" cellpadding="5" cellspacing="10" style="width:100%;"> 
+
+{# end {templatelocation} #}
diff --git a/templates/geo.thtml b/templates/geo.thtml
index 19b9b24..e98137c 100644
--- a/templates/geo.thtml
+++ b/templates/geo.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <style type="text/css">		
 		#map_canvas{gid} {
 		  height:{map_height_geotag}
@@ -127,4 +129,6 @@
 </div>
 </div>
 <a id="directions_{gid}_table"></a>
-<div id="directions{gid}"></div>
\ No newline at end of file
+<div id="directions{gid}"></div>
+
+{# end {templatelocation} #}
diff --git a/templates/geo_profile.thtml b/templates/geo_profile.thtml
index d594633..19f47a2 100644
--- a/templates/geo_profile.thtml
+++ b/templates/geo_profile.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <style type="text/css">		
 		#map_canvas{gid} {
 		  height:{map_height_geotag}
@@ -27,4 +29,6 @@
 </div>
 </div>
 <a id="directions_{gid}_table"></a>
-<div id="directions{gid}"></div>
\ No newline at end of file
+<div id="directions{gid}"></div>
+
+{# end {templatelocation} #}
diff --git a/templates/geocoder.thtml b/templates/geocoder.thtml
index b95ea60..888c27d 100644
--- a/templates/geocoder.thtml
+++ b/templates/geocoder.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 	  <h1>{geocoder}</h1>
       <p>{geocoder_text}        
       </p>
@@ -7,3 +9,4 @@
       </p>
       <div id="map_canvas" style="width: 100%; height: 400px"></div>
 
+{# end {templatelocation} #}
diff --git a/templates/group_overlay_form.thtml b/templates/group_overlay_form.thtml
index e792596..7201578 100644
--- a/templates/group_overlay_form.thtml
+++ b/templates/group_overlay_form.thtml
@@ -1,10 +1,12 @@
+{# begin {templatelocation} #}
+
 <div id="group_overlay_form">
 	<form name="group_overlay_edit" action="{site_url}/admin/plugins/maps/overlay_group_edit.php" method="POST">
 		<fieldset style="margin-top: 10px;padding:10px;">
 		<legend><b>{informations}</b></legend>
 			<div id="informations">
 			    <p>{group_overlay_presentation}</p>
-				<p><b>{name_label}</b> <font color="red">*</font> <input type="text" name="o_group_name" value="{name}" size="80" maxlength="255"></p>
+				<p><b>{name_label}</b> <font color="red">*</font> <input type="text" class="uk-input" name="o_group_name" value="{name}" size="80" maxlength="255"></p>
 			</div>
 		</fieldset>	
 		
@@ -18,4 +20,6 @@
 			{o_group_id}
 		</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
+
+{# end {templatelocation} #}
diff --git a/templates/icon_form.thtml b/templates/icon_form.thtml
index a050443..49e335f 100644
--- a/templates/icon_form.thtml
+++ b/templates/icon_form.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <div id="icon_form">
 	<form name="icon_edit" action="{site_url}/admin/plugins/maps/icons.php" method="POST"  enctype="multipart/form-data">
 		<fieldset style="margin-top: 10px;padding:10px;">
@@ -19,4 +21,6 @@
 			{id}
 		</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
+
+{# end {templatelocation} #}
diff --git a/templates/import_export_form.thtml b/templates/import_export_form.thtml
index 46db5e3..9ab5daf 100644
--- a/templates/import_export_form.thtml
+++ b/templates/import_export_form.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <script language="JavaScript">
     checked = false;
     function checkedAllExport () {
@@ -54,4 +56,6 @@
 		</fieldset>
 		
 	</form>
-</div>
\ No newline at end of file
+</div>
+
+{# end {templatelocation} #}
diff --git a/templates/list_map_end.thtml b/templates/list_map_end.thtml
index ea7e47c..9a95915 100644
--- a/templates/list_map_end.thtml
+++ b/templates/list_map_end.thtml
@@ -1,2 +1,5 @@
+{# begin {templatelocation} #}
+
 </div>
 
+{# end {templatelocation} #}
diff --git a/templates/list_map_item.thtml b/templates/list_map_item.thtml
index e16d706..da803a8 100644
--- a/templates/list_map_item.thtml
+++ b/templates/list_map_item.thtml
@@ -1 +1,5 @@
- {edit_button} <p class="maps_list_item"><b><a href="{map_detail}">{name}</a>&nbsp;</b>{description}<br{xhtml}><small>{update} {markers} {hits} </small></p>
\ No newline at end of file
+{# begin {templatelocation} #}
+
+ {edit_button} <p class="maps_list_item"><b><a href="{map_detail}">{name}</a>&nbsp;</b>{description}<br{xhtml}><small>{update} {markers} {hits} </small></p>
+
+{# end {templatelocation} #}
diff --git a/templates/list_map_start.thtml b/templates/list_map_start.thtml
index 1fbf1e1..83438bf 100644
--- a/templates/list_map_start.thtml
+++ b/templates/list_map_start.thtml
@@ -1 +1,5 @@
+{# begin {templatelocation} #}
+
 <div id="maps_list">
+
+{# end {templatelocation} #}
diff --git a/templates/map.thtml b/templates/map.thtml
index 98c123c..f3c01a8 100644
--- a/templates/map.thtml
+++ b/templates/map.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <style type="text/css">		
 		#map_canvas_m{mid} {
 		  width:{map_width};
@@ -129,4 +131,6 @@
 <small>{date_and_hits}</small>
 {footer}
 
-{edit_button}
\ No newline at end of file
+{edit_button}
+
+{# end {templatelocation} #}
diff --git a/templates/map_autotag.thtml b/templates/map_autotag.thtml
index 2606f87..0694682 100644
--- a/templates/map_autotag.thtml
+++ b/templates/map_autotag.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <style type="text/css">		
 		#map_canvas_m{mid} {
 		width:{map_width};
@@ -47,4 +49,6 @@
 <small>{date_and_hits}</small>
 {footer}
 
-{edit_button}
\ No newline at end of file
+{edit_button}
+
+{# end {templatelocation} #}
diff --git a/templates/map_form.thtml b/templates/map_form.thtml
index 865f6e0..58fde5f 100644
--- a/templates/map_form.thtml
+++ b/templates/map_form.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <div class="tabs">
 <!-- tabs -->
 <ul class="tabNavigation">
@@ -107,4 +109,6 @@
 	</div>
 </div>
 
-</div>
\ No newline at end of file
+</div>
+
+{# end {templatelocation} #}
diff --git a/templates/map_only_script.thtml b/templates/map_only_script.thtml
index b8eea43..ad59ed4 100644
--- a/templates/map_only_script.thtml
+++ b/templates/map_only_script.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <style type="text/css">		
 		#map_canvas_m{mid} {
 		width:{map_width};
@@ -36,3 +38,5 @@
 	google.maps.event.addDomListener(window, 'load', initialize{mid});
 		
 </script>
+
+{# end {templatelocation} #}
diff --git a/templates/marker.thtml b/templates/marker.thtml
index 1c340a8..100dc2b 100644
--- a/templates/marker.thtml
+++ b/templates/marker.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <div style="padding-top:15px;">
 <h1>{name}</h1>
 
@@ -45,3 +47,4 @@
 
 </div>
 
+{# end {templatelocation} #}
diff --git a/templates/marker_detail.thtml b/templates/marker_detail.thtml
index 1303df6..af76aeb 100644
--- a/templates/marker_detail.thtml
+++ b/templates/marker_detail.thtml
@@ -1,6 +1,10 @@
+{# begin {templatelocation} #}
+
 <div class="product">
  <div><strong>{name}</strong></div>
  <div>{short_description}</div>
  <div><strong>{price_label} {currency} {price}</strong></div>
  <div style="margin-top:10px;">{buy_now}</div>
 </div>
+
+{# end {templatelocation} #}
diff --git a/templates/marker_form.thtml b/templates/marker_form.thtml
index 20305bc..c2944db 100644
--- a/templates/marker_form.thtml
+++ b/templates/marker_form.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <div>
 	<form action="#" onsubmit="codeAddress(); return false">
 	  <p>{edit_marker_text}        
@@ -124,4 +126,6 @@
 			{mkid}
 		</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
+
+{# end {templatelocation} #}
diff --git a/templates/marker_submit_form.thtml b/templates/marker_submit_form.thtml
index 92938d4..d2138a4 100644
--- a/templates/marker_submit_form.thtml
+++ b/templates/marker_submit_form.thtml
@@ -1,4 +1,4 @@
-
+{# begin {templatelocation} #}
 
 <div>
 	<form action="#" onsubmit="codeAddress(); return false">
@@ -61,3 +61,6 @@
 		</div>
 	</form>
 </div>
+
+{# end {templatelocation} #}
+
diff --git a/templates/marker_user_form.thtml b/templates/marker_user_form.thtml
index 4314648..afaf5a1 100644
--- a/templates/marker_user_form.thtml
+++ b/templates/marker_user_form.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <div>
 
 	<p>{edit_marker_text}        
@@ -51,4 +53,6 @@
 			{mkid}
 		</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
+
+{# end {templatelocation} #}
diff --git a/templates/overlay_form.thtml b/templates/overlay_form.thtml
index 1a7353a..d854148 100644
--- a/templates/overlay_form.thtml
+++ b/templates/overlay_form.thtml
@@ -1,3 +1,5 @@
+{# begin {templatelocation} #}
+
 <div id="overlay_form">
 	<form name="overlay_edit" action="{site_url}/admin/plugins/maps/overlay_edit.php" method="POST"  enctype="multipart/form-data">
 		<fieldset style="margin-top: 10px;padding:10px;">
@@ -37,4 +39,6 @@
 			{oid}
 		</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
+
+{# end {templatelocation} #}
diff --git a/templates/submitloginrequired.thtml b/templates/submitloginrequired.thtml
index bd80b1f..4346196 100644
--- a/templates/submitloginrequired.thtml
+++ b/templates/submitloginrequired.thtml
@@ -1,2 +1,6 @@
+{# begin {templatelocation} #}
                             {login_message}<br{xhtml}><br{xhtml}>
                             [ <a href="{site_url}/users.php" rel="nofollow">{lang_login}</a> | <a href="{site_url}/users.php?mode=new" rel="nofollow">{lang_newuser}</a> ]<br{xhtml}><br{xhtml}>
+
+{# end {templatelocation} #}
+
diff --git a/templates/user_menu.thtml b/templates/user_menu.thtml
index c450fd7..7ccc28b 100644
--- a/templates/user_menu.thtml
+++ b/templates/user_menu.thtml
@@ -1,6 +1,11 @@
+{# begin {templatelocation} #}
+
 <div class="user_menu">
  <a href="{maps_url}/index.php">{maps}</a>
  {submit_marker}
  {my_markers}
  {admin}
 </div>
+
+{# end {templatelocation} #}
+