Merge branch 'development' into 'master'

Development

See merge request !1443

app/Http/Controllers/HumanVerification.php

@@ -8,7 +8,6 @@ use Illuminate\Hashing\BcryptHasher as Hasher;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redis;
 use Input;
-use LaravelLocalization;
 
 class HumanVerification extends Controller
 {
@@ -27,41 +26,7 @@ class HumanVerification extends Controller
         }
 
         if ($request->getMethod() == 'POST') {
-            # Check if Weekday matches
-            $weekdays = [
-                'de' => [
-                    'montag',
-                    'dienstag',
-                    'mittwoch',
-                    'donnerstag',
-                    'freitag',
-                    'samstag',
-                    'sonntag',
-                ],
-                'en' => [
-                    'monday',
-                    'tuesday',
-                    'wednesday',
-                    'thursday',
-                    'friday',
-                    'saturday',
-                    'sunday',
-                ],
-                'es' => [
-                    'lunes',
-                    'martes',
-                    'miércoles',
-                    'jueves',
-                    'viernes',
-                    'sábado',
-                    'domingo',
-                ],
-            ];
-            $lang = LaravelLocalization::getCurrentLocale();
-            $dow = Carbon::now()->dayOfWeek;
-
-            $dowCheck = strtolower(trim($request->input('dw', ''))) === $weekdays[$lang][$dow - 1];
-
+            $dowCheck = true;
             # Temp remove later
             # Check for recent Spams
             if (\preg_match("/eingabe=[\\d]{3}\s*chan.*$/si", $url)) {

resources/lang/de/captcha.php

@@ -3,7 +3,7 @@ return [
     '1' => 'Entschuldigen Sie die Störung',
     '2' => 'Sie befinden sich in einem Netzwerk aus dem wir verstärkt automatisierte Anfragen erhalten. Keine Sorge: Das bedeutet nicht unbedingt, dass diese Anfragen von Ihrem PC kommen.',
     '3' => 'Allerdings können wir Ihre Anfragen nicht von denen des "Robots" unterscheiden. Zum Schutz der von uns abgefragten Suchmaschinen müssen wir aber sicherstellen, dass diese nicht mit (automatisierten) Abfragen überflutet werden.',
-    '4' => 'Bitte geben Sie deshalb die Zeichen aus dem Bild in die erste Eingabebox und den heutigen Wochentag in die zweite Eingabebox ein und bestätigen Sie mit "OK" um zur Ergebnisseite zu gelangen.',
+    '4' => 'Bitte geben Sie deshalb die Zeichen aus dem Bild in die Eingabebox und bestätigen Sie mit "OK" um zur Ergebnisseite zu gelangen.',
     '5' => 'Captcha eingeben',
     '6' => 'Wochentag eingeben',
     '7' => 'Sollten Sie diese Nachricht häufiger sehen oder handelt es sich dabei um einen Irrtum, schicken Sie uns gerne eine Nachricht über unser <a href=":url">Kontaktformular</a>.',

resources/lang/en/captcha.php

@@ -3,7 +3,7 @@ return [
     '1' => 'Sorry to bother you',
     '2' => 'You are in a network from which we increasingly receive automated requests. Do not worry: this does not necessarily mean that these requests come from your PC.',
     '3' => 'However, we can not distinguish your requests from those of the "robot". To protect the search engines we query, we must ensure that they are not flooded with (automated) queries.',
-    '4' => 'Therefore, please enter the characters from the picture in the first input box and today\'s day of the week in the second input box and confirm with "OK" to get to the result page.',
+    '4' => 'Please enter the characters from the picture in the input box and confirm with "OK" to get to the result page.',
     '5' => 'Enter captcha',
     '6' => 'Enter weekday',
     '7' => 'If you see this message more often, or if it is a mistake, feel free to send a message via our <a href=":url"> contact form </a>.',

resources/lang/es/captcha.php

@@ -3,7 +3,7 @@ return [
     '1' => 'Perdon por la molestia',
     '2' => 'Estás en una red desde la que recibimos cada vez más consultas automáticas. No se preocupe: esto no significa necesariamente que estas solicitudes provengan de su PC.',
     '3' => 'Sin embargo, no podemos distinguir sus peticiones de las del "robot". Para proteger los motores de búsqueda que consultamos, debemos asegurarnos de que no estén inundados de consultas (automatizadas).',
-    '4' => 'Por lo tanto, ingrese los caracteres de la imagen en el primer cuadro de entrada y el día de la semana de hoy en el segundo cuadro de entrada y confirme con "OK" para acceder a la página de resultados.',
+    '4' => 'Ingrese los caracteres de la imagen en el cuadro de entrada y confirme con "OK" para llegar a la página de resultados.',
     '5' => 'Entrar en captcha',
     '6' => 'Entrar en día laborable',
     '7' => 'Si ve este mensaje con más frecuencia o si es un error, puede enviar un mensaje a través de nuestro <a href=":url"> formulario de contacto </a>.',

resources/less/metager/pages/start-page.less

@@ -49,31 +49,42 @@
             font-size: 1.4em;
             color: #777;
             text-align: center;
-            display: grid;
-            grid-gap: 24px;
             margin-top: 60px;
-            justify-content: center;
-            grid-template-columns: 240px;
             width: 100%;
             top: 100vh;
             position: absolute;
-            @media(min-width: 504px){
-                grid-template-columns: 240px 240px ;
-                grid-gap: 24px;
+            @media(min-width: 520px){
                 top: inherit;
                 bottom: 100px;
                 position: inherit;
             }
-            > a {
+            > div {
                 display: flex;
-                flex-direction: column;
-                cursor: pointer;
-                color: inherit;
-                > div.teaser {
-                    font-size: .7em;
-                }
-                &:hover > div.teaser {
-                    visibility: inherit;
+                flex-wrap: wrap;
+                justify-content: center;
+                margin: 24px 0;
+                > a {
+                    &:nth-child(1){
+                        @media(min-width: 520px){
+                            margin-right: 24px;
+                        }
+                    }
+                    @media(max-width: 520px){
+                        &:nth-child(2){
+                            margin-top: 24px;
+                        }
+                    }
+                    display: flex;
+                    flex-direction: column;
+                    cursor: pointer;
+                    color: inherit;
+                    width: 240px;
+                    > div.teaser {
+                        font-size: .7em;
+                    }
+                    &:hover > div.teaser {
+                        visibility: inherit;
+                    }
                 }
             }
         }

resources/less/metager/parts/searchbar.less

@@ -2,18 +2,39 @@
 @searchbar-background-color: white;
 .searchbar {
     display: -webkit-box;
+    display: -moz-box;
     display: -ms-flexbox;
+    display: -webkit-flex;
     display: flex;
-    -webkit-box-align: stretch;
-    -ms-flex-align: stretch;
-    align-items: stretch;
+    -webkit-box-direction: normal;
+    -moz-box-direction: normal;
+    -webkit-box-orient: horizontal;
+    -moz-box-orient: horizontal;
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    -webkit-flex-wrap: wrap;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
     -webkit-box-pack: center;
+    -moz-box-pack: center;
+    -webkit-justify-content: center;
     -ms-flex-pack: center;
     justify-content: center;
+    -webkit-align-content: stretch;
+    -ms-flex-line-pack: stretch;
+    align-content: stretch;
+    -webkit-box-align: center;
+    -moz-box-align: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
     font-size: 1em;
     background-color: transparent;
     color: #333;
     .search-input-submit {
+        width: 100%;
+        max-width: 600px;
         background-color: @searchbar-background-color;
         -webkit-box-flex: 1;
         -ms-flex-positive: 1;
@@ -21,7 +42,7 @@
         display: -webkit-box;
         display: -ms-flexbox;
         display: flex;
-        max-width: 600px;
+        
         #search-key {
             display: flex;
             justify-content: center;

resources/views/humanverification/captcha.blade.php

@@ -15,7 +15,6 @@
         <p><font color="red">{{$errorMessage}}</font></p>
         @endif
         <p><input type="text" class="form-control" name="captcha" placeholder="@lang('captcha.5')" autofocus></p>
-        <p><input type="text" class="form-control" name="dw" placeholder="@lang('captcha.6')"></p>
         <p><button type="submit" class="btn btn-success" name="check">OK</button></p>
     </form>
     <p>@lang('captcha.7', ['url' => LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), 'kontakt')])</p>

resources/views/index.blade.php

@@ -11,30 +11,34 @@
 		<a id="plugin-btn" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin") }}" title="{{ trans('index.plugin-title') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a>
 	</div>
 		<div id="about-us">
-			<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "about") }}">
-				<i class="fas fa-user-secret"></i>
-				<span>@lang('index.about.1.1')</span>
-				<div class="teaser">@lang('index.about.1.2')</div>
-			</a>
-			@if(LaravelLocalization::getCurrentLocale() === "de")
-			<a href="https://suma-ev.de" target="_blank">
-			@else
-			<a href="https://suma-ev.de/en/index.html" target="_blank">
-			@endif
-				<i class="fas fa-heart"></i>
-				<span>@lang('index.about.2.1')</span>
-				<div class="teaser">@lang('index.about.2.2')</div>
-			</a>
-			<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "spende") }}">
-				<i class="fas fa-money-bill-wave"></i>
-				<span>@lang('index.about.3.1')</span>
-				<div class="teaser">@lang('index.about.3.2')</div>
-			</a>
-			<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "beitritt") }}">
-				<i class="fas fa-user-friends"></i>
-				<span>@lang('index.about.4.1')</span>
-				<div class="teaser">@lang('index.about.4.2')</div>
-			</a>
+			<div class="m-row">
+				<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "about") }}">
+					<i class="fas fa-user-secret"></i>
+					<span>@lang('index.about.1.1')</span>
+					<div class="teaser">@lang('index.about.1.2')</div>
+				</a>
+				@if(LaravelLocalization::getCurrentLocale() === "de")
+				<a href="https://suma-ev.de" target="_blank">
+				@else
+				<a href="https://suma-ev.de/en/index.html" target="_blank">
+				@endif
+					<i class="fas fa-heart"></i>
+					<span>@lang('index.about.2.1')</span>
+					<div class="teaser">@lang('index.about.2.2')</div>
+				</a>
+			</div>
+			<div class="m-row">
+				<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "spende") }}">
+					<i class="fas fa-money-bill-wave"></i>
+					<span>@lang('index.about.3.1')</span>
+					<div class="teaser">@lang('index.about.3.2')</div>
+				</a>
+				<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "beitritt") }}">
+					<i class="fas fa-user-friends"></i>
+					<span>@lang('index.about.4.1')</span>
+					<div class="teaser">@lang('index.about.4.2')</div>
+				</a>
+			</div>
 		</div>
 	<a id="scroll-helper" href="#about-us">
 		<i class="fas fa-angle-double-down"></i>