Continued:

[ctracker.git] / libs / lib_detector.php

diff --git a/libs/lib_detector.php b/libs/lib_detector.php
index d0cf25d4988f3830c92cdd284216f939fbb175fd..122f773c465a188479bb3c8ba5b0e65a6c6e40d5 100644 (file)
--- a/libs/lib_detector.php
+++ b/libs/lib_detector.php
@@ -223,7 +223,7 @@ function initCrackerTrackerArrays () {
 
        // Also block these requests (mostly you don't want CONNECT to some SMTP sites)
        $GLOBALS['ctracker_blocked_methods'] = [
-               'CONNECT' => TRUE,
+               'CONNECT' => true,
        ];
 
        // Init more elements
@@ -236,8 +236,8 @@ function initCrackerTrackerArrays () {
 // Checks for worms
 function isCrackerTrackerWormDetected () {
        // Check against the whole list
-       $GLOBALS['ctracker_checked_get'] = urldecode(str_ireplace($GLOBALS['ctracker_get_blacklist'], '*', crackerTrackerQueryString(TRUE)));
-       $GLOBALS['ctracker_checked_ua']  = urldecode(str_ireplace($GLOBALS['ctracker_ua_blacklist'], '*', crackerTrackerUserAgent(TRUE)));
+       $GLOBALS['ctracker_checked_get'] = urldecode(str_ireplace($GLOBALS['ctracker_get_blacklist'], '*', crackerTrackerQueryString(true)));
+       $GLOBALS['ctracker_checked_ua']  = urldecode(str_ireplace($GLOBALS['ctracker_ua_blacklist'], '*', crackerTrackerUserAgent(true)));
 
        /*
         * If it differs to original and the *whole* request string is not in
@@ -245,9 +245,9 @@ function isCrackerTrackerWormDetected () {
         */
        $isWorm = (
                (
-                       $GLOBALS['ctracker_checked_get'] != crackerTrackerQueryString(TRUE) && (!in_array(crackerTrackerQueryString(TRUE), $GLOBALS['ctracker_whitelist']))
+                       $GLOBALS['ctracker_checked_get'] != crackerTrackerQueryString(true) && (!in_array(crackerTrackerQueryString(true), $GLOBALS['ctracker_whitelist']))
                ) || (
-                       $GLOBALS['ctracker_checked_ua'] != crackerTrackerUserAgent(TRUE)
+                       $GLOBALS['ctracker_checked_ua'] != crackerTrackerUserAgent(true)
                ) || (
                        isset($GLOBALS['ctracker_blocked_methods'][crackerTrackerRequestMethod()])
                )
@@ -312,7 +312,7 @@ function sendCrackerTrackerTicketMails () {
 }
 
 // Sends a mail out
-function crackerTrackerSendMail ($mail, $recipient = NULL, $subject = NULL) {
+function crackerTrackerSendMail (string $mail, string $recipient = NULL, string $subject = NULL) {
        // Construct dummy array
        $rowData = [
                'remote_addr'    => determineCrackerTrackerRealRemoteAddress(),
@@ -330,7 +330,7 @@ function crackerTrackerSendMail ($mail, $recipient = NULL, $subject = NULL) {
                        print 'Recipient=' . $recipient . '<br />Subject=' . $subject . '<br />Text=<pre>' . $mail . '</pre>';
 
                        // All fine
-                       return TRUE;
+                       return true;
                } elseif (!is_null($recipient)) {
                        // Recipient specified
                        return mail($recipient, $subject, $mail, $GLOBALS['ctracker_header']);
@@ -346,7 +346,7 @@ function crackerTrackerSendMail ($mail, $recipient = NULL, $subject = NULL) {
                print 'Recipient=' . $recipient . '<br />Subject=' . $subject . '<br />Text=<pre>' . $mail . '</pre>';
 
                // All fine
-               return TRUE;
+               return true;
        }
 }
 
@@ -381,8 +381,11 @@ Filtered POST string : ' . $GLOBALS['ctracker_checked_post'] . '
 
 // Sleeps for a random time and aborts the script
 function crackerTrackerDie () {
-       // Close database link
-       crackerTrackerCloseDatabaseLink();
+       // Check if link is up
+       if (isCrackerTrackerDatabaseLinkUp()) {
+               // Close database link
+               crackerTrackerCloseDatabaseLink();
+       }
 
        // Do only sleep if debug/developer mode is not enabled
        if (!isCrackerTrackerDebug()) {