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

Merge branch 'develop' of github.com:pandorafms/pandorafms into develop

This commit is contained in:
mdtrooper 2014-09-02 16:43:37 +02:00
parent 6a74af80ec ab58d1e4f5
commit 43bdb38d11
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extras/build_vars.sh
View File

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
CODEHOME=/root/code/pandora/trunk CODEHOME=/root/code/pandorafms
CODEHOME_ENT=/root/code/artica/code CODEHOME_ENT=/root/code/pandora_enterprise
PANDHOME_ENT=$CODEHOME_ENT/pandora/trunk PANDHOME_ENT=$CODEHOME_ENT
RPMHOME=/usr/src/packages RPMHOME=/usr/src/packages
VERSION=$(grep 'my $pandora_version =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') VERSION=$(grep 'my $pandora_version =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}')
BUILD=$(grep 'my $pandora_build =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') BUILD=$(grep 'my $pandora_build =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}')
X86_64=`uname -m | grep x86_64` X86_64=`uname -m | grep x86_64`
CONSOLEHOME=$CODEHOME/pandora_console CONSOLEHOME=$CODEHOME/pandora_console
CONSOLEHOME_ENT=$PANDHOME_ENT/pandora_console CONSOLEHOME_ENT=$CODEHOME_ENT/pandora_console

11
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -997,7 +997,7 @@ else {
foreach ($other_actions as $action) { foreach ($other_actions as $action) {
$data[1] .= '<tr>'; $data[1] .= '<tr>';
$data[1] .= '<td>'. alerts_get_alert_action_name ($action["alert_type"]).'</td>'; $data[1] .= '<td>'. alerts_get_alert_action_name ($action["alert_type"]).'</td>';
$data[1] .= '<td> <a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_action=1&action_id='.$action['id'].'"> ' . $data[1] .= '<td> <a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_action=1&action_id='.$action['id'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">' .
html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a> </td>'; html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a> </td>';
$data[1] .= '</tr>'; $data[1] .= '</tr>';
} }
@ -1026,7 +1026,7 @@ else {
'<a href="javascript:show_add_action_snmp(\'' . $row['id_as'] . '\');">' . '<a href="javascript:show_add_action_snmp(\'' . $row['id_as'] . '\');">' .
html_print_image('images/add.png', true, array('title' => __("Add action"))) . html_print_image('images/add.png', true, array('title' => __("Add action"))) .
'</a>' . '</a>' .
'<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">' . '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">' .
html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>'; html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>';
@ -1233,6 +1233,13 @@ $(document).ready (function () {
// Charge the fields of the action // Charge the fields of the action
$("#alert_type").trigger('change'); $("#alert_type").trigger('change');
$("#submit-delete_button").click (function () {
confirmation = confirm("<?php echo __('Are you sure?'); ?>");
if (!confirmation) {
return;
}
});
}); });