Commit Graph

3881 Commits

Author SHA1 Message Date
vgilc d0bd876295 2011-06-07 Vanessa Gil <vanessa.gil@artica.es>
* win32/pandora_agent_conf.cc
	  win32/pandora_agent_conf.h
	  win32/modules/pandora_module_list.cc
	  win32/modules/pandora_module_list.h: Allow the windows agent to include additional configuration files.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4419 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-08 14:12:57 +00:00
juanmanuelr 39828a68c4 2011-06-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_modules.php
	include/functions_tags.php: Support for policy's tag functionality.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-08 14:11:12 +00:00
Ramon Novoa 0035e2937e 2011-06-08 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm: Added a function to get the name of an alert
	  template given the alert id.
	
	* lib/PandoraFMS/Core.pm: Added support for module tags.
	
	* lib/PandoraFMS/DataServer.pm: Do not queue more than max_queue_files
	  files (not max_queue_files + 1!).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-08 11:07:39 +00:00
juanmanuelr 3a73b47476 2011-06-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/massive/massive_edit_modules.php: Tags editor inside massive 
	operations.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4416 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-08 08:49:34 +00:00
javilanz 862cc8198d 2011-06-07 Javier Lanz <javier.lanz@artica.es>
* operation/events/events_list.php: Added rawurlencode and io_safe_input
	where they were necessary


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-07 16:37:51 +00:00
jsatoh d6b145170f 2011-06-07 Junichi Satoh <junichi@rworks.jp>
* operation/agentes/datos_agente.php: Improved filter. It allows
	to select 'Specify time range' and search string.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4414 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-07 02:30:48 +00:00
Ramon Novoa 93bd4b86a0 2011-06-06 Ramon Novoa <rnovoa@artica.es>
* util/pandora_db.pl: Use days_compact instead of days_purge in
	  pandora_compactdb.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 16:33:32 +00:00
juanmanuelr f27ddd9e5e 2011-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php: Added callback function
	for JQuery requests.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4411 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 16:22:30 +00:00
juanmanuelr f0d7ba1a15 2011-06-06 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/servers/manage_recontask.php
	godmode/servers/modificar_server.php
	godmode/menu.php: Changed old name functions to 4.0v.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 14:15:03 +00:00
darode be580cd25e 2011-06-06 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/servers/manage_recontask.php: User with flag AW can manage recon
	task, only for their group.
	* godmode/servers/modificar_server.php: User with AW flag can view server
	status but only Pandora Admin can delete one of them.
	* godmode/servers/manage_recontask_form.php: User with flag AW can manage recon
	task, but only for their group.
	* godmode/menu.php: Allowing user with flag AW see manage server tab and 
	manage recon task subtab.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 14:00:48 +00:00
juanmanuelr 8a5132fa8b 2011-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_tags.php: Fixed problem on
	update tag function. 
	* godmode/tag/tag.php
	* godmode/tag/edit_tag.php: Added tab that links to 
	tag list view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 13:58:34 +00:00
juanmanuelr 7e1795ca4a 2011-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_modules.php: Some mofications over update_tag
	function.
	* include/functions_alerts.php: Added new function 
	alerts_get_alerts_module_name() to retrieve alerts of a module
	in html select tag format.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 12:04:14 +00:00
juanmanuelr c4a067a340 2011-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_tags.php: Added new parameters to function 
	tags_search_tag().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 11:42:50 +00:00
juanmanuelr c755e03c55 2011-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/alert_list.ajax.php: Added new callback function 
	for jQuery requests. 
	* godmode/menu.php: Added alert events entry. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-06 11:16:48 +00:00
slerena d8903afee8 2011-06-03 SanchO Lerena <slerena@artica.es>
* pandora_inventory_change.pl
        pandora_inventory_change.README: New remote plugin to check
        changes in inventory, using a direct database check (only MySQL
        supported).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4402 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-03 14:25:13 +00:00
juanmanuelr e9a68f3b1b 2011-06-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_tags.php: Some modifications in update tag 
function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4401 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-03 13:33:01 +00:00
javilanz a51b7517fe 2011-06-03 Javier Lanz <javier.lanz@artica.es>
* godmode/agentes/module_manager_editor_prediction.php: Edited to get
	"custom_integer_2" parameter & Added period combo 
	* godmode/agentes/module_manager_editor.php: Edited to get
	"custom_integer_2" parameter


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-03 13:16:35 +00:00
Ramon Novoa 2171d8f48b 2011-06-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Do not include BADXML files when
	  evaluating max_queue_files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-02 15:28:29 +00:00
