Commit Graph

3350 Commits

Author SHA1 Message Date
ramonn ba35daa033 2012-01-27 Ramon Novoa <rnovoa@artica.es>
* include/help/es/help_alert_special_days.php: Added to repository.
	  Translated the special days help file to Spanish.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5439 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 10:36:22 +00:00
jsatoh c0966fddbd 2012-01-27 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_action_threshold.php: Rewrote the
	  action_threshold help page and added an example.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 04:58:51 +00:00
jsatoh 2d945d65bb 2012-01-27 Junichi Satoh <junichi@rworks.jp>
* include/help/en/help_alert_special_days.php,
	include/help/ja/help_alert_special_days.php: Added new help files
	for special days feature.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 04:30:38 +00:00
juanmanuelr 84b426b57a 2012-01-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 include/graphs/functions_fsgraph.php: Modified background color in
	 flash charts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5436 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-26 12:51:43 +00:00
juanmanuelr c96acd2fb7 2012-01-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 operation/agentes/estado_generalagente.php: Added static event 
	 agent graph in main agent view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-26 11:38:38 +00:00
zarzuelo 02c210bcae 2012-01-26 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Improved the get all agents
	API function to retrieve more data as address, description, 
	operating system and url address



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5434 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-26 09:58:31 +00:00
juanmanuelr 86f900dfad 2012-01-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Fixed Sla graph when it has 
	a boolean module data.	
	
	Bugfix: #3477786



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5431 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 16:29:40 +00:00
ramonn e9d1396888 2012-01-25 Ramon Novoa <rnovoa@artica.es>
* include/help/en/help_action_threshold.php,
	  include/help/es/help_action_threshold.php: Rewrote the
	  action_threshold help page and added an example.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5430 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 16:06:44 +00:00
juanmanuelr 00c6d7fceb 2012-01-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added csv separator in function 
	get_all_agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 15:48:20 +00:00
vgilc 561a5cc018 2012-01-25 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php: Bad behavior group filter
	in massive operations and policies management.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5427 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 12:40:11 +00:00
juanmanuelr 1eca154698 2012-01-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: removed warning from get_all_agents
	function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5426 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 10:33:37 +00:00
vgilc ec4c91e693 2012-01-25 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php: Fixed bug: Don't show
	good agents modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 09:58:21 +00:00
zarzuelo 9399bfd699 2012-01-25 Sergio Martin <sergio.martin@artica.es>
* include/functions_network_components.php: Fixed some
	include relative paths to API calls



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 09:09:55 +00:00
zarzuelo 40675f1e59 2012-01-25 Sergio Martin <sergio.martin@artica.es>
* include/functions_incidents.php
	operation/integria_incidents/incident.incident.php
	operation/integria_incidents/incident.php: Fixed some bugs
	of the Integria IMS integration



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5422 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 09:08:58 +00:00
jsatoh dddee2d983 2012-01-25 Junichi Satoh <junichi@rworks.jp>
* godmode/menu.php, godmode/alerts/alert_special_days.php,
	godmode/alerts/configure_alert_special_days.php,
	godmode/alerts/configure_alert_template.php,
	extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql,
	extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql,
	pandoradb.oracle.sql, pandoradb.postgreSQL.sql, pandoradb.sql,
	include/functions_alerts.php: Added special days feature. It allows
	to define special days (holidays and special working days) for 
	alert templates.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5421 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 06:13:43 +00:00
juanmanuelr 4e95795804 2012-01-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/incidents/incident.php
	 operation/incidents/incident_detail.php: Modified agent text search
	 due to usability issues.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 18:54:55 +00:00
juanmanuelr 81c9d86bb6 2012-01-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 include/graphs/functions_pchart.php: Added units in Y axis and 
	 fixed min, max and avg values. Also fixed colors fo min, max and
	 avg series.
	 
	Pending task: #3153343



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5419 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 18:53:18 +00:00
ramonn 037c9c54a9 2012-01-24 Ramon Novoa <rnovoa@artica.es>
* include/functions_config.php,
	  include/functions_netflow.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  operation/netflow/nf_live_view.php,
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql,
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql,
	  godmode/agentes/module_manager_editor_prediction.php,
	  godmode/agentes/configurar_agente.php,
	  godmode/menu.php,
	  godmode/netflow/nf_edit_form.php: Added support for enterprise
	  netflow modules.

	* godmode/netflow/nf_manage.php: Moved to
	  godmode/setup/setup_netflow.php.

	* godmode/netflow/nf_option_form.php: Removed from repository. Not used.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5416 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 17:11:12 +00:00
javilanz ac3c96cab4 2010-01-24 Javier Lanz <javier.lanz@artica.es>
* godmode/massive/massive_delete_modules.php: Fixed a small entities
	bug. Added io_safe_output


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 14:55:00 +00:00
juanmanuelr 141e5dd424 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb.sql
	 pandoradb.postgreSQL.sql
 	 pandoradb.oracle.sql
 	 extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	 extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	 extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Modified
	 tagente table.
 	
	* operation/agentes/estado_generalagente.php
	 operation/agentes/url_address.php
	 operation/agentes/ver_agente.php
	 godmode/agentes/agent_incidents.php
	 godmode/agentes/configurar_agente.php
	 godmode/agentes/agent_manager.php: Added url_address functionality.

	Pending task: #3472445



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:36:22 +00:00
ramonn 1950f614e7 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Aesthetic fixes to netflow report
	  tables.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:20:30 +00:00
ramonn 9faeefd0a4 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* operation/menu.php,
	  operation/netflow/nf_live_view.php,
	  godmode/netflow/nf_edit_form.php,
	  godmode/netflow/nf_item_list.php,
	  godmode/netflow/nf_report_item.php,
	  godmode/netflow/nf_report_form.php,
	  godmode/netflow/nf_edit.php: Multiple improvements to netflow live
	  view and report and filter edition.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:17:52 +00:00
