AdSense Plugin WP QUADS - Version 2.0.11.1

Version Description

(27th August 2020) = * New: Geo Location improvements #156

Download this release

Release Info

Developer wpquads
Plugin Icon 128x128 AdSense Plugin WP QUADS
Version 2.0.11.1
Comparing to
See all releases

Code changes from version 2.0.11 to 2.0.11.1

Files changed (5) hide show
  1. admin/assets/js/dist/adminscript.js +34 -727
  2. admin/assets/js/src/components/common/user-targeting/QuadsUserTargeting.jsx +23 -243
  3. includes/conditions.php +4 -89
  4. quick-adsense-reloaded.php +2 -2
  5. readme.txt +11 -9
admin/assets/js/dist/adminscript.js CHANGED
@@ -59973,6 +59973,8 @@ var QuadsUserTargeting = /*#__PURE__*/function (_Component) {
59973
  _defineProperty(_assertThisInitialized(_this), "handleMultiIncludedLeftChange", function (option) {
59974
  var type = _this.state.multiTypeTargetOption[option.value];
59975
 
 
 
59976
  if (!quads_localize_data.is_pro && (option.value === 'geo_location_country' || option.value === 'geo_location_city')) {
59977
  _this.setState({
59978
  includedMainToggle: false
@@ -60015,16 +60017,39 @@ var QuadsUserTargeting = /*#__PURE__*/function (_Component) {
60015
  });
60016
  }
60017
 
60018
- _this.setState({
60019
- includedTextToggle: true
60020
- });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60021
 
60022
- _this.setState({
60023
- multiTypeLeftIncludedValue: option,
60024
- includedDynamicOptions: type,
60025
- multiTypeRightIncludedValue: [],
60026
- includedRightPlaceholder: placeholder
60027
- });
 
60028
  }
60029
  });
60030
 
@@ -60635,724 +60660,6 @@ var QuadsUserTargeting = /*#__PURE__*/function (_Component) {
60635
  }, {
60636
  value: 'false',
60637
  label: 'False'
60638
- }],
60639
- geo_location_country: [{
60640
- value: 'AF',
60641
- label: 'Afghanistan'
60642
- }, {
60643
- value: 'AL',
60644
- label: 'Albania'
60645
- }, {
60646
- value: 'DZ',
60647
- label: 'Algeria'
60648
- }, {
60649
- value: 'AS',
60650
- label: 'American Samoa'
60651
- }, {
60652
- value: 'AD',
60653
- label: 'Andorra'
60654
- }, {
60655
- value: 'AO',
60656
- label: 'Angola'
60657
- }, {
60658
- value: 'AI',
60659
- label: 'Anguilla'
60660
- }, {
60661
- value: 'AQ',
60662
- label: 'Antarctica'
60663
- }, {
60664
- value: 'AG',
60665
- label: 'Antigua and Barbuda'
60666
- }, {
60667
- value: 'AR',
60668
- label: 'Argentina'
60669
- }, {
60670
- value: 'AM',
60671
- label: 'Armenia'
60672
- }, {
60673
- value: 'AW',
60674
- label: 'Aruba'
60675
- }, {
60676
- value: 'AU',
60677
- label: 'Australia'
60678
- }, {
60679
- value: 'AT',
60680
- label: 'Austria'
60681
- }, {
60682
- value: 'AZ',
60683
- label: 'Azerbaijan'
60684
- }, {
60685
- value: 'BS',
60686
- label: 'Bahamas'
60687
- }, {
60688
- value: 'BH',
60689
- label: 'Bahrain'
60690
- }, {
60691
- value: 'BD',
60692
- label: 'Bangladesh'
60693
- }, {
60694
- value: 'BB',
60695
- label: 'Barbados'
60696
- }, {
60697
- value: 'BY',
60698
- label: 'Belarus'
60699
- }, {
60700
- value: 'BE',
60701
- label: 'Belgium'
60702
- }, {
60703
- value: 'BZ',
60704
- label: 'Belize'
60705
- }, {
60706
- value: 'BJ',
60707
- label: 'Benin'
60708
- }, {
60709
- value: 'BM',
60710
- label: 'Bermuda'
60711
- }, {
60712
- value: 'BT',
60713
- label: 'Bhutan'
60714
- }, {
60715
- value: 'BO',
60716
- label: 'Bolivia'
60717
- }, {
60718
- value: 'BA',
60719
- label: 'Bosnia and Herzegovina'
60720
- }, {
60721
- value: 'BW',
60722
- label: 'Botswana'
60723
- }, {
60724
- value: 'BV',
60725
- label: 'Bouvet Island'
60726
- }, {
60727
- value: 'BR',
60728
- label: 'Brazil'
60729
- }, {
60730
- value: 'IO',
60731
- label: 'British Indian Ocean Territory'
60732
- }, {
60733
- value: 'BN',
60734
- label: 'Brunei Darussalam'
60735
- }, {
60736
- value: 'BG',
60737
- label: 'Bulgaria'
60738
- }, {
60739
- value: 'BF',
60740
- label: 'Burkina Faso'
60741
- }, {
60742
- value: 'BI',
60743
- label: 'Burundi'
60744
- }, {
60745
- value: 'KH',
60746
- label: 'Cambodia'
60747
- }, {
60748
- value: 'CM',
60749
- label: 'Cameroon'
60750
- }, {
60751
- value: 'CA',
60752
- label: 'Canada'
60753
- }, {
60754
- value: 'CV',
60755
- label: 'Cape Verde'
60756
- }, {
60757
- value: 'KY',
60758
- label: 'Cayman Islands'
60759
- }, {
60760
- value: 'CF',
60761
- label: 'Central African Republic'
60762
- }, {
60763
- value: 'TD',
60764
- label: 'Chad'
60765
- }, {
60766
- value: 'CL',
60767
- label: 'Chile'
60768
- }, {
60769
- value: 'CN',
60770
- label: 'China'
60771
- }, {
60772
- value: 'CX',
60773
- label: 'Christmas Island'
60774
- }, {
60775
- value: 'CC',
60776
- label: 'Cocos (Keeling) Islands'
60777
- }, {
60778
- value: 'CO',
60779
- label: 'Colombia'
60780
- }, {
60781
- value: 'KM',
60782
- label: 'Comoros'
60783
- }, {
60784
- value: 'CG',
60785
- label: 'Congo'
60786
- }, {
60787
- value: 'CD',
60788
- label: 'Congo, the Democratic Republic of the'
60789
- }, {
60790
- value: 'CK',
60791
- label: 'Cook Islands'
60792
- }, {
60793
- value: 'CR',
60794
- label: 'Costa Rica'
60795
- }, {
60796
- value: 'CI',
60797
- label: 'Cote D\'Ivoire'
60798
- }, {
60799
- value: 'HR',
60800
- label: 'Croatia'
60801
- }, {
60802
- value: 'CU',
60803
- label: 'Cuba'
60804
- }, {
60805
- value: 'CY',
60806
- label: 'Cyprus'
60807
- }, {
60808
- value: 'CZ',
60809
- label: 'Czech Republic'
60810
- }, {
60811
- value: 'DK',
60812
- label: 'Denmark'
60813
- }, {
60814
- value: 'DJ',
60815
- label: 'Djibouti'
60816
- }, {
60817
- value: 'DM',
60818
- label: 'Dominica'
60819
- }, {
60820
- value: 'DO',
60821
- label: 'Dominican Republic'
60822
- }, {
60823
- value: 'EC',
60824
- label: 'Ecuador'
60825
- }, {
60826
- value: 'EG',
60827
- label: 'Egypt'
60828
- }, {
60829
- value: 'SV',
60830
- label: 'El Salvador'
60831
- }, {
60832
- value: 'GQ',
60833
- label: 'Equatorial Guinea'
60834
- }, {
60835
- value: 'ER',
60836
- label: 'Eritrea'
60837
- }, {
60838
- value: 'EE',
60839
- label: 'Estonia'
60840
- }, {
60841
- value: 'ET',
60842
- label: 'Ethiopia'
60843
- }, {
60844
- value: 'FK',
60845
- label: 'Falkland Islands (Malvinas)'
60846
- }, {
60847
- value: 'FO',
60848
- label: 'Faroe Islands'
60849
- }, {
60850
- value: 'FJ',
60851
- label: 'Fiji'
60852
- }, {
60853
- value: 'FI',
60854
- label: 'Finland'
60855
- }, {
60856
- value: 'FR',
60857
- label: 'France'
60858
- }, {
60859
- value: 'GF',
60860
- label: 'French Guiana'
60861
- }, {
60862
- value: 'PF',
60863
- label: 'French Polynesia'
60864
- }, {
60865
- value: 'TF',
60866
- label: 'French Southern Territories'
60867
- }, {
60868
- value: 'GA',
60869
- label: 'Gabon'
60870
- }, {
60871
- value: 'GM',
60872
- label: 'Gambia'
60873
- }, {
60874
- value: 'GE',
60875
- label: 'Georgia'
60876
- }, {
60877
- value: 'DE',
60878
- label: 'Germany'
60879
- }, {
60880
- value: 'GH',
60881
- label: 'Ghana'
60882
- }, {
60883
- value: 'GI',
60884
- label: 'Gibraltar'
60885
- }, {
60886
- value: 'GR',
60887
- label: 'Greece'
60888
- }, {
60889
- value: 'GL',
60890
- label: 'Greenland'
60891
- }, {
60892
- value: 'GD',
60893
- label: 'Grenada'
60894
- }, {
60895
- value: 'GP',
60896
- label: 'Guadeloupe'
60897
- }, {
60898
- value: 'GU',
60899
- label: 'Guam'
60900
- }, {
60901
- value: 'GT',
60902
- label: 'Guatemala'
60903
- }, {
60904
- value: 'GN',
60905
- label: 'Guinea'
60906
- }, {
60907
- value: 'GW',
60908
- label: 'Guinea-Bissau'
60909
- }, {
60910
- value: 'GY',
60911
- label: 'Guyana'
60912
- }, {
60913
- value: 'HT',
60914
- label: 'Haiti'
60915
- }, {
60916
- value: 'HM',
60917
- label: 'Heard Island and Mcdonald Islands'
60918
- }, {
60919
- value: 'VA',
60920
- label: 'Holy See (Vatican City State)'
60921
- }, {
60922
- value: 'HN',
60923
- label: 'Honduras'
60924
- }, {
60925
- value: 'HK',
60926
- label: 'Hong Kong'
60927
- }, {
60928
- value: 'HU',
60929
- label: 'Hungary'
60930
- }, {
60931
- value: 'IS',
60932
- label: 'Iceland'
60933
- }, {
60934
- value: 'IN',
60935
- label: 'India'
60936
- }, {
60937
- value: 'ID',
60938
- label: 'Indonesia'
60939
- }, {
60940
- value: 'IR',
60941
- label: 'Iran, Islamic Republic of'
60942
- }, {
60943
- value: 'IQ',
60944
- label: 'Iraq'
60945
- }, {
60946
- value: 'IE',
60947
- label: 'Ireland'
60948
- }, {
60949
- value: 'IL',
60950
- label: 'Israel'
60951
- }, {
60952
- value: 'IT',
60953
- label: 'Italy'
60954
- }, {
60955
- value: 'JM',
60956
- label: 'Jamaica'
60957
- }, {
60958
- value: 'JP',
60959
- label: 'Japan'
60960
- }, {
60961
- value: 'JO',
60962
- label: 'Jordan'
60963
- }, {
60964
- value: 'KZ',
60965
- label: 'Kazakhstan'
60966
- }, {
60967
- value: 'KE',
60968
- label: 'Kenya'
60969
- }, {
60970
- value: 'KI',
60971
- label: 'Kiribati'
60972
- }, {
60973
- value: 'KP',
60974
- label: 'Korea, Democratic People\'s Republic of'
60975
- }, {
60976
- value: 'KR',
60977
- label: 'Korea, Republic of'
60978
- }, {
60979
- value: 'KW',
60980
- label: 'Kuwait'
60981
- }, {
60982
- value: 'KG',
60983
- label: 'Kyrgyzstan'
60984
- }, {
60985
- value: 'LA',
60986
- label: 'Lao People\'s Democratic Republic'
60987
- }, {
60988
- value: 'LV',
60989
- label: 'Latvia'
60990
- }, {
60991
- value: 'LB',
60992
- label: 'Lebanon'
60993
- }, {
60994
- value: 'LS',
60995
- label: 'Lesotho'
60996
- }, {
60997
- value: 'LR',
60998
- label: 'Liberia'
60999
- }, {
61000
- value: 'LY',
61001
- label: 'Libyan Arab Jamahiriya'
61002
- }, {
61003
- value: 'LI',
61004
- label: 'Liechtenstein'
61005
- }, {
61006
- value: 'LT',
61007
- label: 'Lithuania'
61008
- }, {
61009
- value: 'LU',
61010
- label: 'Luxembourg'
61011
- }, {
61012
- value: 'MO',
61013
- label: 'Macao'
61014
- }, {
61015
- value: 'MK',
61016
- label: 'Macedonia, the Former Yugoslav Republic of'
61017
- }, {
61018
- value: 'MG',
61019
- label: 'Madagascar'
61020
- }, {
61021
- value: 'MW',
61022
- label: 'Malawi'
61023
- }, {
61024
- value: 'MY',
61025
- label: 'Malaysia'
61026
- }, {
61027
- value: 'MV',
61028
- label: 'Maldives'
61029
- }, {
61030
- value: 'ML',
61031
- label: 'Mali'
61032
- }, {
61033
- value: 'MT',
61034
- label: 'Malta'
61035
- }, {
61036
- value: 'MH',
61037
- label: 'Marshall Islands'
61038
- }, {
61039
- value: 'MQ',
61040
- label: 'Martinique'
61041
- }, {
61042
- value: 'MR',
61043
- label: 'Mauritania'
61044
- }, {
61045
- value: 'MU',
61046
- label: 'Mauritius'
61047
- }, {
61048
- value: 'YT',
61049
- label: 'Mayotte'
61050
- }, {
61051
- value: 'MX',
61052
- label: 'Mexico'
61053
- }, {
61054
- value: 'FM',
61055
- label: 'Micronesia, Federated States of'
61056
- }, {
61057
- value: 'MD',
61058
- label: 'Moldova, Republic of'
61059
- }, {
61060
- value: 'MC',
61061
- label: 'Monaco'
61062
- }, {
61063
- value: 'MN',
61064
- label: 'Mongolia'
61065
- }, {
61066
- value: 'MS',
61067
- label: 'Montserrat'
61068
- }, {
61069
- value: 'MA',
61070
- label: 'Morocco'
61071
- }, {
61072
- value: 'MZ',
61073
- label: 'Mozambique'
61074
- }, {
61075
- value: 'MM',
61076
- label: 'Myanmar'
61077
- }, {
61078
- value: 'NA',
61079
- label: 'Namibia'
61080
- }, {
61081
- value: 'NR',
61082
- label: 'Nauru'
61083
- }, {
61084
- value: 'NP',
61085
- label: 'Nepal'
61086
- }, {
61087
- value: 'NL',
61088
- label: 'Netherlands'
61089
- }, {
61090
- value: 'AN',
61091
- label: 'Netherlands Antilles'
61092
- }, {
61093
- value: 'NC',
61094
- label: 'New Caledonia'
61095
- }, {
61096
- value: 'NZ',
61097
- label: 'New Zealand'
61098
- }, {
61099
- value: 'NI',
61100
- label: 'Nicaragua'
61101
- }, {
61102
- value: 'NE',
61103
- label: 'Niger'
61104
- }, {
61105
- value: 'NG',
61106
- label: 'Nigeria'
61107
- }, {
61108
- value: 'NU',
61109
- label: 'Niue'
61110
- }, {
61111
- value: 'NF',
61112
- label: 'Norfolk Island'
61113
- }, {
61114
- value: 'MP',
61115
- label: 'Northern Mariana Islands'
61116
- }, {
61117
- value: 'NO',
61118
- label: 'Norway'
61119
- }, {
61120
- value: 'OM',
61121
- label: 'Oman'
61122
- }, {
61123
- value: 'PK',
61124
- label: 'Pakistan'
61125
- }, {
61126
- value: 'PW',
61127
- label: 'Palau'
61128
- }, {
61129
- value: 'PS',
61130
- label: 'Palestinian Territory, Occupied'
61131
- }, {
61132
- value: 'PA',
61133
- label: 'Panama'
61134
- }, {
61135
- value: 'PG',
61136
- label: 'Papua New Guinea'
61137
- }, {
61138
- value: 'PY',
61139
- label: 'Paraguay'
61140
- }, {
61141
- value: 'PE',
61142
- label: 'Peru'
61143
- }, {
61144
- value: 'PH',
61145
- label: 'Philippines'
61146
- }, {
61147
- value: 'PN',
61148
- label: 'Pitcairn'
61149
- }, {
61150
- value: 'PL',
61151
- label: 'Poland'
61152
- }, {
61153
- value: 'PT',
61154
- label: 'Portugal'
61155
- }, {
61156
- value: 'PR',
61157
- label: 'Puerto Rico'
61158
- }, {
61159
- value: 'QA',
61160
- label: 'Qatar'
61161
- }, {
61162
- value: 'RE',
61163
- label: 'Reunion'
61164
- }, {
61165
- value: 'RO',
61166
- label: 'Romania'
61167
- }, {
61168
- value: 'RU',
61169
- label: 'Russian Federation'
61170
- }, {
61171
- value: 'RW',
61172
- label: 'Rwanda'
61173
- }, {
61174
- value: 'SH',
61175
- label: 'Saint Helena'
61176
- }, {
61177
- value: 'KN',
61178
- label: 'Saint Kitts and Nevis'
61179
- }, {
61180
- value: 'LC',
61181
- label: 'Saint Lucia'
61182
- }, {
61183
- value: 'PM',
61184
- label: 'Saint Pierre and Miquelon'
61185
- }, {
61186
- value: 'VC',
61187
- label: 'Saint Vincent and the Grenadines'
61188
- }, {
61189
- value: 'WS',
61190
- label: 'Samoa'
61191
- }, {
61192
- value: 'SM',
61193
- label: 'San Marino'
61194
- }, {
61195
- value: 'ST',
61196
- label: 'Sao Tome and Principe'
61197
- }, {
61198
- value: 'SA',
61199
- label: 'Saudi Arabia'
61200
- }, {
61201
- value: 'SN',
61202
- label: 'Senegal'
61203
- }, {
61204
- value: 'CS',
61205
- label: 'Serbia and Montenegro'
61206
- }, {
61207
- value: 'SC',
61208
- label: 'Seychelles'
61209
- }, {
61210
- value: 'SL',
61211
- label: 'Sierra Leone'
61212
- }, {
61213
- value: 'SG',
61214
- label: 'Singapore'
61215
- }, {
61216
- value: 'SK',
61217
- label: 'Slovakia'
61218
- }, {
61219
- value: 'SI',
61220
- label: 'Slovenia'
61221
- }, {
61222
- value: 'SB',
61223
- label: 'Solomon Islands'
61224
- }, {
61225
- value: 'SO',
61226
- label: 'Somalia'
61227
- }, {
61228
- value: 'ZA',
61229
- label: 'South Africa'
61230
- }, {
61231
- value: 'GS',
61232
- label: 'South Georgia and the South Sandwich Islands'
61233
- }, {
61234
- value: 'ES',
61235
- label: 'Spain'
61236
- }, {
61237
- value: 'LK',
61238
- label: 'Sri Lanka'
61239
- }, {
61240
- value: 'SD',
61241
- label: 'Sudan'
61242
- }, {
61243
- value: 'SR',
61244
- label: 'Suriname'
61245
- }, {
61246
- value: 'SJ',
61247
- label: 'Svalbard and Jan Mayen'
61248
- }, {
61249
- value: 'SZ',
61250
- label: 'Swaziland'
61251
- }, {
61252
- value: 'SE',
61253
- label: 'Sweden'
61254
- }, {
61255
- value: 'CH',
61256
- label: 'Switzerland'
61257
- }, {
61258
- value: 'SY',
61259
- label: 'Syrian Arab Republic'
61260
- }, {
61261
- value: 'TW',
61262
- label: 'Taiwan, Province of China'
61263
- }, {
61264
- value: 'TJ',
61265
- label: 'Tajikistan'
61266
- }, {
61267
- value: 'TZ',
61268
- label: 'Tanzania, United Republic of'
61269
- }, {
61270
- value: 'TH',
61271
- label: 'Thailand'
61272
- }, {
61273
- value: 'TL',
61274
- label: 'Timor-Leste'
61275
- }, {
61276
- value: 'TG',
61277
- label: 'Togo'
61278
- }, {
61279
- value: 'TK',
61280
- label: 'Tokelau'
61281
- }, {
61282
- value: 'TO',
61283
- label: 'Tonga'
61284
- }, {
61285
- value: 'TT',
61286
- label: 'Trinidad and Tobago'
61287
- }, {
61288
- value: 'TN',
61289
- label: 'Tunisia'
61290
- }, {
61291
- value: 'TR',
61292
- label: 'Turkey'
61293
- }, {
61294
- value: 'TM',
61295
- label: 'Turkmenistan'
61296
- }, {
61297
- value: 'TC',
61298
- label: 'Turks and Caicos Islands'
61299
- }, {
61300
- value: 'TV',
61301
- label: 'Tuvalu'
61302
- }, {
61303
- value: 'UG',
61304
- label: 'Uganda'
61305
- }, {
61306
- value: 'UA',
61307
- label: 'Ukraine'
61308
- }, {
61309
- value: 'AE',
61310
- label: 'United Arab Emirates'
61311
- }, {
61312
- value: 'GB',
61313
- label: 'United Kingdom'
61314
- }, {
61315
- value: 'US',
61316
- label: 'United States'
61317
- }, {
61318
- value: 'UM',
61319
- label: 'United States Minor Outlying Islands'
61320
- }, {
61321
- value: 'UY',
61322
- label: 'Uruguay'
61323
- }, {
61324
- value: 'UZ',
61325
- label: 'Uzbekistan'
61326
- }, {
61327
- value: 'VU',
61328
- label: 'Vanuatu'
61329
- }, {
61330
- value: 'VE',
61331
- label: 'Venezuela'
61332
- }, {
61333
- value: 'VN',
61334
- label: 'Viet Nam'
61335
- }, {
61336
- value: 'VG',
61337
- label: 'Virgin Islands, British'
61338
- }, {
61339
- value: 'VI',
61340
- label: 'Virgin Islands, U.s.'
61341
- }, {
61342
- value: 'WF',
61343
- label: 'Wallis and Futuna'
61344
- }, {
61345
- value: 'EH',
61346
- label: 'Western Sahara'
61347
- }, {
61348
- value: 'YE',
61349
- label: 'Yemen'
61350
- }, {
61351
- value: 'ZM',
61352
- label: 'Zambia'
61353
- }, {
61354
- value: 'ZW',
61355
- label: 'Zimbabwe'
61356
  }]
