Solve the issue for alerts, os names and tags
This commit is contained in:
parent
93ad38888b
commit
5e039adb26
|
@ -351,6 +351,7 @@ $templates = alerts_get_alert_templates(
|
||||||
'description',
|
'description',
|
||||||
'type',
|
'type',
|
||||||
'id_group',
|
'id_group',
|
||||||
|
'previous_name',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
if ($templates === false) {
|
if ($templates === false) {
|
||||||
|
|
|
@ -83,6 +83,10 @@ if ($update_command) {
|
||||||
$values['command'] = $command;
|
$values['command'] = $command;
|
||||||
$values['description'] = $description;
|
$values['description'] = $description;
|
||||||
$values['id_group'] = $id_group;
|
$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.
|
// Check it the new name is used in the other command.
|
||||||
$id_check = db_get_value('id', 'talert_commands', 'name', $name);
|
$id_check = db_get_value('id', 'talert_commands', 'name', $name);
|
||||||
|
|
|
@ -34,6 +34,9 @@ if (! check_acl($config['id_user'], 0, 'LM')) {
|
||||||
$duplicate_template = (bool) get_parameter('duplicate_template');
|
$duplicate_template = (bool) get_parameter('duplicate_template');
|
||||||
$id = (int) get_parameter('id');
|
$id = (int) get_parameter('id');
|
||||||
$pure = get_parameter('pure', 0);
|
$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 user tries to duplicate/edit a template with group=ALL then must have "PM" access privileges
|
||||||
if ($duplicate_template) {
|
if ($duplicate_template) {
|
||||||
|
@ -56,7 +59,6 @@ if ($a_template !== false) {
|
||||||
if (defined('METACONSOLE')) {
|
if (defined('METACONSOLE')) {
|
||||||
alerts_meta_print_header();
|
alerts_meta_print_header();
|
||||||
} else {
|
} else {
|
||||||
$step = (int) get_parameter('step', 1);
|
|
||||||
if ($step == 1) {
|
if ($step == 1) {
|
||||||
$help_header = '';
|
$help_header = '';
|
||||||
} else if ($step == 2) {
|
} else if ($step == 2) {
|
||||||
|
@ -113,7 +115,6 @@ if ($a_template !== false) {
|
||||||
if (defined('METACONSOLE')) {
|
if (defined('METACONSOLE')) {
|
||||||
alerts_meta_print_header();
|
alerts_meta_print_header();
|
||||||
} else {
|
} else {
|
||||||
$step = (int) get_parameter('step', 1);
|
|
||||||
if ($step == 1) {
|
if ($step == 1) {
|
||||||
$help_header = '';
|
$help_header = '';
|
||||||
} else if ($step == 2) {
|
} else if ($step == 2) {
|
||||||
|
@ -252,24 +253,20 @@ function update_template($step)
|
||||||
$wizard_level = (string) get_parameter('wizard_level');
|
$wizard_level = (string) get_parameter('wizard_level');
|
||||||
$priority = (int) get_parameter('priority');
|
$priority = (int) get_parameter('priority');
|
||||||
$id_group = get_parameter('id_group');
|
$id_group = get_parameter('id_group');
|
||||||
|
// Only for Metaconsole. Save the previous name for synchronizing.
|
||||||
switch ($config['dbtype']) {
|
if (is_metaconsole()) {
|
||||||
case 'mysql':
|
$previous_name = db_get_value('name', 'talert_templates', 'id', $id);
|
||||||
case 'postgresql':
|
} else {
|
||||||
$name_check = db_get_value('name', 'talert_templates', 'name', $name);
|
$previous_name = '';
|
||||||
break;
|
|
||||||
|
|
||||||
case 'oracle':
|
|
||||||
$name_check = db_get_value('name', 'talert_templates', 'to_char(name)', $name);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$values = [
|
$values = [
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
'description' => $description,
|
'description' => $description,
|
||||||
'id_group' => $id_group,
|
'id_group' => $id_group,
|
||||||
'priority' => $priority,
|
'priority' => $priority,
|
||||||
'wizard_level' => $wizard_level,
|
'wizard_level' => $wizard_level,
|
||||||
|
'previous_name' => $previous_name,
|
||||||
];
|
];
|
||||||
|
|
||||||
$result = alerts_update_alert_template($id, $values);
|
$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_alert = (bool) get_parameter('create_alert');
|
||||||
$create_template = (bool) get_parameter('create_template');
|
$create_template = (bool) get_parameter('create_template');
|
||||||
$update_template = (bool) get_parameter('update_template');
|
$update_template = (bool) get_parameter('update_template');
|
||||||
|
|
|
@ -88,7 +88,6 @@ switch ($action) {
|
||||||
} else {
|
} else {
|
||||||
header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
|
header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'update':
|
case 'update':
|
||||||
|
@ -99,6 +98,10 @@ switch ($action) {
|
||||||
$values = [];
|
$values = [];
|
||||||
$values['name'] = $name;
|
$values['name'] = $name;
|
||||||
$values['description'] = $description;
|
$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 != '')) {
|
if (($icon !== 0) && ($icon != '')) {
|
||||||
$values['icon_name'] = $icon;
|
$values['icon_name'] = $icon;
|
||||||
|
|
|
@ -79,6 +79,10 @@ if ($update_tag && $id_tag != 0) {
|
||||||
$values['url'] = $url_tag;
|
$values['url'] = $url_tag;
|
||||||
$values['email'] = $email_tag;
|
$values['email'] = $email_tag;
|
||||||
$values['phone'] = $phone_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;
|
$result = false;
|
||||||
if ($values['name'] != '') {
|
if ($values['name'] != '') {
|
||||||
|
|
|
@ -2780,6 +2780,11 @@ function alerts_ui_update_or_create_actions($update=true)
|
||||||
if ($update) {
|
if ($update) {
|
||||||
$values['name'] = $name;
|
$values['name'] = $name;
|
||||||
$values['id_alert_command'] = $id_alert_command;
|
$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);
|
$result = (!$name) ? '' : alerts_update_alert_action($id, $values);
|
||||||
} else {
|
} else {
|
||||||
$name_check = db_get_value('name', 'talert_actions', 'name', $name);
|
$name_check = db_get_value('name', 'talert_actions', 'name', $name);
|
||||||
|
|
Loading…
Reference in New Issue