Commit Graph

6100 Commits

Author SHA1 Message Date
zarzuelo 9a355f5090 2012-11-26 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php
	operation/events/events_list.php
	operation/events/events.php
	operation/search_results.php
	godmode/netflow/nf_edit.php: Fix paths problems



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7183 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-26 10:27:16 +00:00
jsatoh cf9b9dcb15 2012-11-26 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Fixed unintended executions and wrong event
	messages in planned downtime.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7182 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-26 07:27:25 +00:00
zarzuelo 930b09e5f3 2012-11-20 Sergio Martin <sergio.martin@artica.es>
* pandora_windows_service.h
	  pandora_windows_service.cc: Added support for
	gis_exec (Automatic gis coordinates)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7180 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-21 17:13:05 +00:00
darode 0fd24a4de9 2012-11-21 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.php: Fixed a bug in integration
	between Integria and Pandora on Incident management.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7179 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-21 16:18:55 +00:00
mdtrooper e60192ed14 2012-11-20 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/load_updatemanager.php,
	extensions/update_manager/debug.php: fixed the execution of keygen
	when there is some wrong in the execution the message for user is
	more clean now show "Error in execution the keygen." instead the
	message "Error Server authorisation rejected". And added other forms
	to get debugData for the update.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7176 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 19:27:36 +00:00
Ramon Novoa d11d6751b1 2012-11-20 Ramon Novoa <rnovoa@artica.es>
* include/functions_groups.php,
	  include/functions_agents.php,
	  include/functions_modules.php,
	  include/functions_treeview.php,
	  include/functions_os.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  install.php,
	  pandoradb.oracle.sql,
	  operation/tree.php,
	  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: Improved tree
	  view performance.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7170 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 16:14:45 +00:00
darode 9c971b2040 2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.list.php: Fixed a problem with
	incident search, in incident integrated with Integria.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7169 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 12:59:59 +00:00
zarzuelo d35f66391b 2012-11-20 Sergio Martin <sergio.martin@artica.es>
* pandora_windows_service.cc: Fixed some bugs
	of the type conversions 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 12:39:11 +00:00
zarzuelo 2debc7c2fc 2012-11-20 Sergio Martin <sergio.martin@artica.es>
* pandora_windows_service.cc: Added support for
	custom fields



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7166 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 12:29:00 +00:00
darode f21456c9a2 2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.incident.php,
	operation/integria_incidents/incident.php: Fixed several fields of manage
	incident form.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7165 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 12:09:52 +00:00
zarzuelo 5b90a6a59e 2012-11-20 Sergio Martin <sergio.martin@artica.es>
* modules/pandora_module_factory.cc: Fix a few
	variable declaration bugs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7163 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 09:26:04 +00:00
zarzuelo 445e79e289 2012-11-20 Sergio Martin <sergio.martin@artica.es>
* modules/pandora_module_factory.cc: Added macros
	support to the module_exec command of the module
	configuration



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 09:15:14 +00:00
darode 23d1643145 2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.php: Fixed an error printing messages
        which appear before the header.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7161 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-20 08:29:27 +00:00
darode 9e485707e4 2012-11-19 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.list.php,
	operation/integria_incidents/incident.incident.php,
	operation/integria_incidents/incident.php,
	operation/integria_incidents/incident.files.php,
	operation/integria_incidents/incident.workunits.php: Fixed several errors
	in behavior, added messages about operation result and added style to buttons.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7160 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-19 18:10:48 +00:00
zarzuelo 34867c52ad 2012-11-19 Sergio Martin <sergio.martin@artica.es>
* pandora_windows_service.cc: Added new fields of 
	agent in XML header like custom_id and url_address.
	Added coordinates data (not gis_exec yet)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7157 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-19 15:57:56 +00:00
zarzuelo a9dabcf2aa 2012-11-19 Sergio Martin <sergio.martin@artica.es>
* modules/pandora_module.h
	modules/pandora_module.cc: Fixed type conflicts in the
	last changes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7155 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-19 14:30:35 +00:00
zarzuelo 205e4259dd 2012-11-19 Sergio Martin <sergio.martin@artica.es>
* modules/pandora_module.h
	modules/pandora_module_factory.cc
	modules/pandora_module.cc: Added several new module fields
	to the XML



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-19 08:23:49 +00:00
jsatoh e97fb40acf 2012-11-19 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/planned_downtime.editor.php: Allowed to change
	type of planned downtime while it's not active.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7153 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-19 06:23:24 +00:00
