1.1.1; validated for WordPress 6.7.x

README.md

@@ -1,4 +1,4 @@
-[![Software License](https://img.shields.io/badge/License-GPL%20v2-green.svg?style=flat-square)](LICENSE) [![PHP 7.2\+](https://img.shields.io/badge/PHP-7.2-blue?style=flat-square)](https://php.net) [![PHP 7.4\+](https://img.shields.io/badge/PHP-7.4-blue?style=flat-square)](https://php.net) [![WordPress 5](https://img.shields.io/badge/WordPress-5.8-orange?style=flat-square)](https://wordpress.org)
+[![Software License](https://img.shields.io/badge/License-GPL%20v2-green.svg?style=flat-square)](LICENSE) [![PHP 7.2\+](https://img.shields.io/badge/PHP-7.2-blue?style=flat-square)](https://php.net) [![PHP 7.4\+](https://img.shields.io/badge/PHP-7.4-blue?style=flat-square)](https://php.net) [![WordPress 5](https://img.shields.io/badge/WordPress-5.8-orange?style=flat-square)](https://wordpress.org)  [![WordPress 6](https://img.shields.io/badge/WordPress-6.7-orange?style=flat-square)](https://wordpress.org)
 
 # EasyMap
 
@@ -28,7 +28,7 @@ The plugin is also available on [wordpress.org](https://wordpress.org/plugins/ea
 ### Other notes:
 
 * This plugin `may` work with earlier versions of WordPress
-* This plugin has been tested with `WordPress 5.4, 5.5, 5.6, 5.7, and 5.8` at the time of this writing
+* This plugin has been tested with `WordPress 5.5+` at the time of this writing
 * This plugin optionally makes use of `mb_` PHP functions
 * This plugin may create entries in your PHP error log (if active)
 * This plugin contains no tracking code and does not store any information about users
@@ -54,6 +54,11 @@ This is a hard question to answer. There are no known incompatibilities.
 
 ## Changelog
 
+### 1.1.1
+* Validated with WordPress 6.7
+* Verified with Plugin Check (PCP)
+* Corrected some checks for **uninstall.php** and made it more WP-CLI compatible
+
 ### 1.1.0
 * Location status (active/inactive) is now displayed in admin, and sortable
 * Locations with incomplete geolocation data are no longer displayed
@@ -70,6 +75,9 @@ This is a hard question to answer. There are no known incompatibilities.
 
 ## Upgrade Notice
 
+### 1.1.1
+* Simply update the plugin from the WordPress plugins
+
 ### 1.1.0
 * Simply update the plugin from the WordPress plugins
 
@@ -83,13 +91,13 @@ This is a hard question to answer. There are no known incompatibilities.
 
 Please see [LICENSE](LICENSE) for a full copy of GPLv2
 
-Copyright (C) 2021 [Joaquim Homrighausen](https://github.com/joho1968); all rights reserved.
+Copyright 2021-2025 [Joaquim Homrighausen](https://github.com/joho1968); all rights reserved.
 
 The EasyMap Plugin was written by Joaquim Homrighausen while converting :coffee: into code.
 
-EasyMap is sponsored by [WebbPlatsen i Sverige AB](https://webbplatsen.se), Stockholm, Sweden.
+EasyMap is sponsored by [WebbPlatsen i Sverige AB](https://webbplatsen.se), Sweden.
 
-Commercial support and customizations for this plugin is available from WebbPlatsen i Sverige AB in Stockholm, :sweden:
+Commercial support and customizations for this plugin is available from WebbPlatsen i Sverige AB in :sweden:
 
 If you find this plugin useful, the author is happy to receive a donation, good review, or just a kind word.
 

easymap/css/easymap-admin.css

@@ -182,4 +182,7 @@ label.easymap-form-label:after {
     font-size:1.0em;
     width:100%;
     background-color: #eeeeee;
-}
+}
+.easymap-row {
+    margin-top: 5px;
+}

easymap/include/class_easymap_util.inc.php

@@ -8,7 +8,7 @@
  * @author     Joaquim Homrighausen <joho@webbplatsen.se>
  *
  * class_easymap_util.inc.php
- * Copyright (C) 2021 Joaquim Homrighausen where applicable
+ * Copyright 2021-2025 Joaquim Homrighausen where applicable
  * Development sponsored by WebbPlatsen i Sverige AB, www.webbplatsen.se
  *
  * This file is part of EasyMap. EasyMap is free software.

easymap/include/class_location_admin.inc.php

@@ -8,7 +8,7 @@
  * @author     Joaquim Homrighausen <joho@webbplatsen.se>
  *
  * class_location_admin.inc.php
- * Copyright (C) 2021 Joaquim Homrighausen where applicable
+ * Copyright 2021-2025 Joaquim Homrighausen where applicable
  * Development sponsored by WebbPlatsen i Sverige AB, www.webbplatsen.se
  *
  * This file is part of EasyMap. EasyMap is free software.
@@ -244,7 +244,7 @@ protected function retain_search_pagination() {
     public function extra_tablenav( $which ) {
         if ( $which == 'top' ) {
             $addon_str = $this->retain_search_pagination();
-            echo '<a href="?page=' . EASYMAP_LOCATION_LIST_PAGE_NAME .
+            echo '<a href="?page=' . esc_html( EASYMAP_LOCATION_LIST_PAGE_NAME ) .
                  '&action=edit' .
                  '&location=new' .
                  '&_wpnonce=' . esc_attr( $this->single_item_edit_nonce ) .

easymap/languages/easymap-sv_SE.po

@@ -1,15 +1,15 @@
 # EasyMap WordPress plugin SWEDISH translation
-# Copyright (C) 2021 Joaquim Homrighausen
+# Copyright 2021-2025 Joaquim Homrighausen
 # This file is distributed under the same license as the EasyMap package.
 # Joaquim Homrighausen <joho@webbplatsen.se>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: easymap 1.0.0\n"
+"Project-Id-Version: easymap 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-26 11:34+0200\n"
-"PO-Revision-Date: 2021-07-26 15:05+0200\n"
+"PO-Revision-Date: 2025-01-28 14:45+0200\n"
 "Last-Translator: Joaquim Homrighausen <joho@webbplatsen.se>\n"
 "Language-Team: SWEDISH <support@webbplatsen.se>\n"
 "Language: \n"
@@ -662,3 +662,20 @@ msgstr "Du kan också komplettera med parametrar för att ändra resultatet"
 #: easymap.php:832
 msgid "The parameters available are"
 msgstr "De tillgängliga parametrarna är"
+
+#: easymap.php
+msgid ""
+"Plugin that provides integration with Mattermost, including notifications "
+"and OAuth2 authentication"
+msgstr ""
+
+#: easymap.php
+msgid ""
+"Plugin that provides uncomplicated 2FA protection"
+msgstr ""
+
+#: easymap.php
+msgid ""
+"Security plugin that provides integration with fail2ban and many other "
+"security features for WordPress"
+msgstr ""

easymap/languages/easymap.pot

@@ -1,15 +1,15 @@
 # EasyMap WordPress plugin <LANGUAGE> translation
-# Copyright (C) 2021 Joaquim Homrighausen
+# Copyright 2021-2025 Joaquim Homrighausen
 # This file is distributed under the same license as the EasyMap package.
 # Joaquim Homrighausen <joho@webbplatsen.se>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-26 15:05+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2025-01-28 14:45+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -651,3 +651,24 @@ msgstr ""
 #: easymap.php:832
 msgid "The parameters available are"
 msgstr ""
+
+#: easymap.php
+msgid "Other plugins"
+msgstr ""
+
+#: easymap.php
+msgid ""
+"Plugin that provides integration with Mattermost, including notifications "
+"and OAuth2 authentication"
+msgstr ""
+
+#: easymap.php
+msgid ""
+"Plugin that provides uncomplicated 2FA protection"
+msgstr ""
+
+#: easymap.php
+msgid ""
+"Security plugin that provides integration with fail2ban and many other "
+"security features for WordPress"
+msgstr ""

easymap/uninstall.php

@@ -8,7 +8,7 @@
  * @author            Joaquim Homrighausen <joho@webbplatsen.se>
  *
  * uninstall.php
- * Copyright (C) 2021 Joaquim Homrighausen; all rights reserved.
+ * Copyright 2021-2025 Joaquim Homrighausen; all rights reserved.
  * Development sponsored by WebbPlatsen i Sverige AB, www.webbplatsen.se
  *
  * This file is part of EasyMap. EasyMap is free software.
@@ -31,15 +31,20 @@
 
 //  define( 'EASYMAP_UNINSTALL_TRACE', true );
 
-// Don't load directly
 defined( 'ABSPATH' ) || die( '-1' );
 // If uninstall not called from WordPress, then exit
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
     if ( defined( 'EASYMAP_UNINSTALL_TRACE' ) ) {
-        error_log( 'easymap-uninstall: init' );
+        error_log( 'easymap-uninstall: init, WP_UNINSTALL_PLUGIN not defined' );
     }
     exit;
 }
+
+/**
+ * We don't check these anymore.
+ * https://developer.wordpress.org/plugins/plugin-basics/uninstall-methods/
+ */
+/*
 // If action is not to uninstall, then exit
 if ( empty( $_REQUEST['action'] ) || $_REQUEST['action'] !== 'delete-plugin' ) {
     if ( defined( 'EASYMAP_UNINSTALL_TRACE' ) ) {
@@ -61,6 +66,7 @@
     }
     exit;
 }
+*/
 
 // Figure out if an uninstall should remove plugin settings
 $remove_settings = get_option( 'easymap-settings-remove', '0' );