Fixes (opps) for bad check, blocked all

diff --git a/libs/lib_detector.php b/libs/lib_detector.php
index 3fa9b4da9ea0fb83545fba330c6698fd5d655520..26da674db447507c306bba7d9c7b7868f8045267 100644 (file)
--- a/libs/lib_detector.php
+++ b/libs/lib_detector.php
@@ -95,7 +95,7 @@ function initCrackerTrackerArrays () {
 // Checks for worms
 function isCrackerTrackerWormDetected () {
        // Check against the whole list
-       $GLOBALS['ctracker_checkworm'] = str_ireplace($GLOBALS['ctracker_get_blacklist'], '*', urldecode(crackerTrackerQueryString()));
+       $GLOBALS['ctracker_checkworm'] = urldecode(str_ireplace($GLOBALS['ctracker_get_blacklist'], '*', crackerTrackerQueryString()));
 
        // If it differs to original and the *whole* request string is not in whitelist
        // then blog the attempt
@@ -105,7 +105,7 @@ function isCrackerTrackerWormDetected () {
 // Checks POST data
 function isCrackerTrackerPostAttackDetected () {
        // Implode recursive the whole $_POST array
-       $GLOBALS['ctracker_post_track'] = implode_r('', $_POST);
+       $GLOBALS['ctracker_post_track'] = urldecode(implode_r('', $_POST));
 
        // Check for suspicious POST data
        $GLOBALS['ctracker_check_post'] = str_ireplace($GLOBALS['ctracker_post_blacklist'], '*', $GLOBALS['ctracker_post_track']);
@@ -122,13 +122,13 @@ function sendCrackerTrackerMail () {
        // Mail content
        $mail = "Attack detected:
 -----------------------------------------------------
-Remote-IP       : ".determineCrackerTrackerRealRemoteAddress()."
-User-Agent      : ".crackerTrackerUserAgent()."
-Request-string  : ".crackerTrackerQueryString()."
-Filtered string : ".$GLOBALS['ctracker_checkworm']."
-Server          : ".crackerTrackerServerName()."
-Script          : ".crackerTrackerScriptName()."
-Referrer        : ".crackerTrackerReferer()."
+Remote-IP       : " . determineCrackerTrackerRealRemoteAddress() . "
+User-Agent      : " . crackerTrackerUserAgent() . "
+Request-string  : " . crackerTrackerQueryString() . "
+Filtered string : " . $GLOBALS['ctracker_checkworm'] . "
+Server          : " . crackerTrackerServerName() . "
+Script          : " . crackerTrackerScriptName() . "
+Referrer        : " . crackerTrackerReferer() . "
 -----------------------------------------------------
 ";
 

diff --git a/libs/lib_general.php b/libs/lib_general.php
index fe382dc249938179c20c9db3921ea562de560dc5..33f15a0d09da790b55ecc9aa581457dd0167331f 100644 (file)
--- a/libs/lib_general.php
+++ b/libs/lib_general.php
@@ -151,7 +151,7 @@ function crackerTrackerQueryString () {
        } // END - if
 
        // Should always be there!
-       return crackerTrackerEscapeString($_SERVER['QUERY_STRING']);
+       return crackerTrackerEscapeString(urldecode($_SERVER['QUERY_STRING']));
 }
 
 // Detects the server's name