WP Google Maps - Version 5.04

Version Description

  • Fixed multiple bugs (big thanks to Alexander Gieg)
  • Fixed a firefox styling bug when using percentage width/height and set map alignment to 'none'
  • Added support for disabling mouse zooming and dragging
  • Added support for jQuery1.9+
Download this release

Release Info

Developer WPGMaps
Plugin Icon 128x128 WP Google Maps
Version 5.04
Comparing to
See all releases

Code changes from version 5.03 to 5.04

Files changed (9) hide show
  1. readme.txt +6 -0
  2. screenshot-1.jpg +0 -0
  3. screenshot-2.jpg +0 -0
  4. screenshot-3.jpg +0 -0
  5. screenshot-4.jpg +0 -0
  6. screenshot-5.jpg +0 -0
  7. screenshot-6.jpg +0 -0
  8. screenshot-7.jpg +0 -0
  9. wpGoogleMaps.php +35 -24
readme.txt CHANGED
@@ -78,6 +78,12 @@ Previous versions may cause your blog to slow down. Upgrading to 4.5 will get ri
78
 
79
  == Changelog ==
80
 
 
 
 
 
 
 
81
  = 5.03 =
82
  * The google map now auto centres onto the address of the marker you have added
83
  * Fixed some bugs
78
 
79
  == Changelog ==
80
 
81
+ = 5.04 =
82
+ * Fixed multiple bugs (big thanks to Alexander Gieg)
83
+ * Fixed a firefox styling bug when using percentage width/height and set map alignment to 'none'
84
+ * Added support for disabling mouse zooming and dragging
85
+ * Added support for jQuery1.9+
86
+
87
  = 5.03 =
88
  * The google map now auto centres onto the address of the marker you have added
89
  * Fixed some bugs
screenshot-1.jpg ADDED
Binary file
screenshot-2.jpg ADDED
Binary file
screenshot-3.jpg ADDED
Binary file
screenshot-4.jpg ADDED
Binary file
screenshot-5.jpg ADDED
Binary file
screenshot-6.jpg ADDED
Binary file
screenshot-7.jpg ADDED
Binary file
wpGoogleMaps.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: WP Google Maps
4
  Plugin URI: http://www.wpgmaps.com
5
  Description: The easiest to use Google Maps plugin! Create custom Google Maps with high quality markers containing locations, descriptions, images and links. Add your customized map to your WordPress posts and/or pages quickly and easily with the supplied shortcode. No fuss.
6
- Version: 5.03
7
  Author: WP Google Maps
8
  Author URI: http://www.wpgmaps.com
9
  */
@@ -28,8 +28,8 @@ $wpgmza_p = false;
28
  $wpgmza_g = false;
29
  $wpgmza_tblname = $wpdb->prefix . "wpgmza";
30
  $wpgmza_tblname_maps = $wpdb->prefix . "wpgmza_maps";
31
- $wpgmza_version = "5.03";
32
- $wpgmza_p_version = "5.03";
33
  $wpgmza_t = "basic";
34
 
35
  add_action('admin_head', 'wpgmaps_head');