Ramon Novoa b92617e056 2011-06-01 Ramon Novoa <rnovoa@artica.es>
* include/auth/mysql.php: Do not allow empty passwords when
	  authenticating against an LDAP server.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-01 10:51:53 +00:00
vgilc dd62d4a431 2011-06-01 Vanessa Gil <vanessa.gil@artica.es>
* unix/pandora_agent: Allow the agent to include additional configuration files.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4395 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-01 10:34:05 +00:00
javilanz e096e30c67 2011-06-01 Javier Lanz <javier.lanz@artica.es>
* include/functions_graph.php: Fixed a deprecated function call
	* include/functions_reporting.php: Fixed a deprecated function call and
	removed some connection error messages
	* include/functions.php: Disabled agents/modules report type when
	metaconsole is active
	* operation/agentes/ver_agente.php: Removed some connection error messages
	* godmode/reporting/reporting_builder.list_items.php: Removed some
	connection error messages
	* godmode/reporting/reporting_builder.php: Added getting server name for
	sql reports & custom graph in metaconsole
	* godmode/reporting/reporting_builder.item_editor.php: Added Server
	combo box, custom graph for metaconsole & removed some connection error
	messages


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-06-01 10:28:10 +00:00
javilanz cf1e4703af 2011-05-30 Javier Lanz <javier.lanz@artica.es>
* include/functions_reporting.php: Edited "render_report_html" function
	to work with metaconsole printing metaconsole elements
	* include/javascript/pandora.js: Modified autocomplete javascript to use
	with metaconsole
	* include/ajax/reporting.ajax.php: Edited to work with metaconsole
	* include/ajax/agent.php: Edited autocomplete to work with metaconsole
	* operation/agentes/ver_agente.php: Modified to get the agent's modules
	using metacofacensole
	* godmode/reporting/reporting_builder.list_items.php: Edited to display
	agents & modules in metaconsole. Edited top filters to work with
	metaconsole
	* godmode/reporting/reporting_builder.php: Added getting parameter
	server_name & fixed deleting items
	* godmode/reporting/reporting_builder.item_editor.php: Edited to send
	the host when metaconsole is active


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 17:04:34 +00:00
Ramon Novoa 5a95033fc2 2011-05-30 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Fixed the query to get the number of unknown
	  agents. Thanks to Koichiro.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4392 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 16:53:42 +00:00
juanmanuelr 80fbad1709 2011-05-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* install.php: Fixed typo mistake in this file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4391 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 14:40:17 +00:00
juanmanuelr e855608a3c 2011-05-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* ChangeLog: forgot to update Changelog.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4390 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 11:11:18 +00:00
juanmanuelr 86c82310a8 * extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added column "unit"
to "tagente_modulo" table.  

	* include/functions_modules.php
	include/functions_tags.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/configurar_agente.php
	godmode/agentes/module_manager_editor.php
	godmode/tag/tag.php
	godmode/tag/edit_tag.php: Now it's possible to add tags
	to modules.  



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4389 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 11:09:14 +00:00
Ramon Novoa 34321f2f36 2011-05-30 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/Core.pm: Added support for event alerts (Enterprise).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 10:21:15 +00:00
juanmanuelr 3a423acbdd 2011-05-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager_editor.php: Added prefix "modules_"
	to function get_agentmodule_name().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4387 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 08:09:22 +00:00
jsatoh 633985d6cb 2011-05-30 Junichi Satoh <junichi@rworks.jp>
* operation/agentes/datos_agente.php: Replaced format_data with
	modules_format_data.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-30 04:00:23 +00:00
vgilc 463b3fa595 2011-05-26 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manager_editor.php: Removed unit var.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-26 15:43:21 +00:00
javilanz b392c3207b 2011-05-06 Javier Lanz <javier.lanz@artica.es>
* ChangeLog: forgot to commit this file


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4384 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-26 11:38:04 +00:00
juanmanuelr c87a3dd689 2011-05-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/menu.css: Added new background image on css 
	tag entry.
	* include/functions_tags.php: Added new function code for tag 
	functionality.
	* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added new tables "ttag",
	"ttag_module", "ttag_policy_module" and "ttag_event".
	* godmode/tag: Added new path.
	* godmode/menu.php
	godmode/tag/tag.php
	godmode/tag/edit_tag.php: Tag editor for events correlation engine.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-26 10:51:17 +00:00
zarzuelo ff3ef7adf9 2011-05-25 Sergio Martin <sergio.martin@artica.es>
* images/policies_error_db.png: Added new image to policies
	pending update only db



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-25 15:34:42 +00:00
vgilc 298fd6d5be 2011-05-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup_auth.php
	include/functions_config.php: Removed user and password from LDAP setup.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-25 10:10:40 +00:00
