Changeset 3790302

Timestamp:

11/08/2026 12:34:07 AM (40 hours ago)

Author:

visitoratlas

Message:

Release VisitorAtlas Core 2.6.25: local reporting and presentation features in Core, simplified reports, and voluntary donation support.

Location:

visitoratlas/trunk

Files:

• assets/dark.jpg (added)
• assets/light.jpg (added)
• assets/newsletter-confirmation.js (added)
• assets/political.jpg (added)
• assets/report-columns.js (added)
• assets/report-refresh.js (added)
• assets/texture-picker.js (added)
• includes/acquisition-dashboard.php (modified) (4 diffs)
• includes/advanced-reporting.php (added)
• includes/conversion-integrations.php (added)
• includes/core-enhancements.php (added)
• includes/newsletter-confirmation.php (added)
• includes/presentation.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• visitoratlas.php (modified) (8 diffs)

visitoratlas/trunk/includes/acquisition-dashboard.php

@@ -54 +54 @@
     public function acquisition_report_context( $input = null ) {
         $input = is_array( $input ) ? $input : $_GET; // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Read-only dashboard filters.
-        $sites = $this->acquisition_sites();
         $primary = self::primary_site_id();
-        $site_id = isset( $input['site_id'] ) ? absint( $input['site_id'] ) : $primary;
-        $site_unavailable = $site_id && ! isset( $sites[$site_id] );
-        if ( $site_unavailable ) { $site_id = $primary; }
-        $site = $sites[$site_id] ?? array( 'id' => $primary, 'site_name' => get_bloginfo( 'name' ), 'site_url' => home_url( '/' ), 'created_at' => '' );
+        $site_id = $primary;
+        $site = array( 'id' => $primary, 'site_name' => get_bloginfo( 'name' ), 'site_url' => home_url( '/' ), 'created_at' => '' );
         $timezone = wp_timezone();
         $today = new DateTimeImmutable( 'today', $timezone );
         $oldest = $this->acquisition_date( $this->acquisition_installed_on( $site ), $timezone ) ?: $today;
         if ( $oldest > $today ) { $oldest = $today; }
-        $preset = isset( $input['range'] ) && is_string( $input['range'] ) ? sanitize_key( $input['range'] ) : 'month';
+        $preset = isset( $input['range'] ) && is_string( $input['range'] ) ? sanitize_key( $input['range'] ) : 'last_30_days';
         $start = $today;
-        if ( 'week' === $preset ) {
-            $weekday = (int) $today->format( 'w' );
-            $start = $today->modify( '-' . ( ( $weekday - (int) get_option( 'start_of_week', 0 ) + 7 ) % 7 ) . ' days' );
-        } elseif ( 'month' === $preset ) {
-            $start = $today->modify( 'first day of this month' );
-        } elseif ( 'year' === $preset ) {
-            $start = $today->setDate( (int) $today->format( 'Y' ), 1, 1 );
-        } elseif ( 'custom' === $preset ) {
-            $start = $this->acquisition_date( $input['from'] ?? null, $timezone ) ?: $today;
+        if ( 'last_7_days' === $preset ) {
+            $start = $today->modify( '-6 days' );
+        } elseif ( 'last_30_days' === $preset ) {
+            $start = $today->modify( '-29 days' );
+        } elseif ( 'last_90_days' === $preset ) {
+            $start = $today->modify( '-89 days' );
+        } elseif ( 'all_retained_data' === $preset ) {
+            $start = $oldest;
         } else {
-            $preset = 'today';
-        }
-        $end = 'custom' === $preset ? ( $this->acquisition_date( $input['to'] ?? null, $timezone ) ?: $today ) : $today;
+            $preset = 'last_30_days';
+            $start = $today->modify( '-29 days' );
+        }
+        $end = $today;
         if ( $start < $oldest ) { $start = $oldest; }
         if ( $start > $today ) { $start = $today; }
@@ -88 +85 @@
         if ( ! in_array( $channel, $channels, true ) ) { $channel = ''; }
         return array(
-            'sites' => $sites, 'site' => $site, 'site_id' => $site_id, 'site_unavailable' => $site_unavailable, 'oldest' => $oldest->format( 'Y-m-d' ),
+            'site' => $site, 'site_id' => $site_id, 'oldest' => $oldest->format( 'Y-m-d' ),
             'preset' => $preset, 'from' => $start->format( 'Y-m-d' ), 'to' => $end->format( 'Y-m-d' ),
             'from_utc' => $start->setTimezone( new DateTimeZone( 'UTC' ) )->format( 'Y-m-d H:i:s' ),
@@ -152 +149 @@
     public function render_acquisition_dashboard() {
         $context = $this->acquisition_report_context();
-        if ( ! empty( $context['site_unavailable'] ) ) {
-            echo '<div class="notice notice-error"><p>The selected site is unavailable or could not be authenticated. No report was loaded.</p></div>';
-            return;
-        }
         echo '<form class="va-acquisition-filters" method="get" action="' . esc_url( admin_url( 'admin.php' ) ) . '"><input type="hidden" name="page" value="ps-lvg-acquisition">';
-        if ( count( $context['sites'] ) > 1 ) {
-            echo '<label for="va-report-site">Site</label><select id="va-report-site" name="site_id">';
-            foreach ( $context['sites'] as $id => $site ) {
-                echo '<option value="' . esc_attr( $id ) . '" ' . selected( $context['site_id'], $id, false ) . '>' . esc_html( $site['site_name'] ?: $site['site_url'] ) . '</option>';
-            }
-            echo '</select>';
-        } else {
-            echo '<span class="va-acquisition-site"><strong>Site:</strong> ' . esc_html( $context['site']['site_name'] ?: $context['site']['site_url'] ) . '</span>';
-        }
         echo '<label for="va-report-range">Date range</label><select id="va-report-range" name="range">';
-        foreach ( array( 'today' => 'Today', 'week' => 'This Week', 'month' => 'This Month', 'year' => 'This Year', 'custom' => 'Custom' ) as $value => $label ) {
+        foreach ( array( 'last_7_days' => 'Last 7 days', 'last_30_days' => 'Last 30 days', 'last_90_days' => 'Last 90 days', 'all_retained_data' => 'All retained data' ) as $value => $label ) {
             echo '<option value="' . esc_attr( $value ) . '" ' . selected( $context['preset'], $value, false ) . '>' . esc_html( $label ) . '</option>';
         }
-        echo '</select><span class="va-acquisition-custom"><label for="va-report-from">From</label><input id="va-report-from" type="date" name="from" min="' . esc_attr( $context['oldest'] ) . '" max="' . esc_attr( wp_date( 'Y-m-d' ) ) . '" value="' . esc_attr( $context['from'] ) . '"><label for="va-report-to">To</label><input id="va-report-to" type="date" name="to" min="' . esc_attr( $context['oldest'] ) . '" max="' . esc_attr( wp_date( 'Y-m-d' ) ) . '" value="' . esc_attr( $context['to'] ) . '"></span>';
+        echo '</select>';
         echo '<label for="va-report-channel">Channel</label><select id="va-report-channel" name="channel"><option value="">All channels</option>';
         foreach ( $context['channels'] as $channel ) { echo '<option value="' . esc_attr( $channel ) . '" ' . selected( $context['channel'], $channel, false ) . '>' . esc_html( $channel ) . '</option>'; }
@@ -178 +162 @@
         echo '</div>';
         echo '<p class="description">Dates use the site timezone. Reports show retained visits only; the earliest selectable date is the first known installation or recorded visit date. Visitors are deduplicated by a salted browser identifier. WordPress signups use account creation dates and each account\'s earliest retained human visit for channel attribution.</p>';
-        if ( has_action( 'visitoratlas_acquisition_reports' ) ) {
-            echo '<p class="notice notice-info inline" style="padding:8px 12px">Additional Pro reports below use their own retained-history period and do not yet follow these Core filters.</p>';
-        }
     }
 

visitoratlas/trunk/includes/presentation.php

@@ -55 +55 @@
         echo '</div><p>© 2026 Ultimate Liberty Ventures Trust · VisitorAtlas ' . esc_html( self::VERSION ) . '</p></div>';
     }
-    public function integrations_page() {
-        if ( ! current_user_can( 'manage_options' ) ) { return; }
-        if ( has_action( 'visitoratlas_integrations_page' ) ) { do_action( 'visitoratlas_integrations_page', $this ); return; }
-        echo '<div class="wrap"><h1>Conversion Integrations</h1><p>VisitorAtlas Pro supplies configurable provider adapters for Elementor Forms, MailPoet forms, Mailchimp for WordPress, Gravity Forms, and WPForms.</p><p>Install and activate the separate VisitorAtlas Pro add-on to track conversions from these providers. Existing settings and conversion records remain intact.</p></div>';
-    }
 }

visitoratlas/trunk/readme.txt

@@ -1 +1 @@
 === VisitorAtlas ===
 Contributors: visitoratlas
+Donate link: https://visitoratlas.io/donate.php
 Tags: analytics, visitors, globe, acquisition, statistics
 Requires at least: 6.5
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 2.6.24
+Stable tag: 2.6.25
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -157 +158 @@
 == Changelog ==
 
+= 2.6.25 =
+* Core now includes local advanced reporting, conversion integrations, newsletter confirmation-page tracking, additional map styles, custom textures, page-flow detail, and bot reporting.
+* Simplified the acquisition report date selector to last 7, 30, or 90 days, or all retained data; reports now apply to this WordPress installation only.
+* Added an optional donation link to help fund ongoing development.
+
 = 2.6.24 =
 * Arrange Core settings in two columns with the existing live map preview beside the settings and a single-column layout on narrower screens. No settings behaviour changes.

visitoratlas/trunk/visitoratlas.php

@@ -3 +3 @@
  * Plugin Name: VisitorAtlas
  * Description: Interactive live visitor Globe and Polar Azimuthal maps with configurable rotation, zoom, daylight, and touch/mouse controls.
- * Version: 2.6.24
+ * Version: 2.6.25
  * Author: VisitorAtlas SI
  * Author URI: https://profiles.wordpress.org/visitoratlas/
@@ -28 +28 @@
 require_once __DIR__ . '/includes/reporting.php';
 require_once __DIR__ . '/includes/acquisition-dashboard.php';
+require_once __DIR__ . '/includes/advanced-reporting.php';
+require_once __DIR__ . '/includes/conversion-integrations.php';
+require_once __DIR__ . '/includes/newsletter-confirmation.php';
+require_once __DIR__ . '/includes/core-enhancements.php';
 require_once __DIR__ . '/includes/weekly-email-report.php';
 require_once __DIR__ . '/includes/sites.php';
@@ -41 +45 @@
     use VisitorAtlas_Reporting;
     use VisitorAtlas_Acquisition_Dashboard;
+    use VisitorAtlas_Core_Advanced_Reporting;
+    use VisitorAtlas_Core_Conversion_Integrations;
+    use VisitorAtlas_Core_Newsletter_Confirmation;
+    use VisitorAtlas_Core_Enhancements;
     use VisitorAtlas_Weekly_Email_Report;
     use VisitorAtlas_Tracked_Sites;
-    const VERSION = '2.6.24';
+    const VERSION = '2.6.25';
     const DB_VERSION = '1.11.1';
     const OPTION  = 'ps_lvg_settings';
@@ -68 +76 @@
         add_action( 'init', array( $this, 'ready' ), 3 );
         add_action( 'init', array( $this, 'boot_mailpoet_pending_confirmations' ), 4 );
+        add_action( 'init', array( $this, 'boot_conversion_integrations' ), 4 );
+        $this->boot_newsletter_confirmation();
+        add_filter( 'visitoratlas_globe_styles', array( $this, 'core_extended_globe_styles' ) );
+        add_filter( 'visitoratlas_globe_config', array( $this, 'page_flow_globe_config' ), 10, 2 );
+        add_filter( 'visitoratlas_globe_point', array( $this, 'point_data' ), 10, 2 );
+        add_action( 'visitoratlas_globe_settings_fields', array( $this, 'texture_field' ) );
+        add_action( 'visitoratlas_globe_color_settings_rows', array( $this, 'multi_page_color_field' ) );
+        add_filter( 'visitoratlas_sanitize_presentation_settings', array( $this, 'sanitize_texture' ), 10, 2 );
+        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_texture_picker' ) );
+        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_acquisition_columns' ), 20 );
+        add_action( 'visitoratlas_acquisition_reports', array( $this, 'render_pro_reports' ) );
+        add_action( 'visitoratlas_acquisition_page_init', array( $this, 'handle_report_action' ) );
+        add_action( 'wp_ajax_visitoratlas_advanced_acquisition_report', array( $this, 'ajax_pro_acquisition_report' ) );
+        add_filter( 'visitoratlas_dashboard_counts', array( $this, 'add_bot_dashboard_count' ), 10, 2 );
         add_action( 'init', array( $this, 'maybe_schedule_mailpoet_reconciliation' ), 20 );
         add_action( 'visitoratlas_mailpoet_reconcile', array( $this, 'reconcile_mailpoet_pending' ) );
@@ -292 +314 @@
             'geolocation_enabled' => 0,
             'custom_texture_id' => 0,
+            'multi_page_color' => '#f59e0b',
             'button_background_color' => '#132335',
             'button_border_weight' => 1,
@@ -1053 +1076 @@
         add_submenu_page( 'visitoratlas', 'UTM Links', 'UTM Links', 'manage_options', 'visitoratlas-utm-links', array( $this, 'utm_links_page' ) );
         add_submenu_page( 'visitoratlas', 'Conversion Integrations', 'Conversion Integrations', 'manage_options', 'ps-lvg-integrations', array( $this, 'integrations_page' ) );
-        if ( ! isset( $GLOBALS['visitoratlas_pro'] ) ) {
-            add_submenu_page( 'visitoratlas', 'Upgrade to Pro', 'Upgrade to Pro', 'manage_options', 'visitoratlas-upgrade-pro', array( $this, 'upgrade_to_pro_page' ) );
-        }
+        add_submenu_page( 'visitoratlas', 'Help fund ongoing development', 'Help fund ongoing development', 'manage_options', 'visitoratlas-donate', array( $this, 'donation_page' ) );
         do_action( 'visitoratlas_admin_menu', $this );
     }
 
     public function enqueue_admin_menu_assets() {
-        if ( ! current_user_can( 'manage_options' ) || isset( $GLOBALS['visitoratlas_pro'] ) ) { return; }
+        if ( ! current_user_can( 'manage_options' ) ) { return; }
         $base_url = plugin_dir_url( __FILE__ );
         wp_register_style( 'visitoratlas-admin-menu', $base_url . 'assets/admin-menu.css', array(), self::VERSION );
@@ -1068 +1089 @@
     }
 
