Commit Graph

6121 Commits

Author SHA1 Message Date
zarzuelo 484e7787e9 2012-12-12 Sergio Martin <sergio.martin@artica.es>
* include/functions_config.php: Added configuration
	parameters for the events replication



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7264 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-12 09:35:40 +00:00
hkosaka 333b9beb1c 2012-12-12 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/module_manager_editor.php: Fixed a bug only
	for the Enterprise version.  When 'Remote Configuration' is
	enabled and you try to create new module, which name includes
	meta characters, you will get the error "The field name and
	name in module_name in data configuration are different."

	Merged from branch 4.x.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7263 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-12 03:37:54 +00:00
juanmanuelr 8f88287bdf 2012-12-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/agent.php
	include/functions_ui.php
	include/javascript/pandora.js
	godmode/alerts/alert_list.list.php
	godmode/alerts/alert_list.php
	godmode/alerts/alert_list.builder.php
	godmode/users/user_list.php
	godmode/users/profile_list.php
	godmode/users/configure_user.php
	godmode/users/configure_profile.php: Added user and alert editor
	in metaconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7261 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-11 17:39:48 +00:00
Ramon Novoa aa6dfd35e0 2012-12-11 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Added a new way of retrieving netflow
	  data using multiple calls to nfdump that vastly improves the
	  performance of netfow data charts.

	* operation/netflow/nf_live_view.php: Check that the nfdump binary
	  exists.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7260 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-11 16:43:29 +00:00
zarzuelo 2cd441a06c 012-12-11 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php
	include/functions.php
	include/functions_config.php
	godmode/setup/setup_visuals.php: Add interval values
	configuration into visual setup and limit the 
	advanced control of interval combos only for
	administrators



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7259 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-11 16:20:10 +00:00
mdtrooper 57be759cea 2012-12-11 Miguel de Dios <miguel.dedios@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql, pandoradb.sql,
	pandoradb.postgreSQL.sql, pandoradb.oracle.sql: in the table
	"tlayout_data" added the column "id_metaconsole" for to show
	visualmaps in the metaconsole.
	
	* operation/visual_console/render_view.php,
	include/functions_visual_map.php, operation/agentes/ver_agente.php,
	godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.php,
	godmode/reporting/visual_console_builder.data.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.elements.php,
	godmode/reporting/visual_console_builder.editor.php,
	godmode/reporting/map_builder.php,
	include/ajax/visual_console_builder.ajax.php,
	include/ajax/agent.php, include/functions_visual_map_editor.php,
	
	
	* operation/agentes/datos_agente.php,
	include/functions_netflow.php: cleaned source code style.
	
	* include/functions_ui.php: in function 
	"ui_require_javascript_file_enterprise" fixed when need a
	enterprise javascript instead metaconsole enterprise path.
	
	* include/javascript/pandora.js: fixed the function
	"agent_changed_by_multiple_agents" that needs in the metaconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7258 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-11 15:01:45 +00:00
juanmanuelr 602928a927 2012-12-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_groups.php: Fixed propagate parameter in 
	function groups_get_parent.
	* extensions/update_manager.php: Check UM is installed. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7256 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-11 12:32:42 +00:00
zarzuelo 4d4df77228 2012-12-11 Sergio Martin <sergio.martin@artica.es>
* include/functions_network_components.php: Improve 
	network component retrieving to get the category name too



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7255 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-11 11:35:08 +00:00
zarzuelo a47a9f49a5 2012-12-11 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php
	godmode/agentes/module_manager_editor.php: Fix tags and 
	latest fields on web modules editor



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7254 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-11 09:45:38 +00:00
slerena e0b45d88a7 2012-12-10 Sancho Lerena <slerena@artica.es>
* pandoradb.sql: removed utimestamp index on tsesion.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7253 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 19:22:56 +00:00
slerena 2937edaff3 2012-12-10 Sancho Lerena <slerena@artica.es>
* include/config_process.php,
        install.php,
        index.php: Version build update.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7250 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 19:14:42 +00:00
slerena 6aebffcaab 2012-12-10 Sancho Lerena <slerena@artica.es>
* Core.pm: Applied patch 3576115 from Axel: implemented maintance
        priority from events coming from recovery alerts.

        * Tool.pm: Decode output in all logfile output.

        * Config.pm: Updated version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7249 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 19:09:58 +00:00
