Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix target and referer reporting when PHP and database differ on timezone #117

Merged
merged 8 commits into from
Apr 19, 2020
Merged

Fix target and referer reporting when PHP and database differ on timezone #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bfb810a
Fixes target and referer reporting when PHP and database disagree on …
sophiehuiberts Nov 3, 2018
031a65f
Merge branch 'master' into master
stklcode Sep 18, 2019
85f0545
Merge branch "master" master
stklcode Nov 23, 2019
3026056
use prepared statements for current date instead of concatenation
stklcode Nov 23, 2019
72ec582
replace strftime call on timestamp with current time format parameter
stklcode Apr 7, 2020
7c89387
changelog++
stklcode Apr 7, 2020
46c399d
Merge branch 'master' into master
stklcode Apr 13, 2020
9bfd8c3
Merge branch 'pluginkollektiv/master' into 'sophiehuiberts/master'
stklcode Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased
* Fix offset in visitor reporting due to different timezones between PHP and DB
* Introduced separate settinge page and reduced widget backview to widget settings only
* Add options to track logged in users, feeds and search requests
* Add option to show total visits
Expand Down
3 changes: 2 additions & 1 deletion inc/class-statify-cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public static function cleanup_data() {
// Remove items.
$wpdb->query(
$wpdb->prepare(
"DELETE FROM `$wpdb->statify` WHERE created <= SUBDATE(CURDATE(), %d)",
"DELETE FROM `$wpdb->statify` WHERE created <= SUBDATE(%s, %d)",
current_time( 'Y-m-d' ),
(int) self::$_options['days']
)
);
Expand Down
49 changes: 38 additions & 11 deletions inc/class-statify-dashboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ private static function _select_data() {
$today = (int) self::$_options['today'];
$show_totals = (int) self::$_options['show_totals'];

$limit_args = ( $today ) ? $limit : array( $days_show, $limit );
$current_date = current_time( 'Y-m-d' );

$data = array(
'visits' => $wpdb->get_results(
Expand All @@ -332,26 +332,53 @@ private static function _select_data() {
),
ARRAY_A
),
'target' => $wpdb->get_results(
);

if ( $today ) {
$data['target'] = $wpdb->get_results(
$wpdb->prepare(
"SELECT COUNT(`target`) as `count`, `target` as `url` FROM `$wpdb->statify` WHERE created " . ( $today ? '= DATE(NOW())' : '>= DATE_SUB(NOW(), INTERVAL %d DAY)' ) . ' GROUP BY `target` ORDER BY `count` DESC LIMIT %d',
$limit_args
"SELECT COUNT(`target`) as `count`, `target` as `url` FROM `$wpdb->statify` WHERE created = %s GROUP BY `target` ORDER BY `count` DESC LIMIT %d",
$current_date,
$limit
),
ARRAY_A
),
'referrer' => $wpdb->get_results(
);
$data['referrer'] = $wpdb->get_results(
$wpdb->prepare(
"SELECT COUNT(`referrer`) as `count`, `referrer` as `url`, SUBSTRING_INDEX(SUBSTRING_INDEX(TRIM(LEADING 'www.' FROM(TRIM(LEADING 'https://' FROM TRIM(LEADING 'http://' FROM TRIM(`referrer`))))), '/', 1), ':', 1) as `host` FROM `$wpdb->statify` WHERE `referrer` != '' AND created " . ( $today ? '= DATE(NOW())' : '>= DATE_SUB(NOW(), INTERVAL %d DAY)' ) . ' GROUP BY `host` ORDER BY `count` DESC LIMIT %d',
$limit_args
"SELECT COUNT(`referrer`) as `count`, `referrer` as `url`, SUBSTRING_INDEX(SUBSTRING_INDEX(TRIM(LEADING 'www.' FROM(TRIM(LEADING 'https://' FROM TRIM(LEADING 'http://' FROM TRIM(`referrer`))))), '/', 1), ':', 1) as `host` FROM `$wpdb->statify` WHERE `referrer` != '' AND created = %s GROUP BY `host` ORDER BY `count` DESC LIMIT %d",
$current_date,
$limit
),
ARRAY_A
),
);
);
} else {
$data['target'] = $wpdb->get_results(
$wpdb->prepare(
"SELECT COUNT(`target`) as `count`, `target` as `url` FROM `$wpdb->statify` WHERE created >= DATE_SUB(%s, INTERVAL %d DAY) GROUP BY `target` ORDER BY `count` DESC LIMIT %d",
$current_date,
$days_show,
$limit
),
ARRAY_A
);
$data['referrer'] = $wpdb->get_results(
$wpdb->prepare(
"SELECT COUNT(`referrer`) as `count`, `referrer` as `url`, SUBSTRING_INDEX(SUBSTRING_INDEX(TRIM(LEADING 'www.' FROM(TRIM(LEADING 'https://' FROM TRIM(LEADING 'http://' FROM TRIM(`referrer`))))), '/', 1), ':', 1) as `host` FROM `$wpdb->statify` WHERE `referrer` != '' AND created >= DATE_SUB(%s, INTERVAL %d DAY) GROUP BY `host` ORDER BY `count` DESC LIMIT %d",
$current_date,
$days_show,
$limit
),
ARRAY_A
);
}

if ( $show_totals ) {
$data['visit_totals'] = array(
'today' => $wpdb->get_var(
"SELECT COUNT(`created`) FROM `$wpdb->statify` WHERE created = DATE(NOW())"
$wpdb->prepare(
"SELECT COUNT(`created`) FROM `$wpdb->statify` WHERE created = %s",
$current_date
)
),
'since_beginning' => $wpdb->get_var(
"SELECT COUNT(`created`) FROM `$wpdb->statify`"
Expand Down