tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-06-16 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/functions_html.php, operation/reporting/reporting_xml.php,
	godmode/massive/massive_delete_action_alerts.php,
	godmode/massive/massive_add_action_alerts.php: cleaned source code, erased
	lost semicolons.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4511 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-07-05 14:38:02 +00:00
parent b2c7b96366
commit 68b60bde19
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-06-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, operation/reporting/reporting_xml.php,
godmode/massive/massive_delete_action_alerts.php,
godmode/massive/massive_add_action_alerts.php: cleaned source code, erased
lost semicolons.
2011-07-04 Sergio Martin <sergio.martin@artica.es> 2011-07-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_networkmap.php * include/functions_networkmap.php
@ -74,7 +81,6 @@
general/pandora_help.php general/pandora_help.php
general/logon_ok.php: Css style improvements. general/logon_ok.php: Css style improvements.
>>>>>>> .r4506
2011-06-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-06-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css * include/styles/pandora.css
@ -1448,7 +1454,6 @@
* pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the * pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the
table "tagente_datos_string". table "tagente_datos_string".
>>>>>>> .r4322
2011-05-06 Dario Rodriguez <dario.rodriguez@artica.es> 2011-05-06 Dario Rodriguez <dario.rodriguez@artica.es>
* include/graphs/functions_gd.php: Added new parameter to function * include/graphs/functions_gd.php: Added new parameter to function

4
pandora_console/godmode/massive/massive_add_action_alerts.php
View File

@ -49,7 +49,7 @@ if (is_ajax ()) {
$filter .= ' OR '; $filter .= ' OR ';
} }
$filter .= 'id_agent=' . $id_agent; $filter .= 'id_agent=' . $id_agent;
}; }
$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name')); $alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
echo json_encode (index_array ($alert_compounds, 'id', 'name')); echo json_encode (index_array ($alert_compounds, 'id', 'name'));
return; return;
@ -177,7 +177,7 @@ else {
$filter .= ' OR '; $filter .= ' OR ';
} }
$filter .= 'id_agent=' . $id_agent; $filter .= 'id_agent=' . $id_agent;
}; }
$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name')); $alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
} }
$table->data[3][0] = __('Alert compounds'); $table->data[3][0] = __('Alert compounds');

4
pandora_console/godmode/massive/massive_delete_action_alerts.php
View File

@ -48,7 +48,7 @@ if (is_ajax ()) {
$filter .= ' OR '; $filter .= ' OR ';
} }
$filter .= 'id_agent=' . $id_agent; $filter .= 'id_agent=' . $id_agent;
}; }
$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name')); $alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
echo json_encode (index_array ($alert_compounds, 'id', 'name')); echo json_encode (index_array ($alert_compounds, 'id', 'name'));
return; return;
@ -184,7 +184,7 @@ if (empty($id_agents)) {
$filter .= ' OR '; $filter .= ' OR ';
} }
$filter .= 'id_agent=' . $id_agent; $filter .= 'id_agent=' . $id_agent;
}; }
$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name')); $alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
} }
$table->data[3][0] = __('Alert compounds'); $table->data[3][0] = __('Alert compounds');

2
pandora_console/include/functions_html.php
View File

@ -1376,7 +1376,7 @@ function html_print_autocomplete_modules($name = 'module', $default = '', $id_ag
var text = document.createTextNode(str); var text = document.createTextNode(str);
div.appendChild(text); div.appendChild(text);
return div.innerHTML; return div.innerHTML;
}; }
$(document).ready (function () { $(document).ready (function () {
$("#text-<?php echo $name; ?>").autocomplete( $("#text-<?php echo $name; ?>").autocomplete(

2
pandora_console/operation/reporting/reporting_xml.php
View File

@ -169,7 +169,7 @@ $xml["group"]["name"] = io_safe_output_xml ($group_name);
if ($contents === false) { if ($contents === false) {
$contents = array (); $contents = array ();
}; }
xml_array ($xml); xml_array ($xml);