jsatoh 956daca4db 2012-11-18 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Removed duplicated
	query.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7152 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-18 06:59:15 +00:00
zarzuelo e63d9162d9 2012-11-15 Sergio Martin <sergio.martin@artica.es>
* pandora_agent: Added support to the new fields of the
	agent in the XML: custom_id, url_addres and custom fields



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7151 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-15 15:53:45 +00:00
zarzuelo 47f3dd55fa 2012-11-15 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Added support for new agent data in
	the XML as custom_id, url_address and custom fields



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-15 15:20:48 +00:00
Ramon Novoa a996a2e440 2012-11-15 Ramon Novoa <rnovoa@artica.es>
* util/pandora_db.pl: Try to update module status count for all agents.
	  Further performance tests need to be done.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7149 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-15 15:13:13 +00:00
Ramon Novoa 11466c0280 2012-11-14 Ramon Novoa <rnovoa@artica.es>
* include/functions_modules.php,
	  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/agentes/agent_template.php,
	  godmode/agentes/module_manager.php,
	  godmode/agentes/agent_manager.php: Added support for server-side
	  module status calculation.

	* godmode/agentes/configurar_agente.php: Show 'None' when no server is
	  selected for an agent.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-14 18:54:27 +00:00
Ramon Novoa fd975c367f 2012-11-14 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  util/pandora_db.pl: Added support for module status calculation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7147 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-14 18:45:40 +00:00
mdtrooper 8c01c26a22 2012-11-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php,
	godmode/reporting/reporting_builder.item_editor.php,
	include/functions_ui.php: fixed the javascript urls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7146 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-13 19:08:41 +00:00
mdtrooper 5203f1f878 2012-11-13 Miguel de Dios <miguel.dedios@artica.es>
* include/db/mysql.php, include/functions_reporting.php,
	include/ajax/agent.php: cleaned source code style.
	
	* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql, pandoradb.sql,
	pandoradb.postgreSQL.sql, pandoradb.oracle.sql: added the fields
	'id_agent', 'server_name' and 'show_modulegroup' in the table
	'tnetwork_map'.
	
	* include/functions_ui.php: fixed the function
	"ui_print_agent_autocomplete_input".
	
	* include/functions_networkmap.php: added function
	"networkmap_create_module_group_node".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7145 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-13 16:06:21 +00:00
zarzuelo 90cfd8e652 2012-11-13 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Adopt server to the new fields of
	the agents XML



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7144 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-13 12:31:14 +00:00
zarzuelo c2047c4ab7 2012-11-13 Sergio Martin <sergio.martin@artica.es>
* pandora_agent: Added several fields to the XML



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7143 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-13 12:24:36 +00:00
mdtrooper 2b0bcb6846 2012-11-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: cleaned source code style.
	
	* include/functions_api.php: fixed typo error that stoped the
	execution of api.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7142 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-12 14:53:33 +00:00
jsatoh 33077cb181 2012-11-11 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Fixed a typo.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7141 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-11 02:24:44 +00:00
slerena 8230679022 2012-11-08 Sancho Lerena <slerena@artica.es>
* include/functions_config.php: Fixed a XSS in login :-O. Thanks
        to gobejishvili for reporting.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7140 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-08 15:09:24 +00:00
mdtrooper 4522dce0be 2012-11-08 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events.php, include/functions_tags.php: cleaned
	source code style.
	
	* godmode/events/event_edit_filter.php: fixed the lost vars in
	the javascript code for the none elements in the tag select widgets.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7138 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-08 12:24:27 +00:00
zarzuelo e2f08b720b 2012-11-08 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php
	include/graphs/pChart/pData.class.php
	include/functions_reporting.php
	include/constants.php: Improve performance to the SLA 
	report items, added unknown periods and fix planned downtimes
	in SLAs. Adapt the default pchart graph engine colors to pandora



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7136 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-08 07:42:11 +00:00
mdtrooper 10f8229cee 2012-11-07 Miguel de Dios <miguel.dedios@artica.es>
* index.php: cleaned source code style.
	
	* pandoradb.sql, pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql: added the field
	"tag_with" and "tag_without", and removed the field "tags" in the
	table "tevent_filter".
	* operation/events/events_list.php,
	godmode/events/event_edit_filter.php: added widgets for to filter
	the events by tags with the events or and tags without the
	events.
	
	* include/functions_tags.php: cleaned source code style, and
	clarifity the function "tags_search_tag".
	
	* include/functions_html.php: into the function
	"html_print_input_hidden" fixed when the value have double quotes or
	single quotes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-07 17:49:31 +00:00