61357
  }
61358
  };
59973
  _defineProperty(_assertThisInitialized(_this), "handleMultiIncludedLeftChange", function (option) {
59974
  var type = _this.state.multiTypeTargetOption[option.value];
59975
 
59976
+ var self = _assertThisInitialized(_this);
59977
+
59978
  if (!quads_localize_data.is_pro && (option.value === 'geo_location_country' || option.value === 'geo_location_city')) {
59979
  _this.setState({
59980
  includedMainToggle: false
60017
  });
60018
  }
60019
 
60020
+ if (option.value === 'geo_location_country') {
60021
+ var response = fetch(quads_localize_data.quads_pro_plugin_url + 'includes/admin/geo_location_country_code.json', {
60022
+ headers: {
60023
+ 'Accept': 'application/json',
60024
+ 'Content-Type': 'application/json',
60025
+ 'X-WP-Nonce': quads_localize_data.nonce
60026
+ }
60027
+ }).then(function (res) {
60028
+ return res.json();
60029
+ }).then(function (result) {
60030
+ type = result.geo_location_country;
60031
+ self.setState({
60032
+ includedTextToggle: true
60033
+ });
60034
+ self.setState({
60035
+ multiTypeLeftIncludedValue: option,
60036
+ includedDynamicOptions: type,
60037
+ multiTypeRightIncludedValue: [],
60038
+ includedRightPlaceholder: placeholder
60039
+ });
60040
+ });
60041
+ } else {
60042
+ _this.setState({
60043
+ includedTextToggle: true
60044
+ });
60045
 
60046
+ _this.setState({
60047
+ multiTypeLeftIncludedValue: option,
60048
+ includedDynamicOptions: type,
60049
+ multiTypeRightIncludedValue: [],
60050
+ includedRightPlaceholder: placeholder
60051
+ });
60052
+ }
60053
  }
60054
  });
