WP Google Maps - Version 6.3.12

Version Description

  • 2016-06-27 - Medium priority =
  • Modified the API key notification to make it simpler and more intuitive
Download this release

Release Info

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

Code changes from version 6.3.11 to 6.3.12

Files changed (2) hide show
  1. readme.txt +3 -0
  2. wpGoogleMaps.php +31 -11
readme.txt CHANGED
@@ -207,6 +207,9 @@ Please upgrade your version of WP Google Maps to version 6.0.27 as it includes m
207
 
208
  == Changelog ==
209
 
 
 
 
210
  = 6.3.11 - 2016-06-24 - Medium Priority =
211
  * Small activation bug fixed
212
  * all polygons and polylines are now viewable when editing or creating a new polygon or polyline
207
 
208
  == Changelog ==
209
 
210
+ = 6.3.12 - 2016-06-27 - Medium priority =
211
+ * Modified the API key notification to make it simpler and more intuitive
212
+
213
  = 6.3.11 - 2016-06-24 - Medium Priority =
214
  * Small activation bug fixed
215
  * all polygons and polylines are now viewable when editing or creating a new polygon or polyline
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: 6.3.11
7
  Author: WP Google Maps
8
  Author URI: http://www.wpgmaps.com
9
  Text Domain: wp-google-maps
@@ -11,6 +11,9 @@ Domain Path: /languages
11
  */
12
 
13
  /*
 
 
 
14
  * 6.3.11 - 2016-06-24 - Medium Priority
15
  * Small activation bug fixed
16
  * all polygons and polylines are now viewable when editing or creating a new polygon or polyline
@@ -238,8 +241,8 @@ $wpgmza_tblname_poly = $wpdb->prefix . "wpgmza_polygon";
238
  $wpgmza_tblname_polylines = $wpdb->prefix . "wpgmza_polylines";
239
  $wpgmza_tblname_categories = $wpdb->prefix. "wpgmza_categories";
240
  $wpgmza_tblname_category_maps = $wpdb->prefix. "wpgmza_category_maps";
241
- $wpgmza_version = "6.3.13";
242
- $wpgmza_p_version = "6.3.13";
243
  $wpgmza_t = "basic";
244
  define("WPGMAPS", $wpgmza_version);
245
  define("WPGMAPS_DIR",plugin_dir_url(__FILE__));
@@ -443,10 +446,12 @@ function wpgmaps_init() {
443
 
444
 
445
 
 
446
 
447
  wpgmaps_handle_directory();
448
  /* handle first time users and updates */
