diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 65b76241cde59edb99cd5b29642e2bf72ca5eefc..a73d2147ae680de2fe3d7d6249a83b324bf25e2a 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -28,7 +28,7 @@ class Kernel extends ConsoleKernel $schedule->command('requests:gather')->everyFifteenMinutes(); $schedule->command('requests:useragents')->everyFiveMinutes(); $schedule->command('logs:gather')->everyMinute(); - $schedule->command('spam:load')->everyFiveMinutes(); + $schedule->command('spam:load')->everyMinute(); $schedule->call(function () { DB::table('monthlyrequests')->truncate(); DB::disconnect('mysql'); diff --git a/app/Http/Middleware/HumanVerification.php b/app/Http/Middleware/HumanVerification.php index 47e06200c8dd811069ce46f496f6a985b54ca007..d38133150635a5487926aee6df36642c5ef9c9b6 100644 --- a/app/Http/Middleware/HumanVerification.php +++ b/app/Http/Middleware/HumanVerification.php @@ -33,7 +33,7 @@ class HumanVerification $uid = ""; if (\App\Http\Controllers\HumanVerification::couldBeSpammer($ip)) { $id = hash("sha1", "999.999.999.999"); - $uid = hash("sha1", "999.999.999.999" . $ip . $_SERVER["AGENT"] . "uid"); + $uid = hash("sha1", "999.999.999.999uid"); } else { $id = hash("sha1", $ip); $uid = hash("sha1", $ip . $_SERVER["AGENT"] . "uid"); diff --git a/resources/js/result-saver.js b/resources/js/result-saver.js index db58b1b3fffd3f9a7f2313622071551a3072d41b..7776f026fbf06928a7df376f786fad53002b1e4d 100644 --- a/resources/js/result-saver.js +++ b/resources/js/result-saver.js @@ -408,7 +408,8 @@ function resultSaver(index) { var title = $('.result[data-count=' + index + '] .result-title a').html().trim(); var link = $('.result[data-count=' + index + '] .result-title a').attr('href').trim(); var hosterName = $('.result[data-count=' + index + '] .result-hoster').html().trim(); - var hosterLink = $('.result[data-count=' + index + '] .result-hoster').attr('href').trim(); + var hosterLink = $('.result[data-count=' + index + '] .result-hoster').attr('href'); + hosterLink = hosterLink?hosterLink.trim():"#"; var anzeigeLink = $('.result[data-count=' + index + '] .result-link').html().trim(); var description = $('.result[data-count=' + index + '] .result-description').html().trim(); var anonym = $('.result[data-count=' + index + '] .result-open-proxy').attr('href').trim(); diff --git a/resources/js/scriptResultPage.js b/resources/js/scriptResultPage.js index 18ce51a129fc0f6d50f281608680f144d8f93de7..82d24b3f85beeed5c31f4d4d37ef0954579b27ec 100644 --- a/resources/js/scriptResultPage.js +++ b/resources/js/scriptResultPage.js @@ -9,7 +9,7 @@ function botProtection() { var link = $(this).attr('href'); var newtab = false; var top = false; - if ($(this).attr('target') == '_blank' || e.ctrlKey) { + if ($(this).attr('target') == '_blank' || e.ctrlKey || e.metaKey) { newtab = true; } else if ($(this).attr('target') == "_top") { top = true;