mdtrooper 8720e58f12 2012-11-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_command.php, index.php: cleaned
	source code style.
	
	* godmode/alerts/alert_commands.php: fixed the check the name of
	command that it did not make the update the data.
	
	MERGED FROM THE BRANCH PANDORA_4.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-07 15:15:18 +00:00
Ramon Novoa b03592cef0 2012-11-06 Ramon Novoa <rnovoa@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 a new
	  column to tagente_estado to store possible errors.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7132 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-06 17:57:24 +00:00
mdtrooper 85655653f6 2012-11-05 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events_list.php: fixed the lost tag span (with
	styles) in the Event description.
	
	* operation/events/events.php: fixed the default value for id_agent
	set 0 (as All) in the filter of events.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7131 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-05 18:31:18 +00:00
mdtrooper 488c853373 2012-11-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php: improved the function
	"ui_print_agent_autocomplete_input" to get the default value for
	"hidden_input_idagent_value" from the GET or POST instead to set
	as 0.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7130 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-05 13:03:09 +00:00
mdtrooper 1d37ef99b3 2012-11-05 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events.php: cleaned source code style.
	
	* operation/events/events_list.php: cleaned source code style and
	fixed the lost id_agent when reload.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7129 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-05 12:52:26 +00:00
vgilc ed188b3075 2012-11-05 Vanessa Gil <vanessa.gil@artica.es>
* operation/reporting/reporting_xml.php: Moved functions
	to functions_xml.php
	* include/functions_xml.php: Added file.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7128 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-05 12:41:13 +00:00
zarzuelo a8d51f1806 2012-11-05 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fixed a bug of the events/alerts/unwknown
	period calculation



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7127 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-05 11:18:52 +00:00
zarzuelo fd38e3cae1 2012-11-05 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_alert_macros.php
	include/help/es/help_alert_macros.php: Fixed typo in macro name



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7126 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-05 08:50:37 +00:00
mdtrooper f771a88d34 2012-11-04 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/status_monitor.php: improved the page status
	monitor, show in another column the tags and added a select box with
	the tags in user in the filter form.
	
	Pending task: #3581578




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7124 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-04 19:10:19 +00:00
jsatoh dec751165e 2012-11-04 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/planned_downtime.editor.php: Fixed that time range
	of once planned downtime cannot be changed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7123 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-04 14:41:14 +00:00
jsatoh 364db2f6cd 2012-11-04 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/planned_downtime.list.php: Improved to show time
	range of periodically planned downtime.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7122 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-04 13:58:43 +00:00
mdtrooper e5e2ce0b17 2012-11-03 Miguel de Dios <miguel.dedios@artica.es>
* godmode/users/configure_user.php: cleaned source code style.
	
	* include/styles/pandora.css, godmode/users/user_list.php: improved
	the row aspect of disabled users in the list.
	
	Pending task: #3540077




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7121 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-03 16:41:26 +00:00
mdtrooper dda46bfeca 2012-11-02 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php, extensions/update_manager.php:
	cleaned source code style.
	
	* include/functions_ui.php: fixed or improved the function
	"ui_print_agent_autocomplete_input" for to get the data when the
	user stop to typing and lost the focus this widget.
	
	Fixes: #3573762




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7120 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-02 19:18:20 +00:00
vgilc fea1a0f4e5 2012-11-02 Vanessa Gil <vanessa.gil@artica.es>
* operation/reporting/reporting_xml.php: Removed html entities.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7119 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-02 11:00:00 +00:00
jsatoh e9432c8a00 2012-11-01 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alert_fields_description.php,
	include/help/ja/help_alert_fields_values.php: Added new help files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7118 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-11-01 03:13:17 +00:00
zarzuelo 16bdd70e21 2012-10-31 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql: Changed the default data
	of alert commands to fields customization



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7117 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-10-31 09:58:45 +00:00