tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2896-Vista-de-monitores-en-metaconsola' into 'develop'

Browse Source 
first load it does not show the data

See merge request artica/pandorafms!2112

Former-commit-id: 5f88566e4123c079956274ac4f7db27316e11718
This commit is contained in:
Daniel Rodriguez 2019-01-14 19:21:01 +01:00
commit f68cc53bb2
1 changed files with 80 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pandora_console/operation/agentes/status_monitor.php
View File

@ -552,7 +552,7 @@ if (is_metaconsole()) {
$filters .= html_print_table($table, true); $filters .= html_print_table($table, true);
$filters .= "</form>"; $filters .= "</form>";
ui_toggle($filters, __('Show Options')); ui_toggle($filters, __('Show Options'), '', false);
} }
else { else {
$table->colspan[3][0] = 7; $table->colspan[3][0] = 7;
@ -778,18 +778,22 @@ $sql = 'SELECT
ORDER BY ' . $order['field'] . " " . $order['order'] . ' ORDER BY ' . $order['field'] . " " . $order['order'] . '
LIMIT '.$offset.",".$limit_sql; LIMIT '.$offset.",".$limit_sql;
if (! defined ('METACONSOLE')) { // When you enter for the first time you have less than 4 query params in the url
$result = db_get_all_rows_sql ($sql); $first_interaction = count($_GET) > 4;
// We do not show the modules until the user searches with the filter
if ($first_interaction) {
if (! defined ('METACONSOLE')) {
$result = db_get_all_rows_sql($sql);
if ($result === false) { if ($result === false) {
$result = array (); $result = array();
} else {
ui_pagination($count, false, $offset);
} }
else }
ui_pagination ($count, false, $offset); else {
}
else {
// For each server defined and not disabled: // For each server defined and not disabled:
$servers = db_get_all_rows_sql ('SELECT * $servers = db_get_all_rows_sql('SELECT *
FROM tmetaconsole_setup FROM tmetaconsole_setup
WHERE disabled = 0'); WHERE disabled = 0');
if ($servers === false) if ($servers === false)
@ -804,13 +808,13 @@ else {
else else
$connection = false; $connection = false;
$result_server = db_get_all_rows_sql ($sql); $result_server = db_get_all_rows_sql($sql);
if (!empty($result_server)) { if (!empty($result_server)) {
// Create HASH login info // Create HASH login info
$pwd = $server['auth_token']; $pwd = $server['auth_token'];
$auth_serialized = json_decode($pwd,true); $auth_serialized = json_decode($pwd, true);
if (is_array($auth_serialized)) { if (is_array($auth_serialized)) {
$pwd = $auth_serialized['auth_token']; $pwd = $auth_serialized['auth_token'];
@ -821,7 +825,7 @@ else {
$user = $config['id_user']; $user = $config['id_user'];
$user_rot13 = str_rot13($config['id_user']); $user_rot13 = str_rot13($config['id_user']);
$hashdata = $user.$pwd; $hashdata = $user . $pwd;
$hashdata = md5($hashdata); $hashdata = md5($hashdata);
$url_hash = '&' . $url_hash = '&' .
'loginhash=auto&' . 'loginhash=auto&' .
@ -832,7 +836,7 @@ else {
$result_server[$result_element_key]['server_id'] = $server['id']; $result_server[$result_element_key]['server_id'] = $server['id'];
$result_server[$result_element_key]['server_name'] = $server['server_name']; $result_server[$result_element_key]['server_name'] = $server['server_name'];
$result_server[$result_element_key]['server_url'] = $server['server_url'].'/'; $result_server[$result_element_key]['server_url'] = $server['server_url'] . '/';
$result_server[$result_element_key]['hashdata'] = $hashdata; $result_server[$result_element_key]['hashdata'] = $hashdata;
$result_server[$result_element_key]['user'] = $config['id_user']; $result_server[$result_element_key]['user'] = $config['id_user'];
$result_server[$result_element_key]['groups_in_server'] = $result_server[$result_element_key]['groups_in_server'] =
@ -851,11 +855,12 @@ else {
} }
if ($count_modules > $config['block_size']) { if ($count_modules > $config['block_size']) {
ui_pagination ($count_modules, false, $offset); ui_pagination($count_modules, false, $offset);
} }
// Get number of elements of the pagination // Get number of elements of the pagination
$result = ui_meta_get_subset_array($result, $inferior_limit, $superior_limit); $result = ui_meta_get_subset_array($result, $inferior_limit, $superior_limit);
}
} }
if (($config['dbtype'] == 'oracle') && ($result !== false)) { if (($config['dbtype'] == 'oracle') && ($result !== false)) {
@ -1391,9 +1396,14 @@ if (!empty($result)) {
} }
html_print_table ($table); html_print_table ($table);
} else {
if ($first_interaction) {
ui_print_info_message(array('no_close' => true, 'message' => __('This group doesn\'t have any monitor')));
} else {
ui_print_info_message(array('no_close' => true, 'message' => __('Sorry no search parameters')));
}
} }
else
ui_print_info_message ( array ( 'no_close' => true, 'message' => __('This group doesn\'t have any monitor') ) );
// End Build List Result // End Build List Result
///////////////////////////////////// /////////////////////////////////////