WP Google Maps - Version 7.10.03

Version Description

= 6.3.15 = Please update your WP Google Maps version to 6.3.15 to ensure you are using the latest security enhancements.

= 6.3.14 = Please update your WP Google Maps version to 6.3.14 to ensure you are using the latest security enhancements.

= 6.2.1 = Please update your WP Google Maps version to 6.2.1 to ensure you are using the latest security enhancements.

= 6.1.10 = Please update WP Google Maps to version 6.1.10 to enable our latest security enhancements.

= 6.1.5 = We no longer support timthumb and we have opted to remove it from WP Google Maps. Please update to 6.1.5 to ensure the removal of the timthumb script.

= 6.0.27 = Please upgrade your version of WP Google Maps to version 6.0.27 as it includes multiple security improvements.

Download this release

Release Info

Developer perryrylance
Plugin Icon 128x128 WP Google Maps
Version 7.10.03
Comparing to
See all releases

Code changes from version 7.10.02 to 7.10.03

Files changed (15) hide show
  1. css/wp-google-maps-admin.css +26 -0
  2. html/gdpr-compliance-settings.html.php +11 -0
  3. includes/build.log +124 -124
  4. includes/class.gdpr-compliance.php +20 -12
  5. includes/class.google-maps-api-loader.php +51 -12
  6. includes/class.maps-engine-dialog.php +3 -13
  7. includes/class.plugin.php +9 -16
  8. js/v8/core.js +3 -2
  9. js/v8/google-maps/google-info-window.js +11 -0
  10. js/v8/google-maps/google-map.js +17 -3
  11. js/v8/google-maps/google-vertex-context-menu.js +3 -0
  12. js/v8/info-window.js +10 -0
  13. js/v8/open-layers/ol-info-window.js +6 -0
  14. js/wpgmaps.js +18 -0
  15. wpGoogleMaps.php +30 -8
css/wp-google-maps-admin.css CHANGED
@@ -440,4 +440,30 @@ input.cmn-toggle-yes-no:checked + label:after {
440
  #wpgmza_store_locator_default_radius_km.active,
441
  #wpgmza_store_locator_default_radius_mi.active {
442
  display: block;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
443
  }
440
  #wpgmza_store_locator_default_radius_km.active,
441
  #wpgmza_store_locator_default_radius_mi.active {
442
  display: block;
443
+ }
444
+
445
+ #wpgmza-gdpr-compliance fieldset
446
+ {
447
+ margin-bottom: 0.3em;
448
+ }
449
+
450
+ #wpgmza-gdpr-compliance fieldset>*
451
+ {
452
+ display: inline-block;
453
+ vertical-align: top;
454
+ }
455
+
456
+ #wpgmza-gdpr-compliance fieldset>label
457
+ {
458
+ width: 250px;
459
+ }
460
+
461
+ #wpgmza-gdpr-compliance input[type='number']
462
+ {
463
+ width: 64px;
464
+ }
465
+
466
+ #wpgmza-gdpr-compliance textarea
467
+ {
468
+ resize: both;
469
  }
html/gdpr-compliance-settings.html.php CHANGED
@@ -42,4 +42,15 @@
42
  </label>
43
  <textarea name="wpgmza_gdpr_notice"></textarea>
44
  </fieldset>
 
 
 
 
 
 
 
 
 
 
 
45
  </div>
42
  </label>
43
  <textarea name="wpgmza_gdpr_notice"></textarea>
44
  </fieldset>
45
+
46
+ <!--<fieldset>
47
+ <label for="wpgmza_gdpr_require_consent_before_load">
48
+ <?php
49
+ _e('Require consent before load', 'wp-google-maps');
50
+ ?>
51
+ <i class="fa fa-question-circle"
52
+ title="<?php _e('Check this box if you would like to prevent the map API from loading until the user gives consent to the notice above.', 'wp-google-maps'); ?>"/>
53
+ </label>
54
+ <input name="wpgmza_gdpr_require_consent_before_load" type="checkbox"/>
55
+ </fieldset>-->
56
  </div>