60055
 
60660
  }, {
60661
  value: 'false',
60662
  label: 'False'
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60663
  }]
60664
  }
60665
  };
admin/assets/js/src/components/common/user-targeting/QuadsUserTargeting.jsx CHANGED
@@ -162,247 +162,7 @@ class QuadsUserTargeting extends Component {
162
  { value:'true', label: 'True'},
163
  { value:'false', label: 'False'},
164
  ],
165
- geo_location_country:[
166
- {value :'AF' , label : 'Afghanistan'},
167
- {value :'AL' , label : 'Albania'},
168
- {value :'DZ' , label : 'Algeria'},
169
- {value :'AS' , label : 'American Samoa'},
170
- {value :'AD' , label : 'Andorra'},
171
- {value :'AO' , label : 'Angola'},
172
- {value :'AI' , label : 'Anguilla'},
173
- {value :'AQ' , label : 'Antarctica'},
174
- {value :'AG' , label : 'Antigua and Barbuda'},
175
- {value :'AR' , label : 'Argentina'},
176
- {value :'AM' , label : 'Armenia'},
177
- {value :'AW' , label : 'Aruba'},
178
- {value :'AU' , label : 'Australia'},
179
- {value :'AT' , label : 'Austria'},
180
- {value :'AZ' , label : 'Azerbaijan'},
181
- {value :'BS' , label : 'Bahamas'},
182
- {value :'BH' , label : 'Bahrain'},
183
- {value :'BD' , label : 'Bangladesh'},
184
- {value :'BB' , label : 'Barbados'},
185
- {value :'BY' , label : 'Belarus'},
186
- {value :'BE' , label : 'Belgium'},
187
- {value :'BZ' , label : 'Belize'},
188
- {value :'BJ' , label : 'Benin'},
189
- {value :'BM' , label : 'Bermuda'},
190
- {value :'BT' , label : 'Bhutan'},
191
- {value :'BO' , label : 'Bolivia'},
192
- {value :'BA' , label : 'Bosnia and Herzegovina'},
193
- {value :'BW' , label : 'Botswana'},
194
- {value :'BV' , label : 'Bouvet Island'},
195
- {value :'BR' , label : 'Brazil'},
196
- {value :'IO' , label : 'British Indian Ocean Territory'},
197
- {value :'BN' , label : 'Brunei Darussalam'},
198
- {value :'BG' , label : 'Bulgaria'},
199
- {value :'BF' , label : 'Burkina Faso'},
200
- {value :'BI' , label : 'Burundi'},
201
- {value :'KH' , label : 'Cambodia'},
202
- {value :'CM' , label : 'Cameroon'},
203
- {value :'CA' , label : 'Canada'},
204
- {value :'CV' , label : 'Cape Verde'},
205
- {value :'KY' , label : 'Cayman Islands'},
206
- {value :'CF' , label : 'Central African Republic'},
207
- {value :'TD' , label : 'Chad'},
208
- {value :'CL' , label : 'Chile'},
209
- {value :'CN' , label : 'China'},
210
- {value :'CX' , label : 'Christmas Island'},
211
- {value :'CC' , label : 'Cocos (Keeling) Islands'},
212
- {value :'CO' , label : 'Colombia'},
213
- {value :'KM' , label : 'Comoros'},
214
- {value :'CG' , label : 'Congo'},
215
- {value :'CD' , label : 'Congo, the Democratic Republic of the'},
216
- {value :'CK' , label : 'Cook Islands'},
217
- {value :'CR' , label : 'Costa Rica'},
218
- {value :'CI' , label : 'Cote D\'Ivoire'},
219
- {value :'HR' , label : 'Croatia'},
220
- {value :'CU' , label : 'Cuba'},
221
- {value :'CY' , label : 'Cyprus'},
222
- {value :'CZ' , label : 'Czech Republic'},
223
- {value :'DK' , label : 'Denmark'},
224
- {value :'DJ' , label : 'Djibouti'},
225
- {value :'DM' , label : 'Dominica'},
226
- {value :'DO' , label : 'Dominican Republic'},
227
- {value :'EC' , label : 'Ecuador'},
228
- {value :'EG' , label : 'Egypt'},
229
- {value :'SV' , label : 'El Salvador'},
230
- {value :'GQ' , label : 'Equatorial Guinea'},
231
- {value :'ER' , label : 'Eritrea'},
232
- {value :'EE' , label : 'Estonia'},
233
- {value :'ET' , label : 'Ethiopia'},
234
- {value :'FK' , label : 'Falkland Islands (Malvinas)'},
235
- {value :'FO' , label : 'Faroe Islands'},
236
- {value :'FJ' , label : 'Fiji'},
237
- {value :'FI' , label : 'Finland'},
238
- {value :'FR' , label : 'France'},
239
- {value :'GF' , label : 'French Guiana'},
240
- {value :'PF' , label : 'French Polynesia'},
241
- {value :'TF' , label : 'French Southern Territories'},
242
- {value :'GA' , label : 'Gabon'},
243
- {value :'GM' , label : 'Gambia'},
244
- {value :'GE' , label : 'Georgia'},
245
- {value :'DE' , label : 'Germany'},
246
- {value :'GH' , label : 'Ghana'},
247
- {value :'GI' , label : 'Gibraltar'},
248
- {value :'GR' , label : 'Greece'},
249
- {value :'GL' , label : 'Greenland'},
250
- {value :'GD' , label : 'Grenada'},
251
- {value :'GP' , label : 'Guadeloupe'},
252
- {value :'GU' , label : 'Guam'},
253
- {value :'GT' , label : 'Guatemala'},
254
- {value :'GN' , label : 'Guinea'},
255
- {value :'GW' , label : 'Guinea-Bissau'},
256
- {value :'GY' , label : 'Guyana'},
257
- {value :'HT' , label : 'Haiti'},
258
- {value :'HM' , label : 'Heard Island and Mcdonald Islands'},
259
- {value :'VA' , label : 'Holy See (Vatican City State)'},
260
- {value :'HN' , label : 'Honduras'},
261
- {value :'HK' , label : 'Hong Kong'},
262
- {value :'HU' , label : 'Hungary'},
263
- {value :'IS' , label : 'Iceland'},
264
- {value :'IN' , label : 'India'},
265
- {value :'ID' , label : 'Indonesia'},
266
- {value :'IR' , label : 'Iran, Islamic Republic of'},
267
- {value :'IQ' , label : 'Iraq'},
268
- {value :'IE' , label : 'Ireland'},
269
- {value :'IL' , label : 'Israel'},
270
- {value :'IT' , label : 'Italy'},
271
- {value :'JM' , label : 'Jamaica'},
272
- {value :'JP' , label : 'Japan'},
273
- {value :'JO' , label : 'Jordan'},
274
- {value :'KZ' , label : 'Kazakhstan'},
275
- {value :'KE' , label : 'Kenya'},
276
- {value :'KI' , label : 'Kiribati'},
277
- {value :'KP' , label : 'Korea, Democratic People\'s Republic of'},
278
- {value :'KR' , label : 'Korea, Republic of'},
279
- {value :'KW' , label : 'Kuwait'},
280
- {value :'KG' , label : 'Kyrgyzstan'},
281
- {value :'LA' , label : 'Lao People\'s Democratic Republic'},
282
- {value :'LV' , label : 'Latvia'},
283
- {value :'LB' , label : 'Lebanon'},
284
- {value :'LS' , label : 'Lesotho'},
285
- {value :'LR' , label : 'Liberia'},
286
- {value :'LY' , label : 'Libyan Arab Jamahiriya'},
287
- {value :'LI' , label : 'Liechtenstein'},
288
- {value :'LT' , label : 'Lithuania'},
289
- {value :'LU' , label : 'Luxembourg'},
290
- {value :'MO' , label : 'Macao'},
291
- {value :'MK' , label : 'Macedonia, the Former Yugoslav Republic of'},
292
- {value :'MG' , label : 'Madagascar'},
293
- {value :'MW' , label : 'Malawi'},
294
- {value :'MY' , label : 'Malaysia'},
295
- {value :'MV' , label : 'Maldives'},
296
- {value :'ML' , label : 'Mali'},
297
- {value :'MT' , label : 'Malta'},
298
- {value :'MH' , label : 'Marshall Islands'},
299
- {value :'MQ' , label : 'Martinique'},
300
- {value :'MR' , label : 'Mauritania'},
301
- {value :'MU' , label : 'Mauritius'},
302
- {value :'YT' , label : 'Mayotte'},
303
- {value :'MX' , label : 'Mexico'},
304
- {value :'FM' , label : 'Micronesia, Federated States of'},
305
- {value :'MD' , label : 'Moldova, Republic of'},
306
- {value :'MC' , label : 'Monaco'},
307
- {value :'MN' , label : 'Mongolia'},
308
- {value :'MS' , label : 'Montserrat'},
309
- {value :'MA' , label : 'Morocco'},
310
- {value :'MZ' , label : 'Mozambique'},
311
- {value :'MM' , label : 'Myanmar'},
312
- {value :'NA' , label : 'Namibia'},
313
- {value :'NR' , label : 'Nauru'},
314
- {value :'NP' , label : 'Nepal'},
315
- {value :'NL' , label : 'Netherlands'},
316
- {value :'AN' , label : 'Netherlands Antilles'},
317
- {value :'NC' , label : 'New Caledonia'},
318
- {value :'NZ' , label : 'New Zealand'},
319
- {value :'NI' , label : 'Nicaragua'},
320
- {value :'NE' , label : 'Niger'},
321
- {value :'NG' , label : 'Nigeria'},
322
- {value :'NU' , label : 'Niue'},
323
- {value :'NF' , label : 'Norfolk Island'},
324
- {value :'MP' , label : 'Northern Mariana Islands'},
325
- {value :'NO' , label : 'Norway'},
326
- {value :'OM' , label : 'Oman'},
327
- {value :'PK' , label : 'Pakistan'},
328
- {value :'PW' , label : 'Palau'},
329
- {value :'PS' , label : 'Palestinian Territory, Occupied'},
330
- {value :'PA' , label : 'Panama'},
331
- {value :'PG' , label : 'Papua New Guinea'},
332
- {value :'PY' , label : 'Paraguay'},
333
- {value :'PE' , label : 'Peru'},
334
- {value :'PH' , label : 'Philippines'},
335
- {value :'PN' , label : 'Pitcairn'},
336
- {value :'PL' , label : 'Poland'},
337
- {value :'PT' , label : 'Portugal'},
338
- {value :'PR' , label : 'Puerto Rico'},
339
- {value :'QA' , label : 'Qatar'},
340
- {value :'RE' , label : 'Reunion'},
341
- {value :'RO' , label : 'Romania'},
342
- {value :'RU' , label : 'Russian Federation'},
343
- {value :'RW' , label : 'Rwanda'},
344
- {value :'SH' , label : 'Saint Helena'},
345
- {value :'KN' , label : 'Saint Kitts and Nevis'},
346
- {value :'LC' , label : 'Saint Lucia'},
347
- {value :'PM' , label : 'Saint Pierre and Miquelon'},
348
- {value :'VC' , label : 'Saint Vincent and the Grenadines'},
349
- {value :'WS' , label : 'Samoa'},
350
- {value :'SM' , label : 'San Marino'},
351
- {value :'ST' , label : 'Sao Tome and Principe'},
352
- {value :'SA' , label : 'Saudi Arabia'},
353
- {value :'SN' , label : 'Senegal'},
354
- {value :'CS' , label : 'Serbia and Montenegro'},
355
- {value :'SC' , label : 'Seychelles'},
356
- {value :'SL' , label : 'Sierra Leone'},
357
- {value :'SG' , label : 'Singapore'},
358
- {value :'SK' , label : 'Slovakia'},
359
- {value :'SI' , label : 'Slovenia'},
360
- {value :'SB' , label : 'Solomon Islands'},
361
- {value :'SO' , label : 'Somalia'},
362
- {value :'ZA' , label : 'South Africa'},
363
- {value :'GS' , label : 'South Georgia and the South Sandwich Islands'},
364
- {value :'ES' , label : 'Spain'},
365
- {value :'LK' , label : 'Sri Lanka'},
366
- {value :'SD' , label : 'Sudan'},
367
- {value :'SR' , label : 'Suriname'},
368
- {value :'SJ' , label : 'Svalbard and Jan Mayen'},
369
- {value :'SZ' , label : 'Swaziland'},
370
- {value :'SE' , label : 'Sweden'},
371
- {value :'CH' , label : 'Switzerland'},
372
- {value :'SY' , label : 'Syrian Arab Republic'},
373
- {value :'TW' , label : 'Taiwan, Province of China'},
374
- {value :'TJ' , label : 'Tajikistan'},
375
- {value :'TZ' , label : 'Tanzania, United Republic of'},
376
- {value :'TH' , label : 'Thailand'},
377
- {value :'TL' , label : 'Timor-Leste'},
378
- {value :'TG' , label : 'Togo'},
379
- {value :'TK' , label : 'Tokelau'},
380
- {value :'TO' , label : 'Tonga'},
381
- {value :'TT' , label : 'Trinidad and Tobago'},
382
- {value :'TN' , label : 'Tunisia'},
383
- {value :'TR' , label : 'Turkey'},
384
- {value :'TM' , label : 'Turkmenistan'},
385
- {value :'TC' , label : 'Turks and Caicos Islands'},
386
- {value :'TV' , label : 'Tuvalu'},
387
- {value :'UG' , label : 'Uganda'},
388
- {value :'UA' , label : 'Ukraine'},
389
- {value :'AE' , label : 'United Arab Emirates'},
390
- {value :'GB' , label : 'United Kingdom'},
391
- {value :'US' , label : 'United States'},
392
- {value :'UM' , label : 'United States Minor Outlying Islands'},
393
- {value :'UY' , label : 'Uruguay'},
394
- {value :'UZ' , label : 'Uzbekistan'},
395
- {value :'VU' , label : 'Vanuatu'},
396
- {value :'VE' , label : 'Venezuela'},
397
- {value :'VN' , label : 'Viet Nam'},
398
- {value :'VG' , label : 'Virgin Islands, British'},
399
- {value :'VI' , label : 'Virgin Islands, U.s.'},
400
- {value :'WF' , label : 'Wallis and Futuna'},
401
- {value :'EH' , label : 'Western Sahara'},
402
- {value :'YE' , label : 'Yemen'},
403
- {value :'ZM' , label : 'Zambia'},
404
- {value :'ZW' , label : 'Zimbabwe'}
405
- ],
406
  },
