Commit Graph

100 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 72af6134a1 Improved a jquery selector 2015-03-31 18:10:13 +02:00
Alejandro Gallardo Escobar 722c95c470 Replaced the old tooltip for the jquery widget version in the networkmaps section 2015-03-31 17:30:53 +02:00
Alejandro Gallardo Escobar c0bc9ad136 Added a padding to the graph to prevent the text cut 2015-03-31 14:11:17 +02:00
Alejandro Gallardo Escobar 973f0c3e2e Error fixes and improvements 2015-03-31 12:27:12 +02:00
Alejandro Gallardo Escobar 63d322244d Added a new parameter to the modules retrieving by tag function 2015-03-26 19:34:56 +01:00
Alejandro Gallardo Escobar ecb5a4097f A lot of changes into the agents and modules counters 2015-03-11 21:06:16 +01:00
Alejandro Gallardo Escobar 684c99aa0c Now the group filter of the groups networkmap works properly 2015-02-19 19:24:38 +01:00
Vanessa Gil 9aff58ed33 Added Strict ACL mode to networmaps. 2015-01-23 08:59:42 +01:00
mdtrooper d083b78526 Change the position of tooltip in networkmap open. And updated the jquery.cluetip.js to 0.9.9 and human readble version. TICKET: #1625 2015-01-16 18:03:11 +01:00
m-lopez-f 34c5ece58e Changed ACL's permission in Networkmaps
visualization: RR (Report Read)
Edition: RW (Report Write)
Deletion: RW (only yours networkmaps), RM(any of its group, although he did not create it.)
2015-01-15 15:45:00 +01:00
mdtrooper f0abdc0dc6 Fixed the topology networkmaps, sometimes the relationships of agents showed bad 2015-01-12 15:40:02 +01:00
alexhigh dcf974bb46 2014-08-21 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_networkmap.php,
	  operation/agentes/networkmap.dinamic.php,
	  operation/agentes/networkmap.php: Renamed some text
	from 'dinamic' to 'dynamic'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-21 13:56:48 +00:00
alexhigh fe497317be 2014-08-21 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_graph.php: Added filters to the
	function "graph_monitor_wheel".
	
	* operation/agentes/networkmap.dinamic.php,
	  operation/agentes/networkmap.php,
	  include/functions_networkmap.php: Added the 'radial
	dinamic' type.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-21 11:41:30 +00:00
mdtrooper a6197fccb2 2014-07-31 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php, include/functions_graph.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/functions_api.php, extensions/agents_alerts.php,
	operation/search_main.php, operation/search_agents.getdata.php,
	operation/agentes/status_monitor.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/ver_agente.php,
	operation/search_modules.getdata.php, operation/search_results.php,
	operation/events/events_list.php,
	godmode/alerts/alert_list.builder.php,
	godmode/alerts/configure_alert_template.php,
	godmode/modules/manage_network_components_form.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/map_builder.php: tiny fixes for the improve the
	support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-31 14:27:43 +00:00
mdtrooper b4c9a92ecc 2014-07-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php: added parameter to avoid the check
	the propagation in the function "groups_get_childrens".
	
	* include/functions_networkmap.php,
	operation/agentes/networkmap.php,
	operation/agentes/networkmap.topology.php: added feature to show the
	agents in subgroups (or not).
	
	INCIDENT: #1018




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-17 14:28:59 +00:00
mdtrooper b3cf812327 2014-06-25 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap.topology.php,
	include/functions_networkmap.php: fixed the networkmaps of level 2,
	now the nodes without conections with others are more or less
	clean posicioned into the networkmap.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10284 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-25 10:49:11 +00:00
mdtrooper 05e412bbaa 2014-06-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/setup/setup_visuals.php, include/functions_networkmap.php,
	include/functions_config.php: added the visual config value for
	to set the width of networkmap, and fixed the overlap of networkmap
	L2.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10277 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-24 13:17:14 +00:00
alexhigh de01889765 2014-06-24 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_networkmap.php: Modified the function
	"networkmap_generate_dot" to link the orphan nodes with a
	central node when selecting the L2 network interfaces option.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10274 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-24 12:00:17 +00:00
mdtrooper 078c44f679 2014-06-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixed into the function
	networkmap_generate_dot the order of agents, now the agents without
	parents are the first elements in the array.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10202 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-16 16:29:04 +00:00
alexhigh b00614eb63 2014-06-02 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/setup/setup_visuals.php,
	  include/functions_config.php: Added a new config token
	to hold a custom path for the graphviz binaries.

	* include/functions_networkmap.php: Minor fixes on the
	functions "networkmap_create_module_node" and
	"networkmap_open_graph".

	* operation/agentes/networkmap.groups.php,
	  operation/agentes/networkmap.topology.php: Modified to
	support the custom graphviz directory, blanks in paths, etc.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10080 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 17:36:00 +00:00
mdtrooper 75ddac9fce 2014-05-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: improved the source code style.
	
	* extensions/agents_modules.php: fixed the css for the
	m$-internet exploter 11. Please Bill Gates travels to Leon.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10036 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-29 09:36:06 +00:00
