diff --git a/database.mwb b/database.mwb index 299305d..a661c34 100644 Binary files a/database.mwb and b/database.mwb differ diff --git a/database.mwb.bak b/database.mwb.bak index 6fd611e..299305d 100644 Binary files a/database.mwb.bak and b/database.mwb.bak differ diff --git a/endpoints/net.contactspam.php b/endpoints/net.contactspam.php index a9ae0b8..37433f9 100644 --- a/endpoints/net.contactspam.php +++ b/endpoints/net.contactspam.php @@ -135,12 +135,12 @@ try { // Check local spammer database if (env("require_database")) { if (!empty($clientip)) { - if ($database->has("net.contactspam_spammers", ["ip" => $clientip])) { + if ($database->has("net_contactspam-spammers", ["ip" => $clientip])) { exitWithJson(["status" => "OK", "clean" => false, "filter" => "netsyms_ip_blacklist", "hit" => $clientip, "message" => "A computer at your IP address has sent spam in the past. Your message has been blocked."]); } } if (!empty($clientip)) { - if ($database->has("net.contactspam_spammers", ["email" => $email_lower])) { + if ($database->has("net_contactspam-spammers", ["email" => $email_lower])) { exitWithJson(["status" => "OK", "clean" => false, "filter" => "netsyms_email_blacklist", "hit" => $clientip, "message" => "Someone put your email as the from address on a spam message. Your message has been blocked."]); } } diff --git a/endpoints/net.contactspam.submit.php b/endpoints/net.contactspam.submit.php index fb288fc..a84807f 100644 --- a/endpoints/net.contactspam.submit.php +++ b/endpoints/net.contactspam.submit.php @@ -5,13 +5,13 @@ $clientip = $VARS["ipaddr"] ?? ""; if (!empty($fromemail) && filter_var($fromemail, FILTER_VALIDATE_EMAIL)) { $fromemail = strtolower($fromemail); - if ($database->has("net.contactspam_spammers", ["email" => $fromemail])) { - $database->update("net.contactspam_spammers", [ + if ($database->has("net_contactspam-spammers", ["email" => $fromemail])) { + $database->update("net_contactspam-spammers", [ "entrylastreported" => date("Y-m-d H:i:s"), "reportcount[+]" => 1 ], ["email" => $fromemail]); } else { - $database->insert("net.contactspam_spammers", [ + $database->insert("net_contactspam-spammers", [ "entrylastreported" => date("Y-m-d H:i:s"), "reportcount" => 1, "email" => $fromemail @@ -20,13 +20,13 @@ if (!empty($fromemail) && filter_var($fromemail, FILTER_VALIDATE_EMAIL)) { } if (!empty($clientip) && filter_var($clientip, FILTER_VALIDATE_IP)) { - if ($database->has("net.contactspam_spammers", ["ip" => $clientip])) { - $database->update("net.contactspam_spammers", [ + if ($database->has("net_contactspam-spammers", ["ip" => $clientip])) { + $database->update("net_contactspam-spammers", [ "entrylastreported" => date("Y-m-d H:i:s"), "reportcount[+]" => 1 ], ["ip" => $clientip]); } else { - $database->insert("net.contactspam_spammers", [ + $database->insert("net_contactspam-spammers", [ "entrylastreported" => date("Y-m-d H:i:s"), "reportcount" => 1, "ip" => $clientip