@@ -195,7 +195,7 @@ function wpgmaps_get_marker_url($mapid = false) {
195
  global $blog_id;
196
  return wpgmaps_get_plugin_url()."/".$blog_id."-".$mapid."markers.xml";
197
  } else {
198
- if (function_exists(wpgmza_register_pro_version)) {
199
  $prov = get_option("WPGMZA_PRO");
200
  $wpgmza_pro_version = $prov['version'];
201
 
@@ -222,7 +222,10 @@ function wpgmaps_admin_edit_marker_javascript() {
222
  $wpgmza_settings = get_option("WPGMZA_OTHER_SETTINGS");
223
 
224
  ?>
225
- <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
 
 
 
226
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
227
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo wpgmaps_get_plugin_url(); ?>/css/data_table.css" />
228
  <script type="text/javascript" src="<?php echo wpgmaps_get_plugin_url(); ?>/js/jquery.dataTables.js"></script>
@@ -287,12 +290,12 @@ function wpgmaps_admin_javascript_basic() {
287
  $ajax_nonce = wp_create_nonce("wpgmza");
288
  wpgmaps_debugger("admin_js_basic_start");
289
 
290
- if (is_admin() && $_GET['page'] == 'wp-google-maps-menu' && $_GET['action'] == "edit_marker") {
291
  wpgmaps_admin_edit_marker_javascript();
292
 
293
  }
294
 
295
- else if (is_admin() && $_GET['page'] == 'wp-google-maps-menu' && $_GET['action'] == "edit") {
296
 
297
  if ($debug) { echo ""; }
298
 
@@ -326,7 +329,10 @@ function wpgmaps_admin_javascript_basic() {
326
 
327
 
328
  ?>
329
- <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
 
 
 
330
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
331
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo wpgmaps_get_plugin_url(); ?>/css/data_table.css" />
332
  <script type="text/javascript" src="<?php echo wpgmaps_get_plugin_url(); ?>/js/jquery.dataTables.js"></script>
@@ -363,7 +369,7 @@ function wpgmaps_admin_javascript_basic() {
363
 
364
 
365
 
366
- jQuery(".wpgmza_del_btn").live("click", function() {
367
  var cur_id = jQuery(this).attr("id");
368
  var wpgm_map_id = "0";
369
  if (document.getElementsByName("wpgmza_id").length > 0) { wpgm_map_id = jQuery("#wpgmza_id").val(); }
@@ -384,7 +390,7 @@ function wpgmaps_admin_javascript_basic() {
384
  });
385
 
386
 
387
- jQuery(".wpgmza_edit_btn").live("click", function() {
388
  var cur_id = jQuery(this).attr("id");
389
  var wpgmza_edit_address = jQuery("#wpgmza_hid_marker_address_"+cur_id).val();
390
  var wpgmza_edit_title = jQuery("#wpgmza_hid_marker_title_"+cur_id).val();
@@ -629,7 +635,10 @@ function wpgmaps_user_javascript_basic() {
629
  if (!$wpgmza_lat || !$wpgmza_lng) { $wpgmza_lat = "51.5081290"; $wpgmza_lng = "-0.1280050"; }
630
 
631
  ?>
632
- <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
 
 
 
633
  <script type="text/javascript" >
634
 
635
 
@@ -750,7 +759,7 @@ function wpgmaps_update_xml_file($mapid = false) {
750
 
751
 
752
  // PREVIOUS VERSION HANDLING
753
- if (function_exists(wpgmza_register_pro_version)) {
754
  $prov = get_option("WPGMZA_PRO");
755
  $wpgmza_pro_version = $prov['version'];
756
  $results = $wpdb->get_results(
@@ -828,7 +837,7 @@ function wpgmaps_update_xml_file($mapid = false) {
828
  } else {
829
 
830
  // PREVIOUS VERSION HANDLING
831
- if (function_exists(wpgmza_register_pro_version)) {
832
  $prov = get_option("WPGMZA_PRO");
833
  $wpgmza_pro_version = $prov['version'];
834
  @$dom->save(WP_PLUGIN_DIR.'/'.plugin_basename(dirname(__FILE__)).'/'.$mapid.'markers.xml');
@@ -1113,6 +1122,8 @@ function wpgmaps_head() {
1113
  $wpgmza_data['wpgmza_settings_map_pan'] = attribute_escape($_POST['wpgmza_settings_map_pan']);
1114
  $wpgmza_data['wpgmza_settings_map_type'] = attribute_escape($_POST['wpgmza_settings_map_type']);
1115
  $wpgmza_data['wpgmza_settings_map_scroll'] = attribute_escape($_POST['wpgmza_settings_map_scroll']);
 
 
1116
  $wpgmza_data['wpgmza_settings_ugm_striptags'] = attribute_escape($_POST['wpgmza_settings_map_striptags']);
1117
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_data);
1118
  echo "<div class='updated'>";
@@ -1134,7 +1145,7 @@ function wpgmaps_head() {
1134
 
1135
  function wpgmaps_admin_menu() {
1136
  add_menu_page('WPGoogle Maps', __('Maps','wp-google-maps'), 'manage_options', 'wp-google-maps-menu', 'wpgmaps_menu_layout', wpgmaps_get_plugin_url()."/images/map_app_small.png");
1137
- if (function_exists(wpgmza_pro_advanced_menu)) {
1138
  add_submenu_page('wp-google-maps-menu', 'WP Google Maps - Advanced Options', __('Advanced','wp-google-maps'), 'manage_options' , 'wp-google-maps-menu-advanced', 'wpgmaps_menu_advanced_layout');
1139
  }
1140
  add_submenu_page('wp-google-maps-menu', 'WP Google Maps - Settings', __('Settings','wp-google-maps'), 'manage_options' , 'wp-google-maps-menu-settings', 'wpgmaps_menu_settings_layout');
@@ -1178,7 +1189,7 @@ function wpgmaps_menu_layout() {
1178
  }
1179
  else {
1180
 
1181
- if (function_exists(wpgmza_register_pro_version)) {
1182
 
1183
  $prov = get_option("WPGMZA_PRO");
1184
  $wpgmza_pro_version = $prov['version'];
@@ -1205,8 +1216,8 @@ function wpgmaps_menu_layout() {
1205
 
1206
  function wpgmaps_menu_settings_layout() {
1207
  wpgmaps_debugger("menu_settings_start");
1208
- if (function_exists(wpgmza_register_pro_version)) {
1209
- if (function_exists(wpgmaps_settings_page_pro)) {
1210
  wpgmaps_settings_page_pro();
1211
  }
1212
  } else {
@@ -1232,7 +1243,7 @@ function wpgmaps_settings_page_basic() {
1232
  if ($wpgmza_settings_map_pan == "yes") { $wpgmza_pan_checked = "checked='checked'"; }
1233
  if ($wpgmza_settings_map_type == "yes") { $wpgmza_type_checked = "checked='checked'"; }
1234
 
1235
- if (function_exists(wpgmza_register_pro_version)) {
1236
  $pro_settings1 = wpgmaps_settings_page_sub('infowindow');
1237
  $prov = get_option("WPGMZA_PRO");
1238
  $wpgmza_pro_version = $prov['version'];
@@ -1275,7 +1286,7 @@ function wpgmaps_settings_page_basic() {
1275
  }
1276
 
1277
  function wpgmaps_menu_advanced_layout() {
1278
- if (function_exists(wpgmza_register_pro_version)) {
1279
  wpgmza_pro_advanced_menu();
1280
  }
1281
 
@@ -1284,7 +1295,7 @@ function wpgmaps_menu_advanced_layout() {
1284
  function wpgmza_map_page() {
1285
  wpgmaps_debugger("map_page_start");
1286
 
1287
- if (function_exists(wpgmza_register_pro_version)) {
1288
  echo"<div class=\"wrap\"><div id=\"icon-edit\" class=\"icon32 icon32-posts-post\"><br></div><h2>".__("Your Maps","wp-google-maps")." <a href=\"admin.php?page=wp-google-maps-menu&action=new\" class=\"add-new-h2\">".__("Add New","wp-google-maps")."</a></h2>";
1289
  wpgmaps_check_versions();
1290
  wpgmaps_list_maps();
@@ -1335,7 +1346,7 @@ function wpgmaps_list_maps() {
1335
  else if ($result->type == "2") { $map_type = __("Satellite","wp-google-maps"); }
1336
  else if ($result->type == "3") { $map_type = __("Hybrid","wp-google-maps"); }
1337
  else if ($result->type == "4") { $map_type = __("Terrain","wp-google-maps"); }
1338
- if (function_exists(wpgmza_register_pro_version)) {
1339
  $trashlink = "| <a href=\"?page=wp-google-maps-menu&action=trash&map_id=".$result->id."\" title=\"Trash\">".__("Trash","wp-google-maps")."</a>";
1340
  }
1341
  echo "<tr id=\"record_".$result->id."\">";
@@ -1815,13 +1826,13 @@ function wpgmaps_chmodr($path, $filemode) {
1815
 
1816
 
1817
 
1818
- if (function_exists(wpgmza_register_pro_version)) {
1819
  add_action('wp_ajax_add_marker', 'wpgmaps_action_callback_pro');
1820
  add_action('wp_ajax_delete_marker', 'wpgmaps_action_callback_pro');
1821
  add_action('wp_ajax_edit_marker', 'wpgmaps_action_callback_pro');
1822
  add_action('template_redirect','wpgmaps_check_shortcode');
1823
 
1824
- if (function_exists(wpgmza_register_gold_version)) {
1825
  add_action('wp_footer', 'wpgmaps_user_javascript_gold');
1826
  add_action('admin_head', 'wpgmaps_admin_javascript_gold');
1827
  } else {
@@ -1829,7 +1840,7 @@ if (function_exists(wpgmza_register_pro_version)) {
1829
  add_action('admin_head', 'wpgmaps_admin_javascript_pro');
1830
  }
1831
 
1832
- if (function_exists(wpgmza_register_ugm_version)) {
1833
  }
1834
 
1835
  add_shortcode( 'wpgmza', 'wpgmaps_tag_pro' );
3
  Plugin Name: WP Google Maps
4
  Plugin URI: http://www.wpgmaps.com
5
  Description: The easiest to use Google Maps plugin! Create custom Google Maps with high quality markers containing locations, descriptions, images and links. Add your customized map to your WordPress posts and/or pages quickly and easily with the supplied shortcode. No fuss.
6
+ Version: 5.04
7
  Author: WP Google Maps
8
  Author URI: http://www.wpgmaps.com
9
  */
28
  $wpgmza_g = false;
29
  $wpgmza_tblname = $wpdb->prefix . "wpgmza";
30
  $wpgmza_tblname_maps = $wpdb->prefix . "wpgmza_maps";
31
+ $wpgmza_version = "5.04";
32
+ $wpgmza_p_version = "5.04";
33
  $wpgmza_t = "basic";
34
 
35
  add_action('admin_head', 'wpgmaps_head');
195
  global $blog_id;
196
  return wpgmaps_get_plugin_url()."/".$blog_id."-".$mapid."markers.xml";
197
  } else {
198
+ if (function_exists('wpgmza_register_pro_version')) {
199
  $prov = get_option("WPGMZA_PRO");
200
  $wpgmza_pro_version = $prov['version'];
201
 
222
  $wpgmza_settings = get_option("WPGMZA_OTHER_SETTINGS");
223
 
224
  ?>
225
+ <script type="text/javascript">
226
+ var gmapsJsHost = (("https:" == document.location.protocol) ? "https://" : "http://");
227
+ document.write(unescape("%3Cscript src='" + gmapsJsHost + "maps.google.com/maps/api/js?sensor=false' type='text/javascript'%3E%3C/script%3E"));
228
+ </script>
229
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
230
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo wpgmaps_get_plugin_url(); ?>/css/data_table.css" />
231
  <script type="text/javascript" src="<?php echo wpgmaps_get_plugin_url(); ?>/js/jquery.dataTables.js"></script>
290
  $ajax_nonce = wp_create_nonce("wpgmza");
291
  wpgmaps_debugger("admin_js_basic_start");
292
 
293
+ if (is_admin() && isset( $_GET['page'] ) && $_GET['page'] == 'wp-google-maps-menu' && isset( $_GET['action'] ) && $_GET['action'] == "edit_marker") {
294
  wpgmaps_admin_edit_marker_javascript();
295
 
296
  }
297
 
298
+ else if (is_admin() && isset( $_GET['page'] ) && $_GET['page'] == 'wp-google-maps-menu' && isset( $_GET['action'] ) && $_GET['action'] == "edit") {
299
 
300
  if ($debug) { echo ""; }
301
 
329
 
330
 
331
  ?>
332
+ <script type="text/javascript">
333
+ var gmapsJsHost = (("https:" == document.location.protocol) ? "https://" : "http://");
334
+ document.write(unescape("%3Cscript src='" + gmapsJsHost + "maps.google.com/maps/api/js?sensor=false' type='text/javascript'%3E%3C/script%3E"));
335
+ </script>
336
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
337
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo wpgmaps_get_plugin_url(); ?>/css/data_table.css" />
338
  <script type="text/javascript" src="<?php echo wpgmaps_get_plugin_url(); ?>/js/jquery.dataTables.js"></script>
369
 
370
 
371
 
372
+ jQuery("body").on("click", ".wpgmza_del_btn", function() {
373
  var cur_id = jQuery(this).attr("id");
374
  var wpgm_map_id = "0";
375
  if (document.getElementsByName("wpgmza_id").length > 0) { wpgm_map_id = jQuery("#wpgmza_id").val(); }
390
  });
391
 
392
 
393
+ jQuery("body").on("click", ".wpgmza_edit_btn", function() {
394
  var cur_id = jQuery(this).attr("id");
395
  var wpgmza_edit_address = jQuery("#wpgmza_hid_marker_address_"+cur_id).val();
396
  var wpgmza_edit_title = jQuery("#wpgmza_hid_marker_title_"+cur_id).val();
635
  if (!$wpgmza_lat || !$wpgmza_lng) { $wpgmza_lat = "51.5081290"; $wpgmza_lng = "-0.1280050"; }
636
 
637
  ?>
638
+ <script type="text/javascript">
639
+ var gmapsJsHost = (("https:" == document.location.protocol) ? "https://" : "http://");
640
+ document.write(unescape("%3Cscript src='" + gmapsJsHost + "maps.google.com/maps/api/js?sensor=false' type='text/javascript'%3E%3C/script%3E"));
641
+ </script>
642
  <script type="text/javascript" >
643
 
644
 
759
 
760
 
761
  // PREVIOUS VERSION HANDLING
762
+ if (function_exists('wpgmza_register_pro_version')) {
763
  $prov = get_option("WPGMZA_PRO");
764
  $wpgmza_pro_version = $prov['version'];
765
  $results = $wpdb->get_results(
837
  } else {
838
 
839
  // PREVIOUS VERSION HANDLING
840
+ if (function_exists('wpgmza_register_pro_version')) {
841
  $prov = get_option("WPGMZA_PRO");
842
  $wpgmza_pro_version = $prov['version'];
843
  @$dom->save(WP_PLUGIN_DIR.'/'.plugin_basename(dirname(__FILE__)).'/'.$mapid.'markers.xml');
1122
  $wpgmza_data['wpgmza_settings_map_pan'] = attribute_escape($_POST['wpgmza_settings_map_pan']);
1123
  $wpgmza_data['wpgmza_settings_map_type'] = attribute_escape($_POST['wpgmza_settings_map_type']);
1124
  $wpgmza_data['wpgmza_settings_map_scroll'] = attribute_escape($_POST['wpgmza_settings_map_scroll']);
1125
+ $wpgmza_data['wpgmza_settings_map_draggable'] = attribute_escape($_POST['wpgmza_settings_map_draggable']);
1126
+ $wpgmza_data['wpgmza_settings_map_clickzoom'] = attribute_escape($_POST['wpgmza_settings_map_clickzoom']);
1127
  $wpgmza_data['wpgmza_settings_ugm_striptags'] = attribute_escape($_POST['wpgmza_settings_map_striptags']);
1128
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_data);
1129
  echo "<div class='updated'>";
1145
 
1146
  function wpgmaps_admin_menu() {
1147
  add_menu_page('WPGoogle Maps', __('Maps','wp-google-maps'), 'manage_options', 'wp-google-maps-menu', 'wpgmaps_menu_layout', wpgmaps_get_plugin_url()."/images/map_app_small.png");
1148
+ if (function_exists('wpgmza_pro_advanced_menu')) {
1149
  add_submenu_page('wp-google-maps-menu', 'WP Google Maps - Advanced Options', __('Advanced','wp-google-maps'), 'manage_options' , 'wp-google-maps-menu-advanced', 'wpgmaps_menu_advanced_layout');
1150
  }
1151
  add_submenu_page('wp-google-maps-menu', 'WP Google Maps - Settings', __('Settings','wp-google-maps'), 'manage_options' , 'wp-google-maps-menu-settings', 'wpgmaps_menu_settings_layout');
1189
  }
1190
  else {
1191
 
1192
+ if (function_exists('wpgmza_register_pro_version')) {
1193
 
1194
  $prov = get_option("WPGMZA_PRO");
1195
  $wpgmza_pro_version = $prov['version'];
1216
 
1217
  function wpgmaps_menu_settings_layout() {
1218
  wpgmaps_debugger("menu_settings_start");
1219
+ if (function_exists('wpgmza_register_pro_version')) {
1220
+ if (function_exists('wpgmaps_settings_page_pro')) {
1221
  wpgmaps_settings_page_pro();
1222
  }
1223
  } else {
1243
  if ($wpgmza_settings_map_pan == "yes") { $wpgmza_pan_checked = "checked='checked'"; }
1244
  if ($wpgmza_settings_map_type == "yes") { $wpgmza_type_checked = "checked='checked'"; }
1245
 
1246
+ if (function_exists('wpgmza_register_pro_version')) {
1247
  $pro_settings1 = wpgmaps_settings_page_sub('infowindow');
1248
  $prov = get_option("WPGMZA_PRO");
1249
  $wpgmza_pro_version = $prov['version'];
1286
  }
1287
 
1288
  function wpgmaps_menu_advanced_layout() {
1289
+ if (function_exists('wpgmza_register_pro_version')) {
1290
  wpgmza_pro_advanced_menu();
1291
  }
1292
 
1295
  function wpgmza_map_page() {
1296
  wpgmaps_debugger("map_page_start");
1297
 
1298
+ if (function_exists('wpgmza_register_pro_version')) {
1299
  echo"<div class=\"wrap\"><div id=\"icon-edit\" class=\"icon32 icon32-posts-post\"><br></div><h2>".__("Your Maps","wp-google-maps")." <a href=\"admin.php?page=wp-google-maps-menu&action=new\" class=\"add-new-h2\">".__("Add New","wp-google-maps")."</a></h2>";
1300
  wpgmaps_check_versions();
1301
  wpgmaps_list_maps();
1346
  else if ($result->type == "2") { $map_type = __("Satellite","wp-google-maps"); }
1347
  else if ($result->type == "3") { $map_type = __("Hybrid","wp-google-maps"); }
1348
  else if ($result->type == "4") { $map_type = __("Terrain","wp-google-maps"); }
1349
+ if (function_exists('wpgmza_register_pro_version')) {
1350
  $trashlink = "| <a href=\"?page=wp-google-maps-menu&action=trash&map_id=".$result->id."\" title=\"Trash\">".__("Trash","wp-google-maps")."</a>";
1351
  }
1352
  echo "<tr id=\"record_".$result->id."\">";
1826
 
1827
 
1828
 
1829
+ if (function_exists('wpgmza_register_pro_version')) {
1830
  add_action('wp_ajax_add_marker', 'wpgmaps_action_callback_pro');
1831
  add_action('wp_ajax_delete_marker', 'wpgmaps_action_callback_pro');
1832
  add_action('wp_ajax_edit_marker', 'wpgmaps_action_callback_pro');
1833
  add_action('template_redirect','wpgmaps_check_shortcode');
1834
 
1835
+ if (function_exists('wpgmza_register_gold_version')) {
1836
  add_action('wp_footer', 'wpgmaps_user_javascript_gold');
1837
  add_action('admin_head', 'wpgmaps_admin_javascript_gold');
1838
  } else {
1840
  add_action('admin_head', 'wpgmaps_admin_javascript_pro');
1841
  }
1842
 
1843
+ if (function_exists('wpgmza_register_ugm_version')) {
1844
  }
1845
 
1846
  add_shortcode( 'wpgmza', 'wpgmaps_tag_pro' );