tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added new field to monitors search in monitor detail section. Ticket #4201

This commit is contained in:
Arturo Gonzalez 2016-11-16 09:59:48 +01:00
parent e0f93cf464
commit 697dd92c74
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ $sort = get_parameter('sort', 'none');
//When the previous page was a visualmap and show only one module
$id_module = (int) get_parameter('id_module', 0);
$ag_custom_fields = (array) get_parameter('ag_custom_fields', array());
$module_option = (int) get_parameter('module_option', 0);
if (!is_metaconsole()) {
$ag_group = (int) get_parameter ('ag_group', 0);
@ -95,7 +96,7 @@ $sql_from = ' FROM ttipo_modulo,tagente, tagente_modulo, tagente_estado,tmodule
$sql_conditions_base = ' WHERE tagente.id_agente = tagente_modulo.id_agente
AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.id_tipo_modulo = ttipo_modulo.id_tipo AND tmodule.id_module = tagente_modulo.id_modulo';
$sql_conditions = ' AND tagente_modulo.disabled = 0 AND tagente.disabled = 0';
$sql_conditions = ' AND tagente.disabled = 0';
if (is_numeric($ag_group)) {
$id_ag_group = 0;
@ -140,6 +141,16 @@ if ($ag_modulename != '') {
$ag_modulename);
}
if ($module_option !== 0) {
if ($module_option == 1) {
// Only enabled
$sql_conditions .= sprintf (' AND tagente_modulo.disabled = 0');
}
else if ($module_option == 2) {
// Only disabled
$sql_conditions .= sprintf (' AND tagente_modulo.disabled = 1');
}
}
if ($datatype != '') {
$sql_conditions .= sprintf (' AND ttipo_modulo.id_tipo =' .$datatype);
@ -383,17 +394,22 @@ else {
$table->data[2][1] = html_print_select ($typemodules, 'moduletype',$moduletype, '', __('All'),'', true, false, true, '', false, 'width: 150px;');
$monitor_options = array(0 => __('Everyone'), 1 => __('Only enabled'), 2 => __('Only disabled'));
$table->data[2][2] = '<span>'.__('Show monitors...').'</span>';
$table->data[2][2] = '<span id="datatypetittle" ';
$table->data[2][3] = html_print_select ($monitor_options, 'module_option', $module_option, '', '','', true, false, true, '', false, 'width: 150px;');
$table->data[2][4] = '<span id="datatypetittle" ';
if(!$_GET['sort']){
$table->data[2][2] .= 'style="display:none"';
$table->data[2][4] .= 'style="display:none"';
}
$table->data[2][2] .= '>'.__('Data type').'</span>';
$table->data[2][4] .= '>'.__('Data type').'</span>';
$table->data[2][3] .='<div id="datatypebox">';
$table->data[2][5] .='<div id="datatypebox">';
switch ($moduletype)
@ -435,33 +451,33 @@ else {
}
$a = db_get_all_rows_sql($sql);
$table->data[2][3] .= '<select id="datatype" name="datatype" ';
$table->data[2][5] .= '<select id="datatype" name="datatype" ';
if(!$_GET['sort']){
$table->data[2][3] .= 'style="display:none"';
$table->data[2][5] .= 'style="display:none"';
}
$table->data[2][3] .= '>';
$table->data[2][5] .= '>';
$table->data[2][3] .= '<option name="datatype" value="">'.__("All").'</option>';
$table->data[2][5] .= '<option name="datatype" value="">'.__("All").'</option>';
foreach ($a as $valor) {
$table->data[2][3] .= '<option name="datatype" value="'.$valor['id_tipo'].'" ';
$table->data[2][5] .= '<option name="datatype" value="'.$valor['id_tipo'].'" ';
if($valor['id_tipo'] == $datatype){
$table->data[2][3] .= 'selected';
$table->data[2][5] .= 'selected';
}
$table->data[2][3] .= '>'.$valor['descripcion'].'</option>';
$table->data[2][5] .= '>'.$valor['descripcion'].'</option>';
}
$table->data[2][3] .= '</select>';
$table->data[2][5] .= '</select>';
$table->data[2][3] .= '</div>';
$table->data[2][5] .= '</div>';
$table_custom_fields = new stdClass();
@ -502,7 +518,7 @@ foreach ($custom_fields as $custom_field) {
$filters = '<form method="post" action="index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;ag_group=' .
$ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;moduletype=' . $moduletype . '&amp;datatype=' . $datatype . '&amp;status=' . $status . '&amp;sort_field=' .
$ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;module_option=' . $module_option . '&amp;ag_modulename=' . $ag_modulename . '&amp;moduletype=' . $moduletype . '&amp;datatype=' . $datatype . '&amp;status=' . $status . '&amp;sort_field=' .
$sortField . '&amp;sort=' . $sort .'&amp;pure=' . $config['pure'] . $ag_custom_fields_params . '">';
if (is_metaconsole()) {
$table->colspan[3][0] = 7;
@ -828,7 +844,6 @@ switch ($config['dbtype']) {
break;
}
if (! defined ('METACONSOLE')) {
$result = db_get_all_rows_sql ($sql);