Commit Graph

7204 Commits

Author SHA1 Message Date
juanmanuelr 01bc7a0ffc 2013-09-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/admin_access_logs.php: Fixed php error that breaks
        this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8755 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-10 11:52:19 +00:00
ramonn 0c7485e778 2013-09-09 Ramon Novoa <rnovoa@artica.es>
* 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,
	  include/ajax/events.php,
	  include/functions_api.php,
	  include/functions_events.php,
	  include/javascript/pandora_events.js,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql: Added support for event custom data (via CLI
	  and API).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8754 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-09 16:21:45 +00:00
ramonn d9d5678ecc 2013-09-09 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf.new,
	  lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/Core.pm,
	  bin/pandora_server: Added support for event auto-expiry and small
	  fixes.

	* util/pandora_manage.pl: Added support for event custom data.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8753 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-09 16:09:34 +00:00
ramonn 622631b0f2 2013-09-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for module macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8748 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 16:46:52 +00:00
ramonn 07c31e3bac 2013-09-05 Ramon Novoa <rnovoa@artica.es>
* 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.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  godmode/agentes/configurar_agente.php,
	  godmode/agentes/agent_template.php,
	  godmode/agentes/module_manager_editor_common.php,
	  godmode/agentes/module_manager_editor.php,
	  include/functions_modules.php,
	  pandoradb.sql: Added support for module macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8747 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 16:46:21 +00:00
zarzuelo d2dd361397 2013-09-05 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager.php
	godmode/agentes/configurar_agente.php: Change old counts
	of status by new way setting flags to be updated by 
	server



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8746 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 16:35:49 +00:00
mdtrooper 361ed9b69d 2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_plugin.php,
	include/javascript/pandora_modules.js: fixed the double apply
	entities in the plugin components.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8745 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 12:34:03 +00:00
mdtrooper 172fc500ec 2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/PluginServer.pm: fixed the lost decode html
	entities for the value in the macros.
	
	* util/plugin/dummy_plugin.pl: added tiny plugin server with only
	purpose to testing.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8744 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 09:57:40 +00:00
mdtrooper 14cd85bd03 2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_filemanager.php: fixed PHP notice when this
	file is included and there is not a upload file action.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 06:41:02 +00:00
ramonn d52fdc485f 2013-09-04 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/Config.pm,
	  conf/pandora_server.conf.new: Added support for custom event texts.

	* lib/PandoraFMS/Server.pm: Fixed a comparison.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8741 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 13:28:13 +00:00
mdtrooper d4003a5ce9 2013-09-04 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/modificar_agente.php,
	include/functions_agents.php: fixed the delete agent when sometimes
	have remote config but not the enterprise.
	
	MERGED FROM THE BRANCH PANDORA_4




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8740 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 12:49:27 +00:00
ramonn 42eafaf784 2013-09-04 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for treating events with the
	  same id_extra as a single event.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8738 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 09:33:33 +00:00
ramonn 49de2939bf 2013-09-04 Ramon Novoa <rnovoa@artica.es>
* include/functions_events.php,
	  include/javascript/pandora_events.js: Added 'ID extra' to the event
	  details.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 09:14:52 +00:00
mdtrooper fadd278c54 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php, operation/agentes/group_view.php:
	fixed the links (now use constants instead the magic number and
	unicorns) to the filtered list of modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8735 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 12:58:22 +00:00
mdtrooper 2e5bdf9149 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_revent.pl: fixed the script, now runs fine the tags
	and set correclty the comment and owner user, and other fixes.
	
	Fixes: #2386




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8734 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 12:22:57 +00:00
mdtrooper 8394895dca 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed typing bugs...yes I wrote a lot
	of them, sorry.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8733 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 10:37:50 +00:00
mdtrooper f2469fefe2 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php: into the function "ui_pagination"
	added the parameter "print_total_items" to show the total of
	item in the list. It is showed althought the pagination does not.
	
	* operation/agentes/estado_agente.php: changed to don't show the
	total in the pagination block in the bottom.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8732 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 08:59:19 +00:00
