Comprehensive Google Map Plugin - Version 9.1.3

Version Description

  • change Maps Marker Pro install link to explicitly use v3.1.1 (migration tool is not compatible with Maps Marker Pro v4.0+)
Download this release

Release Info

Developer harmr
Plugin Icon 128x128 Comprehensive Google Map Plugin
Version 9.1.3
Comparing to
See all releases

Code changes from version 9.1.2 to 9.1.3

Files changed (4) hide show
  1. assets/html/page_admin_menu_export.tpl +2 -0
  2. comprehensive-google-map-plugin.php +3 -2
  3. info.php +14 -11
  4. readme.txt +3 -1
assets/html/page_admin_menu_export.tpl CHANGED
@@ -3,6 +3,8 @@ For a tutorial and more information on how to transfer your maps from "Comprehen
3
  <br/><br/>
4
  <strong>Important: although the transfer mechanism has been tested thoroughly and is being used successfully since its first release, we suggest making a full database backup before finishing the transfer (clicking step 2/2), just in case any special issue arises. Once the transfer is finished, the CGMP shortcodes could only be restored from that backup!</strong>
5
  <br/><br/>
 
 
6
  To start the transfer, please click the button <strong>step 1/2: create "Maps Marker Pro" maps</strong> below, which will create the according maps within your Maps Marker Pro installation.
7
  <br/>
8
  After that step it is advised to review those maps. With step 2/2 you can then automatically replace all existing CGMP shortcodes with the new "Maps Marker Pro" shortcodes.<br/>
3
  <br/><br/>
4
  <strong>Important: although the transfer mechanism has been tested thoroughly and is being used successfully since its first release, we suggest making a full database backup before finishing the transfer (clicking step 2/2), just in case any special issue arises. Once the transfer is finished, the CGMP shortcodes could only be restored from that backup!</strong>
5
  <br/><br/>
6
+ <strong>Important #2: do not update to Maps Marker Pro v4+ unless you finished the migration from Comprehensive Google Maps Plugin to Maps Marker Pro v3.1.1 - the migration tool is not compatible with Maps Marker Pro v4.0+!</strong>
7
+ <br/><br/>
8
  To start the transfer, please click the button <strong>step 1/2: create "Maps Marker Pro" maps</strong> below, which will create the according maps within your Maps Marker Pro installation.
9
  <br/>
10
  After that step it is advised to review those maps. With step 2/2 you can then automatically replace all existing CGMP shortcodes with the new "Maps Marker Pro" shortcodes.<br/>
comprehensive-google-map-plugin.php CHANGED
@@ -3,12 +3,13 @@
3
  Plugin Name: Comprehensive Google Map Plugin
4
  Plugin URI: http://wordpress.org/support/plugin/comprehensive-google-map-plugin
5
  Description: A simple and intuitive, yet elegant and fully documented Google map plugin that installs as a widget and a short code. The plugin is packed with useful features. Widget and shortcode enabled. Offers extensive configuration options for markers, over 250 custom marker icons, marker Geo mashup, controls, size, KML files, location by latitude/longitude, location by address, info window, directions, traffic/bike lanes and more.
6
- Version: 9.1.2
7
  Author: Alex Zagniotov
8
  Author URI: http://wordpress.org/support/plugin/comprehensive-google-map-plugin
9
  License: GPLv2
10
 
11
- Copyright (C) 2011-09/2016 Alexander Zagniotov
 
12
 
13
  This program is free software; you can redistribute it and/or
14
  modify it under the terms of the GNU General Public License
3
  Plugin Name: Comprehensive Google Map Plugin
4
  Plugin URI: http://wordpress.org/support/plugin/comprehensive-google-map-plugin
5
  Description: A simple and intuitive, yet elegant and fully documented Google map plugin that installs as a widget and a short code. The plugin is packed with useful features. Widget and shortcode enabled. Offers extensive configuration options for markers, over 250 custom marker icons, marker Geo mashup, controls, size, KML files, location by latitude/longitude, location by address, info window, directions, traffic/bike lanes and more.
6
+ Version: 9.1.3
7
  Author: Alex Zagniotov