407
  };
408
  }
@@ -420,7 +180,8 @@ class QuadsUserTargeting extends Component {
420
  }
421
 
422
  handleMultiIncludedLeftChange = (option) => {
423
- let type = this.state.multiTypeTargetOption[option.value];
 
424
  if( !quads_localize_data.is_pro && (option.value==='geo_location_country' || option.value==='geo_location_city')){
425
  this.setState({includedMainToggle:false});
426
  return;
@@ -442,8 +203,27 @@ class QuadsUserTargeting extends Component {
442
  }else{
443
  this.setState({is_amp_endpoint_inc:false});
444
  }
445
- this.setState({includedTextToggle:true});
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
446
  this.setState({multiTypeLeftIncludedValue:option, includedDynamicOptions:type, multiTypeRightIncludedValue:[], includedRightPlaceholder:placeholder});
 
 
447
  }
448
 
449
  }
162
  { value:'true', label: 'True'},
163
  { value:'false', label: 'False'},
164
  ],
165
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
166
  },
167
  };
168
  }
180
  }
181
 
182
  handleMultiIncludedLeftChange = (option) => {
183
+ let type = this.state.multiTypeTargetOption[option.value];
184
+ let self =this;
185
  if( !quads_localize_data.is_pro && (option.value==='geo_location_country' || option.value==='geo_location_city')){
186
  this.setState({includedMainToggle:false});
187
  return;
203
  }else{
204
  this.setState({is_amp_endpoint_inc:false});
205
  }
206
+ if(option.value==='geo_location_country'){
207
+
208
+ const response = fetch(
209
+ quads_localize_data.quads_pro_plugin_url+'includes/admin/geo_location_country_code.json', {headers: {
210
+ 'Accept': 'application/json',
211
+ 'Content-Type': 'application/json',
212
+ 'X-WP-Nonce': quads_localize_data.nonce,
213
+ }}
214
+ ) .then(res => res.json()) .then(function(result) {
215
+
216
+ type = result.geo_location_country;
217
+
218
+ self.setState({includedTextToggle:true});
219
+ self.setState({multiTypeLeftIncludedValue:option, includedDynamicOptions:type, multiTypeRightIncludedValue:[], includedRightPlaceholder:placeholder});
220
+ });
221
+
222
+ }else{
223
+ this.setState({includedTextToggle:true});
224
  this.setState({multiTypeLeftIncludedValue:option, includedDynamicOptions:type, multiTypeRightIncludedValue:[], includedRightPlaceholder:placeholder});
225
+ }
226
+
227
  }
