Fixing Issue #107

Removal rule not using correct DB when using $use_cacti_db = false;

Author: TheWitness

README.md

@@ -160,6 +160,8 @@ that.
 * issue#104: When filtering, syslog incorrectly thinks the Cacti hosts table
   does not exist
 
+* issue#107: Removal rule not using correct DB when using $use_cacti_db = false;
+
 --- 2.5 ---
 
 * issue#103: Allow syslog to use rsyslog new tizezone sensitive timestamps

functions.php

@@ -578,15 +578,17 @@ function sql_hosts_where($tab) {
 	$hostfilter_log = '';
 	$hosts_array    = array();
 
+	include(dirname(__FILE__) . '/config.php');
+
 	if (!isempty_request_var('host') && get_nfilter_request_var('host') != 'null') {
 		$hostarray = explode(',', trim(get_nfilter_request_var('host')));
 		if ($hostarray[0] != '0') {
 			foreach($hostarray as $host_id) {
 				input_validate_input_number($host_id);
 
 				if ($host_id > 0) {
-					$log_host = db_fetch_cell_prepared('SELECT host
-						FROM syslog_hosts
+					$log_host = syslog_db_fetch_cell_prepared('SELECT host
+						FROM `' . $syslogdb_default . '`.`syslog_hosts`
 						WHERE host_id = ?',
 						array($host_id));
 
@@ -802,12 +804,12 @@ function syslog_manage_items($from_table, $to_table) {
 				if ($remove['method'] != 'del') {
 					$sql_sel = "SELECT seq FROM `" . $syslogdb_default . "`. $from_table
 						WHERE facility_id IN
-							(SELECT distinct facility_id from `". $syslogdb_default . "`syslog_facilities
+							(SELECT distinct facility_id FROM `". $syslogdb_default . "`syslog_facilities
 							WHERE facility ='". $remove['message']."')";
 				} else {
 					$sql_dlt = "DELETE FROM `" . $syslogdb_default . "`. $from_table
 						WHERE facility_id IN
-							(SELECT distinct facility_id from `". $syslogdb_default . "`syslog_facilities
+							(SELECT distinct facility_id FROM `". $syslogdb_default . "`syslog_facilities
 							WHERE facility ='". $remove['message']."')";
 				}
 
@@ -816,12 +818,12 @@ function syslog_manage_items($from_table, $to_table) {
 					$sql_sel = "SELECT seq
 						FROM `" . $syslogdb_default . "`. $from_table
 						WHERE host_id in
-							(SELECT distinct host_id from `". $syslogdb_default . "`syslog_hosts
+							(SELECT distinct host_id FROM `". $syslogdb_default . "`syslog_hosts
 							WHERE host ='". $remove['message']."')";
 				} else {
 					$sql_dlt = "DELETE FROM `" . $syslogdb_default . "`. $from_table
 						WHERE host_id in
-							(SELECT distinct host_id from `". $syslogdb_default . "`syslog_hosts
+							(SELECT distinct host_id FROM `". $syslogdb_default . "`syslog_hosts
 							WHERE host ='". $remove['message']."')";
 				}
 			} elseif ($remove['type'] == 'messageb') {

syslog.php

@@ -420,6 +420,9 @@ function get_stats_records(&$sql_where, &$sql_groupby, $rows) {
 
 function syslog_stats_filter() {
 	global $config, $item_rows;
+
+	include(dirname(__FILE__) . '/config.php');
+
 	?>
 	<tr class='even'>
 		<td>
@@ -435,7 +438,7 @@ function syslog_stats_filter() {
 							<option value='-2'<?php if (get_request_var('host') == '-2') { ?> selected<?php } ?>><?php print __('None', 'syslog');?></option>
 							<?php
 							$hosts = syslog_db_fetch_assoc('SELECT DISTINCT sh.host_id, sh.host, h.id
-								FROM syslog_hosts AS sh
+								FROM `' . $syslogdb_default . '`.`syslog_hosts` AS sh
 								LEFT JOIN host AS h
 								ON sh.host = h.hostname
 								OR sh.host = h.description
@@ -466,7 +469,7 @@ function syslog_stats_filter() {
 							<option value='-2'<?php if (get_request_var('facility') == '-2') { ?> selected<?php } ?>><?php print __('None', 'syslog');?></option>
 							<?php
 							$facilities = syslog_db_fetch_assoc('SELECT DISTINCT facility_id, facility
-								FROM syslog_facilities AS sf
+								FROM `' . $syslogdb_default . '`.`syslog_facilities` AS sf
 								ORDER BY facility');
 
 							if (cacti_sizeof($facilities)) {
@@ -486,7 +489,7 @@ function syslog_stats_filter() {
 							<option value='-2'<?php if (get_request_var('priority') == '-2') { ?> selected<?php } ?>><?php print __('None', 'syslog');?></option>
 							<?php
 							$priorities = syslog_db_fetch_assoc('SELECT DISTINCT priority_id, priority
-								FROM syslog_priorities AS sp
+								FROM `' . $syslogdb_default . '`.`syslog_priorities` AS sp
 								ORDER BY priority');
 
 							if (cacti_sizeof($priorities)) {
@@ -820,7 +823,7 @@ function get_syslog_messages(&$sql_where, $rows, $tab) {
 			if ($thold_pos !== false) {
 				$ids = array_rekey(
 					syslog_db_fetch_assoc('SELECT id
-						FROM syslog_alert
+						FROM `' . $syslogdb_default . '`.`syslog_alert`
 						WHERE method = 1'),
 					'id', 'id'
 				);
@@ -981,7 +984,7 @@ function get_syslog_messages(&$sql_where, $rows, $tab) {
 }
 
 function syslog_filter($sql_where, $tab) {
-	global $config, $graph_timespans, $graph_timeshifts, $reset_multi, $page_refresh_interval, $item_rows, $trimvals, $syslogdb_default, $database_default;
+	global $config, $graph_timespans, $graph_timeshifts, $reset_multi, $page_refresh_interval, $item_rows, $trimvals;
 
 	include(dirname(__FILE__) . '/config.php');
 
@@ -1318,8 +1321,8 @@ function timeshiftFilterRight() {
 								$hosts_where = api_plugin_hook_function('syslog_hosts_where', $hosts_where);
 
 								$hosts = syslog_db_fetch_assoc("SELECT sh.host_id, sh.host, h.id
-									FROM `$syslogdb_default`.`syslog_hosts` AS sh
-									LEFT JOIN `$database_default`.host AS h
+									FROM `" . $syslogdb_default . "`.`syslog_hosts` AS sh
+									LEFT JOIN host AS h
 									ON sh.host = h.hostname
 									OR sh.host = h.description
 									OR sh.host LIKE substring_index(h.hostname, '.', 1)