diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php index f9896b254e1675d8b4c02e2bdba8ef6ba072fa10..6d2d685f76f7722edfa8971c61d40f327a222c16 100644 --- a/app/Http/Controllers/MetaGerSearch.php +++ b/app/Http/Controllers/MetaGerSearch.php @@ -43,10 +43,13 @@ class MetaGerSearch extends Controller # Zunächst den Spruch $spruecheFile = storage_path() . "/app/public/sprueche.txt"; - if( file_exists($spruecheFile) ) + if( file_exists($spruecheFile) && $_GET['sprueche']) { $sprueche = file($spruecheFile); $spruch = $sprueche[array_rand($sprueche)]; + }else + { + $spruch = ""; } # Die manuellen Quicktips: diff --git a/app/MetaGer.php b/app/MetaGer.php index 5fb13289cc84fe5483a679cf5efb8555d82b6323..23415c2dde585c5d47a43e3427170dcac943037e 100644 --- a/app/MetaGer.php +++ b/app/MetaGer.php @@ -402,7 +402,11 @@ class MetaGer $this->agent = new Agent(); $this->mobile = $this->agent->isMobile(); #Sprüche - $this->sprueche = $request->input('sprueche', 'on'); + $this->sprueche = $request->input('sprueche', 'off'); + if($this->sprueche === "off" ) + $this->sprueche = true; + else + $this->sprueche = false; # Ergebnisse pro Seite: $this->resultCount = $request->input('resultCount', '20'); diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php index 00f191a9dc00bf2e18cc613616ab94fdd3bba6e3..9177beca4ee208fd42cfb5b8e34de55d09f8a522 100644 --- a/resources/views/metager3.blade.php +++ b/resources/views/metager3.blade.php @@ -19,7 +19,7 @@ </nav> </div> <div class="col-md-4" id="quicktips"> - <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}"></iframe> + <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe> </div> @endsection diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php index 45ecbdb2794a0a3ba936a5ccfa1137e635a81c99..809f7868a5c7453d7a0df13199be763d973a8f24 100644 --- a/resources/views/metager3results.blade.php +++ b/resources/views/metager3results.blade.php @@ -15,6 +15,6 @@ </nav> </div> <div class="col-md-4" id="quicktips"> - <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}"></iframe> + <iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe> </div> diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php index b951fd67de71f3c31cc45723fa92402dd1d9c4db..3ff1a0b48f9943d8aef617822d94fe912d285557 100644 --- a/resources/views/quicktip.blade.php +++ b/resources/views/quicktip.blade.php @@ -49,7 +49,9 @@ </style> </head> <body> + @if( $spruch !== "" ) <blockquote id="spruch">{!! $spruch !!}</blockquote> + @endif @foreach( $mqs as $mq) <div class="quicktip">