Commit Graph

1320 Commits

Author SHA1 Message Date
vgilc 253218aa76 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
vgilc ef0cc277aa 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 bd1a864498 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
vgilc bea6859e36 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit.php: Added column group
	to report list.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 15:05:25 +00:00
vgilc d31e2032b0 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_report_item.php
	  include/functions_netflow.php: changes netflow groups.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5358 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 11:32:49 +00:00
vgilc 2e7da2fa96 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
godmode/netflow/nf_edit.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  include/functions_netflow.php
	  operation/netflow/nf_view.php
	  operation/netflow/nf_reporting.php: changes netflow acl.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5356 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 10:52:15 +00:00
jsatoh 4794156850 2012-01-12 Junichi Satoh <junichi@rworks.jp>
* godmode/admin_access_logs.php: Fixed user filtering does not work.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5354 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 05:55:23 +00:00
vgilc 814f01256e 2012-01-11 Vanessa Gil <vanessa.gil@artica.es>
godmode/netflow/nf_edit_form.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  include/functions_netflow.php
	  operation/netflow/nf_view.php: netflow acl.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 18:12:33 +00:00
vgilc bc11908d0a 2012-01-11 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  godmode/netflow/nf_edit_form.php
	  godmode/netflow/nf_edit.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_reporting.php
	  operation/netflow/nf_view.php: netflow acls.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 15:02:27 +00:00
vgilc ad38df3345 2012-01-10 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.oracle.sql
	  pandoradb.postgreSQL.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
	  godmode/netflow/nf_edit_form.php
	  operation/netflow/nf_view.php: Changes in output format
	of netflow.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 15:23:56 +00:00
vgilc 3fcfa44464 2012-01-10 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/group_view.php
	  include/functions_group.php: Improve display for 
	group view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 13:56:40 +00:00
vgilc bf4f81e680 2012-01-10 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/planned_downtime.php: fixed error in
	planned downtime.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 09:36:29 +00:00
vgilc 3808bff1f0 2012-01-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/planned_downtime.php: allow cancelling scheduled
	downtime once it has started.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-09 17:54:31 +00:00
vgilc 52cbe26e63 2012-01-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report_item.php
	  pandoradb.sql: Fixed editing and deleting netflow filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-09 10:04:31 +00:00
vgilc ffbf220588 2012-01-05 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_graph.php
          include/functions_netflow.php
	  operation/netflow/nf_view.php
	  godmode/netflow/nf_item_list: Graph changes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-05 12:08:15 +00:00
zarzuelo 9287abce07 2012-01-03 Sergio Martin <sergio.martin@artica.es>
* include/functions_users.php
	include/auth/mysql.php
	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
	godmode/users/user_list.php: Added to users the 
	disable/enable feature



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-03 13:07:40 +00:00
vgilc 9f20795bc2 2011-12-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_item_list.php
	  operation/netflow/nf_view: Changed the report date and interval.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-30 15:16:07 +00:00
vgilc a0ff9838d8 2011-12-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_item_list.php: Cascade delete filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-30 10:06:56 +00:00
zarzuelo f3f0db3c02 2011-12-29 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor.php: Fixe module editor when the
	data configuration textarea is empty or is a module plugin



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5306 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-29 13:20:38 +00:00
vgilc b755a39527 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_manage.php
	  godmode/netflow/nf_edit.php
	  include/functions_netflow.php: changed netflow setup.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-23 08:37:36 +00:00
slerena 05358082d8 2011-12-22 Sancho Lerena <slerena@artica.es>
* netflow/nf_report_form.php: Fixed problem in report
        creation due unused fields in the SQL table.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 20:07:05 +00:00
vgilc bef7daca71 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* operation/netflow/nf_view.php
	  godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_report.php: Allow repeat filters
	  in reports.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 17:14:41 +00:00
vgilc 0936a761a2 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php
	  include/functions_graph.php
	  operation/netflow/nf_view.php: remove some warning. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5292 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 16:07:15 +00:00
vgilc 4380251694 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql: added mysql tables for traffic netflow.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5291 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 15:28:01 +00:00
vgilc bb016c2674 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_config.php
	  include/functions_graph.php
	  include/styles/menu.css
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
  	  pandoradb.data.sql: Netflow traffic monitoring.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5289 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 13:09:26 +00:00
vgilc aa8c4cd276 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/menu.php
	  godmode/setup/setup.php
	  include/functions_config.php
	  include/functions_graph.php
	  include/styles/menu.css
 	  operation/menu.php
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
  	  pandoradb.data.sql
	  added files:
	  operation/netflow/nf_reporting.php
	  operation/netflow/nf_view.php
	  godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_manage.php
	  godmode/netflow/nf_option_form.php
	  images/networkmap/so_cisco_new.png: Netflow traffic monitoring.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5288 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 13:00:38 +00:00
jsatoh dee1cef885 2011-12-16 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/module_manager.php: Fixed wrong pagination links
	after updating modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5270 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-16 04:12:29 +00:00
juanmanuelr e63045e0b7 2011-12-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/servers/manage_recontask_form.php: Deleted notice due to 
	a non init variable.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5268 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 16:27:09 +00:00
zarzuelo 2223d7e629 2011-12-15 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/setup.php: Fixed bad use of __() function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5262 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-15 10:18:05 +00:00
juanmanuelr 324aa65402 2011-12-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_events.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/module_manager.php: Some corrections over this 
	views.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5259 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 13:52:46 +00:00
