From f04c12e110290e17545ee05dcfa058feba6cbb82 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 12 Aug 2013 18:45:59 +0000 Subject: [PATCH] Opps, did forget the fetch :( --- libs/lib_connect.php | 7 +++++-- libs/lib_updates.php | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/lib_connect.php b/libs/lib_connect.php index 975ffc4..8686ec5 100644 --- a/libs/lib_connect.php +++ b/libs/lib_connect.php @@ -311,8 +311,8 @@ function isCrackerTrackerIpSuspicious () { return FALSE; } // END - if - // We only need the very last attempt to get! - $result = runCrackerTrackerSql("SELECT SQL_SMALL_RESULT COUNT(`id`) AS `cnt` FROM `ctracker_data` USE INDEX (`remote_proxy_last`) WHERE `remote_addr`='" . determineCrackerTrackerRealRemoteAddress() . "' OR `proxy_addr`='" . getenv('REMOTE_ADDR') . "' LIMIT 1", __FUNCTION__, __LINE__); + // Check if an entry is there + $result = runCrackerTrackerSql("SELECT COUNT(`id`) AS `cnt` FROM `ctracker_data` USE INDEX (`remote_proxy_last`) WHERE `remote_addr`='" . determineCrackerTrackerRealRemoteAddress() . "' OR `proxy_addr`='" . getenv('REMOTE_ADDR') . "' LIMIT 1", __FUNCTION__, __LINE__); // Get row count list($rows) = mysql_fetch_row($result); @@ -322,6 +322,9 @@ function isCrackerTrackerIpSuspicious () { // And again? if ($found === TRUE) { + // Yes, one is found, then load it + $result = runCrackerTrackerSql("SELECT SQL_SMALL_RESULT * FROM `ctracker_data` USE INDEX (`remote_proxy_last`) WHERE `remote_addr`='" . determineCrackerTrackerRealRemoteAddress() . "' OR `proxy_addr`='" . getenv('REMOTE_ADDR') . "' ORDER BY `last_attempt` DESC LIMIT 1", __FUNCTION__, __LINE__); + // Cache the entry $GLOBALS['ctracker_last_suspicious_entry'] = mysql_fetch_array($result); } // END - if diff --git a/libs/lib_updates.php b/libs/lib_updates.php index f844742..a0ea51d 100644 --- a/libs/lib_updates.php +++ b/libs/lib_updates.php @@ -69,8 +69,8 @@ FOREIGN KEY ( `ctracker_data_id` ) REFERENCES `' . $GLOBALS['ctracker_dbname'] . ), // Better key for always repeating query - 3 => array( - 'ALTER TABLE `ctracker`.`ctracker_data` ADD INDEX `remote_proxy_last` ( `remote_addr`, `proxy_addr` )', + 4 => array( + 'ALTER TABLE `ctracker`.`ctracker_data` ADD INDEX `remote_proxy_last` ( `remote_addr`, `proxy_addr`, `last_attempt` DESC )', ), ); } -- 2.30.2