Updated a lot:

[ctracker.git] / ctracker.php

diff --git a/ctracker.php b/ctracker.php
index db3407bda41e7327311169d6bd410c10600848b5..8dc66da748506fbf9f69bfc0f4185c9c1d7edb89 100644 (file)
--- a/ctracker.php
+++ b/ctracker.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Cracker Tracker Protection System - Enhanced Edition
+ * Cracker Tracker Protection System - Extended Edition
  * Initially created by Christian Knerr - www.cback.de
- * Enhanced by: Roland Haeder - www.ship-simu.org
+ *
+ * Extended by: Roland Haeder - www.ship-simu.org
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            3.0.0
@@ -28,16 +29,21 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+// XDEBUG call
+//* DEBUG: */ xdebug_start_trace();
+
 // Include files
-include('config/db_config.php');
-include('libs/lib_general.php');
-include('libs/lib_detector.php');
-include('libs/lib_connect.php');
-include('libs/lib_updates.php');
+require('libs/lib_general.php');
+require('libs/lib_detector.php');
+require('libs/lib_connect.php');
+require('libs/lib_updates.php');
 
 // Init
 initCrackerTrackerArrays();
 
+// Load configuration, if any is found
+crackerTrackerLoadConfiguration();
+
 // Get a database link
 aquireCrackerTrackerDatabaseLink();
 
@@ -47,18 +53,12 @@ crackerTrackerUpdateDatabaseScheme();
 // If it differs to original and the *whole* request string is not in whitelist
 // then block the attempt
 if (isCrackerTrackerWormDetected()) {
-       // Send the email, this must be the last line because it contains a die()
+       // Send the email, this must be the last line in this if() block because it contains a exit()
        sendCrackerTrackerMail();
-} // END - if
-
-// Suspicious POST data detected?
-if (isCrackerTrackerPostAttackDetected()) {
-       // Send the email, this must be the last line because it contains a die()
+} elseif (isCrackerTrackerPostAttackDetected()) {
+       // Send the email, this must be the last line in this if() block because it contains a exit()
        sendCrackerTrackerPostMail();
-} // END - if
-
-// Does the current IP produce some blocked requests but not now?
-if ((getCrackerTrackerConfig('ctracker_alert_user') == 'Y') && (isCrackerTrackerIpSuspicious())) {
+} elseif ((getCrackerTrackerConfig('ctracker_alert_user') == 'Y') && (isCrackerTrackerIpSuspicious())) {
        // This IP is suspicious, so we alert him/her
        crackerTrackerAlertCurrentUser();
 } // END - if