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

Fixed the form to search modules in an agent. TICKET: #3071

This commit is contained in:
mdtrooper 2015-12-30 11:16:11 +01:00
parent 655150a7ae
commit 96f77c7595
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -190,12 +190,16 @@ if ($create_agent) {
$id_agente = db_process_sql_insert ('tagente',
array ('nombre' => $nombre_agente,
'direccion' => $direccion_agente,
'id_grupo' => $grupo, 'intervalo' => $intervalo,
'comentarios' => $comentarios, 'modo' => $modo,
'id_os' => $id_os, 'disabled' => $disabled,
'id_grupo' => $grupo,
'intervalo' => $intervalo,
'comentarios' => $comentarios,
'modo' => $modo,
'id_os' => $id_os,
'disabled' => $disabled,
'cascade_protection' => $cascade_protection,
'server_name' => $server_name,
'id_parent' => $id_parent, 'custom_id' => $custom_id,
'id_parent' => $id_parent,
'custom_id' => $custom_id,
'icon_path' => $icon_path,
'update_gis_data' => $update_gis_data,
'url_address' => $url_description,
@ -736,11 +740,11 @@ if ($update_agent) { // if modified some agent paramenter
'url_address' => $url_description,
'url_address' => $url_description,
'quiet' => $quiet);
if ($config['metaconsole_agent_cache'] == 1) {
$values['update_module_count'] = 1; // Force an update of the agent cache.
}
$result = db_process_sql_update ('tagente', $values, array ('id_agente' => $id_agente));
if ($result === false) {
ui_print_error_message(
@ -838,7 +842,7 @@ if ($update_module || $create_module) {
// Don't read as (float) because it lost it's decimals when put into MySQL
// where are very big and PHP uses scientific notation, p.e:
// 1.23E-10 is 0.000000000123
$post_process = (string) get_parameter ('post_process', 0.0);
//$prediction_module = 0;
@ -1594,7 +1598,7 @@ switch ($tab) {
// Control the tab and subtab hover. When mouse leave one,
// check if is hover the other before hide the subtab
$('.agent_wizard_tab').hover(agent_wizard_tab_show, agent_wizard_tab_hide);
});
// Set the position and width of the subtab

8
pandora_console/godmode/agentes/module_manager.php
View File

@ -99,6 +99,8 @@ if (!isset($policy_page))
$show_creation = false;
echo "</form>";
if (($policy_page) || (isset($agent))) {
if ($policy_page) {
$show_creation = true;
@ -110,7 +112,7 @@ if (($policy_page) || (isset($agent))) {
if ($show_creation) {
// Create module/type combo
//echo '<form id="create_module_type" method="post" action="'.$url.'">';
echo '<form id="create_module_type" method="post" action="'.$url.'">';
echo '<td class="datos" style="font-weight: bold;">';
echo __("Type");
html_print_select ($modules, 'moduletype', '', '', '', '', false, false, false, '', false, 'max-width:300px;' );
@ -120,12 +122,12 @@ if (($policy_page) || (isset($agent))) {
echo '<input align="right" name="updbutton" type="submit" class="sub next" value="'.__('Create').'">';
echo '</td>';
echo '</tr>';
//echo "</form>";
echo "</form>";
}
}
echo "</table>";
echo "</form>";
echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
echo "<strong>";

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

@ -61,7 +61,7 @@ foreach ($reports as $report) {
$data[2] = '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'">' .
html_print_image("images/reporting.png", true) . '</a>';
$data[3] = '<a href="ajax.php?page=operation/reporting/reporting_xml&id='.$report['id_report'].'">' . html_print_image("images/database_lightning.png", true) . '</a>'; //I chose ajax.php because it's supposed to give XML anyway
enterprise_hook ('load_custom_reporting_2');
array_push ($table->data, $data);
}