tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-04-07 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/alerts/alert_list.list.php: fixed the id of agent in source and
	now hide the column agent in list when the edit alerts is in the agent
	configuration. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2549 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-04-07 15:58:44 +00:00
parent 63e0e0c336
commit c923cb9844
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2010-04-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/alert_list.list.php: fixed the id of agent in source and
now hide the column agent in list when the edit alerts is in the agent
configuration.
2010-04-07 Miguel de Dios <miguel.dedios@artica.es> 2010-04-07 Miguel de Dios <miguel.dedios@artica.es>
* ChangeLog: fixed date of last commit. * ChangeLog: fixed date of last commit.

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

@ -25,9 +25,7 @@ if (! give_acl ($config['id_user'], 0, "LW")) {
exit; exit;
} }
$id_group = 0;
/* Check if this page is included from a agent edition */ /* Check if this page is included from a agent edition */
$id_agente = 0;
if (! give_acl ($config['id_user'], 0, "LW")) { if (! give_acl ($config['id_user'], 0, "LW")) {
audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation",
@ -112,18 +110,29 @@ $table->width = '90%';
$table->size = array (); $table->size = array ();
$table->head = array (); $table->head = array ();
$table->head[0] = "<span title='" . __('Enabled / Disabled') . "'>" . __('E/D') . "</span>"; $table->head[0] = "<span title='" . __('Enabled / Disabled') . "'>" . __('E/D') . "</span>";
if (! $id_agente) {
$table->style = array (); $table->style = array ();
$table->style[1] = 'font-weight: bold'; $table->style[1] = 'font-weight: bold';
$table->head[1] = __('Agent'); $table->head[1] = __('Agent');
$table->size[0] = '20px'; $table->size[0] = '20px';
$table->size[1] = '15%'; $table->size[1] = '15%';
$table->size[2] = '20%'; $table->size[2] = '20%';
$table->size[3] = '15%'; $table->size[3] = '15%';
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->size[4] = '20px'; $table->size[4] = '20px';
}
$table->size[5] = '50%';
}
else {
/* Different sizes or the layout screws up */
$table->size[0] = '20px';
$table->size[2] = '30%';
$table->size[3] = '20%';
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->size[4] = '20px';
}
$table->size[5] = '50%';
} }
$table->size[5] = '50%';
$table->head[2] = __('Module'); $table->head[2] = __('Module');
$table->head[3] = __('Template'); $table->head[3] = __('Template');
@ -165,16 +174,16 @@ foreach ($simple_alerts as $alert) {
} }
$data[0] .= print_input_hidden ('id_alert', $alert['id'], true); $data[0] .= print_input_hidden ('id_alert', $alert['id'], true);
$data[0] .= '</form>'; $data[0] .= '</form>';
if (! $id_agente) {
$id_agent = get_agentmodule_agent ($alert['id_agent_module']); $id_agent = get_agentmodule_agent ($alert['id_agent_module']);
$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agent.'">'; $data[1] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agent.'">';
if ($alert['disabled']) if ($alert['disabled'])
$data[1] .= '<span style="font-style: italic; color: #aaaaaa;">'; $data[1] .= '<span style="font-style: italic; color: #aaaaaa;">';
$data[1] .= get_agent_name ($id_agent); $data[1] .= get_agent_name ($id_agent);
if ($alert['disabled']) if ($alert['disabled'])
$data[1] .= '</span>'; $data[1] .= '</span>';
$data[1] .= '</a>'; $data[1] .= '</a>';
}
$data[2] = get_agentmodule_name ($alert['id_agent_module']); $data[2] = get_agentmodule_name ($alert['id_agent_module']);
$data[3] = ' <a class="template_details" $data[3] = ' <a class="template_details"
href="ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$alert['id_alert_template'].'"> href="ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$alert['id_alert_template'].'">