diff --git a/app/MetaGer.php b/app/MetaGer.php
index 8a4c476ae94eb003db4f599eaf59d4db45b9f3ab..0f779e76ebf1b507a184b3d0272e7b61d8d1bfac 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -1051,18 +1051,6 @@ class MetaGer
return $link;
}
- public function lastSearchLink()
- {
- if (isset($this->last) && count($this->last['engines']) > 0) {
- $requestData = $this->request->except(['page', 'out']);
- $requestData['next'] = md5(serialize($this->last));
- $link = action('MetaGerSearch@search', $requestData);
- } else {
- $link = "#";
- }
- return $link;
- }
-
public function nextSearchLink()
{
if (isset($this->next) && isset($this->next['engines']) && count($this->next['engines']) > 0) {
diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php
index c0bcaf26f8146e9d7cb79f2666b4bbfd888d94bb..5099e533eb9191dc35fa2abd8affcaab7a1da07e 100644
--- a/app/Models/Searchengine.php
+++ b/app/Models/Searchengine.php
@@ -75,10 +75,6 @@ abstract class Searchengine
abstract public function loadResults($result);
- public function getLast(MetaGer $metager, $result)
- {
-
- }
public function getNext(MetaGer $metager, $result)
{
@@ -159,7 +155,6 @@ abstract class Searchengine
if ($body !== "") {
$this->loadResults($body);
$this->getNext($metager, $body);
- $this->getLast($metager, $body);
$this->loaded = true;
Redis::hdel('search.' . $this->hash, $this->name);
return true;
diff --git a/app/Models/parserSkripte/Onenewspage.php b/app/Models/parserSkripte/Onenewspage.php
index 1502c9c648f9d14a0d56a42bf6fe8def12acacb9..936eb30181a5f3cec814d884bddfc8ac978176b9 100644
--- a/app/Models/parserSkripte/Onenewspage.php
+++ b/app/Models/parserSkripte/Onenewspage.php
@@ -46,20 +46,6 @@ class Onenewspage extends Searchengine
}
- public function getLast(\App\MetaGer $metager, $result)
- {
- if ($metager->getPage() <= 1) {
- return;
- }
-
- $last = new Onenewspage(simplexml_load_string($this->engine), $metager);
- $last->resultCount = $this->resultCount;
- $last->offset = $this->offset - $this->resultCount;
- $last->getString .= "&o=" . $last->offset;
- $last->hash = md5($last->host . $last->getString . $last->port . $last->name);
- $this->last = $last;
- }
-
public function getNext(\App\MetaGer $metager, $result)
{
if (count($this->results) <= 0) {
diff --git a/app/Models/parserSkripte/Onenewspagegermany.php b/app/Models/parserSkripte/Onenewspagegermany.php
index 6426787d12f49c865e7c714b5acb14b8df7caadf..1ca313f849de4eb203ed86c5ba862dea1bc6d7de 100644
--- a/app/Models/parserSkripte/Onenewspagegermany.php
+++ b/app/Models/parserSkripte/Onenewspagegermany.php
@@ -46,20 +46,6 @@ class Onenewspagegermany extends Searchengine
}
- public function getLast(\App\MetaGer $metager, $result)
- {
- if ($metager->getPage() <= 1) {
- return;
- }
-
- $last = new Onenewspagegermany(simplexml_load_string($this->engine), $metager);
- $last->resultCount = $this->resultCount;
- $last->offset = $this->offset - $this->resultCount;
- $last->getString .= "&o=" . $last->offset;
- $last->hash = md5($last->host . $last->getString . $last->port . $last->name);
- $this->last = $last;
- }
-
public function getNext(\App\MetaGer $metager, $result)
{
if (count($this->results) <= 0) {
diff --git a/app/Models/parserSkripte/Onenewspagevideo.php b/app/Models/parserSkripte/Onenewspagevideo.php
index cf70a57ebe30d2294a3dd75a5c817f574f8e19dc..fb888a47bbc8d5fa3ee1788a2c3d6f655593b463 100644
--- a/app/Models/parserSkripte/Onenewspagevideo.php
+++ b/app/Models/parserSkripte/Onenewspagevideo.php
@@ -44,20 +44,6 @@ class Onenewspagevideo extends Searchengine
}
}
- public function getLast(\App\MetaGer $metager, $result)
- {
- if ($metager->getPage() <= 1) {
- return;
- }
-
- $last = new Onenewspagevideo(simplexml_load_string($this->engine), $metager);
- $last->resultCount = $this->resultCount;
- $last->offset = $this->offset - $this->resultCount;
- $last->getString .= "&o=" . $last->offset;
- $last->hash = md5($last->host . $last->getString . $last->port . $last->name);
- $this->last = $last;
- }
-
public function getNext(\App\MetaGer $metager, $result)
{
if (count($this->results) <= 0) {
diff --git a/app/Models/parserSkripte/Overture.php b/app/Models/parserSkripte/Overture.php
index 672c22bdb710b10f00b07718c0a914ca8e67cc89..be3c320c48955b745f27c20d47bbc7ef9af99275 100644
--- a/app/Models/parserSkripte/Overture.php
+++ b/app/Models/parserSkripte/Overture.php
@@ -63,34 +63,6 @@ class Overture extends Searchengine
}
}
- public function getLast(\App\MetaGer $metager, $result)
- {
- # Auslesen der Argumente für die nächste Suchseite:
- $result = preg_replace("/\r\n/si", "", $result);
- try {
- $content = simplexml_load_string($result);
- } catch (\Exception $e) {
- abort(500, "$result is not a valid xml string");
- }
- $lastArgs = $content->xpath('//Results/PrevArgs');
- if (isset($lastArgs[0])) {
- $lastArgs = $lastArgs[0]->__toString();
- } else {
- $lastArgs = $content->xpath('//Results/ResultSet[@id="inktomi"]/PrevArgs');
- if (isset($lastArgs[0])) {
- $lastArgs = $lastArgs[0]->__toString();
- } else {
- return;
- }
- }
-
- # Erstellen des neuen Suchmaschinenobjekts und anpassen des GetStrings:
- $last = new Overture(simplexml_load_string($this->engine), $metager);
- $last->getString = preg_replace("/&Keywords=.*?&/si", "&", $last->getString) . "&" . $lastArgs;
- $last->hash = md5($last->host . $last->getString . $last->port . $last->name);
- $this->last = $last;
- }
-
public function getNext(\App\MetaGer $metager, $result)
{
# Auslesen der Argumente für die nächste Suchseite:
diff --git a/app/Models/parserSkripte/Witch.php b/app/Models/parserSkripte/Witch.php
index 27d76a69be0d319daa02c3220a87bb3cdcfcb699..70e49ba418a174a036b155a222274b1e0239072f 100644
--- a/app/Models/parserSkripte/Witch.php
+++ b/app/Models/parserSkripte/Witch.php
@@ -43,4 +43,17 @@ class Witch extends Searchengine
}
}
+
+ public function getNext(\App\MetaGer $metager, $result)
+ {
+ if (count($this->results) <= 0) {
+ return;
+ }
+
+ $next = new Witch(simplexml_load_string($this->engine), $metager);
+ $offset = $metager->getPage() * 10;
+ $next->getString = preg_replace("/&cn=\d+/si", "&cn=$offset", $next->getString);
+ $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $this->next = $next;
+ }
}
diff --git a/app/Models/parserSkripte/Yandex.php b/app/Models/parserSkripte/Yandex.php
index 2ffb6fefc2213e237c5ff8b695630210fac4351d..78b9ca9db2caf87acd7875c7924202bf9a7d31a7 100644
--- a/app/Models/parserSkripte/Yandex.php
+++ b/app/Models/parserSkripte/Yandex.php
@@ -52,18 +52,6 @@ class Yandex extends Searchengine
}
}
- public function getLast(\App\MetaGer $metager, $result)
- {
- if ($metager->getPage() <= 1) {
- return;
- }
-
- $last = new Yandex(simplexml_load_string($this->engine), $metager);
- $last->getString .= "&page=" . ($metager->getPage() - 1);
- $last->hash = md5($last->host . $last->getString . $last->port . $last->name);
- $this->last = $last;
- }
-
public function getNext(\App\MetaGer $metager, $result)
{
if (count($this->results) <= 0) {
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 401c9aca1db6f05acf2362bbf111d7e3d0cf34cc..2fdd709834d8e711924b47fe32615e0ebe0ef844 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -43,7 +43,7 @@
@endforeach
<nav aria-label="...">
<ul class="pager">
- <li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
</ul>
</nav>
diff --git a/resources/views/metager3bilder.blade.php b/resources/views/metager3bilder.blade.php
index 19172f57953131de002e49235b45508ba6a48f50..c0c90738982dfe030553f43fa3ca56f2b02763b1 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/resources/views/metager3bilder.blade.php
@@ -38,7 +38,7 @@
</div>
<nav aria-label="...">
<ul class="pager">
- <li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
</ul>
</nav>
diff --git a/resources/views/metager3bilderresults.blade.php b/resources/views/metager3bilderresults.blade.php
index 5f5109a8247725c96ef3a5e73a5f407c4ee1ae91..c545daba2854b3c66774233a417255c107af1c52 100644
--- a/resources/views/metager3bilderresults.blade.php
+++ b/resources/views/metager3bilderresults.blade.php
@@ -35,7 +35,7 @@
</div>
<nav aria-label="...">
<ul class="pager">
- <li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
</ul>
</nav>
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index 32276187c8a19f22c4513c95b0968cc41b025112..f0da3fa921c1a326a6d98ed833cfa08d67f20137 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -36,7 +36,7 @@
@endforeach
<nav aria-label="...">
<ul class="pager">
- <li @if($metager->lastSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->lastSearchLink() }}">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
</ul>
</nav>