diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php index e1bbf864d97f1d3b619f35bd4e5e9f21f2a0f385..4bc0844c984003af577af32a5d3f3d5c1324e9b2 100644 --- a/app/Http/Controllers/MailController.php +++ b/app/Http/Controllers/MailController.php @@ -67,6 +67,12 @@ class MailController extends Controller $messageToUser = ""; $messageType = ""; # [success|error] + #Sicherheitsüberprüfung (Wir wurden in letzter Zeit ziemlich mit Mails zugespammt + $hash = md5(date('Y') . date('m') . date('d')); + if ($request->input('dt') !== $hash) { + return redirect(url('spende')); + } + # Folgende Felder werden vom Spendenformular als Input übergeben: # Name # Telefon diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php index 86a423dfb693803c9d3f7ca0d632f529eb5be955..a7824f40b79004413be8d69030889b2046416c19 100644 --- a/app/Http/Controllers/MetaGerSearch.php +++ b/app/Http/Controllers/MetaGerSearch.php @@ -28,7 +28,7 @@ class MetaGerSearch extends Controller $metager->rankAll(); # Ergebnisse der Suchmaschinen kombinieren: - $metager->combineResults(); + $metager->prepareResults(); # Die Ausgabe erstellen: return $metager->createView(); diff --git a/app/MetaGer.php b/app/MetaGer.php index c29d45c8181e8578c16b7eb2e2a75a4ae60d533d..aaacb294800167ca85621a8e7ac8f7b0be3d8aec 100644 --- a/app/MetaGer.php +++ b/app/MetaGer.php @@ -156,28 +156,18 @@ class MetaGer } } - public function combineResults() - { - foreach ($this->engines as $engine) { - if (isset($engine->next)) { - $this->next[] = $engine->next; - } - if (isset($engine->last)) { - $this->last[] = $engine->last; - } - foreach ($engine->results as $result) { - if ($result->valid) { - $this->results[] = $result; - } - } - foreach ($engine->ads as $ad) { - $this->ads[] = $ad; - } - foreach ($engine->products as $product) { - $this->products[] = $product; - } - } - + public function prepareResults() + { + $engines = $this->engines; + + // combine + $combinedResults = $this->combineResults($engines); + // sort + //$sortedResults = $this->sortResults($engines); + // filter + // augment (boost&adgoal) + // authorize + // misc (WiP) uasort($this->results, function ($a, $b) { if ($a->getRank() == $b->getRank()) { return 0; @@ -275,6 +265,30 @@ class MetaGer } + public function combineResults($engines) + { + foreach ($engines as $engine) { + if (isset($engine->next)) { + $this->next[] = $engine->next; + } + if (isset($engine->last)) { + $this->last[] = $engine->last; + } + foreach ($engine->results as $result) { + if ($result->valid) { + $this->results[] = $result; + } + } + foreach ($engine->ads as $ad) { + $this->ads[] = $ad; + } + foreach ($engine->products as $product) { + $this->products[] = $product; + } + } + + } + public function parseBoost($results) { foreach ($results as $result) { diff --git a/app/Models/Result.php b/app/Models/Result.php index 7b871c7ccc5340e09ed2fecb232ed4a499199222..73d0579f2c9d967be4f5563c7f09b40402c67425 100644 --- a/app/Models/Result.php +++ b/app/Models/Result.php @@ -233,7 +233,7 @@ class Result } } - /* Der Dublettefilter, der sicher stellt, + /* Der Dublettenfilter, der sicher stellt, * dass wir nach Möglichkeit keinen Link doppelt in der Ergebnisliste haben. */ if ($metager->addLink($this->strippedLink)) { diff --git a/resources/lang/en/503.php b/resources/lang/en/503.php new file mode 100644 index 0000000000000000000000000000000000000000..b7cc28856821d2ec3909ed02345c7c1f62b88e68 --- /dev/null +++ b/resources/lang/en/503.php @@ -0,0 +1,6 @@ +<?php + +return [ + "title" => "Service unavailable", + "text" => "We'll be right back" +]; diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php index 7d99121f38e772cba4b46087496590fc4d4eeb41..a97f59e453f1be3b8d4632531aa15af064e27a6a 100644 --- a/resources/views/spende/spende.blade.php +++ b/resources/views/spende/spende.blade.php @@ -42,7 +42,7 @@ <h3 id="lastschrift">{!! trans('spenden.lastschrift.1') !!}</h3> <p>{!! trans('spenden.lastschrift.2') !!}</p> <form role="form" method="POST"> - {{ csrf_field() }} + <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}" /> <div class="form-group donation-form-group"> <label for="Name">{!! trans('spenden.lastschrift.3') !!}</label> <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spenden.lastschrift.3.placeholder') !!}"> diff --git a/resources/views/spende/spendenaufruf.blade.php b/resources/views/spende/spendenaufruf.blade.php index ee62aedd511323e954daedf26bfd58b6a0d1d23d..70b68d2e6748e40dcdef9778c8c02dcb826a8bf0 100644 --- a/resources/views/spende/spendenaufruf.blade.php +++ b/resources/views/spende/spendenaufruf.blade.php @@ -90,7 +90,7 @@ das MetaGer-Team im SUMA-EV <h2 id="lastschrift">{{ trans('spenden.lastschrift.1') }}</h2> <p>{{ trans('spenden.lastschrift.2') }}</p> <form role="form" method="POST" action="{{ action('MailController@donation') }}"> - {{ csrf_field() }} + <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}" /> <div class="form-group" style="text-align:left;"> <label for="Name">{{ trans('spenden.lastschrift.3') }}</label> <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spenden.lastschrift.3.placeholder') }}">