Changeset 3485123

Timestamp:

03/17/2026 09:27:33 PM (11 days ago)

Author:

mostafa.s1990

Message:

Update to version 5.4.4 from GitHub

Location:

wp-slimstat

Files:

• tags/5.4.4 (copied) (copied from wp-slimstat/trunk)
• tags/5.4.4/admin/config/index.php (modified) (1 diff)
• tags/5.4.4/languages/wp-slimstat.pot (modified) (3 diffs)
• tags/5.4.4/readme.txt (modified) (2 diffs)
• tags/5.4.4/src/Helpers/DataBuckets.php (modified) (4 diffs)
• tags/5.4.4/wp-slimstat.php (modified) (2 diffs)
• trunk/admin/config/index.php (modified) (1 diff)
• trunk/languages/wp-slimstat.pot (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/src/Helpers/DataBuckets.php (modified) (4 diffs)
• trunk/wp-slimstat.php (modified) (2 diffs)

wp-slimstat/tags/5.4.4/admin/config/index.php

@@ -592 +592 @@
                 'title'       => __('Content Types', 'wp-slimstat'),
                 'type'        => 'textarea',
-                'description' => __('Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. See note at the bottom of this page for more information on how to use wildcards. String should be entered in lowercase.', 'wp-slimstat'),
+                'description' => __('Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. For custom post types, use the <code>cpt:</code> prefix (e.g., <code>cpt:product</code>, <code>cpt:portfolio</code>). See note at the bottom of this page for more information on how to use wildcards. Strings are case-insensitive.', 'wp-slimstat'),
             ],
             'wildcards_description' => ['Wildcards',

wp-slimstat/tags/5.4.4/languages/wp-slimstat.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: SlimStat Analytics 5.4.3\n"
+"Project-Id-Version: SlimStat Analytics 5.4.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-slimstat\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-03-16T10:28:33+00:00\n"
+"POT-Creation-Date: 2026-03-17T21:13:27+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
@@ -778 +778 @@
 
 #: admin/config/index.php:594
-msgid "Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. See note at the bottom of this page for more information on how to use wildcards. String should be entered in lowercase."
+msgid "Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. For custom post types, use the <code>cpt:</code> prefix (e.g., <code>cpt:product</code>, <code>cpt:portfolio</code>). See note at the bottom of this page for more information on how to use wildcards. Strings are case-insensitive."
 msgstr ""
 

wp-slimstat/tags/5.4.4/readme.txt

@@ -6 +6 @@
 Requires PHP: 7.4
 Tested up to: 6.9.4
-Stable tag: 5.4.3
+Stable tag: 5.4.4
 License: GPL-2.0+
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -76 +76 @@
 
 == Changelog ==
+= 5.4.4 - 2026-03-17 =
+- **Fix**: Chart data not showing due to incorrect bounds check ([PR #232](https://github.com/wp-slimstat/wp-slimstat/pull/232))
+- **Fix**: Weekly chart not showing today's data and not respecting start_of_week setting ([PR #235](https://github.com/wp-slimstat/wp-slimstat/pull/235))
+- **Improved**: Added `cpt:` prefix guidance to content type exclusion setting
+
 = 5.4.3 - 2026-03-16 =
 - **Fix**: Fixed fatal error on servers without the PHP calendar extension ([PR #229](https://github.com/wp-slimstat/wp-slimstat/pull/229))

wp-slimstat/tags/5.4.4/src/Helpers/DataBuckets.php

@@ -196 +196 @@
             }
         } elseif ('WEEK' === $this->gran) {
-            $offset = date('W', $dt) - date('W', $base) + (date('Y', $dt) - date('Y', $base)) * 52;
+            // Calculate the start-of-week date for both base and dt
+            // This respects WordPress start_of_week setting instead of using ISO weeks
+            $baseWeekStart = $this->getWeekStartTimestamp($base);
+            $dtWeekStart = $this->getWeekStartTimestamp($dt);
+
+            // Calculate weeks between the two week start dates
+            $offset = (int) round(($dtWeekStart - $baseWeekStart) / (7 * 86400));
+
             if ($offset < 0) {
                 $offset = -1;
@@ -207 +214 @@
 
         // Ensure offset is within bounds
-        if ($offset <= $this->points) {
+        if ($offset >= 0 && $offset < $this->points) {
             $target = 'current' === $period ? 'datasets' : 'datasetsPrev';
             if (!isset($this->{$target}['v1'][$offset])) {
@@ -230 +237 @@
             return date($params['data_points_label'], $timestamp);
         }, $labels, array_keys($labels));
+    }
+
+    /**
+     * Get the start-of-week timestamp for a given timestamp.
+     * Respects WordPress start_of_week setting.
+     */
+    private function getWeekStartTimestamp(int $timestamp): int
+    {
+        $startOfWeek = (int) get_option('start_of_week', 1);
+        $dayOfWeek = (int) date('w', $timestamp); // 0=Sun, 6=Sat
+        $diff = ($dayOfWeek - $startOfWeek + 7) % 7;
+        return strtotime(date('Y-m-d', strtotime("-{$diff} days", $timestamp)));
     }
 
@@ -271 +290 @@
             'datasets'      => $this->datasets,
             'datasets_prev' => $this->datasetsPrev,
-            'today'         => 'WEEK' === $this->gran && wp_date('YW', $this->end, wp_timezone()) === wp_date('YW', time(), wp_timezone()) ? str_replace("'", '', $this->labels[count($this->labels) - 1]) : wp_date($this->labelFormat, time(), wp_timezone()),
+            'today'         => 'WEEK' === $this->gran && $this->getWeekStartTimestamp($this->end) === $this->getWeekStartTimestamp(time()) ? str_replace("'", '', $this->labels[count($this->labels) - 1]) : wp_date($this->labelFormat, time(), wp_timezone()),
             'granularity'   => $this->gran,
         ];

wp-slimstat/tags/5.4.4/wp-slimstat.php

@@ -4 +4 @@
  * Plugin URI: https://wp-slimstat.com/
  * Description: The leading web analytics plugin for WordPress
- * Version: 5.4.3
+ * Version: 5.4.4
  * Author: Jason Crouse, VeronaLabs
  * Text Domain: wp-slimstat
@@ -21 +21 @@
 
 // Set the plugin version and directory
-define('SLIMSTAT_ANALYTICS_VERSION', '5.4.3');
+define('SLIMSTAT_ANALYTICS_VERSION', '5.4.4');
 define('SLIMSTAT_FILE', __FILE__);
 define('SLIMSTAT_DIR', __DIR__);

wp-slimstat/trunk/admin/config/index.php

@@ -592 +592 @@
                 'title'       => __('Content Types', 'wp-slimstat'),
                 'type'        => 'textarea',
-                'description' => __('Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. See note at the bottom of this page for more information on how to use wildcards. String should be entered in lowercase.', 'wp-slimstat'),
+                'description' => __('Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. For custom post types, use the <code>cpt:</code> prefix (e.g., <code>cpt:product</code>, <code>cpt:portfolio</code>). See note at the bottom of this page for more information on how to use wildcards. Strings are case-insensitive.', 'wp-slimstat'),
             ],
             'wildcards_description' => ['Wildcards',

wp-slimstat/trunk/languages/wp-slimstat.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: SlimStat Analytics 5.4.3\n"
+"Project-Id-Version: SlimStat Analytics 5.4.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-slimstat\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-03-16T10:28:33+00:00\n"
+"POT-Creation-Date: 2026-03-17T21:13:27+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
@@ -778 +778 @@
 
 #: admin/config/index.php:594
-msgid "Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. See note at the bottom of this page for more information on how to use wildcards. String should be entered in lowercase."
+msgid "Enter a list of Slimstat content types that should not be tracked: <code>post, page, attachment, tag, 404, taxonomy, author, archive, search, feed, login</code>, etc. For custom post types, use the <code>cpt:</code> prefix (e.g., <code>cpt:product</code>, <code>cpt:portfolio</code>). See note at the bottom of this page for more information on how to use wildcards. Strings are case-insensitive."
 msgstr ""
 

wp-slimstat/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 7.4
 Tested up to: 6.9.4
-Stable tag: 5.4.3
+Stable tag: 5.4.4
 License: GPL-2.0+
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -76 +76 @@
 
 == Changelog ==
+= 5.4.4 - 2026-03-17 =
+- **Fix**: Chart data not showing due to incorrect bounds check ([PR #232](https://github.com/wp-slimstat/wp-slimstat/pull/232))
+- **Fix**: Weekly chart not showing today's data and not respecting start_of_week setting ([PR #235](https://github.com/wp-slimstat/wp-slimstat/pull/235))
+- **Improved**: Added `cpt:` prefix guidance to content type exclusion setting
+
 = 5.4.3 - 2026-03-16 =
 - **Fix**: Fixed fatal error on servers without the PHP calendar extension ([PR #229](https://github.com/wp-slimstat/wp-slimstat/pull/229))

wp-slimstat/trunk/src/Helpers/DataBuckets.php

@@ -196 +196 @@
             }
         } elseif ('WEEK' === $this->gran) {
-            $offset = date('W', $dt) - date('W', $base) + (date('Y', $dt) - date('Y', $base)) * 52;
+            // Calculate the start-of-week date for both base and dt
+            // This respects WordPress start_of_week setting instead of using ISO weeks
+            $baseWeekStart = $this->getWeekStartTimestamp($base);
+            $dtWeekStart = $this->getWeekStartTimestamp($dt);
+
+            // Calculate weeks between the two week start dates
+            $offset = (int) round(($dtWeekStart - $baseWeekStart) / (7 * 86400));
+
             if ($offset < 0) {
                 $offset = -1;
@@ -207 +214 @@
 
         // Ensure offset is within bounds
-        if ($offset <= $this->points) {
+        if ($offset >= 0 && $offset < $this->points) {
             $target = 'current' === $period ? 'datasets' : 'datasetsPrev';
             if (!isset($this->{$target}['v1'][$offset])) {
@@ -230 +237 @@
             return date($params['data_points_label'], $timestamp);
         }, $labels, array_keys($labels));
+    }
+
+    /**
+     * Get the start-of-week timestamp for a given timestamp.
+     * Respects WordPress start_of_week setting.
+     */
+    private function getWeekStartTimestamp(int $timestamp): int
+    {
+        $startOfWeek = (int) get_option('start_of_week', 1);
+        $dayOfWeek = (int) date('w', $timestamp); // 0=Sun, 6=Sat
+        $diff = ($dayOfWeek - $startOfWeek + 7) % 7;
+        return strtotime(date('Y-m-d', strtotime("-{$diff} days", $timestamp)));
     }
 
@@ -271 +290 @@
             'datasets'      => $this->datasets,
             'datasets_prev' => $this->datasetsPrev,
-            'today'         => 'WEEK' === $this->gran && wp_date('YW', $this->end, wp_timezone()) === wp_date('YW', time(), wp_timezone()) ? str_replace("'", '', $this->labels[count($this->labels) - 1]) : wp_date($this->labelFormat, time(), wp_timezone()),
+            'today'         => 'WEEK' === $this->gran && $this->getWeekStartTimestamp($this->end) === $this->getWeekStartTimestamp(time()) ? str_replace("'", '', $this->labels[count($this->labels) - 1]) : wp_date($this->labelFormat, time(), wp_timezone()),
             'granularity'   => $this->gran,
         ];

wp-slimstat/trunk/wp-slimstat.php

@@ -4 +4 @@
  * Plugin URI: https://wp-slimstat.com/
  * Description: The leading web analytics plugin for WordPress
- * Version: 5.4.3
+ * Version: 5.4.4
  * Author: Jason Crouse, VeronaLabs
  * Text Domain: wp-slimstat
@@ -21 +21 @@
 
 // Set the plugin version and directory
-define('SLIMSTAT_ANALYTICS_VERSION', '5.4.3');
+define('SLIMSTAT_ANALYTICS_VERSION', '5.4.4');
 define('SLIMSTAT_FILE', __FILE__);
 define('SLIMSTAT_DIR', __DIR__);