Updated to allow database-less operation

diff --git a/ctracker.php b/ctracker.php
index acb5bc57c348b5d9a6d6fd97656f959446569a2b..1f071e39d8e78e85fd4d79fd6dd48a738a2a0892 100644 (file)
--- a/ctracker.php
+++ b/ctracker.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Cracker Tracker Protection System - Enhanced Edition
  * Created by: Christian Knerr - www.cback.de
  * Enhanced by: Roland Haeder - www.ship-simu.org

diff --git a/libs/lib_ b/libs/lib_
index 0d8b0415d9283b5fea1caa01f3bb510ebdceaaf5..61077ca0f2d80a92b3ed5f70f2f49193e911d98a 100644 (file)
--- a/libs/lib_
+++ b/libs/lib_
@@ -1,7 +1,6 @@
 <?php
 /**
  * 
- *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            3.0.0
  * @copyright  Copyright (c) 2009, 2010 Cracker Tracker Team

diff --git a/libs/lib_connect.php b/libs/lib_connect.php
index 37474162e5dce1a20fe2a1e117746af2c3a6f309..82e6fe0c87274281a0631dabb6b5a3e8db27ee9a 100644 (file)
--- a/libs/lib_connect.php
+++ b/libs/lib_connect.php
@@ -25,7 +25,7 @@
 // Function to aquire a database link
 function aquireCrackerTrackerDatabaseLink () {
        // Is the link up?
-       if (!isCrackerTrackerDatabaseLinkUp()) {
+       if ((!isCrackerTrackerDatabaseLinkUp()) && (!empty($GLOBALS['ctracker_host'])) && (!empty($GLOBALS['ctracker_dbname'])) && (!empty($GLOBALS['ctracker_user']))) {
                // Then connect to the database
                $GLOBALS['ctracker_link'] = mysql_connect($GLOBALS['ctracker_host'], $GLOBALS['ctracker_user'], $GLOBALS['ctracker_password']) or crackerTrackerDatabaseError(__FUNCTION__, __LINE__);
 
@@ -80,6 +80,12 @@ function crackerTrackerCloseDatabaseLink () {
 
 // Inserts given array, if IP/check_worm combination was not found
 function crackerTrackerInsertArray ($table, $rowData) {
+       // Is there a link up?
+       if (!isCrackerTrackerDatabaseLinkUp()) {
+               // Abort silently here
+               return false;
+       } // END - if
+
        // Is it found?
        if (!isCrackerTrackerEntryFound($rowData)) {
                // Prepare SQL
@@ -114,7 +120,7 @@ function isCrackerTrackerEntryFound ($rowData) {
        $SQL = 'SELECT `id` FROM `ctracker_data` WHERE `remote_addr`="' . crackerTrackerEscapeString($rowData['remote_addr']) . '" AND `check_worm` = "' . crackerTrackerEscapeString($rowData['check_worm']) . '" AND `server_name`="' . crackerTrackerEscapeString($rowData['server_name']) . '" LIMIT 1';
 
        // Run the SQL and check if we have one line
-       return (mysql_num_rows(runCrackerTrackerSql($SQL, __FUNCTION__, __LINE__)) == 1);
+       return ((isCrackerTrackerDatabaseLinkUp()) && (mysql_num_rows(runCrackerTrackerSql($SQL, __FUNCTION__, __LINE__)) == 1));
 }
 
 // Escapes the string
@@ -219,6 +225,12 @@ function crackerTrackerInitTable ($table) {
 
 // Updates the database scheme automatically
 function crackerTrackerUpdateDatabaseScheme () {
+       // Is a link there?
+       if (!isCrackerTrackerDatabaseLinkUp()) {
+               // Abort here silently
+               return;
+       } // END - if
+
        // Is the main config table there?
        if (!isCrackerTrackerTableCreated('ctracker_config')) {
                // Then do it for us

diff --git a/libs/lib_detector.php b/libs/lib_detector.php
index ecd95ba1e94e3ae658473e2a3b91213ab56d4d14..1c16b54588cb31df37fbe97d857bc3952aca121a 100644 (file)
--- a/libs/lib_detector.php
+++ b/libs/lib_detector.php
@@ -160,7 +160,7 @@ function crackerTrackerSendMail ($mail, $recipient = null, $subject = null) {
                // Send the email out only in non-debug mode
                if (isCrackerTrackerDebug()) {
                        // Output message
-                       print 'Recipient='.$recipient.'<br />Subject='.$subject.'<br />Text=<pre>' . $mail . '</pre>';
+                       print 'Recipient=' . $recipient . '<br />Subject=' . $subject . '<br />Text=<pre>' . $mail . '</pre>';
 
                        // All fine
                        return true;
@@ -174,7 +174,13 @@ function crackerTrackerSendMail ($mail, $recipient = null, $subject = null) {
                        // Send it the deprecated way with constant
                        return mail(constant('__CTRACKER_EMAIL'), 'CTracker: Attack detected!', $mail, $GLOBALS['ctracker_header']);
                }
-       } // END - if
+       } elseif (isCrackerTrackerDebug()) {
+               // Output message
+               print 'Recipient=' . $recipient . '<br />Subject=' . $subject . '<br />Text=<pre>' . $mail . '</pre>';
+
+               // All fine
+               return true;
+       }
 }
 
 // Sends a detected POST attack mail