8
  Author URI: http://wordpress.org/support/plugin/comprehensive-google-map-plugin
9
  License: GPLv2
10
 
11
+ Copyright (C) 2011-09/2015 Alexander Zagniotov
12
+ Copyright (C) from 10/2019 MapsMarker.com e.U.
13
 
14
  This program is free software; you can redistribute it and/or
15
  modify it under the terms of the GNU General Public License
info.php CHANGED
@@ -48,7 +48,7 @@ if (file_exists($lmm_pro_readme)) {
48
  $install_title = '"Maps Marker Pro" has already been installed';
49
  } else {
50
  $install_active = '';
51
- $install_title = 'install "Maps Marker Pro" plugin';
52
  }
53
 
54
  if ( $action == NULL ) {
@@ -59,9 +59,10 @@ if ( $action == NULL ) {
59
  if (file_exists($lmm_pro_readme)) {
60
  $admin_url = get_admin_url();
61
  if (!is_plugin_active('leaflet-maps-marker-pro/leaflet-maps-marker.php') ) {
62
- echo '<div class="error" style="padding:10px;"><strong>You already downloaded "Maps Marker Pro" but did not activate the plugin yet!</strong>';
63
  if ( current_user_can( 'install_plugins' ) ) {
64
  echo sprintf(__('<br/>Please navigate to <a style="text-decoration:underline;" href="%1$s">Plugins / Installed Plugins</a> and activate the plugin "Maps Marker Pro".'), $admin_url . 'plugins.php');
 
65
  } else {
66
  echo sprintf(__('Please contact your administrator (%1s) to activate the plugin "Maps Marker Pro".'), '<a style="text-decoration:underline;" href="mailto:' . get_bloginfo('admin_email') . '?subject=Please activate the plugin Maps Marker Pro">' . get_bloginfo('admin_email') . '</a>' );
67
  }
@@ -70,7 +71,8 @@ if ( $action == NULL ) {
70
  if (get_option('leafletmapsmarkerpro_license_key') == NULL) {
71
  echo '<div class="error" style="padding:10px;">Please <a style="text-decoration:underline;" href="' . $admin_url . 'admin.php?page=leafletmapsmarker_license">activate a valid "Maps Marker Pro" license</a> to be able to start the transfer!</div><br/>';
72
  } else {
73
- echo '<div class="updated" style="padding:10px;">"Maps Marker Pro" has been successully installed.<br/>You can now <a style="text-decoration:underline;" href="' . $admin_url . 'admin.php?page=cgmp_export">start transfering your maps</a>.</div><br/>';
 
74
  }
75
  }
76
  }
@@ -89,22 +91,23 @@ if ( $action == NULL ) {
89
  In addition Maps Marker Pro also offers
90
  <ul style="list-style:disc;margin-left:15px;">
91
  <li><a href="https://www.mapsmarker.com/v1.9p" target="_blank">geolocation support</a> (show and follow your location when viewing maps),</li>
92
- <li><a href="https://www.mapsmarker.com/pro-feature-import" target="_blank">support for CSV/XLS/XLSX/ODS imports and exports</a> (for bulk additions and bulk updates),</li>
93
  <li><a href="https://www.mapsmarker.com/pro-feature-webapp" target="_blank">mobile web app support</a> (for <a href="https://demo.mapsmarker.com/wp-content/plugins/leaflet-maps-marker-pro/leaflet-fullscreen.php?layer=1" target="_blank">fullscreen maps with optimized mobile viewport</a>),</li>
94
- <li><a href="https://www.mapsmarker.com/pro-feature-qrcode" target="_blank">support for QR codes with custom backgrounds</a>,</li>
95
- <li><a href="https://www.mapsmarker.com/pro-feature-adsense" target="_blank">Google Adsense for maps integration</a>,</li>
96
  <li><a href="https://www.mapsmarker.com/pro-feature-whitelabel" target="_blank">an option to whitelabel the plugin,</a></li>
97
  <li><a href="https://www.mapsmarker.com/pro-feature-minimaps" target="_blank">collapsible minimaps</a>,</li>
98
  <li><a href="https://www.mapsmarker.com/pro-feature-advanced-widget" target="_blank">advanced recent marker widgets</a>,</li>
99
  <li><a href="https://www.mapsmarker.com/mapsmarker-api" target="_blank" title="view API docs on mapsmarker.com">a fully-featured API</a>,</li>
100
- <li><a href="https://www.mapsmarker.com/docs/misc/translations/" target="_blank">translations for 34 languages</a>,</li>
101
  </ul>
102
  and <a href="https://www.mapsmarker.com/features" target="_blank" title="view features on mapsmarker.com">lots of other features</a>.
103
  <br/><br/>
104
- If you are interested, you can either test drive the plugin at <a href="https://demo.mapsmarker.com" target="_blank" title="test drive Maps Marker Pro on demo site">https://demo.mapsmarker.com</a>, <a href="https://www.mapsmarker.com/download-pro" target="_blank">download the current plugin-package</a> or start a free 30-day trial for ' . get_bloginfo('url') . ' by clicking the following button:
105
  <br/><br/>
106
  <a style="clear:both;" class="button button-primary" href="admin.php?page=cgmp_info&action=install_maps_marker_pro" ' . $install_active . '>' . $install_title . '</a>
107
  <br/><br/>
 
 
108
  The current "Comprehensive Google Map Plugin"-release also includes a new <a href="admin.php?page=cgmp_export">transfer feature</a> contributed by Robert from Mapsmarker.com, which allows you to automatically convert your current "Comprehensive Google Map Plugin" maps to "Maps Marker Pro" maps. If you have any questions about that feature or Maps Marker Pro in general, I am sure Robert <a href="https://www.mapsmarker.com/contact" target="_blank" title="open contact form on mapsmarker.com">will be glad to to answer them</a>.
109
  <br/><br/>
110
  Thanks a lot for your understanding & good luck!
@@ -132,14 +135,14 @@ if ( $action == NULL ) {
132
  }
133
  } else {
134
  $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin() );
135
- $upgrader->install( 'https://www.mapsmarker.com/download-pro' );
136
  //info: check if download was successful
 
137
  $lmm_pro_readme = WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . 'leaflet-maps-marker-pro' . DIRECTORY_SEPARATOR . 'readme.txt';
138
  if (file_exists($lmm_pro_readme)) {
139
  echo '<p>' . 'Please activate the plugin Maps Marker Pro by clicking the link "Activate Plugin" above' . '</p>';
140
  } else {
141
- $dl_l = 'https://www.mapsmarker.com/download-pro';
142
- $dl_lt = 'www.mapsmarker.com/download-pro';
143
  echo '<p>' . sprintf('The pro plugin package could not be downloaded automatically. Please download the plugin from <a href="%1s">%2s</a> and upload it to the directory /wp-content/plugins on your server manually', $dl_l, $dl_lt) . '</p>';
144
  }
145
  }
48
  $install_title = '"Maps Marker Pro" has already been installed';
49
  } else {
50
  $install_active = '';
51
+ $install_title = 'install "Maps Marker Pro" plugin v3.1.1';
52
  }
53
 
54
  if ( $action == NULL ) {
59
  if (file_exists($lmm_pro_readme)) {
60
  $admin_url = get_admin_url();
61
  if (!is_plugin_active('leaflet-maps-marker-pro/leaflet-maps-marker.php') ) {
62
+ echo '<div class="error" style="padding:10px;"><strong>You already downloaded "Maps Marker Pro" v3.1.1 but did not activate the plugin yet!</strong>';
63
  if ( current_user_can( 'install_plugins' ) ) {
64
  echo sprintf(__('<br/>Please navigate to <a style="text-decoration:underline;" href="%1$s">Plugins / Installed Plugins</a> and activate the plugin "Maps Marker Pro".'), $admin_url . 'plugins.php');
65
+ echo '<strong>Important: do not update to Maps Marker Pro v4+ unless you finished the migration from Comprehensive Google Maps Plugin to Maps Marker Pro v3.1.1 - the migration tool is not compatible with Maps Marker Pro v4.0+!</strong>';
66
  } else {
67
  echo sprintf(__('Please contact your administrator (%1s) to activate the plugin "Maps Marker Pro".'), '<a style="text-decoration:underline;" href="mailto:' . get_bloginfo('admin_email') . '?subject=Please activate the plugin Maps Marker Pro">' . get_bloginfo('admin_email') . '</a>' );
68
  }
71
  if (get_option('leafletmapsmarkerpro_license_key') == NULL) {
72
  echo '<div class="error" style="padding:10px;">Please <a style="text-decoration:underline;" href="' . $admin_url . 'admin.php?page=leafletmapsmarker_license">activate a valid "Maps Marker Pro" license</a> to be able to start the transfer!</div><br/>';
73
  } else {
74
+ echo '<div class="updated" style="padding:10px;">"Maps Marker Pro" v3.1.1 has been successully installed.<br/>You can now <a style="text-decoration:underline;" href="' . $admin_url . 'admin.php?page=cgmp_export">start transfering your maps</a>.</div><br/>';
75
+ echo '<strong>Important: do not update to Maps Marker Pro v4+ unless you finished the migration from Comprehensive Google Maps Plugin to Maps Marker Pro v3.1.1 - the migration tool is not compatible with Maps Marker Pro v4.0+!</strong>';
76
  }
77
  }
78
  }
91
  In addition Maps Marker Pro also offers
92
  <ul style="list-style:disc;margin-left:15px;">
93
  <li><a href="https://www.mapsmarker.com/v1.9p" target="_blank">geolocation support</a> (show and follow your location when viewing maps),</li>
94
+ <li><a href="https://www.mapsmarker.com/pro-feature-import" target="_blank">support for GeoJSON imports and exports</a> (for bulk additions and bulk updates),</li>
95
  <li><a href="https://www.mapsmarker.com/pro-feature-webapp" target="_blank">mobile web app support</a> (for <a href="https://demo.mapsmarker.com/wp-content/plugins/leaflet-maps-marker-pro/leaflet-fullscreen.php?layer=1" target="_blank">fullscreen maps with optimized mobile viewport</a>),</li>
96
+ <li><a href="https://www.mapsmarker.com/pro-feature-qrcode" target="_blank">support for QR codes</a>,</li>
 
97
  <li><a href="https://www.mapsmarker.com/pro-feature-whitelabel" target="_blank">an option to whitelabel the plugin,</a></li>
98
  <li><a href="https://www.mapsmarker.com/pro-feature-minimaps" target="_blank">collapsible minimaps</a>,</li>
99
  <li><a href="https://www.mapsmarker.com/pro-feature-advanced-widget" target="_blank">advanced recent marker widgets</a>,</li>
100
  <li><a href="https://www.mapsmarker.com/mapsmarker-api" target="_blank" title="view API docs on mapsmarker.com">a fully-featured API</a>,</li>
101
+ <li><a href="https://www.mapsmarker.com/docs/misc/translations/" target="_blank">translations for 42 languages</a>,</li>
102
  </ul>
103
  and <a href="https://www.mapsmarker.com/features" target="_blank" title="view features on mapsmarker.com">lots of other features</a>.
104
  <br/><br/>
105
+ If you are interested, you can either test drive the plugin at <a href="https://demo.mapsmarker.com" target="_blank" title="test drive Maps Marker Pro on demo site">https://demo.mapsmarker.com</a>, <a href="https://www.mapsmarker.com/upgrade-pro" target="_blank">download the plugin-package v3.1.1</a> or start a free 30-day trial for ' . get_bloginfo('url') . ' by clicking the following button:
106
  <br/><br/>
107
  <a style="clear:both;" class="button button-primary" href="admin.php?page=cgmp_info&action=install_maps_marker_pro" ' . $install_active . '>' . $install_title . '</a>
108
  <br/><br/>
109
+ <strong>Important: do not update to Maps Marker Pro v4+ unless you finished the migration from Comprehensive Google Maps Plugin to Maps Marker Pro v3.1.1 - the migration tool is not compatible with Maps Marker Pro v4.0+!</strong>
110
+ <br/><br/>
111
  The current "Comprehensive Google Map Plugin"-release also includes a new <a href="admin.php?page=cgmp_export">transfer feature</a> contributed by Robert from Mapsmarker.com, which allows you to automatically convert your current "Comprehensive Google Map Plugin" maps to "Maps Marker Pro" maps. If you have any questions about that feature or Maps Marker Pro in general, I am sure Robert <a href="https://www.mapsmarker.com/contact" target="_blank" title="open contact form on mapsmarker.com">will be glad to to answer them</a>.
112
  <br/><br/>
113
  Thanks a lot for your understanding & good luck!
135
  }
136
  } else {
137
  $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin() );
 
