fix poller_servcheck.php does not run any test when it runs automatically from cacti poller (Issue #31)

[MSS970]

poller_servcheck.php does not run any test when it runs automatically from cacti poller

The issue is related to the logic at line 117 to 121:

$tests = db_fetch_assoc_prepared('SELECT *
FROM plugin_servcheck_test
WHERE enabled = "on"
AND poller_id = ? AND id = ?',
array($poller_id, $test_id));

The code could be enhanced as follows:
if ($test_id == 0) {
$sql_condition = ' ';
} else {
$sql_condition = ' AND id = ' . $test_id;
}

$tests = db_fetch_assoc_prepared('SELECT *
FROM plugin_servcheck_test
WHERE enabled = "on"
AND poller_id = ? ' .
$sql_condition,
array($poller_id));

furthermore, typo in arrays.php line 326 "disabled" should be "disable"

in servecheck_test.php, add the following after line 1019 ($sql_order = get_order_string();):

// `statistics` is not a table column, the columns are:
// `stats_ok` and `stats_bad`, hence, the ORDER BY should be based on these 2 columns
if ($sql_order == 'ORDER BY `statistics` ASC') {
	$sql_order = 'ORDER BY `stats_ok` ASC, `stats_bad` ASC';
} elseif ($sql_order == 'ORDER BY `statistics` DESC') {
	$sql_order = 'ORDER BY `stats_ok` DESC, `stats_bad` DESC';
}

[MSS970]

Kindly review the fixes and authorize (if possible)

[TheWitness]

This looks like maybe an error in the display text array.

[MSS970]

Hey @TheWitness
How are you?

Can you advise which file you suspect to have an error in the display text array? what is the array name?

[xmacan]

ups, good catch @MSS970

[MSS970]

Hi @TheWitness ,

Do you see any issue with pull request, or it is good to go.

Regards,
MSS970

[TheWitness]

@MSS970 , I should be able to look at it tomorrow. Busy tonight.