Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development

app/Models/parserSkripte/Kelkoo.php

@@ -52,9 +52,9 @@ class Kelkoo extends Searchengine
             
                 if(isset($result->Description[0]))
                 {
-                    $descr       = $result->Description[0]->__toString();
+                    $descr = $result->Description[0]->__toString();
                 }
-                $descr .= "<p>Preis: " . $price . " €</p>";
+                $descr      .= "<p>Preis: " . $price . " €</p>";
                 $image       = $result->Images[0]->Image[0]->Url[0]->__toString();
                 $link        = $result->Url[0]->__toString();
                 $anzeigeLink = $result->Merchant[0]->Name[0]->__toString();

app/Models/parserSkripte/OvertureAds.php

@@ -96,7 +96,7 @@ class OvertureAds extends Searchengine
         }
 
         # Erstellen des neuen Suchmaschinenobjekts und anpassen des GetStrings:
-        $next = new Overture($this->name, $this->engine, $metager);
+        $next = new OvertureAds($this->name, $this->engine, $metager);
         $next->getString = preg_replace("/&Keywords=.*?&/si", "&", $next->getString) . "&" . $nextArgs;
         $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
         $this->next = $next;

resources/lang/de/impressum.php

@@ -15,7 +15,7 @@ Deutschland/Germany',
 Tel.: ++49-(0)511-34000070
 EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a>
 <a href="/kontakt/">Verschlüsselndes Kontaktformular</a>',
-    'info.4' => 'Vorstand: Dominik Hebeler, Carsten Riel, <a href="https://www2.ostfalia.de/cms/de/pws/jensenn/index.html">Prof.Dr. Nils Jensen</a>',
+    'info.4' => 'Vorstand: Dominik Hebeler, Carsten Riel, <a href="https://www.ostfalia.de/cms/de/pws/jensen/index.html">Prof.Dr. Nils Jensen</a>',
     'info.6' => 'Jugendschutzbeauftragter: Georg Becker
 <a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>',
     'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" ist ein gemeinnütziger

resources/lang/en/hilfe.php

 <?php
 return [
-    "achtung" => "Warning! Structure and functionality of our website are subject to constant development and changes. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
-    "title" => "MetaGer Help",
+    "achtung"               => "Warning! Structure and functionality of our website are subject to constant development and changes. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
+    "title"                 => "MetaGer Help",
 
-    "searchfield.title" => 'The search field',
-    "searchfield.info" => 'The search field contains:',
+    "title.2"               => 'Use of the search engine',
+    
+    "searchfield.title"     => 'The search field',
+    "searchfield.info"      => 'The search field contains:',
     "searchfield.memberkey" => 'The key symbol (only SUMA-EV members): Members can enter a private key to use the "free-of-advertising" metager search. If you want this too, just become a member: <a href = "https://metager.org/beitritt">Membership form</a>',
-    "searchfield.slot" => 'The search field: Enter your words here.',
-    "searchfield.search" => 'The magnifier: Start your search.',
-    "result.top" => 'On the results page: Click / Touch the filter symbol to activate all filter options.',
-
-    "stopworte.title" => "Exclude single words",
-    "stopworte.1" => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word",
-    "stopworte.2" => "Example: You are looking for a new car, but no BMW. Then your search should be <div class=\"well well-sm\">new car -bmw</div>",
-    "stopworte.3" => "car new -bmw",
-
-    "mehrwortsuche.title" => "Searching for more than one word",
-    "mehrwortsuche.1" => "Without quotation you will get results containing one or some of the words of your search entry. Use quotes for the search for exact phrases, citations....",
-    "mehrwortsuche.2" => "Example: search for Shakespears <div class=\"well well-sm\">to be or not to be</div> will deliver many results, but the exact phrase will only be found using <div class=\"well well-sm\">\"to be or nor to be\"</div>",
-    "mehrwortsuche.3" => "Please use quotes to make sure to get your search words in the results list.",
-    "mehrwortsuche.3.example" => '"round-table" "decision"',
-    "mehrwortsuche.4" => "Put words or phrases in quotation marks to search for exact combinations.",
-    "mehrwortsuche.4.example" => '"round-table decision"',
+    "searchfield.slot"      => 'The search field: Enter your words here.',
+    "searchfield.search"    => 'The magnifier: Start your search.',
+
+    "resultpage.title"      => 'The result page',
+    "resultpage.foci"       => 'There are six different search focuses below the search field (Web, Pictures...). We assigned specific search engines to these focuses.',
+    "resultpage.choice"     => 'Below these you have two links:',
+    "resultpage.filter"     => 'Filter: Toggle filters on / off and apply settings here. Each focus has its own assortment.',
+    "resultpage.settings"   => 'Settings: Apply here your permanent settings for the current focus. You can select / unselect search engines here, too. Your settings are stored as non-personally identifiable cookies. Click "Overview" to see your settings. If settings have been stored you find a deletion button at the end of the page.',
+
+    "stopworte.title"       => "Exclude single words",
+    "stopworte.1"           => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word",
+    "stopworte.2"           => "Example: You are looking for a new car, but no BMW. Then your search should be <div class=\"well well-sm\">new car -bmw</div>",
+    "stopworte.3"           => "car new -bmw",
+
+    "mehrwortsuche.title"       => "Searching for more than one word",
+    "mehrwortsuche.1"           => "Without quotation you will get results containing one or some of the words of your search entry. Use quotes for the search for exact phrases, citations....",
+    "mehrwortsuche.2"           => "Example: search for Shakespears <div class=\"well well-sm\">to be or not to be</div> will deliver many results, but the exact phrase will only be found using <div class=\"well well-sm\">\"to be or nor to be\"</div>",
+    "mehrwortsuche.3"           => "Please use quotes to make sure to get your search words in the results list.",
+    "mehrwortsuche.3.example"   => '"round-table" "decision"',
+    "mehrwortsuche.4"           => "Put words or phrases in quotation marks to search for exact combinations.",
+    "mehrwortsuche.4.example"   => '"round-table decision"',
 
     "grossklein.title" => "Upper case vs. lower case",
     "grossklein.1" => "Upper case will not be distinguished from lower case",
@@ -115,4 +122,4 @@ return [
     'assignment.title' => 'How can one match data to indviduals ?',
     'assignment.explanation.1' => 'This could be done by cookies. For example a cookie can be set as a part of making an account. You give your data, a cookie is made out of it and is stored on your PC. Next time using the same service it will know you very well. This kind of data is managed by the webbrowser. It is easy to find and erase all cookies from unknown or not confidable origins. You should do this routinely.',
     'assignment.explanation.2' => 'The webbrowser sends a heap of data to a website, like the user agent, exact version numbers, the work invironment, the operating system and so on. Maybe there is a matching of data to individuals possible, too.',
-];
+];
\ No newline at end of file

resources/lang/en/impressum.php

@@ -14,7 +14,7 @@ Deutschland/Germany',
 Tel.: ++49-(0)511-34000070
 EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a>
 <a href="/kontakt/">encrypted contact form</a>',
-    'info.4' => 'Board: Dominik Hebeler, Carsten Riel, <a href="https://www2.ostfalia.de/cms/de/pws/jensenn/index.html">Prof.Dr. Nils Jensen</a>',
+    'info.4' => 'Board: Dominik Hebeler, Carsten Riel, <a href="https://www.ostfalia.de/cms/de/pws/jensen/index.html">Prof.Dr. Nils Jensen</a>',
     'info.6' => 'Youth Protection Commissioner: Georg Becker
 <a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>',
     'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" is a charitable association, registered in the register of associations at the Amtsgericht Hannover