vgilc eae12b8e9b 2011-05-25 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/ver_agente.php
	operation/agentes/graphs.php
	godmode/agentes/configurar_agente.php
	godmode/agentes/module_manager_editor.php
	godmode/agentes/module_manager_editor_common.php
	include/graphs/fgraph.php
	include/graphs/functions_fsgraph.php
	include/functions_graph.php
	include/functions_modules.php
	pandoradb.oracle.sql
	pandoradb.postgreSQL.sql
	pandoradb.sql: Added units to modules and graphs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-25 09:57:05 +00:00
mdtrooper 1e3661884e 2011-05-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: erased lost trace in source code.
	
	* include/functions_db.php: in function "db_pandora_audit" added the check
	the exists the id_user.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4379 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-25 07:51:17 +00:00
mdtrooper 27392b5d64 2011-05-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4378 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-23 13:54:24 +00:00
zarzuelo 72b00c526e 2011-05-23 Sergio Martin <sergio.martin@artica.es>
* images/cog_db.png
	images/cross_undo.png
	godmode/agentes/module_manager_editor.php: Added two new images to
	queue and added check when relink a module into policy avoiding it 
	when te policy is applying



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-23 13:17:37 +00:00
Ramon Novoa bb9cd2023f 2011-05-23 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/SNMPServer.pm: Applied Koichiro's patch to reuse an
	  already running snmptrapd.

	* lib/PandoraFMS/DataServer.pm: Do not update the configuration of
	  policy modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-23 13:13:34 +00:00
zarzuelo 15e449cdc4 2011-05-23 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Added hidden field
	in module edition form to keep the type when is disabled



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4375 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-23 13:01:56 +00:00
zarzuelo 8c9c68cd84 2011-05-23 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	lib/PandoraFMS/Core.pm
	util/pandora_db.pl
	util/pandora_manage.pl: Added minor functions and fixes to policy queue
	and call to clean policy queue in maintenance script



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-23 11:55:08 +00:00
juanmanuelr 5bc819eaeb 2011-05-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* general/header.php: Added close tag in the autorefresh html link.

	Fixes: #3305092



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-23 11:14:24 +00:00
javilanz 2d73a374af 2011-05-20 Javier Lanz <javier.lanz@artica.es>
* pandoradb.postgreSQL.sql, pandoradb.oracle.sql, pandoradb.sql,
	extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added 'server_name' column
	to treport_content, treport_content_sla_combined and treport_content_item


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-20 11:44:35 +00:00
juanmanuelr eeec94d61e 2011-05-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/db/oracle.php
	include/functions_agents.php
	include/functions_db.php
	include/functions_alerts.php
	pandoradb.oracle.sql
	pandoradb.data.oracle.sql
	godmode/alerts/configure_alert_compound.php
	godmode/alerts/configure_alert_template.php
	godmode/snmpconsole/snmp_alert.php
	godmode/users/configure_user.php
	godmode/reporting/reporting_builder.list_items.php
	godmode/reporting/reporting_builder.php: Several corrections 
	over Console code for Oracle support. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4371 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-20 10:47:42 +00:00
vgilc 385b33b605 2011-05-19 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/alerts_status.php 
	include/functions_agents.php: Fixed filter Status in Alert Detail and pagination.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-19 08:51:49 +00:00
mdtrooper 84ff993022 2011-05-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: changed the source code to fixed the
	enterprise call in function "agents_get_agents".

	* operation/agentes/estado_agente.php: apply the change to the call
	"agents_get_agents".
	
	Fixes: #3303426



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-18 13:02:44 +00:00
juanmanuelr be51309f1c 2011-05-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	operation/events/events.php: Changed the way to include flash
	graph include. 
	* pandoradb.oracle.sql: Changed datatype on max_value field of 
	talert_templates table.
	* pandoradb.data.oracle.sql: Fixes errors in Oracle installation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-18 10:25:03 +00:00
juanmanuelr 228648f5e1 2011-05-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events.php: Added functions_graph.php include in this
	file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-18 10:01:51 +00:00
vgilc 26481b61da 2011-05-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php: Fixed filter Group in Alert Detail.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4364 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-18 09:40:21 +00:00
juanmanuelr 194478e887 2011-05-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/graphs/fgraph.php
	include/config_process.php
	include/functions_agents.php
	operation/agentes/status_monitor.php
	operation/agentes/estado_agente.php: Several corrections 
	over sql queries for Oracle DBMS.
	* godmode/db/db_info.php: Added include to 
	functions_fsgraph.php



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4363 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-05-17 15:59:40 +00:00