Changeset 2171321

Timestamp:

10/10/2019 05:01:39 PM (6 years ago)

Author:

nateinaction

Message:

Update to version 1.2.7 from TravisCI

Location:

wpengine-geoip

Files:

• tags/1.2.7 (copied) (copied from wpengine-geoip/trunk)
• tags/1.2.7/class-geoip.php (added)
• tags/1.2.7/inc/country-list.php (modified) (1 diff)
• tags/1.2.7/js/admin.js (modified) (1 diff)
• tags/1.2.7/readme.txt (modified) (5 diffs)
• tags/1.2.7/wpengine-geoip.php (modified) (2 diffs)
• trunk/class-geoip.php (added)
• trunk/inc/country-list.php (modified) (1 diff)
• trunk/js/admin.js (modified) (1 diff)
• trunk/readme.txt (modified) (5 diffs)
• trunk/wpengine-geoip.php (modified) (2 diffs)

wpengine-geoip/tags/1.2.7/inc/country-list.php

@@ -13 +13 @@
     $countries = array(
         'AF' => array(
-            'country' => 'Afghanistan',
+            'country'   => 'Afghanistan',
             'continent' => 'AS',
         ),
         'AX' => array(
-            'country' => 'Åland Islands',
+            'country'   => 'Åland Islands',
             'continent' => 'EU',
         ),
         'AL' => array(
-            'country' => 'Albania',
+            'country'   => 'Albania',
             'continent' => 'EU',
         ),
         'DZ' => array(
-            'country' => 'Algeria',
+            'country'   => 'Algeria',
             'continent' => 'AF',
         ),
         'AS' => array(
-            'country' => 'American Samoa',
+            'country'   => 'American Samoa',
             'continent' => 'OC',
         ),
         'AD' => array(
-            'country' => 'Andorra',
+            'country'   => 'Andorra',
             'continent' => 'EU',
         ),
         'AO' => array(
-            'country' => 'Angola',
+            'country'   => 'Angola',
             'continent' => 'AF',
         ),
         'AI' => array(
-            'country' => 'Anguilla',
+            'country'   => 'Anguilla',
             'continent' => 'NA',
         ),
         'AQ' => array(
-            'country' => 'AN',
+            'country'   => 'AN',
             'continent' => 'AN',
         ),
         'AG' => array(
-            'country' => 'Antigua and Barbuda',
+            'country'   => 'Antigua and Barbuda',
             'continent' => 'NA',
         ),
         'AR' => array(
-            'country' => 'Argentina',
+            'country'   => 'Argentina',
             'continent' => 'SA',
         ),
         'AM' => array(
-            'country' => 'Armenia',
+            'country'   => 'Armenia',
             'continent' => 'AS',
         ),
         'AW' => array(
-            'country' => 'Aruba',
+            'country'   => 'Aruba',
             'continent' => 'NA',
         ),
         'AU' => array(
-            'country' => 'Australia',
+            'country'   => 'Australia',
             'continent' => 'OC',
         ),
         'AT' => array(
-            'country' => 'Austria',
+            'country'   => 'Austria',
             'continent' => 'EU',
         ),
         'AZ' => array(
-            'country' => 'Azerbaijan',
+            'country'   => 'Azerbaijan',
             'continent' => 'AS',
         ),
         'BS' => array(
-            'country' => 'Bahamas',
+            'country'   => 'Bahamas',
             'continent' => 'NA',
         ),
         'BH' => array(
-            'country' => 'Bahrain',
+            'country'   => 'Bahrain',
             'continent' => 'AS',
         ),
         'BD' => array(
-            'country' => 'Bangladesh',
+            'country'   => 'Bangladesh',
             'continent' => 'AS',
         ),
         'BB' => array(
-            'country' => 'Barbados',
+            'country'   => 'Barbados',
             'continent' => 'NA',
         ),
         'BY' => array(
-            'country' => 'Belarus',
+            'country'   => 'Belarus',
             'continent' => 'EU',
         ),
         'BE' => array(
-            'country' => 'Belgium',
+            'country'   => 'Belgium',
             'continent' => 'EU',
         ),
         'BZ' => array(
-            'country' => 'Belize',
+            'country'   => 'Belize',
             'continent' => 'NA',
         ),
         'BJ' => array(
-            'country' => 'Benin',
+            'country'   => 'Benin',
             'continent' => 'AF',
         ),
         'BM' => array(
-            'country' => 'Bermuda',
+            'country'   => 'Bermuda',
             'continent' => 'NA',
         ),
         'BT' => array(
-            'country' => 'Bhutan',
+            'country'   => 'Bhutan',
             'continent' => 'AS',
         ),
         'BO' => array(
-            'country' => 'Bolivia',
+            'country'   => 'Bolivia',
             'continent' => 'SA',
         ),
         'BA' => array(
-            'country' => 'Bosnia and Herzegovina',
+            'country'   => 'Bosnia and Herzegovina',
             'continent' => 'EU',
         ),
         'BW' => array(
-            'country' => 'Botswana',
+            'country'   => 'Botswana',
             'continent' => 'AF',
         ),
         'BV' => array(
-            'country' => 'Bouvet Island',
+            'country'   => 'Bouvet Island',
             'continent' => 'AN',
         ),
         'BR' => array(
-            'country' => 'Brazil',
+            'country'   => 'Brazil',
             'continent' => 'SA',
         ),
         'IO' => array(
-            'country' => 'British Indian Ocean Territory',
+            'country'   => 'British Indian Ocean Territory',
             'continent' => 'AS',
         ),
         'BN' => array(
-            'country' => 'Brunei Darussalam',
+            'country'   => 'Brunei Darussalam',
             'continent' => 'AS',
         ),
         'BG' => array(
-            'country' => 'Bulgaria',
+            'country'   => 'Bulgaria',
             'continent' => 'EU',
         ),
         'BF' => array(
-            'country' => 'Burkina Faso',
+            'country'   => 'Burkina Faso',
             'continent' => 'AF',
         ),
         'BI' => array(
-            'country' => 'Burundi',
+            'country'   => 'Burundi',
             'continent' => 'AF',
         ),
         'KH' => array(
-            'country' => 'Cambodia',
+            'country'   => 'Cambodia',
             'continent' => 'AS',
         ),
         'CM' => array(
-            'country' => 'Cameroon',
+            'country'   => 'Cameroon',
             'continent' => 'AF',
         ),
         'CA' => array(
-            'country' => 'Canada',
+            'country'   => 'Canada',
             'continent' => 'NA',
         ),
         'CV' => array(
-            'country' => 'Cape Verde',
+            'country'   => 'Cape Verde',
             'continent' => 'AF',
         ),
         'KY' => array(
-            'country' => 'Cayman Islands',
+            'country'   => 'Cayman Islands',
             'continent' => 'NA',
         ),
         'CF' => array(
-            'country' => 'Central African Republic',
+            'country'   => 'Central African Republic',
             'continent' => 'AF',
         ),
         'TD' => array(
-            'country' => 'Chad',
+            'country'   => 'Chad',
             'continent' => 'AF',
         ),
         'CL' => array(
-            'country' => 'Chile',
+            'country'   => 'Chile',
             'continent' => 'SA',
         ),
         'CN' => array(
-            'country' => 'China',
+            'country'   => 'China',
             'continent' => 'AS',
         ),
         'CX' => array(
-            'country' => 'Christmas Island',
+            'country'   => 'Christmas Island',
             'continent' => 'AS',
         ),
         'CC' => array(
-            'country' => 'Cocos (Keeling) Islands',
+            'country'   => 'Cocos (Keeling) Islands',
             'continent' => 'AS',
         ),
         'CO' => array(
-            'country' => 'Colombia',
+            'country'   => 'Colombia',
             'continent' => 'SA',
         ),
         'KM' => array(
-            'country' => 'Comoros',
+            'country'   => 'Comoros',
             'continent' => 'AF',
         ),
         'CG' => array(
-            'country' => 'Congo',
+            'country'   => 'Congo',
             'continent' => 'AF',
         ),
         'CD' => array(
-            'country' => 'The Democratic Republic of The Congo',
+            'country'   => 'The Democratic Republic of The Congo',
             'continent' => 'AF',
         ),
         'CK' => array(
-            'country' => 'Cook Islands',
+            'country'   => 'Cook Islands',
             'continent' => 'OC',
         ),
         'CR' => array(
-            'country' => 'Costa Rica',
+            'country'   => 'Costa Rica',
             'continent' => 'NA',
         ),
         'CI' => array(
-            'country' => 'Cote D\'ivoire',
+            'country'   => 'Cote D\'ivoire',
             'continent' => 'AF',
         ),
         'HR' => array(
-            'country' => 'Croatia',
+            'country'   => 'Croatia',
             'continent' => 'EU',
         ),
         'CU' => array(
-            'country' => 'Cuba',
+            'country'   => 'Cuba',
             'continent' => 'NA',
         ),
         'CY' => array(
-            'country' => 'Cyprus',
+            'country'   => 'Cyprus',
             'continent' => 'AS',
         ),
         'CZ' => array(
-            'country' => 'Czech Republic',
+            'country'   => 'Czech Republic',
             'continent' => 'EU',
         ),
         'DK' => array(
-            'country' => 'Denmark',
+            'country'   => 'Denmark',
             'continent' => 'EU',
         ),
         'DJ' => array(
-            'country' => 'Djibouti',
+            'country'   => 'Djibouti',
             'continent' => 'AF',
         ),
         'DM' => array(
-            'country' => 'Dominica',
+            'country'   => 'Dominica',
             'continent' => 'NA',
         ),
         'DO' => array(
-            'country' => 'Dominican Republic',
+            'country'   => 'Dominican Republic',
             'continent' => 'NA',
         ),
         'EC' => array(
-            'country' => 'Ecuador',
+            'country'   => 'Ecuador',
             'continent' => 'SA',
         ),
         'EG' => array(
-            'country' => 'Egypt',
+            'country'   => 'Egypt',
             'continent' => 'AF',
         ),
         'SV' => array(
-            'country' => 'El Salvador',
+            'country'   => 'El Salvador',
             'continent' => 'NA',
         ),
         'GQ' => array(
-            'country' => 'Equatorial Guinea',
+            'country'   => 'Equatorial Guinea',
             'continent' => 'AF',
         ),
         'ER' => array(
-            'country' => 'Eritrea',
+            'country'   => 'Eritrea',
             'continent' => 'AF',
         ),
         'EE' => array(
-            'country' => 'Estonia',
+            'country'   => 'Estonia',
             'continent' => 'EU',
         ),
         'ET' => array(
-            'country' => 'Ethiopia',
+            'country'   => 'Ethiopia',
             'continent' => 'AF',
         ),
         'FK' => array(
-            'country' => 'Falkland Islands (Malvinas)',
+            'country'   => 'Falkland Islands (Malvinas)',
             'continent' => 'SA',
         ),
         'FO' => array(
-            'country' => 'Faroe Islands',
+            'country'   => 'Faroe Islands',
             'continent' => 'EU',
         ),
         'FJ' => array(
-            'country' => 'Fiji',
+            'country'   => 'Fiji',
             'continent' => 'OC',
         ),
         'FI' => array(
-            'country' => 'Finland',
+            'country'   => 'Finland',
             'continent' => 'EU',
         ),
         'FR' => array(
-            'country' => 'France',
+            'country'   => 'France',
             'continent' => 'EU',
         ),
         'GF' => array(
-            'country' => 'French Guiana',
+            'country'   => 'French Guiana',
             'continent' => 'SA',
         ),
         'PF' => array(
-            'country' => 'French Polynesia',
+            'country'   => 'French Polynesia',
             'continent' => 'OC',
         ),
         'TF' => array(
-            'country' => 'French Southern Territories',
+            'country'   => 'French Southern Territories',
             'continent' => 'AN',
         ),
         'GA' => array(
-            'country' => 'Gabon',
+            'country'   => 'Gabon',
             'continent' => 'AF',
         ),
         'GM' => array(
-            'country' => 'Gambia',
+            'country'   => 'Gambia',
             'continent' => 'AF',
         ),
         'GE' => array(
-            'country' => 'Georgia',
+            'country'   => 'Georgia',
             'continent' => 'AS',
         ),
         'DE' => array(
-            'country' => 'Germany',
+            'country'   => 'Germany',
             'continent' => 'EU',
         ),
         'GH' => array(
-            'country' => 'Ghana',
+            'country'   => 'Ghana',
             'continent' => 'AF',
         ),
         'GI' => array(
-            'country' => 'Gibraltar',
+            'country'   => 'Gibraltar',
             'continent' => 'EU',
         ),
         'GR' => array(
-            'country' => 'Greece',
+            'country'   => 'Greece',
             'continent' => 'EU',
         ),
         'GL' => array(
-            'country' => 'Greenland',
+            'country'   => 'Greenland',
             'continent' => 'NA',
         ),
         'GD' => array(
-            'country' => 'Grenada',
+            'country'   => 'Grenada',
             'continent' => 'NA',
         ),
         'GP' => array(
-            'country' => 'Guadeloupe',
+            'country'   => 'Guadeloupe',
             'continent' => 'NA',
         ),
         'GU' => array(
-            'country' => 'Guam',
+            'country'   => 'Guam',
             'continent' => 'OC',
         ),
         'GT' => array(
-            'country' => 'Guatemala',
+            'country'   => 'Guatemala',
             'continent' => 'NA',
         ),
         'GG' => array(
-            'country' => 'Guernsey',
+            'country'   => 'Guernsey',
             'continent' => 'EU',
         ),
         'GN' => array(
-            'country' => 'Guinea',
+            'country'   => 'Guinea',
             'continent' => 'AF',
         ),
         'GW' => array(
-            'country' => 'Guinea-bissau',
+            'country'   => 'Guinea-bissau',
             'continent' => 'AF',
         ),
         'GY' => array(
-            'country' => 'Guyana',
+            'country'   => 'Guyana',
             'continent' => 'SA',
         ),
         'HT' => array(
-            'country' => 'Haiti',
+            'country'   => 'Haiti',
             'continent' => 'NA',
         ),
         'HM' => array(
-            'country' => 'Heard Island and Mcdonald Islands',
+            'country'   => 'Heard Island and Mcdonald Islands',
             'continent' => 'AN',
         ),
         'VA' => array(
-            'country' => 'Holy See (Vatican City State)',
+            'country'   => 'Holy See (Vatican City State)',
             'continent' => 'EU',
         ),
         'HN' => array(
-            'country' => 'Honduras',
+            'country'   => 'Honduras',
             'continent' => 'NA',
         ),
         'HK' => array(
-            'country' => 'Hong Kong',
+            'country'   => 'Hong Kong',
             'continent' => 'AS',
         ),
         'HU' => array(
-            'country' => 'Hungary',
+            'country'   => 'Hungary',
             'continent' => 'EU',
         ),
         'IS' => array(
-            'country' => 'Iceland',
+            'country'   => 'Iceland',
             'continent' => 'EU',
         ),
         'IN' => array(
-            'country' => 'India',
+            'country'   => 'India',
             'continent' => 'AS',
         ),
         'ID' => array(
-            'country' => 'Indonesia',
+            'country'   => 'Indonesia',
             'continent' => 'AS',
         ),
         'IR' => array(
-            'country' => 'Iran',
+            'country'   => 'Iran',
             'continent' => 'AS',
         ),
         'IQ' => array(
-            'country' => 'Iraq',
+            'country'   => 'Iraq',
             'continent' => 'AS',
         ),
         'IE' => array(
-            'country' => 'Ireland',
+            'country'   => 'Ireland',
             'continent' => 'EU',
         ),
         'IM' => array(
-            'country' => 'Isle of Man',
+            'country'   => 'Isle of Man',
             'continent' => 'EU',
         ),
         'IL' => array(
-            'country' => 'Israel',
+            'country'   => 'Israel',
             'continent' => 'AS',
         ),
         'IT' => array(
-            'country' => 'Italy',
+            'country'   => 'Italy',
             'continent' => 'EU',
         ),
         'JM' => array(
-            'country' => 'Jamaica',
+            'country'   => 'Jamaica',
             'continent' => 'NA',
         ),
         'JP' => array(
-            'country' => 'Japan',
+            'country'   => 'Japan',
             'continent' => 'AS',
         ),
         'JE' => array(
-            'country' => 'Jersey',
+            'country'   => 'Jersey',
             'continent' => 'EU',
         ),
         'JO' => array(
-            'country' => 'Jordan',
+            'country'   => 'Jordan',
             'continent' => 'AS',
         ),
         'KZ' => array(
-            'country' => 'Kazakhstan',
+            'country'   => 'Kazakhstan',
             'continent' => 'AS',
         ),
         'KE' => array(
-            'country' => 'Kenya',
+            'country'   => 'Kenya',
             'continent' => 'AF',
         ),
         'KI' => array(
-            'country' => 'Kiribati',
+            'country'   => 'Kiribati',
             'continent' => 'OC',
         ),
         'KP' => array(
-            'country' => 'Democratic People\'s Republic of Korea',
+            'country'   => 'Democratic People\'s Republic of Korea',
             'continent' => 'AS',
         ),
         'KR' => array(
-            'country' => 'Republic of Korea',
+            'country'   => 'Republic of Korea',
             'continent' => 'AS',
         ),
         'KW' => array(
-            'country' => 'Kuwait',
+            'country'   => 'Kuwait',
             'continent' => 'AS',
         ),
         'KG' => array(
-            'country' => 'Kyrgyzstan',
+            'country'   => 'Kyrgyzstan',
             'continent' => 'AS',
         ),
         'LA' => array(
-            'country' => 'Lao People\'s Democratic Republic',
+            'country'   => 'Lao People\'s Democratic Republic',
             'continent' => 'AS',
         ),
         'LV' => array(
-            'country' => 'Latvia',
+            'country'   => 'Latvia',
             'continent' => 'EU',
         ),
         'LB' => array(
-            'country' => 'Lebanon',
+            'country'   => 'Lebanon',
             'continent' => 'AS',
         ),
         'LS' => array(
-            'country' => 'Lesotho',
+            'country'   => 'Lesotho',
             'continent' => 'AF',
         ),
         'LR' => array(
-            'country' => 'Liberia',
+            'country'   => 'Liberia',
             'continent' => 'AF',
         ),
         'LY' => array(
-            'country' => 'Libya',
+            'country'   => 'Libya',
             'continent' => 'AF',
         ),
         'LI' => array(
-            'country' => 'Liechtenstein',
+            'country'   => 'Liechtenstein',
             'continent' => 'EU',
         ),
         'LT' => array(
-            'country' => 'Lithuania',
+            'country'   => 'Lithuania',
             'continent' => 'EU',
         ),
         'LU' => array(
-            'country' => 'Luxembourg',
+            'country'   => 'Luxembourg',
             'continent' => 'EU',
         ),
         'MO' => array(
-            'country' => 'Macao',
+            'country'   => 'Macao',
             'continent' => 'AS',
         ),
         'MK' => array(
-            'country' => 'Macedonia',
+            'country'   => 'Macedonia',
             'continent' => 'EU',
         ),
         'MG' => array(
-            'country' => 'Madagascar',
+            'country'   => 'Madagascar',
             'continent' => 'AF',
         ),
         'MW' => array(
-            'country' => 'Malawi',
+            'country'   => 'Malawi',
             'continent' => 'AF',
         ),
         'MY' => array(
-            'country' => 'Malaysia',
+            'country'   => 'Malaysia',
             'continent' => 'AS',
         ),
         'MV' => array(
-            'country' => 'Maldives',
+            'country'   => 'Maldives',
             'continent' => 'AS',
         ),
         'ML' => array(
-            'country' => 'Mali',
+            'country'   => 'Mali',
             'continent' => 'AF',
         ),
         'MT' => array(
-            'country' => 'Malta',
+            'country'   => 'Malta',
             'continent' => 'EU',
         ),
         'MH' => array(
-            'country' => 'Marshall Islands',
+            'country'   => 'Marshall Islands',
             'continent' => 'OC',
         ),
         'MQ' => array(
-            'country' => 'Martinique',
+            'country'   => 'Martinique',
             'continent' => 'NA',
         ),
         'MR' => array(
-            'country' => 'Mauritania',
+            'country'   => 'Mauritania',
             'continent' => 'AF',
         ),
         'MU' => array(
-            'country' => 'Mauritius',
+            'country'   => 'Mauritius',
             'continent' => 'AF',
         ),
         'YT' => array(
-            'country' => 'Mayotte',
+            'country'   => 'Mayotte',
             'continent' => 'AF',
         ),
         'MX' => array(
-            'country' => 'Mexico',
+            'country'   => 'Mexico',
             'continent' => 'NA',
         ),
         'FM' => array(
-            'country' => 'Micronesia',
+            'country'   => 'Micronesia',
             'continent' => 'OC',
         ),
         'MD' => array(
-            'country' => 'Moldova',
+            'country'   => 'Moldova',
             'continent' => 'EU',
         ),
         'MC' => array(
-            'country' => 'Monaco',
+            'country'   => 'Monaco',
             'continent' => 'EU',
         ),
         'MN' => array(
-            'country' => 'Mongolia',
+            'country'   => 'Mongolia',
             'continent' => 'AS',
         ),
         'ME' => array(
-            'country' => 'Montenegro',
+            'country'   => 'Montenegro',
             'continent' => 'EU',
         ),
         'MS' => array(
-            'country' => 'Montserrat',
+            'country'   => 'Montserrat',
             'continent' => 'NA',
         ),
         'MA' => array(
-            'country' => 'Morocco',
+            'country'   => 'Morocco',
             'continent' => 'AF',
         ),
         'MZ' => array(
-            'country' => 'Mozambique',
+            'country'   => 'Mozambique',
             'continent' => 'AF',
         ),
         'MM' => array(
-            'country' => 'Myanmar',
+            'country'   => 'Myanmar',
             'continent' => 'AS',
         ),
         'NA' => array(
-            'country' => 'Namibia',
+            'country'   => 'Namibia',
             'continent' => 'AF',
         ),
         'NR' => array(
-            'country' => 'Nauru',
+            'country'   => 'Nauru',
             'continent' => 'OC',
         ),
         'NP' => array(
-            'country' => 'Nepal',
+            'country'   => 'Nepal',
             'continent' => 'AS',
         ),
         'NL' => array(
-            'country' => 'Netherlands',
+            'country'   => 'Netherlands',
             'continent' => 'EU',
         ),
         'AN' => array(
-            'country' => 'Netherlands Antilles',
+            'country'   => 'Netherlands Antilles',
             'continent' => 'NA',
         ),
         'NC' => array(
-            'country' => 'New Caledonia',
+            'country'   => 'New Caledonia',
             'continent' => 'OC',
         ),
         'NZ' => array(
-            'country' => 'New Zealand',
+            'country'   => 'New Zealand',
             'continent' => 'OC',
         ),
         'NI' => array(
-            'country' => 'Nicaragua',
+            'country'   => 'Nicaragua',
             'continent' => 'NA',
         ),
         'NE' => array(
-            'country' => 'Niger',
+            'country'   => 'Niger',
             'continent' => 'AF',
         ),
         'NG' => array(
-            'country' => 'Nigeria',
+            'country'   => 'Nigeria',
             'continent' => 'AF',
         ),
         'NU' => array(
-            'country' => 'Niue',
+            'country'   => 'Niue',
             'continent' => 'OC',
         ),
         'NF' => array(
-            'country' => 'Norfolk Island',
+            'country'   => 'Norfolk Island',
             'continent' => 'OC',
         ),
         'MP' => array(
-            'country' => 'Northern Mariana Islands',
+            'country'   => 'Northern Mariana Islands',
             'continent' => 'OC',
         ),
         'NO' => array(
-            'country' => 'Norway',
+            'country'   => 'Norway',
             'continent' => 'EU',
         ),
         'OM' => array(
-            'country' => 'Oman',
+            'country'   => 'Oman',
             'continent' => 'AS',
         ),
         'PK' => array(
-            'country' => 'Pakistan',
+            'country'   => 'Pakistan',
             'continent' => 'AS',
         ),
         'PW' => array(
-            'country' => 'Palau',
+            'country'   => 'Palau',
             'continent' => 'OC',
         ),
         'PS' => array(
-            'country' => 'Palestinia',
+            'country'   => 'Palestinia',
             'continent' => 'AS',
         ),
         'PA' => array(
-            'country' => 'Panama',
+            'country'   => 'Panama',
             'continent' => 'NA',
         ),
         'PG' => array(
-            'country' => 'Papua New Guinea',
+            'country'   => 'Papua New Guinea',
             'continent' => 'OC',
         ),
         'PY' => array(
-            'country' => 'Paraguay',
+            'country'   => 'Paraguay',
             'continent' => 'SA',
         ),
         'PE' => array(
-            'country' => 'Peru',
+            'country'   => 'Peru',
             'continent' => 'SA',
         ),
         'PH' => array(
-            'country' => 'Philippines',
+            'country'   => 'Philippines',
             'continent' => 'AS',
         ),
         'PN' => array(
-            'country' => 'Pitcairn',
+            'country'   => 'Pitcairn',
             'continent' => 'OC',
         ),
         'PL' => array(
-            'country' => 'Poland',
+            'country'   => 'Poland',
             'continent' => 'EU',
         ),
         'PT' => array(
-            'country' => 'Portugal',
+            'country'   => 'Portugal',
             'continent' => 'EU',
         ),
         'PR' => array(
-            'country' => 'Puerto Rico',
+            'country'   => 'Puerto Rico',
             'continent' => 'NA',
         ),
         'QA' => array(
-            'country' => 'Qatar',
+            'country'   => 'Qatar',
             'continent' => 'AS',
         ),
         'RE' => array(
-            'country' => 'Reunion',
+            'country'   => 'Reunion',
             'continent' => 'AF',
         ),
         'RO' => array(
-            'country' => 'Romania',
+            'country'   => 'Romania',
             'continent' => 'EU',
         ),
         'RU' => array(
-            'country' => 'Russian Federation',
+            'country'   => 'Russian Federation',
             'continent' => 'EU',
         ),
         'RW' => array(
-            'country' => 'Rwanda',
+            'country'   => 'Rwanda',
             'continent' => 'AF',
         ),
         'SH' => array(
-            'country' => 'Saint Helena',
+            'country'   => 'Saint Helena',
             'continent' => 'AF',
         ),
         'KN' => array(
-            'country' => 'Saint Kitts and Nevis',
+            'country'   => 'Saint Kitts and Nevis',
             'continent' => 'NA',
         ),
         'LC' => array(
-            'country' => 'Saint Lucia',
+            'country'   => 'Saint Lucia',
             'continent' => 'NA',
         ),
         'PM' => array(
-            'country' => 'Saint Pierre and Miquelon',
+            'country'   => 'Saint Pierre and Miquelon',
             'continent' => 'NA',
         ),
         'VC' => array(
-            'country' => 'Saint Vincent and The Grenadines',
+            'country'   => 'Saint Vincent and The Grenadines',
             'continent' => 'NA',
         ),
         'WS' => array(
-            'country' => 'Samoa',
+            'country'   => 'Samoa',
             'continent' => 'OC',
         ),
         'SM' => array(
-            'country' => 'San Marino',
+            'country'   => 'San Marino',
             'continent' => 'EU',
         ),
         'ST' => array(
-            'country' => 'Sao Tome and Principe',
+            'country'   => 'Sao Tome and Principe',
             'continent' => 'AF',
         ),
         'SA' => array(
-            'country' => 'Saudi Arabia',
+            'country'   => 'Saudi Arabia',
             'continent' => 'AS',
         ),
         'SN' => array(
-            'country' => 'Senegal',
+            'country'   => 'Senegal',
             'continent' => 'AF',
         ),
         'RS' => array(
-            'country' => 'Serbia',
+            'country'   => 'Serbia',
             'continent' => 'EU',
         ),
         'SC' => array(
-            'country' => 'Seychelles',
+            'country'   => 'Seychelles',
             'continent' => 'AF',
         ),
         'SL' => array(
-            'country' => 'Sierra Leone',
+            'country'   => 'Sierra Leone',
             'continent' => 'AF',
         ),
         'SG' => array(
-            'country' => 'Singapore',
+            'country'   => 'Singapore',
             'continent' => 'AS',
         ),
         'SK' => array(
-            'country' => 'Slovakia',
+            'country'   => 'Slovakia',
             'continent' => 'EU',
         ),
         'SI' => array(
-            'country' => 'Slovenia',
+            'country'   => 'Slovenia',
             'continent' => 'EU',
         ),
         'SB' => array(
-            'country' => 'Solomon Islands',
+            'country'   => 'Solomon Islands',
             'continent' => 'OC',
         ),
         'SO' => array(
-            'country' => 'Somalia',
+            'country'   => 'Somalia',
             'continent' => 'AF',
         ),
         'ZA' => array(
-            'country' => 'South Africa',
+            'country'   => 'South Africa',
             'continent' => 'AF',
         ),
         'GS' => array(
-            'country' => 'South Georgia and The South Sandwich Islands',
+            'country'   => 'South Georgia and The South Sandwich Islands',
             'continent' => 'AN',
         ),
         'ES' => array(
-            'country' => 'Spain',
+            'country'   => 'Spain',
             'continent' => 'EU',
         ),
         'LK' => array(
-            'country' => 'Sri Lanka',
+            'country'   => 'Sri Lanka',
             'continent' => 'AS',
         ),
         'SD' => array(
-            'country' => 'Sudan',
+            'country'   => 'Sudan',
             'continent' => 'AF',
         ),
         'SR' => array(
-            'country' => 'Suriname',
+            'country'   => 'Suriname',
             'continent' => 'SA',
         ),
         'SJ' => array(
-            'country' => 'Svalbard and Jan Mayen',
+            'country'   => 'Svalbard and Jan Mayen',
             'continent' => 'EU',
         ),
         'SZ' => array(
-            'country' => 'Swaziland',
+            'country'   => 'Swaziland',
             'continent' => 'AF',
         ),
         'SE' => array(
-            'country' => 'Sweden',
+            'country'   => 'Sweden',
             'continent' => 'EU',
         ),
         'CH' => array(
-            'country' => 'Switzerland',
+            'country'   => 'Switzerland',
             'continent' => 'EU',
         ),
         'SY' => array(
-            'country' => 'Syrian Arab Republic',
+            'country'   => 'Syrian Arab Republic',
             'continent' => 'AS',
         ),
         'TW' => array(
-            'country' => 'Taiwan, Province of China',
+            'country'   => 'Taiwan, Province of China',
             'continent' => 'AS',
         ),
         'TJ' => array(
-            'country' => 'Tajikistan',
+            'country'   => 'Tajikistan',
             'continent' => 'AS',
         ),
         'TZ' => array(
-            'country' => 'Tanzania, United Republic of',
+            'country'   => 'Tanzania, United Republic of',
             'continent' => 'AF',
         ),
         'TH' => array(
-            'country' => 'Thailand',
+            'country'   => 'Thailand',
             'continent' => 'AS',
         ),
         'TL' => array(
-            'country' => 'Timor-leste',
+            'country'   => 'Timor-leste',
             'continent' => 'AS',
         ),
         'TG' => array(
-            'country' => 'Togo',
+            'country'   => 'Togo',
             'continent' => 'AF',
         ),
         'TK' => array(
-            'country' => 'Tokelau',
+            'country'   => 'Tokelau',
             'continent' => 'OC',
         ),
         'TO' => array(
-            'country' => 'Tonga',
+            'country'   => 'Tonga',
             'continent' => 'OC',
         ),
         'TT' => array(
-            'country' => 'Trinidad and Tobago',
+            'country'   => 'Trinidad and Tobago',
             'continent' => 'NA',
         ),
         'TN' => array(
-            'country' => 'Tunisia',
+            'country'   => 'Tunisia',
             'continent' => 'AF',
         ),
         'TR' => array(
-            'country' => 'Turkey',
+            'country'   => 'Turkey',
             'continent' => 'AS',
         ),
         'TM' => array(
-            'country' => 'Turkmenistan',
+            'country'   => 'Turkmenistan',
             'continent' => 'AS',
         ),
         'TC' => array(
-            'country' => 'Turks and Caicos Islands',
+            'country'   => 'Turks and Caicos Islands',
             'continent' => 'NA',
         ),
         'TV' => array(
-            'country' => 'Tuvalu',
+            'country'   => 'Tuvalu',
             'continent' => 'OC',
         ),
         'UG' => array(
-            'country' => 'Uganda',
+            'country'   => 'Uganda',
             'continent' => 'AF',
         ),
         'UA' => array(
-            'country' => 'Ukraine',
+            'country'   => 'Ukraine',
             'continent' => 'EU',
         ),
         'AE' => array(
-            'country' => 'United Arab Emirates',
+            'country'   => 'United Arab Emirates',
             'continent' => 'AS',
         ),
         'GB' => array(
-            'country' => 'United Kingdom',
+            'country'   => 'United Kingdom',
             'continent' => 'EU',
         ),
         'US' => array(
-            'country' => 'United States',
+            'country'   => 'United States',
             'continent' => 'NA',
         ),
         'UM' => array(
-            'country' => 'United States Minor Outlying Islands',
+            'country'   => 'United States Minor Outlying Islands',
             'continent' => 'OC',
         ),
         'UY' => array(
-            'country' => 'Uruguay',
+            'country'   => 'Uruguay',
             'continent' => 'SA',
         ),
         'UZ' => array(
-            'country' => 'Uzbekistan',
+            'country'   => 'Uzbekistan',
             'continent' => 'AS',
         ),
         'VU' => array(
-            'country' => 'Vanuatu',
+            'country'   => 'Vanuatu',
             'continent' => 'OC',
         ),
         'VE' => array(
-            'country' => 'Venezuela',
+            'country'   => 'Venezuela',
             'continent' => 'SA',
         ),
         'VN' => array(
-            'country' => 'Viet Nam',
+            'country'   => 'Viet Nam',
             'continent' => 'AS',
         ),
         'VG' => array(
-            'country' => 'Virgin Islands, British',
+            'country'   => 'Virgin Islands, British',
             'continent' => 'NA',
         ),
         'VI' => array(
-            'country' => 'Virgin Islands, U.S.',
+            'country'   => 'Virgin Islands, U.S.',
             'continent' => 'NA',
         ),
         'WF' => array(
-            'country' => 'Wallis and Futuna',
+            'country'   => 'Wallis and Futuna',
             'continent' => 'OC',
         ),
         'EH' => array(
-            'country' => 'Western Sahara',
+            'country'   => 'Western Sahara',
             'continent' => 'AF',
         ),
         'YE' => array(
-            'country' => 'Yemen',
+            'country'   => 'Yemen',
             'continent' => 'AS',
         ),
         'ZM' => array(
-            'country' => 'Zambia',
+            'country'   => 'Zambia',
             'continent' => 'AF',
         ),
         'ZW' => array(
-            'country' => 'Zimbabwe',
+            'country'   => 'Zimbabwe',
             'continent' => 'AF',
         ),

wpengine-geoip/tags/1.2.7/js/admin.js

@@ -1 @@
-document.getElementById( 'wpbody' ).addEventListener( 'click', function ( event ) {
-    // If this wasn't a click on a notice-dismiss close button, then abort
-    if ( 'notice-dismiss' !== event.target.className ) {
-        return;
-    }
+/**
+ * This JS file sends an ajax request on admin notification close.
+ *
+ * @package wpengine-geoip
+ */
 
-    // This should be our parent div for the notice
-    var parent = event.path[ 1 ] || null;
+document.getElementById( 'wpbody' ).addEventListener(
+    'click',
+    function ( event ) {
+        // If this wasn't a click on a notice-dismiss close button, then abort.
+        if ( 'notice-dismiss' !== event.target.className ) {
+            return;
+        }
 
-    // If the parent div doesn't have our wpengine-geoip class, then abort
-    if ( !parent || -1 === jQuery.inArray( 'wpengine-geoip', parent.classList ) ) {
-        return;
-    }
+        // This should be our parent div for the notice.
+        var parent = event.path[ 1 ] || null;
 
-    // Get our notice's key
-    var key = parent.attributes[ 'data-key' ].value || null;
+        // If the parent div doesn't have our wpengine-geoip class, then abort.
+        if ( ! parent || -1 === jQuery.inArray( 'wpengine-geoip', parent.classList ) ) {
+            return;
+        }
 
-    // Send our POST request to admin-ajax
-    var http = new XMLHttpRequest();
-    var params = "action=geoip_dismiss_notice&key=" + key;
-    http.open( "POST", ajaxurl, true );
-    http.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
-    http.send( params );
-} );
+        // Get our notice's key.
+        var key = parent.attributes[ 'data-key' ].value || null;
+
+        // Send our POST request to admin-ajax.
+        var http   = new XMLHttpRequest();
+        var params = "action=geoip_dismiss_notice&key=" + key + "&nonce=" + window.nonce;
+        http.open( "POST", ajaxurl, true );
+        http.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
+        http.send( params );
+    }
+);

wpengine-geoip/tags/1.2.7/readme.txt

@@ -1 +1 @@
 === WP Engine GeoTarget ===
 Contributors: wpengine, markkelnar, stevenkword, stephenlin, ryanshoover, taylor4484, nateinaction
-Tags: wpe, wpengine, geoip, localization, geolocation
+Tags: wpe, wpengine, geotarget, geoip, localization, geolocation
 Requires at least: 3.0.1
-Tested up to: 4.9
-Stable tag: 1.2.5
+Tested up to: 5.2
+Stable tag: 1.2.7
 
 License: GPLv2 or later
@@ -15 +15 @@
 WP Engine GeoTarget integrates with the variables on your WP Engine site to display content catered to the visitor’s location. With the ability to access variables from as broad as country to as specific as latitude and longitude, your website can now display geographically relevant content.
 
-
 = Geo-Marketing =
 
@@ -36 +35 @@
 = * Please Note * =
 
-This plugin will only function on your [WP Engine](http://wpengine.com/plans/?utm_source=wpengine-geoip) Business, Premium or Enterprise level account. This will not function outside of the WP Engine environment.
+Customers on Premium and Enterprise plans can use this plugin at no additional cost. If you are on another plan type and would like to use GeoTarget on one of your sites, you can add it to your plan [here](http://wpengine.com/plans/?utm_source=wpengine-geoip). This will not function outside of the WP Engine environment.
 
 == Installation ==
@@ -78 +77 @@
 == Localized Content ==
 
-9) Content: `[geoip-content country="US"]Your US specific content goes here[/geoip-content]`
+`
+[geoip-content country="US"]Your US specific content goes here[/geoip-content]
+`
+
 The content shortcode allows you to hide or show specific content based on visitor geographies:
 
@@ -262 +264 @@
 == Changelog ==
 
+= 1.2.7 =
+- Optimize plugin name rename loop
+- Bump for WP 5.2 compatibility
+
+= 1.2.6 =
+- Bump for WP 5.0 compatibility
+
 = 1.2.5 =
 - Fix for anchor tag escaping in admin notice

wpengine-geoip/tags/1.2.7/wpengine-geoip.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Name: WP Engine GeoTarget
- * Version: 1.2.5
- * Description: Create a personalized user experienced based on location.
- * Author: WP Engine
- * Author URI: http://wpengine.com
- * Plugin URI: https://wordpress.org/plugins/wpengine-geoip/
- * Text Domain: wpengine-geoip
- * Domain Path: /languages
+ * This file helps to prevent any issues from file name change
+ * wpengine-geoip.php -> class-geoip.php to adhere to WPCS
  *
  * @package wpengine-geoip
  */
-
-/*
-Examples use of how to add geoip information to post content:
-
-function geoip_append_content( $content ) {
-    $geo = WPEngine\GeoIp::instance();
-    $content .= "How's the weather in {$geo->city()}, {$geo->region()} {$geo->country()}?<br /><br />";
-    return $content;
-}
-add_filter( 'the_content', 'geoip_append_content' );
-*/
 
 namespace WPEngine;
@@ -32 +15 @@
 
 /**
- * Base class for the GeoTarget plugin, GeoTarget was formerly called GeoIP
+ * Replace plugin filename in options table
  */
-class GeoIp {
-
-    /**
-     * The single instance of this object.  No need to have more than one.
-     *
-     * @var class
-     */
-    private static $instance = null;
-
-    /**
-     * The path to the plugin. Let's just make that function call once.
-     *
-     * @var string
-     */
-    private $geoip_path;
-
-    /**
-     * The geographical data loaded from the environment.
-     *
-     * @var array
-     */
-    public $geos;
-
-    /**
-     * A list of countries and their continents.
-     *
-     * @var array
-     */
-    public $countries;
-
-    /**
-     * WP-Admin errors notices.
-     *
-     * @var array
-     */
-    private $admin_notices;
-
-    /**
-     * Text Domain.
-     *
-     * @var string
-     */
-    const TEXT_DOMAIN           = 'wpengine-geoip';
-
-    /**
-     * Version Number.
-     *
-     * @var string
-     */
-    const VERSION               = '1.2.1';
-
-    // Shortcodes.
-    const SHORTCODE_CONTINENT   = 'geoip-continent';
-    const SHORTCODE_COUNTRY     = 'geoip-country';
-    const SHORTCODE_REGION      = 'geoip-region';
-    const SHORTCODE_CITY        = 'geoip-city';
-    const SHORTCODE_POSTAL_CODE = 'geoip-postalcode';
-    const SHORTCODE_LATITUDE    = 'geoip-latitude';
-    const SHORTCODE_LONGITUDE   = 'geoip-longitude';
-    const SHORTCODE_LOCATION    = 'geoip-location';
-    const SHORTCODE_CONTENT     = 'geoip-content';
-
-    /**
-     * Initialize hooks and setup environment variables
-     *
-     * @since 0.1.0
-     */
-    public static function init() {
-
-        // Initialize.
-        add_action( 'init', array( self::instance(), 'setup' ) );
-        add_action( 'init', array( self::instance(), 'action_init_register_shortcodes' ) );
-
-        // Enqueue our javascript.
-        add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_admin_js' ) );
-
-        // Check for dependencies.
-        add_action( 'admin_init', array( self::instance(), 'action_admin_init_check_plugin_dependencies' ), 9999 ); // check late.
-        add_action( 'admin_notices', array( self::instance(), 'action_admin_notices' ) );
-
-        // Process AJAX requests.
-        add_action( 'wp_ajax_geoip_dismiss_notice', array( self::instance(), 'ajax_action_dismiss_notice' ) );
-    }
-
-    /**
-     * Register singleton
-     *
-     * @since 0.1.0
-     */
-    public static function instance() {
-        // Create a new object if it doesn't exist.
-        if ( is_null( self::$instance ) ) {
-            self::$instance = new self;
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Setup environment variables
-     *
-     * @since 0.1.0
-     */
-    public function setup() {
-
-        $this->geoip_path = plugin_dir_path( __FILE__ );
-
-        // Get our array of countries and continents.
-        require_once( $this->geoip_path . '/inc/country-list.php' );
-
-        $this->countries = apply_filters( 'geoip_country_list', geoip_country_list() );
-
-        $this->geos = $this->get_actuals();
-
-        $this->geos = $this->get_test_parameters( $this->geos );
-
-        $this->geos = wp_unslash( $this->geos );
-
-        $this->geos = apply_filters( 'geoip_location_values', $this->geos );
-
-        // Prepopulate the admin notices array.
-        $this->admin_notices = array(
-            'info'    => array(),
-            'error'   => array(),
-            'success' => array(),
-            'warning' => array(),
-        );
-    }
-
-    /**
-     * Enqueue the admin Javascript file
-     *
-     * @since 1.2.1
-     */
-    public function enqueue_admin_js() {
-        // Only enqueue the JS if the notice will be showing.
-        if ( ! $this->helper_should_notice_show( 'dependency' ) ) {
-            return;
-        }
-
-        wp_enqueue_script( self::TEXT_DOMAIN . '-admin-js', plugins_url( 'js/admin.js', __FILE__ ), null, self::VERSION, true );
-    }
-
-    /**
-     * Here we extract the data from headers set by nginx -- lets only send them if they are part of the cache key
-     *
-     * @since 0.1.0
-     * @return array All of the GeoTarget related environment variables available on the current server instance
-     */
-    public function get_actuals() {
-
-        $geos = array(
-            'countrycode'  => getenv( 'HTTP_GEOIP_COUNTRY_CODE' ),
-            'countrycode3' => getenv( 'HTTP_GEOIP_COUNTRY_CODE3' ),
-            'countryname'  => getenv( 'HTTP_GEOIP_COUNTRY_NAME' ),
-            'latitude'     => getenv( 'HTTP_GEOIP_LATITUDE' ),
-            'longitude'    => getenv( 'HTTP_GEOIP_LONGITUDE' ),
-            'areacode'     => getenv( 'HTTP_GEOIP_AREA_CODE' ),
-            'region'       => getenv( 'HTTP_GEOIP_REGION' ),
-            'city'         => getenv( 'HTTP_GEOIP_CITY' ),
-            'postalcode'   => getenv( 'HTTP_GEOIP_POSTAL_CODE' ),
-        );
-
-        $geos['active'] = ( isset( $geos['countrycode'] ) && false !== $geos['countrycode'] )  ? true : false;
-
-        $geos['continent'] = $this->continent( $geos['countrycode'] );
-
-        return $geos;
-    }
-
-    /**
-     * We want people to be able to test the plugin, so we'll include some url parameters that will spoof a location
-     *
-     * @since 1.1.0
-     * @param  array $geos Array of values for the user's location.
-     * @return array       Modified version of the GeoTarget location array based on url parameters
-     */
-    public function get_test_parameters( $geos ) {
-
-        $params = $_GET;
-
-        if ( ! isset( $params['geoip'] ) ) {
-            return $geos;
-        }
-
-        foreach ( $params as $key => $value ) {
-
-            $key = esc_attr( $key );
-            $value = esc_attr( $value );
-
-            $key = $this->match_label_synonyms( $key );
-
-            if ( isset( $geos[ $key ] ) ) {
-                $geos[ $key ] = $value;
-            }
-        }
-
-        return $geos;
-    }
-
-    /**
-     * Get Continent
-     *
-     * @since 1.1.0
-     * @param  string $country Two-letter country code.
-     * @return string          Two-letter continent code, e.g. EU for Europe
-     */
-    public function continent( $country = '' ) {
-
-        $continent = '';
-
-        if ( empty( $country ) ) {
-            $country = $this->geos['countrycode'];
-        }
-
-        if ( isset( $this->countries[ $country ] ) ) {
-            $continent = $this->countries[ $country ]['continent'];
-        }
-
-        return $continent;
-    }
-
-    /**
-     * Get Country
-     *
-     * @since 0.5.0
-     * @return string Two-letter country code, e.g.) US for the United States of America
-     */
-    public function country() {
-        return $this->geos['countrycode'];
-    }
-
-    /**
-     * Get Region
-     *
-     * @since 0.5.0
-     * @return string Two-letter region code. e.g.) CA for California
-     */
-    public function region() {
-        return $this->geos['region'];
-    }
-
-    /**
-     * Get City
-     *
-     * @since 0.5.0
-     * @return mixed Description
-     */
-    public function city() {
-        return $this->geos['city'];
-    }
-
-    /**
-     * Get Postal Code
-     *
-     * @since 0.6.0
-     * @return mixed Description
-     */
-    public function postal_code() {
-        return $this->geos['postalcode'];
-    }
-
-    /**
-     * Get Latitude
-     *
-     * @since 0.6.0
-     * @return mixed Description
-     */
-    public function latitude() {
-        return $this->geos['latitude'];
-    }
-
-    /**
-     * Get Longitude
-     *
-     * @since 0.6.0
-     * @return mixed Description
-     */
-    public function longitude() {
-        return $this->geos['longitude'];
-    }
-
-    /**
-     * Register the shortcode(s)
-     *
-     * @since  0.5.0
-     * @uses add_shortcode()
-     */
-    public function action_init_register_shortcodes() {
-
-        // Continent Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_CONTINENT ) ) {
-            add_shortcode( self::SHORTCODE_CONTINENT, array( $this, 'do_shortcode_continent' ) );
-        }
-
-        // Country Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_COUNTRY ) ) {
-            add_shortcode( self::SHORTCODE_COUNTRY, array( $this, 'do_shortcode_country' ) );
-        }
-
-        // Region Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_REGION ) ) {
-            add_shortcode( self::SHORTCODE_REGION, array( $this, 'do_shortcode_region' ) );
-        }
-
-        // City Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_CITY ) ) {
-            add_shortcode( self::SHORTCODE_CITY, array( $this, 'do_shortcode_city' ) );
-        }
-
-        // Postal Code Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_POSTAL_CODE ) ) {
-            add_shortcode( self::SHORTCODE_POSTAL_CODE, array( $this, 'do_shortcode_postal_code' ) );
-        }
-
-        // Latitude Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_LATITUDE ) ) {
-            add_shortcode( self::SHORTCODE_LATITUDE, array( $this, 'do_shortcode_latitude' ) );
-        }
-
-        // Longitude Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_LONGITUDE ) ) {
-            add_shortcode( self::SHORTCODE_LONGITUDE, array( $this, 'do_shortcode_longitude' ) );
-        }
-
-        // Smart Location Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_LOCATION ) ) {
-            add_shortcode( self::SHORTCODE_LOCATION, array( $this, 'do_shortcode_location' ) );
-        }
-
-        // Smart Location Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_CONTENT ) ) {
-            add_shortcode( self::SHORTCODE_CONTENT, array( $this, 'do_shortcode_content' ) );
+function replace_previous_plugin_filename() {
+    $active_plugins = get_option( 'active_plugins', array() );
+    foreach ( $active_plugins as $key => $active_plugin ) {
+        if ( strstr( $active_plugin, '/wpengine-geoip.php' ) ) {
+            $active_plugins[ $key ] = str_replace( '/wpengine-geoip.php', '/class-geoip.php', $active_plugin );
+            break;
         }
     }
-
-    /**
-     * Output the current continent
-     *
-     * @since 1.1.0
-     * @param  array $atts Shortcode attributes.
-     * @return string Two-letter continent code
-     */
-    function do_shortcode_continent( $atts ) {
-        $continent = '[' . self::SHORTCODE_CONTINENT . ']';
-
-        $country = $this->geos['countrycode'];
-
-        if ( isset( $this->countries[ $country ] ) ) {
-            $continent = $this->countries[ $country ]['continent'];
-        }
-        return $continent;
-    }
-
-    /**
-     * Output the current country
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string Two-letter country code
-     */
-    function do_shortcode_country( $atts ) {
-        if ( isset( $this->geos['countrycode'] ) ) {
-            return $this->country();
-        }
-        return '[' . self::SHORTCODE_COUNTRY . ']';
-    }
-
-    /**
-     * Output the current region
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string Two-letter region code
-     */
-    function do_shortcode_region( $atts ) {
-        if ( isset( $this->geos['region'] ) ) {
-            return $this->region();
-        }
-        return '[' . self::SHORTCODE_REGION . ']';
-    }
-
-    /**
-     * Output the current city
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string City name
-     */
-    function do_shortcode_city( $atts ) {
-        if ( isset( $this->geos['city'] ) ) {
-            return $this->city();
-        }
-        return '[' . self::SHORTCODE_CITY . ']';
-    }
-
-    /**
-     * Output the current postal code
-     *
-     * @since  0.6.0
-     * @param  array $atts Shortcode attributes.
-     * @return string postal code
-     */
-    function do_shortcode_postal_code( $atts ) {
-        if ( isset( $this->geos['postalcode'] ) ) {
-            return $this->postal_code();
-        }
-        return '[' . self::SHORTCODE_POSTAL_CODE . ']';
-    }
-
-    /**
-     * Output the current latitude
-     *
-     * @since  0.6.0
-     * @param  array $atts Shortcode attributes.
-     * @return string latitude
-     */
-    function do_shortcode_latitude( $atts ) {
-        if ( isset( $this->geos['latitude'] ) ) {
-            return $this->latitude();
-        }
-        return '[' . self::SHORTCODE_LATITUDE . ']';
-    }
-
-    /**
-     * Output the current longitude
-     *
-     * @since  0.6.0
-     * @param  array $atts Shortcode attributes.
-     * @return string longitude
-     */
-    function do_shortcode_longitude( $atts ) {
-        if ( isset( $this->geos['longitude'] ) ) {
-            return $this->longitude();
-        }
-        return '[' . self::SHORTCODE_LONGITUDE . ']';
-    }
-
-    /**
-     * Output the current human readable location, in a smart way.
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string $html
-     */
-    function do_shortcode_location( $atts ) {
-
-        $city = $this->city();
-        if ( isset( $city ) && ! empty( $city ) ) {
-            return trim( $this->city() . ', ' . $this->region() . ' ' . $this->country() );
-        }
-        // Fallback.
-        return trim( $this->region() . ' ' . $this->country() );
-    }
-
-    /**
-     * Output the content filtered by region
-     *
-     * @since 1.1.0
-     * @param  array  $atts Shortcode attributes.
-     * @param  string $content HTML content that comes between the shortcode tags.
-     * @return string HTML
-     */
-    function do_shortcode_content( $atts, $content = null ) {
-
-        $keep = true;
-
-        $test_parameters = array();
-
-        // Process and organzie the test parameters.
-        foreach ( $atts as $label => $value ) {
-
-            // Intialize our negation parameters.
-            $negate = 0;
-            $inline_negate = 0;
-
-            // Check to see if the attribute has "not" in it.
-            $negate = preg_match( '/not?[-_]?(.*)/', $label, $matches );
-
-            // WordPress doesn't like a dash in shortcode parameter labels.
-            // Just in case, check to see if the value has "not-" in it.
-            if ( ! $negate ) {
-                $negate = preg_match( '/not?\-([^=]+)\=\"?([^"]+)\"?/', $value, $matches );
-                $inline_negate = $negate;
-            }
-
-            // Label after the negation match.
-            $label = $negate ? $matches[1] : $label;
-
-            // Value after the negation match.
-            $value = $inline_negate ? $matches[2] : $value;
-
-            // Replace common synonyms with our values.
-            $label = $this->match_label_synonyms( $label );
-
-            // Abort if the label doesn't match.
-            if ( ! isset( $this->geos[ $label ] ) ) {
-                continue;
-            }
-
-            // Find out if the value is comma delimited.
-            $test_values = (array) explode( ',',  $value );
-
-            // Add the value to the test parameters.
-            $test_parameters[ $label ] = array(
-                'test_values' => $test_values,
-                'negate' => $negate,
-                );
-        }// End foreach().
-
-        // Sort the test parameters by region type – largest to smallest.
-        uksort( $test_parameters, array( $this, 'compare_location_type' ) );
-
-        $test_parameters = apply_filters( 'geoip_test_parameters', $test_parameters, $atts );
-
-        // Process through parameters, testing to see if we have a match.
-        foreach ( $test_parameters as $label => $parameter ) {
-
-            $test_values = $parameter['test_values'];
-
-            $negate = $parameter['negate'];
-
-            // Sanitize the match value.
-            $match_value = strtolower( $this->geos[ $label ] );
-
-            // Sanitize the test values.
-            foreach ( $test_values as &$test_value ) {
-                $test_value = strtolower( trim( $test_value, " \t\"." ) );
-            }
-
-            $is_match = in_array( $match_value, $test_values, true );
-
-            $is_match = ! $negate ? $is_match : ! $is_match;
-
-            if ( ! $is_match ) {
-                $keep = false;
-            }
-        }
-
-        if ( ! $keep ) {
-            return '';
-        }
-
-        // Process any shortcodes in the content.
-        $content = do_shortcode( $content );
-
-        return apply_filters( 'geoip_content', $content, $atts );
-    }
-
-    /**
-     * Compare the location types
-     *
-     * Used for sorting location types from largest area to smallest area
-     *
-     * @since 1.1.2
-     * @param  string $a Type of location.
-     * @param  string $b Type of location.
-     * @return int       Whether $a is more important than b
-     */
-    public function compare_location_type( $a, $b ) {
-        $location_types = array(
-            'continent'    => 1,
-            'countrycode'  => 2,
-            'countrycode3' => 2,
-            'countryname'  => 2,
-            'region'       => 3,
-            'areacode'     => 4,
-            'city'         => 5,
-            'postalcode'   => 6,
-            );
-
-        if ( isset( $location_types[ $a ] ) && isset( $location_types[ $b ] ) ) {
-            return $location_types[ $a ] - $location_types[ $b ];
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Checks if environment variable depencies are available on the server
-     *
-     * @todo Include link to query documentation when available on the Plugin Directory
-     * @since  0.5.0
-     */
-    public function action_admin_init_check_plugin_dependencies() {
-        $notice_key = 'dependency';
-
-        if ( $this->helper_should_notice_show( $notice_key ) ) {
-            /* translators: Tells users that the plugin won't automatically work if they're not in the right setup */
-            $notice = __( 'WP Engine GeoTarget requires a <a href="%s">WP Engine account</a> with GeoTarget enabled for full functionality. Only testing queries will work on this site.', 'wpengine-geoip' );
-            $this->admin_notices['warning'][ $notice_key ] = sprintf( $notice, 'http://wpengine.com/plans/?utm_source=' . self::TEXT_DOMAIN );
-        }
-    }
-
-    /**
-     * Displays any of our registered notices
-     *
-     * @since  0.5.0
-     */
-    public function action_admin_notices() {
-        foreach ( $this->admin_notices as $type => $notices ) {
-            foreach ( $notices as $key => $notice ) {
-                ?>
-                <div class="notice notice-<?php echo esc_attr( $type ); ?> wpengine-geoip is-dismissible" data-key="<?php echo esc_attr( $key ); ?>">
-                    <p>
-                        <?php
-                            echo wp_kses(
-                                $notice,
-                                array(
-                                    'a' => array(
-                                        'href' => array(),
-                                    ),
-                                    'span',
-                                    'strong',
-                                    'em',
-                                )
-                            );
-                        ?>
-                    </p>
-                </div>
-                <?php
-            }
-        }
-    }
-
-    /**
-     * Process an AJAX request to dismiss any notices
-     * Adds a user meta field marking when the notice was dismissed
-     *
-     * @since 1.2.1
-     */
-    public function ajax_action_dismiss_notice() {
-        if ( empty( $_POST['key'] ) ) {
-            return;
-        }
-
-        $meta_key = self::TEXT_DOMAIN . '-notice-dismissed-' . esc_attr( wp_unslash( $_POST['key'] ) );
-
-        add_user_meta( get_current_user_id(), $meta_key, time(), true );
-    }
-
-    /**
-     * Helper: Should a notice show in the dashboard?
-     *
-     * @since 1.2.1
-     * @param  string $notice Key of the notice we're testing for.
-     * @return bool           Should we show the notice or not.
-     */
-    protected function helper_should_notice_show( $notice ) {
-        if ( ! $notice ) {
-            return false;
-        }
-
-        $is_active = $this->geos['active'];
-        $is_dismissed = get_user_meta( get_current_user_id(), self::TEXT_DOMAIN . '-notice-dismissed-' . $notice, true );
-
-        // false = GeoTarget is active, or if we've dismissed the notice before.
-        // true = GeoTarget is not active and we haven't dismissed the notice before.
-        return ! ( $is_active || $is_dismissed );
-    }
-
-    /**
-     * As a favor to users, let's match some common synonyms
-     *
-     * @since 1.1.0
-     * @param  string $label The address label that needs a synonym.
-     * @return string label
-     */
-    private function match_label_synonyms( $label ) {
-
-        if ( 'country' === $label ) {
-            $label = 'countrycode';
-        }
-
-        if ( 'state' === $label ) {
-            $label = 'region';
-        }
-
-        if ( 'zipcode' === $label || 'zip' === $label ) {
-            $label = 'postalcode';
-        }
-
-        return $label;
-    }
-
-    /**
-     * Utility function: Calculate distance to point
-     *
-     * Provided a lat/lng, calculate the distance from visitor's location
-     * Uses the Haversine Formula, accurate for short distance but not over poles or the equator
-     *
-     * Note: Test against a return value of false to make sure you got a calculated distance. Example:
-     * $geo = WPEngine\GeoIp::instance();
-     * if ( false !== $geo->distance_to( $latitude, $longitude ) ) {
-     *   // Do something
-     * }
-     *
-     * @link http://andrew.hedges.name/experiments/haversine/
-     * @since 1.2
-     * @param  float $lat     Latitude of the destination in degrees.
-     * @param  float $lng     Longitude of the destination in degrees.
-     * @param  bool  $metric  Whether to calculate the distance in kilometers or miles.
-     * @return float          Distance in miles
-     */
-    public function distance_to( $lat, $lng, $metric = false ) {
-        $start_lat = deg2rad( $this->latitude() );
-        $start_lng = deg2rad( $this->longitude() );
-
-        // Test for null values passed into the function or a 0,0 coordinate for the user.
-        // If either exist, abort. (0,0 is the result when coordinates fail).
-        if ( is_null( $lat ) || is_null( $lng ) || ( empty( $start_lat ) && empty( $start_lng ) ) ) {
-            return false;
-        }
-
-        // Choose the right radius for the results: radius of the Earth in kilometers and miles.
-        $radius = $metric ? 6373 : 3961;
-
-        // Sanitize the user submitted variables.
-        $lat = floatval( $lat );
-        $lng = floatval( $lng );
-
-        $dlng = $lng - $start_lng;
-        $dlat = $lat - $start_lat;
-
-        // Calculate the distance.
-        $a = ( sin( $dlat / 2 ) * sin( $dlat / 2 ) ) + ( cos( $lat ) * cos( $start_lat ) * sin( $dlng / 2 ) * sin( $dlng / 2 ) );
-        $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) );
-        $d = $radius * $c;
-
-        return $d;
-    }
+    update_option( 'active_plugins', $active_plugins );
 }