138
  //info: check if download was successful
139
+ $upgrader->install( 'https://www.mapsmarker.com/upgrade-pro' );
140
  $lmm_pro_readme = WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . 'leaflet-maps-marker-pro' . DIRECTORY_SEPARATOR . 'readme.txt';
141
  if (file_exists($lmm_pro_readme)) {
142
  echo '<p>' . 'Please activate the plugin Maps Marker Pro by clicking the link "Activate Plugin" above' . '</p>';
143
  } else {
144
+ $dl_l = 'https://www.mapsmarker.com/upgrade-pro';
145
+ $dl_lt = 'www.mapsmarker.com/upgrade-pro';
146
  echo '<p>' . sprintf('The pro plugin package could not be downloaded automatically. Please download the plugin from <a href="%1s">%2s</a> and upload it to the directory /wp-content/plugins on your server manually', $dl_l, $dl_lt) . '</p>';
147
  }
148
  }
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: harmr, alexanderzagniotov, waseem_senjer
3
  Tags: google map, google map widget, jquery tabs, clustering, marker clustering, map styles, styling, google map styles, google map short code, google map short code, map widget, map short code, fully documented, marker, controls, size, KML, GPX, GeoRSS, location by latitude/longitude, location by address, info window, directions, traffic/bike lanes, cross browser, google maps v3, google, multiple markers, panoramio photos, marker icons, custom marker icons and text, geo, geo mashup, marker geo mashup, custom marker text, openstreetmap