includes/build.log CHANGED
@@ -1,124 +1,124 @@
1
- 2018-05-29 19:11:27 :- Scanning dependencies
2
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/circle.js
3
- 2018-05-29 19:11:27 :- Found wpgmza-circle
4
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-map-object
5
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/compatibility.js
6
- 2018-05-29 19:11:27 :- Found wpgmza-compatibility
7
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
8
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/core.js
9
- 2018-05-29 19:11:27 :- Found wpgmza
10
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/distance.js
11
- 2018-05-29 19:11:27 :- Found wpgmza-distance
12
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
13
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/event-dispatcher.js
14
- 2018-05-29 19:11:27 :- Found wpgmza-event-dispatcher
15
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
16
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/event.js
17
- 2018-05-29 19:11:27 :- Found wpgmza-event
18
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
19
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/friendly-error.js
20
- 2018-05-29 19:11:27 :- Found wpgmza-friendly-error
21
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
22
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/geocoder.js
23
- 2018-05-29 19:11:27 :- Found wpgmza-geocoder
24
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
25
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/info-window.js
26
- 2018-05-29 19:11:27 :- Found wpgmza-info-window
27
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-event-dispatcher
28
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/latlng.js
29
- 2018-05-29 19:11:27 :- Found wpgmza-lat-lng
30
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
31
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/latlngbounds.js
32
- 2018-05-29 19:11:27 :- Found wpgmza-lat-lng-bounds
33
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
34
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map-object.js
35
- 2018-05-29 19:11:27 :- Found wpgmza-map-object
36
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-event-dispatcher
37
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map-settings-page.js
38
- 2018-05-29 19:11:27 :- Found wpgmza-map-settings-page
39
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
40
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map-settings.js
41
- 2018-05-29 19:11:27 :- Found wpgmza-map-settings
42
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
43
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map.js
44
- 2018-05-29 19:11:27 :- Found wpgmza-map
45
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-event-dispatcher
46
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/maps-engine-dialog.js
47
- 2018-05-29 19:11:27 :- Found wpgmza-maps-engine-dialog
48
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
49
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/marker.js
50
- 2018-05-29 19:11:27 :- Found wpgmza-marker
51
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
52
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator-circle.js
53
- 2018-05-29 19:11:27 :- Found wpgmza-modern-store-locator-circle
54
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
55
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator.js
56
- 2018-05-29 19:11:27 :- Found wpgmza-modern-store-locator
57
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
58
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/polygon.js
59
- 2018-05-29 19:11:27 :- Found wpgmza-polygon
60
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-map-object
61
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/polyline.js
62
- 2018-05-29 19:11:27 :- Found wpgmza-polyline
63
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-map-object
64
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/v7-custom-script.js
65
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/version.js
66
- 2018-05-29 19:11:27 :- Found wpgmza-version
67
- 2018-05-29 19:11:27 :- Adding dependency wpgmza
68
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-circle.js
69
- 2018-05-29 19:11:27 :- Found wpgmza-google-circle
70
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-circle
71
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-geocoder.js
72
- 2018-05-29 19:11:27 :- Found wpgmza-google-geocoder
73
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-geocoder
74
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-info-window.js
75
- 2018-05-29 19:11:27 :- Found wpgmza-google-info-window
76
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-info-window
77
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-map.js
78
- 2018-05-29 19:11:27 :- Found wpgmza-google-map
79
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-map
80
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-marker.js
81
- 2018-05-29 19:11:27 :- Found wpgmza-google-marker
82
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-marker
83
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator-circle.js
84
- 2018-05-29 19:11:27 :- Found wpgmza-google-modern-store-locator-circle
85
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-modern-store-locator-circle
86
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator.js
87
- 2018-05-29 19:11:27 :- Found wpgmza-google-modern-store-locator
88
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-modern-store-locator
89
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polygon.js
90
- 2018-05-29 19:11:27 :- Found wpgmza-google-polygon
91
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-polygon
92
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polyline.js
93
- 2018-05-29 19:11:27 :- Found wpgmza-google-polyline
94
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-polyline
95
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-vertex-context-menu.js
96
- 2018-05-29 19:11:27 :- Found wpgmza-google-vertex-context-menu
97
- 2018-05-29 19:11:27 :- Adding dependency wpgmza_api_call
98
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-circle.js
99
- 2018-05-29 19:11:27 :- Found wpgmza-ol-circle
100
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-circle
101
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-geocoder.js
102
- 2018-05-29 19:11:27 :- Found wpgmza-ol-geocoder
103
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-geocoder
104
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-info-window.js
105
- 2018-05-29 19:11:27 :- Found wpgmza-ol-info-window
106
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-info-window
107
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-map.js
108
- 2018-05-29 19:11:27 :- Found wpgmza-ol-map
109
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-map
110
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-marker.js
111
- 2018-05-29 19:11:27 :- Found wpgmza-ol-marker
112
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-marker
113
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator-circle.js
114
- 2018-05-29 19:11:27 :- Found wpgmza-ol-modern-store-locator-circle
115
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-modern-store-locator-circle
116
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator.js
117
- 2018-05-29 19:11:27 :- Found wpgmza-ol-modern-store-locator
118
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-modern-store-locator
119
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polygon.js
120
- 2018-05-29 19:11:27 :- Found wpgmza-ol-polygon
121
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-polygon
122
- 2018-05-29 19:11:27 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polyline.js
123
- 2018-05-29 19:11:27 :- Found wpgmza-ol-polyline
124
- 2018-05-29 19:11:27 :- Adding dependency wpgmza-polyline
1
+ 2018-05-30 08:15:25 :- Scanning dependencies
2
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/circle.js
3
+ 2018-05-30 08:15:25 :- Found wpgmza-circle
4
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-map-object
5
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/compatibility.js
6
+ 2018-05-30 08:15:25 :- Found wpgmza-compatibility
7
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
8
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/core.js
9
+ 2018-05-30 08:15:25 :- Found wpgmza
10
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/distance.js
11
+ 2018-05-30 08:15:25 :- Found wpgmza-distance
12
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
13
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/event-dispatcher.js
14
+ 2018-05-30 08:15:25 :- Found wpgmza-event-dispatcher
15
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
16
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/event.js
17
+ 2018-05-30 08:15:25 :- Found wpgmza-event
18
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
19
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/friendly-error.js
20
+ 2018-05-30 08:15:25 :- Found wpgmza-friendly-error
21
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
22
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/geocoder.js
23
+ 2018-05-30 08:15:25 :- Found wpgmza-geocoder
24
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
25
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/info-window.js
26
+ 2018-05-30 08:15:25 :- Found wpgmza-info-window
27
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-event-dispatcher
28
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/latlng.js
29
+ 2018-05-30 08:15:25 :- Found wpgmza-lat-lng
30
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
31
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/latlngbounds.js
32
+ 2018-05-30 08:15:25 :- Found wpgmza-lat-lng-bounds
33
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
34
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map-object.js
35
+ 2018-05-30 08:15:25 :- Found wpgmza-map-object
36
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-event-dispatcher
37
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map-settings-page.js
38
+ 2018-05-30 08:15:25 :- Found wpgmza-map-settings-page
39
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
40
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map-settings.js
41
+ 2018-05-30 08:15:25 :- Found wpgmza-map-settings
42
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
43
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/map.js
44
+ 2018-05-30 08:15:25 :- Found wpgmza-map
45
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-event-dispatcher
46
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/maps-engine-dialog.js
47
+ 2018-05-30 08:15:25 :- Found wpgmza-maps-engine-dialog
48
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
49
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/marker.js
50
+ 2018-05-30 08:15:25 :- Found wpgmza-marker
51
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
52
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator-circle.js
53
+ 2018-05-30 08:15:25 :- Found wpgmza-modern-store-locator-circle
54
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
55
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator.js
56
+ 2018-05-30 08:15:25 :- Found wpgmza-modern-store-locator
57
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
58
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/polygon.js
59
+ 2018-05-30 08:15:25 :- Found wpgmza-polygon
60
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-map-object
61
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/polyline.js
62
+ 2018-05-30 08:15:25 :- Found wpgmza-polyline
63
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-map-object
64
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/v7-custom-script.js
65
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/version.js
66
+ 2018-05-30 08:15:25 :- Found wpgmza-version
67
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza
68
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-circle.js
69
+ 2018-05-30 08:15:25 :- Found wpgmza-google-circle
70
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-circle
71
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-geocoder.js
72
+ 2018-05-30 08:15:25 :- Found wpgmza-google-geocoder
73
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-geocoder
74
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-info-window.js
75
+ 2018-05-30 08:15:25 :- Found wpgmza-google-info-window
76
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-info-window
77
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-map.js
78
+ 2018-05-30 08:15:25 :- Found wpgmza-google-map
79
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-map
80
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-marker.js
81
+ 2018-05-30 08:15:25 :- Found wpgmza-google-marker
82
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-marker
83
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator-circle.js
84
+ 2018-05-30 08:15:25 :- Found wpgmza-google-modern-store-locator-circle
85
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-modern-store-locator-circle
86
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator.js
87
+ 2018-05-30 08:15:25 :- Found wpgmza-google-modern-store-locator
88
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-modern-store-locator
89
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polygon.js
90
+ 2018-05-30 08:15:25 :- Found wpgmza-google-polygon
91
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-polygon
92
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polyline.js
93
+ 2018-05-30 08:15:25 :- Found wpgmza-google-polyline
94
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-polyline
95
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-vertex-context-menu.js
96
+ 2018-05-30 08:15:25 :- Found wpgmza-google-vertex-context-menu
97
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza_api_call
98
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-circle.js
99
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-circle
100
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-circle
101
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-geocoder.js
102
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-geocoder
103
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-geocoder
104
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-info-window.js
105
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-info-window
106
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-info-window
107
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-map.js
108
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-map
109
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-map
110
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-marker.js
111
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-marker
112
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-marker
113
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator-circle.js
114
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-modern-store-locator-circle
115
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-modern-store-locator-circle
116
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator.js
117
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-modern-store-locator
118
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-modern-store-locator
119
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polygon.js
120
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-polygon
121
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-polygon
122
+ 2018-05-30 08:15:25 :- Reading E:\Programming\Code Cabin\htdocs\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polyline.js
123
+ 2018-05-30 08:15:25 :- Found wpgmza-ol-polyline
124
+ 2018-05-30 08:15:25 :- Adding dependency wpgmza-polyline
includes/class.gdpr-compliance.php CHANGED
@@ -37,11 +37,13 @@ When using the User Generated Marker addon, data will be stored indefinitiely fo
37
  {
38
  $wpgmza_other_settings = get_option('WPGMZA_OTHER_SETTINGS');
39
  $wpgmza_other_settings['privacy_policy_notice_dismissed'] = true;
 
40
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_other_settings);
41
 
