Merge branch...

Merge branch '59-suchwort-nicht-enthalten-obwohl-das-wussten-sie-schon-sagt-samtliche-suchworter-enthalten' into 'master' Der Schalter um die Sprüche abzuschalten funktioniert jetzt Closes #59 See merge request !61

Merge branch...
a1377d56 · Dominik Hebeler · 076aafcb · 57675f15 · a1377d56 · a1377d56
Commit a1377d56 authored 8 years ago by Dominik Hebeler
--- 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:

--- 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');

--- 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

--- 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>
--- 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">