diff --git a/google_analytics_reports/google_analytics_reports.blocks.inc b/google_analytics_reports/google_analytics_reports.blocks.inc index 3018795..cc08332 100644 --- a/google_analytics_reports/google_analytics_reports.blocks.inc +++ b/google_analytics_reports/google_analytics_reports.blocks.inc @@ -74,7 +74,7 @@ function google_analytics_reports_path_mini_build($path) { */ function google_analytics_reports_dashboard_build() { $params = array( - 'metrics' => array('ga:visits'), + 'metrics' => array('ga:sessions'), 'dimensions' => array('ga:date'), 'sort_metric' => array('ga:date'), 'start_date' => strtotime('-31 days'), @@ -86,8 +86,8 @@ function google_analytics_reports_dashboard_build() { } $max_visits = 0; foreach ($feed->results->rows as $row) { - $data[] = $row['visits']; - $max_visits = max($row['visits'], $max_visits); + $data[] = $row['sessions']; + $max_visits = max($row['sessions'], $max_visits); } $chart = array( '#title' => '', @@ -102,11 +102,11 @@ function google_analytics_reports_dashboard_build() { '#line_styles' => array(chart_line_style(2, 10, 0)), ); $last_day = end($feed->results->rows); - $title = t('The most visits on a single day was @max. Yesterday there were @yesterday visits.', array('@max' => $max_visits, '@yesterday' => $last_day['visits'])); + $title = t('The most sessions on a single day was @max. Yesterday there were @yesterday sessions.', array('@max' => $max_visits, '@yesterday' => $last_day['sessions'])); $chart['#attributes'] = array('title' => $title, 'style' => 'height:' . $chart['#size']['#height'] . 'px; width:100%'); $report['chart'] = theme('chart', array('chart' => $chart)); $report['chart'] = l($report['chart'], 'admin/reports/google-analytics', array('html' => TRUE)); - $report['visits'] = l(t('Full report: @visits visits this month', array('@visits' => number_format($feed->results->totalsForAllResults['visits']))), 'admin/reports/google-analytics'); + $report['sessions'] = l(t('Full report: @sessions sessions this month', array('@sessions' => number_format($feed->results->totalsForAllResults['sessions']))), 'admin/reports/google-analytics'); /* Top pages summary */ $params = array( @@ -124,4 +124,4 @@ function google_analytics_reports_dashboard_build() { } $report['pages'] = $feed->results->rows; return theme('google_analytics_reports_dashboard', $report); -} \ No newline at end of file +} diff --git a/google_analytics_reports/google_analytics_reports.pages.inc b/google_analytics_reports/google_analytics_reports.pages.inc index e80ca78..663173e 100644 --- a/google_analytics_reports/google_analytics_reports.pages.inc +++ b/google_analytics_reports/google_analytics_reports.pages.inc @@ -62,7 +62,7 @@ function google_analytics_reports_detail_page() { */ function _google_analytics_reports_visits() { $params = array( - 'metrics' => array('ga:visits'), + 'metrics' => array('ga:sessions'), 'dimensions' => array('ga:date'), 'sort_metric' => array('ga:date'), 'start_date' => strtotime('-31 days'), @@ -74,8 +74,8 @@ function _google_analytics_reports_visits() { } $max_visits = 0; foreach ($feed->results->rows as $row) { - $data[] = $row['visits']; - $max_visits = max($row['visits'], $max_visits); + $data[] = $row['sessions']; + $max_visits = max($row['sessions'], $max_visits); } $chart = array( '#title' => '', @@ -90,7 +90,7 @@ function _google_analytics_reports_visits() { '#line_styles' => array(chart_line_style(2, 10, 0)), ); $last_day = end($feed->results->rows); - $title = t('The most visits on a single day was @max. Yesterday there were @yesterday visits.', array('@max' => $max_visits, '@yesterday' => $last_day['visits'])); + $title = t('The most sessions on a single day was @max. Yesterday there were @yesterday sessions.', array('@max' => $max_visits, '@yesterday' => $last_day['sessions'])); $chart['#attributes'] = array('title' => $title, 'style' => 'height:' . $chart['#size']['#height'] . 'px; width:100%'); $output = theme('chart', array('chart' => $chart)); return $output; @@ -141,9 +141,16 @@ function _google_analytics_reports_pageviews($path) { * Retrieves usage data. */ function _google_analytics_reports_usage() { - // Site usage + // Site usage. $params = array( - 'metrics' => array('ga:visits', 'ga:bounces', 'ga:entrances', 'ga:pageviews', 'ga:timeOnSite', 'ga:newVisits'), + 'metrics' => array( + 'ga:sessions', + 'ga:bounces', + 'ga:entrances', + 'ga:pageviews', + 'ga:sessionDuration', + 'ga:newUsers', + ), 'start_date' => strtotime('-31 days'), 'end_date' => strtotime('-1 day'), ); @@ -158,9 +165,16 @@ function _google_analytics_reports_usage() { * Retrieves content detail stats. */ function _google_analytics_reports_detail_stats($path) { - // Site usage + // Site usage. $params = array( - 'metrics' => array('ga:pageviews', 'ga:uniquePageviews', 'ga:avgTimeOnPage', 'ga:entranceBounceRate', 'ga:exitRate', 'ga:goalValueAll'), + 'metrics' => array( + 'ga:pageviews', + 'ga:uniquePageviews', + 'ga:avgTimeOnPage', + 'ga:bounceRate', + 'ga:exitRate', + 'ga:goalValueAll', + ), 'start_date' => strtotime('-31 days'), 'end_date' => strtotime('-1 day'), 'filters' => _google_analytics_reports_path_filter($path), @@ -197,9 +211,9 @@ function _google_analytics_reports_top_pages($max_results = 10) { */ function _google_analytics_reports_top_referrals($path = '') { $params = array( - 'metrics' => array('ga:visits'), + 'metrics' => array('ga:sessions'), 'dimensions' => array('ga:source', 'ga:medium'), - 'sort_metric' => array('-ga:visits'), + 'sort_metric' => array('-ga:sessions'), 'filters' => 'ga:medium==referral', 'start_date' => strtotime('-31 days'), 'end_date' => strtotime('-1 day'), @@ -220,9 +234,9 @@ function _google_analytics_reports_top_referrals($path = '') { */ function _google_analytics_reports_top_keywords($path = '') { $params = array( - 'metrics' => array('ga:visits'), + 'metrics' => array('ga:sessions'), 'dimensions' => array('ga:keyword'), - 'sort_metric' => array('-ga:visits'), + 'sort_metric' => array('-ga:sessions'), 'start_date' => strtotime('-31 days'), 'end_date' => strtotime('-1 day'), 'filters' => 'ga:keyword!=(not set)', @@ -236,4 +250,4 @@ function _google_analytics_reports_top_keywords($path = '') { return FALSE; } return $feed->results->rows; -} \ No newline at end of file +} diff --git a/google_analytics_reports/google_analytics_reports.theme.inc b/google_analytics_reports/google_analytics_reports.theme.inc index 4ff4dde..7c05f35 100644 --- a/google_analytics_reports/google_analytics_reports.theme.inc +++ b/google_analytics_reports/google_analytics_reports.theme.inc @@ -7,22 +7,22 @@ function template_preprocess_google_analytics_reports_summary(&$vars) { $vars = array_merge($vars, $vars['usage']); - if ($vars['visits'] <= 0) { + if ($vars['sessions'] <= 0) { $vars['pages_per_visit'] = '0.00'; $vars['new_visits'] = '0.00%'; $vars['time_on_site'] = '0:00'; } else { - $vars['pages_per_visit'] = number_format(round($vars['pageviews'] / $vars['visits'], 2), 2); - $vars['new_visits'] = number_format(round(($vars['newVisits'] / $vars['visits'])*100, 2), 2) . '%'; - $vars['time_on_site'] = format_interval($vars['timeOnSite'] / $vars['visits']); + $vars['pages_per_visit'] = number_format(round($vars['pageviews'] / $vars['sessions'], 2), 2); + $vars['new_visits'] = number_format(round(($vars['newUsers'] / $vars['sessions']) * 100, 2), 2) . '%'; + $vars['time_on_site'] = format_interval($vars['sessionDuration'] / $vars['sessions']); } if ($vars['entrances'] <= 0) { $vars['bounces'] = '0.00%'; } else { - $vars['bounces'] = number_format(round(($vars['bounces'] / $vars['entrances'])*100, 2), 2) . '%'; + $vars['bounces'] = number_format(round(($vars['bounces'] / $vars['entrances']) * 100, 2), 2) . '%'; } $vars['entrances'] = number_format($vars['entrances']); @@ -39,13 +39,13 @@ function template_preprocess_google_analytics_reports_summary(&$vars) { $referrals = array(); foreach ($vars['referrals'] as $referral) { - $referrals[] = '' . $referral['source'] . ' - ' . format_plural($referral['visits'], '1 Visit', '@visits Visits', array('@visits' => number_format($referral['visits']))); + $referrals[] = '' . $referral['source'] . ' - ' . format_plural($referral['sessions'], '1 Session', '@sessions Sessions', array('@sessions' => number_format($referral['sessions']))); } $vars['referrals'] = theme('item_list', array('items' => $referrals, 'type' => 'ol')); $keywords = array(); foreach ($vars['keywords'] as $keyword) { - $keywords[] = '' . $keyword['keyword'] . ' - ' . format_plural($keyword['visits'], '1 Visit', '@visits Visits', array('@visits' => number_format($keyword['visits']))); + $keywords[] = '' . $keyword['keyword'] . ' - ' . format_plural($keyword['sessions'], '1 Session', '@sessions Sessions', array('@sessions' => number_format($keyword['sessions']))); } $vars['keywords'] = theme('item_list', array('items' => $keywords, 'type' => 'ol')); } @@ -54,7 +54,7 @@ function template_preprocess_google_analytics_reports_detail(&$vars) { $vars['pageviews'] = number_format($vars['stats']['pageviews']); $vars['unique_pageviews'] = number_format($vars['stats']['uniquePageviews']); $vars['avg_time_on_page'] = format_interval($vars['stats']['avgTimeOnPage']); - $vars['bounce_rate'] = round($vars['stats']['entranceBounceRate'], 2); + $vars['bounce_rate'] = round($vars['stats']['bounceRate'], 2); $vars['exit_rate'] = round($vars['stats']['exitRate'], 2); if ($vars['stats']['uniquePageviews'] > 0) { $vars['goal_value'] = money_format('%i', $vars['stats']['goalValueAll'] / $vars['stats']['uniquePageviews']); @@ -65,13 +65,13 @@ function template_preprocess_google_analytics_reports_detail(&$vars) { $referrals = array(); foreach ($vars['referrals'] as $referral) { - $referrals[] = '' . $referral['source'] . ' - ' . format_plural($referral['visits'], '1 Visit', '@visits Visits', array('@visits' => number_format($referral['visits']))); + $referrals[] = '' . $referral['source'] . ' - ' . format_plural($referral['sessions'], '1 Session', '@sessions Sessions', array('@sessions' => number_format($referral['sessions']))); } $vars['referrals'] = theme('item_list', array('items' => $referrals, 'type' => 'ol')); $keywords = array(); foreach ($vars['keywords'] as $keyword) { - $keywords[] = '' . $keyword['keyword'] . ' - ' . format_plural($keyword['visits'], '1 Visit', '@visits Visits', array('@visits' => number_format($keyword['visits']))); + $keywords[] = '' . $keyword['keyword'] . ' - ' . format_plural($keyword['sessions'], '1 Session', '@sessions Sessions', array('@sessions' => number_format($keyword['sessions']))); } $vars['keywords'] = theme('item_list', array('items' => $keywords, 'type' => 'ol')); } diff --git a/google_analytics_reports/google_analytics_reports_dashboard.tpl.php b/google_analytics_reports/google_analytics_reports_dashboard.tpl.php index 6223a4f..fc50bd9 100644 --- a/google_analytics_reports/google_analytics_reports_dashboard.tpl.php +++ b/google_analytics_reports/google_analytics_reports_dashboard.tpl.php @@ -7,7 +7,7 @@
-

+

diff --git a/google_analytics_reports/google_analytics_reports_summary.tpl.php b/google_analytics_reports/google_analytics_reports_summary.tpl.php index abecd92..79939e7 100644 --- a/google_analytics_reports/google_analytics_reports_summary.tpl.php +++ b/google_analytics_reports/google_analytics_reports_summary.tpl.php @@ -7,7 +7,7 @@
-

+

@@ -16,7 +16,7 @@ - +