-
-// Register the GeoTarget plugin instance.
-GeoIp::init();
+replace_previous_plugin_filename();

wpengine-geoip/trunk/inc/country-list.php

@@ -13 +13 @@
     $countries = array(
         'AF' => array(
-            'country' => 'Afghanistan',
+            'country'   => 'Afghanistan',
             'continent' => 'AS',
         ),
         'AX' => array(
-            'country' => 'Åland Islands',
+            'country'   => 'Åland Islands',
             'continent' => 'EU',
         ),
         'AL' => array(
-            'country' => 'Albania',
+            'country'   => 'Albania',
             'continent' => 'EU',
         ),
         'DZ' => array(
-            'country' => 'Algeria',
+            'country'   => 'Algeria',
             'continent' => 'AF',
         ),
         'AS' => array(
-            'country' => 'American Samoa',
+            'country'   => 'American Samoa',
             'continent' => 'OC',
         ),
         'AD' => array(
-            'country' => 'Andorra',
+            'country'   => 'Andorra',
             'continent' => 'EU',
         ),
         'AO' => array(
-            'country' => 'Angola',
+            'country'   => 'Angola',
             'continent' => 'AF',
         ),
         'AI' => array(
-            'country' => 'Anguilla',
+            'country'   => 'Anguilla',
             'continent' => 'NA',
         ),
         'AQ' => array(
-            'country' => 'AN',
+            'country'   => 'AN',
             'continent' => 'AN',
         ),
         'AG' => array(
-            'country' => 'Antigua and Barbuda',
+            'country'   => 'Antigua and Barbuda',
             'continent' => 'NA',
         ),
         'AR' => array(
-            'country' => 'Argentina',
+            'country'   => 'Argentina',
             'continent' => 'SA',
         ),
         'AM' => array(
-            'country' => 'Armenia',
+            'country'   => 'Armenia',
             'continent' => 'AS',
         ),
         'AW' => array(
-            'country' => 'Aruba',
+            'country'   => 'Aruba',
             'continent' => 'NA',
         ),
         'AU' => array(
-            'country' => 'Australia',
+            'country'   => 'Australia',
             'continent' => 'OC',
         ),
         'AT' => array(
-            'country' => 'Austria',
+            'country'   => 'Austria',
             'continent' => 'EU',
         ),
         'AZ' => array(
-            'country' => 'Azerbaijan',
+            'country'   => 'Azerbaijan',
             'continent' => 'AS',
         ),
         'BS' => array(
-            'country' => 'Bahamas',
+            'country'   => 'Bahamas',
             'continent' => 'NA',
         ),
         'BH' => array(
-            'country' => 'Bahrain',
+            'country'   => 'Bahrain',
             'continent' => 'AS',
         ),
         'BD' => array(
-            'country' => 'Bangladesh',
+            'country'   => 'Bangladesh',
             'continent' => 'AS',
         ),
         'BB' => array(
-            'country' => 'Barbados',
+            'country'   => 'Barbados',
             'continent' => 'NA',
         ),
         'BY' => array(
-            'country' => 'Belarus',
+            'country'   => 'Belarus',
             'continent' => 'EU',
         ),
         'BE' => array(
-            'country' => 'Belgium',
+            'country'   => 'Belgium',
             'continent' => 'EU',
         ),
         'BZ' => array(
-            'country' => 'Belize',
+            'country'   => 'Belize',
             'continent' => 'NA',
         ),
         'BJ' => array(
-            'country' => 'Benin',
+            'country'   => 'Benin',
             'continent' => 'AF',
         ),
         'BM' => array(
-            'country' => 'Bermuda',
+            'country'   => 'Bermuda',
             'continent' => 'NA',
         ),
         'BT' => array(
-            'country' => 'Bhutan',
+            'country'   => 'Bhutan',
             'continent' => 'AS',
         ),
         'BO' => array(
-            'country' => 'Bolivia',
+            'country'   => 'Bolivia',
             'continent' => 'SA',
         ),
         'BA' => array(
-            'country' => 'Bosnia and Herzegovina',
+            'country'   => 'Bosnia and Herzegovina',
             'continent' => 'EU',
         ),
         'BW' => array(
-            'country' => 'Botswana',
+            'country'   => 'Botswana',
             'continent' => 'AF',
         ),
         'BV' => array(
-            'country' => 'Bouvet Island',
+            'country'   => 'Bouvet Island',
             'continent' => 'AN',
         ),
         'BR' => array(
-            'country' => 'Brazil',
+            'country'   => 'Brazil',
             'continent' => 'SA',
         ),
         'IO' => array(
-            'country' => 'British Indian Ocean Territory',
+            'country'   => 'British Indian Ocean Territory',
             'continent' => 'AS',
         ),
         'BN' => array(
-            'country' => 'Brunei Darussalam',
+            'country'   => 'Brunei Darussalam',
             'continent' => 'AS',
         ),
         'BG' => array(
-            'country' => 'Bulgaria',
+            'country'   => 'Bulgaria',
             'continent' => 'EU',
         ),
         'BF' => array(
-            'country' => 'Burkina Faso',
+            'country'   => 'Burkina Faso',
             'continent' => 'AF',
         ),
         'BI' => array(
-            'country' => 'Burundi',
+            'country'   => 'Burundi',
             'continent' => 'AF',
         ),
         'KH' => array(
-            'country' => 'Cambodia',
+            'country'   => 'Cambodia',
             'continent' => 'AS',
         ),
         'CM' => array(
-            'country' => 'Cameroon',
+            'country'   => 'Cameroon',
             'continent' => 'AF',
         ),
         'CA' => array(
-            'country' => 'Canada',
+            'country'   => 'Canada',
             'continent' => 'NA',
         ),
         'CV' => array(
-            'country' => 'Cape Verde',
+            'country'   => 'Cape Verde',
             'continent' => 'AF',
         ),
         'KY' => array(
-            'country' => 'Cayman Islands',
+            'country'   => 'Cayman Islands',
             'continent' => 'NA',
         ),
         'CF' => array(
-            'country' => 'Central African Republic',
+            'country'   => 'Central African Republic',
             'continent' => 'AF',
         ),
         'TD' => array(
-            'country' => 'Chad',
+            'country'   => 'Chad',
             'continent' => 'AF',
         ),
         'CL' => array(
-            'country' => 'Chile',
+            'country'   => 'Chile',
             'continent' => 'SA',
         ),
         'CN' => array(
-            'country' => 'China',
+            'country'   => 'China',
             'continent' => 'AS',
         ),
         'CX' => array(
-            'country' => 'Christmas Island',
+            'country'   => 'Christmas Island',
             'continent' => 'AS',
         ),
         'CC' => array(
-            'country' => 'Cocos (Keeling) Islands',
+            'country'   => 'Cocos (Keeling) Islands',
             'continent' => 'AS',
         ),
         'CO' => array(
-            'country' => 'Colombia',
+            'country'   => 'Colombia',
             'continent' => 'SA',
         ),
         'KM' => array(
-            'country' => 'Comoros',
+            'country'   => 'Comoros',
             'continent' => 'AF',
         ),
         'CG' => array(
-            'country' => 'Congo',
+            'country'   => 'Congo',
             'continent' => 'AF',
         ),
         'CD' => array(
-            'country' => 'The Democratic Republic of The Congo',
+            'country'   => 'The Democratic Republic of The Congo',
             'continent' => 'AF',
         ),
         'CK' => array(
-            'country' => 'Cook Islands',
+            'country'   => 'Cook Islands',
             'continent' => 'OC',
         ),
         'CR' => array(
-            'country' => 'Costa Rica',
+            'country'   => 'Costa Rica',
             'continent' => 'NA',
         ),
         'CI' => array(
-            'country' => 'Cote D\'ivoire',
+            'country'   => 'Cote D\'ivoire',
             'continent' => 'AF',
         ),
         'HR' => array(
-            'country' => 'Croatia',
+            'country'   => 'Croatia',
             'continent' => 'EU',
         ),
         'CU' => array(
-            'country' => 'Cuba',
+            'country'   => 'Cuba',
             'continent' => 'NA',
         ),
         'CY' => array(
-            'country' => 'Cyprus',
+            'country'   => 'Cyprus',
             'continent' => 'AS',
         ),
         'CZ' => array(
-            'country' => 'Czech Republic',
+            'country'   => 'Czech Republic',
             'continent' => 'EU',
         ),
         'DK' => array(
-            'country' => 'Denmark',
+            'country'   => 'Denmark',
             'continent' => 'EU',
         ),
         'DJ' => array(
-            'country' => 'Djibouti',
+            'country'   => 'Djibouti',
             'continent' => 'AF',
         ),
         'DM' => array(
-            'country' => 'Dominica',
+            'country'   => 'Dominica',
             'continent' => 'NA',
         ),
         'DO' => array(
-            'country' => 'Dominican Republic',
+            'country'   => 'Dominican Republic',
             'continent' => 'NA',
         ),
         'EC' => array(
-            'country' => 'Ecuador',
+            'country'   => 'Ecuador',
             'continent' => 'SA',
         ),
         'EG' => array(
-            'country' => 'Egypt',
+            'country'   => 'Egypt',
             'continent' => 'AF',
         ),
         'SV' => array(
-            'country' => 'El Salvador',
+            'country'   => 'El Salvador',
             'continent' => 'NA',
         ),
         'GQ' => array(
-            'country' => 'Equatorial Guinea',
+            'country'   => 'Equatorial Guinea',
             'continent' => 'AF',
         ),
         'ER' => array(
-            'country' => 'Eritrea',
+            'country'   => 'Eritrea',
             'continent' => 'AF',
         ),
         'EE' => array(
-            'country' => 'Estonia',
+            'country'   => 'Estonia',
             'continent' => 'EU',
         ),
         'ET' => array(
-            'country' => 'Ethiopia',
+            'country'   => 'Ethiopia',
             'continent' => 'AF',
         ),
         'FK' => array(
-            'country' => 'Falkland Islands (Malvinas)',
+            'country'   => 'Falkland Islands (Malvinas)',
             'continent' => 'SA',
         ),
         'FO' => array(
-            'country' => 'Faroe Islands',
+            'country'   => 'Faroe Islands',
             'continent' => 'EU',
         ),
         'FJ' => array(
-            'country' => 'Fiji',
+            'country'   => 'Fiji',
             'continent' => 'OC',
         ),
         'FI' => array(
-            'country' => 'Finland',
+            'country'   => 'Finland',
             'continent' => 'EU',
         ),
         'FR' => array(
-            'country' => 'France',
+            'country'   => 'France',
             'continent' => 'EU',
         ),
         'GF' => array(
-            'country' => 'French Guiana',
+            'country'   => 'French Guiana',
             'continent' => 'SA',
         ),
         'PF' => array(
-            'country' => 'French Polynesia',
+            'country'   => 'French Polynesia',
             'continent' => 'OC',
         ),
         'TF' => array(
-            'country' => 'French Southern Territories',
+            'country'   => 'French Southern Territories',
             'continent' => 'AN',
         ),
         'GA' => array(
-            'country' => 'Gabon',
+            'country'   => 'Gabon',
             'continent' => 'AF',
         ),
         'GM' => array(
-            'country' => 'Gambia',
+            'country'   => 'Gambia',
             'continent' => 'AF',
         ),
         'GE' => array(
-            'country' => 'Georgia',
+            'country'   => 'Georgia',
             'continent' => 'AS',
         ),
         'DE' => array(
-            'country' => 'Germany',
+            'country'   => 'Germany',
             'continent' => 'EU',
         ),
         'GH' => array(
-            'country' => 'Ghana',
+            'country'   => 'Ghana',
             'continent' => 'AF',
         ),
         'GI' => array(
-            'country' => 'Gibraltar',
+            'country'   => 'Gibraltar',
             'continent' => 'EU',
         ),
         'GR' => array(
-            'country' => 'Greece',
+            'country'   => 'Greece',
             'continent' => 'EU',
         ),
         'GL' => array(
-            'country' => 'Greenland',
+            'country'   => 'Greenland',
             'continent' => 'NA',
         ),
         'GD' => array(
-            'country' => 'Grenada',
+            'country'   => 'Grenada',
             'continent' => 'NA',
         ),
         'GP' => array(
-            'country' => 'Guadeloupe',
+            'country'   => 'Guadeloupe',
             'continent' => 'NA',
         ),
         'GU' => array(
-            'country' => 'Guam',
+            'country'   => 'Guam',
             'continent' => 'OC',
         ),
         'GT' => array(
-            'country' => 'Guatemala',
+            'country'   => 'Guatemala',
             'continent' => 'NA',
         ),
         'GG' => array(
-            'country' => 'Guernsey',
+            'country'   => 'Guernsey',
             'continent' => 'EU',
         ),
         'GN' => array(
-            'country' => 'Guinea',
+            'country'   => 'Guinea',
             'continent' => 'AF',
         ),
         'GW' => array(
-            'country' => 'Guinea-bissau',
+            'country'   => 'Guinea-bissau',
             'continent' => 'AF',
         ),
         'GY' => array(
-            'country' => 'Guyana',
+            'country'   => 'Guyana',
             'continent' => 'SA',
         ),
         'HT' => array(
-            'country' => 'Haiti',
+            'country'   => 'Haiti',
             'continent' => 'NA',
         ),
         'HM' => array(
-            'country' => 'Heard Island and Mcdonald Islands',
+            'country'   => 'Heard Island and Mcdonald Islands',
             'continent' => 'AN',
         ),
         'VA' => array(
-            'country' => 'Holy See (Vatican City State)',
+            'country'   => 'Holy See (Vatican City State)',
             'continent' => 'EU',
         ),
         'HN' => array(
-            'country' => 'Honduras',
+            'country'   => 'Honduras',
             'continent' => 'NA',
         ),
         'HK' => array(
-            'country' => 'Hong Kong',
+            'country'   => 'Hong Kong',
             'continent' => 'AS',
         ),
         'HU' => array(
-            'country' => 'Hungary',
+            'country'   => 'Hungary',
             'continent' => 'EU',
         ),
         'IS' => array(
-            'country' => 'Iceland',
+            'country'   => 'Iceland',
             'continent' => 'EU',
         ),
         'IN' => array(
-            'country' => 'India',
+            'country'   => 'India',
             'continent' => 'AS',
         ),
         'ID' => array(
-            'country' => 'Indonesia',
+            'country'   => 'Indonesia',
             'continent' => 'AS',
         ),
         'IR' => array(
-            'country' => 'Iran',
+            'country'   => 'Iran',
             'continent' => 'AS',
         ),
         'IQ' => array(
-            'country' => 'Iraq',
+            'country'   => 'Iraq',
             'continent' => 'AS',
         ),
         'IE' => array(
-            'country' => 'Ireland',
+            'country'   => 'Ireland',
             'continent' => 'EU',
         ),
         'IM' => array(
-            'country' => 'Isle of Man',
+            'country'   => 'Isle of Man',
             'continent' => 'EU',
         ),
         'IL' => array(
-            'country' => 'Israel',
+            'country'   => 'Israel',
             'continent' => 'AS',
         ),
         'IT' => array(
-            'country' => 'Italy',
+            'country'   => 'Italy',
             'continent' => 'EU',
         ),
         'JM' => array(
-            'country' => 'Jamaica',
+            'country'   => 'Jamaica',
             'continent' => 'NA',
         ),
         'JP' => array(
-            'country' => 'Japan',
+            'country'   => 'Japan',
             'continent' => 'AS',
         ),
         'JE' => array(
-            'country' => 'Jersey',
+            'country'   => 'Jersey',
             'continent' => 'EU',
         ),
         'JO' => array(
-            'country' => 'Jordan',
+            'country'   => 'Jordan',
             'continent' => 'AS',
         ),
         'KZ' => array(
-            'country' => 'Kazakhstan',
+            'country'   => 'Kazakhstan',
             'continent' => 'AS',
         ),
         'KE' => array(
-            'country' => 'Kenya',
+            'country'   => 'Kenya',
             'continent' => 'AF',
         ),
         'KI' => array(
-            'country' => 'Kiribati',
+            'country'   => 'Kiribati',
             'continent' => 'OC',
         ),
         'KP' => array(
-            'country' => 'Democratic People\'s Republic of Korea',
+            'country'   => 'Democratic People\'s Republic of Korea',
             'continent' => 'AS',
         ),
         'KR' => array(
-            'country' => 'Republic of Korea',
+            'country'   => 'Republic of Korea',
             'continent' => 'AS',
         ),
         'KW' => array(
-            'country' => 'Kuwait',
+            'country'   => 'Kuwait',
             'continent' => 'AS',
         ),
         'KG' => array(
-            'country' => 'Kyrgyzstan',
+            'country'   => 'Kyrgyzstan',
             'continent' => 'AS',
         ),
         'LA' => array(
-            'country' => 'Lao People\'s Democratic Republic',
+            'country'   => 'Lao People\'s Democratic Republic',
             'continent' => 'AS',
         ),
         'LV' => array(
-            'country' => 'Latvia',
+            'country'   => 'Latvia',
             'continent' => 'EU',
         ),
         'LB' => array(
-            'country' => 'Lebanon',
+            'country'   => 'Lebanon',
             'continent' => 'AS',
         ),
         'LS' => array(
-            'country' => 'Lesotho',
+            'country'   => 'Lesotho',
             'continent' => 'AF',
         ),
         'LR' => array(
-            'country' => 'Liberia',
+            'country'   => 'Liberia',
             'continent' => 'AF',
         ),
         'LY' => array(
-            'country' => 'Libya',
+            'country'   => 'Libya',
             'continent' => 'AF',
         ),
         'LI' => array(
-            'country' => 'Liechtenstein',
+            'country'   => 'Liechtenstein',
             'continent' => 'EU',
         ),
         'LT' => array(
-            'country' => 'Lithuania',
+            'country'   => 'Lithuania',
             'continent' => 'EU',
         ),
         'LU' => array(
-            'country' => 'Luxembourg',
+            'country'   => 'Luxembourg',
             'continent' => 'EU',
         ),
         'MO' => array(
-            'country' => 'Macao',
+            'country'   => 'Macao',
             'continent' => 'AS',
         ),
         'MK' => array(
-            'country' => 'Macedonia',
+            'country'   => 'Macedonia',
             'continent' => 'EU',
         ),
         'MG' => array(
-            'country' => 'Madagascar',
+            'country'   => 'Madagascar',
             'continent' => 'AF',
         ),
         'MW' => array(
-            'country' => 'Malawi',
+            'country'   => 'Malawi',
             'continent' => 'AF',
         ),
         'MY' => array(
-            'country' => 'Malaysia',
+            'country'   => 'Malaysia',
             'continent' => 'AS',
         ),
         'MV' => array(
-            'country' => 'Maldives',
+            'country'   => 'Maldives',
             'continent' => 'AS',
         ),
         'ML' => array(
-            'country' => 'Mali',
+            'country'   => 'Mali',
             'continent' => 'AF',
         ),
         'MT' => array(
-            'country' => 'Malta',
+            'country'   => 'Malta',
             'continent' => 'EU',
         ),
         'MH' => array(
-            'country' => 'Marshall Islands',
+            'country'   => 'Marshall Islands',
             'continent' => 'OC',
         ),
         'MQ' => array(
-            'country' => 'Martinique',
+            'country'   => 'Martinique',
             'continent' => 'NA',
         ),
         'MR' => array(
-            'country' => 'Mauritania',
+            'country'   => 'Mauritania',
             'continent' => 'AF',
         ),
         'MU' => array(
-            'country' => 'Mauritius',
+            'country'   => 'Mauritius',
             'continent' => 'AF',
         ),
         'YT' => array(
-            'country' => 'Mayotte',
+            'country'   => 'Mayotte',
             'continent' => 'AF',
         ),
         'MX' => array(
-            'country' => 'Mexico',
+            'country'   => 'Mexico',
             'continent' => 'NA',
         ),
         'FM' => array(
-            'country' => 'Micronesia',
+            'country'   => 'Micronesia',
             'continent' => 'OC',
         ),
         'MD' => array(
-            'country' => 'Moldova',
+            'country'   => 'Moldova',
             'continent' => 'EU',
         ),
         'MC' => array(
-            'country' => 'Monaco',
+            'country'   => 'Monaco',
             'continent' => 'EU',
         ),
         'MN' => array(
-            'country' => 'Mongolia',
+            'country'   => 'Mongolia',
             'continent' => 'AS',
         ),
         'ME' => array(
-            'country' => 'Montenegro',
+            'country'   => 'Montenegro',
             'continent' => 'EU',
         ),
         'MS' => array(
-            'country' => 'Montserrat',
+            'country'   => 'Montserrat',
             'continent' => 'NA',
         ),
         'MA' => array(
-            'country' => 'Morocco',
+            'country'   => 'Morocco',
             'continent' => 'AF',
         ),
         'MZ' => array(
-            'country' => 'Mozambique',
+            'country'   => 'Mozambique',
             'continent' => 'AF',
         ),
         'MM' => array(
-            'country' => 'Myanmar',
+            'country'   => 'Myanmar',
             'continent' => 'AS',
         ),
         'NA' => array(
-            'country' => 'Namibia',
+            'country'   => 'Namibia',
             'continent' => 'AF',
         ),
         'NR' => array(
-            'country' => 'Nauru',
+            'country'   => 'Nauru',
             'continent' => 'OC',
         ),
         'NP' => array(
-            'country' => 'Nepal',
+            'country'   => 'Nepal',
             'continent' => 'AS',
         ),
         'NL' => array(
-            'country' => 'Netherlands',
+            'country'   => 'Netherlands',
             'continent' => 'EU',
         ),
         'AN' => array(
-            'country' => 'Netherlands Antilles',
+            'country'   => 'Netherlands Antilles',
             'continent' => 'NA',
         ),
         'NC' => array(
-            'country' => 'New Caledonia',
+            'country'   => 'New Caledonia',
             'continent' => 'OC',
         ),
         'NZ' => array(
-            'country' => 'New Zealand',
+            'country'   => 'New Zealand',
             'continent' => 'OC',
         ),
         'NI' => array(
-            'country' => 'Nicaragua',
+            'country'   => 'Nicaragua',
             'continent' => 'NA',
         ),
         'NE' => array(
-            'country' => 'Niger',
+            'country'   => 'Niger',
             'continent' => 'AF',
         ),
         'NG' => array(
-            'country' => 'Nigeria',
+            'country'   => 'Nigeria',
             'continent' => 'AF',
         ),
         'NU' => array(
-            'country' => 'Niue',
+            'country'   => 'Niue',
             'continent' => 'OC',
         ),
         'NF' => array(
-            'country' => 'Norfolk Island',
+            'country'   => 'Norfolk Island',
             'continent' => 'OC',
         ),
         'MP' => array(
-            'country' => 'Northern Mariana Islands',
+            'country'   => 'Northern Mariana Islands',
             'continent' => 'OC',
         ),
         'NO' => array(
-            'country' => 'Norway',
+            'country'   => 'Norway',
             'continent' => 'EU',
         ),
         'OM' => array(
-            'country' => 'Oman',
+            'country'   => 'Oman',
             'continent' => 'AS',
         ),
         'PK' => array(
-            'country' => 'Pakistan',
+            'country'   => 'Pakistan',
             'continent' => 'AS',
         ),
         'PW' => array(
-            'country' => 'Palau',
+            'country'   => 'Palau',
             'continent' => 'OC',
         ),
         'PS' => array(
-            'country' => 'Palestinia',
+            'country'   => 'Palestinia',
             'continent' => 'AS',
         ),
         'PA' => array(
-            'country' => 'Panama',
+            'country'   => 'Panama',
             'continent' => 'NA',
         ),
         'PG' => array(
-            'country' => 'Papua New Guinea',
+            'country'   => 'Papua New Guinea',
             'continent' => 'OC',
         ),
         'PY' => array(
-            'country' => 'Paraguay',
+            'country'   => 'Paraguay',
             'continent' => 'SA',
         ),
         'PE' => array(
-            'country' => 'Peru',
+            'country'   => 'Peru',
             'continent' => 'SA',
         ),
         'PH' => array(
-            'country' => 'Philippines',
+            'country'   => 'Philippines',
             'continent' => 'AS',
         ),
         'PN' => array(
-            'country' => 'Pitcairn',
+            'country'   => 'Pitcairn',
             'continent' => 'OC',
         ),
         'PL' => array(
-            'country' => 'Poland',
+            'country'   => 'Poland',
             'continent' => 'EU',
         ),
         'PT' => array(
-            'country' => 'Portugal',
+            'country'   => 'Portugal',
             'continent' => 'EU',
         ),
         'PR' => array(
-            'country' => 'Puerto Rico',
+            'country'   => 'Puerto Rico',
             'continent' => 'NA',
         ),
         'QA' => array(
-            'country' => 'Qatar',
+            'country'   => 'Qatar',
             'continent' => 'AS',
         ),
         'RE' => array(
-            'country' => 'Reunion',
+            'country'   => 'Reunion',
             'continent' => 'AF',
         ),
         'RO' => array(
-            'country' => 'Romania',
+            'country'   => 'Romania',
             'continent' => 'EU',
         ),
         'RU' => array(
-            'country' => 'Russian Federation',
+            'country'   => 'Russian Federation',
             'continent' => 'EU',
         ),
         'RW' => array(
-            'country' => 'Rwanda',
+            'country'   => 'Rwanda',
             'continent' => 'AF',
         ),
         'SH' => array(
-            'country' => 'Saint Helena',
+            'country'   => 'Saint Helena',
             'continent' => 'AF',
         ),
         'KN' => array(
-            'country' => 'Saint Kitts and Nevis',
+            'country'   => 'Saint Kitts and Nevis',
             'continent' => 'NA',
         ),
         'LC' => array(
-            'country' => 'Saint Lucia',
+            'country'   => 'Saint Lucia',
             'continent' => 'NA',
         ),
         'PM' => array(
-            'country' => 'Saint Pierre and Miquelon',
+            'country'   => 'Saint Pierre and Miquelon',
             'continent' => 'NA',
         ),
         'VC' => array(
-            'country' => 'Saint Vincent and The Grenadines',
+            'country'   => 'Saint Vincent and The Grenadines',
             'continent' => 'NA',
         ),
         'WS' => array(
-            'country' => 'Samoa',
+            'country'   => 'Samoa',
             'continent' => 'OC',
         ),
         'SM' => array(
-            'country' => 'San Marino',
+            'country'   => 'San Marino',
             'continent' => 'EU',
         ),
         'ST' => array(
-            'country' => 'Sao Tome and Principe',
+            'country'   => 'Sao Tome and Principe',
             'continent' => 'AF',
         ),
         'SA' => array(
-            'country' => 'Saudi Arabia',
+            'country'   => 'Saudi Arabia',
             'continent' => 'AS',
         ),
         'SN' => array(
-            'country' => 'Senegal',
+            'country'   => 'Senegal',
             'continent' => 'AF',
         ),
         'RS' => array(
-            'country' => 'Serbia',
+            'country'   => 'Serbia',
             'continent' => 'EU',
         ),
         'SC' => array(
-            'country' => 'Seychelles',
+            'country'   => 'Seychelles',
             'continent' => 'AF',
         ),
         'SL' => array(
-            'country' => 'Sierra Leone',
+            'country'   => 'Sierra Leone',
             'continent' => 'AF',
         ),
         'SG' => array(
-            'country' => 'Singapore',
+            'country'   => 'Singapore',
             'continent' => 'AS',
         ),
         'SK' => array(
-            'country' => 'Slovakia',
+            'country'   => 'Slovakia',
             'continent' => 'EU',
         ),
         'SI' => array(
-            'country' => 'Slovenia',
+            'country'   => 'Slovenia',
             'continent' => 'EU',
         ),
         'SB' => array(
-            'country' => 'Solomon Islands',
+            'country'   => 'Solomon Islands',
             'continent' => 'OC',
         ),
         'SO' => array(
-            'country' => 'Somalia',
+            'country'   => 'Somalia',
             'continent' => 'AF',
         ),
         'ZA' => array(
-            'country' => 'South Africa',
+            'country'   => 'South Africa',
             'continent' => 'AF',
         ),
         'GS' => array(
-            'country' => 'South Georgia and The South Sandwich Islands',
+            'country'   => 'South Georgia and The South Sandwich Islands',
             'continent' => 'AN',
         ),
         'ES' => array(
-            'country' => 'Spain',
+            'country'   => 'Spain',
             'continent' => 'EU',
         ),
         'LK' => array(
-            'country' => 'Sri Lanka',
+            'country'   => 'Sri Lanka',
             'continent' => 'AS',
         ),
         'SD' => array(
-            'country' => 'Sudan',
+            'country'   => 'Sudan',
             'continent' => 'AF',
         ),
         'SR' => array(
-            'country' => 'Suriname',
+            'country'   => 'Suriname',
             'continent' => 'SA',
         ),
         'SJ' => array(
-            'country' => 'Svalbard and Jan Mayen',
+            'country'   => 'Svalbard and Jan Mayen',
             'continent' => 'EU',
         ),
         'SZ' => array(
-            'country' => 'Swaziland',
+            'country'   => 'Swaziland',
             'continent' => 'AF',
         ),
         'SE' => array(
-            'country' => 'Sweden',
+            'country'   => 'Sweden',
             'continent' => 'EU',
         ),
         'CH' => array(
-            'country' => 'Switzerland',
+            'country'   => 'Switzerland',
             'continent' => 'EU',
         ),
         'SY' => array(
-            'country' => 'Syrian Arab Republic',
+            'country'   => 'Syrian Arab Republic',
             'continent' => 'AS',
         ),
         'TW' => array(
-            'country' => 'Taiwan, Province of China',
+            'country'   => 'Taiwan, Province of China',
             'continent' => 'AS',
         ),
         'TJ' => array(
-            'country' => 'Tajikistan',
+            'country'   => 'Tajikistan',
             'continent' => 'AS',
         ),
         'TZ' => array(
-            'country' => 'Tanzania, United Republic of',
+            'country'   => 'Tanzania, United Republic of',
             'continent' => 'AF',
         ),
         'TH' => array(
-            'country' => 'Thailand',
+            'country'   => 'Thailand',
             'continent' => 'AS',
         ),
         'TL' => array(
-            'country' => 'Timor-leste',
+            'country'   => 'Timor-leste',
             'continent' => 'AS',
         ),
         'TG' => array(
-            'country' => 'Togo',
+            'country'   => 'Togo',
             'continent' => 'AF',
         ),
         'TK' => array(
-            'country' => 'Tokelau',
+            'country'   => 'Tokelau',
             'continent' => 'OC',
         ),
         'TO' => array(
-            'country' => 'Tonga',
+            'country'   => 'Tonga',
             'continent' => 'OC',
         ),
         'TT' => array(
-            'country' => 'Trinidad and Tobago',
+            'country'   => 'Trinidad and Tobago',
             'continent' => 'NA',
         ),
         'TN' => array(
-            'country' => 'Tunisia',
+            'country'   => 'Tunisia',
             'continent' => 'AF',
         ),
         'TR' => array(
-            'country' => 'Turkey',
+            'country'   => 'Turkey',
             'continent' => 'AS',
         ),
         'TM' => array(
-            'country' => 'Turkmenistan',
+            'country'   => 'Turkmenistan',
             'continent' => 'AS',
         ),
         'TC' => array(
-            'country' => 'Turks and Caicos Islands',
+            'country'   => 'Turks and Caicos Islands',
             'continent' => 'NA',
         ),
         'TV' => array(
-            'country' => 'Tuvalu',
+            'country'   => 'Tuvalu',
             'continent' => 'OC',
         ),
         'UG' => array(
-            'country' => 'Uganda',
+            'country'   => 'Uganda',
             'continent' => 'AF',
         ),
         'UA' => array(
-            'country' => 'Ukraine',
+            'country'   => 'Ukraine',
             'continent' => 'EU',
         ),
         'AE' => array(
-            'country' => 'United Arab Emirates',
+            'country'   => 'United Arab Emirates',
             'continent' => 'AS',
         ),
         'GB' => array(
-            'country' => 'United Kingdom',
+            'country'   => 'United Kingdom',
             'continent' => 'EU',
         ),
         'US' => array(
-            'country' => 'United States',
+            'country'   => 'United States',
             'continent' => 'NA',
         ),
         'UM' => array(
-            'country' => 'United States Minor Outlying Islands',
+            'country'   => 'United States Minor Outlying Islands',
             'continent' => 'OC',
         ),
         'UY' => array(
-            'country' => 'Uruguay',
+            'country'   => 'Uruguay',
             'continent' => 'SA',
         ),
         'UZ' => array(
-            'country' => 'Uzbekistan',
+            'country'   => 'Uzbekistan',
             'continent' => 'AS',
         ),
         'VU' => array(
-            'country' => 'Vanuatu',
+            'country'   => 'Vanuatu',
             'continent' => 'OC',
         ),
         'VE' => array(
-            'country' => 'Venezuela',
+            'country'   => 'Venezuela',
             'continent' => 'SA',
         ),
         'VN' => array(
-            'country' => 'Viet Nam',
+            'country'   => 'Viet Nam',
             'continent' => 'AS',
         ),
         'VG' => array(
-            'country' => 'Virgin Islands, British',
+            'country'   => 'Virgin Islands, British',
             'continent' => 'NA',
         ),
         'VI' => array(
-            'country' => 'Virgin Islands, U.S.',
+            'country'   => 'Virgin Islands, U.S.',
             'continent' => 'NA',
         ),
         'WF' => array(
-            'country' => 'Wallis and Futuna',
+            'country'   => 'Wallis and Futuna',
             'continent' => 'OC',
         ),
         'EH' => array(
-            'country' => 'Western Sahara',
+            'country'   => 'Western Sahara',
             'continent' => 'AF',
         ),
         'YE' => array(
-            'country' => 'Yemen',
+            'country'   => 'Yemen',
             'continent' => 'AS',
         ),
         'ZM' => array(
-            'country' => 'Zambia',
+            'country'   => 'Zambia',
             'continent' => 'AF',
         ),
         'ZW' => array(
-            'country' => 'Zimbabwe',
+            'country'   => 'Zimbabwe',
             'continent' => 'AF',
         ),

wpengine-geoip/trunk/js/admin.js

@@ -1 @@
-document.getElementById( 'wpbody' ).addEventListener( 'click', function ( event ) {
-    // If this wasn't a click on a notice-dismiss close button, then abort
-    if ( 'notice-dismiss' !== event.target.className ) {
-        return;
-    }
+/**
+ * This JS file sends an ajax request on admin notification close.
+ *
+ * @package wpengine-geoip
+ */
 
-    // This should be our parent div for the notice
-    var parent = event.path[ 1 ] || null;
+document.getElementById( 'wpbody' ).addEventListener(
+    'click',
+    function ( event ) {
+        // If this wasn't a click on a notice-dismiss close button, then abort.
+        if ( 'notice-dismiss' !== event.target.className ) {
+            return;
+        }
 
-    // If the parent div doesn't have our wpengine-geoip class, then abort
-    if ( !parent || -1 === jQuery.inArray( 'wpengine-geoip', parent.classList ) ) {
-        return;
-    }
+        // This should be our parent div for the notice.
+        var parent = event.path[ 1 ] || null;
 
-    // Get our notice's key
-    var key = parent.attributes[ 'data-key' ].value || null;
+        // If the parent div doesn't have our wpengine-geoip class, then abort.
+        if ( ! parent || -1 === jQuery.inArray( 'wpengine-geoip', parent.classList ) ) {
+            return;
+        }
 
-    // Send our POST request to admin-ajax
-    var http = new XMLHttpRequest();
-    var params = "action=geoip_dismiss_notice&key=" + key;
-    http.open( "POST", ajaxurl, true );
-    http.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
-    http.send( params );
-} );
+        // Get our notice's key.
+        var key = parent.attributes[ 'data-key' ].value || null;
+
+        // Send our POST request to admin-ajax.
+        var http   = new XMLHttpRequest();
+        var params = "action=geoip_dismiss_notice&key=" + key + "&nonce=" + window.nonce;
+        http.open( "POST", ajaxurl, true );
+        http.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
+        http.send( params );
+    }
+);

wpengine-geoip/trunk/readme.txt

@@ -1 +1 @@
 === WP Engine GeoTarget ===
 Contributors: wpengine, markkelnar, stevenkword, stephenlin, ryanshoover, taylor4484, nateinaction
-Tags: wpe, wpengine, geoip, localization, geolocation
+Tags: wpe, wpengine, geotarget, geoip, localization, geolocation
 Requires at least: 3.0.1
-Tested up to: 4.9
-Stable tag: 1.2.5
+Tested up to: 5.2
+Stable tag: 1.2.7
 
 License: GPLv2 or later
@@ -15 +15 @@
 WP Engine GeoTarget integrates with the variables on your WP Engine site to display content catered to the visitor’s location. With the ability to access variables from as broad as country to as specific as latitude and longitude, your website can now display geographically relevant content.
 
-
 = Geo-Marketing =
 
@@ -36 +35 @@
 = * Please Note * =
 
-This plugin will only function on your [WP Engine](http://wpengine.com/plans/?utm_source=wpengine-geoip) Business, Premium or Enterprise level account. This will not function outside of the WP Engine environment.
+Customers on Premium and Enterprise plans can use this plugin at no additional cost. If you are on another plan type and would like to use GeoTarget on one of your sites, you can add it to your plan [here](http://wpengine.com/plans/?utm_source=wpengine-geoip). This will not function outside of the WP Engine environment.
 
 == Installation ==
@@ -78 +77 @@
 == Localized Content ==
 
-9) Content: `[geoip-content country="US"]Your US specific content goes here[/geoip-content]`
+`
+[geoip-content country="US"]Your US specific content goes here[/geoip-content]
+`
+
 The content shortcode allows you to hide or show specific content based on visitor geographies:
 
@@ -262 +264 @@
 == Changelog ==
 
+= 1.2.7 =
+- Optimize plugin name rename loop
+- Bump for WP 5.2 compatibility
+
+= 1.2.6 =
+- Bump for WP 5.0 compatibility
+
 = 1.2.5 =
 - Fix for anchor tag escaping in admin notice

wpengine-geoip/trunk/wpengine-geoip.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Name: WP Engine GeoTarget
- * Version: 1.2.5
- * Description: Create a personalized user experienced based on location.
- * Author: WP Engine
- * Author URI: http://wpengine.com
- * Plugin URI: https://wordpress.org/plugins/wpengine-geoip/
- * Text Domain: wpengine-geoip
- * Domain Path: /languages
+ * This file helps to prevent any issues from file name change
+ * wpengine-geoip.php -> class-geoip.php to adhere to WPCS
  *
  * @package wpengine-geoip
  */
-
-/*
-Examples use of how to add geoip information to post content:
-
-function geoip_append_content( $content ) {
-    $geo = WPEngine\GeoIp::instance();
-    $content .= "How's the weather in {$geo->city()}, {$geo->region()} {$geo->country()}?<br /><br />";
-    return $content;
-}
-add_filter( 'the_content', 'geoip_append_content' );
-*/
 
 namespace WPEngine;
@@ -32 +15 @@
 
 /**
- * Base class for the GeoTarget plugin, GeoTarget was formerly called GeoIP
+ * Replace plugin filename in options table
  */
-class GeoIp {
-
-    /**
-     * The single instance of this object.  No need to have more than one.
-     *
-     * @var class
-     */
-    private static $instance = null;
-
-    /**
-     * The path to the plugin. Let's just make that function call once.
-     *
-     * @var string
-     */
-    private $geoip_path;
-
-    /**
-     * The geographical data loaded from the environment.
-     *
-     * @var array
-     */
-    public $geos;
-
-    /**
-     * A list of countries and their continents.
-     *
-     * @var array
-     */
-    public $countries;
-
-    /**
-     * WP-Admin errors notices.
-     *
-     * @var array
-     */
-    private $admin_notices;
-
-    /**
-     * Text Domain.
-     *
-     * @var string
-     */
-    const TEXT_DOMAIN           = 'wpengine-geoip';
-
-    /**
-     * Version Number.
-     *
-     * @var string
-     */
-    const VERSION               = '1.2.1';
-
-    // Shortcodes.
-    const SHORTCODE_CONTINENT   = 'geoip-continent';
-    const SHORTCODE_COUNTRY     = 'geoip-country';
-    const SHORTCODE_REGION      = 'geoip-region';
-    const SHORTCODE_CITY        = 'geoip-city';
-    const SHORTCODE_POSTAL_CODE = 'geoip-postalcode';
-    const SHORTCODE_LATITUDE    = 'geoip-latitude';
-    const SHORTCODE_LONGITUDE   = 'geoip-longitude';
-    const SHORTCODE_LOCATION    = 'geoip-location';
-    const SHORTCODE_CONTENT     = 'geoip-content';
-
-    /**
-     * Initialize hooks and setup environment variables
-     *
-     * @since 0.1.0
-     */
-    public static function init() {
-
-        // Initialize.
-        add_action( 'init', array( self::instance(), 'setup' ) );
-        add_action( 'init', array( self::instance(), 'action_init_register_shortcodes' ) );
-
-        // Enqueue our javascript.
-        add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_admin_js' ) );
-
-        // Check for dependencies.
-        add_action( 'admin_init', array( self::instance(), 'action_admin_init_check_plugin_dependencies' ), 9999 ); // check late.
-        add_action( 'admin_notices', array( self::instance(), 'action_admin_notices' ) );
-
-        // Process AJAX requests.
-        add_action( 'wp_ajax_geoip_dismiss_notice', array( self::instance(), 'ajax_action_dismiss_notice' ) );
-    }
-
-    /**
-     * Register singleton
-     *
-     * @since 0.1.0
-     */
-    public static function instance() {
-        // Create a new object if it doesn't exist.
-        if ( is_null( self::$instance ) ) {
-            self::$instance = new self;
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Setup environment variables
-     *
-     * @since 0.1.0
-     */
-    public function setup() {
-
-        $this->geoip_path = plugin_dir_path( __FILE__ );
-
-        // Get our array of countries and continents.
-        require_once( $this->geoip_path . '/inc/country-list.php' );
-
-        $this->countries = apply_filters( 'geoip_country_list', geoip_country_list() );
-
-        $this->geos = $this->get_actuals();
-
-        $this->geos = $this->get_test_parameters( $this->geos );
-
-        $this->geos = wp_unslash( $this->geos );
-
-        $this->geos = apply_filters( 'geoip_location_values', $this->geos );
-
-        // Prepopulate the admin notices array.
-        $this->admin_notices = array(
-            'info'    => array(),
-            'error'   => array(),
-            'success' => array(),
-            'warning' => array(),
-        );
-    }
-
-    /**
-     * Enqueue the admin Javascript file
-     *
-     * @since 1.2.1
-     */
-    public function enqueue_admin_js() {
-        // Only enqueue the JS if the notice will be showing.
-        if ( ! $this->helper_should_notice_show( 'dependency' ) ) {
-            return;
-        }
-
-        wp_enqueue_script( self::TEXT_DOMAIN . '-admin-js', plugins_url( 'js/admin.js', __FILE__ ), null, self::VERSION, true );
-    }
-
-    /**
-     * Here we extract the data from headers set by nginx -- lets only send them if they are part of the cache key
-     *
-     * @since 0.1.0
-     * @return array All of the GeoTarget related environment variables available on the current server instance
-     */
-    public function get_actuals() {
-
-        $geos = array(
-            'countrycode'  => getenv( 'HTTP_GEOIP_COUNTRY_CODE' ),
-            'countrycode3' => getenv( 'HTTP_GEOIP_COUNTRY_CODE3' ),
-            'countryname'  => getenv( 'HTTP_GEOIP_COUNTRY_NAME' ),
-            'latitude'     => getenv( 'HTTP_GEOIP_LATITUDE' ),
-            'longitude'    => getenv( 'HTTP_GEOIP_LONGITUDE' ),
-            'areacode'     => getenv( 'HTTP_GEOIP_AREA_CODE' ),
-            'region'       => getenv( 'HTTP_GEOIP_REGION' ),
-            'city'         => getenv( 'HTTP_GEOIP_CITY' ),
-            'postalcode'   => getenv( 'HTTP_GEOIP_POSTAL_CODE' ),
-        );
-
-        $geos['active'] = ( isset( $geos['countrycode'] ) && false !== $geos['countrycode'] )  ? true : false;
-
-        $geos['continent'] = $this->continent( $geos['countrycode'] );
-
-        return $geos;
-    }
-
-    /**
-     * We want people to be able to test the plugin, so we'll include some url parameters that will spoof a location
-     *
-     * @since 1.1.0
-     * @param  array $geos Array of values for the user's location.
-     * @return array       Modified version of the GeoTarget location array based on url parameters
-     */
-    public function get_test_parameters( $geos ) {
-
-        $params = $_GET;
-
-        if ( ! isset( $params['geoip'] ) ) {
-            return $geos;
-        }
-
-        foreach ( $params as $key => $value ) {
-
-            $key = esc_attr( $key );
-            $value = esc_attr( $value );
-
-            $key = $this->match_label_synonyms( $key );
-
-            if ( isset( $geos[ $key ] ) ) {
-                $geos[ $key ] = $value;
-            }
-        }
-
-        return $geos;
-    }
-
-    /**
-     * Get Continent
-     *
-     * @since 1.1.0
-     * @param  string $country Two-letter country code.
-     * @return string          Two-letter continent code, e.g. EU for Europe
-     */
-    public function continent( $country = '' ) {
-
-        $continent = '';
-
-        if ( empty( $country ) ) {
-            $country = $this->geos['countrycode'];
-        }
-
-        if ( isset( $this->countries[ $country ] ) ) {
-            $continent = $this->countries[ $country ]['continent'];
-        }
-
-        return $continent;
-    }
-
-    /**
-     * Get Country
-     *
-     * @since 0.5.0
-     * @return string Two-letter country code, e.g.) US for the United States of America
-     */
-    public function country() {
-        return $this->geos['countrycode'];
-    }
-
-    /**
-     * Get Region
-     *
-     * @since 0.5.0
-     * @return string Two-letter region code. e.g.) CA for California
-     */
-    public function region() {
-        return $this->geos['region'];
-    }
-
-    /**
-     * Get City
-     *
-     * @since 0.5.0
-     * @return mixed Description
-     */
-    public function city() {
-        return $this->geos['city'];
-    }
-
-    /**
-     * Get Postal Code
-     *
-     * @since 0.6.0
-     * @return mixed Description
-     */
-    public function postal_code() {
-        return $this->geos['postalcode'];
-    }
-
-    /**
-     * Get Latitude
-     *
-     * @since 0.6.0
-     * @return mixed Description
-     */
-    public function latitude() {
-        return $this->geos['latitude'];
-    }
-
-    /**
-     * Get Longitude
-     *
-     * @since 0.6.0
-     * @return mixed Description
-     */
-    public function longitude() {
-        return $this->geos['longitude'];
-    }
-
-    /**
-     * Register the shortcode(s)
-     *
-     * @since  0.5.0
-     * @uses add_shortcode()
-     */
-    public function action_init_register_shortcodes() {
-
-        // Continent Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_CONTINENT ) ) {
-            add_shortcode( self::SHORTCODE_CONTINENT, array( $this, 'do_shortcode_continent' ) );
-        }
-
-        // Country Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_COUNTRY ) ) {
-            add_shortcode( self::SHORTCODE_COUNTRY, array( $this, 'do_shortcode_country' ) );
-        }
-
-        // Region Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_REGION ) ) {
-            add_shortcode( self::SHORTCODE_REGION, array( $this, 'do_shortcode_region' ) );
-        }
-
-        // City Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_CITY ) ) {
-            add_shortcode( self::SHORTCODE_CITY, array( $this, 'do_shortcode_city' ) );
-        }
-
-        // Postal Code Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_POSTAL_CODE ) ) {
-            add_shortcode( self::SHORTCODE_POSTAL_CODE, array( $this, 'do_shortcode_postal_code' ) );
-        }
-
-        // Latitude Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_LATITUDE ) ) {
-            add_shortcode( self::SHORTCODE_LATITUDE, array( $this, 'do_shortcode_latitude' ) );
-        }
-
-        // Longitude Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_LONGITUDE ) ) {
-            add_shortcode( self::SHORTCODE_LONGITUDE, array( $this, 'do_shortcode_longitude' ) );
-        }
-
-        // Smart Location Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_LOCATION ) ) {
-            add_shortcode( self::SHORTCODE_LOCATION, array( $this, 'do_shortcode_location' ) );
-        }
-
-        // Smart Location Shortcode.
-        if ( ! shortcode_exists( self::SHORTCODE_CONTENT ) ) {
-            add_shortcode( self::SHORTCODE_CONTENT, array( $this, 'do_shortcode_content' ) );
+function replace_previous_plugin_filename() {
+    $active_plugins = get_option( 'active_plugins', array() );
+    foreach ( $active_plugins as $key => $active_plugin ) {
+        if ( strstr( $active_plugin, '/wpengine-geoip.php' ) ) {
+            $active_plugins[ $key ] = str_replace( '/wpengine-geoip.php', '/class-geoip.php', $active_plugin );
+            break;
         }
     }
-
-    /**
-     * Output the current continent
-     *
-     * @since 1.1.0
-     * @param  array $atts Shortcode attributes.
-     * @return string Two-letter continent code
-     */
-    function do_shortcode_continent( $atts ) {
-        $continent = '[' . self::SHORTCODE_CONTINENT . ']';
-
-        $country = $this->geos['countrycode'];
-
-        if ( isset( $this->countries[ $country ] ) ) {
-            $continent = $this->countries[ $country ]['continent'];
-        }
-        return $continent;
-    }
-
-    /**
-     * Output the current country
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string Two-letter country code
-     */
-    function do_shortcode_country( $atts ) {
-        if ( isset( $this->geos['countrycode'] ) ) {
-            return $this->country();
-        }
-        return '[' . self::SHORTCODE_COUNTRY . ']';
-    }
-
-    /**
-     * Output the current region
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string Two-letter region code
-     */
-    function do_shortcode_region( $atts ) {
-        if ( isset( $this->geos['region'] ) ) {
-            return $this->region();
-        }
-        return '[' . self::SHORTCODE_REGION . ']';
-    }
-
-    /**
-     * Output the current city
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string City name
-     */
-    function do_shortcode_city( $atts ) {
-        if ( isset( $this->geos['city'] ) ) {
-            return $this->city();
-        }
-        return '[' . self::SHORTCODE_CITY . ']';
-    }
-
-    /**
-     * Output the current postal code
-     *
-     * @since  0.6.0
-     * @param  array $atts Shortcode attributes.
-     * @return string postal code
-     */
-    function do_shortcode_postal_code( $atts ) {
-        if ( isset( $this->geos['postalcode'] ) ) {
-            return $this->postal_code();
-        }
-        return '[' . self::SHORTCODE_POSTAL_CODE . ']';
-    }
-
-    /**
-     * Output the current latitude
-     *
-     * @since  0.6.0
-     * @param  array $atts Shortcode attributes.
-     * @return string latitude
-     */
-    function do_shortcode_latitude( $atts ) {
-        if ( isset( $this->geos['latitude'] ) ) {
-            return $this->latitude();
-        }
-        return '[' . self::SHORTCODE_LATITUDE . ']';
-    }
-
-    /**
-     * Output the current longitude
-     *
-     * @since  0.6.0
-     * @param  array $atts Shortcode attributes.
-     * @return string longitude
-     */
-    function do_shortcode_longitude( $atts ) {
-        if ( isset( $this->geos['longitude'] ) ) {
-            return $this->longitude();
-        }
-        return '[' . self::SHORTCODE_LONGITUDE . ']';
-    }
-
-    /**
-     * Output the current human readable location, in a smart way.
-     *
-     * @since  0.5.0
-     * @param  array $atts Shortcode attributes.
-     * @return string $html
-     */
-    function do_shortcode_location( $atts ) {
-
-        $city = $this->city();
-        if ( isset( $city ) && ! empty( $city ) ) {
-            return trim( $this->city() . ', ' . $this->region() . ' ' . $this->country() );
-        }
-        // Fallback.
-        return trim( $this->region() . ' ' . $this->country() );
-    }
-
-    /**
-     * Output the content filtered by region
-     *
-     * @since 1.1.0
-     * @param  array  $atts Shortcode attributes.
-     * @param  string $content HTML content that comes between the shortcode tags.
-     * @return string HTML
-     */
-    function do_shortcode_content( $atts, $content = null ) {
-
-        $keep = true;
-
-        $test_parameters = array();
-
-        // Process and organzie the test parameters.
-        foreach ( $atts as $label => $value ) {
-
-            // Intialize our negation parameters.
-            $negate = 0;
-            $inline_negate = 0;
-
-            // Check to see if the attribute has "not" in it.
-            $negate = preg_match( '/not?[-_]?(.*)/', $label, $matches );
-
-            // WordPress doesn't like a dash in shortcode parameter labels.
-            // Just in case, check to see if the value has "not-" in it.
-            if ( ! $negate ) {
-                $negate = preg_match( '/not?\-([^=]+)\=\"?([^"]+)\"?/', $value, $matches );
-                $inline_negate = $negate;
-            }
-
-            // Label after the negation match.
-            $label = $negate ? $matches[1] : $label;
-
-            // Value after the negation match.
-            $value = $inline_negate ? $matches[2] : $value;
-
-            // Replace common synonyms with our values.
-            $label = $this->match_label_synonyms( $label );
-
-            // Abort if the label doesn't match.
-            if ( ! isset( $this->geos[ $label ] ) ) {
-                continue;
-            }
-
-            // Find out if the value is comma delimited.
-            $test_values = (array) explode( ',',  $value );
-
-            // Add the value to the test parameters.
-            $test_parameters[ $label ] = array(
-                'test_values' => $test_values,
-                'negate' => $negate,
-                );
-        }// End foreach().
-
-        // Sort the test parameters by region type – largest to smallest.
-        uksort( $test_parameters, array( $this, 'compare_location_type' ) );
-
-        $test_parameters = apply_filters( 'geoip_test_parameters', $test_parameters, $atts );
-
-        // Process through parameters, testing to see if we have a match.
-        foreach ( $test_parameters as $label => $parameter ) {
-
-            $test_values = $parameter['test_values'];
-
-            $negate = $parameter['negate'];
-
-            // Sanitize the match value.
-            $match_value = strtolower( $this->geos[ $label ] );
-
-            // Sanitize the test values.
-            foreach ( $test_values as &$test_value ) {
-                $test_value = strtolower( trim( $test_value, " \t\"." ) );
-            }
-
-            $is_match = in_array( $match_value, $test_values, true );
-
-            $is_match = ! $negate ? $is_match : ! $is_match;
-
-            if ( ! $is_match ) {
-                $keep = false;
-            }
-        }
-
-        if ( ! $keep ) {
-            return '';
-        }
-
-        // Process any shortcodes in the content.
-        $content = do_shortcode( $content );
-
-        return apply_filters( 'geoip_content', $content, $atts );
-    }
-
-    /**
-     * Compare the location types
-     *
-     * Used for sorting location types from largest area to smallest area
-     *
-     * @since 1.1.2
-     * @param  string $a Type of location.
-     * @param  string $b Type of location.
-     * @return int       Whether $a is more important than b
-     */
-    public function compare_location_type( $a, $b ) {
-        $location_types = array(
-            'continent'    => 1,
-            'countrycode'  => 2,
-            'countrycode3' => 2,
-            'countryname'  => 2,
-            'region'       => 3,
-            'areacode'     => 4,
-            'city'         => 5,
-            'postalcode'   => 6,
-            );
-
-        if ( isset( $location_types[ $a ] ) && isset( $location_types[ $b ] ) ) {
-            return $location_types[ $a ] - $location_types[ $b ];
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Checks if environment variable depencies are available on the server
-     *
-     * @todo Include link to query documentation when available on the Plugin Directory
-     * @since  0.5.0
-     */
-    public function action_admin_init_check_plugin_dependencies() {
-        $notice_key = 'dependency';
-
-        if ( $this->helper_should_notice_show( $notice_key ) ) {
-            /* translators: Tells users that the plugin won't automatically work if they're not in the right setup */
-            $notice = __( 'WP Engine GeoTarget requires a <a href="%s">WP Engine account</a> with GeoTarget enabled for full functionality. Only testing queries will work on this site.', 'wpengine-geoip' );
-            $this->admin_notices['warning'][ $notice_key ] = sprintf( $notice, 'http://wpengine.com/plans/?utm_source=' . self::TEXT_DOMAIN );
-        }
-    }
-
-    /**
-     * Displays any of our registered notices
-     *
-     * @since  0.5.0
-     */
-    public function action_admin_notices() {
-        foreach ( $this->admin_notices as $type => $notices ) {
-            foreach ( $notices as $key => $notice ) {
-                ?>
-                <div class="notice notice-<?php echo esc_attr( $type ); ?> wpengine-geoip is-dismissible" data-key="<?php echo esc_attr( $key ); ?>">
-                    <p>
-                        <?php
-                            echo wp_kses(
-                                $notice,
-                                array(
-                                    'a' => array(
-                                        'href' => array(),
-                                    ),
-                                    'span',
-                                    'strong',
-                                    'em',
-                                )
-                            );
-                        ?>
-                    </p>
-                </div>
-                <?php
-            }
-        }
-    }
-
-    /**
-     * Process an AJAX request to dismiss any notices
-     * Adds a user meta field marking when the notice was dismissed
-     *
-     * @since 1.2.1
-     */
-    public function ajax_action_dismiss_notice() {
-        if ( empty( $_POST['key'] ) ) {
-            return;
-        }
-
-        $meta_key = self::TEXT_DOMAIN . '-notice-dismissed-' . esc_attr( wp_unslash( $_POST['key'] ) );
-
-        add_user_meta( get_current_user_id(), $meta_key, time(), true );
-    }
-
-    /**
-     * Helper: Should a notice show in the dashboard?
-     *
-     * @since 1.2.1
-     * @param  string $notice Key of the notice we're testing for.
-     * @return bool           Should we show the notice or not.
-     */
-    protected function helper_should_notice_show( $notice ) {
-        if ( ! $notice ) {
-            return false;
-        }
-
-        $is_active = $this->geos['active'];
-        $is_dismissed = get_user_meta( get_current_user_id(), self::TEXT_DOMAIN . '-notice-dismissed-' . $notice, true );
-
-        // false = GeoTarget is active, or if we've dismissed the notice before.
-        // true = GeoTarget is not active and we haven't dismissed the notice before.
-        return ! ( $is_active || $is_dismissed );
-    }
-
-    /**
-     * As a favor to users, let's match some common synonyms
-     *
-     * @since 1.1.0
-     * @param  string $label The address label that needs a synonym.
-     * @return string label
-     */
-    private function match_label_synonyms( $label ) {
-
-        if ( 'country' === $label ) {
-            $label = 'countrycode';
-        }
-
-        if ( 'state' === $label ) {
-            $label = 'region';
-        }
-
-        if ( 'zipcode' === $label || 'zip' === $label ) {
-            $label = 'postalcode';
-        }
-
-        return $label;
-    }
-
-    /**
-     * Utility function: Calculate distance to point
-     *
-     * Provided a lat/lng, calculate the distance from visitor's location
-     * Uses the Haversine Formula, accurate for short distance but not over poles or the equator
-     *
-     * Note: Test against a return value of false to make sure you got a calculated distance. Example:
-     * $geo = WPEngine\GeoIp::instance();
-     * if ( false !== $geo->distance_to( $latitude, $longitude ) ) {
-     *   // Do something
-     * }
-     *
-     * @link http://andrew.hedges.name/experiments/haversine/
-     * @since 1.2
-     * @param  float $lat     Latitude of the destination in degrees.
-     * @param  float $lng     Longitude of the destination in degrees.
-     * @param  bool  $metric  Whether to calculate the distance in kilometers or miles.
-     * @return float          Distance in miles
-     */
-    public function distance_to( $lat, $lng, $metric = false ) {
-        $start_lat = deg2rad( $this->latitude() );
-        $start_lng = deg2rad( $this->longitude() );
-
-        // Test for null values passed into the function or a 0,0 coordinate for the user.
-        // If either exist, abort. (0,0 is the result when coordinates fail).
-        if ( is_null( $lat ) || is_null( $lng ) || ( empty( $start_lat ) && empty( $start_lng ) ) ) {
-            return false;
-        }
-
-        // Choose the right radius for the results: radius of the Earth in kilometers and miles.
-        $radius = $metric ? 6373 : 3961;
-
-        // Sanitize the user submitted variables.
-        $lat = floatval( $lat );
-        $lng = floatval( $lng );
-
-        $dlng = $lng - $start_lng;
-        $dlat = $lat - $start_lat;
-
-        // Calculate the distance.
-        $a = ( sin( $dlat / 2 ) * sin( $dlat / 2 ) ) + ( cos( $lat ) * cos( $start_lat ) * sin( $dlng / 2 ) * sin( $dlng / 2 ) );
-        $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) );
-        $d = $radius * $c;
-
-        return $d;
-    }
+    update_option( 'active_plugins', $active_plugins );
 }
-
-// Register the GeoTarget plugin instance.
-GeoIp::init();
+replace_previous_plugin_filename();