Merge branch 'development' into 'master'

modified hv

See merge request !1438

app/Http/Middleware/HumanVerification.php

@@ -29,7 +29,7 @@ class HumanVerification
             $ip = $request->ip();
             $id = "";
             $uid = "";
-            if ($this->isTor($ip)) {
+            if ($this->couldBeSpammer($ip)) {
                 $id = hash("sha512", "999.999.999.999");
                 $uid = hash("sha512", "999.999.999.999" . $ip . $_SERVER["AGENT"] . "uid");
             } else {
@@ -189,7 +189,7 @@ class HumanVerification
 
     }
 
-    private function isTor($ip)
+    private function couldBeSpammer($ip)
     {
         $serverAddress = empty($_SERVER['SERVER_ADDR']) ? "144.76.88.77" : $_SERVER['SERVER_ADDR'];
         $queryUrl = "https://tor.metager.org?password=" . urlencode(env("TOR_PASSWORD")) . "&ra=" . urlencode($ip) . "&sa=" . urlencode($serverAddress) . "&sp=443";
@@ -201,10 +201,21 @@ class HumanVerification
         $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         curl_close($ch);
 
+        $possibleSpammer = false;
         if ($httpcode === 200) {
             return true;
-        } else {
-            return false;
         }
+
+        # Check for recent Spams
+        $eingabe = \Request::input('eingabe');
+        if (\preg_match("/^[\\d]{3}\s*chan.*$/si", $eingabe)) {
+            return true;
+        }
+        if (\preg_match("/^susimail\s+-site:[^\s]+\s-site:/si", $eingabe)) {
+            return true;
+        }
+
+        return $possibleSpammer;
+
     }
 }