-
Seitenaufrufe : filtered_visits; ?>
+
i18n('statistics_overview_visits'); ?>: filtered_visits; ?>
-
Besucher : filtered_visitors; ?>
+
i18n('statistics_overview_visitors'); ?>: filtered_visitors; ?>
+
+
+
+
+
+
+
top_article_path_week, ENT_QUOTES); ?>
+
i18n('statistics_overview_views'); ?>: top_article_count_week; ?>
+
+
+
+
+
+
+
+
pages_per_session_week, 2, ',', '.'); ?>
diff --git a/lang/de_de.lang b/lang/de_de.lang
index b0614b4..61128a9 100644
--- a/lang/de_de.lang
+++ b/lang/de_de.lang
@@ -88,6 +88,14 @@ statistics_scroll_panel = Container
statistics_scroll_none = Keines von beidem
statistics_statistics_ignore_url_params = Ignoriere URL-Parameter
statistics_statistics_ignore_url_params_note = URL-Parameter werden in der Statistik nicht geloggt. Z.b. www.example.com?data=1 wird als www.example.com gespeichert.
+statistics_details_for = Details für:
+statistics_all_domains = Alle Domains
+statistics_filter_all = Alle
+statistics_filter_only_200 = Nur 200er
+statistics_filter_only_not_200 = Nur nicht 200er
+statistics_ignore_success = Es wurden %s Einträge gelöscht.
+statistics_ignore_url_future = Die URL
%s wird zukünftig ignoriert.
+statistics_deleted_campaign_entries = Es wurden %s Einträge der Kampagne
%s gelöscht.
perm_general_statistics[] = Benutzer darf das Addon "Statistiken" aufrufen.
perm_options_statistics[settings] = Benutzer darf Einstellungen des Addons "Statistiken" ändern.
statistics_default_datefilter_range = Standard Datumsbereich
@@ -132,4 +140,20 @@ statistics_api_enable_campaigns_note = Aktiviert das tracken von API Aufrufen
statistics_api_delete_api = Alle API Aufrufe löschen
statistics_api_delete_api_confirm = Möchten Sie wirklich alle API Aufrufe und Kampagnen löschen?
statistics_api_delete = Löschen
-statistics_api_delete_confirm = Wirklich alle Einträge für diese Kampagne löschen?
\ No newline at end of file
+statistics_api_delete_confirm = Wirklich alle Einträge für diese Kampagne löschen?
+statistics_overview_visits = Seitenaufrufe
+statistics_overview_visitors = Besucher
+statistics_overview_today = Heute
+statistics_overview_total = Insgesamt
+statistics_overview_week_visits = Besuche letzte 7 Tage
+statistics_overview_week_visitors = Besucher letzte 7 Tage
+statistics_overview_week_top_article = Top-Artikel letzte 7 Tage
+statistics_overview_week_pages_per_session = Seiten pro Sitzung (7 Tage)
+statistics_overview_views = Aufrufe
+statistics_analysis_heading = Detaillierte Analysen
+statistics_analysis_card_device_title = Geräte & Browser
+statistics_analysis_card_device_desc = Gerätetypen, Browser, OS, Marken und Modelle
+statistics_analysis_card_extended_title = Verhaltensdaten
+statistics_analysis_card_extended_desc = Sitzungsdauer, Seiten pro Sitzung, Ausstiegsseiten, Länder
+statistics_analysis_card_bots_title = Bots
+statistics_analysis_card_bots_desc = Erkannte Crawler, Kategorien und Hersteller
\ No newline at end of file
diff --git a/lang/en_gb.lang b/lang/en_gb.lang
index 8ade558..52afdac 100644
--- a/lang/en_gb.lang
+++ b/lang/en_gb.lang
@@ -90,6 +90,14 @@ statistics_scroll_panel = Container
statistics_scroll_none = None of both
statistics_statistics_ignore_url_params = Ignore URL parameters.
statistics_statistics_ignore_url_params_note = URL parameters are not logged in the statistics. E.g. www.example.com?data=1 is stored as www.example.com.
+statistics_details_for = Details for:
+statistics_all_domains = All domains
+statistics_filter_all = All
+statistics_filter_only_200 = Only 200
+statistics_filter_only_not_200 = Only non-200
+statistics_ignore_success = %s entries were deleted.
+statistics_ignore_url_future = The URL
%s will be ignored in the future.
+statistics_deleted_campaign_entries = %s entries of campaign
%s were deleted.
perm_general_statistics[] = User may open the "Statistics" addon.
perm_options_statistics[settings] = User may change settings of the "Statistics" addon.
statistics_default_datefilter_range = Default date range.
@@ -134,4 +142,20 @@ statistics_api_enable_campaigns_note = Enable tracking of API calls
statistics_api_delete_api = Delete all API calls
statistics_api_delete_api_confirm = Do you really want to delete all API calls and campaigns?
statistics_api_delete = Delete
-statistics_api_delete_confirm = Really delete all entries for this campaign?
\ No newline at end of file
+statistics_api_delete_confirm = Really delete all entries for this campaign?
+statistics_overview_visits = Page views
+statistics_overview_visitors = Visitors
+statistics_overview_today = Today
+statistics_overview_total = Total
+statistics_overview_week_visits = Visits last 7 days
+statistics_overview_week_visitors = Visitors last 7 days
+statistics_overview_week_top_article = Top article last 7 days
+statistics_overview_week_pages_per_session = Pages per session (7 days)
+statistics_overview_views = Views
+statistics_analysis_heading = Detailed analyses
+statistics_analysis_card_device_title = Devices and browsers
+statistics_analysis_card_device_desc = Device types, browsers, operating systems, brands and models
+statistics_analysis_card_extended_title = Behavior metrics
+statistics_analysis_card_extended_desc = Session duration, pages per session, exit pages, countries
+statistics_analysis_card_bots_title = Bots
+statistics_analysis_card_bots_desc = Detected crawlers, categories and vendors
\ No newline at end of file
diff --git a/lib/DateFilter.php b/lib/DateFilter.php
index 8c0b4ec..de5b0ab 100644
--- a/lib/DateFilter.php
+++ b/lib/DateFilter.php
@@ -4,6 +4,8 @@
use rex;
use rex_addon;
+use rex_addon_interface;
+use rex_request;
use rex_sql;
use rex_view;
use InvalidArgumentException;
@@ -22,8 +24,10 @@ class DateFilter
public DateTimeImmutable $whole_time_start;
+ /** @var non-empty-string */
private string $table;
- private rex_addon $addon;
+ private rex_addon_interface $addon;
+ private const SESSION_KEY = 'statistics_datefilter';
/**
@@ -38,37 +42,62 @@ class DateFilter
*/
function __construct(string $date_start, string $date_end, string $table)
{
+ if ('' === $table) {
+ throw new InvalidArgumentException('Table name must not be empty.');
+ }
+
+ /** @var non-empty-string $table */
$this->table = $table;
$this->addon = rex_addon::get('statistics');
- if ($date_start == '') {
-
- // prefered date range
- $date_range = $this->addon->getConfig('statistics_default_datefilter_range');
-
- if ($date_range == 'last7days') {
- $date = new DateTimeImmutable();
- $date = $date->modify("-7 day");
- $this->date_start = $date;
- } elseif ($date_range == 'last30days') {
- $date = new DateTimeImmutable();
- $date = $date->modify("-30 day");
- $this->date_start = $date;
- } elseif ($date_range == 'thisYear') {
- $date = new DateTimeImmutable();
- $date = $date->modify("-365 day");
- $this->date_start = $date;
- } else {
- $this->date_start = $this->getMinDateFromTable();
- }
- // design decision, uncomment this line to default show only timespan where data was collected
- // $this->date_end = $this->getMaxDateFromTable();
+ $hasRequestDateRange = '' !== $date_start && '' !== $date_end;
- $this->date_end = new DateTimeImmutable();
- // $this->date_end->modify('+1 day');
- } else {
+ if ($hasRequestDateRange) {
$this->date_start = new DateTimeImmutable($date_start);
$this->date_end = new DateTimeImmutable($date_end);
+
+ rex_request::setSession(self::SESSION_KEY, [
+ 'date_start' => $this->date_start->format('Y-m-d'),
+ 'date_end' => $this->date_end->format('Y-m-d'),
+ ]);
+ } else {
+ $sessionDateRange = rex_request::session(self::SESSION_KEY);
+ $hasSessionDateRange = is_array($sessionDateRange)
+ && isset($sessionDateRange['date_start'], $sessionDateRange['date_end'])
+ && is_string($sessionDateRange['date_start'])
+ && is_string($sessionDateRange['date_end'])
+ && '' !== $sessionDateRange['date_start']
+ && '' !== $sessionDateRange['date_end'];
+
+ if ($hasSessionDateRange) {
+ $this->date_start = new DateTimeImmutable($sessionDateRange['date_start']);
+ $this->date_end = new DateTimeImmutable($sessionDateRange['date_end']);
+ } else {
+
+ // prefered date range
+ $date_range = $this->addon->getConfig('statistics_default_datefilter_range');
+
+ if ($date_range === 'last7days') {
+ $date = new DateTimeImmutable();
+ $date = $date->modify('-7 day');
+ $this->date_start = $date;
+ } elseif ($date_range === 'last30days') {
+ $date = new DateTimeImmutable();
+ $date = $date->modify('-30 day');
+ $this->date_start = $date;
+ } elseif ($date_range === 'thisYear') {
+ $date = new DateTimeImmutable();
+ $date = $date->modify('-365 day');
+ $this->date_start = $date;
+ } else {
+ $this->date_start = $this->getMinDateFromTable();
+ }
+ // design decision, uncomment this line to default show only timespan where data was collected
+ // $this->date_end = $this->getMaxDateFromTable();
+
+ $this->date_end = new DateTimeImmutable();
+ // $this->date_end->modify('+1 day');
+ }
}
// set total time range to use in datefilter fragment with javascript
@@ -90,16 +119,18 @@ function __construct(string $date_start, string $date_end, string $table)
private function getMinDateFromTable(): DateTimeImmutable
{
$sql = rex_sql::factory();
- $min_date = $sql->setQuery('SELECT MIN(date) AS "date" from ' . rex::getTable($this->table));
- $min_date = $min_date->getValue('date');
+ $result = $sql->setQuery('SELECT MIN(date) AS "date" from ' . rex::getTable($this->table));
+ $minDateRaw = $result->getValue('date');
- if ($min_date === null) {
- $min_date = new DateTimeImmutable("now");
- } else {
- $min_date = DateTimeImmutable::createFromFormat('Y-m-d', $min_date);
+ if (!is_string($minDateRaw) || '' === $minDateRaw) {
+ return new DateTimeImmutable('now');
}
+ $minDate = DateTimeImmutable::createFromFormat('Y-m-d', $minDateRaw);
+ if (false === $minDate) {
+ return new DateTimeImmutable('now');
+ }
- return $min_date;
+ return $minDate;
}
}
diff --git a/lib/StatsDashboard.php b/lib/StatsDashboard.php
index 2981d2c..8c47945 100644
--- a/lib/StatsDashboard.php
+++ b/lib/StatsDashboard.php
@@ -34,10 +34,24 @@ public static function renderOverview(DateFilter $filterDateHelper, array $overv
$fragmentOverview->setVar('today_visitors', $overviewData['visitors_today']);
$fragmentOverview->setVar('total_visits', $overviewData['visits_total']);
$fragmentOverview->setVar('total_visitors', $overviewData['visitors_total']);
+ $fragmentOverview->setVar('visits_week', $overviewData['visits_week']);
+ $fragmentOverview->setVar('visitors_week', $overviewData['visitors_week']);
+ $fragmentOverview->setVar('top_article_path_week', $overviewData['top_article_path_week']);
+ $fragmentOverview->setVar('top_article_count_week', $overviewData['top_article_count_week']);
+ $fragmentOverview->setVar('pages_per_session_week', $overviewData['pages_per_session_week']);
return $fragmentOverview->parse('overview.php');
}
+ public static function renderAnalysisCards(DateFilter $filterDateHelper): string
+ {
+ $fragment = new rex_fragment();
+ $fragment->setVar('date_start', $filterDateHelper->date_start->format('Y-m-d'));
+ $fragment->setVar('date_end', $filterDateHelper->date_end->format('Y-m-d'));
+
+ return $fragment->parse('analysis_cards.php');
+ }
+
public static function renderMainChartSection(DateFilter $filterDateHelper): string
{
return StatsMainChartSection::render($filterDateHelper);
@@ -83,9 +97,9 @@ public static function renderTableLanguageConfigScript(): string
}
/**
- * @return array
|null
+ * @return array
*/
- private static function getTableLanguage(): ?array
+ private static function getTableLanguage(): array
{
$language = (string) rex::getProperty('lang');
$isGerman = 'de_de' === $language;
diff --git a/lib/Summary.php b/lib/Summary.php
index accae7b..46465cf 100644
--- a/lib/Summary.php
+++ b/lib/Summary.php
@@ -29,7 +29,7 @@ public function __construct(DateFilter $filter_date_helper)
/**
*
*
- * @return array
+ * @return array
* @throws InvalidArgumentException
* @throws rex_sql_exception
*/
@@ -37,6 +37,8 @@ public function getSummaryData(): array
{
$sql = rex_sql::factory();
$today = date('Y-m-d');
+ $weekStart = date('Y-m-d', strtotime('-6 day'));
+ $weekEnd = $today;
$visits = $sql->getArray(
'SELECT '
@@ -67,13 +69,76 @@ public function getSummaryData(): array
$visitsRow = $visits[0] ?? ['total' => 0, 'today' => 0, 'filtered' => 0];
$visitorsRow = $visitors[0] ?? ['total' => 0, 'today' => 0, 'filtered' => 0];
+ $visitsWeek = $sql->getArray(
+ 'SELECT IFNULL(SUM(count), 0) AS total '
+ . 'FROM ' . rex::getTable('pagestats_visits_per_day')
+ . ' WHERE date BETWEEN :start AND :end',
+ [
+ 'start' => $weekStart,
+ 'end' => $weekEnd,
+ ]
+ );
+
+ $visitorsWeek = $sql->getArray(
+ 'SELECT IFNULL(SUM(count), 0) AS total '
+ . 'FROM ' . rex::getTable('pagestats_visitors_per_day')
+ . ' WHERE date BETWEEN :start AND :end',
+ [
+ 'start' => $weekStart,
+ 'end' => $weekEnd,
+ ]
+ );
+
+ $topArticle = $sql->getArray(
+ 'SELECT url, SUM(count) AS total '
+ . 'FROM ' . rex::getTable('pagestats_visits_per_url')
+ . ' WHERE date BETWEEN :start AND :end '
+ . 'GROUP BY url ORDER BY total DESC LIMIT 1',
+ [
+ 'start' => $weekStart,
+ 'end' => $weekEnd,
+ ]
+ );
+
+ $weekVisits = (int) ($visitsWeek[0]['total'] ?? 0);
+ $weekVisitors = (int) ($visitorsWeek[0]['total'] ?? 0);
+ $weekPagesPerSession = $weekVisitors > 0 ? round($weekVisits / $weekVisitors, 2) : 0.0;
+
+ $topArticleUrl = (string) ($topArticle[0]['url'] ?? '');
+ $topArticleCount = (int) ($topArticle[0]['total'] ?? 0);
+ $topArticlePath = $this->extractPathFromTrackedUrl($topArticleUrl);
+
return [
- 'visits_datefilter' => $visitsRow['filtered'],
- 'visitors_datefilter' => $visitorsRow['filtered'],
- 'visits_today' => $visitsRow['today'],
- 'visitors_today' => $visitorsRow['today'],
- 'visits_total' => $visitsRow['total'],
- 'visitors_total' => $visitorsRow['total'],
+ 'visits_datefilter' => (int) $visitsRow['filtered'],
+ 'visitors_datefilter' => (int) $visitorsRow['filtered'],
+ 'visits_today' => (int) $visitsRow['today'],
+ 'visitors_today' => (int) $visitorsRow['today'],
+ 'visits_total' => (int) $visitsRow['total'],
+ 'visitors_total' => (int) $visitorsRow['total'],
+ 'visits_week' => $weekVisits,
+ 'visitors_week' => $weekVisitors,
+ 'top_article_path_week' => $topArticlePath,
+ 'top_article_count_week' => $topArticleCount,
+ 'pages_per_session_week' => $weekPagesPerSession,
];
}
+
+ private function extractPathFromTrackedUrl(string $url): string
+ {
+ if ('' === $url) {
+ return '/';
+ }
+
+ $firstSlash = strpos($url, '/');
+ if (false === $firstSlash) {
+ return '/';
+ }
+
+ $path = substr($url, $firstSlash);
+ if ('' === $path) {
+ return '/';
+ }
+
+ return $path;
+ }
}
diff --git a/lib/Visit.php b/lib/Visit.php
index e0f12ea..22688fd 100644
--- a/lib/Visit.php
+++ b/lib/Visit.php
@@ -526,6 +526,16 @@ public function isBot(): bool
return $this->DeviceDetector->isBot();
}
+ public function setUrl(string $url): void
+ {
+ $this->url = $url;
+ }
+
+ public function getUrl(): string
+ {
+ return $this->url;
+ }
+
/**
*
diff --git a/package.yml b/package.yml
index 93547c4..3cba338 100644
--- a/package.yml
+++ b/package.yml
@@ -1,5 +1,5 @@
package: statistics
-version: 3.2.0
+version: 3.2.3
author: Andreas Lenhardt
supportpage: https://github.com/AndiLeni/statistics
diff --git a/pages/events.php b/pages/events.php
index 7fc2b37..ffa65d6 100644
--- a/pages/events.php
+++ b/pages/events.php
@@ -19,14 +19,14 @@
echo StatsSubpageRenderer::renderFilter($current_backend_page, $filter_date_helper);
-if ($request_name != '' && $delete_entry === true) {
+if ($request_name !== '' && $delete_entry === true) {
$sql = rex_sql::factory();
$sql->setQuery('delete from ' . rex::getTable('pagestats_api') . ' where name = :name', ['name' => $request_name]);
- echo rex_view::success('Es wurden ' . $sql->getRows() . ' Einträge der Kampagne ' . $request_name . ' gelöscht.');
+ echo rex_view::success(sprintf($addon->i18n('statistics_deleted_campaign_entries'), (string) $sql->getRows(), htmlspecialchars($request_name, ENT_QUOTES)));
}
// details section
-if ($request_name != '' && !$delete_entry) {
+if ($request_name !== '' && !$delete_entry) {
// details section for single campaign
$pagedetails = new EventDetails($request_name, $filter_date_helper);
@@ -36,7 +36,7 @@
$content = '';
echo StatsSubpageRenderer::renderInfoSection(
- 'Details für:',
+ $addon->i18n('statistics_details_for'),
$request_name,
$content . StatsChartConfig::renderScript('chart_details', StatsChartConfig::buildTimelineOption($sum_data['labels'], $sum_data['values']))
);
diff --git a/pages/media.php b/pages/media.php
index 680957b..0950f2b 100644
--- a/pages/media.php
+++ b/pages/media.php
@@ -18,14 +18,14 @@
$filter_date_helper = new DateFilter($request_date_start, $request_date_end, 'pagestats_media');
echo StatsSubpageRenderer::renderFilter($current_backend_page, $filter_date_helper);
-if ($request_url != '' && $delete_entry === true) {
+if ($request_url !== '' && $delete_entry === true) {
$sql = rex_sql::factory();
$sql->setQuery('delete from ' . rex::getTable('pagestats_media') . ' where url = :url', ['url' => $request_url]);
- echo rex_view::success('Es wurden ' . $sql->getRows() . ' Einträge der Kampagne ' . $request_url . ' gelöscht.');
+ echo rex_view::success(sprintf($addon->i18n('statistics_deleted_campaign_entries'), (string) $sql->getRows(), htmlspecialchars($request_url, ENT_QUOTES)));
}
// details section
-if ($request_url != '' && !$delete_entry) {
+if ($request_url !== '' && !$delete_entry) {
// details section for single campaign
$pagedetails = new MediaDetails($request_url, $filter_date_helper);
@@ -34,7 +34,7 @@
$content = '';
echo StatsSubpageRenderer::renderInfoSection(
- 'Details für:',
+ $addon->i18n('statistics_details_for'),
$request_url,
$content . StatsChartConfig::renderScript('chart_details', StatsChartConfig::buildTimelineOption($sum_data['labels'], $sum_data['values']))
);
diff --git a/pages/pages.php b/pages/pages.php
index f72ef2d..e8c6c6c 100644
--- a/pages/pages.php
+++ b/pages/pages.php
@@ -29,14 +29,18 @@
// check if request is for ignoring a url
// if yes, add url to addon settings and delete all database entries of this url
-if ($request_url != '' && $ignore_page === true) {
+if ($request_url !== '' && $ignore_page === true) {
$rows = $pages_helper->ignorePage($request_url);
- echo rex_view::success('Es wurden ' . $rows . ' Einträge gelöscht. Die Url ' . $request_url . ' wird zukünftig ignoriert.');
+ echo rex_view::success(
+ sprintf($addon->i18n('statistics_ignore_success'), (string) $rows)
+ . ' '
+ . sprintf($addon->i18n('statistics_ignore_url_future'), htmlspecialchars($request_url, ENT_QUOTES))
+ );
}
// details for one url requested
-if ($request_url != '' && !$ignore_page) {
+if ($request_url !== '' && !$ignore_page) {
// details section for single page
$pagedetails = new PageDetails($request_url, $filter_date_helper);
@@ -47,7 +51,7 @@
$content .= StatsChartConfig::renderScript('chart_details', StatsChartConfig::buildTimelineOption($sum_data['labels'], $sum_data['values']));
$content .= $pagedetails->getList();
- echo StatsSubpageRenderer::renderInfoSection('Details für:', $request_url, $content);
+ echo StatsSubpageRenderer::renderInfoSection($addon->i18n('statistics_details_for'), $request_url, $content);
}
@@ -56,7 +60,7 @@
$domains = $sql->getArray('SELECT distinct domain FROM ' . rex::getTable('pagestats_visits_per_day'));
$domain_select = '