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

2013-01-11 Ramon Novoa <rnovoa@artica.es> 

* godmode/setup/setup_netflow.php: Fixed a string.

	* include/functions_config.php,
	  operation/menu.php,
	  godmode/menu.php: Added support for the log viewer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-01-11 16:02:10 +00:00
parent 32c75af44f
commit f6549bfdf9
5 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-01-11 Ramon Novoa <rnovoa@artica.es>
* godmode/setup/setup_netflow.php: Fixed a string.
* include/functions_config.php,
operation/menu.php,
godmode/menu.php: Added support for the log viewer.
2013-01-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_component_groups.php

3
pandora_console/godmode/menu.php
View File

@ -208,6 +208,9 @@ if (check_acl ($config['id_user'], 0, "PM")) {
$sub["godmode/setup/file_manager"]["text"] = __('File manager');
if ($config['activate_netflow'])
$sub["godmode/setup/setup_netflow"]["text"] = __('Netflow');
if ($config['log_collector'] == 1) {
enterprise_hook ('log_collector_submenu');
}
if ($config['activate_gis'])
$sub["godmode/setup/gis"]["text"] = __('Map conections GIS');
$sub["godmode/setup/links"]["text"] = __('Links');

2
pandora_console/godmode/setup/setup_netflow.php
View File

@ -25,7 +25,7 @@ check_login ();
if (! check_acl ($config["id_user"], 0, "IR")) {
db_pandora_audit("ACL Violation",
"Trying to access event viewer");
"Trying to access netflow setup");
require ("general/noaccess.php");
return;
}

16
pandora_console/include/functions_config.php
View File

@ -69,7 +69,7 @@ function config_update_value ($token, $value) {
*/
function config_update_config () {
global $config;
/* If user is not even log it, don't try this */
if (! isset ($config['id_user']))
return false;
@ -135,7 +135,6 @@ function config_update_config () {
config_update_value ('replication_dbpass', (string)get_parameter('replication_dbpass'));
config_update_value ('replication_dbport', (string)get_parameter('replication_dbport'));
config_update_value ('replication_mode', (string)get_parameter('replication_mode'));
config_update_value ('public_url', get_parameter('public_url'));
config_update_value ('referer_security', get_parameter('referer_security'));
@ -153,6 +152,8 @@ function config_update_config () {
config_update_value ('enable_pass_history', get_parameter('enable_pass_history'));
config_update_value ('compare_pass', get_parameter('compare_pass'));
}
config_update_value ('log_collector', (bool)get_parameter('log_collector'));
/////////////
break;
case 'godmode/setup/setup_auth':
@ -302,6 +303,9 @@ function config_update_config () {
config_update_value ('netflow_nfdump', get_parameter ('netflow_nfdump'));
config_update_value ('netflow_max_resolution', get_parameter ('netflow_max_resolution'));
break;
case 'enterprise/godmode/setup/setup_log_collector':
config_update_value ('log_dir', (string)get_parameter('log_dir'));
break;
}
enterprise_include_once('include/functions_policies.php');
@ -474,6 +478,14 @@ function config_process_config () {
config_update_value ('replication_mode', "only_validated");
}
if (!isset ($config["log_collector"])) {
config_update_value ('log_collector', 0);
}
if (!isset ($config["log_dir"])) {
config_update_value ('log_dir', '/var/spool/pandora/data_in/log');
}
if (!isset ($config["font_size"])) {
config_update_value ('font_size', 6);
}

3
pandora_console/operation/menu.php
View File

@ -64,6 +64,9 @@ if (check_acl ($config['id_user'], 0, "AR")) {
$sub["operation/servers/recon_view"]["text"] = __('Recon view');
$sub["operation/servers/recon_view"]["refr"] = 0;
if ($config['log_collector'] == 1) {
enterprise_hook ('log_collector_menu');
}
//SNMP Console
$sub["operation/snmpconsole/snmp_view"]["text"] = __('SNMP console');