Merge branch 'development' into 'master'

Development

See merge request !1806

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');

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");

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();

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;