4
  Requires at least: 3.6
5
  Tested up to: 4.5.3
6
- Stable tag: 9.1.2
7
 
8
  A simple and intuitive, yet elegant and fully documented Google map plugin that installs as a widget and a short code.
9
 
@@ -79,6 +79,8 @@ You can use one of the following formats:<br />
79
  9. When having marker Geo mashup, you can display in the info bubble marker's original post and post content excerpt instead of normally address and lat/long
80
 
81
  == Changelog ==
 
 
82
 
83
  = 9.1.2 =
84
  * last official release - development & maintenance has been continued - for more details and recommendations please <a href="http://wordpress.org/support/plugin/comprehensive-google-map-plugin">visit the support forum</a>
3
  Tags: google map, google map widget, jquery tabs, clustering, marker clustering, map styles, styling, google map styles, google map short code, google map short code, map widget, map short code, fully documented, marker, controls, size, KML, GPX, GeoRSS, location by latitude/longitude, location by address, info window, directions, traffic/bike lanes, cross browser, google maps v3, google, multiple markers, panoramio photos, marker icons, custom marker icons and text, geo, geo mashup, marker geo mashup, custom marker text, openstreetmap
4
  Requires at least: 3.6
5
  Tested up to: 4.5.3
6
+ Stable tag: 9.1.3
7
 
8
  A simple and intuitive, yet elegant and fully documented Google map plugin that installs as a widget and a short code.
9
 
79
  9. When having marker Geo mashup, you can display in the info bubble marker's original post and post content excerpt instead of normally address and lat/long
80
 
81
  == Changelog ==
82
+ = 9.1.3 =
83
+ * change Maps Marker Pro install link to explicitly use v3.1.1 (migration tool is not compatible with Maps Marker Pro v4.0+)
84
 
85
  = 9.1.2 =
86
  * last official release - development & maintenance has been continued - for more details and recommendations please <a href="http://wordpress.org/support/plugin/comprehensive-google-map-plugin">visit the support forum</a>