42
  wp_send_json(array(
43
  'success' => 1
44
  ));
 
45
  exit;
46
  }
47
 
@@ -56,7 +58,7 @@ When using the User Generated Marker addon, data will be stored indefinitiely fo
56
  return $document;
57
  }
58
 
59
- public function getNoticeHTML()
60
  {
61
  $wpgmza_other_settings = get_option('WPGMZA_OTHER_SETTINGS');
62
 
@@ -65,11 +67,16 @@ When using the User Generated Marker addon, data will be stored indefinitiely fo
65
 
66
  $html = $wpgmza_other_settings['wpgmza_gdpr_notice'];
67
 
68
- $html = preg_replace('/{COMPANY_NAME}/i', $wpgmza_other_settings['wpgmza_gdpr_company_name'], $html);
69
- $html = preg_replace('/{RETENTION_PERIOD}/i', $wpgmza_other_settings['wpgmza_gdpr_retention_period_days'], $html);
70
- $html = preg_replace('/{RETENTION_PURPOSE}/i', $wpgmza_other_settings['wpgmza_gdpr_retention_purpose'], $html);
71
 
72
- $html = '<input type="checkbox" name="wpgmza_ugm_gdpr_consent" required/> ' . $html;
 
 
 
 
 
73
 
74
  $html = apply_filters('wpgmza_gdpr_notice_html', $html);
75
 
@@ -90,6 +97,11 @@ When using the User Generated Marker addon, data will be stored indefinitiely fo
90
  ";
91
  }
92
 
 
 
 
 
 
93
  public function onGlobalSettingsTabs($input)
94
  {
95
  return $input . "<li><a href=\"#wpgmza-gdpr-compliance\">".__("GDPR Compliance","wp-google-maps")."</a></li>";
@@ -112,7 +124,6 @@ When using the User Generated Marker addon, data will be stored indefinitiely fo
112
 
113
  foreach($document->querySelectorAll('input, select, textarea') as $input)
114
  {
115
-
116
  $name = $input->getAttribute('name');
117
 
118
  if(!$name)
@@ -120,20 +131,17 @@ When using the User Generated Marker addon, data will be stored indefinitiely fo
120
 
121
  switch($input->getAttribute('type'))
122
  {
123
-
124
  case 'checkbox':
125
- if(isset($wpgmza_other_settings[$name]))
126
- unset($wpgmza_other_settings[$name]);
127
- else
128
  $wpgmza_other_settings[$name] = 1;
 
 
129
  break;
130
 
131
  default:
132
  $wpgmza_other_settings[$name] = stripslashes( $input->getValue() );
133
  break;
134
-
135
  }
136
-
137
  }
138
 
139
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_other_settings);
37
  {
38
  $wpgmza_other_settings = get_option('WPGMZA_OTHER_SETTINGS');
39
  $wpgmza_other_settings['privacy_policy_notice_dismissed'] = true;
40
+
41
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_other_settings);
42
 