-    public function upgrade_to_pro_page() {
-        if ( ! current_user_can( 'manage_options' ) ) { return; }
-        echo '<div class="wrap"><h1>Upgrade to Pro</h1><p>Explore VisitorAtlas Pro plans and choose the coverage for your WordPress sites.</p><p><a class="button button-primary" href="https://visitoratlas.io/#pricing" target="_blank" rel="noopener noreferrer">View Pro plans</a></p></div>';
-    }
-
     public function redirect_legacy_globe_settings() {
         // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Read-only admin navigation parameter used solely for a safe redirect.
@@ -1078 +1094 @@
         wp_safe_redirect( admin_url( 'admin.php?page=visitoratlas' ) );
         exit;
+    }
+
+    public function donation_page() {
+        if ( ! current_user_can( 'manage_options' ) ) { return; }
+        echo '<div class="wrap"><h1>Help fund ongoing development</h1><p>VisitorAtlas Core is free software. Voluntary contributions help support maintenance, privacy work, compatibility testing, and documentation.</p><p>A contribution does not purchase a licence, feature, support level, Cloud Sites access, credit, or any other product or service.</p><p><a class="button button-secondary" href="https://visitoratlas.io/donate.php" target="_blank" rel="noopener noreferrer">Help fund ongoing development</a></p></div>';
     }