ramonn 3ef6758d5e 2013-09-03 Ramon Novoa <rnovoa@artica.es>
* 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,
	  godmode/tag/tag.php,
	  godmode/tag/edit_tag.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  pandoradb_data.sql: Added support for tag phone information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8731 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 08:50:25 +00:00
ramonn ce877b6e30 2013-09-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for tag phone information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8730 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 08:48:26 +00:00
mdtrooper bb37abd2c4 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* operation/tree.php, include/functions_treeview.php: improved the
	source code style.
	
	* operation/search_agents.getdata.php: added to search for the
	main address of agent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8729 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 07:54:24 +00:00
mdtrooper 42b92eb24b 2013-09-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_edit_modules.php: added field "ip_target"
	for to massive edit module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8727 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-02 14:02:37 +00:00
mdtrooper 8ed2e0e43a 2013-09-02 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_xml_stress.pl: fixed perl warning and set the default
	temp directory correctly.
	
	* util/pandora_xml_stress.conf: added lost parameters
	"directory_confs" and "directory_temp".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8725 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-02 07:20:10 +00:00
mdtrooper 534373bacf 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/servers.build_table.php: fixed the tooltip for
	lag column.
	
	Fixes: #2378




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8721 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 12:21:38 +00:00
mdtrooper e645b83a72 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: set the first default server
	when create a new agent.
	
	MERGED FROM THE BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8719 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 11:29:57 +00:00
mdtrooper beccfb9e54 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_generalagente.php: show a warning
	message when the agent has not a assigned server.
	
	* operation/agentes/ver_agente.php: some changes for to make more
	easy the merge with the trunk.
	
	MERGED FROM THE TRUNK.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8718 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 11:21:51 +00:00
mdtrooper f212c86c06 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/group_list.php: fixed pagination mismatch.
	
	Fixes: #2383




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8716 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 06:44:37 +00:00
mdtrooper a86e93fa78 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/Core.pm: into the function "pandora_module_unknown"
	now checks if the module have disable unknown events.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8714 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 13:01:12 +00:00
mdtrooper 13e4995700 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_snmp_browser.php: fixed PHP warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8713 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 12:18:38 +00:00
mdtrooper b1c1055982 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_manage.pl: added support to disable/enable unknown
	events for modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8712 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 11:39:05 +00:00
mdtrooper 43eb307833 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: added supoport for disabled unknown
	events modules, components and policies.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8711 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 07:48:10 +00:00
mdtrooper b8a91c1b90 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: added code to
	policy module editor with disabled unknown events modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8708 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 12:44:47 +00:00
mdtrooper b58faa2944 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: fixed the massive copy modules
	between agents.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8705 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 09:16:19 +00:00
mdtrooper 893a36149c 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php,
	include/javascript/pandora_modules.js: implemented the disabled
	unknown events for local modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8704 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 07:53:50 +00:00
mdtrooper 51ca20f933 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: fixed the PHP warnings in the
	call to enterprise function.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8703 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 07:19:46 +00:00
mdtrooper a3cae69ef1 2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
	godmode/agentes/module_manager_editor.php,
	godmode/agentes/module_manager_editor_common.php,
	godmode/agentes/configurar_agente.php,
	godmode/massive/massive_edit_modules.php,
	godmode/modules/manage_network_components_form_common.php,
	godmode/modules/manage_network_components.php,
	include/functions_events.php, include/functions.php,
	include/javascript/pandora_modules.js,
	include/functions_network_components.php,
	include/functions_modules.php, include/constants.php, pandoradb.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: first version of
	disabled unknown events for modules, now it is implemented in
	modules, massive operations and components, but it is necesary in
	local component, policy,  api, cli, pandora server and recond task.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8701 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-27 13:05:30 +00:00
mdtrooper 7e1d8c44d3 2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* conf/pandora_server.conf.new: set the policy queues as default
	running.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8700 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-27 09:31:15 +00:00
