diff --git a/metager/resources/js/scriptResultPage.js b/metager/resources/js/scriptResultPage.js index 11d4f07b6bef62d10dcdcdb0616daaf150e2d445..a3fc3ea42d3df56b38d906ae511c939c27bf170e 100644 --- a/metager/resources/js/scriptResultPage.js +++ b/metager/resources/js/scriptResultPage.js @@ -85,7 +85,6 @@ function initialize() { let promise_fetch = verify(); if (typeof promise_fetch !== "undefined" && link !== "#") { - console.log(link); promise_fetch.then((response) => { if (!newtab) { if (top) { diff --git a/metager/resources/js/statistics.js b/metager/resources/js/statistics.js index 308957a279725e2927a9387f42feb7a8623cc31c..5a9df338ee85f3465e7b8823c18a38e4281d7d72 100644 --- a/metager/resources/js/statistics.js +++ b/metager/resources/js/statistics.js @@ -8,6 +8,10 @@ class Statistics { constructor() { let performance = window.performance.getEntriesByType('navigation')[0]; + try { + let statistics_enabled = document.querySelector("meta[name=statistics-enabled]").content; + if (statistics_enabled != 1) return; // Disable statistics if those are not enabled + } catch (error) { } if (performance.loadEventEnd != 0) { this.#init(); } else { @@ -24,6 +28,7 @@ class Statistics { #init() { setTimeout(this.pageLoad.bind(this), 60000); + document.addEventListener("visibilitychange", this.pageLoad.bind(this)); document.querySelectorAll("a").forEach(anchor => { anchor.addEventListener("click", e => this.pageLeave(e.target.closest("a").href)); }); diff --git a/metager/resources/js/utility.js b/metager/resources/js/utility.js index 0f5001337745b8b5e435965539b47bd085a7c905..1ffad047fc834b7ae96c4dbf10c64ebbb28b3ed4 100644 --- a/metager/resources/js/utility.js +++ b/metager/resources/js/utility.js @@ -63,7 +63,6 @@ function reportJSAvailabilityForAuthenticatedSearch() { function backButtons() { document.querySelectorAll(".back-button").forEach(button => { button.style.display = "block"; - console.log(button); button.addEventListener("click", e => { let href = button.href; // Use the defined URL on the button if there is one diff --git a/metager/resources/views/layouts/resultPage.blade.php b/metager/resources/views/layouts/resultPage.blade.php index 33825f95c1400812706285e74029ba487cbb01a5..862b848e89615f3beaac2dbad5d49710ee0b5d29 100644 --- a/metager/resources/views/layouts/resultPage.blade.php +++ b/metager/resources/views/layouts/resultPage.blade.php @@ -58,6 +58,7 @@ <meta name="searchkey" content="{{ $metager->getSearchUid() }}" /> <meta name="referrer" content="origin-when-cross-origin"> <meta name="age-meta-label" content="age=18" /> + <meta name="statistics-enabled" content="{{ config("metager.matomo.enabled") }}"> {{-- Add Advertisement Scripts if Yahoo is enabled --}} @if (app(\App\Models\Configuration\Searchengines::class)->getEnabledSearchengine('yahoo') !== null) <meta name="source_tag" diff --git a/metager/resources/views/layouts/staticPages.blade.php b/metager/resources/views/layouts/staticPages.blade.php index f399d8ac5c94a6fefff4fd3c16de2b6f94c3f872..ba139a47834a71ad854f4cd7bb0d607479f86496 100644 --- a/metager/resources/views/layouts/staticPages.blade.php +++ b/metager/resources/views/layouts/staticPages.blade.php @@ -11,6 +11,7 @@ <meta name="revisit-after" content="7 days" /> <meta name="audience" content="all" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" /> + <meta name="statistics-enabled" content="{{ config("metager.matomo.enabled") }}"> <link href="/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" /> @foreach(LaravelLocalization::getSupportedLocales() as $locale => $locale_data)