2010-06-09 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Fixed errors of parameters for bug 3013419 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2885 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
ed231e4ea7
commit
ba5ce80035
|
@ -1,3 +1,8 @@
|
||||||
|
2010-06-09 Sergio Martin <sergio.martin@artica.es>
|
||||||
|
|
||||||
|
* util/pandora_manage.pl: Fixed errors of parameters
|
||||||
|
for bug 3013419
|
||||||
|
|
||||||
2010-06-08 Ramon Novoa <rnovoa@artica.es>
|
2010-06-08 Ramon Novoa <rnovoa@artica.es>
|
||||||
|
|
||||||
* DEBIAN/control, DEBIAN/make_deb_package.sh,
|
* DEBIAN/control, DEBIAN/make_deb_package.sh,
|
||||||
|
|
|
@ -43,7 +43,7 @@ my %conf;
|
||||||
$| = 0;
|
$| = 0;
|
||||||
|
|
||||||
# Init
|
# Init
|
||||||
pandora_init(\%conf);
|
pandora_manage_init(\%conf);
|
||||||
|
|
||||||
# Read config file
|
# Read config file
|
||||||
pandora_load_config (\%conf);
|
pandora_load_config (\%conf);
|
||||||
|
@ -155,7 +155,7 @@ sub pandora_enable_group ($$$) {
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Init screen
|
# Init screen
|
||||||
##############################################################################
|
##############################################################################
|
||||||
sub pandora_init ($) {
|
sub pandora_manage_init ($) {
|
||||||
my $conf = shift;
|
my $conf = shift;
|
||||||
|
|
||||||
$conf->{"verbosity"}=0; # Verbose 1 by default
|
$conf->{"verbosity"}=0; # Verbose 1 by default
|
||||||
|
@ -236,18 +236,6 @@ sub pandora_delete_template_module ($$) {
|
||||||
db_do ($dbh, 'DELETE FROM talert_template_module_actions WHERE id_alert_template_module = ?', $template_module_id);
|
db_do ($dbh, 'DELETE FROM talert_template_module_actions WHERE id_alert_template_module = ?', $template_module_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
##########################################################################
|
|
||||||
## Asociate a module to a template.
|
|
||||||
##########################################################################
|
|
||||||
sub pandora_create_template_module_action ($$$) {
|
|
||||||
my ($dbh, $module_id, $template_id, $action_id) = @_;
|
|
||||||
|
|
||||||
my $template_module_id = get_template_module_id ($dbh, $module_id, $template_id);
|
|
||||||
return -1 if ($template_module_id == -1);
|
|
||||||
|
|
||||||
return db_insert ($dbh, 'INSERT INTO talert_template_module_actions (id_alert_template_module, id_alert_action) VALUES (?, ?, ?)', $template_module_id, $template_id, $action_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
## Asociate a module to a template.
|
## Asociate a module to a template.
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
@ -299,15 +287,6 @@ sub pandora_create_template_module_action ($$$$$) {
|
||||||
return db_insert ($dbh, 'INSERT INTO talert_template_module_actions (id_alert_template_module, id_alert_action, fires_min, fires_max) VALUES (?, ?, ?, ?)', $template_module_id, $action_id, $fires_min, $fires_max);
|
return db_insert ($dbh, 'INSERT INTO talert_template_module_actions (id_alert_template_module, id_alert_action, fires_min, fires_max) VALUES (?, ?, ?, ?)', $template_module_id, $action_id, $fires_min, $fires_max);
|
||||||
}
|
}
|
||||||
|
|
||||||
##########################################################################
|
|
||||||
## Asociate a module to a template.
|
|
||||||
##########################################################################
|
|
||||||
sub pandora_delete_template_module_action ($$$) {
|
|
||||||
my ($dbh, $template_module_id, $action_id) = @_;
|
|
||||||
|
|
||||||
return db_do ($dbh, 'DELETE FROM talert_template_module_actions WHERE id_alert_template_module = ? AND id_alert_action = ?', $template_module_id, $action_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
## Assign a profile to the given user/group.
|
## Assign a profile to the given user/group.
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
|
Loading…
Reference in New Issue