jsatoh 8a19c14f5d 2011-12-14 Junichi Satoh <junichi@rworks.jp>
* godmode/alerts/configure_alert_compound.php: Improved that actions
	can be removed in step 2. (Added delete button.)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5256 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-14 04:11:34 +00:00
zarzuelo 596ae320d7 2011-12-12 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fixed some notices of the graphs
	when no data

	* include/functions_reporting.php
	include/functions.php
	godmode/reporting/reporting_builder.item_editor.php: Added the 
	first version of the new group report 3438332



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5246 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-12 13:01:04 +00:00
zarzuelo b7faa74556 2011-12-07 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/estado_agente.php
	godmode/agentes/modificar_agente.php: Added tab on header in the
	agent list views to navigate from operation to godmode sections
	improving usability



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5240 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-07 15:04:40 +00:00
zarzuelo ce862be0ec 2011-12-07 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/module_manager.php: Added status column in 
	godmode view of modules and added delete button in 
	edition module view

	* operation/agentes/estado_monitores.php: Fixed missed
	extra query to not show modules of foreign policies



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5239 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-07 14:19:05 +00:00
juanmanuelr 36b63e71c7 2011-12-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/setup/os.php: List all OS is the page by defect.
	
	Fixes: #3450147



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-05 13:16:58 +00:00
juanmanuelr ad48fa2242 2011-12-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/agent_conf_gis.php
      godmode/gis_maps/configure_gis_map.php: Changed order of latitude,
      longitude and altitude in Gis maps information.
      
      Fixes: #3450292



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5230 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-05 11:54:06 +00:00
zarzuelo 29a2273527 2011-12-02 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	include/functions.php
	extensions/snmp_explorer.php
	godmode/agentes/configurar_agente.php
	godmode/massive/massive_edit_modules.php: Check if a module 
	name exists in the agent when you edit the module and
	improve the errors feedback



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5229 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-02 10:08:07 +00:00
zarzuelo ae69df1839 2011-12-02 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	include/functions_api.php
	include/functions.php
	extensions/snmp_explorer.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/configurar_agente.php: limited the 
	modules creation to not allows to create one if exists
	a module with the same name in the agent to avoid
	recreate a module when go back in the browser.
	Bugfix: 3416129



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5227 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-02 08:52:54 +00:00
juanmanuelr f728246d50 2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/massive/massive_operations.php: Cleaned code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5219 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-30 16:35:04 +00:00
zarzuelo 93ce4834af 2011-11-30 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed massive
	module edition to not break module group, export id etc 
	when edit another field



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5210 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-30 09:38:35 +00:00
juanmanuelr 8c142204aa 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/setup/setup_visuals.php: Added custom logo in visual 
	styles.

	Fixes: #3419712



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5199 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-29 12:30:27 +00:00
juanmanuelr fa4ffcf54c 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
godmode/agentes/modificar_agente.php: Changed style in description
	column of this view. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5193 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-29 10:16:54 +00:00
zarzuelo 8309408c19 2011-11-28 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php
	include/help/en/help_ip_api_list.php
	include/help/es/help_ip_api_list.php
	godmode/setup/setup.php: Improved the IP ACL Access 
	list to allow substrings for bug 3438385



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5187 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-28 16:37:08 +00:00
juanmanuelr 64ecde8bf7 2011-11-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager.php: Incremented agent description
	in this view.

	Fixes: #3424395



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5174 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-25 12:18:29 +00:00
juanmanuelr 9eb9a3a74b 2011-11-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php
	 operation/menu.php
	 operation/gis_maps/render_view.php
	 operation/gis_maps/index.php
	 godmode/gis_maps/index.php: Fixed a problem with agent groups in 
	 gis maps.
	 
	 Fixes: #3438313



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5173 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-25 11:55:13 +00:00
juanmanuelr dfef5e3c71 2011-11-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager.php: Fixed an sql error.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5170 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-25 10:42:33 +00:00
zarzuelo 739dfdcf0a 2011-11-24 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php
	include/functions.php
	include/functions_agents.php
	operation/search_modules.php
	operation/agentes/status_monitor.php
	operation/agentes/estado_ultimopaquete.php
	operation/agentes/alerts_status.php
	operation/agentes/estado_generalagente.php
	operation/agentes/estado_agente.php
	operation/agentes/estado_monitores.php
	operation/agentes/ver_agente.php
	operation/search_agents.php
	operation/search_alerts.php
	godmode/agentes/module_manager.php
	godmode/agentes/modificar_agente.php
	godmode/agentes/configurar_agente.php
	godmode/alerts/alert_list.list.php
	godmode/users/configure_user.php: Reconstruct policy acl
	system to allow in enterprise version get extra access for 
	a user in a policy



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5168 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-24 18:19:09 +00:00
zarzuelo d4a8ae4249 2011-11-24 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_integria_url.php
	include/help/es/help_integria_url.php
	godmode/setup/setup.php: Added help for integria api
	url in setup



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5166 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-24 18:16:26 +00:00
juanmanuelr c037df2820 2011-11-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/setup/performance.php: Changed html element from input 
	text to select in SLA period (seconds) parameter.
	
	Fixes: #3437884



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5165 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-24 16:51:49 +00:00
juanmanuelr f08f777d07 2011-11-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/setup/setup.php: Added confirmation when "Use Enterprise 
	ACL System" is checked.
	
	Fixes: #3438190



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5163 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-11-24 15:48:21 +00:00