Changeset 3102453
- Timestamp:
- 06/13/2024 06:09:25 PM (22 months ago)
- Location:
- simple-webstats
- Files:
-
- 111 added
- 3 edited
-
tags/1.2.2 (added)
-
tags/1.2.2/css (added)
-
tags/1.2.2/css/dashboard.min.css (added)
-
tags/1.2.2/css/dashboard.scss (added)
-
tags/1.2.2/css/global.min.css (added)
-
tags/1.2.2/css/global.scss (added)
-
tags/1.2.2/css/widget.min.css (added)
-
tags/1.2.2/css/widget.scss (added)
-
tags/1.2.2/inc (added)
-
tags/1.2.2/inc/collector.php (added)
-
tags/1.2.2/inc/dashboard.php (added)
-
tags/1.2.2/inc/setup.php (added)
-
tags/1.2.2/index.php (added)
-
tags/1.2.2/js (added)
-
tags/1.2.2/js/collector.js (added)
-
tags/1.2.2/js/collector.min.js (added)
-
tags/1.2.2/js/dashboard.js (added)
-
tags/1.2.2/js/dashboard.min.js (added)
-
tags/1.2.2/js/inc (added)
-
tags/1.2.2/js/inc/countries.js (added)
-
tags/1.2.2/lib (added)
-
tags/1.2.2/lib/chartjs (added)
-
tags/1.2.2/lib/chartjs/chart.umd.min.js (added)
-
tags/1.2.2/lib/freakflags (added)
-
tags/1.2.2/lib/freakflags/flagSprite42.png (added)
-
tags/1.2.2/lib/freakflags/freakflags.css (added)
-
tags/1.2.2/readme.txt (added)
-
tags/1.2.2/simple-webstats.php (added)
-
tags/1.2.2/vendor-prefixed (added)
-
tags/1.2.2/vendor-prefixed/autoload-classmap.php (added)
-
tags/1.2.2/vendor-prefixed/autoload-files.php (added)
-
tags/1.2.2/vendor-prefixed/autoload.php (added)
-
tags/1.2.2/vendor-prefixed/matomo (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Cache (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Cache/CacheInterface.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Cache/DoctrineBridge.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Cache/LaravelCache.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Cache/PSR16Bridge.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Cache/PSR6Bridge.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Cache/StaticCache.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/ClientHints.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/DeviceDetector.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/LICENSE (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/AbstractBotParser.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/AbstractParser.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Bot.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/AbstractClientParser.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Browser (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Browser.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Browser/Engine (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Browser/Engine.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Browser/Engine/Version.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/FeedReader.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Hints (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Hints/AppHints.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Hints/BrowserHints.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/Library.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/MediaPlayer.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/MobileApp.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Client/PIM.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/AbstractDeviceParser.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/Camera.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/CarBrowser.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/Console.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/HbbTv.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/Mobile.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/Notebook.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/PortableMediaPlayer.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/Device/ShellTv.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/OperatingSystem.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Parser/VendorFragment.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/README.md (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Yaml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Yaml/ParserInterface.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Yaml/Pecl.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Yaml/Spyc.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/Yaml/Symfony.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/autoload.php (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/composer.json (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/phpcs.xml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/bots.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/browser_engine.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/browsers.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/feed_readers.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/hints (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/hints/apps.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/hints/browsers.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/libraries.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/mediaplayers.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/mobile_apps.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/client/pim.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/cameras.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/car_browsers.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/consoles.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/mobiles.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/notebooks.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/portable_media_player.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/shell_tv.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/device/televisions.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/oss.yml (added)
-
tags/1.2.2/vendor-prefixed/matomo/device-detector/regexes/vendorfragments.yml (added)
-
tags/1.2.2/vendor-prefixed/mustangostang (added)
-
tags/1.2.2/vendor-prefixed/mustangostang/spyc (added)
-
tags/1.2.2/vendor-prefixed/mustangostang/spyc/Spyc.php (added)
-
trunk/inc/dashboard.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/simple-webstats.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
simple-webstats/trunk/inc/dashboard.php
r3102307 r3102453 244 244 { 245 245 $comparativeWhereClauses = $this->where_clauses(array_merge($timeBounds['comparativeWhereClauses'], array('v.timeonpage > 0'))); 246 $sql = $wpdb->prepare("SELECT * FROM (SELECT AVG(sub.timeonpage) AS val FROM (SELECT @row_index := @row_index + 1 AS row_index, v.timeonpage FROM %i AS v, (SELECT @row_index := -1) r %1s ORDER BY v.timeonpage) AS sub WHERE sub.row_index IN (FLOOR(@row_index / 2), CEIL(@row_index / 2))) AS a, (SELECT AVG(sub.timeonpage) AS comp FROM (SELECT @row_index := @row_index + 1 AS row_index, v.timeonpage FROM %i AS v, (SELECT @row_index := -1) r %1s ORDER BY v.timeonpage) AS sub WHERE sub.row_index IN (FLOOR(@row_index / 2), CEIL(@row_index/ 2))) AS b", $wpdb->prefix.SWSTATS_VIEWS_TABLE, $whereClauses, $wpdb->prefix.SWSTATS_VIEWS_TABLE, $comparativeWhereClauses);246 $sql = $wpdb->prepare("SELECT * FROM (SELECT AVG(sub.timeonpage) AS val FROM (SELECT @row_index_a := @row_index_a + 1 AS row_index, v.timeonpage FROM %i AS v, (SELECT @row_index_a := -1) r %1s ORDER BY v.timeonpage) AS sub WHERE sub.row_index IN (FLOOR(@row_index_a / 2), CEIL(@row_index_a / 2))) AS a, (SELECT AVG(sub.timeonpage) AS comp FROM (SELECT @row_index_b := @row_index_b + 1 AS row_index, v.timeonpage FROM %i AS v, (SELECT @row_index_b := -1) r %1s ORDER BY v.timeonpage) AS sub WHERE sub.row_index IN (FLOOR(@row_index_b / 2), CEIL(@row_index_b / 2))) AS b", $wpdb->prefix.SWSTATS_VIEWS_TABLE, $whereClauses, $wpdb->prefix.SWSTATS_VIEWS_TABLE, $comparativeWhereClauses); 247 247 } 248 248 else … … 253 253 if(isset($result[0])) 254 254 { 255 if(isset($result[0]->val) && $result[0]->val && $data['viewsPerVisit']['value']) $dataPoint['value'] = $result[0]->val * $data['viewsPerVisit']['value'];255 if(isset($result[0]->val) && $result[0]->val && $data['viewsPerVisit']['value']) $dataPoint['value'] = $result[0]->val * $data['viewsPerVisit']['value']; 256 256 if(($dataPoint['value'] !== null) && isset($result[0]->comp) && $result[0]->comp && $data['viewsPerVisit']['comparison']) $dataPoint['comparison'] = $result[0]->comp * $data['viewsPerVisit']['comparison']; 257 257 } -
simple-webstats/trunk/readme.txt
r3102307 r3102453 5 5 Tested up to: 6.5 6 6 Requires PHP: 7.3 7 Stable tag: 1.2. 17 Stable tag: 1.2.2 8 8 License: GPLv2 or later 9 9 … … 50 50 == Changelog == 51 51 52 = 1.2.2 = 53 54 * Bugfix: Error in average time on site query was causing anomalous results. 55 52 56 = 1.2.1 = 53 57 -
simple-webstats/trunk/simple-webstats.php
r3102307 r3102453 4 4 * Plugin Name: Simple Webstats 5 5 * Description: Privacy-focused cookie-free web analytics for WordPress. 6 * Version: 1.2. 16 * Version: 1.2.2 7 7 * Requires at least: 4.6 8 8 * Requires PHP: 7.3 … … 20 20 21 21 // config 22 define('SWSTATS_VERSION', '1.2. 1');22 define('SWSTATS_VERSION', '1.2.2'); 23 23 define('SWSTATS_PATH', plugin_dir_path(__FILE__)); 24 24 define('SWSTATS_URL', plugin_dir_url(__FILE__));
Note: See TracChangeset
for help on using the changeset viewer.