43
  wp_send_json(array(
44
  'success' => 1
45
  ));
46
+
47
  exit;
48
  }
49
 
58
  return $document;
59
  }
60
 
61
+ public function getNoticeHTML($checkbox=true)
62
  {
63
  $wpgmza_other_settings = get_option('WPGMZA_OTHER_SETTINGS');
64
 
67
 
68
  $html = $wpgmza_other_settings['wpgmza_gdpr_notice'];
69
 
70
+ $company_name = (empty($wpgmza_other_settings['wpgmza_gdpr_company_name']) ? '' : $wpgmza_other_settings['wpgmza_gdpr_company_name']);
71
+ $retention_period_days = (empty($wpgmza_other_settings['wpgmza_gdpr_retention_period_days']) ? '' : $wpgmza_other_settings['wpgmza_gdpr_retention_period_days']);
72
+ $retention_purpose = (empty($wpgmza_other_settings['wpgmza_gdpr_retention_purpose']) ? '' : $wpgmza_other_settings['wpgmza_gdpr_retention_purpose']);
73
 
74
+ $html = preg_replace('/{COMPANY_NAME}/i', $company_name, $html);
75
+ $html = preg_replace('/{RETENTION_PERIOD}/i', $retention_period_days, $html);
76
+ $html = preg_replace('/{RETENTION_PURPOSE}/i', $retention_purpose, $html);
77
+
78
+ if($checkbox)
79
+ $html = '<input type="checkbox" name="wpgmza_ugm_gdpr_consent" required/> ' . $html;
80
 
81
  $html = apply_filters('wpgmza_gdpr_notice_html', $html);
82
 
97
  ";
98
  }
99
 
100
+ public function getConsentPromptHTML()
101
+ {
102
+ return '<div>' . $this->getNoticeHTML(false) . "<p class='wpgmza-centered'><button class='wpgmza-api-consent'>" . __('I agree', 'wp-google-maps') . "</button></div></p>";
103
+ }
104
+
105
  public function onGlobalSettingsTabs($input)
106
  {
107
  return $input . "<li><a href=\"#wpgmza-gdpr-compliance\">".__("GDPR Compliance","wp-google-maps")."</a></li>";
124
 
125
  foreach($document->querySelectorAll('input, select, textarea') as $input)
126
  {
 
127
  $name = $input->getAttribute('name');
128
 
129
  if(!$name)
131
 
132
  switch($input->getAttribute('type'))
133
  {
 
134
  case 'checkbox':
135
+ if($input->getValue())
 
 
136
  $wpgmza_other_settings[$name] = 1;
137
+ else
138
+ unset($wpgmza_other_settings[$name]);
139
  break;
140
 
141
  default:
142
  $wpgmza_other_settings[$name] = stripslashes( $input->getValue() );
143
  break;
 
144
  }
 
145
  }
146
 
147
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_other_settings);
includes/class.google-maps-api-loader.php CHANGED
@@ -10,6 +10,16 @@ class GoogleMapsAPILoader
10
  private static $googleAPILoadCalled = false;
11
  private static $settings;
12
 
 
 
 
 
 
 
 
 
 
 
13
  public function __construct()
14
  {
15
  if(empty(GoogleMapsAPILoader::$settings))
@@ -163,22 +173,39 @@ class GoogleMapsAPILoader
163
  return (array_search($page_id, $page_ids) !== false);
164
  }
165
 
166
- public function isIncludeAllowed(&$reason=null)
167
  {
168
  global $wpgmza;
169
  global $post;
170
 
 
 
 
 
 
171
  $settings = (array)$wpgmza->settings;
172
 
173
  if(!empty($settings['wpgmza_settings_remove_api']))
174
  {
175
- $reason = 'Remove API checked in settings';
 
 
176
  return false;
177
  }
178
 
179
- if(!empty($settings['wpgmza_maps_engine']) && $settings['wpgmza_maps_engine'] != 'google-maps')
180
  {
181
- $reason = 'Engine is not google-maps';
 
 
 
 
 
 
 
 
 
 
182
  return false;
183
  }
184
 
@@ -186,13 +213,17 @@ class GoogleMapsAPILoader
186
  {
187
  if($this->isPageIncluded($post->ID))
188
  {
189
- $reason = 'Page is explicitly included in settings';
 
 
190
  return true;
191
  }
192
 
193
  if($this->isPageExcluded($post->ID))
194
  {
195
- $reason = 'Page is explicitly excluded in settings';
 
 
196
  return false;
197
  }
198
  }
@@ -201,17 +232,23 @@ class GoogleMapsAPILoader
201
  switch($settings['wpgmza_load_engine_api_condition'])
202
  {
203
  case 'never':
204
- $reason = 'Never load API chosen in settings';
 
 
205
  return false;
206
  break;
207
 
208
  case 'only-front-end':
209
- $reason = 'Load API front end only chosen in settings';
 
 
210
  return !is_admin();
211
  break;
212
 
213
  case 'only-back-end':
214
- $reason = 'Load API back end only chosen in settings';
 
 
215
  return is_admin();
216
  break;
217
 
@@ -219,7 +256,9 @@ class GoogleMapsAPILoader
219
  break;
220
  }
221
 
222
- $reason = 'Enqueue is allowed';
 
 
223
  return true;
224
  }
225
 