mdtrooper 0caf3566b3 2014-05-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: added the generate networkmap
	from the ip mask.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10008 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-26 14:55:19 +00:00
mdtrooper ce3b41c0da 2014-05-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php,
	include/functions_networkmap.php: added the filters for the
	CIDR network masks.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9994 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-23 14:42:55 +00:00
mdtrooper a65a494f7f 2014-05-07 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php, include/functions_networkmap.php: clean
	source code style.
	
	* include/functions_modules.php: added function
	"modules_get_interfaces".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9881 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-07 17:15:48 +00:00
juanmanuelr 5de50fd730 2014-05-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php
          include/functions_networkmap.php: Fixed not init agent state
        in networkmap.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9855 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-05 09:21:43 +00:00
mdtrooper cd56ef2542 2014-04-16 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/d3.v3.4.5.js: added the last javascript
	D3 library.
	
	* include/javascript/pandora_modules.js,
	include/functions_visual_map.php, include/functions_networkmap.php,
	include/functions_os.php, include/db/mysql.php,
	include/functions_netflow.php, include/constants.php,
	include/functions_reporting.php: standarized the color, now the
	code uses the colors constant.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9773 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-16 14:42:28 +00:00
mdtrooper 4f9b6c2818 2014-04-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: cleaned source code and killed
	some unicorns and magic numbers, now there is some constants.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9772 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-16 13:43:28 +00:00
mdtrooper 53e78e9731 2014-04-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixed the networkmap L2 with
	unknown modules. Thanks Alex.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9723 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-04 09:39:45 +00:00
mdtrooper d2b05f3d3c 2014-04-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixed the PHP warning.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9717 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-03 16:29:51 +00:00
alexhigh af9cf1f51a 2014-04-01 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_networkmap.php: Modified the L2
	network interfaces.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9694 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-01 13:10:34 +00:00
alexhigh e14cf95db5 2014-03-31 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_networkmap.php: Updated the function
	"networkmap_generate_dot" to fix a regex and delete the
	central node if the L2 network interfaces is true.

	* operation/agentes/estado_generalagente.php: Fixed
	some regex.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9690 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-31 16:41:13 +00:00
mdtrooper b4305d7b9a 2014-03-20 Miguel de Dios <miguel.dedios@artica.es>
* images/group_green.disabled.png, images/group_green.png,
	extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/agentes/configurar_agente.php, include/styles/pandora.css,
	include/functions_networkmap.php, include/functions_agents.php,
	include/functions_visual_map_editor.php,
	include/functions_modules.php, include/functions_groups.php,
	include/constants.php, include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php, pandoradb.sql,
	pandoradb.postgreSQL.sql, pandoradb.oracle.sql: added the feature to
	show the item for groups in visualmap.
	
	Incident: #671




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-20 16:43:42 +00:00
alexhigh 5fe4fbf696 2014-03-19 Alejandro Gallardo <alejandro.gallardo@artica.es>
* pandoradb_data.sql,
	  pandoradb.data.oracle.sql,
	  pandoradb.data.postgreSQL.sql: Deleted an old link
	and updated the link to the Pandora FMS documentation.

	* pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
	  extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql:
	Added the column "l2_network" to the table "tnetwork_map".

	* godmode/agentes/module_manager_editor_common.php:
	Added a help tip to a column of relations.

	* include/functions_modules.php: Improved the function
	"modules_relation_exists".

	* operation/agentes/networkmap.topology.php,
	  include/functions_networkmap.php,
	  operation/agentes/networkmap.php: Added a new option
	to show the relations between the agents interfaces.

	* operation/agentes/estado_monitores.php: Added a tooltip
	to show the relations of a monitor in the monitor list.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-19 16:43:08 +00:00
Ramon Novoa bd51b40fcc 2013-10-07 Ramon Novoa <rnovoa@artica.es>
* include/functions_networkmap.php,
	  operation/agentes/networkmap_list.php,
	  operation/agentes/networkmap.php: Fixed ACL related problems.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8862 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-07 10:52:24 +00:00
mdtrooper c06108fb2f 2013-07-30 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/functions.ajax.php,
	godmode/agentes/configurar_agente.php, include/functions_html.php,
	include/functions_networkmap.php: cleaned source code and removed
	the debug traces.
	
	* godmode/agentes/module_manager_editor_prediction.php,
	include/constants.php: fixed the repeat operator and added some
	constants for to make more easy the code.
	
	Fixes: #2279




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8597 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-30 14:10:05 +00:00
mdtrooper ca2305157b 2013-07-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php,
	operation/agentes/networkmap.dinamic.php: added the tooltips and
	only it needs reorganize the code.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8583 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-26 11:53:11 +00:00
mdtrooper ef837a8378 2013-07-25 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/d3.v3.js: removed some changes.
	
	* include/functions_networkmap.php,
	operation/agentes/networkmap.dinamic.php,
	operation/agentes/networkmap.php: first version of dinamic view
	for networkmap. It needs implement tooltip and of course fix
	the new bugs.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8579 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-25 16:52:45 +00:00
