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

2013-04-24 Sergio Martin <sergio.martin@artica.es> 

* godmode/servers/servers.build_table.php
	godmode/servers/modificar_server.php: Rewrite missed
	servers buttons in last huge merge. Add success/error
	messages on this actions



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8041 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-04-24 09:17:53 +00:00
parent 62a10bfaf8
commit 5df3aa6bce
3 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-04-24 Sergio Martin <sergio.martin@artica.es>
* godmode/servers/servers.build_table.php
godmode/servers/modificar_server.php: Rewrite missed
servers buttons in last huge merge. Add success/error
messages on this actions
2013-04-23 Sergio Martin <sergio.martin@artica.es>
* include/styles/dialog.css

18
pandora_console/godmode/servers/modificar_server.php
View File

@ -58,12 +58,26 @@ else {
// Move SNMP modules back to the enterprise server
if (isset($_GET["server_reset_snmp_enterprise"])) {
db_process_sql ("UPDATE tagente_estado SET last_error=0");
$result = db_process_sql ("UPDATE tagente_estado SET last_error=0");
if($result === false) {
ui_print_error_message(__('Unsuccessfull action'));
}
else {
ui_print_success_message(__('Successfully action'));
}
}
// Move SNMP modules back to the enterprise server
if (isset($_GET["server_reset_counts"])) {
db_process_sql ("UPDATE tagente SET update_module_count=1, update_alert_count=1");
$reslt = db_process_sql ("UPDATE tagente SET update_module_count=1, update_alert_count=1");
if($result === false) {
ui_print_error_message(__('Unsuccessfull action'));
}
else {
ui_print_success_message(__('Successfully action'));
}
}
if (isset ($_GET["delete"])) {

37
pandora_console/godmode/servers/servers.build_table.php
View File

@ -108,18 +108,31 @@ foreach ($servers as $server) {
$data[6] = $server['threads'].' : '.$server['queued_modules'];
$data[7] = ui_print_timestamp ($server['keepalive'], true);
//Only Pandora Administrator can delete servers
if (check_acl ($config["id_user"], 0, "PM")) {
$data[8] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server["id_server"].'">';
$data[8] .= html_print_image ('images/config.png', true,
array('title' => __('Edit')));
$data[8] .= '</a>';
$data[8] .= '&nbsp;&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
$data[8] .= html_print_image ('images/cross.png', true,
array('title' => __('Delete'),
'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
$data[8] .= '</a>';
//Only Pandora Administrator can delete servers
if (check_acl ($config["id_user"], 0, "PM")) {
$data[8] = '';
if ($server['type'] == 'data') {
$data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server["id_server"].'">';
$data[8] .= html_print_image ('images/target.png', true,
array('title' => __('Reset module status and fired alert counts')));
$data[8] .= '</a>&nbsp;&nbsp;';
} else if ($server['type'] == 'enterprise snmp') {
$data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server["id_server"].'">';
$data[8] .= html_print_image ('images/target.png', true,
array('title' => __('Claim back SNMP modules')));
$data[8] .= '</a>&nbsp;&nbsp;';
}
$data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server["id_server"].'">';
$data[8] .= html_print_image ('images/config.png', true,
array('title' => __('Edit')));
$data[8] .= '</a>';
$data[8] .= '&nbsp;&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
$data[8] .= html_print_image ('images/cross.png', true,
array('title' => __('Delete'),
'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
$data[8] .= '</a>';
}
if($tiny) {