449
  if (isset($_GET['page']) && $_GET['page'] == 'wp-google-maps-menu') {
 
450
 
451
  /* check if their using APC object cache, if yes, do nothing with the welcome page as it causes issues when caching the DB options */
452
  if (class_exists("APC_Object_Cache")) {
@@ -4742,8 +4747,13 @@ function wpgmza_basic_menu() {
4742
  if( isset( $other_settings_data['wpgmza_theme_data'] ) ){
4743
  $wpgmza_theme_data_custom = $other_settings_data['wpgmza_theme_data'];
4744
  } else {
 
 
 
 
4745
  $wpgmza_theme_data_custom = '';
4746
  }
 
4747
 
4748
 
4749
  google_maps_api_key_warning();
@@ -5359,6 +5369,7 @@ function wpgmza_basic_menu() {
5359
  <li><a href=\"#tabs-m-2\" class=\"tabs-m-1\">".__("Advanced markers","wp-google-maps")."</a></li>
5360
  <li><a href=\"#tabs-m-3\" class=\"tabs-m-2\">".__("Polygon","wp-google-maps")."</a></li>
5361
  <li><a href=\"#tabs-m-4\" class=\"tabs-m-3\">".__("Polylines","wp-google-maps")."</a></li>
 
5362
  </ul>
5363
  <div id=\"tabs-m-1\">
5364
 
@@ -5490,7 +5501,11 @@ function wpgmza_basic_menu() {
5490
  <span id=\"wpgmza_addpolyline_div\"><a href='".get_option('siteurl')."/wp-admin/admin.php?page=wp-google-maps-menu&action=add_polyline&map_id=".sanitize_text_field($_GET['map_id'])."' id='wpgmza_addpolyline' class='button-primary' value='".__("Add a New Polyline","wp-google-maps")."' />".__("Add a New Polyline","wp-google-maps")."</a></span>
5491
  <div id=\"wpgmza_polyline_holder\">".wpgmza_b_return_polyline_list(sanitize_text_field($_GET['map_id']))."</div>
5492
  </div>
5493
-
 
 
 
 
5494
  </div>
5495
  </div>
5496
  <div style='display:block; width:50%; overflow:auto; float:left;'>
@@ -6083,6 +6098,7 @@ function wpgmaps_handle_db() {
6083
  approved tinyint(1) DEFAULT '1',
6084
  retina tinyint(1) DEFAULT '0',
6085
  type tinyint(1) DEFAULT '0',
 
6086
  other_data LONGTEXT NOT NULL,
6087
  PRIMARY KEY (id)
6088
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -6679,13 +6695,17 @@ function wpgmza_return_country_tld_array(){
6679
  function google_maps_api_key_warning(){
6680
  $g_api_key = get_option('wpgmza_google_maps_api_key');
6681
  if( !$g_api_key || $g_api_key == '' ){
6682
- $developers_console = "<a href='https://console.developers.google.com/apis/library' target='_BLANK'>".__('Google Developers Console', 'wp-google-maps')."</a>";
6683
- $documentation = "<a href='http://www.wpgmaps.com/documentation/creating-a-google-maps-api-key/' target='_BLANK'>".__('here', 'wp-google-maps')."</a>.";
6684
- echo "<div class='error'><h1>".__('Google Maps API Key Required', 'wp-google-maps')."</h1><p>";
6685
- $article = "<a href='https://googlegeodevelopers.blogspot.co.za/2016/06/building-for-scale-updates-to-google.html' target='_BLANK'>".__('Google Maps now requires a Google Maps API key', 'wp-google-maps')."</a>";
6686
- echo sprintf( __('%s when using any Google Map on your website. Please enter your Google Maps API key below.', 'wp-google-maps'), $article );
6687
- echo "</p><p><form method='POST'><input type='text' name='wpgmza_google_maps_api_key' /> ". sprintf( __('This API can be obtained from the %s. Further documentation on this can be found %s', 'wp-google-maps'), $developers_console, $documentation )."</p>";
6688
- echo "<p><button type='submit' class='button button-primary' name='wpgmza_save_google_api_key_list'>".__('Save', 'wp-google-maps')."</button></form></p>";
 
 
 
 
6689
  echo "</div>";
6690
  }
6691
  }
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: 6.3.12
7
  Author: WP Google Maps
8
  Author URI: http://www.wpgmaps.com
9
  Text Domain: wp-google-maps
11
  */
12
 
13
  /*
14
+ * 6.3.12 - 2016-06-27 - Medium priority
15
+ * Modified the API key notification to make it simpler and more intuitive
16
+ *
17
  * 6.3.11 - 2016-06-24 - Medium Priority
18
  * Small activation bug fixed
19
  * all polygons and polylines are now viewable when editing or creating a new polygon or polyline
241
  $wpgmza_tblname_polylines = $wpdb->prefix . "wpgmza_polylines";
242
  $wpgmza_tblname_categories = $wpdb->prefix. "wpgmza_categories";
243
  $wpgmza_tblname_category_maps = $wpdb->prefix. "wpgmza_category_maps";
244
+ $wpgmza_version = "6.3.12";
245
+ $wpgmza_p_version = "6.3.12";
246
  $wpgmza_t = "basic";
247
  define("WPGMAPS", $wpgmza_version);
248
  define("WPGMAPS_DIR",plugin_dir_url(__FILE__));
446
 
447
 
448
 
449
+ // delete_option("WPGMZA_FIRST_TIME");
450
 
451
  wpgmaps_handle_directory();
452
  /* handle first time users and updates */
453
  if (isset($_GET['page']) && $_GET['page'] == 'wp-google-maps-menu') {
454
+
455
 
456
  /* check if their using APC object cache, if yes, do nothing with the welcome page as it causes issues when caching the DB options */
457
  if (class_exists("APC_Object_Cache")) {
4747
  if( isset( $other_settings_data['wpgmza_theme_data'] ) ){
4748
  $wpgmza_theme_data_custom = $other_settings_data['wpgmza_theme_data'];
4749
  } else {
4750
+ /* convert old gold stylign to new styling */
4751
+ if (isset($res->styling_json)) {
4752
+ $wpgmza_theme_data_custom = stripslashes($res->styling_json);
4753
+ } else {
4754
  $wpgmza_theme_data_custom = '';
4755
  }
4756
+ }
4757
 
4758
 
4759
  google_maps_api_key_warning();
5369
  <li><a href=\"#tabs-m-2\" class=\"tabs-m-1\">".__("Advanced markers","wp-google-maps")."</a></li>
5370
  <li><a href=\"#tabs-m-3\" class=\"tabs-m-2\">".__("Polygon","wp-google-maps")."</a></li>
5371
  <li><a href=\"#tabs-m-4\" class=\"tabs-m-3\">".__("Polylines","wp-google-maps")."</a></li>
5372
+ <li><a href=\"#tabs-m-5\" class=\"tabs-m-3\">".__("Heatmaps","wp-google-maps")."</a></li>
5373
  </ul>
5374
  <div id=\"tabs-m-1\">
5375
 
5501
  <span id=\"wpgmza_addpolyline_div\"><a href='".get_option('siteurl')."/wp-admin/admin.php?page=wp-google-maps-menu&action=add_polyline&map_id=".sanitize_text_field($_GET['map_id'])."' id='wpgmza_addpolyline' class='button-primary' value='".__("Add a New Polyline","wp-google-maps")."' />".__("Add a New Polyline","wp-google-maps")."</a></span>
5502
  <div id=\"wpgmza_polyline_holder\">".wpgmza_b_return_polyline_list(sanitize_text_field($_GET['map_id']))."</div>
5503
  </div>
5504
+ <div id=\"tabs-m-5\">
5505
+ <h2 style=\"padding-top:0; margin-top:0;\"> ".__("Heatmaps","wp-google-maps")."</h2>
5506
+ <a target=\"_BLANK\" href=\"http://www.wpgmaps.com/purchase-professional-version/?utm_source=plugin&utm_medium=link&utm_campaign=heatmaps\">".__("Add dynamic heatmap data","wp-google-maps")."</a> ".__("with the Pro version.","wp-google-maps")."
5507
+ <a target=\"_BLANK\" href=\"http://www.wpgmaps.com/demo/heatmaps-demo/?utm_source=plugin&utm_medium=link&utm_campaign=heatmap_demo\">".__("View a demo.","wp-google-maps")."</a>
5508
+ </div>
5509
  </div>
5510
  </div>
5511
  <div style='display:block; width:50%; overflow:auto; float:left;'>
6098
  approved tinyint(1) DEFAULT '1',
6099
  retina tinyint(1) DEFAULT '0',
6100
  type tinyint(1) DEFAULT '0',
6101
+ did varchar(500) NOT NULL,
6102
  other_data LONGTEXT NOT NULL,
6103
  PRIMARY KEY (id)
6104
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
6695
  function google_maps_api_key_warning(){
6696
  $g_api_key = get_option('wpgmza_google_maps_api_key');
6697
  if( !$g_api_key || $g_api_key == '' ){
6698
+ $video = "<a href='https://www.youtube.com/watch?v=OH98za14LNg' target='_BLANK'>".__('View the instruction video', 'wp-google-maps')."</a>";
6699
+ $documentation = "<a href='http://www.wpgmaps.com/documentation/creating-a-google-maps-api-key/' target='_BLANK'>".__('Read the documentation', 'wp-google-maps')."</a>";
6700
+ echo "<div class='error'><h1>".__('Important Notification', 'wp-google-maps')."</h1><p>";
6701
+ $article = "<small><a href='https://googlegeodevelopers.blogspot.co.za/2016/06/building-for-scale-updates-to-google.html' target='_BLANK'>".__('You can read more about that here.', 'wp-google-maps')."</small></a>";
6702
+ echo "<h2>".__('Before you begin please note that *ALL* Google Maps now require an API key to function.','wp-google-maps').' '.$article.'</h2>';
6703
+ echo "<a target='_BLANK' href='https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend&keyType=CLIENT_SIDE&reusekey=true' class='button button-primary'>".__("Create an API key now (free)","wp-google-maps")."</a>";
6704
+ echo "<p><h3>".__('Once created, simply paste your API key here and press save.','wp-google-maps')."</h3>";
6705
+ echo sprintf( __('Need help? %s or %s.', 'wp-google-maps'), $video, $documentation )."</p>";
6706
+ echo "<form method='POST'><label>".__("Google Maps JavaScript API Key: ","wp-google-maps")."</label><input type='text' name='wpgmza_google_maps_api_key' /><br />";
6707
+ echo "<p><button type='submit' class='button button-primary' name='wpgmza_save_google_api_key_list'>".__('Save', 'wp-google-maps')."</button>";
6708
+ echo "<br /><em>".__("Once saved, it may take up to 5 minutes for your map to display.","wp-google-maps")."</em></p></form>";
6709
  echo "</div>";
6710
  }
6711
  }