Merge branch 'development' into 'master'

Development

See merge request !1396

app/Http/Controllers/HumanVerification.php

@@ -168,7 +168,7 @@ class HumanVerification extends Controller
 
     private static function checkId($request, $id)
     {
-        if (hash("sha512", $request->ip() . $_SERVER["AGENT"]) === $id) {
+        if (hash("sha512", $request->ip() . $_SERVER["AGENT"] . "uid") === $id) {
             return true;
         } else {
             return false;

app/Http/Middleware/HumanVerification.php

@@ -27,7 +27,7 @@ class HumanVerification
         $redis = Redis::connection('redisCache');
         try {
             $id = hash("sha512", $request->ip());
-            $uid = hash("sha512", $request->ip() . $_SERVER["AGENT"]);
+            $uid = hash("sha512", $request->ip() . $_SERVER["AGENT"] . "uid");
             unset($_SERVER["AGENT"]);
 
             /**

resources/views/layouts/staticPages.blade.php

@@ -39,8 +39,6 @@
 		<header>
 			@yield('homeIcon')
 		</header>
-		@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
-		@include('parts.sidebar-opener', ['class' => 'fixed'])
 		<div class="wrapper {{$page ?? ''}}">
 			<main id="main-content">
 				@if (isset($success))
@@ -61,6 +59,8 @@
 				@yield('additional-content')
 			</div>
 		</div>
+		@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
+		@include('parts.sidebar-opener', ['class' => 'fixed'])
 		@if (isset($page) && $page === 'startpage')
 			@include('parts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
 		@else