zarzuelo c94f05b2e4 2012-12-10 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js
	godmode/agentes/module_manager_editor_common.php
	godmode/modules/manage_network_components_form.php
	godmode/modules/manage_network_components_form_common.php
	godmode/modules/manage_network_components.php: Added tags support
	to the network components



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7248 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 18:04:27 +00:00
juanmanuelr b60a8143d6 2012-12-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb_data.sql
	 pandoradb.sql
	 pandoradb.postgreSQL.sql
	 pandoradb.oracle.sql
	 extensions/update_manager.php
	 pandoradb.data.postgreSQL.sql
	 pandoradb.data.oracle.sql: Added table tupdate_settings;



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7246 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 15:52:51 +00:00
mdtrooper 7df32abae4 i2012-12-10 Miguel de Dios <miguel.dedios@artica.es>
* db/mysql.php: finish to fixed the insert in the metaconsoles.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7245 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 14:58:05 +00:00
zarzuelo b6f9867ef0 2012-12-10 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added
	tags column to the network components table



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7244 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 10:50:20 +00:00
slerena 001ee125ac 2012-12-09 Sancho Lerena <slerena@artica.es>
* pandoradb.sql: Replaced ^---.. comments with "-- -.." to avoid problems
	with MySQL 5.0.x
	
	* include/config_process.php: Fixed some problems with default timezone, because
	config function was called before timezone was setup.
	
	* include/styles/pandora.css: Added new style for netflow report render (HTML).
	
	* include/functions_netflow.php: Replaced some code for use new CSS styles.
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7243 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-10 00:05:09 +00:00
slerena 74634b8676 2012-12-09 Sancho Lerena <slerena@artica.es>
Ported new feature (Command Snapshot) from 4.0.3 code.

        *  include/javascript/pandora.js: Added new javascript function
        to open a generic URL with custom width / height.

        * operation/agentes/snapshot_view.php: New feature for command
        snapshot rendering.

        * operation/agentes/datos_agente.php,
        operation/agentes/estado_monitores.php: Changes for new feature
        command snapshot monitoring.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7242 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-09 22:31:29 +00:00
jsatoh 8286587bcb 2012-12-09 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/tentacle_server: Changed how to get pid of tentacle_server
	strictly. Updated year.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7241 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-09 14:36:49 +00:00
Ramon Novoa ad677e2cc5 2012-12-07 Sergio Martin <sergio.martin@artica.es>
* include/functions_categories.php: Add categories
	  library of functions



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7240 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-07 14:43:53 +00:00
zarzuelo eb8f66da1e 2012-12-07 Sergio Martin <sergio.martin@artica.es>
* include/functions_categories.php: Add categories
	library of functions



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7239 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-07 14:30:16 +00:00
zarzuelo 1bb1011868 2012-12-07 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/configurar_agente.php
	godmode/modules/manage_network_components_form.php
	godmode/modules/manage_network_components_form_common.php
	godmode/modules/manage_network_components.php: Added id_category
	to network components and module editors



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7238 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-07 14:25:40 +00:00
Ramon Novoa 6e8de73ca5 2012-12-07 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_reporting.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_live_view.php: Aesthetic fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7237 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-07 14:03:00 +00:00
jsatoh 0a816a4376 2012-12-07 Junichi Satoh <junichi@rworks.jp>
* index.php: Fixed undefined function error in case of login
	failures without enterprise.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7236 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-07 06:36:22 +00:00
mdtrooper a495c5e7b1 2012-12-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php, include/functions_html.php,
	include/functions_netflow.php: cleaned source code style.
	
	* include/db/mysql.php: fixed into the function
	"mysql_db_process_sql" a big bug that runs fine the select querys in
	a metaconsole enviorement with several DBs but the insert querys
	make in the previous connection.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7235 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-06 18:12:28 +00:00
mdtrooper 1f4a1a3db6 2012-12-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php,
	operation/integria_incidents/incident.php,
	godmode/massive/massive_delete_modules.php,
	godmode/modules/manage_network_templates_form.php,
	godmode/modules/manage_network_components_form_plugin.php,
	godmode/agentes/fields_manager.php,
	godmode/agentes/module_manager.php, godmode/users/profile_list.php,
	godmode/events/event_filter.php: cleaned source code style.
	
	* operation/tree.php: fixed the url to childrem consoles from the
	metaconsole tree.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7234 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-06 12:52:01 +00:00
Ramon Novoa 278f4ee169 2012-12-05 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql,
	  include/functions_config.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_live_view.php,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql,
	  godmode/setup/setup_netflow.php,
	  godmode/netflow/nf_edit_form.php: Performance improvements. Use csv
	  output to avoid using regular expressions. Removed byte, flow and
	  packet unit and added kilobyte, megabyte, kilobytes per second and
	  megabytes per second.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7232 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-05 17:29:06 +00:00
zarzuelo a973eec629 2012-12-05 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php
	godmode/agentes/configurar_agente.php
	godmode/agentes/module_manager_editor.php
	godmode/menu.php
	godmode/category
	godmode/category/category.php
	godmode/category/edit_category.php: Add categories editor
	and the category combo in the modules editor



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-05 17:02:47 +00:00
mdtrooper fbdc052f00 2012-12-05 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/libupdate_manager_client.php,
	extensions/update_manager/lib/libupdate_manager.php,
	operation/agentes/ver_agente.php,
	operation/agentes/status_monitor.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/estado_agente.php,
	operation/integria_incidents/incident.php,
	operation/reporting/reporting_xml.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.elements.php,
	include/functions_visual_map.php,
	include/functions_visual_map_editor.php: uploaded the changes of
	source code style previous to my next commit for to make the next
	commit more easy.
	
	* godmode/reporting/visual_console_builder.php: set empty string
	for the new visualmap.
	
	* include/ajax/visual_console_builder.ajax.php: fixed the regular
	expresion to extract the url for the graph.
	
	* include/functions_html.php: fixed into the function
	"html_print_select_groups" lost code for to show the selectbox.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7230 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-05 14:20:47 +00:00
