diff --git a/app/MetaGer.php b/app/MetaGer.php index 9d2a682e58c203626dda6a9045bad1589e1c0213..6efe28bb05730617c8ba4298013b11787fb63a6e 100644 --- a/app/MetaGer.php +++ b/app/MetaGer.php @@ -6,6 +6,7 @@ use Jenssegers\Agent\Agent; use App; use Storage; use Log; +use Config; use App\lib\TextLanguageDetect\TextLanguageDetect; use App\lib\TextLanguageDetect\LanguageDetect\TextLanguageDetectException; use Illuminate\Pagination\LengthAwarePaginator; @@ -119,9 +120,18 @@ class MetaGer ->with('errors', $this->errors) ->with('metager', $this); break; - default: + case 'results-with-style': return view('metager3') ->with('results', $viewResults) + ->with('eingabe', $this->eingabe) + ->with('mobile', $this->mobile) + ->with('warnings', $this->warnings) + ->with('errors', $this->errors) + ->with('metager', $this) + ->with('suspendheader', "yes"); + break; + default: + return view('metager3') ->with('eingabe', $this->eingabe) ->with('mobile', $this->mobile) ->with('warnings', $this->warnings) @@ -217,6 +227,19 @@ class MetaGer } $this->results = $paginatedSearchResults; + + if( isset($this->password) ) + { + # Wir bieten einen bezahlten API-Zugriff an, bei dem dementsprechend die Werbung ausgeblendet wurde: + # Aktuell ist es nur die Uni-Mainz. Deshalb überprüfen wir auch nur diese. + $password = getenv('mainz'); + $eingabe = $this->eingabe; + $password = md5($eingabe . $password); + if( $this->password === $password ) + { + $this->ads = []; + } + } } public function createSearchEngines (Request $request) @@ -502,6 +525,13 @@ class MetaGer { $this->tab = "_blank"; } + if( $request->has('password') ) + $this->password = $request->input('password'); + if( $request->has('quicktips') ) + $this->quicktips = false; + else + $this->quicktips = true; + $this->out = $request->input('out', "html"); if($this->out !== "html" && $this->out !== "json" && $this->out !== "results" && $this->out !== "results-with-style") $this->out = "html"; @@ -517,6 +547,11 @@ class MetaGer $this->q = $match[1] . $match[3]; $this->warnings[] = "Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: \"" . $this->site . "\" angezeigt."; } + if( $request->has('site') ) + { + $this->site = $request->input('site'); + $this->warnings[] = "Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: \"" . $this->site . "\" angezeigt."; + } # Wenn die Suchanfrage um das Schlüsselwort "-host:*" ergänzt ist, sollen bestimmte Hosts nicht eingeblendet werden # Wir prüfen, ob das hier der Fall ist: while(preg_match("/(.*)(^|\s)-host:(\S+)(.*)/si", $this->q, $match)) @@ -765,4 +800,8 @@ class MetaGer $link = action('Pictureproxy@get', $requestData); return $link; } + public function showQuicktips () + { + return $this->quicktips; + } } \ No newline at end of file diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..689ff152f4dc9669f77be69cf0d79c78ffca590c --- /dev/null +++ b/resources/views/layouts/researchandtabs.blade.php @@ -0,0 +1,229 @@ +
+
+ +
+ + +
+ @if( sizeof($errors) > 0 ) +
+
    + @foreach($errors as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + @if( sizeof($warnings) > 0) +
+
    + @foreach($warnings as $warning) +
  • {{ $warning }}
    • + @endforeach +
+
+ @endif + + @if( $metager->getFokus() === "web" ) +
+
+ @yield('results') +
+
+ @else +
+
+ +
+
+ @endif + + + + @if( $metager->getFokus() === "bilder" ) +
+
+ @yield('results') +
+
+ @else +
+
+ +
+
+ @endif + + + + @if( $metager->getFokus() === "nachrichten" ) +
+
+ @yield('results') +
+
+ @else +
+
+ +
+
+ @endif + + @if( $metager->getFokus() === "wissenschaft" ) +
+
+ @yield('results') +
+
+ @else +
+
+ +
+
+ @endif + + @if( $metager->getFokus() === "produktsuche" ) +
+
+ @yield('results') +
+
+ @else +
+
+ +
+
+ @endif + + + + @if( $metager->getFokus() === "angepasst" ) +
+
+ @yield('results') +
+
+ @endif +
+
\ No newline at end of file diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php index 7b778e831a918e4f1909fda5cf46760da1795a9b..75c0180f72f2d8d6345482c5f6b6c03a48041cc9 100644 --- a/resources/views/layouts/resultPage.blade.php +++ b/resources/views/layouts/resultPage.blade.php @@ -18,236 +18,32 @@ -
-
- -
-