Solve the issue for alerts, os names and tags

This commit is contained in:
Jose Gonzalez 2020-07-07 11:05:19 +02:00
parent 93ad38888b
commit 5e039adb26
6 changed files with 32 additions and 23 deletions

View File

@ -351,6 +351,7 @@ $templates = alerts_get_alert_templates(
'description',
'type',
'id_group',
'previous_name',
]
);
if ($templates === false) {

View File

@ -83,6 +83,10 @@ if ($update_command) {
$values['command'] = $command;
$values['description'] = $description;
$values['id_group'] = $id_group;
// Only for Metaconsole. Save the previous name for synchronizing.
if (is_metaconsole()) {
$values['previous_name'] = db_get_value('name', 'talert_commands', 'id', $id);
}
// Check it the new name is used in the other command.
$id_check = db_get_value('id', 'talert_commands', 'name', $name);

View File

@ -34,6 +34,9 @@ if (! check_acl($config['id_user'], 0, 'LM')) {
$duplicate_template = (bool) get_parameter('duplicate_template');
$id = (int) get_parameter('id');
$pure = get_parameter('pure', 0);
$step = (int) get_parameter('step', 1);
// We set here the number of steps.
define('LAST_STEP', 3);
// If user tries to duplicate/edit a template with group=ALL then must have "PM" access privileges
if ($duplicate_template) {
@ -56,7 +59,6 @@ if ($a_template !== false) {
if (defined('METACONSOLE')) {
alerts_meta_print_header();
} else {
$step = (int) get_parameter('step', 1);
if ($step == 1) {
$help_header = '';
} else if ($step == 2) {
@ -113,7 +115,6 @@ if ($a_template !== false) {
if (defined('METACONSOLE')) {
alerts_meta_print_header();
} else {
$step = (int) get_parameter('step', 1);
if ($step == 1) {
$help_header = '';
} else if ($step == 2) {
@ -252,24 +253,20 @@ function update_template($step)
$wizard_level = (string) get_parameter('wizard_level');
$priority = (int) get_parameter('priority');
$id_group = get_parameter('id_group');
switch ($config['dbtype']) {
case 'mysql':
case 'postgresql':
$name_check = db_get_value('name', 'talert_templates', 'name', $name);
break;
case 'oracle':
$name_check = db_get_value('name', 'talert_templates', 'to_char(name)', $name);
break;
// Only for Metaconsole. Save the previous name for synchronizing.
if (is_metaconsole()) {
$previous_name = db_get_value('name', 'talert_templates', 'id', $id);
} else {
$previous_name = '';
}
$values = [
'name' => $name,
'description' => $description,
'id_group' => $id_group,
'priority' => $priority,
'wizard_level' => $wizard_level,
'name' => $name,
'description' => $description,
'id_group' => $id_group,
'priority' => $priority,
'wizard_level' => $wizard_level,
'previous_name' => $previous_name,
];
$result = alerts_update_alert_template($id, $values);
@ -363,11 +360,6 @@ function update_template($step)
}
// We set here the number of steps
define('LAST_STEP', 3);
$step = (int) get_parameter('step', 1);
$create_alert = (bool) get_parameter('create_alert');
$create_template = (bool) get_parameter('create_template');
$update_template = (bool) get_parameter('update_template');

View File

@ -88,7 +88,6 @@ switch ($action) {
} else {
header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
}
break;
case 'update':
@ -99,6 +98,10 @@ switch ($action) {
$values = [];
$values['name'] = $name;
$values['description'] = $description;
// Only for Metaconsole. Save the previous name for synchronizing.
if (is_metaconsole()) {
$values['previous_name'] = db_get_value('name', 'tconfig_os', 'id_os', $idOS);
}
if (($icon !== 0) && ($icon != '')) {
$values['icon_name'] = $icon;

View File

@ -79,6 +79,10 @@ if ($update_tag && $id_tag != 0) {
$values['url'] = $url_tag;
$values['email'] = $email_tag;
$values['phone'] = $phone_tag;
// Only for Metaconsole. Save the previous name for synchronizing.
if (is_metaconsole()) {
$values['previous_name'] = db_get_value('name', 'ttag', 'id_tag', $id_tag);
}
$result = false;
if ($values['name'] != '') {

View File

@ -2780,6 +2780,11 @@ function alerts_ui_update_or_create_actions($update=true)
if ($update) {
$values['name'] = $name;
$values['id_alert_command'] = $id_alert_command;
// Only for Metaconsole, save the previous name for synchronization.
if (is_metaconsole()) {
$values['previous_name'] = db_get_value('name', 'talert_actions', 'id', $id);
}
$result = (!$name) ? '' : alerts_update_alert_action($id, $values);
} else {
$name_check = db_get_value('name', 'talert_actions', 'name', $name);