zarzuelo f3922dda7f 2012-12-05 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added
	database structure for new feature "module categories"



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7229 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-05 12:55:44 +00:00
zarzuelo 8a7c2b9a76 2012-12-05 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fix a statistics bug on
	compared graphs merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7228 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-05 11:41:52 +00:00
zarzuelo b843bb4131 2012-12-04 Sergio Martin <sergio.martin@artica.es>
* extensions/dbmanager.php
	godmode/servers/recon_script.php: Comment missed check_referer 
	calls to disable it by the moment



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7226 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-04 16:34:36 +00:00
zarzuelo 10342303a1 2012-12-04 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	godmode/alerts/configure_alert_template.php: Add wizard_level flag to the
	alert templates table



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7225 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-04 15:34:57 +00:00
mdtrooper 03b0fc8a95 2012-12-04 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php,
	godmode/reporting/map_builder.php,
	godmode/reporting/visual_console_builder.php,
	godmode/reporting/visual_console_builder.data.php,
	include/functions_visual_map_editor.php,
	operation/reporting/reporting_xml.php,
	operation/agentes/exportdata.excel.php,
	operation/agentes/ver_agente.php,
	operation/agentes/status_monitor.php,
	operation/agentes/alerts_status.php,
	operation/agentes/exportdata.csv.php: uploaded the changes of source
	code style previous to my next commit for to make the next commit
	more easy.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7224 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-04 12:21:39 +00:00
Ramon Novoa 88c6d89c5a 2012-12-03 Ramon Novoa <rnovoa@artica.es>
* include/functions_treeview.php: Fixed id decoding under the
	  metaconsole.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7223 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 17:58:15 +00:00
juanmanuelr d657f0fd0e 2012-12-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb_data.sql
	 pandoradb.data.postgreSQL.sql
	 pandoradb.data.oracle.sql: Added meta_num_elements token in tconfig
	 to support metaconsole views with a lot of elements.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7222 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 14:47:27 +00:00
juanmanuelr eb90c6b7e6 2012-12-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Added agent statistics for 
	batch statistic branch in function reporting_get_group_stats. 
	 operation/agentes/status_monitor.php: Cleaned code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7221 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 13:23:30 +00:00
Ramon Novoa 0156261568 2012-12-03 Ramon Novoa <rnovoa@artica.es>
* operation/tree.php: Fixed the icon of the last element of a sub-tree.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7220 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 11:04:34 +00:00
Ramon Novoa 7d959f061f 2012-12-03 Ramon Novoa <rnovoa@artica.es>
* include/functions_treeview.php: Fixed a typo.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7219 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 10:28:53 +00:00
zarzuelo 661b0fed26 2012-12-03 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/configurar_agente.php: Fixed macros update of
	plugin components for bug #3591104



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7218 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 10:14:34 +00:00
Ramon Novoa 305db4a282 2012-12-03 Ramon Novoa <rnovoa@artica.es>
* include/functions_agents.php: Removed debugging code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7217 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 10:09:13 +00:00
Ramon Novoa 3117e6f205 2012-12-03 Ramon Novoa <rnovoa@artica.es>
* include/functions_agents.php,
	  include/functions_treeview.php: Improved error detection and small fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7216 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 10:05:20 +00:00
hkosaka bc61c0c412 2012-12-03 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_html.php: Use "autocomplete=off" in all
	password fields (this is re-apply of rev5823, that was
	dropped at rev6607).  Merged from branch 4.x.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7215 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 03:29:29 +00:00
jsatoh b7027b986e 2012-12-03 Junichi Satoh <junichi@rworks.jp>
* godmode/setup/setup.php: Changed not to depend on DateTimeZone
	constants with timezone setting to support php 5.2.x.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7213 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-03 02:37:48 +00:00
hkosaka 71a67e8291 2012-11-30 Hirofumi Kosaka <kosaka@rworks.jp>
* lib/PandoraFMS/SNMPServer.pm: Added missing safe_output()
	for trap filters. This fixed a bug that a backslash could not
	escape its following character.

	Merged from 4.0 branch.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7212 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-30 06:18:29 +00:00
zarzuelo cf123d5f65 2012-11-29 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/reporting_builder.php: Fix a pure fail



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7210 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-29 19:01:21 +00:00
juanmanuelr 7dc96933f6 2012-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/status_monitor.php: Added check in group filter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7209 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-29 18:27:37 +00:00
Ramon Novoa dc1259f765 2012-11-29 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Detect errors when retrieving stats.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7208 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-29 18:16:40 +00:00
Ramon Novoa b38af6f8d5 2012-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_ui.php
	 operation/agentes/status_monitor.php: New metaconsole monitor view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7207 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-29 18:01:56 +00:00
juanmanuelr 5219304693 2012-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_ui.php
	 operation/agentes/status_monitor.php: New metaconsole monitor view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7206 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-29 17:34:51 +00:00