mdtrooper 3eed1ff8be 2013-07-16 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/flot/pandora.flot.js,
	include/functions_networkmap.php, include/constants.php,
	include/ajax/agent.php, include/ajax/events.php: improve the
	source code and remove the magic number and they changed for
	constants.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8527 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 09:09:50 +00:00
mdtrooper 97e47d8bc7 2013-07-03 Miguel de Dios <miguel.dedios@artica.es>
* mobile/index.php, mobile/operation/networkmaps.php,
	mobile/operation/networkmap.php, mobile/operation/home.php,
	mobile/include/ui.class.php, include/functions_networkmap.php,
	include/functions_ui.php: uploaded the some changes and files
	for to show networkmaps in the Pandora mobile.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 08:50:50 +00:00
mdtrooper 5b3c442f2d 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* operation/tree.php: improved the source code style.
	
	* include/functions_networkmap.php: remove the link in metaconsole
	node and set the color.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-12 14:43:08 +00:00
zarzuelo c38ad22f0b 2013-06-10 Sergio Martin <sergio.martin@artica.es>
* include/styles/jquery-ui-1.10.0.custom.css
	include/styles/pandora.css
	include/ajax/events.php
	include/functions_graph.php
	include/functions_events.php
	include/functions_networkmap.php
	include/functions_netflow.php
	operation/tree.php
	operation/events/events.build_table.php
	operation/reporting/reporting_viewer.php
	operation/agentes/status_monitor.php
	operation/agentes/stat_win.php
	operation/netflow/nf_live_view.php
	images/header_refresh_disabled.png
	images/image_problem_data.png
	images/input_pdf.png
	images/input_delete.png
	general/header.php
	godmode/users/user_list.php
	godmode/events/event_edit_filter.php
	godmode/events/event_responses.list.php
	godmode/events/events.php: Fix a lot of aesthetic issues and other
	little fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-10 16:15:36 +00:00
zarzuelo d19aa8c269 2013-05-30 Sergio Martin <sergio.martin@artica.es>
* include/styles/menu.css
	include/styles/cluetip.css
	include/styles/pandora.css
	include/functions.php
	include/functions_events.php
	include/graphs/functions_gd.php
	include/functions_networkmap.php
	include/javascript/jquery.cluetip.js
	images/outof.png: Visual improvements

	* include/functions_treeview.php
	extensions/module_groups.php
	operation/tree.php
	operation/events/events.build_table.php
	operation/events/events_list.php
	operation/agentes/status_monitor.php : Add to the shared 
	views between normal and meta controls to access remote nodes
	for certain users

	* include/functions_visual_map.php
	include/functions_ui.php: Little bugfixes and improvements



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8237 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-30 15:48:22 +00:00
mdtrooper c999a888b9 2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php, include/functions_reporting.php,
	include/functions_users.php: cleaned source code style.
	
	* operation/search_agents.getdata.php: fixed notice messages PHP.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8142 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-16 10:16:16 +00:00
mdtrooper e0c5603127 2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap.php,
	include/functions_networkmap.php: set the background transparent.
	
	Fixes: #3611686
	
	* include/styles/pandora.css, include/functions_ui.php: fixed the
	tabs in the header when the tab is bigger that standar tab, and
	the separator doesn't print.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8045 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-24 13:16:28 +00:00
mdtrooper 6af7ae4956 2013-01-29 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/reporting_builder.php,
	godmode/agentes/configurar_agente.php, godmode/menu.php,
	include/functions_ui.php, include/functions_agents.php,
	include/functions_alerts.php, include/functions_menu.php,
	include/functions_networkmap.php,
	include/help/en/help_alert_type.php,
	include/help/es/help_alert_type.php,
	include/functions_reporting.php,
	operation/agentes/alerts_status.functions.php,
	operation/agentes/alerts_status.php: erased the ocurrences about
	the deprecated alert compounds.
	
	Fixes: #3602487




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7543 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-29 14:42:55 +00:00
mdtrooper 804b132fb7 2013-01-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/networkmap.groups.php: fixed the lost parameter
	in the generation of networkmap with a text filter.
	
	Fixes: #3602233




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7532 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-28 11:50:30 +00:00
juanmanuelr c576382e5a 2013-01-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_networkmap.php: Fixed entity problem in 
	networkmap and hided agents without alerts if "only module with 
	alerts" option enabled.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7421 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-10 14:07:52 +00:00
zarzuelo 66e01a50a0 2012-11-28 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php
	include/functions_graph.php
	include/functions_reporting.php
	include/functions_networkmap.php
	operation/reporting/reporting_viewer.php
	godmode/reporting/reporting_builder.php: Fix a lot of bugs of reports and
	networkmap like foreach problems and filter issues




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7199 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-28 18:29:24 +00:00
zarzuelo 0f95ba32fe 2012-11-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_networkmap.php: Performance improvements
	in networkmaps



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7188 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-27 09:42:41 +00:00
zarzuelo 0b9836143e 2012-11-26 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php
	include/functions_networkmap.php
	operation/agentes/status_monitor.php
	operation/netflow/nf_live_view.php: Improve the 
	performance of networkmap with the new status counts.
	Modify some common code between console and metaconsole



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7185 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-26 18:38:09 +00:00