228
 
229
  }
includes/conditions.php CHANGED
@@ -418,37 +418,7 @@ function quads_visitor_comparison_logic_checker($visibility){
418
  $result = true;
419
  }
420
  break;
421
-
422
- case 'geo_location_country':
423
-
424
- if(!quads_is_extra()){
425
- break;
426
- }
427
- $quads_client_info = array();
428
- $quads_client_info = quads_get_ip_geolocation();
429
-
430
- if (isset($quads_client_info['countryCode']) && $quads_client_info['countryCode'] == $v_id ) {
431
- $result = true;
432
- }
433
- break;
434
- case 'geo_location_city':
435
-
436
- if(!quads_is_extra()){
437
- break;
438
- }
439
- $quads_client_info = array();
440
- $quads_client_info = quads_get_ip_geolocation();
441
- if(isset($quads_client_info['city'])){
442
- $city_cookie = str_replace(' ','',$quads_client_info['city']);
443
- $city_cookie = strtolower($city_cookie);
444
- $city = str_replace(' ','',$v_id);
445
- $city = strtolower($city);
446
- if($city_cookie == $city) {
447
- $result = true;
448
- }
449
- }
450
- break;
451
-
452
  case 'url_parameter':
453
  $url = esc_url($_SERVER['REQUEST_URI']);
