Merge branch 'development' into 'master'

Development

See merge request !1790

Dockerfile

@@ -77,4 +77,5 @@ CMD cp /root/.env .env && \
     chown -R root:nginx storage/logs/metager bootstrap/cache && \
     chmod -R g+w storage/logs/metager bootstrap/cache && \
     crond -L /dev/stdout && \
+    php artisan spam:load && \
     php-fpm7

app/Http/Controllers/AdminSpamController.php

@@ -19,7 +19,8 @@ class AdminSpamController extends Controller
             ->with('title', "Spam Konfiguration - MetaGer")
             ->with('queries', $queries)
             ->with('bans', $currentBans)
-            ->with('loadedBans', $loadedBans);
+            ->with('loadedBans', $loadedBans)
+            ->with('darkcss', [mix('/css/spam.css')]);
     }
 
     public function ban(Request $request)
@@ -111,18 +112,17 @@ class AdminSpamController extends Controller
 
         if (file_exists($file)) {
             $tmpBans = json_decode(file_get_contents($file), true);
-
-            foreach ($tmpBans as $ban) {
-                #dd($ban["banned-until"]);
-                $bannedUntil = Carbon::createFromFormat('Y-m-d H:i:s', $ban["banned-until"]);
-                if ($bannedUntil->isAfter(Carbon::now())) {
-                    $bans[] = $ban;
+            if(!empty($tmpBans) && is_array($tmpBans)){
+                foreach ($tmpBans as $ban) {
+                    #dd($ban["banned-until"]);
+                    $bannedUntil = Carbon::createFromFormat('Y-m-d H:i:s', $ban["banned-until"]);
+                    if ($bannedUntil->isAfter(Carbon::now())) {
+                        $bans[] = $ban;
+                    }
                 }
             }
         }
 
-        file_put_contents($file, json_encode($bans));
-
         return $bans;
     }
 

resources/less/metager/pages/spam.less

+#queries > div.matches {
+    color: #777
+}
\ No newline at end of file

webpack.mix.js

@@ -28,6 +28,9 @@ mix
   .less("resources/less/metager/startpage-only-dark.less", "public/css/themes/startpage-only-dark.css", {
     strictMath: true
   })
+  .less("resources/less/metager/pages/spam.less", "public/css/spam.css", {
+    strictMath: true
+  })
   .less("resources/less/metager/metager-dark.less", "public/css/themes/metager-dark.css", {
     strictMath: true
   })