juanmanuelr 7ea01805e4 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Removed Php warning in function 
	agents_get_agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5406 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 17:08:45 +00:00
juanmanuelr e1ea2d84ce 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php
	 operation/incidents/incident.php
	 operation/incidents/incident_detail.php
     operation/agentes/ver_agente.php
	 godmode/agentes/agent_incidents.php
	 godmode/agentes/configurar_agente.php: Added the possibility to add
	 agent to an incident and added new tab in agent view if the agent
	 has incidents associated.
  
	 * pandoradb.postgreSQL.sql
	 pandoradb.oracle.sql
	 pandoradb.sql
	 extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	 extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql	
	 extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: modified 
	 table tincidencia.
	 
	 Pending task: # 3472447
	 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 17:01:00 +00:00
vgilc 7d6ab5a944 2012-01-23 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_agente.php
	  include/functions_agents.php: Simplify code estado_agente
	and fix bug in search filter.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 16:28:22 +00:00
ramonn 9e60e3f19e 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql, pandoradb.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql,
	  godmode/netflow/nf_manage.php: Added netflow daemon configuration
	  options.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 15:37:45 +00:00
juanmanuelr be2b4b7d10 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified get_policy_modules function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 09:03:57 +00:00
koichirok 3ed66be052 2012-01-23 Koichiro Kikuchi <koichiro@rworks.jp>
* include/functions_servers.php: Exclude modules which belong to
	  disabled agent from server performance and lag calculation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 08:05:35 +00:00
juanmanuelr 0ddeab6b4c 2012-01-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified get_all_agents function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 07:52:43 +00:00
ramonn 2009c60047 2012-01-20 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php,
	  operation/menu.php,
	  operation/netflow/nf_view.php,
	  godmode/netflow/nf_report_item.php: Netflow live view support and small
	  fixes.

	* operation/netflow/nf_live_view.php: Added to repository: Netflow live view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 13:14:09 +00:00
juanmanuelr 271f3df593 2012-01-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified in parameters in 
	update_modules functions (network, data, snmp and plugin).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 12:23:17 +00:00
juanmanuelr cc4bbbc2a5 2012-01-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php
	 include/functions_agents.php
	 include/functions_alerts.php: New functionality for the Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-19 17:45:59 +00:00
vgilc 76f4f1d68d 2012-01-18 Vanessa Gil <vanessa.gil@artica.es>
* operation/reporting/reporting_viewer.php: Check that the date range
	entered is correct.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 11:56:14 +00:00
vgilc f5eb6a24f0 2012-01-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
	  operation/agentes/estado_monitores.php: Counter modified to ignore
	disabled modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 10:09:58 +00:00
jsatoh f4d2c55dec 2012-01-18 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_pcap_filter.php: Added a new help file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 08:36:14 +00:00
juanmanuelr 9fc7ff50a5 2012-01-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_network_components.php
	 include/functions_api.php: Added new functions to Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5384 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 20:20:45 +00:00
ramonn 51ebd92b2b 2012-01-17 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Clean \r and \n from advanced
	  filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 15:37:50 +00:00
ramonn cff11f680b 2012-01-17 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php, include/functions_netflow.php,
	  godmode/netflow/nf_edit_form.php, pandoradb.sql,
	  pandoradb.postgreSQL.sql, pandoradb.oracle.sql: Added suport for
	  custom filters. Small fixes.

	* include/help/en/help_pcap_filter.php,
	  include/help/es/help_pcap_filter.php: Added to repository. Nfdump
	  filter syntax help files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 14:01:49 +00:00
juanmanuelr 1cb3751ba8 2012-01-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added new functions add_agent_policy,
	add_data_module_policy, add_network_module_policy, 
	add_snmp_module_policy and add_plugin_module_policy to Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 12:08:53 +00:00
vgilc 985083d10d 2012-01-17 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
	  extensions/module_groups.php: Fixed bug: sql error in
	extension "Module Groups" and popup alert.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 10:20:53 +00:00
vgilc 19c0857a48 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report_item.php: Changed name items.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 14:34:25 +00:00
vgilc df67d27eaf 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_monitores.php: Fixed bug: count in the group
	mode is not well done because ignore the disabled modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 14:24:20 +00:00
vgilc 0fd88fd3c6 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php: Changed add button.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5371 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 11:08:28 +00:00
juanmanuelr 62e79b4d1d 2012-01-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: New functions in Api 
	update_network_module, update_plugin_module, update_data_module and
	update_snmp_module.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5370 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 10:30:16 +00:00
ramonn 0d3586ad32 2012-01-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Aesthetic fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5369 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 14:52:52 +00:00
ramonn a034893237 2012-01-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Fixed data source ordering for some
	  netflow charts and implemented a basic disk cache.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 13:14:16 +00:00
vgilc 0c39ae634e 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php: Changes sort
	rows in netflow items.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 13:06:28 +00:00
vgilc d3c662ab50 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql
	  pandoradb.postgreSQL.sql
	  pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Update
	table tnetflow_report_content.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 12:11:00 +00:00
vgilc 4668df5db0 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_item.php
	  operation/netflow/nf_reporting.php
	  pandoradb.sql: Sort items of netflow reports.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 11:58:59 +00:00
juanmanuelr d1f1ba7cb2 2012-01-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_users.php
	 include/functions_groups.php
	 include/functions_profile.php
	 include/functions_api.php: Added functions and new functions to Api
	 set_update_template, set_delete_template, 
	 set_delete_module_template, set_update_user, set_add_user_profile,
	 set_create_module_template.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 15:33:52 +00:00