Updated to allow database-less operation

[ctracker.git] / libs / lib_connect.php

diff --git a/libs/lib_connect.php b/libs/lib_connect.php
index 175fcbf97bf6566d8a265ac5f603af2edc3cab7e..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
@@ -340,13 +352,16 @@ function addCrackerTrackerTicket (array $data) {
        if ((isset($GLOBALS['ctracker_last_insert_id'])) && ($GLOBALS['ctracker_last_insert_id'] > 0)) {
                // All fine, so prepare the link between ticket<->data
                $data = array(
-                       'ctracker_ticket'  => $GLOBALS['ctracker_last_insert_id'],
-                       'ctracker_data_id' => $GLOBALS['ctracker_last_suspicious_entry']['id']
+                       'ctracker_ticket_id' => $GLOBALS['ctracker_last_insert_id'],
+                       'ctracker_data_id'   => $GLOBALS['ctracker_last_suspicious_entry']['id']
                );
 
                // And insert it as well
                crackerTrackerInsertArray('ctracker_ticket_data', $data);
 
+               // Add ticket id again
+               $GLOBALS['ctracker_ticket'] = $data['ctracker_ticket_id'];
+
                // Merge all data for emails
                $GLOBALS['ctracker_last_ticket'] = array_merge($GLOBALS['ctracker_last_ticket'], $data);