@@ -227,9 +266,9 @@ class GoogleMapsAPILoader
227
  {
228
  if(preg_match('/maps\.google/i', $src))
229
  {
230
- if(!$this->isIncludeAllowed($reason))
231
  {
232
- echo "<script>var wpgmza_api_not_enqueued_reason = '$reason';</script>";
233
  return '';
234
  }
235
 
10
  private static $googleAPILoadCalled = false;
11
  private static $settings;
12
 
13
+ const REMOVE_API_CHECKED = 'REMOVE_API_CHECKED';
14
+ const USER_CONSENT_NOT_GIVEN = 'USER_CONSENT_NOT_GIVEN';
15
+ const ENGINE_NOT_GOOGLE_MAPS = 'ENGINE_NOT_GOOGLE_MAPS';
16
+ const PAGE_EXPLICITLY_INCLUDED = 'PAGE_EXPLICITLY_INCLUDED';
17
+ const PAGE_EXPLICITLY_EXCLUDED = 'PAGE_EXPLICITLY_EXCLUDED';
18
+ const NEVER_LOAD_API_SELECTED = 'NEVER_LOAD_API_SELECTED';
19
+ const ONLY_LOAD_FRONT_END_SELECTED = 'ONLY_LOAD_FRONT_END_SELECTED';
20
+ const ONLY_LOAD_BACK_END_SELECTED = 'ONLY_LOAD_BACK_END_SELECTED';
21
+ const ENQUEUED = 'ENQUEUED';
22
+
23
  public function __construct()
24
  {
25
  if(empty(GoogleMapsAPILoader::$settings))
173
  return (array_search($page_id, $page_ids) !== false);
174
  }
175
 
176
+ public function isIncludeAllowed(&$status=null)
177
  {
178
  global $wpgmza;
179
  global $post;
180
 
181
+ $status = (object)array(
182
+ 'message' => null,
183
+ 'code' => null
184
+ );
185
+
186
  $settings = (array)$wpgmza->settings;
187
 
188
  if(!empty($settings['wpgmza_settings_remove_api']))
189
  {
190
+ $status->message = 'Remove API checked in settings';
191
+ $status->code = GoogleMapsAPILoader::REMOVE_API_CHECKED;
192
+
193
  return false;
194
  }
195
 
196
+ /*if(!empty($settings['wpgmza_gdpr_require_consent_before_load']) && !isset($_COOKIE['wpgmza-api-consent-given']))
197
  {
198
+ $status->message = 'User consent not given';
199
+ $status->code = GoogleMapsAPILoader::USER_CONSENT_NOT_GIVEN;
200
+
201
+ return false;
202
+ }*/
203
+
204
+ if(empty($settings['wpgmza_maps_engine']) || $settings['wpgmza_maps_engine'] != 'google-maps')
205
+ {
206
+ $status->message = 'Engine is not google-maps';
207
+ $status->code = GoogleMapsAPILoader::ENGINE_NOT_GOOGLE_MAPS;
208
+
209
  return false;
210
  }
211
 
213
  {
214
  if($this->isPageIncluded($post->ID))
215
  {
216
+ $status->message = 'Page is explicitly included in settings';
217
+ $status->code = GoogleMapsAPILoader::PAGE_EXPLICITLY_INCLUDED;
218
+
219
  return true;
220
  }
221
 
222
  if($this->isPageExcluded($post->ID))
223
  {
224
+ $status->message = 'Page is explicitly excluded in settings';
225
+ $status->code = GoogleMapsAPILoader::PAGE_EXPLICITLY_EXCLUDED;
226
+
227
  return false;
228
  }
229
  }
232
  switch($settings['wpgmza_load_engine_api_condition'])
233
  {
234
  case 'never':
235
+ $status->message = 'Never load API chosen in settings';
236
+ $status->code = GoogleMapsAPILoader::NEVER_LOAD_API_SELECTED;
237
+
238
  return false;
239
  break;
240
 
241
  case 'only-front-end':
242
+ $status->message = 'Load API front end only chosen in settings';
243
+ $status->code = GoogleMapsAPILoader::ONLY_LOAD_FRONT_END_SELECTED;
244
+
245
  return !is_admin();
246
  break;
247
 
248
  case 'only-back-end':
249
+ $status->message = 'Load API back end only chosen in settings';
250
+ $status->code = GoogleMapsAPILoader::ONLY_LOAD_BACK_END_SELECTED;
251
+
252
  return is_admin();
253
  break;
254
 
256
  break;
257
  }
258
 
259
+ $status->message = 'Enqueued';
260
+ $status->code = GoogleMapsAPILoader::ENQUEUED;
261
+
262
  return true;
263
  }
264
 
266
  {
267
  if(preg_match('/maps\.google/i', $src))
268
  {
269
+ if(!$this->isIncludeAllowed($status))
270
  {
271
+ echo "<script>var wpgmza_google_api_status = " . json_encode($status) . "</script>";
272
  return '';
273
  }
274
 
includes/class.maps-engine-dialog.php CHANGED
@@ -44,16 +44,13 @@ class MapsEngineDialog
44
 
45
  <img class="wpgmza-engine-logo" src="<?php echo plugin_dir_url(__DIR__) . 'images/OpenLayers_logo.svg.png'?>"/>
46
 
47
- <ul class="wpgmza-pros">
48
- <li>
49
- <?php _e('No billing setup required', 'wp-google-maps'); ?>
50
- </li>
51
  <li>
52
  <?php _e('No API keys required', 'wp-google-maps'); ?>
53
  </li>
54
  </ul>
55
 
56
- <ul class="wpgmza-cons">
57
  <li>
58
  <?php _e('Limited functionality', 'wp-google-maps'); ?>
59
  </li>
@@ -100,18 +97,11 @@ class MapsEngineDialog
100
  </li>
101
  </ul>-->
102
 
103
- <ul class="wpgmza-cons">
104
- <li>
105
- <?php _e('Billing setup required *', 'wp-google-maps'); ?>
106
- </li>
107
  <li>
108
  <?php _e('API Key required', 'wp-google-maps'); ?>
109
  </li>
110
  </ul>
111
-
112
- <small>
113
- <?php _e('* Card details required, $200 each month free, <a href="https://cloud.google.com/maps-platform/pricing/">more info</a>', 'wp-google-maps'); ?>
114
- </small>
115
  </div>
116
 
117
  <!--<p class="wpgmza-centered">
44
 
45
  <img class="wpgmza-engine-logo" src="<?php echo plugin_dir_url(__DIR__) . 'images/OpenLayers_logo.svg.png'?>"/>
46
 
47
+ <ul>
 
 
 
48
  <li>
49
  <?php _e('No API keys required', 'wp-google-maps'); ?>
50
  </li>
51
  </ul>
52
 
53
+ <ul>
54
  <li>
55
  <?php _e('Limited functionality', 'wp-google-maps'); ?>
56
  </li>
97
  </li>
98
  </ul>-->
99
 
100
+ <ul>
 
 
 
101
  <li>
102
  <?php _e('API Key required', 'wp-google-maps'); ?>
103
  </li>
104
  </ul>
 
 
 
 
105
  </div>
106
 
107
  <!--<p class="wpgmza-centered">
includes/class.plugin.php CHANGED
@@ -26,20 +26,12 @@ class Plugin
26
  if(!$this->legacySettings)
27
  $this->legacySettings = array();
28
 
29
- // Force engine setting to Google Maps for users updating to 7.10.01 or above, set a flag so it only happens once
30
- if(!isset($this->legacySettings['v7.10.01-default-api-fix']))
31
- {
32
- $this->legacySettings['wpgmza_maps_engine'] = 'google-maps';
33
- $this->legacySettings['v7.10.01-default-api-fix'] = true;
34
- update_option('WPGMZA_OTHER_SETTINGS', $this->legacySettings);
35
- }
36
-
37
  $settings = $this->getDefaultSettings();
38
 
39
  // Legacy compatibility
40
  global $wpgmza_pro_version;
41
 
42
- // TODO: This should be in default settings, this code is duplicated
43
  if(!empty($wpgmza_pro_version) && version_compare(trim($wpgmza_pro_version), '7.10.00', '<'))
44
  {
45
  $settings['wpgmza_maps_engine'] = $settings['engine'] = 'google-maps';
@@ -100,11 +92,9 @@ class Plugin
100
 
101
  public function getDefaultSettings()
102
  {
 
103
  $defaultEngine = 'google-maps';
104
 
105
- if(!empty($defaultEngine))
106
- $defaultEngine = $this->legacySettings['wpgmza_maps_engine'];
107
-
108
  return apply_filters('wpgmza_plugin_get_default_settings', array(
109
  'engine' => $defaultEngine,
110
  'google_maps_api_key' => get_option('wpgmza_google_maps_api_key'),
@@ -115,13 +105,16 @@ class Plugin
115
 
116
  public function getLocalizedData()
117
  {
 
 
118
  $strings = new Strings();
119
 
120
  return apply_filters('wpgmza_plugin_get_localized_data', array(
121
- 'ajaxurl' => admin_url('admin-ajax.php'),
122
- 'settings' => $this->settings,
123
- 'localized_strings' => $strings->getLocalizedStrings(),
124
- '_isProVersion' => $this->isProVersion()
 
125
  ));
126
  }
127
 
26
  if(!$this->legacySettings)
27
  $this->legacySettings = array();
28
 
 
 
 
 
 
 
 
 
29
  $settings = $this->getDefaultSettings();
30
 
31
  // Legacy compatibility
32
  global $wpgmza_pro_version;
33
 
34
+ // TODO: This should be in default settings, this code is duplicaetd
35
  if(!empty($wpgmza_pro_version) && version_compare(trim($wpgmza_pro_version), '7.10.00', '<'))
36
  {
37
  $settings['wpgmza_maps_engine'] = $settings['engine'] = 'google-maps';
92
 
93
  public function getDefaultSettings()
94
  {
95
+ //$defaultEngine = (empty($this->legacySettings['wpgmza_maps_engine']) || $this->legacySettings['wpgmza_maps_engine'] != 'google-maps' ? 'open-layers' : 'google-maps');
96
  $defaultEngine = 'google-maps';
97
 
 
 
 
98
  return apply_filters('wpgmza_plugin_get_default_settings', array(
99
  'engine' => $defaultEngine,
100
  'google_maps_api_key' => get_option('wpgmza_google_maps_api_key'),
105
 
106
  public function getLocalizedData()
107
  {
108
+ global $wpgmzaGDPRCompliance;
109
+
110
  $strings = new Strings();
111
 
112
  return apply_filters('wpgmza_plugin_get_localized_data', array(
113
+ 'ajaxurl' => admin_url('admin-ajax.php'),
114
+ 'settings' => $this->settings,
115
+ 'localized_strings' => $strings->getLocalizedStrings(),
116
+ 'api_consent_html' => $wpgmzaGDPRCompliance->getConsentPromptHTML(),
117
+ '_isProVersion' => $this->isProVersion()
118
  ));
119
  }
120
 
js/v8/core.js CHANGED
@@ -333,7 +333,9 @@
333
  */
334
  isGoogleAutocompleteSupported: function() {
335
  return typeof google === 'object' && typeof google.maps === 'object' && typeof google.maps.places === 'object' && typeof google.maps.places.Autocomplete === 'function';
336
- }
 
 
337
  };
338
 
339
  if(window.WPGMZA)
@@ -360,7 +362,6 @@
360
 
361
  if(elements.length > 1)
362
  console.warn("Multiple jQuery versions detected: ", elements);
363
-
364
  });
365
 
366
  $(window).on("load", function(event) {
333
  */
334
  isGoogleAutocompleteSupported: function() {
335
  return typeof google === 'object' && typeof google.maps === 'object' && typeof google.maps.places === 'object' && typeof google.maps.places.Autocomplete === 'function';
336
+ },
337
+
338
+ googleAPIStatus: window.wpgmza_google_api_status
339
  };
340
 
341
  if(window.WPGMZA)
362
 
363
  if(elements.length > 1)
364
  console.warn("Multiple jQuery versions detected: ", elements);
 
365
  });
366
 
367
  $(window).on("load", function(event) {
js/v8/google-maps/google-info-window.js CHANGED
@@ -110,6 +110,8 @@
110
 
111
  WPGMZA.GoogleInfoWindow.prototype.setContent = function(html)
112
  {
 
 
113
  this.content = html;
114
 
115
  this.createGoogleInfoWindow();
@@ -117,4 +119,13 @@
117
  this.googleInfoWindow.setContent(html);
118
  }
119
 
 
 
 
 
 
 
 
 
 
120
  })(jQuery);
110
 
111
  WPGMZA.GoogleInfoWindow.prototype.setContent = function(html)
112
  {
113
+ Parent.prototype.setContent.call(this, html);
114
+
115
  this.content = html;
116
 
117
  this.createGoogleInfoWindow();
119
  this.googleInfoWindow.setContent(html);
120
  }
121
 
122
+ WPGMZA.GoogleInfoWindow.prototype.setOptions = function(options)
123
+ {
124
+ Parent.prototype.setOptions.call(this, options);
125
+
126
+ this.createGoogleInfoWindow();
127
+
128
+ this.googleInfoWindow.setOptions(options);
129
+ }
130
+
131
  })(jQuery);
js/v8/google-maps/google-map.js CHANGED
@@ -15,11 +15,25 @@
15
  {
16
  var self = this;
17
 
18
- if(!window.google)
19
- throw new Error("Google API not loaded - " + wpgmza_api_not_enqueued_reason);
20
-
21
  Parent.call(this, element, options);
22
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
23
  this.loadGoogleMap();
24
 
25
  if(options)
15
  {
16
  var self = this;
17
 
 
 
 
18
  Parent.call(this, element, options);
19
 
20
+ if(!window.google)
21
+ {
22
+ var status = WPGMZA.googleAPIStatus;
23
+ var message = "Google API not loaded";
24
+
25
+ if(status && status.message)
26
+ message += " - " + status.message;
27
+
28
+ if(status.code == "USER_CONSENT_NOT_GIVEN")
29
+ {
30
+ console.log(WPGMZA.api_consent_html);
31
+ return;
32
+ }
33
+
34
+ throw new Error(message);
35
+ }
36
+
37
  this.loadGoogleMap();
38
 
39
  if(options)
js/v8/google-maps/google-vertex-context-menu.js CHANGED
@@ -8,6 +8,9 @@
8
  if(WPGMZA.settings.engine != "google-maps")
9
  return;
10
 
 
 
 
11
  WPGMZA.GoogleVertexContextMenu = function(mapEditPage)
12
  {
13
  var self = this;
8
  if(WPGMZA.settings.engine != "google-maps")
9
  return;
10
 
11
+ if(WPGMZA.googleAPIStatus && WPGMZA.googleAPIStatus.code == "USER_CONSENT_NOT_GIVEN")
12
+ return;
13
+
14
  WPGMZA.GoogleVertexContextMenu = function(mapEditPage)
15
  {
16
  var self = this;
js/v8/info-window.js CHANGED
@@ -96,6 +96,16 @@
96
 
97
  }
98
 
 
 
 
 
 
 
 
 
 
 
99
  /**
100
  * Event listener for when the map object is added. This will cause the info window to open if the map object has infoopen set
101
  * @return void
96
 
97
  }
98
 
99
+ WPGMZA.InfoWindow.prototype.setContent = function(options)
100
+ {
101
+
102
+ }
103
+
104
+ WPGMZA.InfoWindow.prototype.setOptions = function(options)
105
+ {
106
+
107
+ }
108
+
109
  /**
110
  * Event listener for when the map object is added. This will cause the info window to open if the map object has infoopen set
111
  * @return void
js/v8/open-layers/ol-info-window.js CHANGED
@@ -80,4 +80,10 @@
80
  $(this.element).html("<i class='fa fa-times ol-info-window-close' aria-hidden='true'></i>" + html);
81
  }
82
 
 
 
 
 
 
 
83
  })(jQuery);
80
  $(this.element).html("<i class='fa fa-times ol-info-window-close' aria-hidden='true'></i>" + html);
81
  }
82
 
83
+ WPGMZA.OLInfoWindow.prototype.setOptions = function(options)
84
+ {
85
+ if(WPGMZA.settings.developer_mode)
86
+ console.log(options);
87
+ }
88
+
89
  })(jQuery);
js/wpgmaps.js CHANGED
@@ -51,6 +51,24 @@ function wpgmza_open_info_window(infoWindow, content)
51
  }
52
 
53
  function InitMap() {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
54
  var myLatLng = {
55
  lat: wpgmaps_localize[wpgmaps_mapid].map_start_lat,
56
  lng: wpgmaps_localize[wpgmaps_mapid].map_start_lng
51
  }
52
 
53
  function InitMap() {
54
+
55
+ var $ = jQuery;
56
+
57
+ /*if(WPGMZA.googleAPIStatus && WPGMZA.googleAPIStatus.code == "USER_CONSENT_NOT_GIVEN")
58
+ {
59
+ $("#wpgmza_map, .wpgmza_map").each(function(index, el) {
60
+ $(el).append($(WPGMZA.api_consent_html));
61
+ $(el).css({height: "auto"});
62
+ });
63
+
64
+ $("button.wpgmza-api-consent").on("click", function(event) {
65
+ Cookies.set("wpgmza-api-consent-given", true);
66
+ window.location.reload();
67
+ });
68
+
69
+ return;
70
+ }*/
71
+
72
  var myLatLng = {
73
  lat: wpgmaps_localize[wpgmaps_mapid].map_start_lat,
74
  lng: wpgmaps_localize[wpgmaps_mapid].map_start_lng
wpGoogleMaps.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: WP Google Maps
4
  Plugin URI: https://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: 7.10.01
7
  Author: WP Google Maps
8
  Author URI: https://www.wpgmaps.com
9
  Text Domain: wp-google-maps
@@ -11,12 +11,19 @@ Domain Path: /languages
11
  */
12
 
13
  /*
14
- * 7.10.01
15
- * Maps API defaults to Google Maps when updating to 7.10.01
16
- * Map engine dialog selection bug fixed
17
- * Map engine select setting fixed
 
 
 
 
 
 
 
18
  *
19
- * 7.10.00
20
  * Added new Javascript modules
21
  * Added new PHP modules
22
  * Class AutoLoading implemented
@@ -2971,6 +2978,11 @@ function wpgmza_settings_page_post()
2971
  {
2972
  global $wpdb;
2973
 
 
 
 
 
 
2974
  //$wpgmza_data = array();
2975
  $wpgmza_data = get_option('WPGMZA_OTHER_SETTINGS');
2976
  if(!$wpgmza_data)
@@ -2996,6 +3008,8 @@ function wpgmza_settings_page_post()
2996
  "carousel_autoheight",
2997
  "carousel_pagination",
2998
  "carousel_navigation",
 
 
2999
  "wpgmza_developer_mode"
3000
  );
3001
 
@@ -3054,7 +3068,7 @@ function wpgmza_settings_page_post()
3054
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_data);
3055
 
3056
  if( isset( $_POST['wpgmza_google_maps_api_key'] ) ){ update_option( 'wpgmza_google_maps_api_key', sanitize_text_field( trim($_POST['wpgmza_google_maps_api_key'] )) ); }
3057
-
3058
  wp_redirect(get_admin_url() . 'admin.php?page=wp-google-maps-menu-settings');
3059
  exit;
3060
  }
@@ -4367,6 +4381,9 @@ function wpgmaps_settings_page_basic() {
4367
  $ret .= " <li><a href=\"#tabs-3\">".__("Marker Listing","wp-google-maps")."</a></li>";
4368
  $ret .= " <li><a href=\"#tabs-4\">".__("Store Locator","wp-google-maps")."</a></li>";
4369
  $ret .= " <li><a href=\"#tabs-5\">".__("Advanced","wp-google-maps")."</a></li>";
 
 
 
4370
  $ret .= " </ul>";
4371
  $ret .= " <div id=\"tabs-1\">";
4372
  $ret .= " <h3>".__("Map Settings")."</h3>";
@@ -4725,11 +4742,16 @@ function wpgmaps_settings_page_basic() {
4725
  ";
4726
 
4727
  $ret .= " </div>";
 
 
 
4728
  $ret .= " </div>";
4729
  $ret .= " <p class='submit'><input type='submit' name='wpgmza_save_settings' class='button-primary' value='".__("Save Settings","wp-google-maps")." &raquo;' /></p>";
4730
  $ret .= " </form>";
 
 
4731
  $ret .= "</div>";
4732
-
4733
  echo $ret;
4734
 
4735
 
3
  Plugin Name: WP Google Maps
4
  Plugin URI: https://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: 7.10.03
7
  Author: WP Google Maps
8
  Author URI: https://www.wpgmaps.com
9
  Text Domain: wp-google-maps
11
  */
12
 
13
  /*
14
+ * 7.10.03 - 2018-05-30
15
+ * Fixed InfoWindow not opening when max width set in
16
+ * Fixed $this not in context inside closure when using older PHP versions
17
+ * Fixed Gold add-on clustering settings blank
18
+ * Altered map engine selection dialog
19
+ *
20
+ * 7.10.02 - 2018-05-29
21
+ * Engine defaults to Google Maps
22
+ *
23
+ * 7.10.01 - 2018-05-29
24
+ * Fixed undefined index notice in GDPR module
25
  *
26
+ * 7.10.00 - 2018-05-29
27
  * Added new Javascript modules
28
  * Added new PHP modules
29
  * Class AutoLoading implemented
2978
  {
2979
  global $wpdb;
2980
 
2981
+ global $wpgmzaGDPRCompliance;
2982
+
2983
+ if($wpgmzaGDPRCompliance)
2984
+ $wpgmzaGDPRCompliance->onPOST();
2985
+
2986
  //$wpgmza_data = array();
2987
  $wpgmza_data = get_option('WPGMZA_OTHER_SETTINGS');
2988
  if(!$wpgmza_data)
3008
  "carousel_autoheight",
3009
  "carousel_pagination",
3010
  "carousel_navigation",
3011
+ "wpgmza_gdpr_enabled",
3012
+ "wpgmza_gdpr_require_consent_before_load",
3013
  "wpgmza_developer_mode"
3014
  );
3015
 
3068
  update_option('WPGMZA_OTHER_SETTINGS', $wpgmza_data);
3069
 
3070
  if( isset( $_POST['wpgmza_google_maps_api_key'] ) ){ update_option( 'wpgmza_google_maps_api_key', sanitize_text_field( trim($_POST['wpgmza_google_maps_api_key'] )) ); }
3071
+
3072
  wp_redirect(get_admin_url() . 'admin.php?page=wp-google-maps-menu-settings');
3073
  exit;
3074
  }
4381
  $ret .= " <li><a href=\"#tabs-3\">".__("Marker Listing","wp-google-maps")."</a></li>";
4382
  $ret .= " <li><a href=\"#tabs-4\">".__("Store Locator","wp-google-maps")."</a></li>";
4383
  $ret .= " <li><a href=\"#tabs-5\">".__("Advanced","wp-google-maps")."</a></li>";
4384
+
4385
+ $ret .= apply_filters('wpgmza_global_settings_tabs', '');
4386
+
4387
  $ret .= " </ul>";
4388
  $ret .= " <div id=\"tabs-1\">";
4389
  $ret .= " <h3>".__("Map Settings")."</h3>";
4742
  ";
4743
 
4744
  $ret .= " </div>";
4745
+
4746
+ $ret .= apply_filters('wpgmza_global_settings_tab_content', '');
4747
+
4748
  $ret .= " </div>";
4749
  $ret .= " <p class='submit'><input type='submit' name='wpgmza_save_settings' class='button-primary' value='".__("Save Settings","wp-google-maps")." &raquo;' /></p>";
4750
  $ret .= " </form>";
4751
+
4752
+
4753
  $ret .= "</div>";
4754
+
4755
  echo $ret;
4756
 
4757