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

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

* godmode/alerts/alert_list.php: added request the search parameter.
	
	* godmode/alerts/alert_list.list.php: fixed recove lost source code for
	build $where var of old version of godmode/alerts/alert_list.php .



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2550 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-04-07 16:20:19 +00:00
parent 8ec3e9d945
commit 267f41182b
3 changed files with 33 additions and 2 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 @@
2010-04-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/alert_list.php: added request the search parameter.
* godmode/alerts/alert_list.list.php: fixed recove lost source code for
build $where var of old version of godmode/alerts/alert_list.php .
2010-04-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/alert_list.list.php: fixed the id of agent in source and

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

@ -41,7 +41,7 @@ echo "<div id='alert_control' style='display:none'>\n";
// Table for filter controls
echo '<form method="post" action="index.php?sec=galertas&amp;sec2=godmode/alerts/alert_list&amp;refr='.$config["refr"].'&amp;pure='.$config["pure"].'">';
echo "<input type='hidden' name='search' value='1' />\n";
echo '<table style="width: 550px;" cellpadding="4" cellspacing="4" class="databox">'."\n";
echo '<table style="width: 90%;" cellpadding="4" cellspacing="4" class="databox">'."\n";
echo "<tr>\n";
echo "<td>".__('Template name')."</td><td>";
print_input_text ('template_name', $templateName, '', 15);
@ -52,7 +52,7 @@ echo "<div id='alert_control' style='display:none'>\n";
$arrayAgents[$agentElement['id_agente']] = $agentElement['nombre'];
}
echo "<td>".__('Agents')."</td><td>";
echo print_input_text_extended ('agent_name', $agentName, 'text-agent_name', '', 25, 100, false, '',
echo print_input_text_extended ('agent_name', $agentName, 'text-agent_name', '', 15, 100, false, '',
array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
echo "</td>\n";
@ -97,6 +97,29 @@ $simple_alerts = array();
$total = 0;
$where = '';
if ($searchFlag) {
if ($priority != -1 )
$where .= " AND priority = " . $priority;
if (strlen(trim($templateName)) > 0)
$where .= " AND id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE '%" . trim($templateName) . "%')";
if (strlen(trim($fieldContent)) > 0)
$where .= " AND id_alert_template IN (SELECT id FROM talert_templates
WHERE field1 LIKE '%" . trim($fieldContent) . "%' OR field2 LIKE '%" . trim($fieldContent) . "%' OR
field3 LIKE '%" . trim($fieldContent) . "%' OR
field2_recovery LIKE '%" . trim($fieldContent) . "%' OR
field3_recovery LIKE '%" . trim($fieldContent) . "%')";
if (strlen(trim($moduleName)) > 0)
$where .= " AND id_agent_module IN (SELECT id_agente_modulo FROM tagente_modulo WHERE nombre LIKE '%" . trim($moduleName) . "%')";
//if ($agentID != -1)
//$where .= " AND id_agent_module IN (SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = " . $agentID . ")";
if (strlen(trim($agentName)) > 0)
$where .= " AND id_agent_module IN (SELECT t2.id_agente_modulo
FROM tagente AS t1 INNER JOIN tagente_modulo AS t2 ON t1.id_agente = t2.id_agente
WHERE t1.nombre LIKE '" . trim($agentName) . "')";
if ($actionID != -1)
$where .= " AND id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = " . $actionID . ")";
}
$total = get_agent_alerts_simple (array_keys ($agents), array('priority' => $priority),
false, $where, false, false, false, true);

1
pandora_console/godmode/alerts/alert_list.php
View File

@ -54,6 +54,7 @@ $actionID = get_parameter('action_id','');
$fieldContent = get_parameter('field_content','');
$searchType = get_parameter('search_type','');
$priority = get_parameter('priority','');
$searchFlag = get_parameter('search',0);
$messageAction = '';