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

2013-01-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_modules.php
	godmode/extensions.php
	godmode/agentes/configurar_agente.php
	godmode/servers/manage_recontask.php: Merged fixes from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2013-01-14 09:51:44 +00:00
parent f6549bfdf9
commit 326d90f985
5 changed files with 26 additions and 1 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 @@
2013-01-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_modules.php
godmode/extensions.php
godmode/agentes/configurar_agente.php
godmode/servers/manage_recontask.php: Merged fixes from branches.
2013-01-11 Ramon Novoa <rnovoa@artica.es>
* godmode/setup/setup_netflow.php: Fixed a string.

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

@ -693,6 +693,10 @@ if ($update_module || $create_module) {
$tcp_send = (string) get_parameter ('tcp_send');
$tcp_rcv = (string) get_parameter ('tcp_rcv');
$tcp_port = (int) get_parameter ('tcp_port');
// Correction in order to not insert 0 as port
$is_port_empty = get_parameter ('tcp_port');
if (empty($is_port_empty))
$tcp_port = NULL;
$configuration_data = (string) get_parameter ('configuration_data');
$old_configuration_data = (string) get_parameter ('old_configuration_data');
$new_configuration_data = '';

2
pandora_console/godmode/extensions.php
View File

@ -218,7 +218,7 @@ foreach ($extensions as $file => $extension) {
$data[] = $config['extensions'][$file]['operation_menu']['version'];
} else if ($config['extensions'][$file]['godmode_menu']) {
$data[] = $config['extensions'][$file]['godmode_menu']['version'];
} else if ($config['extensions'][$file]['extension_ope_tab']) {
} else if (isset($config['extensions'][$file]['extension_ope_tab'])) {
$data[] = $config['extensions'][$file]['extension_ope_tab']['version'];
} else if ($config['extensions'][$file]['extension_god_tab']) {
$data[] = $config['extensions'][$file]['extension_god_tab']['version'];

6
pandora_console/godmode/servers/manage_recontask.php
View File

@ -127,12 +127,15 @@ if (isset($_GET["update"])) {
$where = array('id_rt' => $id);
$reason = '';
if ($name != "") {
if (($id_recon_script == 'NULL') && preg_match("/[0-9]+.+[0-9]+.+[0-9]+.+[0-9]+\/+[0-9]/", $network))
$result = db_process_sql_update('trecon_task', $values, $where);
elseif ($id_recon_script != 'NULL')
$result = db_process_sql_update('trecon_task', $values, $where);
else {
if (!preg_match("/[0-9]+.+[0-9]+.+[0-9]+.+[0-9]+\/+[0-9]/", $network))
$reason = __('Incorrect format in Subnet field');
$result = false;
}
}
@ -144,6 +147,7 @@ if (isset($_GET["update"])) {
}
else {
echo '<h3 class="error">'.__('Error updating recon task').'</h3>';
echo $reason;
}
}
@ -185,6 +189,8 @@ if (isset($_GET["create"])) {
$result = db_process_sql_insert('trecon_task', $values);
}
else {
if (!preg_match("/[0-9]+.+[0-9]+.+[0-9]+.+[0-9]+\/+[0-9]/", $network))
$reason = __('Incorrect format in Subnet field');
$result = false;
}
}

8
pandora_console/include/functions_modules.php
View File

@ -167,6 +167,14 @@ function modules_copy_agent_module_to_agent ($id_agent_module, $id_destiny_agent
}
}
// Copy module tags
$source_tags = tags_get_module_tags($id_agent_module);
if ($source_tags == false)
$source_tags = array();
tags_insert_module_tag($id_new_module, $source_tags);
//Added the config data if necesary
enterprise_include_once('include/functions_config_agents.php');