diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php
index a7b3c710c97f1e6992d8de00da4d05d0f98ba3ee..850e81938770d9c042c71c9a96069d28010364ae 100644
--- a/app/Http/Controllers/LanguageController.php
+++ b/app/Http/Controllers/LanguageController.php
@@ -321,12 +321,12 @@ class LanguageController extends Controller
}
}
- if(file_exists("langfiles.zip"))
- unlink("langfiles.zip");
+ if(file_exists("/tmp/langfiles.zip"))
+ unlink("/tmp/langfiles.zip");
$zip = new ZipArchive();
- if (empty($data) || $zip->open("langfiles.zip", ZipArchive::CREATE) !== TRUE) {
+ if (empty($data) || $zip->open("/tmp/langfiles.zip", ZipArchive::CREATE) !== TRUE) {
return redirect(url('synoptic', ['exclude' => $exclude]));
}
@@ -344,7 +344,7 @@ class LanguageController extends Controller
$zip->close();
- return response()->download("langfiles.zip", $filename.".zip");
+ return response()->download("/tmp/langfiles.zip", $filename.".zip");
} catch(ErrorException $e) {
echo("Failed to write ".$filename);
}
diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index ee50d3360089f4f0b22dadbaf55f662609d40d3d..b466939083e6fa8e3fd9334b5c0bb06339da0608 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -70,9 +70,11 @@ class MetaGerSearch extends Controller
if ($word[0] === "!") {
$dummyQuery .= $word . " ";
} else {
- $realQuery .= $word;
+ $realQuery .= $word . " ";
}
}
+ $realQuery = rtrim($realQuery);
+
if ($dummyQuery !== "") {
$dummyQuery .= $placeholder;
$url = "https://api.duckduckgo.com/?format=json&no_redirect=1&t=MetaGerDE&q=" . urlencode($dummyQuery);
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 88eb29fb580c7abe5978b6e1730e94f7b70fc3a1..96a5020e34ba80f6e4e5d5f1953382c64cab545f 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -36,7 +36,7 @@ class MetaGer
protected $addedHosts = [];
protected $startCount = 0;
protected $canCache = false;
- # Daten über die Abfrage
+ # Daten über die Abfrage$
protected $ip;
protected $language;
protected $agent;
@@ -591,7 +591,6 @@ class MetaGer
foreach ($engines as $engine) {
$engine->startSearch($this);
}
-
// Derzeit deaktiviert, da es die eigene Suche gibt
// $this->adjustFocus($sumas, $enabledSearchengines);
@@ -746,6 +745,7 @@ class MetaGer
public function loadMiniSucher($xml, $subcollections)
{
$minisucherEngine = $xml->xpath('suma[@name="minism"]')[0];
+ $minisucherEngine["subcollections"] = implode(", ", $subcollections);
$subcollections = urlencode("(" . implode(" OR ", $subcollections) . ")");
$minisucherEngine["formData"] = str_replace("<<SUBCOLLECTIONS>>", $subcollections, $minisucherEngine["formData"]);
$minisucherEngine["formData"] = str_replace("<<COUNT>>", sizeof($subcollections) * 10, $minisucherEngine["formData"]);
diff --git a/app/Models/parserSkripte/Minisucher.php b/app/Models/parserSkripte/Minisucher.php
index 8614479d96c53f0b97720b7c59fb43d0fedd140d..02a3e28c26d378ca83e0c6bb3df1ea9547f777de 100644
--- a/app/Models/parserSkripte/Minisucher.php
+++ b/app/Models/parserSkripte/Minisucher.php
@@ -6,7 +6,6 @@ use App\Models\Searchengine;
class Minisucher extends Searchengine
{
-
public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
{
parent::__construct($engine, $metager);
@@ -55,23 +54,8 @@ class Minisucher extends Searchengine
$additionalInformation = ['date' => $dateVal];
- $provider = $result->xpath('//doc/str[@name="subcollection"]')[0]->__toString();
-
- if (isset($providerCounter[$provider]) && $providerCounter[$provider] > 10) {
- continue;
- } else {
- if (!isset($providerCounter[$provider])) {
- $providerCounter[$provider] = 0;
- }
-
- $providerCounter[$provider] += 1;
- }
-
- if (isset($provider)) {
- $gefVon = "<a href=\"https://metager.de\" target=\"_blank\" rel=\"noopener\">Minisucher: $provider</a>";
- } else {
- $gefVon = $this->gefVon;
- }
+ $minism = simplexml_load_string($this->engine)["subcollections"];
+ $gefVon = "<a href=\"https://metager.de\" target=\"_blank\" rel=\"noopener\">Minisucher: $minism </a>";
$this->results[] = new \App\Models\Result(
$this->engine,
diff --git a/resources/lang/de/metaGer.php b/resources/lang/de/metaGer.php
index 38980a54a3cba617a32211068dba15c73f56be0b..c622ce91b90c3bec39e567585dac8e0624d58968 100644
--- a/resources/lang/de/metaGer.php
+++ b/resources/lang/de/metaGer.php
@@ -18,5 +18,5 @@ return [
'sitesearch.failed' => 'Sie wollten eine Sitesearch auf :site durchführen. Leider unterstützen die eingestellten Suchmaschinen diese nicht. Sie können <a href=":searchLink">hier</a> die Sitesearch im Web-Fokus durchführen. Es werden ihnen Ergebnisse ohne Sitesearch angezeigt.',
'sitesearch.success' => 'Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: <a href="http://:site" target="_blank" rel="noopener">":site"</a> angezeigt.',
- 'feedback' => 'Nichts passendes dabei? Geben Sie uns Feedback: ',
+ 'feedback' => 'Nichts Passendes dabei? Geben Sie uns Feedback: ',
];
diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
index 6dd97f81f7b5a75113dd12982e38d9f3681f95bc..620046d3dbf0477a084456b1235303bde91fd410 100644
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@@ -1,52 +1,41 @@
<?php
return [
- 'head.1' => 'Einstellungen',
- 'head.2' => 'Hier können Sie Ihr MetaGer anpassen: Nach Anklicken Ihrer gewünschten Einstellungen müssen Sie wählen, ob Sie die Einstellungen dauerhaft speichern, oder nur einmalig setzen wollen.',
-
- 'allgemein.1' => 'Allgemein',
-
- 'quotes.label' => 'Sprüche',
- 'quotes.on' => 'anzeigen',
- 'quotes.off' => 'nicht anzeigen',
-
- 'maps.label' => 'Maps',
- 'maps.on' => 'anzeigen',
- 'maps.off' => 'nicht anzeigen',
-
- 'tab.label' => 'Ergebnisse öffnen:',
- 'tab.new' => 'In einem neuen Tab',
- 'tab.same' => 'Im gleichen Tab',
-
- 'language.label' => 'Sprache auswählen:',
- 'language.all' => 'Alle Sprachen',
- 'language.de' => 'Deutsch',
- 'language.en' => 'Englisch',
-
- 'suchmaschinen.1' => 'Suchmaschinen',
- 'suchmaschinen.2' => '(alle abwählen)',
- 'suchmaschinen.3' => '(alle an-/abwählen)',
-
- 'abort' => 'abbrechen',
-
- 'speichern.1' => 'Startseite für einmalige Nutzung generieren',
- 'speichern.2' => 'Einstellungen dauerhaft speichern',
- 'speichern.3' => 'Plugin mit diesen Einstellungen generieren',
- 'speichern.4' => 'Einstellungen zurücksetzen',
-
- 'request' => 'Abfragemethode',
-
- 'autocomplete.label'=> 'Auto-Vervollständigung (Sucheingabe)',
- 'autocomplete.on' => 'ein',
- 'autocomplete.off' => 'aus',
-
- 'key.label' => 'Schlüssel für werbefreie Suche',
- 'key.placeholder' => 'Schlüssel eingeben',
-
- "foki.web" => "Web",
- "foki.andere" => "Andere",
- "foki.produktsuche" => "Produktsuche",
- "foki.wissenschaft" => "Wissenschaft",
- "foki.nachrichten" => "News/Politik",
- "foki.bilder" => "Bilder",
-];
+ "head.1" => "Einstellungen",
+ "head.2" => "Hier können Sie Ihr MetaGer anpassen: Nach Anklicken Ihrer gewünschten Einstellungen müssen Sie wählen, ob Sie die Einstellungen dauerhaft speichern, oder nur einmalig setzen wollen.",
+ "allgemein.1" => "Allgemein",
+ "quotes.label" => "Sprüche",
+ "quotes.on" => "anzeigen",
+ "quotes.off" => "nicht anzeigen",
+ "maps.label" => "Maps",
+ "maps.on" => "anzeigen",
+ "maps.off" => "nicht anzeigen",
+ "tab.label" => "Ergebnisse öffnen:",
+ "tab.new" => "In einem neuen Tab",
+ "tab.same" => "Im gleichen Tab",
+ "language.label" => "Sprache auswählen:",
+ "language.all" => "Alle Sprachen",
+ "language.de" => "Deutsch",
+ "language.en" => "Englisch",
+ "suchmaschinen.1" => "Suchmaschinen",
+ "suchmaschinen.2" => "(alle abwählen)",
+ "suchmaschinen.3" => "(alle an-/abwählen)",
+ "abort" => "abbrechen",
+ "speichern.1" => "Startseite für einmalige Nutzung generieren",
+ "speichern.2" => "Einstellungen dauerhaft speichern",
+ "speichern.3" => "Plugin mit diesen Einstellungen generieren",
+ "speichern.4" => "Einstellungen zurücksetzen",
+ "request" => "Abfragemethode",
+ "autocomplete.label" => "Auto-Vervollständigung (Sucheingabe)",
+ "autocomplete.on" => "ein",
+ "autocomplete.off" => "aus",
+ "key.label" => "Schlüssel für werbefreie Suche",
+ "key.placeholder" => "Schlüssel eingeben",
+ "foki.web" => "Web",
+ "foki.andere" => "Andere",
+ "foki.produktsuche" => "Produktsuche",
+ "foki.wissenschaft" => "Wissenschaft",
+ "foki.nachrichten" => "News/Politik",
+ "foki.bilder" => "Bilder",
+ "autocomplete" => "Automatisch vervollständigen"
+];
\ No newline at end of file
diff --git a/resources/lang/en/about.php b/resources/lang/en/about.php
index 8723624f8d6f0419305f9acb3965fa5321eb1221..ea7a7f68412a3f730e4c6e1df60bc7811701037f 100644
--- a/resources/lang/en/about.php
+++ b/resources/lang/en/about.php
@@ -1,13 +1,22 @@
<?php
return [
- "head.1" => "About us",
- "head.2" => "What are the advantages of using MetaGer?",
- "list.1" => "Privacy is quite natural for us: Completely built in and automatically applied to every search. <a href=\"/en/datenschutz/\">More about privacy...</a>",
- "list.2" => "We do not work profit-oriented, we are a <a href=\"/en/spende/\">charitable association</a>: Our goal is not to enrich ourselves with your clicks or even your data.",
- "list.3" => "<a href=\"https://en.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> is primarily a <a href=\"https://de.wikipedia.org/wiki/Metasuchmaschine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>: We query up to 50 search engines. Thus we can offer real variety in results.",
- "list.4" => "For our results, we do not prefer results <a href=\"https://en.wikipedia.org/wiki/Filter_bubble\" target=\"_blank\" rel=\"noopener\">that are clicked more often</a>: This also gives you variety, instead of mainstream.",
- "list.5" => "MetaGer is online since about 20 years: Our experience is your advantage - we know what we do.",
- "list.6" => "We only use green electricity for our servers.",
- "list.7" => "But we are not perfect as well: If you encounter something weird: Please <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact us</a>! We take your hints seriously: <em>You</em> are most important for us.",
+ "head.1" => "About us",
+ "head.2" => "What are the advantages of using MetaGer?",
+ "head.3" => "MetaGer - Characteristic qualities",
+ "3.0" => "implementation of free access to knowledge and digital democracy with:",
+ "3.1" => "access to knowledge without control and dictation by states or trusts.",
+ "3.2" => "no storage of private data, highest demand of privacy.",
+ "3.3" => "and anonymous access also to the search results, therefore.",
+ "3.4" => "realized through: anony,ous proxy an the Hidden-Tor-Branch, ",
+ "3.5" => "as an Open-Source-Software which allows examining and checks.",
+ "3.6" => "these features are realized not only for search and find of informations but also for route-planning and geographical search (<a href=\"https://maps.metager.de\" target=\"_blank\">maps.metager.de</a>), WITHOUT tracking any locations.",
+ "3.7" => "embedded in a transparent organization (Nonprofit organization <a href=\"https://suma-ev.de\" target=\"_blank\">SUMA-EV</a>), each and every can become a member of it.",
+ "list.1" => "Privacy is quite natural for us: Completely built in and automatically applied to every search. <a href=\"/en/datenschutz/\">More about privacy...</a>",
+ "list.2" => "We do not work profit-oriented, we are a <a href=\"/en/spende/\">charitable association</a>: Our goal is not to enrich ourselves with your clicks or even your data.",
+ "list.3" => "<a href=\"https://en.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> is primarily a <a href=\"https://de.wikipedia.org/wiki/Metasuchmaschine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>: We query up to 50 search engines. Thus we can offer real variety in results.",
+ "list.4" => "For our results, we do not prefer results <a href=\"https://en.wikipedia.org/wiki/Filter_bubble\" target=\"_blank\" rel=\"noopener\">that are clicked more often</a>: This also gives you variety, instead of mainstream.",
+ "list.5" => "MetaGer is online since about 20 years: Our experience is your advantage - we know what we do.",
+ "list.6" => "We only use green electricity for our servers.",
+ "list.7" => "But we are not perfect as well: If you encounter something weird: Please <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact us</a>! We take your hints seriously: <em>You</em> are most important for us."
];
diff --git a/resources/lang/en/faktencheck.php b/resources/lang/en/faktencheck.php
new file mode 100644
index 0000000000000000000000000000000000000000..570e58df5e95b11e8d460a441a98fba495e7bef6
--- /dev/null
+++ b/resources/lang/en/faktencheck.php
@@ -0,0 +1,37 @@
+<?php
+
+return [
+ "heading.1" => "Fact-checks versus fake news:",
+ "paragraph.1" => "Which origin has this message?",
+ "list.1" => "Web",
+ "list.1.1" => "Has this web document an imprint? What can be found out about these specified persons, companies....",
+ "list.1.2" => "Checking the WHOIS database: who is listed as the owner / operator of the website / page? Does these informations fit with the imprint? What can be found out about the owner of the web document? (<a href=\"https://de.wikipedia.org/wiki/Whois\" target=\"_blank\" rel=\"noopener\">https://de.wikipedia.org/wiki/Whois</a>)",
+ "list.1.3" => "On the page: Is there an author mentioned? What can be found out about that author?",
+ "list.1.4" => "Is it a very well known author on this subject? Any Wikipedia entries?",
+ "list.1.5" => "Does the text contain facts which can be sifted? Other sources -not only internet- known and available? ",
+ "list.1.6" => "Does the writing style indicate if the text could be ironical?",
+ "list.1.7" => "Does the author use a proper citation which can be sifted elsewhere?",
+ "list.1.8" => "Is the argumentation logical and reasonable ?",
+ "list.2" => "Facebook and other social nets or panels",
+ "list.2.1" => "The message is not very believable if there is no real appearing authors name.",
+ "list.2.2" => "Are there additional informations referring to this author's name?",
+ "list.2.3" => "Can be verified if this name is real? Is the person reachable on other channels? Is it possible to speak with this person?",
+ "list.2.4" => "Is there a verified Facebook profile? (<a href=\"https://www.facebook.com/help/196050490547892\" target=\"_blank\" rel=\"noopener\">https://www.facebook.com/help/196050490547892</a>)",
+ "list.2.5" => "Since when is this profile online?",
+ "list.2.6" => "How many friends are listed in this profile? Can be found out anything about these profiles?",
+ "list.3" => "Wikipedia",
+ "list.3.1" => "Not everything which can be found on wikipedia is true!",
+ "list.3.2" => "Check the history: Who wrote this at what time?",
+ "list.3.3" => "Can be found out anything about these authors?",
+ "list.3.4" => "Is there a special discussion page on wikipedia?",
+ "list.4" => "Emails",
+ "list.4.1" => "It's very easy to fake Emails or to manipulate accounts. => Fakemails.",
+ "list.4.2" => "It' not easy to find out the origin and other facts of an email. You may find some hints here: <a href=\"http://cert.uni-stuttgart.de/themen/spam/header.html\" target=\"_blank\" rel=\"noopener\">http://cert.uni-stuttgart.de/themen/spam/header.html</a>",
+ "list.4.3" => "It is very good and safe to use encrypted mails. Hints: <a href=\"https://www.heise.de/ct/artikel/Ausgebootet-289538.html\" target=\"_blank\" rel=\"noopener\">https://www.heise.de/ct/artikel/Ausgebootet-289538.html</a> ",
+ "list.5" => "Pictures an videos",
+ "list.5.1" => "Check out the image background. Landscape, buildings, cars with their registration numbers, persons and clothes. Does this fit together? Does it fit with the text?",
+ "list.5.2" => "Could be find similar pictures with an reverse-image-search (provided by image search engines)?",
+ "list.5.3" => "Open the image file with a graphic application: are their metadatas inside the image and do they fit with the image content?",
+ "list.6" => "There is a \"Fake News Check\"-App for the smartphone which considers very subjective and emotional issues.",
+ "list.7" => "There's no such thing as absolute security against fakes."
+];
\ No newline at end of file
diff --git a/resources/lang/en/faq.php b/resources/lang/en/faq.php
index d8b5f9da5704cf95ac4db3d65d6db06c855f5d6d..09fa6ee0b4a380b9a0c549995b2a0ed2131bf6e7 100644
--- a/resources/lang/en/faq.php
+++ b/resources/lang/en/faq.php
@@ -1,56 +1,64 @@
<?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 - FAQ",
- "faq.1.h" => "What is MetaGer?",
- "faq.1.b" => "MetaGer is primarily a <a href=\"https://en.wikipedia.org/wiki/Metasearch_engine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>. Besides that MetaGer maintains a number of specialized crawlers and indexers of its own.",
- "faq.2.h" => "Which search engines are meta-crawled by MetaGer?",
- "faq.2.b" => "You can find a list at our \"customize\" menu on the MetaGer homepage.",
- "faq.3.h" => "Why does MetaGer has no button \"search using all search engines\"?",
- "faq.3.b" => "The reason is, that the requirements of a search are often not suitable for this. Example: For a search for scientific results it makes no sense to search with a product search engine.",
- "faq.4.h" => "Why don't you metacrawl search engine XY anymore?",
- "faq.4.b" => "If we do not query a search engine which we did query before, then this has technical or \"political\" reasons.",
- "faq.5.h" => "One search engine does not answer anymore",
- "faq.5.b" => "If you observe this it is probably a technical fault. Please email us in that case: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>",
- "faq.6.h" => "Inappropriate Content",
- "faq.6.b.1" => "I found results with illegal content.",
- "faq.6.b.2" => "If some content (found by MetaGer) seems to be illegal, please email us to <a href=\"mailto:jugendschutz@metager.de\" target=\"_blank\" rel=\"noopener\">jugendschutz@metager.de</a>.",
- "faq.7.h" => "Is it possible to integrate MetaGer into my own website?",
- "faq.7.b" => "No problem! We have a <a href=\"/en/widget\" target=_blank>widget</a> that you can use free of charge.",
- "faq.8.h" => "How can I register my homepage on MetaGer?",
- "faq.8.b" => "You can't. MetaGer is a metasearch engine. If you want to propagate your website, you have to register at all the other search engines for that purpose.",
- "faq.9.h" => "How does the MetaGer ranking work?",
- "faq.9.b" => 'You can check <a href="https://gitlab.metager3.de/open-source/MetaGer" target=_blank>our source code</a> to find out.',
- "faq.10.h" => "I can't use MetaGer with my browser X and operating system Y. I need help!",
- "faq.10.b" => "Please try first to install the newest available plugin. Just use the link below the searchfield, it has an automatic browserdetection. If it is still not working, please let us know: <a href=\"mailto:office@suma-ev.de\" target=\"_blank\" rel=\"noopener\">office@suma-ev.de</a>",
- "faq.11.h" => "Where did you get all these nice sayings?",
- "faq.11.b" => "We find some in the web but we've got the most of them from Alexander Hammer. We don't provide them in english....",
- "faq.12.h" => "How can I delete the search suggestions?",
- "faq.12.b" => "This is provided by your webbrowser. Try to customize the history settings.",
- "faq.13.h" => "What is about the privacy and how long / what do you store?",
- "faq.13.b.1" => "The protection of private data is our general principle. Everything we do is subordinated to this principle. Therefore we do not work with Cookies, Session IDs or anything else. More exact information: <a href=\"/datenschutz/\" target=\"_blank\" rel=\"noopener\">https://metager.de/en/datenschutz/</a>",
- "faq.13.b.2" => "Besides: we do not store and we do not even know your IP-address (For the purpose of securing our servers against Hacking- and Bot-Attacks, we need to store these information for a short period of time. It will be then automatically deleted afterwards). We use serversided anonymization for the communication with the prompted search services. We think that searchengines work well without storing IP-addresses. What do we do additionally?",
- "faq.13.b.3" => "You may wish to hide your IP-address generally. We provide a free proxyservice. Click \"Tools\" for more exact information: ",
- "faq.13.b.4" => "Please use the Tor-network or the MetaGer Tor-branch for advanced anonymization. Please click \"Tools\" for further information.",
- "faq.13.b.5" => "Needless to say: we use the https protocoll at any time. All your queries are safe between your personal computer and the MetaGer servers.",
- "faq.14.h" => "How can one match data to indviduals ?",
- "faq.14.b.1" => "1.) This could be done by using 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. You should do this routinely. ",
- "faq.14.b.2" => "2.) The webproviders manage internet connections by assigning IP-addresses to individuals. This is ruled by law and is different in all countries.",
- "faq.14.b.3" => "3.) 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.",
- "faq.15.h" => "How was MetaGer started, what is the story behind MetaGer?",
- "faq.15.b" => "It was started in 1996. Take a look at the historically documented origin story here: <a href=\"http://blog.suma-ev.de/node/207\" target=\"_blank\" rel=\"noopener\">http://blog.suma-ev.de/node/207</a>.",
- "faq.16.h" => "Is it allowed to hyperlink MetaGer ?",
- "faq.16.b" => "Yes, sure. You can do this as you like. This refers to all pages of our site. But: we would like it more if you would use our widget (for the improvement of your own website). See \"Tools\".",
- "faq.17.h" => "How to add MetaGer as a standard search engine (using the plugin)",
- "faq.17.b.1" => "A short instruction how to add the metager plugin to your webbrowser (includes deinstallation if necessary):",
- "faq.17.b.2" => "<b>For the Firefox webbrowser:</b>",
- "faq.17.b.3" => "1. Please choose \"Edit/Preferences\" from the menu and",
- "faq.17.b.4" => "2. pick \"Search\".",
- "faq.17.b.5" => "3. If there is an entry \"MetaGer\" in the below list then",
- "faq.17.b.6" => "4. select this entry and",
- "faq.17.b.7" => "5. click \"Remove\" on the right side below the list.",
- "faq.17.b.8" => "6. Open the MetaGer startpage (https://metager.de/en) and",
- "faq.17.b.9" => "7. click \"Add the MetaGer-Plugin\" below the searchfield. Please follow the given advices.",
- "faq.17.b.10" => "Of course, you can use MetaGer without that plugin at any time. Just type \"metager.de\" into your browsers address bar.",
-];
+ "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 - FAQ",
+ "faq.1.h" => "What is MetaGer?",
+ "faq.1.b" => "MetaGer is primarily a <a href=\"https://en.wikipedia.org/wiki/Metasearch_engine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>. Besides that MetaGer maintains a number of specialized crawlers and indexers of its own.",
+ "faq.2.h" => "Which search engines are meta-crawled by MetaGer?",
+ "faq.2.b" => "You can find a list at our \"customize\" menu on the MetaGer homepage.",
+ "faq.3.h" => "Why does MetaGer has no button \"search using all search engines\"?",
+ "faq.3.b" => "The reason is, that the requirements of a search are often not suitable for this. Example: For a search for scientific results it makes no sense to search with a product search engine.",
+ "faq.4.h" => "Why don't you metacrawl search engine XY anymore?",
+ "faq.4.b" => "If we do not query a search engine which we did query before, then this has technical or \"political\" reasons.",
+ "faq.5.h" => "One search engine does not answer anymore",
+ "faq.5.b" => "If you observe this it is probably a technical fault. Please email us in that case: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>",
+ "faq.6.h" => "Inappropriate Content",
+ "faq.6.b.1" => "I found results with illegal content.",
+ "faq.6.b.2" => "If some content (found by MetaGer) seems to be illegal, please email us to <a href=\"mailto:jugendschutz@metager.de\" target=\"_blank\" rel=\"noopener\">jugendschutz@metager.de</a>.",
+ "faq.7.h" => "Is it possible to integrate MetaGer into my own website?",
+ "faq.7.b" => "No problem! We have a <a href=\"/en/widget\" target=_blank>widget</a> that you can use free of charge.",
+ "faq.8.h" => "How can I register my homepage on MetaGer?",
+ "faq.8.b" => "You can't. MetaGer is a metasearch engine. If you want to propagate your website, you have to register at all the other search engines for that purpose.",
+ "faq.9.h" => "How does the MetaGer ranking work?",
+ "faq.9.b" => "You can check <a href=\"https://gitlab.metager3.de/open-source/MetaGer\" target=_blank>our source code</a> to find out.",
+ "faq.10.h" => "I can't use MetaGer with my browser X and operating system Y. I need help!",
+ "faq.10.b" => "Please try first to install the newest available plugin. Just use the link below the searchfield, it has an automatic browserdetection. If it is still not working, please let us know: <a href=\"mailto:office@suma-ev.de\" target=\"_blank\" rel=\"noopener\">office@suma-ev.de</a>",
+ "faq.11.h" => "Where did you get all these nice sayings?",
+ "faq.11.b" => "We find some in the web but we've got the most of them from Alexander Hammer. We don't provide them in english....",
+ "faq.12.h" => "How can I delete the search suggestions?",
+ "faq.12.b" => "This is provided by your webbrowser. Try to customize the history settings.",
+ "faq.13.h" => "What is about the privacy and how long / what do you store?",
+ "faq.13.b.1" => "The protection of private data is our general principle. Everything we do is subordinated to this principle. Therefore we do not work with Cookies, Session IDs or anything else. More exact information: <a href=\"/datenschutz/\" target=\"_blank\" rel=\"noopener\">https://metager.de/en/datenschutz/</a>",
+ "faq.13.b.2" => "Besides: we do not store and we do not even know your IP-address (For the purpose of securing our servers against Hacking- and Bot-Attacks, we need to store these information for a short period of time. It will be then automatically deleted afterwards). We use serversided anonymization for the communication with the prompted search services. We think that searchengines work well without storing IP-addresses. What do we do additionally?",
+ "faq.13.b.3" => "You may wish to hide your IP-address generally. We provide a free proxyservice. Click \"Tools\" for more exact information: ",
+ "faq.13.b.4" => "Please use the Tor-network or the MetaGer Tor-branch for advanced anonymization. Please click \"Tools\" for further information.",
+ "faq.13.b.5" => "Needless to say: we use the https protocoll at any time. All your queries are safe between your personal computer and the MetaGer servers.",
+ "faq.14.h" => "How can one match data to indviduals ?",
+ "faq.14.b.1" => "1.) This could be done by using 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. You should do this routinely. ",
+ "faq.14.b.2" => "2.) The webproviders manage internet connections by assigning IP-addresses to individuals. This is ruled by law and is different in all countries.",
+ "faq.14.b.3" => "3.) 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.",
+ "faq.15.h" => "How was MetaGer started, what is the story behind MetaGer?",
+ "faq.15.b" => "It was started in 1996. Take a look at the historically documented origin story here: <a href=\"http://blog.suma-ev.de/node/207\" target=\"_blank\" rel=\"noopener\">http://blog.suma-ev.de/node/207</a>.",
+ "faq.16.h" => "Is it allowed to hyperlink MetaGer ?",
+ "faq.16.b" => "Yes, sure. You can do this as you like. This refers to all pages of our site. But: we would like it more if you would use our widget (for the improvement of your own website). See \"Tools\".",
+ "faq.17.h" => "How to add MetaGer as a standard search engine (using the plugin)",
+ "faq.17.b.1" => "A short instruction how to add the metager plugin to your webbrowser (includes deinstallation if necessary):",
+ "faq.17.b.2" => "<b>For the Firefox webbrowser:</b>",
+ "faq.17.b.3" => "1. Please choose \"Edit/Preferences\" from the menu and",
+ "faq.17.b.4" => "2. pick \"Search\".",
+ "faq.17.b.5" => "3. If there is an entry \"MetaGer\" in the below list then",
+ "faq.17.b.6" => "4. select this entry and",
+ "faq.17.b.7" => "5. click \"Remove\" on the right side below the list.",
+ "faq.17.b.8" => "6. Open the MetaGer startpage (https://metager.de/en) and",
+ "faq.17.b.9" => "7. click \"Add the MetaGer-Plugin\" below the searchfield. Please follow the given advices.",
+ "faq.17.b.10" => "Of course, you can use MetaGer without that plugin at any time. Just type \"metager.de\" into your browsers address bar.",
+ "faq.18.h" => "Why are the !bangs not opended directly?",
+ "faq.18.b" => "The !bang -\"redirections\" are part of our quicktips and they need an additional click. We had to decide between easy-to-use and keep-control-of-data. We find it necessary to show that the links are third party property (DuckDuckGo). So there is a two way protection: first we do not transfer your searchwords but only the !bang to DuckDuckGo. On the other hand the user confirms the !bang-target explicit. We don't have the ressources to maintain all this !bangs, we are sorry.",
+ "faq.19.h" => "Is it possible to chose the requested search engines by myself?",
+ "faq.19.b.1" => "Yes, you can build an own search focus.",
+ "faq.19.b.2" => "Here: <a href=hilfe#custom-focus-help>Help</a>",
+ "faq.20.h" => "Where can I find the search engines settings?",
+ "faq.20.b" => "See here: <a href=\"#custom-focus-faq\">\"Is it possible to chose the requested search engines by myself?\"</a>",
+ "faq.21.h" => "Why is MetaGer presenting the umlauts in a wrong way?"
+];
\ No newline at end of file
diff --git a/resources/lang/en/hilfe.php b/resources/lang/en/hilfe.php
index 5c5f9fc081dd1dab485fffffdf6fb6808c5a94c1..9dda04ba82832af3e8d12fb65f95a2569e5a4b69 100644
--- a/resources/lang/en/hilfe.php
+++ b/resources/lang/en/hilfe.php
@@ -60,6 +60,9 @@ return [
"datenschutz.1" => "Cookies, Session-IDs, IP addresses",
"datenschutz.2" => "We don't store or work with any personal information (For the purpose of securing our servers against Hacking- and Bot-Attacks, we need to store these information for a short period of time. It will be then automatically deleted afterwards). We provide further privacy security services as follows:",
"datenschutz.3" => "For more details see \"Tools\" above.",
+ "datenschutz.faktencheck.heading"=> "Fact-Check versus fake news:",
+ "datenschutz.faktencheck.body.1" => '<a href="http://www.password-online.de/?wysija-page=1&controller=email&action=view&email_id=280" target="_blanK" rel="noopener">Ausführliche Anleitung und Beschreibung</a> von <a href="http://www.ude.de/" target="_blanK" rel="noopener">Albrecht Ude</a>',
+ "datenschutz.faktencheck.body.2" => '<a href="en/hilfe/faktencheck">Checklist</a>'
"tor.title" => "Tor Hidden Service",
"tor.1" => "MetaGer provides the highest reachable security level for your privacy (anonymised IP addresses, servers under german privacy protection law). For further security needs or fear of compromised servers you may use the MetaGer-Tor branch. Please download the specialized webbrowser from <a href=\"https://www.torproject.org/\" target=\"_blank\" rel=\"noopener\">https://www.torproject.org/</a>. You will find help there, too.",
"tor.2" => "MetaGer Tor address: http://b7cxf4dkdsko6ah2.onion/tor/",
diff --git a/resources/lang/en/metaGer.php b/resources/lang/en/metaGer.php
index 8e2389238d6409ec77603794ae6acbdb52731da1..d6ffd2ab7b29d5b841b41a4acdf60bf469de2e55 100644
--- a/resources/lang/en/metaGer.php
+++ b/resources/lang/en/metaGer.php
@@ -9,9 +9,10 @@ return [
"formdata.dartEurope" => "Hint: you have activated Dart-Europe. Therefore the response time might be longer and is set to 10 sec",
"formdata.hostBlacklist" => "Results of the following domains will not be shown: \":host\"",
"formdata.domainBlacklist" => "These domains get ignored: \":domain\"",
+ "formdata.urlBlacklist" => "Results containing \":url\" are not shown.",
"formdata.stopwords" => "You have excluded results with the following words: \":stopwords\"",
"formdata.phrase" => "You are doing a string search: :phrase",
"sitesearch.failed" => "You intend to do a site search on :site. Unfortunately the chosen search engines do not support that. You can do a site search <a href=\":searchLink\">here</a> within the Web focus",
"sitesearch.success" => "You are doing a site search. Only results of the website <a href=\"http://:site\" target=\"_blank\" rel=\"noopener\">\":site\"</a> will be shown.",
- "feedback" => "Not what you were looking for? Give us feedback: ",
-];
\ No newline at end of file
+ "feedback" => "Not what you were looking for? Give us feedback: "
+];
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index d06119d32d99598cdef3d8644be92e4b434358de..097faaeace248a3620e174a529e1f1618079dfe8 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -26,13 +26,16 @@ return [
"speichern.3" => "Generate plugin with these settings",
"speichern.4" => "Reset saved settings",
"request" => "Query method",
- "autocomplete" => "autocomplete (search input)",
+ "autocomplete.label" => "Auto complete (of search input)",
"autocomplete.on" => "on",
"autocomplete.off" => "off",
+ "key.label" => "The key for ad-free search",
+ "key.placeholder" => "Put in the key here",
"foki.web" => "Web",
"foki.andere" => "Others",
"foki.produktsuche" => "Shopping",
"foki.wissenschaft" => "Science",
"foki.nachrichten" => "News/Politics",
- "foki.bilder" => "Pictures"
-];
\ No newline at end of file
+ "foki.bilder" => "Pictures",
+ "autocomplete" => "autocomplete (search input)"
+];
diff --git a/resources/lang/en/titles.php b/resources/lang/en/titles.php
index 85d296ab08dc60c5a0a2fb051cf48518512a4376..9d1a6f07bf15ece44fefa1691dd72ec58bb98b7b 100644
--- a/resources/lang/en/titles.php
+++ b/resources/lang/en/titles.php
@@ -18,5 +18,6 @@ return [
"partnershops" => "Partnershops - MetaGer",
"languages" => "translation tool - MetaGer",
"languages.edit" => "Edit language files - MetaGer",
- "app" => "Apps - MetaGer"
+ "app" => "Apps - MetaGer",
+ "faktencheck" => "Fact-checks versus fake news"
];
diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php
index bb29ca41deabf873a0d6c0121da0725e97663493..584ef75fc0b14587be2a201a49b4ddd00344663c 100644
--- a/resources/views/kontakt/kontakt.blade.php
+++ b/resources/views/kontakt/kontakt.blade.php
@@ -16,10 +16,10 @@
<div class="form-group kontakt-form-group">
<input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="text"></div>
<div class="form-group kontakt-form-group">
- @if($url !== "")
+ @if(isset($url) && $url !== "")
<label for="message">Wenn MetaGer bestimmte Webseiten nicht angezeigt hat, von denen Sie wissen, dass es sie gibt: Bitte nennen Sie deren Adresse/n (http:// ...???...). Wir werden das detailliert untersuchen.</label>
@endif
- <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}">@if($url !== "")Die Suche unter "{{ base64_decode($url) }}" ist unvollständig.@endif</textarea>
+ <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}">@if(isset($url) && $url !== "")Die Suche unter "{{ base64_decode($url) }}" ist unvollständig.@endif</textarea>
</div>
<div class="form-group kontakt-form-group">
<p>{!! trans('kontakt.form.7') !!}</p>