mdtrooper 514884aee3 2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* index.php, include/javascript/pandora.js: fixed code style.
	
	* godmode/massive/massive_edit_modules.php: fixed the javascript
	that showed some rows before to select modules to edit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8699 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-27 09:29:36 +00:00
mdtrooper 8431fa82f9 2013-08-26 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql,
	pandoradb_data.sql: fixed the id_alert_command for restart the
	agent set 11 (before it was 10).

2013-08-26 Miguel de Dios <miguel.dedios@artica.es>
	
	* extensions/update_manager/lib/xmlrpc/xmlrpc.inc: fixed the timeout
	for to check packages of pandora update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8697 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-26 13:44:44 +00:00
mdtrooper f52ce3d71d 2013-08-26 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php,
	godmode/agentes/module_manager_editor_common.php: fixed PHP
	warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8695 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-26 07:17:43 +00:00
mdtrooper 05cb44b7ae 2013-08-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: fixed the PHP
	warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8691 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-23 06:35:31 +00:00
mdtrooper b6e9cc8057 2013-08-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/modificar_agente.php,
	include/functions_snmp_browser.php, include/functions_api.php: fixed
	PHP warnings and PHP notices.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8690 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-23 06:24:42 +00:00
darode bd5d827ba9 2013-08-22 Dario Rodriguez <dario@artica.es>
* pandora_agent_installer: Merged improvements from 4.1 branch
        to fix several bugs related to custom installation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8688 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-22 17:04:00 +00:00
mdtrooper d58f3f9d9b 2013-08-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/servers.build_table.php, include/functions_db.php,
	include/functions_servers.php, index.php: improved the source code
	style.
	
	* include/functions_api.php: added the call to update the agent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8682 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-21 12:37:37 +00:00
mdtrooper 6d104eb5e1 2013-08-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: added calls to set gis data for agent
	"set/gis_agent_only_position" and "set/gis_agent", and for to get
	gis data "get/gis_agent".
	
	* include/functions_agents.php: added function "agents_update_gis".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8680 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-20 13:13:52 +00:00
hkosaka a3c69476df 2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Small Fix. Corrected error message.

	MERGED FROM branch4.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8678 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-19 08:00:31 +00:00
mdtrooper 7e9f0b1718 2013-08-19 Miguel de Dios <miguel.dedios@artica.es>
* general/logon_ok.php, godmode/setup/news.php: fixed the lost
	"<br>" in the news.
	
	Fixes: #2380




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8675 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-19 06:49:17 +00:00
hkosaka 296004499f 2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/module_manager_editor.php,
	godmode/agentes/agent_manager.php,
	godmode/agentes/modificar_agente.php,
	include/functions_agents.php,
	include/functions_modules.php: Added missing enterprise_hook()
	wrapper calls.

	MERGED FROM branch4.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8674 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-19 06:43:12 +00:00
mdtrooper f9191352bf 2013-08-16 Miguel de Dios <miguel.dedios@artica.es>
* extensions/pandora_logs.php: fixed the translation the human
	size of php memory limit to bytes size limit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8668 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-16 10:02:07 +00:00
mdtrooper 437300b986 2013-08-16 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/module.php, include/javascript/pandora_modules.js:
	fixed the ajax call to get the plugin fields in the form editor
	module plugin server.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8667 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-16 09:15:44 +00:00
ramonn 9b1975aed7 2013-08-14 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/module_manager_editor_plugin.php,
	  include/help/ja/help_web_checks.php,
	  include/help/ja/help_plugin_macros.php,
	  include/help/en/help_plugin_macros.php,
	  include/help/en/help_web_checks.php,
	  include/help/en/help_snmp_alert_field1.php,
	  include/help/es/help_plugin_macros.php,
	  include/help/es/help_snmp_alert_field1.php,
	  include/help/es/help_web_checks.php: Updated help files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8664 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-14 16:25:07 +00:00