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

2011-07-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/alerts/alert_list.list.php
	include/functions_ui.php: Changed length on module name and template
	column in function ui_format_alert_row().

	Fixes: #3302292



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4561 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-07-14 09:34:11 +00:00
parent 777a26c314
commit 297fab6bb3
3 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-07-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/alerts/alert_list.list.php
include/functions_ui.php: Changed length on module name and template
column in function ui_format_alert_row().
Fixes: #3302292
2011-07-14 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_prediction.php

39
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -384,30 +384,6 @@ foreach ($simple_alerts as $alert) {
$data = array ();
/* $data[0] = '<form class="disable_alert_form" method="post" style="display: inline;">';
if ($alert['disabled']) {
$data[0] .= html_print_input_image ('enable', 'images/lightbulb_off.png', 1, '', true);
$data[0] .= html_print_input_hidden ('enable_alert', 1, true);
}
else {
$data[0] .= html_print_input_image ('disable', 'images/lightbulb.png', 1, '', true);
$data[0] .= html_print_input_hidden ('disable_alert', 1, true);
}
$data[0] .= html_print_input_hidden ('id_alert', $alert['id'], true);
$data[0] .= '</form>';
$data[1] = '<form class="standby_alert_form" method="post" style="display: inline;">';
if (!$alert['standby']) {
$data[1] .= html_print_input_image ('standby_off', 'images/bell.png', 1, '', true);
$data[1] .= html_print_input_hidden ('standbyon_alert', 1, true);
}
else {
$data[1] .= html_print_input_image ('standby_on', 'images/bell_pause.png', 1, '', true);
$data[1] .= html_print_input_hidden ('standbyoff_alert', 1, true);
}
$data[1] .= html_print_input_hidden ('id_alert', $alert['id'], true);
$data[1] .= '</form>'; */
if (! $id_agente) {
$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
$data[0] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agent.'">';
@ -426,20 +402,7 @@ foreach ($simple_alerts as $alert) {
$data[2] .= "<a href='index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id=".$alert['id_alert_template']."'>";
$data[2] .= ui_print_truncate_text(alerts_get_alert_template_name ($alert['id_alert_template']), 55, false, true, true, '[&hellip;]', 'font-size: 7.1pt');
$data[2] .= "</a>";
/* if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$policyInfo = policies_is_alert_in_policy2($alert['id'], false);
if ($policyInfo === false)
$data[5] = '';
else {
$img = 'images/policies.png';
$data[5] = '<a href="?sec=gpolicies&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id'] . '">' .
html_print_image($img,true, array('title' => $policyInfo['name'])) .
'</a>';
}
} */
$actions = alerts_get_alert_agent_module_actions ($alert['id']);
$data[3] = '';

6
pandora_console/include/functions_ui.php
View File

@ -553,7 +553,7 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
}
}
elseif ($agent == 0) {
$data[$index['module_name']] .= mb_substr (modules_get_agentmodule_name ($alert["id_agent_module"]), 0, 20);
$data[$index['module_name']] .= ui_print_truncate_text(modules_get_agentmodule_name ($alert["id_agent_module"]), 30, false, true, true, '[&hellip;]', 'font-size: 7.2pt');
}
else {
if ($agent_style !== false) {
@ -562,7 +562,7 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
else {
$data[$index['agent_name']] .= ui_print_agent_name (modules_get_agentmodule_agent ($alert["id_agent_module"]), true, 20, $styleDisabled);
}
$data[$index['module_name']] = mb_substr (modules_get_agentmodule_name ($alert["id_agent_module"]), 0, 20);
$data[$index['module_name']] = ui_print_truncate_text (modules_get_agentmodule_name ($alert["id_agent_module"]), 30, false, true, true, '[&hellip;]', 'font-size: 7.2pt');
}
$data[$index['agent_name']] .= $disabledHtmlEnd;
@ -577,7 +577,7 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
else {
$actionDefault = db_get_value_sql("SELECT id_alert_action FROM talert_compound_actions WHERE id_alert_compound = " . $alert['id']);
}
$data[$index['description']] .= $disabledHtmlStart . mb_substr (io_safe_input ($description), 0, 35) . $disabledHtmlEnd;
$data[$index['description']] .= $disabledHtmlStart . ui_print_truncate_text (io_safe_input ($description), 35, false, true, true, '[&hellip;]', 'font-size: 7.1pt') . $disabledHtmlEnd;
$actions = alerts_get_alert_agent_module_actions ($alert['id'], false, $compound);