Merge branch '712-quicktips-werden-oft-gar-nicht-angezeigt' into 'development'

Resolve "Quicktips werden oft gar nicht angezeigt"

Closes #712

See merge request !1209

app/Http/Controllers/MetaGerSearch.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use App;
 use App\MetaGer;
 use Illuminate\Http\Request;
-use LaravelLocalization;
 
 class MetaGerSearch extends Controller
 {
@@ -13,15 +12,15 @@ class MetaGerSearch extends Controller
     {
 
         $focus = $request->input("focus", "web");
-        
+
         if ($focus === "maps") {
             $searchinput = $request->input('eingabe', '');
             return redirect()->to('https://maps.metager.de/map/' . $searchinput . '/1240908.5493525574,6638783.2192695495,6');
         }
 
         /*if ($focus !== "angepasst" && $this->startsWith($focus, "focus_")) {
-            $metager->parseFormData($request);
-            return $metager->createView();
+        $metager->parseFormData($request);
+        return $metager->createView();
         }*/
 
         #die($request->header('User-Agent'));
@@ -35,7 +34,7 @@ class MetaGerSearch extends Controller
         # Die Quicktips als Job erstellen
         $quicktips = $metager->createQuicktips();
 
-        # Suche für alle zu verwendenden Suchmaschinen als Job erstellen, 
+        # Suche für alle zu verwendenden Suchmaschinen als Job erstellen,
         # auf Ergebnisse warten und die Ergebnisse laden
         $metager->createSearchEngines($request);
 
@@ -62,7 +61,7 @@ class MetaGerSearch extends Controller
 
     public function get($url)
     {
-	   $ctx = stream_context_create(array('http'=>array('timeout' => 2,)));
+        $ctx = stream_context_create(array('http' => array('timeout' => 2)));
         return file_get_contents($url, false, $ctx);
     }
 

app/Models/Quicktips/Quicktips.php

@@ -13,6 +13,7 @@ class Quicktips
     use DispatchesJobs;
 
     const QUICKTIP_URL = "https://quicktips.metager3.de/quicktips.xml";
+    //const QUICKTIP_URL = "http://localhost:63825/quicktips.xml";
     const QUICKTIP_NAME = "quicktips";
     const CACHE_DURATION = 60;
 
@@ -25,7 +26,7 @@ class Quicktips
 
     public function startSearch($search, $locale, $max_time)
     {
-        $url = self::QUICKTIP_URL . "?search=" . $search . "&locale=" . $locale;
+        $url = self::QUICKTIP_URL . "?search=" . $this->normalize_search($search) . "&locale=" . $locale;
 
         $hash = md5($url);
 
@@ -82,6 +83,7 @@ class Quicktips
         Redis::hdel('search.' . $hash, self::QUICKTIP_NAME);
         Cache::put($hash, $body, self::CACHE_DURATION);
         #}
+
         if ($body !== "") {
             return $body;
         } else {
@@ -168,4 +170,9 @@ class Quicktips
             return [];
         }
     }
+
+    public function normalize_search($search)
+    {
+        return urlencode($search);
+    }
 }