Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop'
several minor fixes See merge request artica/pandorafms!5638
This commit is contained in:
commit
3e0c06b4b7
|
@ -808,7 +808,7 @@ $table->data['edit1'][1] = '<table width="100%">';
|
|||
1
|
||||
);
|
||||
|
||||
$table->data['edit3'][2] = __('SMNP community');
|
||||
$table->data['edit3'][2] = __('SNMP community');
|
||||
$table->data['edit3'][3] = html_print_input_text(
|
||||
'snmp_community',
|
||||
'',
|
||||
|
|
|
@ -56,7 +56,7 @@ ui_print_standard_header(
|
|||
],
|
||||
[
|
||||
'link' => '',
|
||||
'label' => __('SMNP'),
|
||||
'label' => __('SNMP'),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
|
@ -48,7 +48,7 @@ ui_print_standard_header(
|
|||
],
|
||||
[
|
||||
'link' => '',
|
||||
'label' => __('SMNP'),
|
||||
'label' => __('SNMP'),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
|
@ -719,6 +719,7 @@ class SnmpConsole extends HTML
|
|||
}
|
||||
|
||||
$sql = sprintf($sql, $whereSubquery, $start, $length);
|
||||
|
||||
$sql_count = 'SELECT COUNT(id_trap) FROM ttrap
|
||||
WHERE (
|
||||
source IN ('.implode(',', $address_by_user_groups).") OR
|
||||
|
@ -908,7 +909,7 @@ class SnmpConsole extends HTML
|
|||
).'</a>';
|
||||
|
||||
if ($config['enterprise_installed']) {
|
||||
$tmp->action .= '<a href="index.php?sec=snmpconsole&sec2=enterprise/godmode/snmpconsole/snmp_trap_editor_form&oid='.$tmp->oid.'&custom_oid='.urlencode($tmp->oid_custom).'&severity='.$tmp->severity.'&text='.io_safe_input($tmp->text).'&description='.io_safe_input($tmp->description, ENT_QUOTES).'" title="'.io_safe_input($tmp->description, ENT_QUOTES).'">';
|
||||
$tmp->action .= '<a href="index.php?sec=snmpconsole&sec2=enterprise/godmode/snmpconsole/snmp_trap_editor_form&id='.$tmp->id_trap.'&oid='.$tmp->oid.'&custom_oid='.urlencode($tmp->oid_custom).'&severity='.$tmp->severity.'&text='.io_safe_input($tmp->text).'&description='.io_safe_input($tmp->description, ENT_QUOTES).'" title="'.io_safe_input($tmp->description, ENT_QUOTES).'">';
|
||||
$tmp->action .= html_print_image(
|
||||
'images/edit.svg',
|
||||
true,
|
||||
|
|
|
@ -87,7 +87,7 @@ ui_print_standard_header(
|
|||
],
|
||||
[
|
||||
'link' => '',
|
||||
'label' => __('SMNP'),
|
||||
'label' => __('SNMP'),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
|
@ -57,7 +57,7 @@ ui_print_standard_header(
|
|||
],
|
||||
[
|
||||
'link' => '',
|
||||
'label' => __('SMNP'),
|
||||
'label' => __('SNMP'),
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue