diff --git a/app/Http/Controllers/AdminSpamController.php b/app/Http/Controllers/AdminSpamController.php index e4a514ce347b6dadf4141353316a7b315c187b37..43ccfc0be0ebebd4e571492490ce86876509bdf6 100644 --- a/app/Http/Controllers/AdminSpamController.php +++ b/app/Http/Controllers/AdminSpamController.php @@ -44,6 +44,9 @@ class AdminSpamController extends Controller public function jsonQueries() { $queries = $this->getQueries(); + # JSON encoding will fail if invalid UTF-8 Characters are in this string + # mb_convert_encoding will remove thise invalid characters for us + $queries = mb_convert_encoding($queries, "UTF-8", "UTF-8"); return response()->json($queries); } @@ -77,8 +80,10 @@ class AdminSpamController extends Controller ]; } + # JSON encoding will fail if invalid UTF-8 Characters are in this string + # mb_convert_encoding will remove thise invalid characters for us + $resultData = mb_convert_encoding($resultData, "UTF-8", "UTF-8"); return response()->json($resultData); - } private function getQueries() diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php index afadcafdfad895cb1c89b119ded39224391dca89..22289cad828c7a27ab621c1c9282239cdd9944cf 100644 --- a/app/Http/Controllers/MetaGerSearch.php +++ b/app/Http/Controllers/MetaGerSearch.php @@ -12,7 +12,6 @@ use View; class MetaGerSearch extends Controller { - public function search(Request $request, MetaGer $metager, $timing = false) { if ($request->filled("chrome-plugin")) { @@ -156,7 +155,7 @@ class MetaGerSearch extends Controller // This might speed up page view time for users with slow network $responseArray = str_split($resultpage->render(), 1024); foreach ($responseArray as $responsePart) { - echo ($responsePart); + echo($responsePart); flush(); } $requestTime = microtime(true) - $time; @@ -182,7 +181,6 @@ class MetaGerSearch extends Controller if ($request->filled('loadMore') && $request->filled('script') && $request->input('script') === "yes") { return $this->loadMoreJS($request); } - } private function loadMoreJS(Request $request) @@ -296,6 +294,10 @@ class MetaGerSearch extends Controller ], "engines" => $metager->getEngines(), ], 1 * 60); + + # JSON encoding will fail if invalid UTF-8 Characters are in this string + # mb_convert_encoding will remove thise invalid characters for us + $result = mb_convert_encoding($result, "UTF-8", "UTF-8"); return response()->json($result); } diff --git a/app/Http/Middleware/BrowserVerification.php b/app/Http/Middleware/BrowserVerification.php index 00182c2254b42ccecfbf7b01293e78cb88a73647..f8ec4a32f4fd904c6d869a4605ce335ebcfe413e 100644 --- a/app/Http/Middleware/BrowserVerification.php +++ b/app/Http/Middleware/BrowserVerification.php @@ -5,6 +5,7 @@ namespace App\Http\Middleware; use Closure; use Illuminate\Support\Facades\Redis; use Jenssegers\Agent\Agent; +use Cache; class BrowserVerification { @@ -59,12 +60,12 @@ class BrowserVerification $key = md5($request->ip() . microtime(true)); - echo (view('layouts.resultpage.verificationHeader')->with('key', $key)->render()); + echo(view('layouts.resultpage.verificationHeader')->with('key', $key)->render()); flush(); $answer = Redis::connection("cache")->blpop($key, 2); if ($answer !== null) { - echo (view('layouts.resultpage.resources')->render()); + echo(view('layouts.resultpage.resources')->render()); flush(); $request->request->add(["headerPrinted" => true, "jskey" => $key]); return $next($request); @@ -74,9 +75,8 @@ class BrowserVerification $params["mgv"] = $key; $url = route("resultpage", $params); - echo (view('layouts.resultpage.unverifiedResultPage') + echo(view('layouts.resultpage.unverifiedResultPage') ->with('url', $url) ->render()); - } }