diff --git a/Dockerfile b/Dockerfile index bfdd92cae87b08678e11b1a889fdbe02edccc19c..230c3f178fefa48d89333b781bd4656bad7bcdfd 100644 --- a/Dockerfile +++ b/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 diff --git a/app/Http/Controllers/AdminSpamController.php b/app/Http/Controllers/AdminSpamController.php index 43ccfc0be0ebebd4e571492490ce86876509bdf6..cc1761b4e924b4e09fdeb1183237e4acf3b624a9 100644 --- a/app/Http/Controllers/AdminSpamController.php +++ b/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; } diff --git a/resources/less/metager/pages/spam.less b/resources/less/metager/pages/spam.less new file mode 100644 index 0000000000000000000000000000000000000000..c144a89d210d23df52731132782ef40d93c7692b --- /dev/null +++ b/resources/less/metager/pages/spam.less @@ -0,0 +1,3 @@ +#queries > div.matches { + color: #777 +} \ No newline at end of file diff --git a/webpack.mix.js b/webpack.mix.js index 5103ed5838b76375f21d56bbefd436562cbdc6a5..5e4be685345876ffc0c3d04825d6a20f864e6a85 100644 --- a/webpack.mix.js +++ b/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 })