454
  if ( strpos($url,$v_id) !== false ) {
@@ -514,67 +484,12 @@ function quads_visitor_comparison_logic_checker($visibility){
514
  break;
515
  }
516
 
 
 
 
517
  return $result;
518
  }
519
- function quads_get_client_ip() {
520
- $ipaddress = '';
521
- if (isset($_SERVER['HTTP_CLIENT_IP']))
522
- $ipaddress = $_SERVER['HTTP_CLIENT_IP'];
523
- else if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
524
- $ipaddress = $_SERVER['HTTP_X_FORWARDED_FOR'];
525
- else if(isset($_SERVER['HTTP_X_FORWARDED']))
526
- $ipaddress = $_SERVER['HTTP_X_FORWARDED'];
527
- else if(isset($_SERVER['HTTP_FORWARDED_FOR']))
528
- $ipaddress = $_SERVER['HTTP_FORWARDED_FOR'];
529
- else if(isset($_SERVER['HTTP_FORWARDED']))
530
- $ipaddress = $_SERVER['HTTP_FORWARDED'];
531
- else if(isset($_SERVER['REMOTE_ADDR']))
532
- $ipaddress = $_SERVER['REMOTE_ADDR'];
533
- else
534
- $ipaddress = 'UNKNOWN';
535
- return $ipaddress;
536
- }
537
- function quads_get_ip_geolocation(){
538
- if(!is_admin()){
539
- global $quads_options;
540
- $user_ip = quads_get_client_ip();
541
- $saved_ip = '';
542
- $saved_ip_list = array();
543
- $quads_client_info = array();
544
- if(isset($_COOKIE['quads_client_info'])){
545
- $saved_ip_list = json_decode(base64_decode($_COOKIE['quads_client_info']),true);
546
- $saved_ip = trim($saved_ip_list['ipaddress']);
547
- $quads_client_info['ipaddress']=$saved_ip;
548
- $quads_client_info['countryCode']=trim($saved_ip_list['countryCode']);
549
- $quads_client_info['region']=trim($saved_ip_list['region']);
550
- $quads_client_info['city']=trim($saved_ip_list['city']);
551
- }
552
- if($saved_ip != $user_ip){
553
- $quads_license_key = isset( $quads_options['quads_wp_quads_pro_license_key'] ) ? $quads_options['quads_wp_quads_pro_license_key'] : '';
554
- if(empty($quads_license_key)){
555
- return '';
556
- }
557
- $geo_location_data = wp_remote_get('https://us-central1-golden-academy-286513.cloudfunctions.net/function-1?ipaddress='.$user_ip,array(
558
- 'headers' => array( 'quads_auth' => $quads_license_key)
559
- ));
560
- if(!is_wp_error($geo_location_data) && !isset($geo_location_data['body'])){
561
 
562
- return '';
563
- }
564
- $geo_location_arr = unserialize($geo_location_data['body']);
565
- if(isset($geo_location_arr['status']) && $geo_location_arr['status'] == 'success'){
566
- $quads_client_info = array();
567
- $quads_client_info['ipaddress'] = (isset($geo_location_arr['query']))?$geo_location_arr['query'] : "";
568
- $quads_client_info['countryCode'] = (isset($geo_location_arr['countryCode']))?$geo_location_arr['countryCode'] : "";
569
- $quads_client_info['region'] = (isset($geo_location_arr['region']))?$geo_location_arr['region'] : "";
570
- $quads_client_info['city'] = (isset($geo_location_arr['city']))?$geo_location_arr['city'] : "";
571
- $quads_client_info_json = json_encode($quads_client_info);
572
- setcookie('quads_client_info', trim(base64_encode($quads_client_info_json)), time() + (86400 * 60), "/");
573
- }
574
- }
575
- return $quads_client_info;
576
- }
577
- }
578
  function quads_detect_user_agent( ){
579
  $user_agent_name ='others';
580
  if(strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') || strpos($user_agent_name, 'OPR/')) $user_agent_name = 'opera';
418
  $result = true;
419
  }
420
  break;
421
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
422
  case 'url_parameter':
423
  $url = esc_url($_SERVER['REQUEST_URI']);
424
  if ( strpos($url,$v_id) !== false ) {
484
  break;
485
  }
486
 
487
+ $result = apply_filters( 'quads_visitor_comparison_logic_checker', $visibility, $result );
488
+
489
+
490
  return $result;
491
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
492
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
493
  function quads_detect_user_agent( ){
494
  $user_agent_name ='others';
495
  if(strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') || strpos($user_agent_name, 'OPR/')) $user_agent_name = 'opera';
quick-adsense-reloaded.php CHANGED
@@ -6,7 +6,7 @@
6
  * Description: Insert Google AdSense and other ad formats fully automatic into your website
7
  * Author: WP Quads
8
  * Author URI: https://wordpress.org/plugins/quick-adsense-reloaded/
9
- * Version: 2.0.11
10
  * Text Domain: quick-adsense-reloaded
11
  * Domain Path: languages
12
  * Credits: WP QUADS - Quick AdSense Reloaded is a fork of Quick AdSense
@@ -38,7 +38,7 @@ if( !defined( 'ABSPATH' ) )
38
 
39
  // Plugin version
40
  if( !defined( 'QUADS_VERSION' ) ) {
41
- define( 'QUADS_VERSION', '2.0.11' );
42
  }
43
 
44
  // Plugin name
6
  * Description: Insert Google AdSense and other ad formats fully automatic into your website
7
  * Author: WP Quads
8
  * Author URI: https://wordpress.org/plugins/quick-adsense-reloaded/
9
+ * Version: 2.0.11.1
10
  * Text Domain: quick-adsense-reloaded
11
  * Domain Path: languages
12
  * Credits: WP QUADS - Quick AdSense Reloaded is a fork of Quick AdSense
38
 
39
  // Plugin version
40
  if( !defined( 'QUADS_VERSION' ) ) {
41
+ define( 'QUADS_VERSION', '2.0.11.1' );
42
  }
43
 
44
  // Plugin name
readme.txt CHANGED
@@ -10,7 +10,7 @@ Tags: ad manager, ads, adsense, amp, banner
10
  Requires at least: 3.6+
11
  Tested up to: 5.5
12
  Requires PHP: 5.3
13
- Stable tag: 2.0.11
14
 
15
  Ads & AdSense Ad Plugin is the quickest way to insert Google AdSense & other ads into your website. Google AdSense integration with Google AMP support.
16
 
@@ -20,6 +20,7 @@ The legendary WPQuads Ads plugin is back with the modern approach for an Ads sol
20
  WPQuads is the most feature rich & Advanced Ad Inserter & Adsense solution built for WordPress.
21
 
22
  = Features: =
 
23
  * <strong>Easy</strong> to use Modern options panel built on React JS.
24
  * Deeply <strong>integrates with AMP</strong> plugins like AMPforWP, Official AMP by Google.
25
  * <strong>Google Adsense</strong> support: It gives a deep integration with the ad types of Google Adsense like Display ads, In-feed ads, In-article ads & Auto ads. You can define fixed or responsive sizes for the ads.
@@ -106,7 +107,6 @@ WPQuads is the most feature rich & Advanced Ad Inserter & Adsense solution built
106
  We are actively developing this plugin and our aim is to make this plugin into the #1 advertisment solution in the world. You can [Request a Feature](https://wpquads.com/support/) or [Report a Bug](https://github.com/wpquads/quick-adsense-reloaded/issues). The code is hosted on [Github](https://github.com/wpquads/quick-adsense-reloaded).
107
 
108
  = Development Roadmap: =
109
- * <strong>Geo Targeting </strong>: Target the ads based on the city and countries.
110
  * <strong>Reports & Tracking </strong>: Find out which of your ads are performing the best and find out the most performing ad location.
111
  * <strong>AD Blindness </strong>: Helps you fight the Ad blindness.
112
  * <strong>AD Logging </strong>: Gives you an almost accurate data page, IP, browser, referrer, and dimensions of the user that clicked the ad and gives you reports of that data.
@@ -181,20 +181,22 @@ Alternative Installation:
181
  1. The Ads Overview Page
182
  2. Choose Ad Vendor
183
  3. How to insert an Ad?
184
- 4. Ad types in AdSense
185
- 5. Visibility & Targeting Options
186
- 6. Where do you want to insert the ad?
187
- 7. You can Insert the ad anywhere
188
- 8. Tons of options to target the ad.
189
- 9. Settings Page for WPQuads
190
  10. Widget AD
191
  11. Customer Support Happiness Stats
192
 
193
 
194
  == Changelog ==
 
 
195
 
196
  = 2.0.11 (26th August 2020) =
197
- * New: Geo Location Targetting for ads #156
198
  * New: AdsforWP Migrator #87
199
 
200
  = 2.0.10.2 (17th August 2020) =
10
  Requires at least: 3.6+
11
  Tested up to: 5.5
12
  Requires PHP: 5.3
13
+ Stable tag: 2.0.11.1
14
 
15
  Ads & AdSense Ad Plugin is the quickest way to insert Google AdSense & other ads into your website. Google AdSense integration with Google AMP support.
16
 
20
  WPQuads is the most feature rich & Advanced Ad Inserter & Adsense solution built for WordPress.
21
 
22
  = Features: =
23
+ * <strong> NEW Geo Targeting </strong>: Target the ads based on the city and countries.
24
  * <strong>Easy</strong> to use Modern options panel built on React JS.
25
  * Deeply <strong>integrates with AMP</strong> plugins like AMPforWP, Official AMP by Google.
26
  * <strong>Google Adsense</strong> support: It gives a deep integration with the ad types of Google Adsense like Display ads, In-feed ads, In-article ads & Auto ads. You can define fixed or responsive sizes for the ads.
107
  We are actively developing this plugin and our aim is to make this plugin into the #1 advertisment solution in the world. You can [Request a Feature](https://wpquads.com/support/) or [Report a Bug](https://github.com/wpquads/quick-adsense-reloaded/issues). The code is hosted on [Github](https://github.com/wpquads/quick-adsense-reloaded).
108
 
109
  = Development Roadmap: =
 
110
  * <strong>Reports & Tracking </strong>: Find out which of your ads are performing the best and find out the most performing ad location.
111
  * <strong>AD Blindness </strong>: Helps you fight the Ad blindness.
112
  * <strong>AD Logging </strong>: Gives you an almost accurate data page, IP, browser, referrer, and dimensions of the user that clicked the ad and gives you reports of that data.
181
  1. The Ads Overview Page
182
  2. Choose Ad Vendor
183
  3. How to insert an Ad?
184
+ 4. Ad types in AdSense
185
+ 5. Visibility & Targeting Options
186
+ 6. Where do you want to insert the ad?
187
+ 7. You can Insert the ad anywhere
188
+ 8. Tons of options to target the ad.
189
+ 9. Settings Page for WPQuads
190
  10. Widget AD
191
  11. Customer Support Happiness Stats
192
 
193
 
194
  == Changelog ==
195
+ = 2.0.11.1 (27th August 2020) =
196
+ * New: Geo Location improvements #156
197
 
198
  = 2.0.11 (26th August 2020) =
199
+ * New: Geo Location Targeting for ads #156
200
  * New: AdsforWP Migrator #87
201
 
202
  = 2.0.10.2 (17th August 2020) =