From e572adc7f667207ff75e0464d5da67617739ec7a Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@hebeler.club>
Date: Mon, 4 Sep 2023 15:02:26 +0200
Subject: [PATCH] additional data
---
metager/app/Models/parserSkripte/Overture.php | 6 +++---
metager/lang/en/privacy.php | 1 -
metager/resources/views/privacy.blade.php | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/metager/app/Models/parserSkripte/Overture.php b/metager/app/Models/parserSkripte/Overture.php
index 5b8c9128e..78221f17b 100644
--- a/metager/app/Models/parserSkripte/Overture.php
+++ b/metager/app/Models/parserSkripte/Overture.php
@@ -229,11 +229,11 @@ class Overture extends Searchengine
$this->next = $next;
}
- # Liefert Sonderdaten für Yahoo
+ // Liefert Sonderdaten für Yahoo
private function setOvertureAffilData($url)
{
- $affil_data = 'ip=' . $this->ip;
- $affil_data .= '&ua=' . $this->useragent;
+ $affil_data = 'ip=' . request()->ip();
+ $affil_data .= '&ua=' . request()->useragent();
$serve_domain = "https://metager.de/";
if ($this->configuration->getParameter->mkt !== "de") {
diff --git a/metager/lang/en/privacy.php b/metager/lang/en/privacy.php
index e089f5179..a4a1878d8 100644
--- a/metager/lang/en/privacy.php
+++ b/metager/lang/en/privacy.php
@@ -20,7 +20,6 @@ return [
'preferences' => 'We use this data (e.g. language settings) to answer the respective search query. We store some of this data on a non-personal basis for statistical purposes.',
'additionally' => 'The following data is also collected if you use our ad-supported version:',
'botprotection' => 'To protect our service from overload, we need to limit the number of searches per internet connection. For this purpose alone, we store the full IP address and a timestamp for a maximum of 96 hours. If a noticeably large number of searches are carried out from an IP, this IP is temporarily (maximum 96 hours after the last search) saved in a blacklist. The IP is then deleted.',
- 'advertisers' => 'In addition to donations and membership fees, we must fund our operations through non-personalized advertising on the results page. In order to receive this advertising, we give the first two blocks of the IP in connection with parts of the so-called user agent to our advertising partners.',
'clarity' => 'We work with Microsoft Clarity and Microsoft Advertising to bring you free Yahoo search results and advertising. For this purpose, usage data for statistical purposes is recorded on the MetaGer results page.',
],
'contact' => [
diff --git a/metager/resources/views/privacy.blade.php b/metager/resources/views/privacy.blade.php
index 513c8eff7..0f3c18ac2 100644
--- a/metager/resources/views/privacy.blade.php
+++ b/metager/resources/views/privacy.blade.php
@@ -36,7 +36,6 @@
<li>
<div><a href="#ip-address">@lang('privacy.data.ip')</a>, <a href="#user-agent">@lang('privacy.data.useragent')</a>:</div>
<div>@lang('privacy.contexts.metager.botprotection')</div>
- <div>@lang('privacy.contexts.metager.advertisers')</div>
</li>
<li>
<div><a href="https://privacy.microsoft.com/privacystatement">Microsoft Clarity & Yahoo</a></div>
@@ -257,6 +256,6 @@
<div class="section">
<h1>@lang('privacy.changes.title')</h1>
<div>@lang('privacy.changes.description')</div>
- <div>@lang('privacy.changes.date', ['date' => '2023-08-31'])</div>
+ <div>@lang('privacy.changes.date', ['date' => '2023-09-04'])</div>
</div>
@endsection
\ No newline at end of file
--
GitLab