From d5953df87bfefd73cd244b802cf7b252e44b3786 Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Wed, 27 Apr 2011 13:43:31 +0000
Subject: [PATCH] 2011-04-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

	* include/functions_graph.php
	include/functions_users.php
	include/functions_events.php
	include/functions_html.php
	include/functions_menu.php
	include/styles/pandora.css
	include/graphs/functions_pchart.php
	include/functions_messages.php
	include/functions_exportserver.php
	include/functions_modules.php
	include/functions_reporting.php
	include/functions_filemanager.php
	include/functions_groups.php
	include/functions_gis.php
	include/functions_networkmap.php
	include/functions_servers.php
	include/functions_network_components.php
	include/functions_visual_map.php
	include/ajax/skins.ajax.php
	include/ajax/visual_console_builder.ajax.php
	include/help/en/help_gis_map_builder.php
	include/help/en/help_agent_status.php
	include/help/en/help_eventview.php
	include/help/en/help_configure_gis_map.php
	include/help/en/help_cascade_protection.php
	include/help/en/help_setup_gis_index.php
	include/help/es/help_gis_map_builder.php
	include/help/es/help_agent_status.php
	include/help/es/help_eventview.php
	include/help/es/help_configure_gis_map.php
	include/help/es/help_cascade_protection.php
	include/help/ja/help_gis_map_builder.php
	include/help/ja/help_agent_status.php
	include/help/ja/help_eventview.php
	include/help/ja/help_configure_gis_map.php
	include/help/ja/help_cascade_protection.php
	include/help/ja/help_setup_gis_index.php
	include/functions_ui.php
	include/functions_incidents.php
	include/functions.php
	include/functions_agents.php
	include/functions_db.php
	include/functions_fsgraph.php
	include/functions_extensions.php
	include/functions_ui_renders.php
	extensions/insert_data.php
	extensions/system_info.php
	extensions/extension_uploader.php
	extensions/agents_modules.php
	extensions/dbmanager.php
	extensions/resource_registration.php
	extensions/resource_exportation.php
	extensions/users_connected.php
	extensions/module_groups.php
	extensions/update_manager/settings.php
	extensions/update_manager/main.php
	operation/incidents/incident.incident.php
	operation/incidents/incident.php
	operation/incidents/incident.files.php
	operation/incidents/incident.tracking.php
	operation/incidents/incident_detail.php
	operation/incidents/incident.workunits.php
	operation/incidents/incident.list.php
	operation/search_modules.php
	operation/extensions.php
	operation/visual_console/render_view.php
	operation/visual_console/index.php
	operation/agentes/status_monitor.php
	operation/agentes/estado_ultimopaquete.php
	operation/agentes/datos_agente.php
	operation/agentes/alerts_status.php
	operation/agentes/estado_generalagente.php
	operation/agentes/custom_fields.php
	operation/agentes/estado_agente.php
	operation/agentes/networkmap.topology.php
	operation/agentes/alerts_status.functions.php
	operation/agentes/networkmap.groups.php
	operation/agentes/sla_view.php
	operation/agentes/exportdata.php
	operation/agentes/gis_view.php
	operation/agentes/estado_monitores.php
	operation/agentes/ver_agente.php
	operation/agentes/graphs.php
	operation/agentes/tactical.php
	operation/agentes/group_view.php
	operation/agentes/networkmap.php
	operation/agentes/stat_win.php
	operation/servers/view_server.php
	operation/servers/view_server_detail.php
	operation/search_agents.php
	operation/search_graphs.php
	operation/snmpconsole/snmp_view.php
	operation/users/user_edit.php
	operation/integria_incidents/incident.incident.php
	operation/integria_incidents/incident.php
	operation/integria_incidents/incident.files.php
	operation/integria_incidents/incident.tracking.php
	operation/integria_incidents/incident_detail.php
	operation/integria_incidents/incident.workunits.php
	operation/integria_incidents/incident.list.php
	operation/gis_maps/render_view.php
	operation/gis_maps/ajax.php
	operation/gis_maps/index.php
	operation/events/export_csv.php
	operation/events/sound_events.php
	operation/events/events_validate.php
	operation/events/events_list.php
	operation/events/events.php
	operation/search_alerts.php
	operation/messages/message.php
	operation/reporting/reporting_xml.php
	operation/reporting/reporting_viewer.php
	operation/reporting/graph_viewer.php
	operation/reporting/custom_reporting.php
	operation/search_reports.php
	operation/search_maps.php
	operation/search_results.php
	operation/search_users.php
	mobile/operation/agents/monitor_status.php
	mobile/operation/agents/view_agents.php
	mobile/operation/agents/tactical.php
	mobile/operation/agents/view_alerts.php
	mobile/operation/agents/group_view.php
	mobile/operation/events/events.php
	mobile/operation/servers/view_servers.php
	mobile/include/user.class.php
	general/pandora_help.php
	general/noaccess.php
	general/login_page.php
	general/logon_ok.php
	general/logoff.php
	general/ui/agents_list.php
	general/header.php
	godmode/groups/modu_group_list.php
	godmode/groups/configure_group.php
	godmode/groups/configure_modu_group.php
	godmode/groups/group_list.php
	godmode/admin_access_logs.php
	godmode/extensions.php
	godmode/db/db_sanity.php
	godmode/db/db_refine.php
	godmode/db/db_info.php
	godmode/db/db_event.php
	godmode/db/db_purge.php
	godmode/agentes/agent_template.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/module_manager_editor_network.php
	godmode/agentes/fields_manager.php
	godmode/agentes/module_manager_editor_wmi.php
	godmode/agentes/module_manager_editor_plugin.php
	godmode/agentes/agent_conf_gis.php
	godmode/agentes/module_manager_editor_prediction.php
	godmode/agentes/module_manager.php
	godmode/agentes/modificar_agente.php
	godmode/agentes/configurar_agente.php
	godmode/agentes/configure_field.php
	godmode/agentes/module_manager_editor.php
	godmode/agentes/planned_downtime.php
	godmode/agentes/manage_config_remote.php
	godmode/agentes/agent_manager.php
	godmode/servers/recon_script.php
	godmode/servers/plugin.php
	godmode/servers/manage_recontask.php
	godmode/servers/modificar_server.php
	godmode/servers/manage_recontask_form.php
	godmode/alerts/alert_list.list.php
	godmode/alerts/configure_alert_compound.php
	godmode/alerts/alert_compounds.php
	godmode/alerts/alert_list.php
	godmode/alerts/configure_alert_template.php
	godmode/alerts/alert_templates.php
	godmode/alerts/configure_alert_action.php
	godmode/alerts/configure_alert_command.php
	godmode/alerts/alert_actions.php
	godmode/alerts/alert_list.builder.php
	godmode/alerts/alert_commands.php
	godmode/snmpconsole/snmp_alert.php
	godmode/snmpconsole/snmp_filters.php
	godmode/setup/file_manager.php
	godmode/setup/os.list.php
	godmode/setup/news.php
	godmode/setup/gis_step_2.php
	godmode/setup/links.php
	godmode/setup/setup.php
	godmode/setup/os.php
	godmode/setup/performance.php
	godmode/setup/setup_auth.php
	godmode/setup/gis.php
	godmode/setup/os.builder.php
	godmode/setup/setup_visuals.php
	godmode/users/user_list.php
	godmode/users/configure_user.php
	godmode/users/configure_profile.php
	godmode/gis_maps/configure_gis_map.php
	godmode/gis_maps/index.php
	godmode/massive/massive_add_alerts.php
	godmode/massive/massive_copy_modules.php
	godmode/massive/massive_delete_agents.php
	godmode/massive/massive_enable_disable_alerts.php
	godmode/massive/massive_operations.php
	godmode/massive/massive_delete_profiles.php
	godmode/massive/massive_edit_agents.php
	godmode/massive/massive_delete_action_alerts.php
	godmode/massive/massive_delete_modules.php
	godmode/massive/massive_add_profiles.php
	godmode/massive/massive_delete_alerts.php
	godmode/massive/massive_edit_modules.php
	godmode/massive/massive_standby_alerts.php
	godmode/massive/massive_add_action_alerts.php
	godmode/modules/manage_network_components_form.php
	godmode/modules/manage_nc_groups_form.php
	godmode/modules/manage_network_templates.php
	godmode/modules/module_list.php
	godmode/modules/manage_network_components_form_common.php
	godmode/modules/manage_network_components_form_network.php
	godmode/modules/manage_network_templates_form.php
	godmode/modules/manage_network_components_form_wmi.php
	godmode/modules/manage_network_components.php
	godmode/modules/manage_nc_groups.php
	godmode/modules/manage_network_components_form_plugin.php
	godmode/reporting/reporting_builder.list_items.php
	godmode/reporting/graph_builder.main.php
	godmode/reporting/visual_console_builder.wizard.php
	godmode/reporting/visual_console_builder.php
	godmode/reporting/reporting_builder.preview.php
	godmode/reporting/reporting_builder.main.php
	godmode/reporting/visual_console_builder.data.php
	godmode/reporting/visual_console_builder.elements.php
	godmode/reporting/graph_builder.php
	godmode/reporting/graph_builder.graph_editor.php
	godmode/reporting/reporting_builder.php
	godmode/reporting/visual_console_builder.editor.php
	godmode/reporting/reporting_builder.item_editor.php
	godmode/reporting/map_builder.php
	godmode/reporting/graphs.php
	godmode/reporting/graph_builder.preview.php: Now functions on
	functions_html.php, functions_gis.php, functions_filemanager.php,
	functions_exportserver.php have "html_", "gis_", "filemanager_" and
	"exportserver_" prefix respectively.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4281 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     | 242 ++++++++++++++++++
 pandora_console/extensions/agents_modules.php |  20 +-
 pandora_console/extensions/dbmanager.php      |   6 +-
 .../extensions/extension_uploader.php         |   8 +-
 pandora_console/extensions/insert_data.php    |  18 +-
 pandora_console/extensions/module_groups.php  |   4 +-
 .../extensions/resource_exportation.php       |  10 +-
 .../extensions/resource_registration.php      |   2 +-
 pandora_console/extensions/system_info.php    |  16 +-
 .../extensions/update_manager/main.php        |  12 +-
 .../extensions/update_manager/settings.php    |  26 +-
 .../extensions/users_connected.php            |   2 +-
 pandora_console/general/header.php            |  28 +-
 pandora_console/general/login_page.php        |  10 +-
 pandora_console/general/logoff.php            |   2 +-
 pandora_console/general/logon_ok.php          |   4 +-
 pandora_console/general/noaccess.php          |   2 +-
 pandora_console/general/pandora_help.php      |   4 +-
 pandora_console/general/ui/agents_list.php    |  14 +-
 pandora_console/godmode/admin_access_logs.php |  16 +-
 .../godmode/agentes/agent_conf_gis.php        |  20 +-
 .../godmode/agentes/agent_manager.php         |  76 +++---
 .../godmode/agentes/agent_template.php        |  12 +-
 .../godmode/agentes/configurar_agente.php     |  16 +-
 .../godmode/agentes/configure_field.php       |  16 +-
 .../godmode/agentes/fields_manager.php        |  12 +-
 .../godmode/agentes/manage_config_remote.php  |   2 +-
 .../godmode/agentes/modificar_agente.php      |  26 +-
 .../godmode/agentes/module_manager.php        |  38 +--
 .../godmode/agentes/module_manager_editor.php |  20 +-
 .../agentes/module_manager_editor_common.php  |  44 ++--
 .../agentes/module_manager_editor_network.php |  40 +--
 .../agentes/module_manager_editor_plugin.php  |  12 +-
 .../module_manager_editor_prediction.php      |  10 +-
 .../agentes/module_manager_editor_wmi.php     |  14 +-
 .../godmode/agentes/planned_downtime.php      |  54 ++--
 .../godmode/alerts/alert_actions.php          |  12 +-
 .../godmode/alerts/alert_commands.php         |   8 +-
 .../godmode/alerts/alert_compounds.php        |  32 +--
 .../godmode/alerts/alert_list.builder.php     |  30 +--
 .../godmode/alerts/alert_list.list.php        |  96 +++----
 pandora_console/godmode/alerts/alert_list.php |   4 +-
 .../godmode/alerts/alert_templates.php        |  28 +-
 .../godmode/alerts/configure_alert_action.php |  30 +--
 .../alerts/configure_alert_command.php        |  18 +-
 .../alerts/configure_alert_compound.php       |  94 +++----
 .../alerts/configure_alert_template.php       |  78 +++---
 pandora_console/godmode/db/db_event.php       |   6 +-
 pandora_console/godmode/db/db_info.php        |   4 +-
 pandora_console/godmode/db/db_purge.php       |  12 +-
 pandora_console/godmode/db/db_refine.php      |  12 +-
 pandora_console/godmode/db/db_sanity.php      |   4 +-
 pandora_console/godmode/extensions.php        |  18 +-
 .../godmode/gis_maps/configure_gis_map.php    | 100 ++++----
 pandora_console/godmode/gis_maps/index.php    |  14 +-
 .../godmode/groups/configure_group.php        |  30 +--
 .../godmode/groups/configure_modu_group.php   |  14 +-
 pandora_console/godmode/groups/group_list.php |  10 +-
 .../godmode/groups/modu_group_list.php        |   6 +-
 .../massive/massive_add_action_alerts.php     |  26 +-
 .../godmode/massive/massive_add_alerts.php    |  16 +-
 .../godmode/massive/massive_add_profiles.php  |  16 +-
 .../godmode/massive/massive_copy_modules.php  |  38 +--
 .../massive/massive_delete_action_alerts.php  |  22 +-
 .../godmode/massive/massive_delete_agents.php |  12 +-
 .../godmode/massive/massive_delete_alerts.php |  16 +-
 .../massive/massive_delete_modules.php        |  14 +-
 .../massive/massive_delete_profiles.php       |  16 +-
 .../godmode/massive/massive_edit_agents.php   |  70 ++---
 .../godmode/massive/massive_edit_modules.php  |  66 ++---
 .../massive/massive_enable_disable_alerts.php |  28 +-
 .../godmode/massive/massive_operations.php    |  10 +-
 .../massive/massive_standby_alerts.php        |  28 +-
 .../godmode/modules/manage_nc_groups.php      |  12 +-
 .../godmode/modules/manage_nc_groups_form.php |  16 +-
 .../modules/manage_network_components.php     |  20 +-
 .../manage_network_components_form.php        |  18 +-
 .../manage_network_components_form_common.php |  26 +-
 ...manage_network_components_form_network.php |  26 +-
 .../manage_network_components_form_plugin.php |  12 +-
 .../manage_network_components_form_wmi.php    |  28 +-
 .../modules/manage_network_templates.php      |  12 +-
 .../modules/manage_network_templates_form.php |  26 +-
 .../godmode/modules/module_list.php           |   2 +-
 .../reporting/graph_builder.graph_editor.php  |  14 +-
 .../godmode/reporting/graph_builder.main.php  |  10 +-
 .../godmode/reporting/graph_builder.php       |   6 +-
 .../reporting/graph_builder.preview.php       |  10 +-
 pandora_console/godmode/reporting/graphs.php  |   8 +-
 .../godmode/reporting/map_builder.php         |  10 +-
 .../reporting_builder.item_editor.php         | 106 ++++----
 .../reporting_builder.list_items.php          |  36 +--
 .../reporting/reporting_builder.main.php      |  16 +-
 .../godmode/reporting/reporting_builder.php   |  18 +-
 .../reporting/reporting_builder.preview.php   |  22 +-
 .../reporting/visual_console_builder.data.php |  16 +-
 .../visual_console_builder.editor.php         |  60 ++---
 .../visual_console_builder.elements.php       |  54 ++--
 .../reporting/visual_console_builder.php      |  10 +-
 .../visual_console_builder.wizard.php         |  20 +-
 .../godmode/servers/manage_recontask.php      |  14 +-
 .../godmode/servers/manage_recontask_form.php |  40 +--
 .../godmode/servers/modificar_server.php      |  12 +-
 pandora_console/godmode/servers/plugin.php    |   4 +-
 .../godmode/servers/recon_script.php          |   2 +-
 .../godmode/setup/file_manager.php            |   4 +-
 pandora_console/godmode/setup/gis.php         |  10 +-
 pandora_console/godmode/setup/gis_step_2.php  |  64 ++---
 pandora_console/godmode/setup/links.php       |   2 +-
 pandora_console/godmode/setup/news.php        |   2 +-
 pandora_console/godmode/setup/os.builder.php  |  14 +-
 pandora_console/godmode/setup/os.list.php     |   4 +-
 pandora_console/godmode/setup/os.php          |   4 +-
 pandora_console/godmode/setup/performance.php |  40 +--
 pandora_console/godmode/setup/setup.php       |  60 ++---
 pandora_console/godmode/setup/setup_auth.php  |  32 +--
 .../godmode/setup/setup_visuals.php           |  32 +--
 .../godmode/snmpconsole/snmp_alert.php        |  38 +--
 .../godmode/snmpconsole/snmp_filters.php      |  20 +-
 .../godmode/users/configure_profile.php       |  34 +--
 .../godmode/users/configure_user.php          |  56 ++--
 pandora_console/godmode/users/user_list.php   |  36 +--
 pandora_console/include/ajax/skins.ajax.php   |   2 +-
 .../ajax/visual_console_builder.ajax.php      |  10 +-
 pandora_console/include/functions.php         |  12 +-
 pandora_console/include/functions_agents.php  |   2 +-
 pandora_console/include/functions_db.php      |   4 +-
 pandora_console/include/functions_events.php  |  30 +--
 .../include/functions_exportserver.php        |  10 +-
 .../include/functions_extensions.php          |  72 +++---
 .../include/functions_filemanager.php         | 186 +++++++-------
 pandora_console/include/functions_fsgraph.php |   2 +-
 pandora_console/include/functions_gis.php     |  92 +++----
 pandora_console/include/functions_graph.php   |   2 +-
 pandora_console/include/functions_groups.php  |  38 +--
 pandora_console/include/functions_html.php    |  82 +++---
 .../include/functions_incidents.php           |  22 +-
 pandora_console/include/functions_menu.php    |   2 +-
 .../include/functions_messages.php            |   2 +-
 pandora_console/include/functions_modules.php |   6 +-
 .../include/functions_network_components.php  |   4 +-
 .../include/functions_networkmap.php          |  20 +-
 .../include/functions_reporting.php           |  54 ++--
 pandora_console/include/functions_servers.php |  32 +--
 pandora_console/include/functions_ui.php      |  44 ++--
 .../include/functions_ui_renders.php          |   6 +-
 pandora_console/include/functions_users.php   |   4 +-
 .../include/functions_visual_map.php          |  16 +-
 .../include/graphs/functions_pchart.php       |  12 +-
 .../include/help/en/help_agent_status.php     |  16 +-
 .../help/en/help_cascade_protection.php       |   2 +-
 .../help/en/help_configure_gis_map.php        |   4 +-
 .../include/help/en/help_eventview.php        |  20 +-
 .../include/help/en/help_gis_map_builder.php  |   4 +-
 .../include/help/en/help_setup_gis_index.php  |   2 +-
 .../include/help/es/help_agent_status.php     |  16 +-
 .../help/es/help_cascade_protection.php       |   2 +-
 .../help/es/help_configure_gis_map.php        |   2 +-
 .../include/help/es/help_eventview.php        |  20 +-
 .../include/help/es/help_gis_map_builder.php  |   4 +-
 .../include/help/ja/help_agent_status.php     |  16 +-
 .../help/ja/help_cascade_protection.php       |   2 +-
 .../help/ja/help_configure_gis_map.php        |   4 +-
 .../include/help/ja/help_eventview.php        |  20 +-
 .../include/help/ja/help_gis_map_builder.php  |   4 +-
 .../include/help/ja/help_setup_gis_index.php  |   2 +-
 pandora_console/include/styles/pandora.css    |   2 +-
 pandora_console/mobile/include/user.class.php |  16 +-
 .../mobile/operation/agents/group_view.php    |   4 +-
 .../operation/agents/monitor_status.php       |  12 +-
 .../mobile/operation/agents/tactical.php      |   6 +-
 .../mobile/operation/agents/view_agents.php   |  18 +-
 .../mobile/operation/agents/view_alerts.php   |   2 +-
 .../mobile/operation/events/events.php        |  12 +-
 .../mobile/operation/servers/view_servers.php |   2 +-
 .../agentes/alerts_status.functions.php       |  12 +-
 .../operation/agentes/alerts_status.php       |  46 ++--
 .../operation/agentes/custom_fields.php       |   6 +-
 .../operation/agentes/datos_agente.php        |   4 +-
 .../operation/agentes/estado_agente.php       |  34 +--
 .../agentes/estado_generalagente.php          |  10 +-
 .../operation/agentes/estado_monitores.php    |  36 +--
 .../agentes/estado_ultimopaquete.php          |  42 +--
 .../operation/agentes/exportdata.php          |  26 +-
 .../operation/agentes/gis_view.php            |  16 +-
 pandora_console/operation/agentes/graphs.php  |  20 +-
 .../operation/agentes/group_view.php          |   2 +-
 .../operation/agentes/networkmap.groups.php   |   2 +-
 .../operation/agentes/networkmap.php          |  54 ++--
 .../operation/agentes/networkmap.topology.php |   2 +-
 .../operation/agentes/sla_view.php            |  12 +-
 .../operation/agentes/stat_win.php            |  30 +--
 .../operation/agentes/status_monitor.php      |  22 +-
 .../operation/agentes/tactical.php            |   4 +-
 .../operation/agentes/ver_agente.php          |  36 +--
 pandora_console/operation/events/events.php   |  12 +-
 .../operation/events/events_list.php          |  66 ++---
 .../operation/events/events_validate.php      |  16 +-
 .../operation/events/export_csv.php           |   2 +-
 .../operation/events/sound_events.php         |  16 +-
 pandora_console/operation/extensions.php      |   2 +-
 pandora_console/operation/gis_maps/ajax.php   |   6 +-
 pandora_console/operation/gis_maps/index.php  |   4 +-
 .../operation/gis_maps/render_view.php        |  42 +--
 .../operation/incidents/incident.files.php    |  18 +-
 .../operation/incidents/incident.incident.php |  36 +--
 .../operation/incidents/incident.list.php     |  12 +-
 .../operation/incidents/incident.php          |  14 +-
 .../operation/incidents/incident.tracking.php |   2 +-
 .../incidents/incident.workunits.php          |  22 +-
 .../operation/incidents/incident_detail.php   |  50 ++--
 .../integria_incidents/incident.files.php     |  18 +-
 .../integria_incidents/incident.incident.php  |  36 +--
 .../integria_incidents/incident.list.php      |  12 +-
 .../operation/integria_incidents/incident.php |  14 +-
 .../integria_incidents/incident.tracking.php  |   2 +-
 .../integria_incidents/incident.workunits.php |  22 +-
 .../integria_incidents/incident_detail.php    |  50 ++--
 .../operation/messages/message.php            |  34 +--
 .../operation/reporting/custom_reporting.php  |   6 +-
 .../operation/reporting/graph_viewer.php      |  16 +-
 .../operation/reporting/reporting_viewer.php  |  22 +-
 .../operation/reporting/reporting_xml.php     |   4 +-
 pandora_console/operation/search_agents.php   |  24 +-
 pandora_console/operation/search_alerts.php   |  22 +-
 pandora_console/operation/search_graphs.php   |   2 +-
 pandora_console/operation/search_maps.php     |   2 +-
 pandora_console/operation/search_modules.php  |  14 +-
 pandora_console/operation/search_reports.php  |   6 +-
 pandora_console/operation/search_results.php  |  14 +-
 pandora_console/operation/search_users.php    |  28 +-
 .../operation/servers/view_server.php         |   2 +-
 .../operation/servers/view_server_detail.php  |  12 +-
 .../operation/snmpconsole/snmp_view.php       |  58 ++---
 pandora_console/operation/users/user_edit.php |  32 +--
 .../operation/visual_console/index.php        |   4 +-
 .../operation/visual_console/render_view.php  |  16 +-
 237 files changed, 2736 insertions(+), 2488 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 98ec716012..298d1aa587 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,245 @@
+2011-04-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/functions_graph.php
+	include/functions_users.php
+	include/functions_events.php
+	include/functions_html.php
+	include/functions_menu.php
+	include/styles/pandora.css
+	include/graphs/functions_pchart.php
+	include/functions_messages.php
+	include/functions_exportserver.php
+	include/functions_modules.php
+	include/functions_reporting.php
+	include/functions_filemanager.php
+	include/functions_groups.php
+	include/functions_gis.php
+	include/functions_networkmap.php
+	include/functions_servers.php
+	include/functions_network_components.php
+	include/functions_visual_map.php
+	include/ajax/skins.ajax.php
+	include/ajax/visual_console_builder.ajax.php
+	include/help/en/help_gis_map_builder.php
+	include/help/en/help_agent_status.php
+	include/help/en/help_eventview.php
+	include/help/en/help_configure_gis_map.php
+	include/help/en/help_cascade_protection.php
+	include/help/en/help_setup_gis_index.php
+	include/help/es/help_gis_map_builder.php
+	include/help/es/help_agent_status.php
+	include/help/es/help_eventview.php
+	include/help/es/help_configure_gis_map.php
+	include/help/es/help_cascade_protection.php
+	include/help/ja/help_gis_map_builder.php
+	include/help/ja/help_agent_status.php
+	include/help/ja/help_eventview.php
+	include/help/ja/help_configure_gis_map.php
+	include/help/ja/help_cascade_protection.php
+	include/help/ja/help_setup_gis_index.php
+	include/functions_ui.php
+	include/functions_incidents.php
+	include/functions.php
+	include/functions_agents.php
+	include/functions_db.php
+	include/functions_fsgraph.php
+	include/functions_extensions.php
+	include/functions_ui_renders.php
+	extensions/insert_data.php
+	extensions/system_info.php
+	extensions/extension_uploader.php
+	extensions/agents_modules.php
+	extensions/dbmanager.php
+	extensions/resource_registration.php
+	extensions/resource_exportation.php
+	extensions/users_connected.php
+	extensions/module_groups.php
+	extensions/update_manager/settings.php
+	extensions/update_manager/main.php
+	operation/incidents/incident.incident.php
+	operation/incidents/incident.php
+	operation/incidents/incident.files.php
+	operation/incidents/incident.tracking.php
+	operation/incidents/incident_detail.php
+	operation/incidents/incident.workunits.php
+	operation/incidents/incident.list.php
+	operation/search_modules.php
+	operation/extensions.php
+	operation/visual_console/render_view.php
+	operation/visual_console/index.php
+	operation/agentes/status_monitor.php
+	operation/agentes/estado_ultimopaquete.php
+	operation/agentes/datos_agente.php
+	operation/agentes/alerts_status.php
+	operation/agentes/estado_generalagente.php
+	operation/agentes/custom_fields.php
+	operation/agentes/estado_agente.php
+	operation/agentes/networkmap.topology.php
+	operation/agentes/alerts_status.functions.php
+	operation/agentes/networkmap.groups.php
+	operation/agentes/sla_view.php
+	operation/agentes/exportdata.php
+	operation/agentes/gis_view.php
+	operation/agentes/estado_monitores.php
+	operation/agentes/ver_agente.php
+	operation/agentes/graphs.php
+	operation/agentes/tactical.php
+	operation/agentes/group_view.php
+	operation/agentes/networkmap.php
+	operation/agentes/stat_win.php
+	operation/servers/view_server.php
+	operation/servers/view_server_detail.php
+	operation/search_agents.php
+	operation/search_graphs.php
+	operation/snmpconsole/snmp_view.php
+	operation/users/user_edit.php
+	operation/integria_incidents/incident.incident.php
+	operation/integria_incidents/incident.php
+	operation/integria_incidents/incident.files.php
+	operation/integria_incidents/incident.tracking.php
+	operation/integria_incidents/incident_detail.php
+	operation/integria_incidents/incident.workunits.php
+	operation/integria_incidents/incident.list.php
+	operation/gis_maps/render_view.php
+	operation/gis_maps/ajax.php
+	operation/gis_maps/index.php
+	operation/events/export_csv.php
+	operation/events/sound_events.php
+	operation/events/events_validate.php
+	operation/events/events_list.php
+	operation/events/events.php
+	operation/search_alerts.php
+	operation/messages/message.php
+	operation/reporting/reporting_xml.php
+	operation/reporting/reporting_viewer.php
+	operation/reporting/graph_viewer.php
+	operation/reporting/custom_reporting.php
+	operation/search_reports.php
+	operation/search_maps.php
+	operation/search_results.php
+	operation/search_users.php
+	mobile/operation/agents/monitor_status.php
+	mobile/operation/agents/view_agents.php
+	mobile/operation/agents/tactical.php
+	mobile/operation/agents/view_alerts.php
+	mobile/operation/agents/group_view.php
+	mobile/operation/events/events.php
+	mobile/operation/servers/view_servers.php
+	mobile/include/user.class.php
+	general/pandora_help.php
+	general/noaccess.php
+	general/login_page.php
+	general/logon_ok.php
+	general/logoff.php
+	general/ui/agents_list.php
+	general/header.php
+	godmode/groups/modu_group_list.php
+	godmode/groups/configure_group.php
+	godmode/groups/configure_modu_group.php
+	godmode/groups/group_list.php
+	godmode/admin_access_logs.php
+	godmode/extensions.php
+	godmode/db/db_sanity.php
+	godmode/db/db_refine.php
+	godmode/db/db_info.php
+	godmode/db/db_event.php
+	godmode/db/db_purge.php
+	godmode/agentes/agent_template.php
+	godmode/agentes/module_manager_editor_common.php
+	godmode/agentes/module_manager_editor_network.php
+	godmode/agentes/fields_manager.php
+	godmode/agentes/module_manager_editor_wmi.php
+	godmode/agentes/module_manager_editor_plugin.php
+	godmode/agentes/agent_conf_gis.php
+	godmode/agentes/module_manager_editor_prediction.php
+	godmode/agentes/module_manager.php
+	godmode/agentes/modificar_agente.php
+	godmode/agentes/configurar_agente.php
+	godmode/agentes/configure_field.php
+	godmode/agentes/module_manager_editor.php
+	godmode/agentes/planned_downtime.php
+	godmode/agentes/manage_config_remote.php
+	godmode/agentes/agent_manager.php
+	godmode/servers/recon_script.php
+	godmode/servers/plugin.php
+	godmode/servers/manage_recontask.php
+	godmode/servers/modificar_server.php
+	godmode/servers/manage_recontask_form.php
+	godmode/alerts/alert_list.list.php
+	godmode/alerts/configure_alert_compound.php
+	godmode/alerts/alert_compounds.php
+	godmode/alerts/alert_list.php
+	godmode/alerts/configure_alert_template.php
+	godmode/alerts/alert_templates.php
+	godmode/alerts/configure_alert_action.php
+	godmode/alerts/configure_alert_command.php
+	godmode/alerts/alert_actions.php
+	godmode/alerts/alert_list.builder.php
+	godmode/alerts/alert_commands.php
+	godmode/snmpconsole/snmp_alert.php
+	godmode/snmpconsole/snmp_filters.php
+	godmode/setup/file_manager.php
+	godmode/setup/os.list.php
+	godmode/setup/news.php
+	godmode/setup/gis_step_2.php
+	godmode/setup/links.php
+	godmode/setup/setup.php
+	godmode/setup/os.php
+	godmode/setup/performance.php
+	godmode/setup/setup_auth.php
+	godmode/setup/gis.php
+	godmode/setup/os.builder.php
+	godmode/setup/setup_visuals.php
+	godmode/users/user_list.php
+	godmode/users/configure_user.php
+	godmode/users/configure_profile.php
+	godmode/gis_maps/configure_gis_map.php
+	godmode/gis_maps/index.php
+	godmode/massive/massive_add_alerts.php
+	godmode/massive/massive_copy_modules.php
+	godmode/massive/massive_delete_agents.php
+	godmode/massive/massive_enable_disable_alerts.php
+	godmode/massive/massive_operations.php
+	godmode/massive/massive_delete_profiles.php
+	godmode/massive/massive_edit_agents.php
+	godmode/massive/massive_delete_action_alerts.php
+	godmode/massive/massive_delete_modules.php
+	godmode/massive/massive_add_profiles.php
+	godmode/massive/massive_delete_alerts.php
+	godmode/massive/massive_edit_modules.php
+	godmode/massive/massive_standby_alerts.php
+	godmode/massive/massive_add_action_alerts.php
+	godmode/modules/manage_network_components_form.php
+	godmode/modules/manage_nc_groups_form.php
+	godmode/modules/manage_network_templates.php
+	godmode/modules/module_list.php
+	godmode/modules/manage_network_components_form_common.php
+	godmode/modules/manage_network_components_form_network.php
+	godmode/modules/manage_network_templates_form.php
+	godmode/modules/manage_network_components_form_wmi.php
+	godmode/modules/manage_network_components.php
+	godmode/modules/manage_nc_groups.php
+	godmode/modules/manage_network_components_form_plugin.php
+	godmode/reporting/reporting_builder.list_items.php
+	godmode/reporting/graph_builder.main.php
+	godmode/reporting/visual_console_builder.wizard.php
+	godmode/reporting/visual_console_builder.php
+	godmode/reporting/reporting_builder.preview.php
+	godmode/reporting/reporting_builder.main.php
+	godmode/reporting/visual_console_builder.data.php
+	godmode/reporting/visual_console_builder.elements.php
+	godmode/reporting/graph_builder.php
+	godmode/reporting/graph_builder.graph_editor.php
+	godmode/reporting/reporting_builder.php
+	godmode/reporting/visual_console_builder.editor.php
+	godmode/reporting/reporting_builder.item_editor.php
+	godmode/reporting/map_builder.php
+	godmode/reporting/graphs.php
+	godmode/reporting/graph_builder.preview.php: Now functions on 
+	functions_html.php, functions_gis.php, functions_filemanager.php, 
+	functions_exportserver.php have "html_", "gis_", "filemanager_" and
+	"exportserver_" prefix respectively.
+
 2011-04-26  Sergio Martin <sergio.martin@artica.es>
 
 	* include/graphs/functions_pchart.php
diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 3874aeb19f..97e8aa07e4 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -59,7 +59,7 @@ function mainAgentsModules() {
 		$updated_info = __("Updated at realtime");
 	}
 	
-	$updated_time = print_image ("images/information.png", true, array ("title" => __('Last update'), "style" => 'margin: 5px 3px 0px 10px')).$updated_info;
+	$updated_time = html_print_image ("images/information.png", true, array ("title" => __('Last update'), "style" => 'margin: 5px 3px 0px 10px')).$updated_info;
 
 	$modulegroup = get_parameter('modulegroup', 0);
 	$refr = get_parameter('refr', 30); // By default 30 seconds
@@ -73,28 +73,28 @@ function mainAgentsModules() {
 
 	$filter_module_groups = '<form method="post" action="' . ui_get_url_refresh (array ('offset' => 0, 'hor_offset' => 0)).'">';
 	$filter_module_groups .= '<b>'.__('Module group').'</b>';
-	$filter_module_groups .= print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
+	$filter_module_groups .= html_print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
 		'modulegroup', $modulegroup, 'this.form.submit()',__('All'), 0, true, false, true, false, 'width: 100px; margin-right: 10px; margin-top: 5px;');
 	$filter_module_groups .= '</form>';
 	
 	$filter_groups = '<form method="post" action="' . ui_get_url_refresh (array ('offset' => 0, 'hor_offset' => 0)).'">';
 	$filter_groups .= '<b>'.__('Group').'</b>';
-	$filter_groups .= print_select_groups(false, "AR", true, 'group_id', $group_id, 'this.form.submit()', '', '', true, false, true, '', false , 'width: 100px; margin-right: 10px;; margin-top: 5px;');
+	$filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, 'this.form.submit()', '', '', true, false, true, '', false , 'width: 100px; margin-right: 10px;; margin-top: 5px;');
 	$filter_groups .= '</form>';
 	
 	$comborefr = '<form method="post" action="' . ui_get_url_refresh (array ('offset' => 0, 'hor_offset' => 0)).'">';
 	$comborefr .= '<b>'.__('Refresh').'</b>';
-	$comborefr .= print_select (array('30' => '30 '.__('seconds'), '60' => '1 '.__('minute'), '120' => '2 '.__('minutes'), '300' => '5 '.__('minutes'), '600' => '10 '.__('minutes')) , 'refr', $config['refr'], $script = 'this.form.submit()', '', 0, true, false, false, '', false, 'width: 100px; margin-right: 10px; margin-top: 5px;');
+	$comborefr .= html_print_select (array('30' => '30 '.__('seconds'), '60' => '1 '.__('minute'), '120' => '2 '.__('minutes'), '300' => '5 '.__('minutes'), '600' => '10 '.__('minutes')) , 'refr', $config['refr'], $script = 'this.form.submit()', '', 0, true, false, false, '', false, 'width: 100px; margin-right: 10px; margin-top: 5px;');
 	$comborefr .= "</form>";
 	
 	if ($config["pure"] == 0) {
 		$fullscreen = '<a href="index.php?extension_in_menu=estado&amp;sec=extensions&amp;sec2=extensions/agents_modules&amp;pure=1&amp;offset='.$offset.'&group_id='.$group_id.'&modulegroup='.$modulegroup.'">'
-			. print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
+			. html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
 			. "</a>";
 	}
 	else {
 		$fullscreen = '<a href="index.php?extension_in_menu=estado&amp;sec=extensions&amp;sec2=extensions/agents_modules&amp;refr=0&amp;offset='.$offset.'&group_id='.$group_id.'&modulegroup='.$modulegroup.'">'
-			. print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
+			. html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
 			. "</a>";
 		$config['refr'] = $refr;
 	}
@@ -168,7 +168,7 @@ function mainAgentsModules() {
 
 	if($hor_offset > 0) {
 		$new_hor_offset = $hor_offset-$block;
-		echo "<th width='20px' style='vertical-align:top; padding-top: 35px;' rowspan='".($nagents+1)."'><a href='index.php?sec=extensions&sec2=extensions/agents_modules&refr=0&hor_offset=".$new_hor_offset."&offset=".$offset."&group_id=".$group_id."&modulegroup=".$modulegroup."'>".print_image("images/darrowleft.png",true, array('title' => __('Previous modules')))."</a> </th>";
+		echo "<th width='20px' style='vertical-align:top; padding-top: 35px;' rowspan='".($nagents+1)."'><a href='index.php?sec=extensions&sec2=extensions/agents_modules&refr=0&hor_offset=".$new_hor_offset."&offset=".$offset."&group_id=".$group_id."&modulegroup=".$modulegroup."'>".html_print_image("images/darrowleft.png",true, array('title' => __('Previous modules')))."</a> </th>";
 	}
 	$nmodules = 0;
 	foreach($modules_by_name as $module) {
@@ -179,12 +179,12 @@ function mainAgentsModules() {
 		}
 		
 		$file_name = string2image(ui_print_truncate_text($module['name'],15, false, true, false, '...'), 115, 13, 3, 270, '#9EAC8B', 'FFF', 4, 0);
-		echo '<th width="22px">'.print_image($file_name, true, array('title' => $module['name']))."</th>";
+		echo '<th width="22px">'.html_print_image($file_name, true, array('title' => $module['name']))."</th>";
 	}
 	
 	if(($hor_offset + $block) < $nmodules) {
 		$new_hor_offset = $hor_offset+$block;
-		echo "<th width='20px' style='vertical-align:top; padding-top: 35px;' rowspan='".($nagents+1)."'><a href='index.php?sec=extensions&sec2=extensions/agents_modules&hor_offset=".$new_hor_offset."&offset=".$offset."&group_id=".$group_id."&modulegroup=".$modulegroup."'>".print_image("images/darrowright.png",true, array('title' => __('More modules')))."</a> </th>";
+		echo "<th width='20px' style='vertical-align:top; padding-top: 35px;' rowspan='".($nagents+1)."'><a href='index.php?sec=extensions&sec2=extensions/agents_modules&hor_offset=".$new_hor_offset."&offset=".$offset."&group_id=".$group_id."&modulegroup=".$modulegroup."'>".html_print_image("images/darrowright.png",true, array('title' => __('More modules')))."</a> </th>";
 	}
 
 	$filter_agents = false;
@@ -227,7 +227,7 @@ function mainAgentsModules() {
 		echo "<tr style='height: 35px;'>";
 		
 		$file_name = string2image(ui_print_truncate_text($agent['nombre'],19, false, true, false, '...'), 140, 15, 3, 0, $rowcolor, $textcolor, 4, 0);
-		echo "<td style='background-color: ".$rowcolor.";'><a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$agent['id_agente']."'>".print_image($file_name, true, array('title' => $agent['nombre']))."</a></td>";
+		echo "<td style='background-color: ".$rowcolor.";'><a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$agent['id_agente']."'>".html_print_image($file_name, true, array('title' => $agent['nombre']))."</a></td>";
 		$agent_modules = get_agent_modules($agent['id_agente']);
 		
 		$nmodules = 0;
diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index cd4fc34a56..49b2d8e842 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -102,10 +102,10 @@ function dbmgr_extension_main () {
 
 	echo "<br /><br />";
 	echo "<form method='post' action=''>";
-	print_textarea ('sql', 5, 40, html_entity_decode($sql, ENT_QUOTES));
+	html_print_textarea ('sql', 5, 40, html_entity_decode($sql, ENT_QUOTES));
 	echo '<br />';
 	echo '<div class="action-buttons" style="width: 96%">';
-	print_submit_button (__('Execute SQL'), '', false, 'class="sub next"');
+	html_print_submit_button (__('Execute SQL'), '', false, 'class="sub next"');
 	echo '</div>';
 	echo "</form>";
 
@@ -143,7 +143,7 @@ function dbmgr_extension_main () {
 	
 	$table->data = $result;
 	
-	print_table ($table);
+	html_print_table ($table);
 }
 
 /* This adds a option in the operation menu */
diff --git a/pandora_console/extensions/extension_uploader.php b/pandora_console/extensions/extension_uploader.php
index c4228dd0ba..da88f5a4ba 100644
--- a/pandora_console/extensions/extension_uploader.php
+++ b/pandora_console/extensions/extension_uploader.php
@@ -55,14 +55,14 @@ function extension_uploader_extensions() {
 	$table->width = '50%';
 	$table->data = array();
 	$table->data[0][0] = __('Upload extension');
-	$table->data[0][1] = print_input_file('extension', true) .
+	$table->data[0][1] = html_print_input_file('extension', true) .
 		ui_print_help_tip (__("Upload the extension as a zip file."), true);
 	
 	echo "<form method='post' enctype='multipart/form-data'>";
-	print_table($table);
+	html_print_table($table);
 	echo "<div style='text-align: right; width: " . $table->width . "'>";
-	print_input_hidden('upload', 1);
-	print_submit_button(__('Upload'), 'submit', false, 'class="sub add"');
+	html_print_input_hidden('upload', 1);
+	html_print_submit_button(__('Upload'), 'submit', false, 'class="sub add"');
 	echo "</div>";
 	echo "</form>";
 }
diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 259c1d9097..a143d4a6f1 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -116,30 +116,30 @@ function mainInsertData() {
 	
 	$table->data = array();
 	$table->data[0][0] = __('Agent');
-	$table->data[0][1] = print_input_text_extended ('id_agent', $id_agent, 'text_id_agent', '', 30, 100, false, '',
+	$table->data[0][1] = html_print_input_text_extended ('id_agent', $id_agent, 'text_id_agent', '', 30, 100, false, '',
 		array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
 		. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 	$table->data[1][0] = __('Module');
 	$modules = array ();
 	if ($id_agent)
 		$modules = get_agent_modules ($id_agent, false, array("delete_pending" => 0));
-	$table->data[1][1] = print_select ($modules, 'id_agent_module', $id_agent_module, true,
+	$table->data[1][1] = html_print_select ($modules, 'id_agent_module', $id_agent_module, true,
 		__('Select'), 0, true, false, true, '', ($id_agent === ''));
 	$table->data[2][0] = __('Data');
-	$table->data[2][1] = print_input_text('data', $data, __('Data'), 40, 60, true);
+	$table->data[2][1] = html_print_input_text('data', $data, __('Data'), 40, 60, true);
 	$table->data[3][0] = __('Date');
-	$table->data[3][1] = print_input_text ('date', $date, '', 11, 11, true).' ';
-	$table->data[3][1] .= print_input_text ('time', $time, '', 7, 7, true);
+	$table->data[3][1] = html_print_input_text ('date', $date, '', 11, 11, true).' ';
+	$table->data[3][1] .= html_print_input_text ('time', $time, '', 7, 7, true);
 	$table->data[4][0] = __('CSV');
-	$table->data[4][1] = print_input_file('csv', true);
+	$table->data[4][1] = html_print_input_file('csv', true);
 	
 	echo "<form method='post' enctype='multipart/form-data'>";
 	
-	print_table($table);
+	html_print_table($table);
 	
 	echo "<div style='text-align: right; width: " . $table->width . "'>";
-	print_input_hidden('save', 1);
-	print_submit_button(__('Save'), 'submit', ($id_agent === ''), 'class="sub next"');
+	html_print_input_hidden('save', 1);
+	html_print_submit_button(__('Save'), 'submit', ($id_agent === ''), 'class="sub next"');
 	echo "</div>";
 	
 	echo "</form>";
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 5b8f4adc58..c0cd065e5f 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -134,7 +134,7 @@ function mainModuleGroups() {
 	$head = $modelGroups;
 	array_unshift($head, '&nbsp;');
 	
-	//Metaobject use in print_table
+	//Metaobject use in html_print_table
 	$table = null;
 	$table->align[0] = 'right'; //Align to right the first column.
 	$table->style[0] = 'color: #ffffff; background-color: #778866; font-weight: bolder;';
@@ -231,7 +231,7 @@ function mainModuleGroups() {
 	}
 	$table->data = $tableData;
 	echo "<div style='width:98%; overflow-x:scroll;'>";
-	print_table($table);
+	html_print_table($table);
 	echo "</div>";
 	
 	echo "<p>" . __("The colours meaning:") .
diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index c4c6a1ef34..ad43460e9f 100644
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -352,16 +352,16 @@ function resource_exportation_extension_main() {
 	$table->style[1] = 'width: 10%;';
 	$table->class = "databox_color";
 	$table->data[0][0] = __('Report');
-	$table->data[0][1] = print_select_from_sql('SELECT id_report, name FROM treport', 'report', '', '', '', 0, true);
-	$table->data[0][2] = print_button(__('Export'), '', false, 'export_to_ptr(\'report\');', 'class="sub"', true);
+	$table->data[0][1] = html_print_select_from_sql('SELECT id_report, name FROM treport', 'report', '', '', '', 0, true);
+	$table->data[0][2] = html_print_button(__('Export'), '', false, 'export_to_ptr(\'report\');', 'class="sub"', true);
 	$table->data[1][0] = __('Visual console');
-	$table->data[1][1] = print_select_from_sql('SELECT id, name FROM tlayout', 'visual_console', '', '', '', 0, true);
-	$table->data[1][2] = print_button(__('Export'), '', false, 'export_to_ptr(\'visual_console\');', 'class="sub"', true);
+	$table->data[1][1] = html_print_select_from_sql('SELECT id, name FROM tlayout', 'visual_console', '', '', '', 0, true);
+	$table->data[1][2] = html_print_button(__('Export'), '', false, 'export_to_ptr(\'visual_console\');', 'class="sub"', true);
 	
 	if ($hook_enterprise === true)
 		add_rows_for_enterprise($table->data);
 	
-	print_table($table);
+	html_print_table($table);
 	
 	?>
 	<script type="text/javascript">
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 4cccbd7092..654f86248a 100644
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -843,7 +843,7 @@ function resource_registration_extension_main() {
 			echo "<tr>";
 				echo "<td>" . __('Group filter: ') . "</td>";
 				echo "<td>";
-					print_select_groups(false, "AW", true, 'group');
+					html_print_select_groups(false, "AW", true, 'group');
 				echo "</td>";
 				echo "<td class='datos'><input type='submit' class='sub next' value='".__('Upload')."' />";
 			echo "</tr>";
diff --git a/pandora_console/extensions/system_info.php b/pandora_console/extensions/system_info.php
index 8c8ab2c7e1..f3236b325d 100644
--- a/pandora_console/extensions/system_info.php
+++ b/pandora_console/extensions/system_info.php
@@ -233,7 +233,7 @@ function show_array($title, $anchor, $array = array()) {
 	
 	echo "<h1><a name='" . $anchor . "'>" . $title . "</a></h1>";
 	
-	print_table($table);
+	html_print_table($table);
 }
 
 function mainSystemInfo() {
@@ -272,27 +272,27 @@ function mainSystemInfo() {
 	else {
 		$table->data[0][0] = __('Pandora Diagnostic info');
 	}
-	$table->data[0][1] = print_checkbox('pandora_diag', 1, $pandora_diag, true);
+	$table->data[0][1] = html_print_checkbox('pandora_diag', 1, $pandora_diag, true);
 	if ($system_info) {
 		$table->data[1][0] = '<a href="#system_info">' . __('System info') . '</a>';
 	}
 	else {
 		$table->data[1][0] = __('System info');
 	}
-	$table->data[1][1] = print_checkbox('system_info', 1, $system_info, true);
+	$table->data[1][1] = html_print_checkbox('system_info', 1, $system_info, true);
 	if ($log_info) {
 		$table->data[2][0] = '<a href="#log_info">' . __('Log Info') . '</a>';
 	}
 	else {
 		$table->data[2][0] = __('Log Info');
 	}
-	$table->data[2][1] = print_checkbox('log_info', 1, $log_info, true);
+	$table->data[2][1] = html_print_checkbox('log_info', 1, $log_info, true);
 	$table->data[3][0] = __('Number lines of log');
-	$table->data[3][1] = print_input_text('log_num_lines', $log_num_lines, __('Number lines of log'), 5, 10, true);
-	print_table($table);
+	$table->data[3][1] = html_print_input_text('log_num_lines', $log_num_lines, __('Number lines of log'), 5, 10, true);
+	html_print_table($table);
 	echo "<div style='width: " . $table->width . "; text-align: right;'>";
-	//print_submit_button(__('Show'), 'show', false, 'class="sub next"');
-		print_submit_button(__('Generate file'), 'generate', false, 'class="sub next"');
+	//html_print_submit_button(__('Show'), 'show', false, 'class="sub next"');
+		html_print_submit_button(__('Generate file'), 'generate', false, 'class="sub next"');
 	echo "</div>";
 	echo "</form>";
 	
diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php
index a8518ea6b3..bd7fc28d95 100644
--- a/pandora_console/extensions/update_manager/main.php
+++ b/pandora_console/extensions/update_manager/main.php
@@ -27,7 +27,7 @@ ui_print_page_header (__('Update manager'), "images/extensions.png", false, "",
 
 if ($settings->customer_key == FREE_USER) {
 	echo '<div class="notify" style="width: 80%; text-align:left;" >';
-	echo print_image("images/information.png", true) . '&nbsp;'; 
+	echo html_print_image("images/information.png", true) . '&nbsp;'; 
 	/* Translators: Do not translade Update Manager, it's the name of the program */
 	echo __('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS 3.0. It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.');
 	echo '<p />';
@@ -169,14 +169,14 @@ if (check_acl ($config['id_user'], 0, 'PM')) {
 		$table->data[2][0] = '<strong>'.__('Description').'</strong>';
 		$table->data[2][1] = html_entity_decode ($package->description);
 	
-		print_table ($table);
+		html_print_table ($table);
 		echo '<div class="action-buttons" style="width: '.$table->width.'">';
 		echo '<form method="post">';
 		echo __('Overwrite local changes');
-		print_checkbox ('force_update', '1', false);
+		html_print_checkbox ('force_update', '1', false);
 		echo '<p />';
-		print_input_hidden ('update_package', 1);
-		print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
+		html_print_input_hidden ('update_package', 1);
+		html_print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
 		echo '</form>';
 		echo '</div>';
 	}
@@ -197,7 +197,7 @@ if (check_acl ($config['id_user'], 0, 'PM')) {
 	$table->data[1][1] = '<input type="submit" name="upload_button" value="'.__('Upload').'">';
 	
 	echo '<form method="post" enctype="multipart/form-data">';
-	print_table($table);
+	html_print_table($table);
 	echo '</form>';
 
 } 
diff --git a/pandora_console/extensions/update_manager/settings.php b/pandora_console/extensions/update_manager/settings.php
index 91ee84bf84..667c63b70c 100644
--- a/pandora_console/extensions/update_manager/settings.php
+++ b/pandora_console/extensions/update_manager/settings.php
@@ -44,39 +44,39 @@ $table->width = '95%';
 $table->data = array ();
 
 $table->data[0][0] = '<strong>'.__('Customer key').'</strong>';
-$table->data[0][1] = print_input_text ('keys[customer_key]', $settings->customer_key, '', 40, 255, true);
+$table->data[0][1] = html_print_input_text ('keys[customer_key]', $settings->customer_key, '', 40, 255, true);
 
 $table->data[1][0] = '<strong>'.__('Update server host').'</strong>';
-$table->data[1][1] = print_input_text ('keys[update_server_host]', $settings->update_server_host, '', 20, 255, true);
+$table->data[1][1] = html_print_input_text ('keys[update_server_host]', $settings->update_server_host, '', 20, 255, true);
 
 $table->data[2][0] = '<strong>'.__('Update server path').'</strong>';
-$table->data[2][1] = print_input_text ('keys[update_server_path]', $settings->update_server_path, '', 40, 255, true);
+$table->data[2][1] = html_print_input_text ('keys[update_server_path]', $settings->update_server_path, '', 40, 255, true);
 
 $table->data[3][0] = '<strong>'.__('Update server port').'</strong>';
-$table->data[3][1] = print_input_text ('keys[update_server_port]', $settings->update_server_port, '', 5, 5, true);
+$table->data[3][1] = html_print_input_text ('keys[update_server_port]', $settings->update_server_port, '', 5, 5, true);
 
 $table->data[4][0] = '<strong>'.__('Binary input path').'</strong>';
-$table->data[4][1] = print_input_text ('keys[updating_binary_path]', $settings->updating_binary_path, '', 40, 255, true);
+$table->data[4][1] = html_print_input_text ('keys[updating_binary_path]', $settings->updating_binary_path, '', 40, 255, true);
 
 $table->data[5][0] = '<strong>'.__('Keygen path').'</strong>';
-$table->data[5][1] = print_input_text ('keys[keygen_path]', $settings->keygen_path, '', 40, 255, true);
+$table->data[5][1] = html_print_input_text ('keys[keygen_path]', $settings->keygen_path, '', 40, 255, true);
 
 $table->data[6][0] = '<strong>'.__('Proxy server').'</strong>';
-$table->data[6][1] = print_input_text ('keys[proxy]', $settings->proxy, '', 40, 255, true);
+$table->data[6][1] = html_print_input_text ('keys[proxy]', $settings->proxy, '', 40, 255, true);
 
 $table->data[7][0] = '<strong>'.__('Proxy port').'</strong>';
-$table->data[7][1] = print_input_text ('keys[proxy_port]', $settings->proxy_port, '', 40, 255, true);
+$table->data[7][1] = html_print_input_text ('keys[proxy_port]', $settings->proxy_port, '', 40, 255, true);
 
 $table->data[8][0] = '<strong>'.__('Proxy user').'</strong>';
-$table->data[8][1] = print_input_text ('keys[proxy_user]', $settings->proxy_user, '', 40, 255, true);
+$table->data[8][1] = html_print_input_text ('keys[proxy_user]', $settings->proxy_user, '', 40, 255, true);
 
 $table->data[9][0] = '<strong>'.__('Proxy password').'</strong>';
-$table->data[9][1] = print_input_password ('keys[proxy_pass]', $settings->proxy_pass, '', 40, 255, true);
+$table->data[9][1] = html_print_input_password ('keys[proxy_pass]', $settings->proxy_pass, '', 40, 255, true);
 
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('update_settings', 1);
-print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
+html_print_input_hidden ('update_settings', 1);
+html_print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/extensions/users_connected.php b/pandora_console/extensions/users_connected.php
index ad43440b6c..fedd940a9f 100644
--- a/pandora_console/extensions/users_connected.php
+++ b/pandora_console/extensions/users_connected.php
@@ -85,7 +85,7 @@ function users_extension_main_god ($god = true) {
 			array_push ($table->data, $data);
 		}
 
-		print_table ($table);
+		html_print_table ($table);
 	}
 }
 add_godmode_menu_option (__('Users connected'), 'UM','gusuarios',"users/icon.png");
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index b328083d54..4811b53cc4 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -28,9 +28,9 @@ $msg_cnt = 0;
 		<a href="index.php?sec=main">
 <?php
 		if (!defined ('PANDORA_ENTERPRISE')){
-			echo print_image('images/pandora_header_logo.png', true, array("alt" => 'Pandora FMS Opensource', "border" => '0'));
+			echo html_print_image('images/pandora_header_logo.png', true, array("alt" => 'Pandora FMS Opensource', "border" => '0'));
 		} else {
-			echo print_image('images/pandora_header_logo_enterprise.png', true, array("alt" => 'Pandora FMS Enterprise', "border" => '0'));
+			echo html_print_image('images/pandora_header_logo_enterprise.png', true, array("alt" => 'Pandora FMS Enterprise', "border" => '0'));
 		}
 ?>
 		</a>
@@ -38,9 +38,9 @@ $msg_cnt = 0;
 		<td width="20%">
 			<?php 
 				if (is_user_admin ($config["id_user"]) == 1)
-					print_image("images/user_suit.png" , false, array("class" => 'bot', "alt" => 'user'));
+					html_print_image("images/user_suit.png" , false, array("class" => 'bot', "alt" => 'user'));
 				else
-					print_image("images/user_green.png" , false, array("class" => 'bot', "alt" => 'user'));
+					html_print_image("images/user_green.png" , false, array("class" => 'bot', "alt" => 'user'));
 			?>			
 			<a href="index.php?sec=usuarios&amp;sec2=operation/users/user_edit" class="white"> [<b><?php echo $config["id_user"];?></b>]</a>
 			<?php
@@ -54,14 +54,14 @@ $msg_cnt = 0;
 					ui_require_jquery_file ('ui.core');
 					ui_require_jquery_file ('ui.dialog');
 					echo '<a href="ajax.php?page=operation/messages/message" id="show_messages_dialog">';
-					print_image ("images/email.png", false,
+					html_print_image ("images/email.png", false,
 					array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot"));
 					echo '</a>';
 				}
 			}
 			?>
 			&nbsp;
-			<a class="white_bold" href="index.php?bye=bye"><?php print_image("images/log-out.png", false, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')))?></a>
+			<a class="white_bold" href="index.php?bye=bye"><?php html_print_image("images/log-out.png", false, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')))?></a>
 		</td>
 		
 		<td width="20%">
@@ -75,15 +75,15 @@ $msg_cnt = 0;
 			$servers["down"] = $servers["all"] - $servers["up"];
 			if ($servers["up"] == 0) {
 				//All Servers down or no servers at all
-				echo print_image("images/cross.png", true, array("alt" => 'cross', "class" => 'bot')) . '&nbsp;'.__('All systems').': '.__('Down');
+				echo html_print_image("images/cross.png", true, array("alt" => 'cross', "class" => 'bot')) . '&nbsp;'.__('All systems').': '.__('Down');
 			}
 			elseif ($servers["down"] != 0) {
 				//Some servers down
-				echo print_image("images/error.png", true, array("alt" => 'error', "class" => 'bot')) . '&nbsp;'.$servers["down"].' '.__('servers down');
+				echo html_print_image("images/error.png", true, array("alt" => 'error', "class" => 'bot')) . '&nbsp;'.$servers["down"].' '.__('servers down');
 			}
 			else {
 				//All servers up
-				echo print_image("images/ok.png", true, array("alt" => 'ok', "class" => 'bot')) . '&nbsp;'.__('All systems').': '.__('Ready');
+				echo html_print_image("images/ok.png", true, array("alt" => 'ok', "class" => 'bot')) . '&nbsp;'.__('All systems').': '.__('Ready');
 			}
 			unset ($servers); // Since this is the header, we don't like to trickle down variables.
 			echo '</a>';
@@ -100,13 +100,13 @@ $msg_cnt = 0;
 			$ignored_params = array ('agent_config' => false, 'code' => false);
 			if ($config["refr"]) {
 				$ignored_params['refr'] = 0;
-				echo '<a id="autorefresh" class="white_grey_bold" href="' . ui_get_url_refresh ($ignored_params).'">' . print_image("images/page_refresh.png", true, array("class" => 'bot', "alt" => 'lightning')) . '&nbsp;'. __('Autorefresh'); 
+				echo '<a id="autorefresh" class="white_grey_bold" href="' . ui_get_url_refresh ($ignored_params).'">' . html_print_image("images/page_refresh.png", true, array("class" => 'bot', "alt" => 'lightning')) . '&nbsp;'. __('Autorefresh'); 
 				echo ' (<span id="refrcounter">'.date ("i:s", $config["refr"]).'</span>)';
 				echo '</a>';
 			}
 			else {	
 				$ignored_params['refr'] = '';
-				echo '<a id="autorefresh" class="white_bold" href="' . ui_get_url_refresh ($ignored_params).'">' . print_image("images/page_refresh.png", true, array("class" => 'bot', "alt" => 'lightning')) . '&nbsp;'. __('Autorefresh'); 
+				echo '<a id="autorefresh" class="white_bold" href="' . ui_get_url_refresh ($ignored_params).'">' . html_print_image("images/page_refresh.png", true, array("class" => 'bot', "alt" => 'lightning')) . '&nbsp;'. __('Autorefresh'); 
 				$values = array (
 					'5' => '5 '.__('seconds'),
 					'10' => '10 '.__('seconds'),
@@ -119,7 +119,7 @@ $msg_cnt = 0;
 					'1800' => '30 '.__('minutes'),
 					'3600' => '1 '.__('hour'));
 				echo '<span id="combo_refr" style="display: none">';
-				print_select ($values, 'ref', '', '', __('Select'), '0', false, false, false);
+				html_print_select ($values, 'ref', '', '', __('Select'), '0', false, false, false);
 				unset ($values);
 				echo '</span>';
 			}
@@ -127,7 +127,7 @@ $msg_cnt = 0;
 		echo "<td width='20%' rowspan='2'>";
 		echo "<a href='index.php?sec=main'>";
 		if (isset($config["custom_logo"]))
-			echo print_image("images/custom_logo/" . $config["custom_logo"], true,array("height" => '60', "width" => '139', "alt" => 'Logo'));
+			echo html_print_image("images/custom_logo/" . $config["custom_logo"], true,array("height" => '60', "width" => '139', "alt" => 'Logo'));
 		echo "</a>";
 ?>
 		</td>
@@ -162,7 +162,7 @@ $msg_cnt = 0;
 		<td>
 		<?php
 if ($config["metaconsole"] == 0){
-	echo '<a class="white_bold" href="index.php?sec=eventos&amp;sec2=operation/events/events">' . print_image("images/lightning_go.png", true, array("alt" => 'lightning_go', "class" => 'bot')) . '&nbsp;'.__('Events').'</a>';
+	echo '<a class="white_bold" href="index.php?sec=eventos&amp;sec2=operation/events/events">' . html_print_image("images/lightning_go.png", true, array("alt" => 'lightning_go', "class" => 'bot')) . '&nbsp;'.__('Events').'</a>';
 }
 		?>
 		</td>
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 9e7e9cfed7..5647b55c18 100644
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -42,7 +42,7 @@ echo '<tr><td rowspan="3" align="left" style="border-right: solid 1px #678;">';
 
 if (!empty ($page) && !empty ($sec)) {
 	foreach ($_POST as $key => $value) {
-		print_input_hidden ($key, $value);
+		html_print_input_hidden ($key, $value);
 	}
 }
 
@@ -52,7 +52,7 @@ if (!empty ($page) && !empty ($sec)) {
 // Replace the following with your own URL and logo.
 // A mashup of the Pandora FMS logo and your companies highly preferred
 echo '<a href="http://pandorafms.org" title="Go to pandorafms.org...">';
-print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0));
+html_print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0));
 echo '</a><br />';
 
 // This prints the current pandora console version.
@@ -62,13 +62,13 @@ echo $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_versi
 /* CUSTOM BRANDING ENDS HERE */
 
 echo '</td><td class="f9b">
-		'.__('Login').':<br />'.print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login"', true).'
+		'.__('Login').':<br />'.html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login"', true).'
 	</td></tr>
 	<tr><td class="f9b">
-		'.__('Password').':<br />'.print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login"', true, true).'
+		'.__('Password').':<br />'.html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login"', true, true).'
 	</td></tr>
 	<tr><td align="center">
-		'.print_submit_button ("Login",'',false,'class="sub next"',true).'
+		'.html_print_submit_button ("Login",'',false,'class="sub next"',true).'
 	</td></tr>
 	</table>
 	</form>
diff --git a/pandora_console/general/logoff.php b/pandora_console/general/logoff.php
index 6fef38df18..692fa43592 100644
--- a/pandora_console/general/logoff.php
+++ b/pandora_console/general/logoff.php
@@ -22,7 +22,7 @@
 		<tr><td align="left">
 			<?php
 				echo '<a href="index.php">';
-				print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0));
+				html_print_image ("images/pandora_logo.png", false, array ("alt" => "logo", "border" => 0));
 				echo '</a> '.$pandora_version;
 			?>
 		</td><td valign="bottom">
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 8bf97509d2..5b111ccc28 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -86,7 +86,7 @@ $table->data[4][0] = '<b>'.__('Alert level').'</b>';
 $table->data[5][0] =
 	progress_bar2($data["alert_level"], 280, 20, $data["alert_level"].'% '.__('of defined alerts not fired'), 0);
 
-print_table ($table);
+html_print_table ($table);
 unset ($table);
 
 echo '<table class="databox" cellpadding="4" cellspacing="4" width="100%">';
@@ -214,7 +214,7 @@ foreach ($sessions as $session) {
 	array_push ($table->data, $data);
 }
 echo "<div style='width:100%; overflow-x:scroll;'>";
-print_table ($table);
+html_print_table ($table);
 echo "</div>";
 echo "</div>"; // activity
 ?>
diff --git a/pandora_console/general/noaccess.php b/pandora_console/general/noaccess.php
index e671b3a602..98a6012e29 100644
--- a/pandora_console/general/noaccess.php
+++ b/pandora_console/general/noaccess.php
@@ -26,7 +26,7 @@ if (file_exists("images/noaccess.png")){
 
 <?php
 	if (file_exists("images/noaccess.png")){
-		echo print_image('images/noaccess.png', true, array("alt" => __('No access')));
+		echo html_print_image('images/noaccess.png', true, array("alt" => __('No access')));
 	}
 ?>
 		<div>&nbsp;</div>
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index 6da6782ef0..4fc2f5819b 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -50,7 +50,7 @@ if (! $id || ! file_exists ($help_file)) {
 	echo __('Help system error');
 	echo "</h1>";
 	echo "<div class='noa'>";
-	echo '<a href="../index.php">' . print_image("../images/pandora_logo.png", array("border" => '0')) . '</a><br>';
+	echo '<a href="../index.php">' . html_print_image("../images/pandora_logo.png", array("border" => '0')) . '</a><br>';
 	echo "</div>";
 	echo '<div class="msg">'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'</div></div></div>';
 	return;
@@ -59,7 +59,7 @@ if (! $id || ! file_exists ($help_file)) {
 /* Show help */
 echo '<div>';
 echo '<span style="float:left; margin: 0px; padding: 0px">';
-echo print_image('../images/pandora_textlogo.png', true, array("border" => '0'));
+echo html_print_image('../images/pandora_textlogo.png', true, array("border" => '0'));
 echo "</span>";
 echo '<p style="text-align: right"><strong>'.__('Pandora FMS help system').'</strong></p>';
 echo '</div>';
diff --git a/pandora_console/general/ui/agents_list.php b/pandora_console/general/ui/agents_list.php
index 42388df4d2..9e3767d1ee 100644
--- a/pandora_console/general/ui/agents_list.php
+++ b/pandora_console/general/ui/agents_list.php
@@ -67,7 +67,7 @@ if ($show_filter_form) {
 			$data = array ();
 		$data = array ();
 		$data[] = __('Group');
-		$data[] = print_select_groups(false, $access, true,
+		$data[] = html_print_select_groups(false, $access, true,
 			'id_group', '', '', '', '', true);
 		if (! $odd)
 			array_push ($table->data, $data);
@@ -78,18 +78,18 @@ if ($show_filter_form) {
 		if ($odd) 
 			$data = array ();
 		$data[] = __('Search');
-		$data[] = print_input_text ('search_string', '', '', 15, 255, true);
+		$data[] = html_print_input_text ('search_string', '', '', 15, 255, true);
 		if (! $odd)
 			array_push ($table->data, $data);
 		$odd = !$odd;
 	}
 	
 	echo '<form id="agent_search" method="post">';
-	print_table ($table);
+	html_print_table ($table);
 	
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
-	print_submit_button (__('Search'), 'search', false, 'class="sub search"');
-	print_input_hidden ('search_agents', 1);
+	html_print_submit_button (__('Search'), 'search', false, 'class="sub search"');
+	html_print_input_hidden ('search_agents', 1);
 	echo '</div>';
 	echo '</form>';
 	
@@ -117,7 +117,7 @@ unset ($filter['offset']);
 
 if (! is_ajax ()) {
 	echo '<div id="agents_loading" class="loading invisible">';
-	echo print_image('images/spinner.png', true);
+	echo html_print_image('images/spinner.png', true);
 	echo __('Loading').'&hellip;';
 	echo '</div>';
 }
@@ -149,7 +149,7 @@ if ($agents !== false) {
 }
 echo '<div id="agents"'.($agents === false ? ' class="invisible"' : '').'>';
 ui_pagination ($total_agents, '#');
-print_table ($table);
+html_print_table ($table);
 echo '</div>';
 echo '</div>';
 
diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index b7e27f45bc..6a979603fe 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -62,18 +62,18 @@ $table = null;
 $table->width = '100%';
 $table->data = array();
 $table->data[0][0] = __('Action');
-$table->data[0][1] = print_select ($actions, 'tipo_log', $tipo_log, '', __('All'), 'all', true);
+$table->data[0][1] = html_print_select ($actions, 'tipo_log', $tipo_log, '', __('All'), 'all', true);
 $table->data[1][0] = __('User');
-$table->data[1][1] = print_select_from_sql('SELECT id_user, id_user AS text FROM tusuario', 'user', $user_filter, '', __('All'), 0, true);
+$table->data[1][1] = html_print_select_from_sql('SELECT id_user, id_user AS text FROM tusuario', 'user', $user_filter, '', __('All'), 0, true);
 $table->data[2][0] = __('Free text for search (*)');
-$table->data[2][1] = print_input_text('filter_text', $filter_text, __('Free text for search (*)'), 20, 40, true);
+$table->data[2][1] = html_print_input_text('filter_text', $filter_text, __('Free text for search (*)'), 20, 40, true);
 $table->data[3][0] = __('Max. hours old');
-$table->data[3][1] = print_input_text('filter_hours_old', $filter_hours_old, __('Max. hours old'), 3, 6, true);
+$table->data[3][1] = html_print_input_text('filter_hours_old', $filter_hours_old, __('Max. hours old'), 3, 6, true);
 $table->data[4][0] = __('IP');
-$table->data[4][1] = print_input_text('filter_ip', $filter_ip, __('IP'), 15, 15, true);
+$table->data[4][1] = html_print_input_text('filter_ip', $filter_ip, __('IP'), 15, 15, true);
 $table->data[5][0] = '';
-$table->data[5][1] = print_submit_button(__('Filter'), 'filter', false, 'class="sub search" style="float: right;"', true);
-print_table($table);
+$table->data[5][1] = html_print_submit_button(__('Filter'), 'filter', false, 'class="sub search" style="float: right;"', true);
+html_print_table($table);
 echo '</form>';
 echo '</div>';
 echo '<div style="float: right; width: 250px;">';
@@ -284,7 +284,7 @@ foreach ($result as $row) {
 	}
 }
 
-print_table ($table);
+html_print_table ($table);
 
 if ($enterprise_include !== ENTERPRISE_NOT_HOOK) {
 	enterprise_hook('enterpriseAuditFooter');
diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php
index 2fd25e0696..e325f8e504 100644
--- a/pandora_console/godmode/agentes/agent_conf_gis.php
+++ b/pandora_console/godmode/agentes/agent_conf_gis.php
@@ -26,14 +26,14 @@ ui_require_javascript_file('openlayers.pandora');
 
 echo "<div style='margin-bottom: 10px;'></div>";
 
-$agentData = getDataLastPositionAgent($id_agente);
+$agentData = gis_get_data_last_position_agent($id_agente);
 $updateGisData = db_get_value('update_gis_data','tagente', 'id_agente', $id_agente);
 $agent_name = get_agent_name($id_agente);
 
 /* Map with the current position */
 echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>";
 
-if (!getAgentMap($id_agente, "500px", "98%", false)) {
+if (!gis_get_agent_map($id_agente, "500px", "98%", false)) {
 	echo "<br /><div class='nf'>" . __("There is no default map.") . "</div>";
 } 
 
@@ -49,28 +49,28 @@ $table->head[0] =__('Agent position');
 $table->head_colspan[0] = 2;
 
 $table->data[1][0] = __('Longitude: ');
-$table->data[1][1] = print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '',
+$table->data[1][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '',
 	array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true);
 
 $table->data[2][0] = __('Latitude: ');
-$table->data[2][1] = print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 10, 10, false, '',
+$table->data[2][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 10, 10, false, '',
 	array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true);
 
 $table->data[3][0] = __('Altitude: ');
-$table->data[3][1] = print_input_text_extended ('altitude', $agentData['stored_altitude'], 'text-altitude', '', 10, 10, false, '',
+$table->data[3][1] = html_print_input_text_extended ('altitude', $agentData['stored_altitude'], 'text-altitude', '', 10, 10, false, '',
 	array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true);
 
 $table->data[4][0] = __('Ignore new GIS data:');
-$table->data[4][1] = __('Disabled').' '.print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
-$table->data[4][1] .= __('Active').' '.print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
+$table->data[4][1] = __('Disabled').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
+$table->data[4][1] .= __('Active').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
 
 $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente;
 echo "<form method='post' action='" . $url . "' onsubmit ='return validateFormFields();'>";
-print_input_hidden('update_gis', 1);
-print_table($table);
+html_print_input_hidden('update_gis', 1);
+html_print_table($table);
 
 echo '<div class="action-buttons" style="clear: left; width: ' . $table->width . '; float: left;">';
-print_submit_button (__('Update'), '', false, 'class="sub upd"');
+html_print_submit_button (__('Update'), '', false, 'class="sub upd"');
 echo '</div>';
 echo "</form>";
 ?>
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index f2519d34f6..fc1ac08604 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -99,11 +99,11 @@ $table->data = array ();
 
 $table->data[0][0] = __('Agent name') . 
 	ui_print_help_tip (__("The agent's name must be the same as the one defined at the console"), true);
-$table->data[0][1] = print_input_text ('agente', $nombre_agente, '', 30, 100,true); 
+$table->data[0][1] = html_print_input_text ('agente', $nombre_agente, '', 30, 100,true); 
 
 if ($id_agente) {
 	$table->data[0][1] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">';
-	$table->data[0][1] .= print_image ("images/lupa.png", true, array ("border" => 0, "title" => __('Agent detail')));
+	$table->data[0][1] .= html_print_image ("images/lupa.png", true, array ("border" => 0, "title" => __('Agent detail')));
 	$table->data[0][1] .= '</a>';
 }
 
@@ -111,35 +111,35 @@ if ($id_agente) {
 if (!$new_agent) {
 	if (file_exists ($filename['md5'])) {
 		$table->data[0][1] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=main&amp;id_agente='.$id_agente.'&amp;disk_conf='.$agent_md5.'">';
-		$table->data[0][1] .= print_image ("images/application_edit.png", true, array ("border" => 0, "title" => __('This agent can be remotely configured')));
+		$table->data[0][1] .= html_print_image ("images/application_edit.png", true, array ("border" => 0, "title" => __('This agent can be remotely configured')));
 		$table->data[0][1] .= '</a>'.ui_print_help_tip (__('You can remotely edit this agent configuration'), true);
 	}
 }
 
 $table->data[1][0] = __('IP Address');
-$table->data[1][1] = print_input_text ('direccion', $direccion_agente, '', 16, 100, true);
+$table->data[1][1] = html_print_input_text ('direccion', $direccion_agente, '', 16, 100, true);
 
 if ($id_agente) {
 	$table->data[1][1] .= '&nbsp;&nbsp;&nbsp;&nbsp;';
 	
 	$ip_all = get_agent_addresses ($id_agente);
 		
-	$table->data[1][1] .= print_select ($ip_all, "address_list", $direccion_agente, '', '', 0, true);
-	$table->data[1][1] .= "&nbsp;". print_checkbox ("delete_ip", 1, false, true).__('Delete selected');	
+	$table->data[1][1] .= html_print_select ($ip_all, "address_list", $direccion_agente, '', '', 0, true);
+	$table->data[1][1] .= "&nbsp;". html_print_checkbox ("delete_ip", 1, false, true).__('Delete selected');	
 }
 
 $groups = get_user_groups ($config["id_user"], "AR",false);
 $agents = get_group_agents (array_keys ($groups));
 
 $table->data[2][0] = __('Parent');
-$table->data[2][1] = print_input_text_extended ('id_parent', get_agent_name ($id_parent), 'text-id_parent', '', 30, 100, false, '',
+$table->data[2][1] = html_print_input_text_extended ('id_parent', get_agent_name ($id_parent), 'text-id_parent', '', 30, 100, false, '',
 	array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
 	. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 
-$table->data[2][1] .= print_checkbox ("cascade_protection", 1, $cascade_protection, true).__('Cascade protection'). "&nbsp;" . ui_print_help_icon("cascade_protection", true);
+$table->data[2][1] .= html_print_checkbox ("cascade_protection", 1, $cascade_protection, true).__('Cascade protection'). "&nbsp;" . ui_print_help_icon("cascade_protection", true);
 
 $table->data[3][0] = __('Group');
-$table->data[3][1] = print_select_groups(false, "AR", false, 'grupo', $grupo, '', '', 0, true);
+$table->data[3][1] = html_print_select_groups(false, "AR", false, 'grupo', $grupo, '', '', 0, true);
 
 $table->data[4][0] = __('Interval');
 
@@ -152,11 +152,11 @@ $intervals[1200] = human_time_description_raw (1200);
 $intervals[1800] = human_time_description_raw (1800);
 $intervals[3600] = human_time_description_raw (3600);
 $intervals[7200] = human_time_description_raw (7200);
-$table->data[4][1] = print_extended_select_for_time ($intervals, 'intervalo', $intervalo, '', '', '0', 10, true) . __(" seconds.");
-//$table->data[4][1] = print_input_text ('intervalo', $intervalo, '', 16, 100, true);
+$table->data[4][1] = html_print_extended_select_for_time ($intervals, 'intervalo', $intervalo, '', '', '0', 10, true) . __(" seconds.");
+//$table->data[4][1] = html_print_input_text ('intervalo', $intervalo, '', 16, 100, true);
 
 $table->data[5][0] = __('OS');
-$table->data[5][1] = print_select_from_sql ('SELECT id_os, name FROM tconfig_os',
+$table->data[5][1] = html_print_select_from_sql ('SELECT id_os, name FROM tconfig_os',
 	'id_os', $id_os, '', '', '0', true);
 $table->data[5][1] .= ' <span id="os_preview">';
 $table->data[5][1] .= ui_print_os_icon ($id_os, false, true);
@@ -167,14 +167,14 @@ $none = '';
 if ($server_name == '' && $id_agente)
 	$none = __('None');
 $table->data[6][0] = __('Server');
-$table->data[6][1] = print_select (get_server_names (),
+$table->data[6][1] = html_print_select (get_server_names (),
 	'server_name', $server_name, '', $none, 0, true);
 
 // Description
 $table->data[7][0] = __('Description');
-$table->data[7][1] = print_input_text ('comentarios', $comentarios, '', 45, 255, true);
+$table->data[7][1] = html_print_input_text ('comentarios', $comentarios, '', 45, 255, true);
 
-print_table ($table);
+html_print_table ($table);
 unset($table);
 
 $table->width = '95%';
@@ -187,17 +187,17 @@ $table->data = array ();
 
 // Custom ID
 $table->data[0][0] = __('Custom ID');
-$table->data[0][1] = print_input_text ('custom_id', $custom_id, '', 16, 255, true);
+$table->data[0][1] = html_print_input_text ('custom_id', $custom_id, '', 16, 255, true);
 
 // Learn mode / Normal mode
 $table->data[1][0] = __('Module definition').ui_print_help_icon("module_definition", true);
-$table->data[1][1] = __('Learning mode').' '.print_radio_button_extended ("modo", 1, '', $modo, false, '', 'style="margin-right: 40px;"', true);
-$table->data[1][1] .= __('Normal mode').' '.print_radio_button_extended ("modo", 0, '', $modo, false, '', 'style="margin-right: 40px;"', true);
+$table->data[1][1] = __('Learning mode').' '.html_print_radio_button_extended ("modo", 1, '', $modo, false, '', 'style="margin-right: 40px;"', true);
+$table->data[1][1] .= __('Normal mode').' '.html_print_radio_button_extended ("modo", 0, '', $modo, false, '', 'style="margin-right: 40px;"', true);
 
 // Status (Disabled / Enabled)
 $table->data[2][0] = __('Status');
-$table->data[2][1] = __('Disabled').' '.print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
-$table->data[2][1] .= __('Active').' '.print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
+$table->data[2][1] = __('Disabled').' '.html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
+$table->data[2][1] .= __('Active').' '.html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 
 // Remote configuration
 $table->data[3][0] = __('Remote configuration');
@@ -207,7 +207,7 @@ if (!$new_agent) {
 		$table->data[3][1] = date ("F d Y H:i:s", fileatime ($filename['md5']));
 		// Delete remote configuration
 		$table->data[3][1] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=main&amp;disk_conf_delete=1&amp;id_agente='.$id_agente.'">';
-		$table->data[3][1] .= print_image ("images/cross.png", true, array ('title' => __('Delete remote configuration file'), 'style' => 'vertical-align: middle;')).'</a>';
+		$table->data[3][1] .= html_print_image ("images/cross.png", true, array ('title' => __('Delete remote configuration file'), 'style' => 'vertical-align: middle;')).'</a>';
 		$table->data[3][1] .= '</a>'.ui_print_help_tip (__('Delete this conf file implies that for restore you must reactive remote config in the local agent.'), true);
 	}
 	else
@@ -216,7 +216,7 @@ if (!$new_agent) {
 else
 	$table->data[3][1] = '<em>'.__('Not available').'</em>';
 	
-$listIcons = getArrayListIcons();
+$listIcons = gis_get_array_list_icons();
 
 $arraySelectIcon = array();
 foreach ($listIcons as $index => $value) $arraySelectIcon[$index] = $index;
@@ -224,22 +224,22 @@ foreach ($listIcons as $index => $value) $arraySelectIcon[$index] = $index;
 $path = 'images/gis_map/icons/'; //TODO set better method the path
 
 $table->data[4][0] = __('Agent icon');
-$table->data[4][1] = print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .
-	'&nbsp;' . __('Without status') . ': ' . print_image($path . $icon_path . "default.png", true, array("id" => "icon_without_status", "style" => "display:none;")) .
-	'&nbsp;' . __('Default') . ': ' . print_image($path . $icon_path . "default.png", true, array("id" => "icon_default", "style" => "display:none;")) .
-	'&nbsp;' . __('Ok') . ': ' . print_image($path . $icon_path . "ok.png", true, array("id" => "icon_ok", "style" => "display:none;")) .
+$table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .
+	'&nbsp;' . __('Without status') . ': ' . html_print_image($path . $icon_path . "default.png", true, array("id" => "icon_without_status", "style" => "display:none;")) .
+	'&nbsp;' . __('Default') . ': ' . html_print_image($path . $icon_path . "default.png", true, array("id" => "icon_default", "style" => "display:none;")) .
+	'&nbsp;' . __('Ok') . ': ' . html_print_image($path . $icon_path . "ok.png", true, array("id" => "icon_ok", "style" => "display:none;")) .
 
-	'&nbsp;' . __('Bad') . ': ' . print_image($path . $icon_path . "bad.png", true, array("id" => "icon_bad", "style" => "display:none;")) .
+	'&nbsp;' . __('Bad') . ': ' . html_print_image($path . $icon_path . "bad.png", true, array("id" => "icon_bad", "style" => "display:none;")) .
 
-	'&nbsp;' . __('Warning') . ': ' . print_image($path . $icon_path . "warning.png", true, array("id" => "icon_warning", "style" => "display:none;"));
+	'&nbsp;' . __('Warning') . ': ' . html_print_image($path . $icon_path . "warning.png", true, array("id" => "icon_warning", "style" => "display:none;"));
 
 if ($config['activate_gis']) {
 	$table->data[5][0] = __('Ignore new GIS data:');
-	$table->data[5][1] = __('Disabled').' '.print_radio_button_extended ("update_gis_data", 0, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
-	$table->data[5][1] .= __('Active').' '.print_radio_button_extended ("update_gis_data", 1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] = __('Disabled').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] .= __('Active').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
 }
 
-ui_toggle(print_table ($table, true), __('Advanced options'));
+ui_toggle(html_print_table ($table, true), __('Advanced options'));
 unset($table);
 
 $table->width = '95%';
@@ -264,23 +264,23 @@ foreach ($fields as $field) {
 		$custom_value = '';
 	}
 	
-	$data[1] = print_textarea ('customvalue_'.$field['id_field'], 2, 65, $custom_value, 'style="min-height: 30px;"', true);
+	$data[1] = html_print_textarea ('customvalue_'.$field['id_field'], 2, 65, $custom_value, 'style="min-height: 30px;"', true);
 	
 	array_push ($table->data, $data);
 }
 
 if(!empty($fields)) {
-	ui_toggle(print_table ($table, true), __('Custom fields'));
+	ui_toggle(html_print_table ($table, true), __('Custom fields'));
 }
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id_agente) {
-	print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
-	print_input_hidden ('update_agent', 1);
-	print_input_hidden ('id_agente', $id_agente);
+	html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
+	html_print_input_hidden ('update_agent', 1);
+	html_print_input_hidden ('id_agente', $id_agente);
 } else {
-	print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
-	print_input_hidden ('create_agent', 1);
+	html_print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
+	html_print_input_hidden ('create_agent', 1);
 }
 echo '</div></form>';
 
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index 4235960baf..dd01a61433 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -120,8 +120,8 @@ foreach ($nps as $row) {
 }
 
 echo '<div>'.__('Template');
-print_select ($select, "template_id");
-print_submit_button (__('Assign'), 'crt', false, 'class="sub next"');
+html_print_select ($select, "template_id");
+html_print_submit_button (__('Assign'), 'crt', false, 'class="sub next"');
 echo '</div></form>';
 
 // ==========================
@@ -164,21 +164,21 @@ foreach ($result as $row) {
 	
 	$data[0] = $row["nombre"];
 	if ($row["id_tipo_modulo"] > 0) {
-		$data[1] = print_image("images/" . show_icon_type ($row["id_tipo_modulo"]), true, array("border" => "0"));
+		$data[1] = html_print_image("images/" . show_icon_type ($row["id_tipo_modulo"]), true, array("border" => "0"));
 	} else {
 		$data[1] = '';
 	}
 	$data[2] = mb_substr ($row["descripcion"], 0, 60);
 	
-	$data[3] = '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row["id_agente_modulo"].'">' . print_image("images/cross.png", true, array("border" => "0", "alt" => __('Delete'), "onclick" => "if (!confirm('".__('Are you sure?') . "')) return false;")) . '</a>&nbsp;';
+	$data[3] = '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row["id_agente_modulo"].'">' . html_print_image("images/cross.png", true, array("border" => "0", "alt" => __('Delete'), "onclick" => "if (!confirm('".__('Are you sure?') . "')) return false;")) . '</a>&nbsp;';
 	
-	$data[3] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row["id_agente_modulo"].'">' . print_image("images/config.png", true, array("border" => '0', "alt" => __('Update')))  . '</a>';
+	$data[3] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row["id_agente_modulo"].'">' . html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update')))  . '</a>';
 	
 	array_push ($table->data, $data);
 }
 
 if (!empty ($table->data)) {
-	print_table ($table);
+	html_print_table ($table);
 	unset ($table);
 } else {
 	echo '<div class="nf">No modules</div>';
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 455f41fbf0..3201ab772b 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -199,7 +199,7 @@ if ($id_agente) {
 	
 	/* View tab */
 	$viewtab['text'] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">' 
-			. print_image ("images/zoom.png", true, array ("title" =>__('View')))
+			. html_print_image ("images/zoom.png", true, array ("title" =>__('View')))
 			. '</a>';
 			
 	if($tab == 'view')
@@ -209,7 +209,7 @@ if ($id_agente) {
 	
 	/* Main tab */
 	$maintab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=main&amp;id_agente='.$id_agente.'">' 
-			. print_image ("images/cog.png", true, array ("title" =>__('Setup')))
+			. html_print_image ("images/cog.png", true, array ("title" =>__('Setup')))
 			. '</a>';
 	if($tab == 'main')
 	
@@ -219,7 +219,7 @@ if ($id_agente) {
 		
 	/* Module tab */
 	$moduletab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=module&amp;id_agente='.$id_agente.'">' 
-			. print_image ("images/lightbulb.png", true, array ("title" =>__('Modules')))
+			. html_print_image ("images/lightbulb.png", true, array ("title" =>__('Modules')))
 			. '</a>';
 	
 	if($tab == 'module')
@@ -229,7 +229,7 @@ if ($id_agente) {
 		
 	/* Alert tab */
 	$alerttab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=alert&amp;id_agente='.$id_agente.'">' 
-			. print_image ("images/bell.png", true, array ("title" =>__('Alerts')))
+			. html_print_image ("images/bell.png", true, array ("title" =>__('Alerts')))
 			. '</a>';
 	
 	if($tab == 'alert')
@@ -239,7 +239,7 @@ if ($id_agente) {
 		
 	/* Template tab */
 	$templatetab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=template&amp;id_agente='.$id_agente.'">' 
-			. print_image ("images/network.png", true, array ("title" =>__('Module templates')))
+			. html_print_image ("images/network.png", true, array ("title" =>__('Module templates')))
 			. '</a>';
 	
 	if($tab == 'template')
@@ -263,7 +263,7 @@ if ($id_agente) {
 	/* Group tab */
 	
 	$grouptab['text'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&ag_group='.$group.'">'
-			. print_image ("images/agents_group.png", true, array( "title" => __('Group')))
+			. html_print_image ("images/agents_group.png", true, array( "title" => __('Group')))
 			. '</a>';
 	
 	$grouptab['active'] = false;
@@ -274,7 +274,7 @@ if ($id_agente) {
 	if ($config['activate_gis']) {
 		
 		$gistab['text'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente.'">'
-			. print_image ("images/world.png", true, array ( "title" => __('GIS data')))
+			. html_print_image ("images/world.png", true, array ( "title" => __('GIS data')))
 			. '</a>';
 
 		if ($tab == "gis")
@@ -304,7 +304,7 @@ if ($id_agente) {
 			
 			$url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=extension&id_agente='.$id_agente . '&id_extension=' . $id;
 			
-			$extension_tab = array('text' => '<a href="' . $url .'">' . print_image ($image, true, array ( "title" => $name)) . '</a>', 'active' => $active);
+			$extension_tab = array('text' => '<a href="' . $url .'">' . html_print_image ($image, true, array ( "title" => $name)) . '</a>', 'active' => $active);
 			
 			$onheader = $onheader + array($id => $extension_tab);	
 		}
diff --git a/pandora_console/godmode/agentes/configure_field.php b/pandora_console/godmode/agentes/configure_field.php
index b2b118e4b3..a6dff43749 100755
--- a/pandora_console/godmode/agentes/configure_field.php
+++ b/pandora_console/godmode/agentes/configure_field.php
@@ -41,22 +41,22 @@ if ($id_field) {
 $table->width = '450px';
 $table->data = array ();
 $table->data[0][0] = __('Name');
-$table->data[0][1] = print_input_text ('name', $name, '', 35, 100, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true);
 
 $table->data[1][0] = __('Display on front').ui_print_help_tip (__('The fields with display on front enabled will be displayed into the agent details'), true);
-$table->data[1][1] = print_checkbox ('display_on_front', 1, $display_on_front, true);
+$table->data[1][1] = html_print_checkbox ('display_on_front', 1, $display_on_front, true);
 
 echo '<form name="field" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/fields_manager">';
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 
 if ($id_field) {
-	print_input_hidden ('update_field', 1);
-	print_input_hidden ('id_field', $id_field);
-	print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
+	html_print_input_hidden ('update_field', 1);
+	html_print_input_hidden ('id_field', $id_field);
+	html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('create_field', 1);
-	print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
+	html_print_input_hidden ('create_field', 1);
+	html_print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
 }
 
 echo '</div>';
diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php
index 8a93d3b865..5263a8ab97 100644
--- a/pandora_console/godmode/agentes/fields_manager.php
+++ b/pandora_console/godmode/agentes/fields_manager.php
@@ -109,24 +109,24 @@ foreach ($fields as $field) {
 	$data[0] = '<b>'.$field['name'].'</b>';
 
 	if($field['display_on_front']) {
-		$data[1] = print_image('images/tick.png', true);
+		$data[1] = html_print_image('images/tick.png', true);
 	}
 	else {
-		$data[1] = print_image('images/delete.png', true);
+		$data[1] = html_print_image('images/delete.png', true);
 	}
 		
-	$data[2] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configure_field&id_field='.$field['id_field'].'">' . print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0')) . '</a>';
-	$data[2] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/fields_manager&delete_field=1&id_field='.$field['id_field'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . print_image("images/cross.png", true, array("alt" => __('Delete'), "title" => __('Delete'), "border" => '0')) . '</a>';
+	$data[2] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configure_field&id_field='.$field['id_field'].'">' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0')) . '</a>';
+	$data[2] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/fields_manager&delete_field=1&id_field='.$field['id_field'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "title" => __('Delete'), "border" => '0')) . '</a>';
 	
 	array_push ($table->data, $data);
 }
 
 if($fields)
-	print_table ($table);
+	html_print_table ($table);
 
 echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configure_field">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Create field'), 'crt', false, 'class="sub next"');
+html_print_submit_button (__('Create field'), 'crt', false, 'class="sub next"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php
index dc8467fc8f..049b5ece3a 100644
--- a/pandora_console/godmode/agentes/manage_config_remote.php
+++ b/pandora_console/godmode/agentes/manage_config_remote.php
@@ -107,7 +107,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
 		$group_select = get_user_groups ($config['id_user']);
 		$grouplist = implode (',', array_keys ($group_select));
 		
-		echo print_select_groups($config['id_user'], "AR", true, 'id_group', $id_group, '', '', '', true);
+		echo html_print_select_groups($config['id_user'], "AR", true, 'id_group', $id_group, '', '', '', true);
 		echo '&nbsp;&nbsp;';
 		echo '<input type=submit name="update_group" class="sub upd"  value="'.__('Filter').'">';
 		echo '<br><br>';
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 4879f0a43d..d983cd5d31 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -80,7 +80,7 @@ echo "<table cellpadding='4' cellspacing='4' class='databox' width='770'><tr>";
 echo "<td valign='top'>".__('Group')."</td>";
 echo "<td valign='top'>";
 
-print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();', '', 0);
+html_print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();', '', 0);
 
 echo "<td valign='top'>
 <noscript>
@@ -109,8 +109,8 @@ echo "</form>";
 echo "<td>";
 
 echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
-	print_input_hidden ('new_agent', 1);
-	print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
+	html_print_input_hidden ('new_agent', 1);
+	html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
 echo "</form>";
 
 echo "</td></tr></table>";
@@ -306,17 +306,17 @@ if ($agents !== false) {
 	
 	echo "<table cellpadding='4' id='agent_list' cellspacing='4' width='95%' class='databox'>";
 	echo "<th>".__('Agent name') . ' ' .
-		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
-		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
+		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
+		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
 	echo "</th>";
 	echo "<th title='".__('Remote agent configuration')."'>".__('R')."</th>";
 	echo "<th>".__('OS'). ' ' .
-		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '</a>' .
-		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . '</a>';
+		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '</a>' .
+		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . '</a>';
 	echo "</th>";
 	echo "<th>".__('Group'). ' ' .
-			'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '</a>' .
-			'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . '</a>';
+			'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '</a>' .
+			'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . '</a>';
 		echo "</th>";
 	echo "<th>".__('Description')."</th>";
 	echo "<th>".__('Delete')."</th>";
@@ -382,7 +382,7 @@ if ($agents !== false) {
 		$agent_md5 = md5 ($agent["nombre"], false);
 		if (file_exists ($config["remote_config"]."/md5/".$agent_md5.".md5")) {
 			echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>";
-			echo print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')));		
+			echo html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')));		
 			echo "</a>";
 		}
 		echo "</td>";
@@ -406,7 +406,7 @@ if ($agents !== false) {
 		echo "<td class='$tdcolor' align='center' valign='middle'><a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
 		borrar_agente=".$agent["id_agente"]."&search=$search&offset=$offsetArg&sort_field=$sortField&sort=$sort'";
 		echo ' onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-		echo print_image('images/cross.png', true, array("border" => '0')) . "</a></td>";
+		echo html_print_image('images/cross.png', true, array("border" => '0')) . "</a></td>";
 	}
 	echo "</table>";
 	ui_pagination ($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&search=$search&sort_field=$sortField&sort=$sort", $offset);
@@ -420,8 +420,8 @@ else {
 // Create agent button
 echo '<a name="bottom">';
 echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
-print_input_hidden ('new_agent', 1);
-print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
+html_print_input_hidden ('new_agent', 1);
+html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
 echo "</form></td></tr></table>";
 ?>
 
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index d6ff290705..280d9aac71 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -64,8 +64,8 @@ if (strstr($sec2, "enterprise/godmode/policies/policies") !== false) {
 	unset($modules['predictionserver']);
 }
 
-print_select ($modules, 'moduletype', '', '', '', '', false, false, false);
-print_input_hidden ('edit_module', 1);
+html_print_select ($modules, 'moduletype', '', '', '', '', false, false, false);
+html_print_input_hidden ('edit_module', 1);
 echo '</td>';
 echo '<td class="datos">';
 echo '<input align="right" name="updbutton" type="submit" class="sub next" value="'.__('Create').'">';
@@ -272,19 +272,19 @@ if ($modules === false) {
 $table->width = '95%';
 $table->head = array ();
 $table->head[0] = __('Name') . ' ' .
-	'<a href="' . $url . '&sort_field=name&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
-	'<a href="' . $url . '&sort_field=name&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
+	'<a href="' . $url . '&sort_field=name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
 if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK)
 	$table->head[1] = "<span title='" . __('Policy') . "'>" . __('P.') . "</span>";
 $table->head[2] = "<span title='" . __('Server') . "'>" . __('S.') . "</span>" . ' ' .
-	'<a href="' . $url . '&sort_field=server&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectServerUp)) . '</a>' .
-	'<a href="' . $url . '&sort_field=server&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectServerDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=server&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectServerUp)) . '</a>' .
+	'<a href="' . $url . '&sort_field=server&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectServerDown)) . '</a>';
 $table->head[3] = __('Type') . ' ' .
-	'<a href="' . $url . '&sort_field=type&sort=up">' .  print_image("images/sort_up.png", true, array("style" => $selectTypeUp)) .'</a>' .
-	'<a href="' . $url . '&sort_field=type&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTypeDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=type&sort=up">' .  html_print_image("images/sort_up.png", true, array("style" => $selectTypeUp)) .'</a>' .
+	'<a href="' . $url . '&sort_field=type&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTypeDown)) . '</a>';
 $table->head[4] = __('Interval') . ' ' .
-	'<a href="' . $url . '&sort_field=interval&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectIntervalUp)) . '</a>' .
-	'<a href="' . $url . '&sort_field=interval&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectIntervalDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=interval&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp)) . '</a>' .
+	'<a href="' . $url . '&sort_field=interval&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown)) . '</a>';
 $table->head[5] = __('Description');
 $table->head[6] = __('Max/Min');
 $table->head[7] = __('Action');
@@ -377,7 +377,7 @@ foreach ($modules as $module) {
 			}
 				
 			$data[1] = '<a href="?sec=gpolicies&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id_policy'] . '">' . 
-				print_image($img,true, array('title' => $title)) .
+				html_print_image($img,true, array('title' => $title)) .
 				'</a>';
 		}
 	}
@@ -391,7 +391,7 @@ foreach ($modules as $module) {
 	// This module is initialized ? (has real data)
 	$module_init = db_get_value ('utimestamp', 'tagente_estado', 'id_agente_modulo', $module['id_agente_modulo']);
 	if ($module_init == 0)
-		$data[2] .= print_image ('images/error.png', true, array ('title' => __('Non initialized module')));
+		$data[2] .= html_print_image ('images/error.png', true, array ('title' => __('Non initialized module')));
 	
 	// Module type (by data type)
 	$data[3] = '';
@@ -413,15 +413,15 @@ foreach ($modules as $module) {
 	$data[6] .= ' / '.($module["min"] != $module['max']? $module["min"] : __('N/A'));
 
 	// Delete module
-	$data[7] = print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true);
+	$data[7] = html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true);
 	$data[7] .= '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$module['id_agente_modulo'].'"
 		onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-	$data[7] .= print_image ('images/cross.png', true,
+	$data[7] .= html_print_image ('images/cross.png', true,
 		array ('title' => __('Delete')));
 	$data[7] .= '</a> ';
 	$data[7] .= '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&duplicate_module='.$module['id_agente_modulo'].'"
 		onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-	$data[7] .= print_image ('images/copy.png', true,
+	$data[7] .= html_print_image ('images/copy.png', true,
 		array ('title' => __('Duplicate')));
 	$data[7] .= '</a> ';
 	
@@ -430,7 +430,7 @@ foreach ($modules as $module) {
 	if (isset($numericModules[$type])) {
 		if ($numericModules[$type] === true) {
 			$data[7] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&fix_module='.$module['id_agente_modulo'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-			$data[7] .= print_image ('images/chart_curve.png', true,
+			$data[7] .= html_print_image ('images/chart_curve.png', true,
 				array ('title' => __('Normalize')));
 			$data[7] .= '</a>';
 		}
@@ -441,10 +441,10 @@ foreach ($modules as $module) {
 
 echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module"
 	onsubmit="if (! confirm (\''.__('Are you sure?').'\')) return false">';
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('multiple_delete', 1);
-print_submit_button (__('Delete'), 'multiple_delete', false, 'class="sub delete"');
+html_print_input_hidden ('multiple_delete', 1);
+html_print_submit_button (__('Delete'), 'multiple_delete', false, 'class="sub delete"');
 echo '</div>';
 echo '</form>'
 ?>
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index 2e34aa67b1..62186e2e0e 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -314,27 +314,27 @@ if($config['enterprise_installed'] && $id_agent_module) {
 echo '<h3 id="message" class="error invisible"></h3>';
 
 echo '<form method="post" id="module_form">';
-print_table ($table_simple);
+html_print_table ($table_simple);
 
 echo '<b><a href="#" id="show_advanced" onclick="$(\'div#advanced\').show ();$(this).remove (); return false">';
-echo __('Advanced options').'&nbsp;' .print_image ("images/down.png", true, array ("title" => __('Advanced options')));
+echo __('Advanced options').'&nbsp;' .html_print_image ("images/down.png", true, array ("title" => __('Advanced options')));
 echo '</a></b>';
 
 echo '<div id="advanced" style="display: none">';
-print_table ($table_advanced);
+html_print_table ($table_advanced);
 echo '</div>';
 
 // Submit
 echo '<div class="action-buttons" style="width: '.$table_simple->width.'">';
 if ($id_agent_module) {
-	print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
-	print_input_hidden ('update_module', 1);
-	print_input_hidden ('id_agent_module', $id_agent_module);
-	print_input_hidden ('id_module_type', $id_module_type);
+	html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
+	html_print_input_hidden ('update_module', 1);
+	html_print_input_hidden ('id_agent_module', $id_agent_module);
+	html_print_input_hidden ('id_module_type', $id_module_type);
 } else {
-	print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
-	print_input_hidden ('id_module', $moduletype);
-	print_input_hidden ('create_module', 1);
+	html_print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
+	html_print_input_hidden ('id_module', $moduletype);
+	html_print_input_hidden ('create_module', 1);
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 2f71e4e8aa..55dffff7d9 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -69,20 +69,20 @@ function add_component_selection ($id_network_component_type) {
 	
 	$component_groups = get_network_component_groups ($id_network_component_type);
 	$data[1] = '<span id="component_group" class="left">';
-	$data[1] .= print_select ($component_groups,
+	$data[1] .= html_print_select ($component_groups,
 		'network_component_group', '', '', '--'.__('Manual setup').'--', 0,
 		true, false, false);
 	$data[1] .= '</span>';
-	$data[1] .= print_input_hidden ('id_module_component_type', $id_network_component_type, true);
+	$data[1] .= html_print_input_hidden ('id_module_component_type', $id_network_component_type, true);
 	$data[1] .= '<span id="no_component" class="invisible error">';
 	$data[1] .= __('No component was found');
 	$data[1] .= '</span>';
 	$data[1] .= '<span id="component" class="invisible right">';
-	$data[1] .= print_select (array (), 'network_component', '', '',
+	$data[1] .= html_print_select (array (), 'network_component', '', '',
 		'---'.__('Manual setup').'---', 0, true);
 	$data[1] .= '</span>';
 	$data[1] .= ' <span id="component_loading" class="invisible">';
-	$data[1] .= print_image('images/spinner.png', true);
+	$data[1] .= html_print_image('images/spinner.png', true);
 	$data[1] .= '</span>';
 	
 	$table_simple->colspan['module_component'][1] = 3;
@@ -110,7 +110,7 @@ if (strstr($page, "policy_modules") === false && $id_agent_module) {
 
 $update_module_id = (int) get_parameter_get ('update_module');
 
-print_input_hidden ('moduletype', $moduletype);
+html_print_input_hidden ('moduletype', $moduletype);
 
 $table_simple->id = 'simple';
 $table_simple->width = '90%';
@@ -122,9 +122,9 @@ $table_simple->style[0] = 'font-weight: bold; vertical-align: top';
 $table_simple->style[2] = 'font-weight: bold; vertical-align: top';
 
 $table_simple->data[0][0] = __('Name');
-$table_simple->data[0][1] = print_input_text ('name', $name, '', 20, 100, true, $disabledBecauseInPolicy);
+$table_simple->data[0][1] = html_print_input_text ('name', $name, '', 20, 100, true, $disabledBecauseInPolicy);
 $table_simple->data[0][2] = __('Disabled');
-$table_simple->data[0][3] = print_checkbox ("disabled", 1, $disabled, true);
+$table_simple->data[0][3] = html_print_checkbox ("disabled", 1, $disabled, true);
 
 $table_simple->data[1][0] = __('Type').' ' . ui_print_help_icon ('module_type', true);
 
@@ -158,36 +158,36 @@ else {
 		WHERE categoria IN (%s)
 		ORDER BY descripcion',
 		implode (',', $categories));
-	$table_simple->data[1][1] = print_select_from_sql ($sql, 'id_module_type',
+	$table_simple->data[1][1] = html_print_select_from_sql ($sql, 'id_module_type',
 		$idModuleType, '', '', '', true, false, false, $disabledBecauseInPolicy);
 }
 
 $table_simple->data[1][2] = __('Module group');
-$table_simple->data[1][3] = print_select_from_sql ('SELECT id_mg, name FROM tmodule_group ORDER BY name',
+$table_simple->data[1][3] = html_print_select_from_sql ('SELECT id_mg, name FROM tmodule_group ORDER BY name',
 	'id_module_group', $id_module_group, '', __('Not assigned'), '0',
 	true, false, true, $disabledBecauseInPolicy);
 
 $table_simple->data[2][0] = __('Warning status').' ' . ui_print_help_icon ('warning_status', true);
 $table_simple->data[2][1] = '<em>'.__('Min.').'</em>';
-$table_simple->data[2][1] .= print_input_text ('min_warning', $min_warning,
+$table_simple->data[2][1] .= html_print_input_text ('min_warning', $min_warning,
 	'', 5, 255, true, $disabledBecauseInPolicy);
 $table_simple->data[2][1] .= '<br /><em>'.__('Max.').'</em>';
-$table_simple->data[2][1] .= print_input_text ('max_warning', $max_warning,
+$table_simple->data[2][1] .= html_print_input_text ('max_warning', $max_warning,
 	'', 5, 255, true, $disabledBecauseInPolicy);
 $table_simple->data[2][2] = __('Critical status').' ' . ui_print_help_icon ('critical_status', true);
 $table_simple->data[2][3] = '<em>'.__('Min.').'</em>';
-$table_simple->data[2][3] .= print_input_text ('min_critical', $min_critical,
+$table_simple->data[2][3] .= html_print_input_text ('min_critical', $min_critical,
 	'', 5, 255, true, $disabledBecauseInPolicy);
 $table_simple->data[2][3] .= '<br /><em>'.__('Max.').'</em>';
-$table_simple->data[2][3] .= print_input_text ('max_critical', $max_critical,
+$table_simple->data[2][3] .= html_print_input_text ('max_critical', $max_critical,
 	'', 5, 255, true, $disabledBecauseInPolicy);
 
 /* FF stands for Flip-flop */
 $table_simple->data[3][0] = __('FF threshold').' ' . ui_print_help_icon ('ff_threshold', true);
-$table_simple->data[3][1] = print_input_text ('ff_event', $ff_event,
+$table_simple->data[3][1] = html_print_input_text ('ff_event', $ff_event,
 	'', 5, 15, true, $disabledBecauseInPolicy);
 $table_simple->data[3][2] = __('Historical data');
-$table_simple->data[3][3] = print_checkbox ("history_data", 1, $history_data, true, $disabledBecauseInPolicy);
+$table_simple->data[3][3] = html_print_checkbox ("history_data", 1, $history_data, true, $disabledBecauseInPolicy);
 
 /* Advanced form part */
 $table_advanced->id = 'advanced';
@@ -201,28 +201,28 @@ $table_advanced->colspan = array ();
 
 $table_advanced->data[0][0] = __('Description');
 $table_advanced->colspan[0][1] = 3;
-$table_advanced->data[0][1] = print_textarea ('description', 2, 65,
+$table_advanced->data[0][1] = html_print_textarea ('description', 2, 65,
 	$description, $disabledTextBecauseInPolicy, true);
 
 $table_advanced->data[1][0] = __('Custom ID');
-$table_advanced->data[1][1] = print_input_text ('custom_id', $custom_id,
+$table_advanced->data[1][1] = html_print_input_text ('custom_id', $custom_id,
 	'', 20, 65, true);
 
 $table_advanced->data[2][0] = __('Interval');
-$table_advanced->data[2][1] = print_input_text ('module_interval', $interval,
+$table_advanced->data[2][1] = html_print_input_text ('module_interval', $interval,
 	'', 5, 10, true, $disabledBecauseInPolicy).ui_print_help_tip (__('Module execution time interval (in secs).'), true);
 	
 $table_advanced->data[2][2] = __('Post process').' ' . ui_print_help_icon ('postprocess', true);
-$table_advanced->data[2][3] = print_input_text ('post_process',
+$table_advanced->data[2][3] = html_print_input_text ('post_process',
 	$post_process, '', 12, 25, true, $disabledBecauseInPolicy);
 
 $table_advanced->data[3][0] = __('Min. Value');
-$table_advanced->data[3][1] = print_input_text ('min', $min, '', 5, 15, true, $disabledBecauseInPolicy);
+$table_advanced->data[3][1] = html_print_input_text ('min', $min, '', 5, 15, true, $disabledBecauseInPolicy);
 $table_advanced->data[3][2] = __('Max. Value');
-$table_advanced->data[3][3] = print_input_text ('max', $max, '', 5, 15, true, $disabledBecauseInPolicy);
+$table_advanced->data[3][3] = html_print_input_text ('max', $max, '', 5, 15, true, $disabledBecauseInPolicy);
 
 $table_advanced->data[4][0] = __('Export target');
-$table_advanced->data[4][1] = print_select_from_sql ('SELECT id, name FROM tserver_export ORDER BY name',
+$table_advanced->data[4][1] = html_print_select_from_sql ('SELECT id, name FROM tserver_export ORDER BY name',
 	'id_export', $id_export, '',__('None'),'0', true, false, false, $disabledBecauseInPolicy).ui_print_help_tip (__('In case you use an Export server you can link this module and export data to one these.'), true);
 $table_advanced->colspan[4][1] = 3;
 ?>
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index f4fe4f68fd..d2266f81c4 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -40,9 +40,9 @@ $extra_title = __('Network server module');
 
 $data = array ();
 $data[0] = __('Target IP');
-$data[1] = print_input_text ('ip_target', $ip_target, '', 15, 60, true);
+$data[1] = html_print_input_text ('ip_target', $ip_target, '', 15, 60, true);
 $data[2] = __('Port');
-$data[3] = print_input_text ('tcp_port', $tcp_port, '', 5, 20, true, $disabledBecauseInPolicy);
+$data[3] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, true, $disabledBecauseInPolicy);
 
 push_table_simple ($data, 'target_ip');
 
@@ -58,19 +58,19 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK && isset($id_agent_module)) {
 	$adopt = isModuleAdopt($id_agent_module);
 }
 if (!$adopt) {
-	$data[1] = print_input_text ('snmp_community', $snmp_community, '', 15, 60, true, $disabledBecauseInPolicy);
+	$data[1] = html_print_input_text ('snmp_community', $snmp_community, '', 15, 60, true, $disabledBecauseInPolicy);
 }
 else {
-	$data[1] = print_input_text ('snmp_community', $snmp_community, '', 15, 60, true, false);
+	$data[1] = html_print_input_text ('snmp_community', $snmp_community, '', 15, 60, true, false);
 }
 
 $data[2] = _('SNMP version');
 
 if ($id_module_type >= 15 && $id_module_type <= 18) {
-	$data[3] = print_select ($snmp_versions, 'snmp_version', $snmp_version,
+	$data[3] = html_print_select ($snmp_versions, 'snmp_version', $snmp_version,
 		'', '', '', true, false, false, '', $disabledBecauseInPolicy);
 } else {
-	$data[3] = print_select ($snmp_versions, 'snmp_version', 0, '', '',
+	$data[3] = html_print_select ($snmp_versions, 'snmp_version', 0, '', '',
 		'', true, false, false, '', $disabledBecauseInPolicy);
 }
 
@@ -79,14 +79,14 @@ push_table_simple ($data, 'snmp_1');
 $data = array ();
 $data[0] = __('SNMP OID');
 $data[1] = '<span class="left"; style="width: 50%">';
-$data[1] .= print_input_text ('snmp_oid', $snmp_oid, '', 30, 255, true, $disabledBecauseInPolicy);
+$data[1] .= html_print_input_text ('snmp_oid', $snmp_oid, '', 30, 255, true, $disabledBecauseInPolicy);
 $data[1] .= '<span class="invisible" id="oid">';
-$data[1] .= print_select (array (), 'select_snmp_oid', $snmp_oid, '', '', 0, true, false, false, '', $disabledBecauseInPolicy);
-$data[1] .= print_image("images/edit.png", true, array("class" => "invisible clickable", "id" => "edit_oid"));
+$data[1] .= html_print_select (array (), 'select_snmp_oid', $snmp_oid, '', '', 0, true, false, false, '', $disabledBecauseInPolicy);
+$data[1] .= html_print_image("images/edit.png", true, array("class" => "invisible clickable", "id" => "edit_oid"));
 $data[1] .= '</span>';
 $data[1] .= '<span id="no_snmp" class="error invisible">'.__('Unable to do SNMP walk').'</span>';
 $data[1] .= '</span> <span class="right" style="width: 50%; text-align: right"><span id="oid_loading" class="invisible">';
-$data[1] .= print_image('images/spinner.gif', true);
+$data[1] .= html_print_image('images/spinner.gif', true);
 $data[1] .= '</span>';
 if ($disabledBecauseInPolicy)
 	$disableButton = true;
@@ -96,7 +96,7 @@ else
 	else
 		$disableButton = false;
 
-$data[1] .= print_button (__('SNMP walk'), 'snmp_walk', $disableButton, '',
+$data[1] .= html_print_button (__('SNMP walk'), 'snmp_walk', $disableButton, '',
 	'class="sub next"', true);
 $data[1] .= ui_print_help_icon ('snmpwalk', true);
 $data[1] .= '</span>';
@@ -107,13 +107,13 @@ push_table_simple ($data, 'snmp_2');
 /* Advanced stuff */
 $data = array ();
 $data[0] = __('TCP send') . ' ' . ui_print_help_icon ("tcp_send", true);
-$data[1] = print_textarea ('tcp_send', 2, 65, $tcp_send, $disabledTextBecauseInPolicy, true);
+$data[1] = html_print_textarea ('tcp_send', 2, 65, $tcp_send, $disabledTextBecauseInPolicy, true);
 $table_advanced->colspan['tcp_send'][1] = 3;
 
 push_table_advanced ($data, 'tcp_send');
 
 $data[0] = __('TCP receive');
-$data[1] = print_textarea ('tcp_rcv', 2, 65, $tcp_rcv, $disabledTextBecauseInPolicy, true);
+$data[1] = html_print_textarea ('tcp_rcv', 2, 65, $tcp_rcv, $disabledTextBecauseInPolicy, true);
 $table_advanced->colspan['tcp_receive'][1] = 3;
 
 push_table_advanced ($data, 'tcp_receive');
@@ -148,26 +148,26 @@ if (!isset($id_agent_module)) {
 
 $data = array();
 $data[0] = __('Auth user');
-$data[1] = print_input_text ('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true);
+$data[1] = html_print_input_text ('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true);
 $data[2] = __('Auth password');
-$data[3] = print_input_text ('snmp3_auth_pass', $snmp3_auth_pass, '', 15, 60, true);
-$data[3] .= print_input_hidden('active_snmp_v3', 0, true);
+$data[3] = html_print_input_text ('snmp3_auth_pass', $snmp3_auth_pass, '', 15, 60, true);
+$data[3] .= html_print_input_hidden('active_snmp_v3', 0, true);
 if ($snmp_version != 3) $table_simple->rowstyle['field_snmpv3_row1'] = 'display: none;';
 push_table_simple($data, 'field_snmpv3_row1');
 
 $data = array();
 $data[0] = __('Privacy method');
-$data[1] = print_select(array('DES' => __('DES'), 'AES' => __('AES')), 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true);
+$data[1] = html_print_select(array('DES' => __('DES'), 'AES' => __('AES')), 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true);
 $data[2] = __('privacy pass');
-$data[3] = print_input_text ('snmp3_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true);
+$data[3] = html_print_input_text ('snmp3_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true);
 if ($snmp_version != 3) $table_simple->rowstyle['field_snmpv3_row2'] = 'display: none;';
 push_table_simple($data, 'field_snmpv3_row2');
 
 $data = array();
 $data[0] = __('Auth method');
-$data[1] = print_select(array('MD5' => __('MD5'), 'SHA' => __('SHA')), 'snmp3_auth_method', $snmp3_auth_method, '', '', '', true);
+$data[1] = html_print_select(array('MD5' => __('MD5'), 'SHA' => __('SHA')), 'snmp3_auth_method', $snmp3_auth_method, '', '', '', true);
 $data[2] = __('Security level');
-$data[3] = print_select(array('noAuthNoPriv' => __('Not auth and not privacy method'),
+$data[3] = html_print_select(array('noAuthNoPriv' => __('Not auth and not privacy method'),
 	'authNoPriv' => __('Auth and not privacy method'), 'authPriv' => __('Auth and privacy method')), 'snmp3_security_level', $snmp3_security_level, '', '', '', true);
 if ($snmp_version != 3) $table_simple->rowstyle['field_snmpv3_row3'] = 'display: none;';
 push_table_simple($data, 'field_snmpv3_row3');
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 0124b4a26a..7e83c6083b 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -40,7 +40,7 @@ $extra_title = __('Plugin server module');
 
 $data = array ();
 $data[0] = __('Plugin');
-$data[1] = print_select_from_sql ('SELECT id, name FROM tplugin ORDER BY name',
+$data[1] = html_print_select_from_sql ('SELECT id, name FROM tplugin ORDER BY name',
 	'id_plugin', $id_plugin, 'changePluginSelect();', __('None'), 0, true, false, false, $disabledBecauseInPolicy);
 $table_simple->colspan['plugin_1'][2] = 2;
 $data[2] = '<span style="font-weight: normal;" id="plugin_description"></span>';
@@ -49,24 +49,24 @@ push_table_simple ($data, 'plugin_1');
 
 $data = array ();
 $data[0] = __('Target IP');
-$data[1] = print_input_text ('ip_target', $ip_target, '', 15, 60, true);
+$data[1] = html_print_input_text ('ip_target', $ip_target, '', 15, 60, true);
 $data[2] = __('Port');
-$data[3] = print_input_text ('tcp_port', $tcp_port, '', 5, 20, true);
+$data[3] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, true);
 
 push_table_simple ($data, 'target_ip');
 
 $data = array ();
 $data[0] = __('Username');
-$data[1] = print_input_text ('plugin_user', $plugin_user, '', 15, 60, true);
+$data[1] = html_print_input_text ('plugin_user', $plugin_user, '', 15, 60, true);
 $data[2] = __('Password');
-$data[3] = print_input_password ('plugin_pass', $plugin_pass, '', 15, 60, true);
+$data[3] = html_print_input_password ('plugin_pass', $plugin_pass, '', 15, 60, true);
 
 push_table_simple ($data, 'plugin_2');
 
 $data = array ();
 $data[0] = __('Plugin parameters');
 $data[0] .= ui_print_help_icon ('plugin_parameters', true);
-$data[1] = print_input_text ('plugin_parameter', $plugin_parameter, '', 255, '', true, $disabledBecauseInPolicy);
+$data[1] = html_print_input_text ('plugin_parameter', $plugin_parameter, '', 255, '', true, $disabledBecauseInPolicy);
 $table_simple->colspan['plugin_3'][1] = 3;
 
 push_table_simple ($data, 'plugin_3');
diff --git a/pandora_console/godmode/agentes/module_manager_editor_prediction.php b/pandora_console/godmode/agentes/module_manager_editor_prediction.php
index 9975dd9ebb..176eb37eda 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_prediction.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_prediction.php
@@ -57,23 +57,23 @@ if ($module_service_selector !== ENTERPRISE_NOT_HOOK) {
 	$data[1] = $module_service_selector;
 }
 $data[1] .= '<div id="module_data" style="top:1em; float:left; width:50%;">';
-$data[1] .= print_label(__("Agent"),'agent_name', true)."<br/>";
+$data[1] .= html_print_label(__("Agent"),'agent_name', true)."<br/>";
 $sql = "SELECT id_agente, nombre FROM tagente";
 // TODO: ACL Filter
-$data[1] .= print_input_text_extended ('agent_name',$agent_name, 'text_agent_name', '', 30, 100, $is_service, '',
+$data[1] .= html_print_input_text_extended ('agent_name',$agent_name, 'text_agent_name', '', 30, 100, $is_service, '',
                             array('style' => 'background: url(images/lightning.png) no-repeat right;'), true, false);
 $data[1] .= '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>&nbsp; <br/>';
-$data[1] .= print_label(__("Module"),'prediction_module',true);
+$data[1] .= html_print_label(__("Module"),'prediction_module',true);
 if($id_agente) {
 	$sql = "SELECT id_agente_modulo, nombre
 		FROM tagente_modulo
 		WHERE history_data = 1 AND id_agente =  ".$id_agente;
-    $data[1] .= print_select_from_sql($sql, 'prediction_module', $prediction_module, false, __('Select Module'), 0, true, false, true, $is_service);
+    $data[1] .= html_print_select_from_sql($sql, 'prediction_module', $prediction_module, false, __('Select Module'), 0, true, false, true, $is_service);
 }
 else {
 	$data[1] .= '<select id="prediction_module" name="prediction_module" disabled="disabled"><option value="0">Select an Agent first</option></select>';
 }
-$data[1] .= print_input_hidden ('id_agente', $id_agente, true);
+$data[1] .= html_print_input_hidden ('id_agente', $id_agente, true);
 $data[1] .= '</div>';
 
 // Services are an Enterprise feature.
diff --git a/pandora_console/godmode/agentes/module_manager_editor_wmi.php b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
index cceab04c9d..f755be40f4 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_wmi.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
@@ -39,25 +39,25 @@ if (empty ($update_module_id)) {
 
 $data = array ();
 $data[0] = __('Target IP');
-$data[1] = print_input_text ('ip_target', $ip_target, '', 15, 60, true);
+$data[1] = html_print_input_text ('ip_target', $ip_target, '', 15, 60, true);
 $data[2] = __('Namespace');
 $data[2] .= ui_print_help_icon ('wminamespace', true);
-$data[3] = print_input_text ('tcp_send', $tcp_send, '', 5, 20, true, $disabledBecauseInPolicy);
+$data[3] = html_print_input_text ('tcp_send', $tcp_send, '', 5, 20, true, $disabledBecauseInPolicy);
 
 push_table_simple ($data, 'target_ip');
 
 $data = array ();
 $data[0] = __('Username');
-$data[1] = print_input_text ('plugin_user', $plugin_user, '', 15, 60, true);
+$data[1] = html_print_input_text ('plugin_user', $plugin_user, '', 15, 60, true);
 $data[2] = __('Password');
-$data[3] = print_input_password ('plugin_pass', $plugin_pass, '', 15, 60, true);
+$data[3] = html_print_input_password ('plugin_pass', $plugin_pass, '', 15, 60, true);
 
 push_table_simple ($data, 'user_pass');
 
 $data = array ();
 $data[0] = __('WMI query');
 $data[0] .= ui_print_help_icon ('wmiquery', true);
-$data[1] = print_input_text ('snmp_oid', $snmp_oid, '', 35, 255, true, $disabledBecauseInPolicy);
+$data[1] = html_print_input_text ('snmp_oid', $snmp_oid, '', 35, 255, true, $disabledBecauseInPolicy);
 $table_simple->colspan['wmi_query'][1] = 3;
 
 push_table_simple ($data, 'wmi_query');
@@ -65,10 +65,10 @@ push_table_simple ($data, 'wmi_query');
 $data = array ();
 $data[0] = __('Key string');
 $data[0] .= ui_print_help_icon ('wmikey', true);
-$data[1] = print_input_text ('snmp_community', $snmp_community, '', 20, 60, true, $disabledBecauseInPolicy);
+$data[1] = html_print_input_text ('snmp_community', $snmp_community, '', 20, 60, true, $disabledBecauseInPolicy);
 $data[2] = __('Field number');
 $data[2] .= ui_print_help_icon ('wmifield', true);
-$data[3] = print_input_text ('tcp_port', $tcp_port, '', 5, 15, true, $disabledBecauseInPolicy);
+$data[3] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 15, true, $disabledBecauseInPolicy);
 
 push_table_simple ($data, 'key_field');
 ?>
diff --git a/pandora_console/godmode/agentes/planned_downtime.php b/pandora_console/godmode/agentes/planned_downtime.php
index 72ba0306f9..5fb442fcd0 100644
--- a/pandora_console/godmode/agentes/planned_downtime.php
+++ b/pandora_console/godmode/agentes/planned_downtime.php
@@ -169,19 +169,19 @@ if ($create_downtime || $update_downtime) {
 		$table->width = '90%';
 		$table->data = array ();
 		$table->data[0][0] = __('Name');
-		$table->data[0][1] = print_input_text ('name', $name, '', 25, 40, true);
+		$table->data[0][1] = html_print_input_text ('name', $name, '', 25, 40, true);
 		$table->data[2][0] = __('Description');
-		$table->data[2][1] = print_textarea ('description', 3, 35, $description, '', true);
+		$table->data[2][1] = html_print_textarea ('description', 3, 35, $description, '', true);
 		$table->data[3][0] = __('Timestamp from');
-		$table->data[3][1] = print_input_text ('date_from', $date_from, '', 10, 10, true);
-		$table->data[3][1] .= print_input_text ('time_from', $time_from, '', 7, 7, true);
+		$table->data[3][1] = html_print_input_text ('date_from', $date_from, '', 10, 10, true);
+		$table->data[3][1] .= html_print_input_text ('time_from', $time_from, '', 7, 7, true);
 		
 		$table->data[4][0] = __('Timestamp to');
-		$table->data[4][1] = print_input_text ('date_to', $date_to, '', 10, 10, true);
-		$table->data[4][1] .= print_input_text ('time_to', $time_to, '', 7, 7, true);
+		$table->data[4][1] = html_print_input_text ('date_to', $date_to, '', 10, 10, true);
+		$table->data[4][1] .= html_print_input_text ('time_to', $time_to, '', 7, 7, true);
 
 		$table->data[5][0] = __('Group');
-		$table->data[5][1] = print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true);
+		$table->data[5][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true);
 		echo '<form method="POST" action="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime">';
 
 		if ($id_downtime > 0){
@@ -191,18 +191,18 @@ if ($create_downtime || $update_downtime) {
 	
 		//Editor form
 		echo '<h3>'.__('Planned Downtime Form').' '.ui_print_help_icon ('planned_downtime', true).'</h3>';
-		print_table ($table);
+		html_print_table ($table);
 		
-		print_input_hidden ('id_agent', $id_agent);
+		html_print_input_hidden ('id_agent', $id_agent);
 		echo '<div class="action-buttons" style="width: 90%">';
 		if ($id_downtime) {
-			print_input_hidden ('update_downtime', 1);
-			print_input_hidden ('id_downtime', $id_downtime);
-			print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
+			html_print_input_hidden ('update_downtime', 1);
+			html_print_input_hidden ('id_downtime', $id_downtime);
+			html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
 		}
 		else {
-			print_input_hidden ('create_downtime', 1);
-			print_submit_button (__('Add'), 'crtbutton', false, 'class="sub wand"');
+			html_print_input_hidden ('create_downtime', 1);
+			html_print_submit_button (__('Add'), 'crtbutton', false, 'class="sub wand"');
 		}
 		echo '</div>';
 		echo '</form>';
@@ -238,16 +238,16 @@ if ($create_downtime || $update_downtime) {
 	
 		echo "<form method=post action='index.php?sec=gagente&sec2=godmode/agentes/planned_downtime&first_update=1&id_downtime=$id_downtime'>";
 
-		print_select_groups(false, "AR", true, 'filter_group', $filter_group);	
+		html_print_select_groups(false, "AR", true, 'filter_group', $filter_group);	
 		echo "<br /><br />";
-		print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false);
+		html_print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false);
 		echo "</form>";
 	
 		echo "<form method=post action='index.php?sec=gagente&sec2=godmode/agentes/planned_downtime&first_update=1&insert_downtime_agent=1&id_downtime=$id_downtime'>";
 	
-		echo print_select ($data, "id_agent[]", '', '', '', 0, false, true);
+		echo html_print_select ($data, "id_agent[]", '', '', '', 0, false, true);
 		echo "<br /><br /><br />";
-		print_submit_button (__('Add'), '', false, 'class="sub next"',false);
+		html_print_submit_button (__('Add'), '', false, 'class="sub next"',false);
 		echo "</form>";
 		echo "</table>";
 		
@@ -291,11 +291,11 @@ if ($create_downtime || $update_downtime) {
 	
 			$data[4] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime&amp;id_agent='.
 				$id_agent.'&amp;delete_downtime_agent=1&amp;first_update=1&amp;id_downtime_agent='.$downtime["id"].'&amp;id_downtime='.$id_downtime.'">' .
-				print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete')));
+				html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete')));
 	
 			array_push ($table->data, $data);
 		}
-			print_table ($table);
+			html_print_table ($table);
 		}
 	}
 }
@@ -339,9 +339,9 @@ else {
 				if ($downtime["executed"] == 0){
 					$data[5] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime&amp;id_agent='.
 					$id_agent.'&amp;delete_downtime=1&amp;id_downtime='.$downtime['id'].'">' .
-					print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete')));
+					html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete')));
 					$data[6] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime&amp;edit_downtime=1&amp;first_update=1&amp;id_downtime='.$downtime['id'].'">' .
-					print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
+					html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
 				}
 				else {
 					$data[5]= "N/A";
@@ -349,19 +349,19 @@ else {
 
 				}
 				if ($downtime["executed"] == 0)
-					$data[7] = print_image ("images/pixel_green.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Executed')));
+					$data[7] = html_print_image ("images/pixel_green.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Executed')));
 				else
-					$data[7] = print_image ("images/pixel_red.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Not executed')));
+					$data[7] = html_print_image ("images/pixel_red.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Not executed')));
 
 				array_push ($table->data, $data);
 			}
-			print_table ($table);
+			html_print_table ($table);
 		}
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
 
 	echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/planned_downtime">';
-	print_input_hidden ("first_create", 1);
-	print_submit_button (__('Create'), 'create', false, 'class="sub next"');
+	html_print_input_hidden ("first_create", 1);
+	html_print_submit_button (__('Create'), 'create', false, 'class="sub next"');
 	echo '</form>';
 	echo '</div>';
 }
diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php
index 3691c81b4e..261ee38097 100644
--- a/pandora_console/godmode/alerts/alert_actions.php
+++ b/pandora_console/godmode/alerts/alert_actions.php
@@ -284,26 +284,26 @@ foreach ($actions as $action) {
 	
 	$data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&id='.$action['id'].'">'.
 		$action['name'].'</a>';
-	$data[1] = ui_print_group_icon ($action["id_group"], true) .'&nbsp;'. ui_print_truncate_text(get_group_name ($action["id_group"], true));
+	$data[1] = ui_print_group_icon ($action["id_group"], true) .'&nbsp;'. ui_print_truncate_text(groups_get_name ($action["id_group"], true));
 	$data[2] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_actions&copy_action=1&id='.$action['id'].'"
 		onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">' .
-		print_image("images/copy.png", true) . '</a>';
+		html_print_image("images/copy.png", true) . '</a>';
 	$data[3] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_actions&delete_action=1&id='.$action['id'].'"
 		onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.
-		print_image("images/cross.png", true) . '</a>';
+		html_print_image("images/cross.png", true) . '</a>';
 	
 	array_push ($table->data, $data);
 }
 if (isset($data)){
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo "<div class='nf'>".__('No alert actions configured')."</div>";
 }
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action">';
-print_submit_button (__('Create'), 'create', false, 'class="sub next"');
-print_input_hidden ('create_alert', 1);
+html_print_submit_button (__('Create'), 'create', false, 'class="sub next"');
+html_print_input_hidden ('create_alert', 1);
 echo '</form>';
 echo '</div>';
 ?>
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 7b1593a8ee..5e7871b8db 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -154,17 +154,17 @@ foreach ($commands as $command) {
 	if (! $command['internal'])
 		$data[2] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'"
 			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.
-			print_image("images/cross.png", true) . '</a>';
+			html_print_image("images/cross.png", true) . '</a>';
 	
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_command">';
-print_submit_button (__('Create'), 'create', false, 'class="sub next"');
-print_input_hidden ('create_alert', 1);
+html_print_submit_button (__('Create'), 'create', false, 'class="sub next"');
+html_print_input_hidden ('create_alert', 1);
 echo '</form>';
 echo '</div>';
 ?>
diff --git a/pandora_console/godmode/alerts/alert_compounds.php b/pandora_console/godmode/alerts/alert_compounds.php
index 4642a832c5..1fa42f911d 100644
--- a/pandora_console/godmode/alerts/alert_compounds.php
+++ b/pandora_console/godmode/alerts/alert_compounds.php
@@ -115,24 +115,24 @@ $table->size[2] = '15%';
 $table->size[3] = '35%';
 
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(0, "LM", true, 'id_group', $id_group, false, '',
+$table->data[0][1] = html_print_select_groups(0, "LM", true, 'id_group', $id_group, false, '',
 	'', true);
 $table->data[0][2] = __('Agent');
 $table->data[0][2] .= ' <span id="agent_loading" class="invisible">';
-$table->data[0][2] .= print_image("images/spinner.png", true);
+$table->data[0][2] .= html_print_image("images/spinner.png", true);
 $table->data[0][2] .= '</span>';
-$table->data[0][3] = print_select ($agents, 'id_agent', $id_agent, false,
+$table->data[0][3] = html_print_select ($agents, 'id_agent', $id_agent, false,
 	__('All'), 0, true);
 
 $table->data[1][0] = __('Free search');
-$table->data[1][1] = print_input_text ('search', $search, '', 20, 40, true);
+$table->data[1][1] = html_print_input_text ('search', $search, '', 20, 40, true);
 $table->colspan[1][1] = 3;
 
 echo '<form id="filter_form" method="post" action="index.php?galertas&sec2=godmode/alerts/alert_compounds">';
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: 90%">';
-print_input_hidden ('do_search', 1);
-print_submit_button (__('Search'), 'search_btn', false, 'class="sub search"');
+html_print_input_hidden ('do_search', 1);
+html_print_submit_button (__('Search'), 'search_btn', false, 'class="sub search"');
 echo '</div>';
 echo '</form>';
 unset ($table);
@@ -221,13 +221,13 @@ foreach ($id_alerts as $alert) {
 	
 	$data[0] = '<form class="disable_alert_form" action="'.$url.'" method="post" style="display: inline;">';
 	if ($alert['disabled']) {
-		$data[0] .= print_input_image ('enable', 'images/lightbulb_off.png', 1, '', true);
-		$data[0] .= print_input_hidden ('enable_alert', 1, true);
+		$data[0] .= html_print_input_image ('enable', 'images/lightbulb_off.png', 1, '', true);
+		$data[0] .= html_print_input_hidden ('enable_alert', 1, true);
 	} else {
-		$data[0] .= print_input_image ('disable', 'images/lightbulb.png', 1, '', true);
-		$data[0] .= print_input_hidden ('disable_alert', 1, true);
+		$data[0] .= html_print_input_image ('disable', 'images/lightbulb.png', 1, '', true);
+		$data[0] .= html_print_input_hidden ('disable_alert', 1, true);
 	}
-	$data[0] .= print_input_hidden ('id', $alert['id'], true);
+	$data[0] .= html_print_input_hidden ('id', $alert['id'], true);
 	$data[0] .= '</form>';
 	
 	$data[1] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_compound&id='.$alert['id'].'">';
@@ -236,22 +236,22 @@ foreach ($id_alerts as $alert) {
 	$data[2] = get_agent_name ($alert['id_agent']);
 	$data[3] = '<a href="'.$url.'&delete_alert=1&id='.$alert['id'].'"
 		onClick="javascript:confirm(\''.__('Are you sure?').'\')">';
-	$data[3] .= print_image("images/cross.png", true, array("title" => __('Delete'))); 
+	$data[3] .= html_print_image("images/cross.png", true, array("title" => __('Delete'))); 
 	$data[3] .= '</a>';
 	
 	array_push ($table->data, $data);
 }
 
 if (isset($data)){
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo "<div class='nf'>".__('No alerts found')."</div>";
 }
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_compound">';
-print_submit_button (__('Create'), 'crtbtn', false, 'class="sub next"');
-print_input_hidden ('new_compound', 1);
+html_print_submit_button (__('Create'), 'crtbtn', false, 'class="sub next"');
+html_print_input_hidden ('new_compound', 1);
 echo '</form>';
 echo '</div>';
 
diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index d8bd4769dc..620204d630 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -47,7 +47,7 @@ if (! $id_agente) {
 	
 	$table->data['agent'][0] = __('Agent');
 	
-	$table->data['agent'][1] = print_input_text_extended ('id_agent', '', 'text_id_agent', '', 30, 100, false, '',
+	$table->data['agent'][1] = html_print_input_text_extended ('id_agent', '', 'text_id_agent', '', 30, 100, false, '',
 	array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
 	. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 }
@@ -57,12 +57,12 @@ $modules = array ();
 if ($id_agente)
 	$modules = get_agent_modules ($id_agente, false, array("delete_pending" => 0));
 
-$table->data[0][1] = print_select ($modules, 'id_agent_module', 0, true,
+$table->data[0][1] = html_print_select ($modules, 'id_agent_module', 0, true,
 	__('Select'), 0, true, false, true, '', ($id_agente == 0));
 $table->data[0][1] .= ' <span id="latest_value" class="invisible">'.__('Latest value').': ';
 $table->data[0][1] .= '<span id="value">&nbsp;</span></span>';
 $table->data[0][1] .= ' <span id="module_loading" class="invisible">';
-$table->data[0][1] .= print_image('images/spinner.png', true) . '</span>';
+$table->data[0][1] .= html_print_image('images/spinner.png', true) . '</span>';
 
 $table->data[1][0] = __('Template');
 
@@ -77,12 +77,12 @@ else{
 	$templates = alerts_get_alert_templates (array ('id_group IN (' . $filter_groups . ')'), array ('id', 'name'));
 }	
 
-$table->data[1][1] = print_select (index_array ($templates, 'id', 'name'),
+$table->data[1][1] = html_print_select (index_array ($templates, 'id', 'name'),
 	'template', '', '', __('Select'), 0, true);
 $table->data[1][1] .= ' <a class="template_details invisible" href="#">' .
-	print_image("images/zoom.png", true, array("class" => 'img_help')) . '</a>';
+	html_print_image("images/zoom.png", true, array("class" => 'img_help')) . '</a>';
 if (check_acl ($config['id_user'], 0, "LM")) {
-	$table->data[1][1] .= print_image ('images/add.png', true);
+	$table->data[1][1] .= html_print_image ('images/add.png', true);
 	$table->data[1][1] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template">';
 	$table->data[1][1] .= __('Create Template');
 	$table->data[1][1] .= '</a>';
@@ -93,33 +93,33 @@ $table->data[2][0] = __('Actions');
 $actions = array ('0' => __('None'));
 
 $table->data[2][1] = '<div class="actions_container">';
-$table->data[2][1] = print_select($actions,'action_select','','','','',true);
+$table->data[2][1] = html_print_select($actions,'action_select','','','','',true);
 $table->data[2][1] .= ' <span id="action_loading" class="invisible">';
-$table->data[2][1] .= print_image('images/spinner.png', true) . '</span>';
+$table->data[2][1] .= html_print_image('images/spinner.png', true) . '</span>';
 $table->data[2][1] .= ' <span id="advanced_action" class="advanced_actions invisible">';
 $table->data[2][1] .= __('Number of alerts match from').' ';
-$table->data[2][1] .= print_input_text ('fires_min', '', '', 4, 10, true);
+$table->data[2][1] .= html_print_input_text ('fires_min', '', '', 4, 10, true);
 $table->data[2][1] .= ' '.__('to').' ';
-$table->data[2][1] .= print_input_text ('fires_max', '', '', 4, 10, true);
+$table->data[2][1] .= html_print_input_text ('fires_max', '', '', 4, 10, true);
 $table->data[2][1] .= ui_print_help_icon ("alert-matches", true);
 $table->data[2][1] .= '</span>';
 $table->data[2][1] .= '</div>';
 if (check_acl ($config['id_user'], 0, "LM")) {
-	$table->data[2][1] .= print_image ('images/add.png', true);
+	$table->data[2][1] .= html_print_image ('images/add.png', true);
 	$table->data[2][1] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action">';
 	$table->data[2][1] .= __('Create Action');
 	$table->data[2][1] .= '</a>';
 }
 $table->data[3][0] = __('Threshold');
-$table->data[3][1] = print_input_text ('module_action_threshold', '', '', 4, 10, true) . ui_print_help_icon ('action_threshold', true);
+$table->data[3][1] = html_print_input_text ('module_action_threshold', '', '', 4, 10, true) . ui_print_help_icon ('action_threshold', true);
 
 echo '<form class="add_alert_form" method="post">';
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Add alert'), 'add', false, 'class="sub wand"');
-print_input_hidden ('create_alert', 1);
+html_print_submit_button (__('Add alert'), 'add', false, 'class="sub wand"');
+html_print_input_hidden ('create_alert', 1);
 echo '</div></form>';
 
 ui_require_css_file ('cluetip');
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index ae1d83aaa8..938971b9ad 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -44,7 +44,7 @@ $form_filter .= "<input type='hidden' name='search' value='1' />\n";
 $form_filter .= '<table style="width: 90%;" cellpadding="4" cellspacing="4" class="databox">'."\n";
 $form_filter .= "<tr>\n";
 $form_filter .= "<td>".__('Template name')."</td><td>";
-$form_filter .= print_input_text ('template_name', $templateName, '', 12, 255, true);
+$form_filter .= html_print_input_text ('template_name', $templateName, '', 12, 255, true);
 $form_filter .= "</td>\n";
 $temp = agents_get_agents();
 $arrayAgents = array();
@@ -57,14 +57,14 @@ if ($temp){
 }
 
 $form_filter .= "<td>".__('Agents')."</td><td>";
-$form_filter .= print_input_text_extended ('agent_name', $agentName, 'text-agent_name', '', 12, 100, false, '',
+$form_filter .= html_print_input_text_extended ('agent_name', $agentName, 'text-agent_name', '', 12, 100, false, '',
 array('style' => 'background: url(images/lightning.png) no-repeat right;'), true);
 $form_filter .= '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 $form_filter .= "</td>\n";
 
 
 $form_filter .= "<td>".__('Module name')."</td><td>";
-$form_filter .= print_input_text ('module_name', $moduleName, '', 12, 255, true);
+$form_filter .= html_print_input_text ('module_name', $moduleName, '', 12, 255, true);
 $form_filter .= "</td>\n";
 $form_filter .= "</tr>\n";
 
@@ -86,13 +86,13 @@ if (is_array($temp)) {
 	}
 }
 $form_filter .= "<td>".__('Actions')."</td><td>";
-$form_filter .= print_select ($arrayActions, "action_id", $actionID,  '', __('All'), -1, true);
+$form_filter .= html_print_select ($arrayActions, "action_id", $actionID,  '', __('All'), -1, true);
 $form_filter .= "</td>\n";
 $form_filter .= "<td>".__('Field content')."</td><td>";
-$form_filter .= print_input_text ('field_content', $fieldContent, '', 12, 255, true);
+$form_filter .= html_print_input_text ('field_content', $fieldContent, '', 12, 255, true);
 $form_filter .= "</td>\n";
 $form_filter .= "<td>".__('Priority')."</td><td>";
-$form_filter .= print_select (get_priorities (), 'priority',$priority, '', __('All'), -1, true);
+$form_filter .= html_print_select (get_priorities (), 'priority',$priority, '', __('All'), -1, true);
 $form_filter .= "</td>";
 $form_filter .= "</tr>\n";
 
@@ -101,17 +101,17 @@ $form_filter .= "<td>".__('Enabled / Disabled')."</td><td>";
 $ed_list = array ();
 $ed_list[0] = __('Enable');
 $ed_list[1] = __('Disable');
-$form_filter .= print_select ($ed_list, 'enabledisable', $enabledisable, '', __('All'), -1, true);
+$form_filter .= html_print_select ($ed_list, 'enabledisable', $enabledisable, '', __('All'), -1, true);
 $form_filter .= "</td><td>".__('Standby')."</td><td>";
 $sb_list = array ();
 $sb_list[1] = __('Standby on');
 $sb_list[0] = __('Standby off');
-$form_filter .= print_select ($sb_list, 'standby', $standby, '', __('All'), -1, true);
+$form_filter .= html_print_select ($sb_list, 'standby', $standby, '', __('All'), -1, true);
 $form_filter .= "</td></tr>\n";
 
 $form_filter .= "<tr>\n";
 $form_filter .= "<td colspan='6' align='right'>";
-$form_filter .= print_submit_button (__('Update'), '', false, 'class="sub upd"', true);
+$form_filter .= html_print_submit_button (__('Update'), '', false, 'class="sub upd"', true);
 $form_filter .= "</td>";
 $form_filter .= "</tr>\n";
 $form_filter .= "</table>\n";
@@ -302,17 +302,17 @@ $table->align[1] = 'center';
 
 $table->head = array ();
 $table->head[0] = "<span title='" . __('Enabled / Disabled') . "'>" . __('E/D') . "</span><br>" .
-	'<a href="' . $url . '&sort_field=disabled&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectDisabledUp)) . '</a>' .
-	'<a href="' . $url . '&sort_field=disabled&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectDisabledDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=disabled&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectDisabledUp)) . '</a>' .
+	'<a href="' . $url . '&sort_field=disabled&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectDisabledDown)) . '</a>';
 $table->head[1] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span><br>" .
-	'<a href="' . $url . '&sort_field=standby&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectStandbyUp)) . '</a>' .
-	'<a href="' . $url . '&sort_field=standby&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectStandbyDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=standby&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectStandbyUp)) . '</a>' .
+	'<a href="' . $url . '&sort_field=standby&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectStandbyDown)) . '</a>';
 if (! $id_agente) {
 	$table->style = array ();
 	$table->style[2] = 'font-weight: bold';
 	$table->head[2] = __('Agent') . '<br>' .
-		'<a href="' . $url . '&sort_field=agent&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
-		'<a href="' . $url . '&sort_field=agent&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
+		'<a href="' . $url . '&sort_field=agent&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
+		'<a href="' . $url . '&sort_field=agent&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
 	$table->size[0] = '6%';
 	$table->size[1] = '6%';
 	$table->size[2] = '20%';
@@ -338,11 +338,11 @@ else {
 }
 
 $table->head[3] = __('Module') . '<br>' .
-	'<a href="' . $url . '&sort_field=module&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
-	'<a href="' . $url . '&sort_field=module&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=module&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
+	'<a href="' . $url . '&sort_field=module&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
 $table->head[4] = __('Template') . '<br>' .
-	'<a href="' . $url . '&sort_field=template&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
-	'<a href="' . $url . '&sort_field=template&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
+	'<a href="' . $url . '&sort_field=template&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
+	'<a href="' . $url . '&sort_field=template&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
 if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 	$table->head[5] = "<span title='" . __('Policy') . "'>" . __('P.') . "</span>";
 }
@@ -389,26 +389,26 @@ foreach ($simple_alerts as $alert) {
 	
 	$data[0] = '<form class="disable_alert_form" method="post" style="display: inline;">';
 	if ($alert['disabled']) {
-		$data[0] .= print_input_image ('enable', 'images/lightbulb_off.png', 1, '', true);
-		$data[0] .= print_input_hidden ('enable_alert', 1, true);
+		$data[0] .= html_print_input_image ('enable', 'images/lightbulb_off.png', 1, '', true);
+		$data[0] .= html_print_input_hidden ('enable_alert', 1, true);
 	}
 	else {
-		$data[0] .= print_input_image ('disable', 'images/lightbulb.png', 1, '', true);
-		$data[0] .= print_input_hidden ('disable_alert', 1, true);
+		$data[0] .= html_print_input_image ('disable', 'images/lightbulb.png', 1, '', true);
+		$data[0] .= html_print_input_hidden ('disable_alert', 1, true);
 	}
-	$data[0] .= print_input_hidden ('id_alert', $alert['id'], true);
+	$data[0] .= html_print_input_hidden ('id_alert', $alert['id'], true);
 	$data[0] .= '</form>';
 	
 	$data[1] = '<form class="standby_alert_form" method="post" style="display: inline;">';
 	if (!$alert['standby']) {
-		$data[1] .= print_input_image ('standby_off', 'images/bell.png', 1, '', true);
-		$data[1] .= print_input_hidden ('standbyon_alert', 1, true);
+		$data[1] .= html_print_input_image ('standby_off', 'images/bell.png', 1, '', true);
+		$data[1] .= html_print_input_hidden ('standbyon_alert', 1, true);
 	}
 	else {
-		$data[1] .= print_input_image ('standby_on', 'images/bell_pause.png', 1, '', true);
-		$data[1] .= print_input_hidden ('standbyoff_alert', 1, true);
+		$data[1] .= html_print_input_image ('standby_on', 'images/bell_pause.png', 1, '', true);
+		$data[1] .= html_print_input_hidden ('standbyoff_alert', 1, true);
 	}
-	$data[1] .= print_input_hidden ('id_alert', $alert['id'], true);
+	$data[1] .= html_print_input_hidden ('id_alert', $alert['id'], true);
 	$data[1] .= '</form>';
 	
 	if (! $id_agente) {
@@ -424,7 +424,7 @@ foreach ($simple_alerts as $alert) {
 	$data[3] = ui_print_truncate_text(get_agentmodule_name ($alert['id_agent_module']), 25, false);
 	$data[4] = ' <a class="template_details"
 		href="ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$alert['id_alert_template'].'">' .
-		print_image("images/zoom.png", true, array("id" => 'template-details-'.$alert['id_alert_template'], "class" => "img_help")) . '</a> ';
+		html_print_image("images/zoom.png", true, array("id" => 'template-details-'.$alert['id_alert_template'], "class" => "img_help")) . '</a> ';
 
 	$data[4] .= "<a href='index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id=".$alert['id_alert_template']."'>";
 	$data[4] .= ui_print_truncate_text(alerts_get_alert_template_name ($alert['id_alert_template']), 15, false);
@@ -438,7 +438,7 @@ foreach ($simple_alerts as $alert) {
 			$img = 'images/policies.png';
 				
 			$data[5] = '<a href="?sec=gpolicies&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id'] . '">' . 
-				print_image($img,true, array('title' => $policyInfo['name'])) .
+				html_print_image($img,true, array('title' => $policyInfo['name'])) .
 				'</a>';
 		}
 	}
@@ -481,10 +481,10 @@ foreach ($simple_alerts as $alert) {
 			$data[6] .= '</font>';
 //			$data[6] .= ' <span class="delete" style="clear:right">';
 			$data[6] .= '<form method="post" class="delete_link" style="display: inline; vertical-align: -50%;">';
-			$data[6] .= print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
-			$data[6] .= print_input_hidden ('delete_action', 1, true);
-			$data[6] .= print_input_hidden ('id_alert', $alert['id'], true);
-			$data[6] .= print_input_hidden ('id_action', $action_id, true);
+			$data[6] .= html_print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
+			$data[6] .= html_print_input_hidden ('delete_action', 1, true);
+			$data[6] .= html_print_input_hidden ('id_alert', $alert['id'], true);
+			$data[6] .= html_print_input_hidden ('id_action', $action_id, true);
 			$data[6] .= '</form>';
 //			$data[6] .= '</span>';
 			$data[6] .= '</li>';
@@ -494,7 +494,7 @@ foreach ($simple_alerts as $alert) {
 
 	
 	$data[6] .= '<a class="add_action" id="add-action-'.$alert['id'].'" href="#">';
-	$data[6] .= print_image ('images/add.png', true);
+	$data[6] .= html_print_image ('images/add.png', true);
 	if ($alert['disabled'])
 		$data[6] .= ' '. '<span style="font-style: italic; color: #aaaaaa;">' .__('Add action') . '</span>';
 	else
@@ -502,27 +502,27 @@ foreach ($simple_alerts as $alert) {
 	$data[6] .= '</a>';
 	
 	$data[6] .= '<form id="add_action_form-'.$alert['id'].'" method="post" class="invisible">';
-	$data[6] .= print_input_hidden ('add_action', 1, true);
-	$data[6] .= print_input_hidden ('id_alert_module', $alert['id'], true);
+	$data[6] .= html_print_input_hidden ('add_action', 1, true);
+	$data[6] .= html_print_input_hidden ('id_alert_module', $alert['id'], true);
 	$own_info = get_user_info($config['id_user']);
 	$own_groups = get_user_groups($config['id_user'], 'LW', $own_info['is_admin']);
 	$filter_groups = '';
 	$filter_groups = implode(',', array_keys($own_groups));
 	$actions = alerts_get_alert_actions_filter(true, 'id_group IN (' . $filter_groups . ')');
-	$data[6] .= print_select ($actions, 'action', '', '', __('None'), 0, true);
+	$data[6] .= html_print_select ($actions, 'action', '', '', __('None'), 0, true);
 	$data[6] .= '<br />';
 	$data[6] .= '<span><a href="#" class="show_advanced_actions">'.__('Advanced options').' &raquo; </a></span>';
 	$data[6] .= '<span class="advanced_actions invisible">';
 	$data[6] .= __('Number of alerts match from').' ';
-	$data[6] .= print_input_text ('fires_min', -1, '', 4, 10, true);
+	$data[6] .= html_print_input_text ('fires_min', -1, '', 4, 10, true);
 	$data[6] .= ' '.__('to').' ';
-	$data[6] .= print_input_text ('fires_max', -1, '', 4, 10, true);
+	$data[6] .= html_print_input_text ('fires_max', -1, '', 4, 10, true);
 	$data[6] .= ui_print_help_icon ("alert-matches", true);
 	$data[6] .= '<br />' . __('Threshold');
-	$data[6] .= print_input_text ('module_action_threshold', '', '', 4, 10, true) . ui_print_help_icon ('action_threshold', true);
+	$data[6] .= html_print_input_text ('module_action_threshold', '', '', 4, 10, true) . ui_print_help_icon ('action_threshold', true);
 	$data[6] .= '</span>';
 	$data[6] .= '<div class="right">';
-	$data[6] .= print_submit_button (__('Add'), 'add_action', false, 'class="sub next"', true);
+	$data[6] .= html_print_submit_button (__('Add'), 'add_action', false, 'class="sub next"', true);
 	$data[6] .= '</div>';
 	$data[6] .= '</form>';
 	
@@ -546,15 +546,15 @@ foreach ($simple_alerts as $alert) {
 	
 	$data[8] = '<form class="delete_alert_form" method="post" style="display: inline;">';
 	
-	$data[8] .= print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
-	$data[8] .= print_input_hidden ('delete_alert', 1, true);
-	$data[8] .= print_input_hidden ('id_alert', $alert['id'], true);
+	$data[8] .= html_print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
+	$data[8] .= html_print_input_hidden ('delete_alert', 1, true);
+	$data[8] .= html_print_input_hidden ('id_alert', $alert['id'], true);
 	$data[8] .= '</form>';
 	array_push ($table->data, $data);
 }
 
 if (isset($data)){
-	print_table ($table);
+	html_print_table ($table);
 }
 else {
 	echo "<div class='nf'>".__('No alerts defined')."</div>";
@@ -563,7 +563,7 @@ else {
 // Create alert button
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder">';
-print_submit_button (__('Create'), 'crtbtn', false, 'class="sub next"');
+html_print_submit_button (__('Create'), 'crtbtn', false, 'class="sub next"');
 echo '</form>';
 echo '</div>';
 
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index bd6a2430e2..f8de18f286 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -251,11 +251,11 @@ else {
 		'list' => array(
 			'active' => false,
 			'text' => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list">' . 
-				print_image ("images/god6.png", true, array ("title" => __('List alerts'))) .'</a>'),
+				html_print_image ("images/god6.png", true, array ("title" => __('List alerts'))) .'</a>'),
 		'builder' => array(
 			'active' => false,
 			'text' => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder">' . 
-				print_image ("images/config.png", true, array ("title" => __('Builder alert'))) .'</a>'));
+				html_print_image ("images/config.png", true, array ("title" => __('Builder alert'))) .'</a>'));
 	
 	$buttons[$tab]['active'] = true;
 
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index 63b27feee9..96f0d778f8 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -199,18 +199,18 @@ $table->style[0] = 'font-weight: bold';
 $table->style[2] = 'font-weight: bold';
 
 $table->data[0][0] = __('Type');
-$table->data[0][1] = print_select (alerts_get_alert_templates_types (), 'search_type',
+$table->data[0][1] = html_print_select (alerts_get_alert_templates_types (), 'search_type',
 	$search_type, '', __('All'), '', true, false, false);
 $table->data[0][2] = __('Search');
-$table->data[0][3] = print_input_text ('search_string', $search_string, '', 25,
+$table->data[0][3] = html_print_input_text ('search_string', $search_string, '', 25,
 	255, true);
 $table->data[0][4] = '<div class="action-buttons">';
-$table->data[0][4] .= print_submit_button (__('Search'), 'search', false,
+$table->data[0][4] .= html_print_submit_button (__('Search'), 'search', false,
 	'class="sub search"', true);
 $table->data[0][4] .= '</div>';
 
 echo '<form method="post" action="'.$url.'">';
-print_table ($table);
+html_print_table ($table);
 echo '</form>';
 
 unset ($table);
@@ -259,19 +259,19 @@ foreach ($templates as $template) {
 	$data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id='.$template['id'].'">'.
 		$template['name'].'</a>';
 
-	$data[1] = ui_print_group_icon ($template["id_group"], true) .'&nbsp;'. ui_print_truncate_text(get_group_name ($template['id_group'], true));
+	$data[1] = ui_print_group_icon ($template["id_group"], true) .'&nbsp;'. ui_print_truncate_text(groups_get_name ($template['id_group'], true));
 	$data[3] = alerts_get_alert_templates_type_name ($template['type']);
 
 	$data[4] = '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template" style="display: inline; float: left">';
-	$data[4] .= print_input_hidden ('duplicate_template', 1, true);
-	$data[4] .= print_input_hidden ('source_id', $template['id'], true);
-	$data[4] .= print_input_image ('dup', 'images/copy.png', 1, '', true, array ('title' => __('Duplicate')));
+	$data[4] .= html_print_input_hidden ('duplicate_template', 1, true);
+	$data[4] .= html_print_input_hidden ('source_id', $template['id'], true);
+	$data[4] .= html_print_input_image ('dup', 'images/copy.png', 1, '', true, array ('title' => __('Duplicate')));
 	$data[4] .= '</form> ';
 	
 	$data[4] .= '<form method="post" style="display: inline; float: right" onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-	$data[4] .= print_input_hidden ('delete_template', 1, true);
-	$data[4] .= print_input_hidden ('id', $template['id'], true);
-	$data[4] .= print_input_image ('del', 'images/cross.png', 1, '', true, array ('title' => __('Delete')));
+	$data[4] .= html_print_input_hidden ('delete_template', 1, true);
+	$data[4] .= html_print_input_hidden ('id', $template['id'], true);
+	$data[4] .= html_print_input_image ('del', 'images/cross.png', 1, '', true, array ('title' => __('Delete')));
 	$data[4] .= '</form> ';
 	
 	array_push ($table->data, $data);
@@ -279,14 +279,14 @@ foreach ($templates as $template) {
 
 ui_pagination ($total_templates, $url);
 if (isset($data)){
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo "<div class='nf'>".__('No alert templates defined')."</div>";
 }
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template">';
-print_submit_button (__('Create'), 'create', false, 'class="sub next"');
-print_input_hidden ('create_alert', 1);
+html_print_submit_button (__('Create'), 'create', false, 'class="sub next"');
+html_print_input_hidden ('create_alert', 1);
 echo '</form>';
 echo '</div>';
 
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index b6c57bda3c..9d477ab899 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -93,7 +93,7 @@ $table->size = array ();
 $table->size[0] = '20%';
 $table->data = array ();
 $table->data[0][0] = __('Name');
-$table->data[0][1] = print_input_text ('name', $name, '', 35, 255, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 255, true);
 
 $table->data[1][0] = __('Group');
 
@@ -104,44 +104,44 @@ if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
 	$display_all_group = true;
 else	
 	$display_all_group = false;
-$table->data[1][1] = print_select_groups(false, "LW", $display_all_group, 'group', $group, '', '', 0, true);
+$table->data[1][1] = html_print_select_groups(false, "LW", $display_all_group, 'group', $group, '', '', 0, true);
 
 $table->data[2][0] = __('Command');
-$table->data[2][1] = print_select_from_sql ('SELECT id, name FROM talert_commands',
+$table->data[2][1] = html_print_select_from_sql ('SELECT id, name FROM talert_commands',
 	'id_command', $id_command, '', __('None'), 0, true);
 $table->data[2][1] .= ' ';
 if (check_acl ($config['id_user'], 0, "PM")){
-	$table->data[2][1] .= print_image ('images/add.png', true);
+	$table->data[2][1] .= html_print_image ('images/add.png', true);
 	$table->data[2][1] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_command">';
 	$table->data[2][1] .= __('Create Command');
 	$table->data[2][1] .= '</a>';
 }
 $table->data[3][0] = __('Threshold');
-$table->data[3][1] = print_input_text ('action_threshold', $action_threshold, '', 5, 7, true);
+$table->data[3][1] = html_print_input_text ('action_threshold', $action_threshold, '', 5, 7, true);
 $table->data[3][1] .= ' '.__('seconds') . ui_print_help_icon ('action_threshold', true);
 $table->data[4][0] = __('Field 1');
-$table->data[4][1] = print_input_text ('field1', $field1, '', 35, 255, true) . ui_print_help_icon ('alert_macros', true);
+$table->data[4][1] = html_print_input_text ('field1', $field1, '', 35, 255, true) . ui_print_help_icon ('alert_macros', true);
 
 $table->data[5][0] = __('Field 2');
-$table->data[5][1] = print_input_text ('field2', $field2, '', 80, 255, true);
+$table->data[5][1] = html_print_input_text ('field2', $field2, '', 80, 255, true);
 
 $table->data[6][0] = __('Field 3');
-$table->data[6][1] = print_textarea ('field3', 10, 30, $field3, '', true);
+$table->data[6][1] = html_print_textarea ('field3', 10, 30, $field3, '', true);
 
 $table->data[7][0] = __('Command preview');
-$table->data[7][1] = print_textarea ('command_preview', 10, 30, '', 'disabled="disabled"', true);
+$table->data[7][1] = html_print_textarea ('command_preview', 10, 30, '', 'disabled="disabled"', true);
 
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_actions">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id) {
-	print_input_hidden ('id', $id);
-	print_input_hidden ('update_action', 1);
-	print_submit_button (__('Update'), 'create', false, 'class="sub upd"');
+	html_print_input_hidden ('id', $id);
+	html_print_input_hidden ('update_action', 1);
+	html_print_submit_button (__('Update'), 'create', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('create_action', 1);
-	print_submit_button (__('Create'), 'create', false, 'class="sub wand"');
+	html_print_input_hidden ('create_action', 1);
+	html_print_submit_button (__('Create'), 'create', false, 'class="sub wand"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php
index 10ce6d7f9e..52cebf0f4b 100644
--- a/pandora_console/godmode/alerts/configure_alert_command.php
+++ b/pandora_console/godmode/alerts/configure_alert_command.php
@@ -48,25 +48,25 @@ $table->size = array ();
 $table->size[0] = '20%';
 $table->data = array ();
 $table->data[0][0] = __('Name');
-$table->data[0][1] = print_input_text ('name', $name, '', 35, 255, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 255, true);
 $table->data[1][0] = __('Command');
 $table->data[1][0] .= ui_print_help_icon ('alert_macros', true);
-$table->data[1][1] = print_input_text ('command', $command, '', 80, 255, true);
+$table->data[1][1] = html_print_input_text ('command', $command, '', 80, 255, true);
 
 $table->data[2][0] = __('Description');
-$table->data[2][1] = print_textarea ('description', 10, 30, $description, '', true);
+$table->data[2][1] = html_print_textarea ('description', 10, 30, $description, '', true);
 
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_commands">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id) {
-	print_input_hidden ('id', $id);
-	print_input_hidden ('update_command', 1);
-	print_submit_button (__('Update'), 'create', false, 'class="sub upd"');
+	html_print_input_hidden ('id', $id);
+	html_print_input_hidden ('update_command', 1);
+	html_print_submit_button (__('Update'), 'create', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('create_command', 1);
-	print_submit_button (__('Create'), 'create', false, 'class="sub wand"');
+	html_print_input_hidden ('create_command', 1);
+	html_print_submit_button (__('Create'), 'create', false, 'class="sub wand"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/alerts/configure_alert_compound.php b/pandora_console/godmode/alerts/configure_alert_compound.php
index 998194094f..fd1cd721cf 100644
--- a/pandora_console/godmode/alerts/configure_alert_compound.php
+++ b/pandora_console/godmode/alerts/configure_alert_compound.php
@@ -318,55 +318,55 @@ if ($step == 2) {
 	
 	$table->data[0][0] = __('Days of week');
 	$table->data[0][1] = __('Mon');
-	$table->data[0][1] .= print_checkbox ('monday', 1, $monday, true);
+	$table->data[0][1] .= html_print_checkbox ('monday', 1, $monday, true);
 	$table->data[0][1] .= __('Tue');
-	$table->data[0][1] .= print_checkbox ('tuesday', 1, $tuesday, true);
+	$table->data[0][1] .= html_print_checkbox ('tuesday', 1, $tuesday, true);
 	$table->data[0][1] .= __('Wed');
-	$table->data[0][1] .= print_checkbox ('wednesday', 1, $wednesday, true);
+	$table->data[0][1] .= html_print_checkbox ('wednesday', 1, $wednesday, true);
 	$table->data[0][1] .= __('Thu');
-	$table->data[0][1] .= print_checkbox ('thursday', 1, $thursday, true);
+	$table->data[0][1] .= html_print_checkbox ('thursday', 1, $thursday, true);
 	$table->data[0][1] .= __('Fri');
-	$table->data[0][1] .= print_checkbox ('friday', 1, $friday, true);
+	$table->data[0][1] .= html_print_checkbox ('friday', 1, $friday, true);
 	$table->data[0][1] .= __('Sat');
-	$table->data[0][1] .= print_checkbox ('saturday', 1, $saturday, true);
+	$table->data[0][1] .= html_print_checkbox ('saturday', 1, $saturday, true);
 	$table->data[0][1] .= __('Sun');
-	$table->data[0][1] .= print_checkbox ('sunday', 1, $sunday, true);
+	$table->data[0][1] .= html_print_checkbox ('sunday', 1, $sunday, true);
 	
 	$table->data[1][0] = __('Time from');
-	$table->data[1][1] = print_input_text ('time_from', $time_from, '', 7, 7,
+	$table->data[1][1] = html_print_input_text ('time_from', $time_from, '', 7, 7,
 		true);
 	$table->data[1][2] = __('Time to');
-	$table->data[1][3] = print_input_text ('time_to', $time_to, '', 7, 7,
+	$table->data[1][3] = html_print_input_text ('time_to', $time_to, '', 7, 7,
 		true);
 	
 	$table->data['threshold'][0] = __('Time threshold');
-	$table->data['threshold'][1] = print_select ($threshold_values,
+	$table->data['threshold'][1] = html_print_select ($threshold_values,
 		'threshold', $threshold_selected, '', '', '', true, false, false);
 	$table->data['threshold']['other_label'] = __('Other value');
-	$table->data['threshold']['other_input'] = print_input_text ('other_threshold',
+	$table->data['threshold']['other_input'] = html_print_input_text ('other_threshold',
 		$threshold, '', 5, 7, true);
 	$table->data['threshold']['other_input'] .= ' '.__('seconds');
 	
 	$table->data[3][0] = __('Min. number of alerts');
-	$table->data[3][1] = print_input_text ('min_alerts', $min_alerts, '',
+	$table->data[3][1] = html_print_input_text ('min_alerts', $min_alerts, '',
 		5, 7, true);
 	$table->data[3][2] = __('Max. number of alerts');
-	$table->data[3][3] = print_input_text ('max_alerts', $max_alerts, '',
+	$table->data[3][3] = html_print_input_text ('max_alerts', $max_alerts, '',
 		5, 7, true);
 	
 	$table->data[4][0] = __('Actions');
-	$table->data[4][1] = print_select_from_sql ('SELECT id, name FROM talert_actions ORDER BY name',
+	$table->data[4][1] = html_print_select_from_sql ('SELECT id, name FROM talert_actions ORDER BY name',
 		'action', '', '', __('Select'), 0, true, false, false).' ';
-	$table->data[4][1] .= print_button (__('Add'), 'add_action', false, '',
+	$table->data[4][1] .= html_print_button (__('Add'), 'add_action', false, '',
 		'class="sub next"', true);
 	$table->data[4][1] .=  '<br />';
 	/* TODO: Finish fires_max and fires_min support */
 /*	$table->data[4][1] .=  '<span><a href="" class="show_advanced_actions">'.__('Advanced options').' &raquo; </a></span>';
 	$table->data[4][1] .=  '<span class="advanced_actions invisible">';
 	$table->data[4][1] .=  __('From').' ';
-	$table->data[4][1] .= print_input_text ('fires_min', 0, '', 4, 10, true);
+	$table->data[4][1] .= html_print_input_text ('fires_min', 0, '', 4, 10, true);
 	$table->data[4][1] .=  ' '.__('to').' ';
-	$table->data[4][1] .= print_input_text ('fires_max', 0, '', 4, 10, true);
+	$table->data[4][1] .= html_print_input_text ('fires_max', 0, '', 4, 10, true);
 	$table->data[4][1] .=  ' '.__('matches of the alert');
 	$table->data[4][1] .=  ui_print_help_icon("alert-matches", true);
 	$table->data[4][1] .=  '</span>';
@@ -407,16 +407,16 @@ if ($step == 2) {
 	}
 	$table->data[0][0] = __('Alert recovery');
 	$values = array (false => __('Disabled'), true => __('Enabled'));
-	$table->data[0][1] = print_select ($values,
+	$table->data[0][1] = html_print_select ($values,
 		'recovery_notify', $recovery_notify, '', '', '', true, false,
 		false);
 	
 	$table->data['field2'][0] = __('Field 2');
-	$table->data['field2'][1] = print_input_text ('field2_recovery',
+	$table->data['field2'][1] = html_print_input_text ('field2_recovery',
 		$field2_recovery, '', 35, 255, true);
 	
 	$table->data['field3'][0] = __('Field 3');
-	$table->data['field3'][1] = print_textarea ('field3_recovery', 10, 30,
+	$table->data['field3'][1] = html_print_textarea ('field3_recovery', 10, 30,
 		$field3_recovery, '', true);
 } else {
 	/* Step 1 by default */
@@ -435,13 +435,13 @@ if ($step == 2) {
 	}
 
 	$table->data[0][0] = __('Name');
-	$table->data[0][1] = print_input_text ('name', $name, '', 35, 255, true);
+	$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 255, true);
 	
 	$table->data[1][0] = __('Assigned to');
-	$table->data[1][1] = print_select (get_group_agents (array_keys ($groups)),
+	$table->data[1][1] = html_print_select (get_group_agents (array_keys ($groups)),
 		'id_agent', $id_agent, '', __('Select'), 0, true);
 	$table->data[2][0] = __('Description');
-	$table->data[2][1] =  print_textarea ('description', 10, 30,
+	$table->data[2][1] =  html_print_textarea ('description', 10, 30,
 		$description, '', true);
 
 	$table->data[3][0] = __('Condition');
@@ -473,7 +473,7 @@ if ($step == 2) {
 			
 			$alert = alerts_get_alert_agent_module ($condition['id_alert_template_module']);
 			$data[0] = '<a href="#" class="remove_alert" id="alert-'.$alert['id'].'" />';
-			$data[0] .= print_image("images/delete.png", true);
+			$data[0] .= html_print_image("images/delete.png", true);
 			$data[0] .= '</a>';
 			$idAgent = get_agent_module_id($alert['id_agent_module']);
 			$nameAgent = get_agent_name($idAgent);
@@ -481,18 +481,18 @@ if ($step == 2) {
 			$data[2] = alerts_get_alert_template_name ($alert['id_alert_template']);
 			$data[3] = get_agentmodule_name ($alert['id_agent_module']);
 			if ($condition['operation'] == 'NOP') {
-				$data[4] = print_input_hidden ('operations['.$alert['id'].']', 'NOP', true);
+				$data[4] = html_print_input_hidden ('operations['.$alert['id'].']', 'NOP', true);
 			} else {
-				$data[4] = print_select (alerts_compound_operations (),
+				$data[4] = html_print_select (alerts_compound_operations (),
 					'operations['.$alert['id'].']', $condition['operation'], '', '', '', true);
 			}
-			$data[4] .= print_input_hidden ("conditions[]", $alert['id'], true);
+			$data[4] .= html_print_input_hidden ("conditions[]", $alert['id'], true);
 			
 			array_push ($table_alerts->data, $data);
 		}
 	}
 	
-	$table->data['conditions'][1] = print_table ($table_alerts, true);
+	$table->data['conditions'][1] = html_print_table ($table_alerts, true);
 	$table->colspan['conditions'][1] = 2;
 }
 
@@ -502,22 +502,22 @@ if ($step >= LAST_STEP) {
 } else {
 	echo '<form method="post" id="alert_form">';
 }
-print_table ($table);
+html_print_table ($table);
 
 echo '<div id="message" class="invisible error">&nbsp;</div>';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id) {
-	print_input_hidden ('id', $id);
-	print_input_hidden ('update_compound', 1);
+	html_print_input_hidden ('id', $id);
+	html_print_input_hidden ('update_compound', 1);
 } else {
-	print_input_hidden ('create_compound', 1);
+	html_print_input_hidden ('create_compound', 1);
 }
 
 if ($step >= LAST_STEP) {
-	print_submit_button (__('Finish'), 'finish', false, 'class="sub upd"');
+	html_print_submit_button (__('Finish'), 'finish', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('step', $step + 1);
-	print_submit_button (__('Next'), 'next', false, 'class="sub next"');
+	html_print_input_hidden ('step', $step + 1);
+	html_print_submit_button (__('Next'), 'next', false, 'class="sub next"');
 }
 echo '</div>';
 echo '</form>';
@@ -538,18 +538,18 @@ if ($step == 1) {
 	$table->size[3] = '40%';
 	
 	$table->data[0][0] = __('Group');
-	$table->data[0][1] = print_select_groups(false, "AR", true, 'search_id_group', $id_group,
+	$table->data[0][1] = html_print_select_groups(false, "AR", true, 'search_id_group', $id_group,
 		false, '', '', true);
 	$table->data[0][2] = __('Agent');
-	$table->data[0][3] = print_select (get_group_agents ($id_group, false, "none"),
+	$table->data[0][3] = html_print_select (get_group_agents ($id_group, false, "none"),
 		'search_id_agent', $id_agent, false, __('Select'), 0, true);
 	$table->data[0][3] .= '<span id="agent_loading" class="invisible">';
-	$table->data[0][3] .= print_image('images/spinner.png', true);
+	$table->data[0][3] .= html_print_image('images/spinner.png', true);
 	$table->data[0][3] .= '</span>';
 	
-	print_table ($table);
+	html_print_table ($table);
 	echo '<div id="alerts_loading" class="loading invisible">';
-	echo print_image('images/spinner.png', true);
+	echo html_print_image('images/spinner.png', true);
 	echo __('Loading').'&hellip;';
 	echo '</div>';
 	
@@ -574,7 +574,7 @@ if ($step == 1) {
 			$data = array ();
 			
 			$data[0] = '<a href="#" class="add_alert" id="add-'.$alert['id'].'" />';
-			$data[0] .= print_image('images/add.png', true);
+			$data[0] .= html_print_image('images/add.png', true);
 			$data[0] .= '</a>';
 			$data[1] = get_agentmodule_name ($alert['id_agent_module']);
 			$data[2] = alerts_get_alert_template_name ($alert['id_alert_template']);
@@ -583,16 +583,16 @@ if ($step == 1) {
 		}
 	}
 	
-	print_table ($table_alerts);
+	html_print_table ($table_alerts);
 	
 	/* Pager for alert list using Javascript */
 	echo '<div id="alerts_pager" class="'.($id_agent ? '' : 'invisible ').'pager">';
 	echo '<form>';
-	echo print_image("images/go_first.png", true, array("class" => "first"));
-	echo print_image("images/go_previous.png", true, array("class" => "prev"));
+	echo html_print_image("images/go_first.png", true, array("class" => "first"));
+	echo html_print_image("images/go_previous.png", true, array("class" => "prev"));
 	echo '<input type="text" class="pagedisplay" />';
-	echo print_image("images/go_next.png", true, array("class" => "next"));
-	echo print_image("images/go_last.png", true, array("class" => "last"));
+	echo html_print_image("images/go_next.png", true, array("class" => "next"));
+	echo html_print_image("images/go_last.png", true, array("class" => "last"));
 	echo '<select class="pagesize invisible">';
 	echo '<option selected="selected" value="'.$config['block_size'].'">'.$config['block_size'].'</option>';
 	echo '</select>';
@@ -600,7 +600,7 @@ if ($step == 1) {
 	echo '</div>';
 	
 	echo '<div class="invisible">';
-	print_select (alerts_compound_operations (), 'operations');
+	html_print_select (alerts_compound_operations (), 'operations');
 	echo '</div>';
 }
 
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index 805f00644d..cfe141691b 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -410,55 +410,55 @@ if ($step == 2) {
 	
 	$table->data[0][0] = __('Days of week');
 	$table->data[0][1] = __('Mon');
-	$table->data[0][1] .= print_checkbox ('monday', 1, $monday, true);
+	$table->data[0][1] .= html_print_checkbox ('monday', 1, $monday, true);
 	$table->data[0][1] .= __('Tue');
-	$table->data[0][1] .= print_checkbox ('tuesday', 1, $tuesday, true);
+	$table->data[0][1] .= html_print_checkbox ('tuesday', 1, $tuesday, true);
 	$table->data[0][1] .= __('Wed');
-	$table->data[0][1] .= print_checkbox ('wednesday', 1, $wednesday, true);
+	$table->data[0][1] .= html_print_checkbox ('wednesday', 1, $wednesday, true);
 	$table->data[0][1] .= __('Thu');
-	$table->data[0][1] .= print_checkbox ('thursday', 1, $thursday, true);
+	$table->data[0][1] .= html_print_checkbox ('thursday', 1, $thursday, true);
 	$table->data[0][1] .= __('Fri');
-	$table->data[0][1] .= print_checkbox ('friday', 1, $friday, true);
+	$table->data[0][1] .= html_print_checkbox ('friday', 1, $friday, true);
 	$table->data[0][1] .= __('Sat');
-	$table->data[0][1] .= print_checkbox ('saturday', 1, $saturday, true);
+	$table->data[0][1] .= html_print_checkbox ('saturday', 1, $saturday, true);
 	$table->data[0][1] .= __('Sun');
-	$table->data[0][1] .= print_checkbox ('sunday', 1, $sunday, true);
+	$table->data[0][1] .= html_print_checkbox ('sunday', 1, $sunday, true);
 	
 	$table->data[1][0] = __('Time from');
-	$table->data[1][1] = print_input_text ('time_from', $time_from, '', 7, 7,
+	$table->data[1][1] = html_print_input_text ('time_from', $time_from, '', 7, 7,
 		true);
 	$table->data[1][2] = __('Time to');
-	$table->data[1][3] = print_input_text ('time_to', $time_to, '', 7, 7,
+	$table->data[1][3] = html_print_input_text ('time_to', $time_to, '', 7, 7,
 		true);
 	
 	$table->data['threshold'][0] = __('Time threshold');
-	$table->data['threshold'][1] = print_select ($threshold_values,
+	$table->data['threshold'][1] = html_print_select ($threshold_values,
 		'threshold', $threshold_selected, '', '', '', true, false, false);
 	$table->data['threshold']['other_label'] = __('Other value');
-	$table->data['threshold']['other_input'] = print_input_text ('other_threshold',
+	$table->data['threshold']['other_input'] = html_print_input_text ('other_threshold',
 		$threshold, '', 5, 7, true);
 	$table->data['threshold']['other_input'] .= ' '.__('seconds');
 	
 	$table->data[3][0] = __('Min. number of alerts');
-	$table->data[3][1] = print_input_text ('min_alerts', $min_alerts, '',
+	$table->data[3][1] = html_print_input_text ('min_alerts', $min_alerts, '',
 		5, 7, true);
 	$table->data[3][2] = __('Max. number of alerts');
-	$table->data[3][3] = print_input_text ('max_alerts', $max_alerts, '',
+	$table->data[3][3] = html_print_input_text ('max_alerts', $max_alerts, '',
 		5, 7, true);
 	
 	$table->data['field1'][0] = __('Field 1') . ui_print_help_icon ('alert_macros', true);
-	$table->data['field1'][1] = print_input_text ('field1', $field1, '', 70, 255, true);
+	$table->data['field1'][1] = html_print_input_text ('field1', $field1, '', 70, 255, true);
 	
 	$table->data['field2'][0] = __('Field 2') . ui_print_help_icon ('alert_macros', true);
-	$table->data['field2'][1] = print_input_text ('field2', $field2, '', 70, 255, true);
+	$table->data['field2'][1] = html_print_input_text ('field2', $field2, '', 70, 255, true);
 	
 	$table->data['field3'][0] = __('Field 3') . ui_print_help_icon ('alert_macros', true);
-	$table->data['field3'][1] = print_textarea ('field3', 10, 30, $field3, '', true);
+	$table->data['field3'][1] = html_print_textarea ('field3', 10, 30, $field3, '', true);
 	
 	$table->data[4][0] = __('Default action');
 	$usr_groups = implode(',', array_keys(get_user_groups($config['id_user'], 'LM', true)));
 	$sql_query = sprintf('SELECT id, name FROM talert_actions WHERE id_group IN (%s) ORDER BY name', $usr_groups);
-	$table->data[4][1] = print_select_from_sql ($sql_query,
+	$table->data[4][1] = html_print_select_from_sql ($sql_query,
 		'default_action', $default_action, '', __('None'), 0,
 		true, false, false).ui_print_help_tip (__('In case you fill any Field 1, Field 2 or Field 3 above, those will replace the corresponding fields of this associated "Default action".'), true);
 } else if ($step == 3) {
@@ -470,16 +470,16 @@ if ($step == 2) {
 	}
 	$table->data[0][0] = __('Alert recovery');
 	$values = array (false => __('Disabled'), true => __('Enabled'));
-	$table->data[0][1] = print_select ($values,
+	$table->data[0][1] = html_print_select ($values,
 		'recovery_notify', $recovery_notify, '', '', '', true, false,
 		false);
 	
 	$table->data['field2'][0] = __('Field 2');
-	$table->data['field2'][1] = print_input_text ('field2_recovery',
+	$table->data['field2'][1] = html_print_input_text ('field2_recovery',
 		$field2_recovery, '', 35, 255, true);
 	
 	$table->data['field3'][0] = __('Field 3');
-	$table->data['field3'][1] = print_textarea ('field3_recovery', 10, 30,
+	$table->data['field3'][1] = html_print_textarea ('field3_recovery', 10, 30,
 		$field3_recovery, '', true);
 } else {
 	/* Step 1 by default */
@@ -514,7 +514,7 @@ if ($step == 2) {
 	}
 
 	$table->data[0][0] = __('Name');
-	$table->data[0][1] = print_input_text ('name', $name, '', 35, 255, true);
+	$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 255, true);
 
 	$table->data[0][1] .= "&nbsp;&nbsp;". __("Group");
 	$groups = get_user_groups ();
@@ -524,34 +524,34 @@ if ($step == 2) {
 		$display_all_group = true;
 	else	
 		$display_all_group = false;
-	$table->data[0][1] .= "&nbsp;".print_select_groups(false, "AR", $display_all_group, 'id_group', $id_group, '', '', 0, true);
+	$table->data[0][1] .= "&nbsp;".html_print_select_groups(false, "AR", $display_all_group, 'id_group', $id_group, '', '', 0, true);
 
 	$table->data[1][0] = __('Description');
-	$table->data[1][1] =  print_textarea ('description', 10, 30,
+	$table->data[1][1] =  html_print_textarea ('description', 10, 30,
 		$description, '', true);
 	
 	$table->data[2][0] = __('Priority');
-	$table->data[2][1] = print_select (get_priorities (), 'priority',
+	$table->data[2][1] = html_print_select (get_priorities (), 'priority',
 		$priority, '', 0, 0, true, false, false);
 	
 	$table->data[3][0] = __('Condition type');
-	$table->data[3][1] = print_select (alerts_get_alert_templates_types (), 'type',
+	$table->data[3][1] = html_print_select (alerts_get_alert_templates_types (), 'type',
 		$type, '', __('Select'), 0, true, false, false);
 	$table->data[3][1] .= '<span id="matches_value" '.($show_matches ? '' : 'style="display: none"').'>';
-	$table->data[3][1] .= '&nbsp;'.print_checkbox ('matches_value', 1, $matches, true);
-	$table->data[3][1] .= print_label (__('Trigger when matches the value'),
+	$table->data[3][1] .= '&nbsp;'.html_print_checkbox ('matches_value', 1, $matches, true);
+	$table->data[3][1] .= html_print_label (__('Trigger when matches the value'),
 		'checkbox-matches_value', true);
 	$table->data[3][1] .= '</span>';
 
 	$table->data['value'][0] = __('Value');
-	$table->data['value'][1] = print_input_text ('value', $value, '',
+	$table->data['value'][1] = html_print_input_text ('value', $value, '',
 		35, 255, true);
 	$table->data['value'][1] .= '&nbsp;<span id="regex_ok">';
-	$table->data['value'][1] .= print_image ('images/suc.png', true,
+	$table->data['value'][1] .= html_print_image ('images/suc.png', true,
 		array ('style' => 'display:none',
 			'id' => 'regex_good',
 			'title' => __('The regular expression is valid')));
-	$table->data['value'][1] .= print_image ('images/err.png', true,
+	$table->data['value'][1] .= html_print_image ('images/err.png', true,
 		array ('style' => 'display:none',
 			'id' => 'regex_bad',
 			'title' => __('The regular expression is not valid')));
@@ -559,10 +559,10 @@ if ($step == 2) {
 
 	//Min first, then max, that's more logical
 	$table->data['min'][0] = __('Min.');
-	$table->data['min'][1] = print_input_text ('min', $min, '', 5, 255, true);
+	$table->data['min'][1] = html_print_input_text ('min', $min, '', 5, 255, true);
 
 	$table->data['max'][0] = __('Max.');
-	$table->data['max'][1] = print_input_text ('max', $max, '', 5, 255, true);
+	$table->data['max'][1] = html_print_input_text ('max', $max, '', 5, 255, true);
 	
 	$table->data['example'][1] = ui_print_alert_template_example ($id, true, false);
 	$table->colspan['example'][1] = 2;
@@ -574,21 +574,21 @@ if ($step >= LAST_STEP) {
 } else {
 	echo '<form method="post">';
 }
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id) {
-	print_input_hidden ('id', $id);
-	print_input_hidden ('update_template', 1);
+	html_print_input_hidden ('id', $id);
+	html_print_input_hidden ('update_template', 1);
 } else {
-	print_input_hidden ('create_template', 1);
+	html_print_input_hidden ('create_template', 1);
 }
 
 if ($step >= LAST_STEP) {
-	print_submit_button (__('Finish'), 'finish', false, 'class="sub upd"');
+	html_print_submit_button (__('Finish'), 'finish', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('step', $step + 1);
-	print_submit_button (__('Next'), 'next', false, 'class="sub next"');
+	html_print_input_hidden ('step', $step + 1);
+	html_print_submit_button (__('Next'), 'next', false, 'class="sub next"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php
index a9b2e2bfb7..192147a6e0 100644
--- a/pandora_console/godmode/db/db_event.php
+++ b/pandora_console/godmode/db/db_event.php
@@ -60,7 +60,7 @@ $table->data[1][1] = $row["first_date"];
 $table->data[2][0] = '<b>'.__('Latest data').':</b>';
 $table->data[2][1] = $row["latest_date"];
 
-print_table ($table);
+html_print_table ($table);
 unset ($table);
 
 echo '<h3>'.__('Purge data').'</h3>';
@@ -79,9 +79,9 @@ $fields[$time - 259200] = __('Purge event data over 3 days');
 $fields[$time - 86400] = __('Purge event data over 1 day');
 $fields[$time] = __('Purge all event data');
 
-print_select ($fields, "date_purge", '', '', '', '0', false, false, false, "w255");
+html_print_select ($fields, "date_purge", '', '', '', '0', false, false, false, "w255");
 
 echo '</td><td class="datos">';
-print_submit_button (__('Do it!'),'purgedb', false, 'class="sub wand" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"');
+html_print_submit_button (__('Do it!'),'purgedb', false, 'class="sub wand" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"');
 echo '</td></tr></table></form>';
 ?>
diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php
index 20e9f5f0c2..2f55d3aa26 100644
--- a/pandora_console/godmode/db/db_info.php
+++ b/pandora_console/godmode/db/db_info.php
@@ -58,7 +58,7 @@ echo '<h3>'.__('Packets per agent').'</h3>';
 echo grafico_db_agentes_paquetes2(700, 300);
 
 echo '</table>';
-echo '<a href="#" onClick="toggleDiv(\'db_info_data\'); toggleDiv(\'db_info_graph\'); return false;"><b>'.__('Press here to get database information as text').'</b>&nbsp;' . print_image("images/down.png", true, array("alt" => "down", "title" => "down")) . '</a></div>';
+echo '<a href="#" onClick="toggleDiv(\'db_info_data\'); toggleDiv(\'db_info_graph\'); return false;"><b>'.__('Press here to get database information as text').'</b>&nbsp;' . html_print_image("images/down.png", true, array("alt" => "down", "title" => "down")) . '</a></div>';
 echo '<div id="db_info_data" style="display:none">';
 
 //Merged from db_info_data.php because the queries are the same, so the cache
@@ -89,7 +89,7 @@ foreach ($count as $agent_id => $value) {
 	
 	array_unshift ($table->data, $data);
 }
-print_table ($table);
+html_print_table ($table);
 
 echo '<a href="#" onClick="toggleDiv(\'db_info_graph\'); toggleDiv(\'db_info_data\'); return false;">'.__('Press here to get database information as a graph').'</a></div>';
 ?>
diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php
index 054701ea4e..a5206a6fc4 100644
--- a/pandora_console/godmode/db/db_purge.php
+++ b/pandora_console/godmode/db/db_purge.php
@@ -157,10 +157,10 @@ $agents[0] = __('All agents');
 
 echo '<form action="index.php?sec=gdbman&sec2=godmode/db/db_purge" method="post">';
 echo '<div style="width:100%;">';
-print_select ($agents, "agent", $id_agent, "this.form.submit();", "", "", false, false, false);
+html_print_select ($agents, "agent", $id_agent, "this.form.submit();", "", "", false, false, false);
 ui_print_help_tip (__("Select the agent you want information about"));
 echo '<noscript>';
-print_submit_button (__('Get data'), 'purgedb_ag', false, 'class="sub upd"');
+html_print_submit_button (__('Get data'), 'purgedb_ag', false, 'class="sub upd"');
 ui_print_help_tip (__("Click here to get the data from the agent specified in the select box")); 
 echo '</noscript><br />';
 
@@ -233,7 +233,7 @@ $table->data[5][1] = format_numeric($data["1day"]);
 $table->data[6][0] = '<strong>'.__('Total number of packets').'</strong>';
 $table->data[6][1] = '<strong>'.format_numeric($data["total"]).'</strong>';
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<br />';
 echo '<h3>'.__('Purge data').'</h3>';
@@ -249,12 +249,12 @@ $times[$time["3day"]] = __('Purge data over 3 days');
 $times[$time["1day"]] = __('Purge data over 1 day');
 $times[$time["all"]] = __('All data until now');
 
-$table->data[0][0] = print_select ($times, 'date_purge', '', '', '', '',
+$table->data[0][0] = html_print_select ($times, 'date_purge', '', '', '', '',
 	true, false, false);
-$table->data[0][1] = print_submit_button (__('Purge'), "purgedb", false,
+$table->data[0][1] = html_print_submit_button (__('Purge'), "purgedb", false,
 	'class="sub wand"', true);
 
-print_table ($table);
+html_print_table ($table);
 
 echo '</form>';
 ?>
diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php
index ca9bd665d1..be96cc938b 100644
--- a/pandora_console/godmode/db/db_refine.php
+++ b/pandora_console/godmode/db/db_refine.php
@@ -70,11 +70,11 @@ echo '<b>'.__('Source agent').'</b><br /><br />';
 $agent_selected = get_parameter_post ("origen", 0);
 $agents = get_group_agents (array_keys (get_user_groups ($config["id_user"], "AW")));
 
-print_select ($agents, "origen", $agent_selected, 'javascript:this.form.update_agent.click();', __('No agent selected'), '0', false, false, false, 'w130');
+html_print_select ($agents, "origen", $agent_selected, 'javascript:this.form.update_agent.click();', __('No agent selected'), '0', false, false, false, 'w130');
 
 echo '&nbsp;&nbsp;';
 
-print_submit_button (__('Get Info'), 'update_agent', false, 'style="display:none;"');
+html_print_submit_button (__('Get Info'), 'update_agent', false, 'style="display:none;"');
 
 echo '<br /><br />';
 echo '<b>'.__('Modules').'</b><br /><br />';
@@ -82,7 +82,7 @@ echo '<b>'.__('Modules').'</b><br /><br />';
 $module_selected = get_parameter_post ("origen", array ());
 $modules = get_agent_modules ($module_selected, false, 'delete_pending != 1');
 
-print_select ($modules, "origen_modulo[]", $module_selected, '', '', '0', false, true, false, 'w130');
+html_print_select ($modules, "origen_modulo[]", $module_selected, '', '', '0', false, true, false, 'w130');
 
 echo '</div>'; //Left div
 
@@ -90,17 +90,17 @@ echo '<div style="float:left; width:250px;"><b>'.__('Purge data out of these lim
 echo '<table><tr><td>';
 echo __('Minimum').': ';
 echo '</td><td>';
-print_input_text ("min", 0, __('Minimum'), 4, 0, false);
+html_print_input_text ("min", 0, __('Minimum'), 4, 0, false);
 echo '</td></tr>';
 echo '<tr><td>';
 echo __('Maximum').': 	';
 echo '</td><td>';
-print_input_text ("max", 0, __('Maximum'), 4, 0, false);
+html_print_input_text ("max", 0, __('Maximum'), 4, 0, false);
 echo '</td></tr>';
 echo '</table>';
 echo '</div>';
 echo '<div style="clear:both;">&nbsp;</div>';
-print_submit_button (__('Delete'), 'eliminar', false, 'class="sub delete" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"');
+html_print_submit_button (__('Delete'), 'eliminar', false, 'class="sub delete" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"');
 echo '</td></tr></table>';
 
 ?>
diff --git a/pandora_console/godmode/db/db_sanity.php b/pandora_console/godmode/db/db_sanity.php
index 9b08706445..e4c969179a 100644
--- a/pandora_console/godmode/db/db_sanity.php
+++ b/pandora_console/godmode/db/db_sanity.php
@@ -102,14 +102,14 @@ echo __('Pandora FMS Sanity tool is used to remove bad database structure data,
 	
 echo "<br><br>";
 echo "<b><a href='index.php?sec=gdbman&sec2=godmode/db/db_sanity&sanity=1'>";
-echo print_image('images/status_away.png', true) . "&nbsp;&nbsp;";
+echo html_print_image('images/status_away.png', true) . "&nbsp;&nbsp;";
 echo __('Sanitize my database now');
 echo "</a></b>";
 
 
 echo "<br><br>";
 echo "<b><a href='index.php?sec=gdbman&sec2=godmode/db/db_sanity&sanity=2'>";
-echo print_image('images/status_away.png', true) . "&nbsp;&nbsp;";
+echo html_print_image('images/status_away.png', true) . "&nbsp;&nbsp;";
 echo __('Delete non-initialized modules now');
 echo "</a></b>";
 
diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php
index 1cd3bcbc47..2ba6234608 100644
--- a/pandora_console/godmode/extensions.php
+++ b/pandora_console/godmode/extensions.php
@@ -182,11 +182,11 @@ $table->data = array();
 foreach ($extensions as $file => $extension) {
 	$data = array();
 	
-	$on = print_image("images/dot_green.png", true);
-	$off = print_image("images/dot_red.png", true); 
+	$on = html_print_image("images/dot_green.png", true);
+	$off = html_print_image("images/dot_red.png", true); 
 	if (!$extension['enabled']) {
-		$on = print_image("images/dot_green.disabled.png", true); 
-		$off = print_image("images/dot_red.disabled.png", true);
+		$on = html_print_image("images/dot_green.disabled.png", true); 
+		$off = html_print_image("images/dot_red.disabled.png", true);
 		$data[] = '<i style="color: grey;">' . $file . '</i>';
 	}
 	else {
@@ -250,15 +250,15 @@ foreach ($extensions as $file => $extension) {
 	}
 	
 	if (!$extension['enabled']) {
-		$data[] = '<a title="' . __('Delete') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&delete='.$file.'" class="mn">' . print_image("images/cross.disabled.png", true) . '</a>' .
-			' <a title="' . __('Enable') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&enabled='.$file.'" class="mn">' . print_image("images/lightbulb_off.png", true) . '</a>';
+		$data[] = '<a title="' . __('Delete') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&delete='.$file.'" class="mn">' . html_print_image("images/cross.disabled.png", true) . '</a>' .
+			' <a title="' . __('Enable') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&enabled='.$file.'" class="mn">' . html_print_image("images/lightbulb_off.png", true) . '</a>';
 	}
 	else {
-		$data[] = '<a title="' . __('Delete') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&delete='.$file.'" class="mn">' . print_image("images/cross.png", true) . '</a>' .
-			' <a title="' . __('Disable') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&disabled='.$file.'" class="mn">' . print_image("images/lightbulb.png", true) . '</a>';
+		$data[] = '<a title="' . __('Delete') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&delete='.$file.'" class="mn">' . html_print_image("images/cross.png", true) . '</a>' .
+			' <a title="' . __('Disable') . '" href="index.php?sec=gextensions&amp;sec2=godmode/extensions&enterprise=' . (int)$extension['enterprise'] . '&disabled='.$file.'" class="mn">' . html_print_image("images/lightbulb.png", true) . '</a>';
 	}
 	
 	$table->data[] = $data;
 }
-print_table ($table);
+html_print_table ($table);
 ?>
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index 5babd4ba33..7555fbcc6e 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -56,10 +56,10 @@ function updateArrowLayers() {
 				$('.up_arrow', layerObj).html('');
 			}
 			else {
-				$('.up_arrow', layerObj).html('<a class="up_arrow" href="javascript: upLayer(' + numLayer + ');"><?php print_image ("images/up.png"); ?></a>');
+				$('.up_arrow', layerObj).html('<a class="up_arrow" href="javascript: upLayer(' + numLayer + ');"><?php html_print_image ("images/up.png"); ?></a>');
 			}
 
-			$('.down_arrow', layerObj).html('<a class="down_arrow" href="javascript: downLayer(' + numLayer + ');"><?php print_image ("images/down.png"); ?></a>');
+			$('.down_arrow', layerObj).html('<a class="down_arrow" href="javascript: downLayer(' + numLayer + ');"><?php html_print_image ("images/down.png"); ?></a>');
 
 			
 			count++;
@@ -141,20 +141,20 @@ switch ($action) {
 			$arrayLayers[] = JSON_decode($layer, true);
 		}
 		
-		$invalidFields = validateMapData($map_name, $map_zoom_level,
+		$invalidFields = gis_validate_map_data($map_name, $map_zoom_level,
 			$map_initial_longitude, $map_initial_latitude, $map_initial_altitude,
 			$map_default_longitude, $map_default_latitude, $map_default_altitude,
 			$map_connection_list, $map_levels_zoom);
 		
 		if (empty($invalidFields) && get_parameter('map_connection_list') != "") {
-			saveMap($map_name, $map_initial_longitude, $map_initial_latitude,
+			gis_save_map($map_name, $map_initial_longitude, $map_initial_latitude,
 				$map_initial_altitude, $map_zoom_level, $map_background,
 				$map_default_longitude, $map_default_latitude, $map_default_altitude,
 				$map_group_id, $map_connection_list, $arrayLayers);
 			$mapCreatedOk = true;
 		}
 		else {
-			print_input_hidden('action', 'save_new');
+			html_print_input_hidden('action', 'save_new');
 			$mapCreatedOk = false;
 		}
 		$layer_list = $arrayLayers;
@@ -163,7 +163,7 @@ switch ($action) {
 			__('Map could not be created'));
 		break;
 	case 'new_map':
-		print_input_hidden('action', 'save_new');
+		html_print_input_hidden('action', 'save_new');
 		
 		$map_name = '';
 		$map_initial_longitude = '';
@@ -182,10 +182,10 @@ switch ($action) {
 	case 'edit_map':
 		$idMap = get_parameter('map_id');
 		
-		print_input_hidden('action', 'update_saved');
-		print_input_hidden('map_id', $idMap);
+		html_print_input_hidden('action', 'update_saved');
+		html_print_input_hidden('map_id', $idMap);
 		
-		$mapData = getMapData($idMap);
+		$mapData = gis_get_map_data($idMap);
 
 		$map_name = $mapData['map']['map_name'];
 		$map_group_id = $mapData['map']['group_id'];
@@ -199,7 +199,7 @@ switch ($action) {
 		$map_default_altitude = $mapData['map']['default_altitude'];
 		
 		$map_connection_list = $mapData['connections'];
-		$map_levels_zoom = getNumZoomLevelsOfConnectionDefault($map_connection_list);
+		$map_levels_zoom = gis_get_num_zoom_levels_connection_default($map_connection_list);
 		
 		//$map_levels_zoom = get_parameter('map_levels_zoom');
 		
@@ -269,14 +269,14 @@ switch ($action) {
 			$arrayLayers[] = JSON_decode($layer, true);
 		}
 		
-		$invalidFields = validateMapData($map_name, $map_zoom_level,
+		$invalidFields = gis_validate_map_data($map_name, $map_zoom_level,
 			$map_initial_longitude, $map_initial_latitude, $map_initial_altitude,
 			$map_default_longitude, $map_default_latitude, $map_default_altitude,
 			$map_connection_list, $map_levels_zoom);
 			
 		if (empty($invalidFields) && get_parameter('map_connection_list') != "") {
 			//TODO
-			updateMap($idMap, $map_name, $map_initial_longitude, $map_initial_latitude,
+			gis_update_map($idMap, $map_name, $map_initial_longitude, $map_initial_latitude,
 				$map_initial_altitude, $map_zoom_level, $map_background,
 				$map_default_longitude, $map_default_latitude, $map_default_altitude,
 				$map_group_id, $map_connection_list, $arrayLayers);
@@ -284,7 +284,7 @@ switch ($action) {
 		}
 		else {
 			
-			print_input_hidden('action', 'update_saved');
+			html_print_input_hidden('action', 'update_saved');
 			$mapCreatedOk = false;
 		}
 		$layer_list = $arrayLayers;
@@ -292,8 +292,8 @@ switch ($action) {
 		ui_print_result_message ($mapCreatedOk, __('Map successfully update'),
 			__('Map could not be update'));
 		
-		print_input_hidden('action', 'update_saved');
-		print_input_hidden('map_id', $idMap);
+		html_print_input_hidden('action', 'update_saved');
+		html_print_input_hidden('map_id', $idMap);
 		break;
 }
 
@@ -302,13 +302,13 @@ $table->data = array ();
 $table->valign[0] = 'top';
 
 $table->data[0][0] = __('Map Name') . ui_print_help_tip (__('Descriptive name for the map'), true). ':';
-$table->data[0][1] = print_input_text ('map_name', $map_name, '', 30, 60, true);
+$table->data[0][1] = html_print_input_text ('map_name', $map_name, '', 30, 60, true);
 $table->rowspan[0][2] = 9;
 
 $iconError = '';
 if (isset($invalidFields['map_connection_list'])) {
 	if ($invalidFields['map_connection_list']) {
-		$iconError = print_image("images/dot_red.png", true);
+		$iconError = html_print_image("images/dot_red.png", true);
 	}
 }
 
@@ -324,14 +324,14 @@ $table->data[1][0] = __("Add Map connection") . ui_print_help_tip (__('At least
 $table->data[1][1] = "<table class='databox' border='0' id='map_connection'>
 	<tr>
 		<td>
-			" . print_select($listConnection, 'map_connection', '', '', '', '0', true) ."
+			" . html_print_select($listConnection, 'map_connection', '', '', '', '0', true) ."
 		</td>
 		<td>
-			<a href='javascript: addConnectionMap();'>" . print_image ("images/add.png", true) . "</a>
+			<a href='javascript: addConnectionMap();'>" . html_print_image ("images/add.png", true) . "</a>
 			<input type='hidden' name='map_connection_list' value='' id='map_connection_list' />
 			<input type='hidden' name='layer_list' value='' id='layer_list' />
 		</td>
-	</tr> " . addConectionMapsInForm($map_connection_list) . "
+	</tr> " . gis_add_conection_maps_in_form($map_connection_list) . "
 </table>";
 $own_info = get_user_info($config['id_user']);
 if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
@@ -339,30 +339,30 @@ if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
 else
 	$display_all_group = false;
 $table->data[2][0] = __('Group') . ui_print_help_tip (__('Group that owns the map'), true). ':';
-$table->data[2][1] = print_select_groups(false, 'IW', $display_all_group, 'map_group_id', $map_group_id, '', '', '', true);
+$table->data[2][1] = html_print_select_groups(false, 'IW', $display_all_group, 'map_group_id', $map_group_id, '', '', '', true);
 
 $table->data[3][0] = __('Default zoom') . ui_print_help_tip (__('Default zoom level when opening the map'), true). ':';
-$table->data[3][1] = print_input_text ('map_zoom_level', $map_zoom_level, '', 2, 4, true) . print_input_hidden('map_levels_zoom', $map_levels_zoom, true);
+$table->data[3][1] = html_print_input_text ('map_zoom_level', $map_zoom_level, '', 2, 4, true) . html_print_input_hidden('map_levels_zoom', $map_levels_zoom, true);
 
 $table->data[4][0] = __('Center Longitude') . ':';
-$table->data[4][1] = print_input_text ('map_initial_longitude', $map_initial_longitude, '', 4, 8, true);
+$table->data[4][1] = html_print_input_text ('map_initial_longitude', $map_initial_longitude, '', 4, 8, true);
 
 $table->data[5][0] = __('Center Latitude') . ':';
-$table->data[5][1] = print_input_text ('map_initial_latitude', $map_initial_latitude, '', 4, 8, true);
+$table->data[5][1] = html_print_input_text ('map_initial_latitude', $map_initial_latitude, '', 4, 8, true);
 
 $table->data[6][0] = __('Center Altitude') . ':';
-$table->data[6][1] = print_input_text ('map_initial_altitude', $map_initial_altitude, '', 4, 8, true);
+$table->data[6][1] = html_print_input_text ('map_initial_altitude', $map_initial_altitude, '', 4, 8, true);
 
 $table->data[7][0] = __('Default Longitude') . ':';
-$table->data[7][1] = print_input_text ('map_default_longitude', $map_default_longitude, '', 4, 8, true);
+$table->data[7][1] = html_print_input_text ('map_default_longitude', $map_default_longitude, '', 4, 8, true);
 
 $table->data[8][0] = __('Default Latitude') . ':';
-$table->data[8][1] = print_input_text ('map_default_latitude', $map_default_latitude, '', 4, 8, true);
+$table->data[8][1] = html_print_input_text ('map_default_latitude', $map_default_latitude, '', 4, 8, true);
 
 $table->data[9][0] = __('Default Altitude') . ':';
-$table->data[9][1] = print_input_text ('map_default_altitude', $map_default_altitude, '', 4, 8, true);
+$table->data[9][1] = html_print_input_text ('map_default_altitude', $map_default_altitude, '', 4, 8, true);
 
-print_table($table);
+html_print_table($table);
 
 echo "<h3>" . __('Layers') . ui_print_help_tip (__('Each layer can show agents from one group or the agents added to that layer or both.'), true). "</h3>";
 
@@ -372,22 +372,22 @@ $table->valign[0] = 'top';
 $table->valign[1] = 'top';
 
 $table->data[0][0] = "<h4>" .__('List of layers') . ui_print_help_tip (__('It is possible to edit, delete and reorder the layers.'), true) . "</h4>";
-$table->data[0][1] = '<div style="text-align: right;">' . print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add"', true) . '</div>';
+$table->data[0][1] = '<div style="text-align: right;">' . html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add"', true) . '</div>';
 
 $table->data[1][0] = '<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_layers">' .
-	addLayerList($layer_list) . 
+	gis_add_layer_list($layer_list) . 
 	'</table>';
 $table->data[1][1] = '<div id="form_layer">
 		<table id="form_layer_table" class="databox" border="0" cellpadding="4" cellspacing="4" style="visibility: hidden;">
 			<tr>
 				<td>' . __('Layer name') . ':</td>
-				<td>' . print_input_text ('layer_name_form', '', '', 20, 40, true) . '</td>
+				<td>' . html_print_input_text ('layer_name_form', '', '', 20, 40, true) . '</td>
 				<td>' . __('Visible') . ':</td>
-				<td>' . print_checkbox('layer_visible_form', 1, true, true) . '</td>
+				<td>' . html_print_checkbox('layer_visible_form', 1, true, true) . '</td>
 			</tr>
 			<tr>
 				<td>' . __('Show agents from group') . ':</td>
-				<td colspan="3">' . print_select_groups(false, 'IW', $display_all_group, 'layer_group_form', '-1', '', __('None'), '-1', true) . '</td>
+				<td colspan="3">' . html_print_select_groups(false, 'IW', $display_all_group, 'layer_group_form', '-1', '', __('None'), '-1', true) . '</td>
 			</tr>
 			<tr>
 				<td colspan="4"><hr /></td>
@@ -395,10 +395,10 @@ $table->data[1][1] = '<div id="form_layer">
 			<tr>
 				<td>' . __('Agent') . ':</td>
 				<td colspan="3">
-					' . print_input_text_extended ('id_agent', __('Select'), 'text_id_agent', '', 30, 100, false, '',
+					' . html_print_input_text_extended ('id_agent', __('Select'), 'text_id_agent', '', 30, 100, false, '',
 					array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
 					. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>&nbsp;' . 
-					print_button(__('Add agent'), 'add_agent', true, 'addAgentLayer();', 'class="sub add"', true) .'
+					html_print_button(__('Add agent'), 'add_agent', true, 'addAgentLayer();', 'class="sub add"', true) .'
 				</td>
 			</tr>
 			<tr>
@@ -410,14 +410,14 @@ $table->data[1][1] = '<div id="form_layer">
 			</tr>
 			<tr>
 				<td align="right" colspan="4">' . 
-					print_button(__('Save Layer'), 'save_layer', false, 'saveLayer();', 'class="sub wand"', true) . '
-					' . print_input_hidden('layer_edit_id_form', '', true) . '
+					html_print_button(__('Save Layer'), 'save_layer', false, 'saveLayer();', 'class="sub wand"', true) . '
+					' . html_print_input_hidden('layer_edit_id_form', '', true) . '
 				</td>
 			</tr>
 		</table>
 	</div>';
 
-print_table($table);
+html_print_table($table);
 
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
@@ -426,14 +426,14 @@ switch ($action) {
 	case 'edit_map':
 	case 'update_saved':
 		if (!empty($invalidFields)) {
-			print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
+			html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
 		}
 		else {
-			print_submit_button(_('Update map'), 'update_button', false, 'class="sub upd"');
+			html_print_submit_button(_('Update map'), 'update_button', false, 'class="sub upd"');
 		}
 		break;
 	case 'new_map':
-		print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
+		html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
 		break;
 }
 echo '</div>';
@@ -447,9 +447,9 @@ echo "</form>";
 <table style="visibility: hidden;">
 	<tbody id="chunk_map_connection">
 		<tr class="row_0">
-			<td><?php print_input_text ('map_connection_name', $map_name, '', 20, 40, false, true); ?></td>
-			<td><?php print_radio_button_extended('map_connection_default', '', '', true, false, 'changeDefaultConection(this.value)', '');?></td>
-			<td><a id="delete_row" href="none"><?php print_image("images/cross.png", false, array("alt" => ""));?></a></td>
+			<td><?php html_print_input_text ('map_connection_name', $map_name, '', 20, 40, false, true); ?></td>
+			<td><?php html_print_radio_button_extended('map_connection_default', '', '', true, false, 'changeDefaultConection(this.value)', '');?></td>
+			<td><a id="delete_row" href="none"><?php html_print_image("images/cross.png", false, array("alt" => ""));?></a></td>
 		</tr>
 	</tbody>
 </table>
@@ -460,7 +460,7 @@ echo "</form>";
 			<td class="col1">XXXX</td>
 			<td class="col2">
 				<input type="hidden" id="name_agent" name="name_agent" value="" />
-				<a id="delete_row" href="none"><?php print_image("images/cross.png", false, array("alt" => ""));?></a>
+				<a id="delete_row" href="none"><?php html_print_image("images/cross.png", false, array("alt" => ""));?></a>
 			</td>
 		</tr>
 	</tbody>
@@ -470,14 +470,14 @@ echo "</form>";
 		<tbody id="chuck_layer_item">
 			<tr>
 				<td class="col1">XXXXXXXXXXXXXXXXXX</td>
-				<td class="up_arrow"><a id="up_arrow" href="javascript: upLayer();"><?php print_image("images/up.png", false, array("alt" => ""));?></a></td>
-				<td class="down_arrow"><a id="down_arrow" href="javascript: downLayer();"><?php print_image("images/down.png", false, array("alt" => ""));?></a></td>
+				<td class="up_arrow"><a id="up_arrow" href="javascript: upLayer();"><?php html_print_image("images/up.png", false, array("alt" => ""));?></a></td>
+				<td class="down_arrow"><a id="down_arrow" href="javascript: downLayer();"><?php html_print_image("images/down.png", false, array("alt" => ""));?></a></td>
 				<td class="col3">
-					<a id="edit_layer" href="javascript: editLayer(none);"><?php print_image("images/config.png", false, array("alt" => ""));?></a>
+					<a id="edit_layer" href="javascript: editLayer(none);"><?php html_print_image("images/config.png", false, array("alt" => ""));?></a>
 				</td>
 				<td class="col4">
 					<input type="hidden" name="layer_values" id="layer_values" />
-					<a id="delete_row" href="none"><?php print_image("images/cross.png", false, array("alt" => ""));?></a>
+					<a id="delete_row" href="none"><?php html_print_image("images/cross.png", false, array("alt" => ""));?></a>
 				</td>
 			</tr>
 		</tbody>
diff --git a/pandora_console/godmode/gis_maps/index.php b/pandora_console/godmode/gis_maps/index.php
index f96435d4a0..cdf0d87195 100644
--- a/pandora_console/godmode/gis_maps/index.php
+++ b/pandora_console/godmode/gis_maps/index.php
@@ -58,7 +58,7 @@ else
 switch ($action) {
 	case 'delete_map':
 		$idMap = get_parameter('map_id');
-		deleteMap($idMap);
+		gis_delete_map($idMap);
 		break;
 }
 
@@ -101,22 +101,22 @@ if (!$maps) {
 		
 		$table_info = array('<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">' . $map['map_name'] . '</a>',
 			ui_print_group_icon ($map['group_id'], true),
-			'<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&map_id='.$map['id_tgis_map'].'">' . print_image ("images/eye.png", true).'</a>');
+			'<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&map_id='.$map['id_tgis_map'].'">' . html_print_image ("images/eye.png", true).'</a>');
 		if ($display_default_column) {
-			$default_button = print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, "setDefault(" . $map['id_tgis_map'] . ");", '', true);
+			$default_button = html_print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, "setDefault(" . $map['id_tgis_map'] . ");", '', true);
 			array_push($table_info, $default_button);
 		}
-		$delete_button = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/index&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">' . print_image ("images/cross.png", true).'</a>';
+		$delete_button = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/index&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">' . html_print_image ("images/cross.png", true).'</a>';
 		array_push ($table_info, $delete_button);
 		$table->data[] = $table_info;
 	}
-	print_table($table);
+	html_print_table($table);
 }
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form action="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map" method="post">';
-print_input_hidden ('action','new_map');
-print_submit_button (__('Create'), '', false, 'class="sub next"');
+html_print_input_hidden ('action','new_map');
+html_print_submit_button (__('Create'), '', false, 'class="sub next"');
 echo '</form>';
 echo '</div>';
 ?>
diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php
index fd1c4738f9..8392eb0c09 100644
--- a/pandora_console/godmode/groups/configure_group.php
+++ b/pandora_console/godmode/groups/configure_group.php
@@ -69,14 +69,14 @@ else {
 $table->width = '450px';
 $table->data = array ();
 $table->data[0][0] = __('Name');
-$table->data[0][1] = print_input_text ('name', $name, '', 35, 100, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true);
 
 $table->data[1][0] = __('Icon');
 $files = list_files ('images/groups_small/', "png", 1, 0);
-$table->data[1][1] = print_select ($files, 'icon', $icon, '', 'None', '', true);
+$table->data[1][1] = html_print_select ($files, 'icon', $icon, '', 'None', '', true);
 $table->data[1][1] .= ' <span id="icon_preview">';
 if ($icon) {
-	$table->data[1][1] .= print_image("images/groups_small/".$icon, true); 
+	$table->data[1][1] .= html_print_image("images/groups_small/".$icon, true); 
 }
 $table->data[1][1] .= '</span>';
 
@@ -86,24 +86,24 @@ if ($id_group)
 	$sql .= sprintf ('WHERE id_grupo != %d', $id_group);
 $groups = get_user_groups();
 if ($id_group) {
-	$table->data[2][1] = print_select_groups(false, "AR", true, 'id_parent', $id_parent,
+	$table->data[2][1] = html_print_select_groups(false, "AR", true, 'id_parent', $id_parent,
 		'', '', '', true, false, true, '', false, false, false, $id_group);
 }
 else {
-	$table->data[2][1] = print_select_groups(false, "AR", true, 'id_parent', $id_parent, '', '', '', true);
+	$table->data[2][1] = html_print_select_groups(false, "AR", true, 'id_parent', $id_parent, '', '', '', true);
 }
 $table->data[2][1] .= ' <span id="parent_preview">';
-$table->data[2][1] .= print_image("images/groups_small/".get_group_icon ($id_parent).".png", true); 
+$table->data[2][1] .= html_print_image("images/groups_small/".groups_get_icon ($id_parent).".png", true); 
 $table->data[2][1] .= '</span>';
 
 $table->data[3][0] = __('Alerts');
-$table->data[3][1] = print_checkbox ('alerts_enabled', 1, ! $alerts_disabled, true);
+$table->data[3][1] = html_print_checkbox ('alerts_enabled', 1, ! $alerts_disabled, true);
 
 $table->data[4][0] = __('Propagate ACL') . ui_print_help_tip (__("Propagate the same ACL security into the child subgroups."), true);
-$table->data[4][1] = print_checkbox('propagate', 1, $propagate, true);
+$table->data[4][1] = html_print_checkbox('propagate', 1, $propagate, true);
 
 $table->data[5][0] = __('Custom ID');
-$table->data[5][1] = print_input_text ('custom_id', $custom_id, '', 16, 255, true);
+$table->data[5][1] = html_print_input_text ('custom_id', $custom_id, '', 16, 255, true);
 
 $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
 if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
@@ -112,16 +112,16 @@ if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 }
 
 echo '<form name="grupo" method="post" action="index.php?sec=gagente&sec2=godmode/groups/group_list">';
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id_group) {
-	print_input_hidden ('update_group', 1);
-	print_input_hidden ('id_group', $id_group);
-	print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
+	html_print_input_hidden ('update_group', 1);
+	html_print_input_hidden ('id_group', $id_group);
+	html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
 }
 else {
-	print_input_hidden ('create_group', 1);
-	print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
+	html_print_input_hidden ('create_group', 1);
+	html_print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/groups/configure_modu_group.php b/pandora_console/godmode/groups/configure_modu_group.php
index 0c5f274838..69dc460717 100644
--- a/pandora_console/godmode/groups/configure_modu_group.php
+++ b/pandora_console/godmode/groups/configure_modu_group.php
@@ -54,20 +54,20 @@ if ($id_group) {
 $table->width = '450px';
 $table->data = array ();
 $table->data[0][0] = __('Name');
-$table->data[0][1] = print_input_text ('name', $name, '', 35, 100, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true);
 
 
 echo'</span>';
 echo '<form name="grupo" method="post" action="index.php?sec=gagente&sec2=godmode/groups/modu_group_list">';
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id_group) {
-	print_input_hidden ('update_group', 1);
-	print_input_hidden ('id_group', $id_group);
-	print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
+	html_print_input_hidden ('update_group', 1);
+	html_print_input_hidden ('id_group', $id_group);
+	html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('create_group', 1);
-	print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
+	html_print_input_hidden ('create_group', 1);
+	html_print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 73fd5f9859..117022d76e 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -169,7 +169,7 @@ if ($update_group) {
 if ($delete_group) {
 	$id_group = (int) get_parameter ('id_group');
 
-	$usedGroup = checkUsedGroup($id_group);
+	$usedGroup = groups_check_used($id_group);
 	
 	if (!$usedGroup['return']) {
 		
@@ -289,8 +289,8 @@ foreach ($groups as $id_group => $group) {
 		$data[3] = '';
 	}
 	else {
-		$data[3] = '<a href="index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo'].'">' . print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0'));
-		$data[3] .= '<a href="index.php?sec=gagente&sec2=godmode/groups/group_list&id_group='.$id_group.'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . print_image("images/cross.png", true, array("alt" => __('Delete'), "border" => '0'));
+		$data[3] = '<a href="index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo'].'">' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0'));
+		$data[3] .= '<a href="index.php?sec=gagente&sec2=godmode/groups/group_list&id_group='.$id_group.'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "border" => '0'));
 	}
 	
 	array_push ($table->data, $data);
@@ -318,11 +318,11 @@ function showBranch(parent) {
 </script>
 <?php
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/groups/configure_group">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Create group'), 'crt', false, 'class="sub next"');
+html_print_submit_button (__('Create group'), 'crt', false, 'class="sub next"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php
index 7c70206bf5..aa3c10f2a0 100644
--- a/pandora_console/godmode/groups/modu_group_list.php
+++ b/pandora_console/godmode/groups/modu_group_list.php
@@ -122,16 +122,16 @@ foreach ($groups as $id_group ) {
 	$data = array ();
 	
 	$data[0] = '<strong><a href="index.php?sec=gagente&sec2=godmode/groups/configure_modu_group&id_group='.$id_group["id_mg"].'">' . ui_print_truncate_text($id_group["name"], 50).'</a></strong>';
-	$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/groups/modu_group_list&id_group='.$id_group["id_mg"].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . print_image("images/cross.png", true, array("border" => '0')) . '</a>';
+	$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/groups/modu_group_list&id_group='.$id_group["id_mg"].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
 	
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/groups/configure_modu_group">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Create module group'), 'crt', false, 'class="sub next"');
+html_print_submit_button (__('Create module group'), 'crt', false, 'class="sub next"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php
index 8cf8ee0c80..eef14bde47 100644
--- a/pandora_console/godmode/massive/massive_add_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_action_alerts.php
@@ -145,14 +145,14 @@ $table->size[1] = '85%';
 
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agents');
 $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= print_image('images/spinner.png', true);
+$table->data[1][0] .= html_print_image('images/spinner.png', true);
 $table->data[1][0] .= '</span>';
-$table->data[1][1] = print_select (get_group_agents ($id_group, false, "none"),
+$table->data[1][1] = html_print_select (get_group_agents ($id_group, false, "none"),
 	'id_agents[]', 0, false, '', '', true, true);
 
 if (empty($id_agents)) {
@@ -163,9 +163,9 @@ else {
 }
 $table->data[2][0] = __('Alert templates');
 $table->data[2][0] .= '<span id="template_loading" class="invisible">';
-$table->data[2][0] .= print_image('images/spinner.png', true);
+$table->data[2][0] .= html_print_image('images/spinner.png', true);
 $table->data[2][0] .= '</span>';
-$table->data[2][1] = print_select (index_array ($alert_templates, 'id_alert_template', 'template_name'), 'id_alert_templates[]', '', '', '', '', true, true, true, '', $alert_templates == 0);
+$table->data[2][1] = html_print_select (index_array ($alert_templates, 'id_alert_template', 'template_name'), 'id_alert_templates[]', '', '', '', '', true, true, true, '', $alert_templates == 0);
 
 if (empty($id_agents)) {
 	$alert_compounds = '';
@@ -182,28 +182,28 @@ else {
 }
 $table->data[3][0] = __('Alert compounds');
 $table->data[3][0] .= '<span id="compound_loading" class="invisible">';
-$table->data[3][0] .= print_image('images/spinner.png', true);
+$table->data[3][0] .= html_print_image('images/spinner.png', true);
 $table->data[3][0] .= '</span>';
-$table->data[3][1] = print_select (index_array ($alert_compounds, 'id', 'name'), 'id_alert_compounds[]', '', false, '', '', true, true, true, '', $alert_compounds == 0);
+$table->data[3][1] = html_print_select (index_array ($alert_compounds, 'id', 'name'), 'id_alert_compounds[]', '', false, '', '', true, true, true, '', $alert_compounds == 0);
 	
 $actions = alerts_get_alert_actions ();
 $table->data[4][0] = __('Action');
-$table->data[4][1] = print_select ($actions, 'action', '', '', __('None'), 0, true);	
+$table->data[4][1] = html_print_select ($actions, 'action', '', '', __('None'), 0, true);	
 $table->data[4][1] .= '<span><a href="#" class="show_advanced_actions">'.__('Advanced options').' &raquo; </a></span>';
 $table->data[4][1] .= '<span id="advanced_actions" class="advanced_actions invisible">';
 $table->data[4][1] .= __('Number of alerts match from').' ';
-$table->data[4][1] .= print_input_text ('fires_min', 0, '', 4, 10, true);
+$table->data[4][1] .= html_print_input_text ('fires_min', 0, '', 4, 10, true);
 $table->data[4][1] .= ' '.__('to').' ';
-$table->data[4][1] .= print_input_text ('fires_max', 0, '', 4, 10, true);
+$table->data[4][1] .= html_print_input_text ('fires_max', 0, '', 4, 10, true);
 $table->data[4][1] .= ui_print_help_icon ("alert-matches", true);
 $table->data[4][1] .= '</span>';
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=add_action_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('add', 1);
-print_submit_button (__('Add'), 'go', false, 'class="sub add"');
+html_print_input_hidden ('add', 1);
+html_print_submit_button (__('Add'), 'go', false, 'class="sub add"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php
index cbec7e2f5d..ca1ab3af1d 100644
--- a/pandora_console/godmode/massive/massive_add_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_alerts.php
@@ -117,36 +117,36 @@ $table->size[3] = '40%';
 $table->data = array ();
 	
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', 0,
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', 0,
 	'', 'Select', -1, true, false, true, '', false);
 $table->data[0][2] = '';
 $table->data[0][3] = '';
 
 $table->data[1][0] = __('Agents');
 $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= print_image('images/spinner.png', true);
+$table->data[1][0] .= html_print_image('images/spinner.png', true);
 $table->data[1][0] .= '</span>';
 $agents_alerts = alerts_get_agents_with_alert_template ($id_alert_template, $id_group,
 	false, array ('tagente.nombre', 'tagente.id_agente'));
 $agents = agents_get_agents();
-$table->data[1][1] = print_select (index_array ($agents, 'id_agente', 'nombre'),
+$table->data[1][1] = html_print_select (index_array ($agents, 'id_agente', 'nombre'),
 	'id_agents[]', '', '', '', '', true, true, true, '', false);
 $table->data[1][2] = __('Modules');
-$table->data[1][3] = print_select (array(), 'module[]',	'', false, '', '', true, true, false);
+$table->data[1][3] = html_print_select (array(), 'module[]',	'', false, '', '', true, true, false);
 
 $templates = alerts_get_alert_templates (false, array ('id', 'name'));
 $table->data[2][0] = __('Alert template');
-$table->data[2][1] = print_select (index_array ($templates, 'id', 'name'),
+$table->data[2][1] = html_print_select (index_array ($templates, 'id', 'name'),
 	'id_alert_template', $id_alert_template, false, __('Select'), 0, true);
 $table->data[2][2] = '';
 $table->data[2][3] = '';
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=add_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('add', 1);
-print_submit_button (__('Add'), 'go', false, 'class="sub add"');
+html_print_input_hidden ('add', 1);
+html_print_submit_button (__('Add'), 'go', false, 'class="sub add"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_add_profiles.php b/pandora_console/godmode/massive/massive_add_profiles.php
index fdc1761e46..f13abaf800 100644
--- a/pandora_console/godmode/massive/massive_add_profiles.php
+++ b/pandora_console/godmode/massive/massive_add_profiles.php
@@ -73,7 +73,7 @@ if ($create_profiles) {
 		__('Profiles cannot be added'));
 }
 
-print_table ($table);
+html_print_table ($table);
 
 unset($table);
 
@@ -94,26 +94,26 @@ $table->size[2] = '33%';
 
 $data = array ();
 $data[0] = '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_users&option=add_profiles">';
-$data[0] .= print_select (get_profiles (), 'profiles_id[]', '', '', '',
+$data[0] .= html_print_select (get_profiles (), 'profiles_id[]', '', '', '',
 	'', true, true, false, '', false, 'width: 100%');
-$data[1] = print_select_groups($config['id_user'], "UM", true,
+$data[1] = html_print_select_groups($config['id_user'], "UM", true,
 	'groups_id[]', '', '', '', '', true, true, false, '', false, 'width: 100%');
 $data[2] = '<span id="alerts_loading" class="invisible">';
-$data[2] .= print_image('images/spinner.png', true);
+$data[2] .= html_print_image('images/spinner.png', true);
 $data[2] .= '</span>';
 $users_profiles = "";
 
-$data[2] .= print_select (get_users_info(), 'users_id[]', '', '', '', 
+$data[2] .= html_print_select (get_users_info(), 'users_id[]', '', '', '', 
     '', true, true, true, '', false, 'width: 100%');
 
 
 array_push ($table->data, $data);
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('create_profiles', 1);
-print_submit_button (__('Create'), 'go', false, 'class="sub add"');
+html_print_input_hidden ('create_profiles', 1);
+html_print_submit_button (__('Create'), 'go', false, 'class="sub add"');
 echo '</div>';
 
 echo '</form>';
diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php
index 5af0e83a45..39917899f7 100644
--- a/pandora_console/godmode/massive/massive_copy_modules.php
+++ b/pandora_console/godmode/massive/massive_copy_modules.php
@@ -66,16 +66,16 @@ $table->size[3] = '35%';
 /* Source selection */
 $table->id = 'source_table';
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'source_id_group', $source_id_group,
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'source_id_group', $source_id_group,
 	false, '', '', true);
 $table->data[0][2] = __('Agent');
 $table->data[0][2] .= ' <span id="source_agent_loading" class="invisible">';
-$table->data[0][2] .= print_image ("images/spinner.png", true);
+$table->data[0][2] .= html_print_image ("images/spinner.png", true);
 $table->data[0][2] .= '</span>';
-$table->data[0][3] = print_select (get_group_agents ($source_id_group, false, "none"),
+$table->data[0][3] = html_print_select (get_group_agents ($source_id_group, false, "none"),
 	'source_id_agent', $source_id_agent, false, __('Select'), 0, true);
 
-//$table->data[0][3] = print_input_text_extended ('id_agent', __('Select'), 'text-id_agent', '', 25, 100, false, '',
+//$table->data[0][3] = html_print_input_text_extended ('id_agent', __('Select'), 'text-id_agent', '', 25, 100, false, '',
 //	array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
 //	. '<a href="#" class="tip">&nbsp;<span>' . __("Type two chars at least for search") . '</span></a>';
 
@@ -85,7 +85,7 @@ echo '<fieldset id="fieldset_source">';
 echo '<legend><span>'.__('Source');
 ui_print_help_icon ('manageconfig');
 echo '</span></legend>';
-print_table ($table);
+html_print_table ($table);
 echo '</fieldset>';
 
 /* Target selection */
@@ -98,18 +98,18 @@ if ($source_id_agent)
 
 $table->data['operations'][0] = __('Operations');
 $table->data['operations'][1] = '<span class="with_modules'.(empty ($modules) ? ' invisible': '').'">';
-$table->data['operations'][1] .= print_checkbox ('copy_modules', 1, true, true);
-$table->data['operations'][1] .= print_label (__('Copy modules'), 'checkbox-copy_modules', true);
+$table->data['operations'][1] .= html_print_checkbox ('copy_modules', 1, true, true);
+$table->data['operations'][1] .= html_print_label (__('Copy modules'), 'checkbox-copy_modules', true);
 $table->data['operations'][1] .= '</span><br />';
 
 $table->data['operations'][1] .= '<span class="with_alerts'.(empty ($alerts) ? ' invisible': '').'">';
-$table->data['operations'][1] .= print_checkbox ('copy_alerts', 1, true, true);
-$table->data['operations'][1] .= print_label (__('Copy alerts'), 'checkbox-copy_alerts', true);
+$table->data['operations'][1] .= html_print_checkbox ('copy_alerts', 1, true, true);
+$table->data['operations'][1] .= html_print_label (__('Copy alerts'), 'checkbox-copy_alerts', true);
 $table->data['operations'][1] .= '</span>';
 
 $table->data[1][0] = __('Modules');
 $table->data[1][1] = '<span class="with_modules'.(empty ($modules) ? ' invisible': '').'">';
-$table->data[1][1] .= print_select ($modules,
+$table->data[1][1] .= html_print_select ($modules,
 	'target_modules[]', 0, false, '', '', true, true);
 $table->data[1][1] .= '</span>';
 $table->data[1][1] .= '<span class="without_modules'.(! empty ($modules) ? ' invisible': '').'">';
@@ -128,7 +128,7 @@ foreach ($agent_alerts as $alert) {
 	$alerts[$alert['id']] = $name;
 }
 $table->data[2][1] = '<span class="with_alerts'.(empty ($alerts) ? ' invisible': '').'">';
-$table->data[2][1] .= print_select ($alerts,
+$table->data[2][1] .= html_print_select ($alerts,
 	'target_alerts[]', 0, false, '', '', true, true);
 $table->data[2][1] .= '</span>';
 $table->data[2][1] .= '<span class="without_alerts'.(! empty ($modules) ? ' invisible': '').'">';
@@ -136,37 +136,37 @@ $table->data[2][1] .= '<em>'.__('No alerts for this agent').'</em>';
 $table->data[2][1] .= '</span>';
 
 echo '<div id="modules_loading" class="loading invisible">';
-print_image ("images/spinner.png");
+html_print_image ("images/spinner.png");
 echo __('Loading').'&hellip;';
 echo '</div>';
 
 echo '<fieldset id="fieldset_targets"'.($source_id_agent ? '' : ' class="invisible"').'>';
 echo '<legend><span>'.__('Targets').'</span></legend>';
-print_table ($table);
+html_print_table ($table);
 echo '</fieldset>';
 
 /* Destiny selection */
 $table->id = 'destiny_table';
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'destiny_id_group', $destiny_id_group,
+$table->data[0][1] = html_print_select ($groups, 'destiny_id_group', $destiny_id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agent');
 $table->data[1][0] .= '<span id="destiny_agent_loading" class="invisible">';
-$table->data[1][0] .= print_image ("images/spinner.png", true);
+$table->data[1][0] .= html_print_image ("images/spinner.png", true);
 $table->data[1][0] .= '</span>';
-$table->data[1][1] = print_select (get_group_agents ($destiny_id_group, false, "none"),
+$table->data[1][1] = html_print_select (get_group_agents ($destiny_id_group, false, "none"),
 	'destiny_id_agent[]', 0, false, '', '', true, true);
 
 echo '<fieldset id="fieldset_destiny"'.($source_id_agent ? '' : ' class="invisible"').'>';
 echo '<legend><span>'.__('To agent(s)').'</span></legend>';
-print_table ($table);
+html_print_table ($table);
 echo '</fieldset>';
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('do_operation', 1);
-print_submit_button (__('Copy'), 'go', false, 'class="sub wand"');
+html_print_input_hidden ('do_operation', 1);
+html_print_submit_button (__('Copy'), 'go', false, 'class="sub wand"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_action_alerts.php b/pandora_console/godmode/massive/massive_delete_action_alerts.php
index b6be8b5bfc..4f578c19fc 100644
--- a/pandora_console/godmode/massive/massive_delete_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_action_alerts.php
@@ -154,14 +154,14 @@ $table->size[1] = '85%';
 
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agents');
 $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= print_image('images/spinner.png', true);
+$table->data[1][0] .= html_print_image('images/spinner.png', true);
 $table->data[1][0] .= '</span>';
-$table->data[1][1] = print_select (get_group_agents ($id_group, false, "none"),
+$table->data[1][1] = html_print_select (get_group_agents ($id_group, false, "none"),
 	'id_agents[]', 0, false, '', '', true, true);
 
 if (empty($id_agents)) {
@@ -171,9 +171,9 @@ if (empty($id_agents)) {
 }
 $table->data[2][0] = __('Alert templates');
 $table->data[2][0] .= '<span id="template_loading" class="invisible">';
-$table->data[2][0] .= print_image('images/spinner.png', true);
+$table->data[2][0] .= html_print_image('images/spinner.png', true);
 $table->data[2][0] .= '</span>';
-$table->data[2][1] = print_select (index_array ($alert_templates, 'id_alert_template', 'template_name'), 'id_alert_templates[]', '', '', '', '', true, true, true, '', $alert_templates == 0);
+$table->data[2][1] = html_print_select (index_array ($alert_templates, 'id_alert_template', 'template_name'), 'id_alert_templates[]', '', '', '', '', true, true, true, '', $alert_templates == 0);
 
 if (empty($id_agents)) {
 	$alert_compounds = '';
@@ -189,20 +189,20 @@ if (empty($id_agents)) {
 }
 $table->data[3][0] = __('Alert compounds');
 $table->data[3][0] .= '<span id="compound_loading" class="invisible">';
-$table->data[3][0] .= print_image('images/spinner.png', true);
+$table->data[3][0] .= html_print_image('images/spinner.png', true);
 $table->data[3][0] .= '</span>';
-$table->data[3][1] = print_select (index_array ($alert_compounds, 'id', 'name'), 'id_alert_compounds[]', '', false, '', '', true, true, true, '', $alert_compounds == 0);
+$table->data[3][1] = html_print_select (index_array ($alert_compounds, 'id', 'name'), 'id_alert_compounds[]', '', false, '', '', true, true, true, '', $alert_compounds == 0);
 
 $actions = alerts_get_alert_actions ();
 $table->data[4][0] = __('Action');
-$table->data[4][1] = print_select ($actions, 'action', '', '', __('None'), 0, true);	
+$table->data[4][1] = html_print_select ($actions, 'action', '', '', __('None'), 0, true);	
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_action_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('delete', 1);
-print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
+html_print_input_hidden ('delete', 1);
+html_print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_agents.php b/pandora_console/godmode/massive/massive_delete_agents.php
index 6c309c3f24..22df66ab5b 100644
--- a/pandora_console/godmode/massive/massive_delete_agents.php
+++ b/pandora_console/godmode/massive/massive_delete_agents.php
@@ -95,22 +95,22 @@ $table->size[1] = '85%';
 
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agents');
 $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= print_image('images/spinner.png', true);
+$table->data[1][0] .= html_print_image('images/spinner.png', true);
 $table->data[1][0] .= '</span>';
-$table->data[1][1] = print_select (get_group_agents ($id_group, false, "none"),
+$table->data[1][1] = html_print_select (get_group_agents ($id_group, false, "none"),
 	'id_agents[]', 0, false, '', '', true, true);
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_agents" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('delete', 1);
-print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
+html_print_input_hidden ('delete', 1);
+html_print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_alerts.php b/pandora_console/godmode/massive/massive_delete_alerts.php
index 0aa9f523c0..8f44f6b92f 100644
--- a/pandora_console/godmode/massive/massive_delete_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_alerts.php
@@ -125,34 +125,34 @@ $table->data = array ();
 
 $templates = alerts_get_alert_templates (false, array ('id', 'name'));
 $table->data[0][0] = __('Alert template');
-$table->data[0][1] = print_select (index_array ($templates, 'id', 'name'),
+$table->data[0][1] = html_print_select (index_array ($templates, 'id', 'name'),
 	'id_alert_template', $id_alert_template, false, __('Select'), 0, true);
 $table->data[0][2] = '';
 $table->data[0][3] = '';
 
 $table->data[1][0] = __('Group');
-$table->data[1][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
+$table->data[1][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
 	'', '', '', true, false, true, '', $id_alert_template == 0);
 $table->data[1][2] = '';
 $table->data[1][3] = '';
 
 $table->data[2][0] = __('Agents');
 $table->data[2][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[2][0] .= print_image('images/spinner.png', true);
+$table->data[2][0] .= html_print_image('images/spinner.png', true);
 $table->data[2][0] .= '</span>';
 $agents_alerts = alerts_get_agents_with_alert_template ($id_alert_template, $id_group,
 	false, array ('tagente.nombre', 'tagente.id_agente'));
-$table->data[2][1] = print_select (index_array ($agents_alerts, 'id_agente', 'nombre'),
+$table->data[2][1] = html_print_select (index_array ($agents_alerts, 'id_agente', 'nombre'),
 	'id_agents[]', '', '', '', '', true, true, true, '', $id_alert_template == 0);
 $table->data[2][2] = __('Modules');
-$table->data[2][3] = print_select (array(), 'module[]',	'', false, '', '', true, true, false);
+$table->data[2][3] = html_print_select (array(), 'module[]',	'', false, '', '', true, true, false);
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('delete', 1);
-print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
+html_print_input_hidden ('delete', 1);
+html_print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php
index 45bf79e828..dfd46f3f3e 100644
--- a/pandora_console/godmode/massive/massive_delete_modules.php
+++ b/pandora_console/godmode/massive/massive_delete_modules.php
@@ -115,30 +115,30 @@ $modulesSelect = array();
 foreach ($modules as $module) {
 	$modulesSelect[$module] = $module;
 }
-$table->data[0][1] = print_select($modulesSelect,
+$table->data[0][1] = html_print_select($modulesSelect,
 	'module_name', $module_name, false, __('Select'), '', true);
 
 $table->data[1][0] = __('Group');
-$table->data[1][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
+$table->data[1][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true, false, true, '', empty ($module_name));
 
 $table->data[2][0] = __('Agent');
 $table->data[2][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[2][0] .= print_image('images/spinner.png', true);
+$table->data[2][0] .= html_print_image('images/spinner.png', true);
 $table->data[2][0] .= '</span>';
 $agents = get_agents_with_module_name ($module_name, $id_group,
 	array ('delete_pending' => 0,
 		'tagente_modulo.disabled' => 0),
 	array ('tagente.id_agente', 'tagente.nombre'));
-$table->data[2][1] = print_select (index_array ($agents, 'id_agente', 'nombre'),
+$table->data[2][1] = html_print_select (index_array ($agents, 'id_agente', 'nombre'),
 	'id_agents[]', 0, false, __('None'), 0, true, true, true, '', empty ($module_name));
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_modules" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('delete', 1);
-print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
+html_print_input_hidden ('delete', 1);
+html_print_submit_button (__('Delete'), 'go', false, 'class="sub delete"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_profiles.php b/pandora_console/godmode/massive/massive_delete_profiles.php
index f94d9da1ea..21182e90b9 100644
--- a/pandora_console/godmode/massive/massive_delete_profiles.php
+++ b/pandora_console/godmode/massive/massive_delete_profiles.php
@@ -82,7 +82,7 @@ if ($delete_profiles) {
 		__('Profiles cannot be deleted'));
 }
 
-print_table ($table);
+html_print_table ($table);
 
 unset($table);
 
@@ -103,26 +103,26 @@ $table->size[2] = '33%';
 
 $data = array ();
 $data[0] = '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_users&option=delete_profiles">';
-$data[0] .= print_select (get_profiles (), 'profiles_id[]', '', '', '',
+$data[0] .= html_print_select (get_profiles (), 'profiles_id[]', '', '', '',
 	'', true, false, false, '', false, 'width: 100%');
-$data[1] = print_select_groups($config['id_user'], "UM", true,
+$data[1] = html_print_select_groups($config['id_user'], "UM", true,
 	'groups_id[]', '', '', '', '', true, false, false, '', false, 'width: 100%');
 $data[2] = '<span id="users_loading" class="invisible">';
-$data[2] .= print_image('images/spinner.png', true);
+$data[2] .= html_print_image('images/spinner.png', true);
 $data[2] .= '</span>';
 $users_profiles = "";
 
-$data[2] .= print_select (array(), 'users_id[]', '', '', '', 
+$data[2] .= html_print_select (array(), 'users_id[]', '', '', '', 
     '', true, true, true, '', false, 'width: 100%');
 
 
 array_push ($table->data, $data);
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('delete_profiles', 1);
-print_submit_button (__('Delete'), 'del', false, 'class="sub delete"');
+html_print_input_hidden ('delete_profiles', 1);
+html_print_submit_button (__('Delete'), 'del', false, 'class="sub delete"');
 echo '</div>';
 
 echo '</form>';
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index ee44ca57e8..f983f3f233 100644
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -188,21 +188,21 @@ $table->size[1] = '85%';
 
 $table->data = array ();
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
 	false, '', '', true);
 
 $table->data[1][0] = __('Agents');
 $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= print_image('images/spinner.png', true);
+$table->data[1][0] .= html_print_image('images/spinner.png', true);
 $table->data[1][0] .= '</span>';
 $enabled_agents = get_group_agents ($id_group, array('disabled' => 0), "none");
 $all_agents = get_group_agents ($id_group, array('disabled' => 1), "none") + $enabled_agents;
 
-$table->data[1][1] = print_select ($all_agents,
+$table->data[1][1] = html_print_select ($all_agents,
 	'id_agents[]', 0, false, '', '', true, true);
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_agents" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 $nombre_agente = "";
 $direccion_agente = "";
@@ -229,14 +229,14 @@ $groups = get_user_groups ($config["id_user"], "AR",false);
 $agents = get_group_agents (array_keys ($groups));
 
 $table->data[0][0] = __('Parent');
-$table->data[0][1] = print_input_text_extended ('id_parent', get_agent_name ($id_parent), 'text-id_parent', '', 30, 100, false, '',
+$table->data[0][1] = html_print_input_text_extended ('id_parent', get_agent_name ($id_parent), 'text-id_parent', '', 30, 100, false, '',
 	array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
 	. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 
-$table->data[0][1] .= print_checkbox ("cascade_protection", 1, $cascade_protection, true).__('Cascade protection'). "&nbsp;" . ui_print_help_icon("cascade_protection", true);
+$table->data[0][1] .= html_print_checkbox ("cascade_protection", 1, $cascade_protection, true).__('Cascade protection'). "&nbsp;" . ui_print_help_icon("cascade_protection", true);
 
 $table->data[1][0] = __('Group');
-$table->data[1][1] = print_select_groups(false, "AR", false, 'group', $group, '', __('No change'), -1, true, false, true, '', false, 'width: 150px;');
+$table->data[1][1] = html_print_select_groups(false, "AR", false, 'group', $group, '', __('No change'), -1, true, false, true, '', false, 'width: 150px;');
 
 $table->data[2][0] = __('Interval');
 
@@ -249,10 +249,10 @@ $intervals[1200] = human_time_description_raw (1200);
 $intervals[1800] = human_time_description_raw (1800);
 $intervals[3600] = human_time_description_raw (3600);
 $intervals[7200] = human_time_description_raw (7200);
-$table->data[2][1] = print_extended_select_for_time ($intervals, 'interval', $interval, '', '', '0', 10, true, 'width: 150px') . __(" seconds.");
+$table->data[2][1] = html_print_extended_select_for_time ($intervals, 'interval', $interval, '', '', '0', 10, true, 'width: 150px') . __(" seconds.");
 
 $table->data[3][0] = __('OS');
-$table->data[3][1] = print_select_from_sql ('SELECT id_os, name FROM tconfig_os',
+$table->data[3][1] = html_print_select_from_sql ('SELECT id_os, name FROM tconfig_os',
 	'id_os', $id_os, '', __('No change'), -1, true, false, true, false, 'width: 105px;');
 $table->data[3][1] .= ' <span id="os_preview">';
 $table->data[3][1] .= ui_print_os_icon ($id_os, false, true);
@@ -263,14 +263,14 @@ $none = '';
 if ($server_name == '' && $id_agente)
 	$none = __('None');
 $table->data[4][0] = __('Server');
-$table->data[4][1] = print_select (get_server_names (),
+$table->data[4][1] = html_print_select (get_server_names (),
 	'server_name', $server_name, '', __('No change'), -1, true, false, true, '', false, 'width: 150px;');
 
 // Description
 $table->data[5][0] = __('Description');
-$table->data[5][1] = print_input_text ('description', $description, '', 45, 255, true);
+$table->data[5][1] = html_print_input_text ('description', $description, '', 45, 255, true);
 
-print_table ($table);
+html_print_table ($table);
 unset($table);
 
 $custom_id = '';
@@ -291,19 +291,19 @@ $table->data = array ();
 
 // Custom ID
 $table->data[0][0] = __('Custom ID');
-$table->data[0][1] = print_input_text ('custom_id', $custom_id, '', 16, 255, true);
+$table->data[0][1] = html_print_input_text ('custom_id', $custom_id, '', 16, 255, true);
 
 // Learn mode / Normal mode
 $table->data[1][0] = __('Module definition') . ui_print_help_icon("module_definition", true);
-$table->data[1][1] = __('No change').' '.print_radio_button_extended ("mode", -1, '', $mode, false, '', 'style="margin-right: 40px;"', true);
-$table->data[1][1] .= __('Learning mode').' '.print_radio_button_extended ("mode", 1, '', $mode, false, '', 'style="margin-right: 40px;"', true);
-$table->data[1][1] .= __('Normal mode').' '.print_radio_button_extended ("mode", 0, '', $mode, false, '', 'style="margin-right: 40px;"', true);
+$table->data[1][1] = __('No change').' '.html_print_radio_button_extended ("mode", -1, '', $mode, false, '', 'style="margin-right: 40px;"', true);
+$table->data[1][1] .= __('Learning mode').' '.html_print_radio_button_extended ("mode", 1, '', $mode, false, '', 'style="margin-right: 40px;"', true);
+$table->data[1][1] .= __('Normal mode').' '.html_print_radio_button_extended ("mode", 0, '', $mode, false, '', 'style="margin-right: 40px;"', true);
 
 // Status (Disabled / Enabled)
 $table->data[2][0] = __('Status');
-$table->data[2][1] = __('No change').' '.print_radio_button_extended ("disabled", -1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
-$table->data[2][1] .= __('Disabled').' '.print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
-$table->data[2][1] .= __('Active').' '.print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
+$table->data[2][1] = __('No change').' '.html_print_radio_button_extended ("disabled", -1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
+$table->data[2][1] .= __('Disabled').' '.html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
+$table->data[2][1] .= __('Active').' '.html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 
 // Remote configuration
 $table->data[3][0] = __('Remote configuration');
@@ -311,11 +311,11 @@ $table->data[3][0] = __('Remote configuration');
 // Delete remote configuration
 $table->data[3][1] = '<div id="delete_configurations" style="display: none">'. __('Delete available remote configurations').' (';
 $table->data[3][1] .= '<span id="n_configurations"></span>';
-$table->data[3][1] .= ') '.print_radio_button_extended ("delete_conf", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true).'</div>';
+$table->data[3][1] .= ') '.html_print_radio_button_extended ("delete_conf", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true).'</div>';
 
 $table->data[3][1] .= '<div id="not_available_configurations" style="display: none"><em>'.__('Not available').'</em></div>';		
 	
-$listIcons = getArrayListIcons();
+$listIcons = gis_get_array_list_icons();
 
 $arraySelectIcon = array();
 foreach ($listIcons as $index => $value) $arraySelectIcon[$index] = $index;
@@ -323,20 +323,20 @@ foreach ($listIcons as $index => $value) $arraySelectIcon[$index] = $index;
 $path = 'images/gis_map/icons/'; //TODO set better method the path
 
 $table->data[4][0] = __('Agent icon');
-$table->data[4][1] = print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .
-	'&nbsp;' . __('Without status') . ': ' . print_image($path . $icon_path . 'default.png', true, array("id" => 'icon_without_status',"style" => 'display:none;')) .
-	'&nbsp;' . __('Default') . ': ' . print_image($path . $icon_path . 'default.png', true, array("id" => 'icon_default',"style" => 'display:none;')) .
-	'&nbsp;' . __('Ok') . ': ' .  print_image($path . $icon_path . 'ok.png', true, array("id" => 'icon_ok',"style" => 'display:none;')) .
-	'&nbsp;' . __('Bad') . ': ' . print_image($path . $icon_path . 'bad.png', true, array("id" => 'icon_bad',"style" => 'display:none;')) . 		'&nbsp;' . __('Warning') . ': ' .  print_image($path . $icon_path . 'warning.png', true, array("id" => 'icon_warning',"style" => 'display:none;'));
+$table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .
+	'&nbsp;' . __('Without status') . ': ' . html_print_image($path . $icon_path . 'default.png', true, array("id" => 'icon_without_status',"style" => 'display:none;')) .
+	'&nbsp;' . __('Default') . ': ' . html_print_image($path . $icon_path . 'default.png', true, array("id" => 'icon_default',"style" => 'display:none;')) .
+	'&nbsp;' . __('Ok') . ': ' .  html_print_image($path . $icon_path . 'ok.png', true, array("id" => 'icon_ok',"style" => 'display:none;')) .
+	'&nbsp;' . __('Bad') . ': ' . html_print_image($path . $icon_path . 'bad.png', true, array("id" => 'icon_bad',"style" => 'display:none;')) . 		'&nbsp;' . __('Warning') . ': ' .  html_print_image($path . $icon_path . 'warning.png', true, array("id" => 'icon_warning',"style" => 'display:none;'));
 
 if ($config['activate_gis']) {
 	$table->data[5][0] = __('Ignore new GIS data:');
-	$table->data[5][1] = __('No change').' '.print_radio_button_extended ("update_gis_data", -1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
-	$table->data[5][1] .= __('Disabled').' '.print_radio_button_extended ("update_gis_data", 0, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
-	$table->data[5][1] .= __('Active').' '.print_radio_button_extended ("update_gis_data", 1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] = __('No change').' '.html_print_radio_button_extended ("update_gis_data", -1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] .= __('Disabled').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
+	$table->data[5][1] .= __('Active').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $update_gis_data, false, '', 'style="margin-right: 40px;"', true);
 }
 
-ui_toggle(print_table ($table, true), __('Advanced options'));
+ui_toggle(html_print_table ($table, true), __('Advanced options'));
 unset($table);
 
 $table->width = '95%';
@@ -361,13 +361,13 @@ foreach ($fields as $field) {
 		$custom_value = '';
 	}
 	
-	$data[1] = print_textarea ('customvalue_'.$field['id_field'], 2, 65, $custom_value, 'style="min-height: 30px;"', true);
+	$data[1] = html_print_textarea ('customvalue_'.$field['id_field'], 2, 65, $custom_value, 'style="min-height: 30px;"', true);
 	
 	array_push ($table->data, $data);
 }
 
 if (!empty($fields)) {
-	ui_toggle(print_table ($table, true), __('Custom fields'));
+	ui_toggle(html_print_table ($table, true), __('Custom fields'));
 }
 
 
@@ -375,9 +375,9 @@ echo '<h3 class="error invisible" id="message"> </h3>';
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 
-print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
-print_input_hidden ('update_agents', 1);
-print_input_hidden ('id_agente', $id_agente);
+html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"');
+html_print_input_hidden ('update_agents', 1);
+html_print_input_hidden ('id_agente', $id_agente);
 
 echo "</div>"; // Shown and hide div
 
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index b37134201c..fabfaf2cf7 100644
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -230,21 +230,21 @@ $snmp_versions['3'] = 'v. 3';
 $table->data = array ();
 	
 $table->data[0][0] = __('Selection mode');
-$table->data[0][1] = __('Select modules first').' '.print_radio_button_extended ("selection_mode", 'modules', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true);
+$table->data[0][1] = __('Select modules first').' '.html_print_radio_button_extended ("selection_mode", 'modules', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true);
 $table->data[0][2] = '';
-$table->data[0][3] = __('Select agents first').' '.print_radio_button_extended ("selection_mode", 'agents', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true);
+$table->data[0][3] = __('Select agents first').' '.html_print_radio_button_extended ("selection_mode", 'agents', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true);
 
 $table->rowclass[1] = 'select_modules_row';
 $table->data[1][0] = __('Module type');
 $table->data[1][0] .= '<span id="module_loading" class="invisible">';
-$table->data[1][0] .= print_image('images/spinner.png', true);
+$table->data[1][0] .= html_print_image('images/spinner.png', true);
 $table->data[1][0] .= '</span>';
 $types[0] = __('All');
 $table->colspan[1][1] = 2;
-$table->data[1][1] = print_select ($types,
+$table->data[1][1] = html_print_select ($types,
 	'module_type', '', false, __('Select'), -1, true, false, true);
 
-$table->data[1][3] = __('Select all modules of this type').' '.print_checkbox_extended ("force_type", 'type', '', '', false, '', 'style="margin-right: 40px;"', true);
+$table->data[1][3] = __('Select all modules of this type').' '.html_print_checkbox_extended ("force_type", 'type', '', '', false, '', 'style="margin-right: 40px;"', true);
 
 $modules = array ();
 if ($module_type != '') {
@@ -262,91 +262,91 @@ foreach ($names as $name) {
 
 $table->rowclass[2] = 'select_agents_row';
 $table->data[2][0] = __('Agent group');
-$groups = get_all_groups(true);
+$groups = groups_get_all(true);
 $groups[0] = __('All');
 $table->colspan[2][1] = 2;
-$table->data[2][1] = print_select ($groups, 'groups_select',
+$table->data[2][1] = html_print_select ($groups, 'groups_select',
 	'', true, __('Select'), -1, true, false, true);
-$table->data[2][3] = __('Select all modules of this group').' '.print_checkbox_extended ("force_group", 'group', '', '', false, '', 'style="margin-right: 40px;"', true);
+$table->data[2][3] = __('Select all modules of this group').' '.html_print_checkbox_extended ("force_group", 'group', '', '', false, '', 'style="margin-right: 40px;"', true);
 
 $table->rowstyle[3] = 'vertical-align: top;';
 $table->rowclass[3] = 'select_modules_row select_modules_row_2';
 $table->data[3][0] = __('Modules');
-$table->data[3][1] = print_select ($modules, 'module_name[]',
+$table->data[3][1] = html_print_select ($modules, 'module_name[]',
 	$module_name, false, __('Select'), -1, true, true, true);
 
 $table->data[3][2] = __('Agents');
-$table->data[3][3] = print_select (array(), 'agents[]',
+$table->data[3][3] = html_print_select (array(), 'agents[]',
 	$agents_select, false, __('None'), 0, true, true, false);
 	
 $table->rowstyle[4] = 'vertical-align: top;';
 $table->rowclass[4] = 'select_agents_row select_agents_row_2';
 $table->data[4][0] = __('Agents');
-$table->data[4][1] = print_select ($agents, 'id_agents[]',
+$table->data[4][1] = html_print_select ($agents, 'id_agents[]',
 	$agents_id, false, '', '', true, true, false);
 	
 $table->data[4][2] = __('Modules');
-$table->data[4][3] = print_select (array(), 'module[]',
+$table->data[4][3] = html_print_select (array(), 'module[]',
 	$modules_select, false, '', '', true, true, false);
 
 
 $table->data['edit1'][0] = __('Warning status');
 $table->data['edit1'][1] = '<em>'.__('Min.').'</em>';
-$table->data['edit1'][1] .= print_input_text ('min_warning', '', '', 5, 15, true);
+$table->data['edit1'][1] .= html_print_input_text ('min_warning', '', '', 5, 15, true);
 $table->data['edit1'][1] .= '<br /><em>'.__('Max.').'</em>';
-$table->data['edit1'][1] .= print_input_text ('max_warning', '', '', 5, 15, true);
+$table->data['edit1'][1] .= html_print_input_text ('max_warning', '', '', 5, 15, true);
 $table->data['edit1'][2] = __('Critical status');
 $table->data['edit1'][3] = '<em>'.__('Min.').'</em>';
-$table->data['edit1'][3] .= print_input_text ('min_critical', '', '', 5, 15, true);
+$table->data['edit1'][3] .= html_print_input_text ('min_critical', '', '', 5, 15, true);
 $table->data['edit1'][3] .= '<br /><em>'.__('Max.').'</em>';
-$table->data['edit1'][3] .= print_input_text ('max_critical', '', '', 5, 15, true);
+$table->data['edit1'][3] .= html_print_input_text ('max_critical', '', '', 5, 15, true);
 
 $table->data['edit2'][0] = __('Interval');
-$table->data['edit2'][1] = print_input_text ('module_interval', '', '', 5, 15, true);
+$table->data['edit2'][1] = html_print_input_text ('module_interval', '', '', 5, 15, true);
 $table->data['edit2'][2] = __('Disabled');
-//$table->data['edit2'][3] = print_checkbox ("disabled", 1, '', true);
-$table->data['edit2'][3] = print_select(array('' => '', '1' => __('Yes'), '0' => __('No')),'disabled','','','', '', true);
+//$table->data['edit2'][3] = html_print_checkbox ("disabled", 1, '', true);
+$table->data['edit2'][3] = html_print_select(array('' => '', '1' => __('Yes'), '0' => __('No')),'disabled','','','', '', true);
 
 $table->data['edit3'][0] = __('Post process');
-$table->data['edit3'][1] = print_input_text ('post_process', '', '', 10, 15, true);
+$table->data['edit3'][1] = html_print_input_text ('post_process', '', '', 10, 15, true);
 $table->data['edit3'][2] = __('SMNP community');
-$table->data['edit3'][3] = print_input_text ('snmp_community', '', '', 10, 15, true);
+$table->data['edit3'][3] = html_print_input_text ('snmp_community', '', '', 10, 15, true);
 $table->data['edit35'][0] = '';
 $table->data['edit35'][1] = '';
 $table->data['edit35'][2] = __('SNMP version');
-$table->data['edit35'][3] = print_select ($snmp_versions, 'tcp_send', '', '', __('Select'), '', true, false, false, '');
+$table->data['edit35'][3] = html_print_select ($snmp_versions, 'tcp_send', '', '', __('Select'), '', true, false, false, '');
 
 $table->data['edit4'][0] = __('Value');
 $table->data['edit4'][1] = '<em>'.__('Min.').'</em>';
-$table->data['edit4'][1] .= print_input_text ('min', '', '', 5, 15, true);
+$table->data['edit4'][1] .= html_print_input_text ('min', '', '', 5, 15, true);
 $table->data['edit4'][1] .= '<br /><em>'.__('Max.').'</em>';
-$table->data['edit4'][1] .= print_input_text ('max', '', '', 5, 15, true);
+$table->data['edit4'][1] .= html_print_input_text ('max', '', '', 5, 15, true);
 $table->data['edit4'][2] = __('Module group');
-$table->data['edit4'][3] = print_select (get_modulegroups(),
+$table->data['edit4'][3] = html_print_select (get_modulegroups(),
 	'id_module_group', '', '', __('Select'), 0, true, false, false);
 
 $table->data['edit5'][0] = __('Username');
-$table->data['edit5'][1] = print_input_text ('plugin_user', '', '', 15, 60, true);
+$table->data['edit5'][1] = html_print_input_text ('plugin_user', '', '', 15, 60, true);
 $table->data['edit5'][2] = __('Password');
-$table->data['edit5'][3] = print_input_password ('plugin_pass', '', '', 15, 60, true);
+$table->data['edit5'][3] = html_print_input_password ('plugin_pass', '', '', 15, 60, true);
 
 $table->data['edit6'][0] = __('Export target');
-$table->data['edit6'][1] = print_select_from_sql ('SELECT id, name
+$table->data['edit6'][1] = html_print_select_from_sql ('SELECT id, name
 	FROM tserver_export ORDER BY name',
 	'id_export', '', '',__('None'),'0', true, false, false);
 
 /* FF stands for Flip-flop */
 $table->data['edit7'][0] = __('FF threshold') . ' ' . ui_print_help_icon ('ff_threshold', true);
-$table->data['edit7'][1] = print_input_text ('min_ff_event', '', '', 5, 15, true);
+$table->data['edit7'][1] = html_print_input_text ('min_ff_event', '', '', 5, 15, true);
 $table->data['edit7'][2] = __('Historical data');
-$table->data['edit7'][3] = print_select(array('' => '', '1' => __('Yes'), '0' => __('No')),'history_data','','','', '', true);
+$table->data['edit7'][3] = html_print_select(array('' => '', '1' => __('Yes'), '0' => __('No')),'history_data','','','', '', true);
 
 echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_modules" id="form_edit" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-print_input_hidden ('update', 1);
-print_submit_button (__('Update'), 'go', false, 'class="sub upd"');
+html_print_input_hidden ('update', 1);
+html_print_submit_button (__('Update'), 'go', false, 'class="sub upd"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_enable_disable_alerts.php b/pandora_console/godmode/massive/massive_enable_disable_alerts.php
index 26aa701fc0..a7a22a578f 100644
--- a/pandora_console/godmode/massive/massive_enable_disable_alerts.php
+++ b/pandora_console/godmode/massive/massive_enable_disable_alerts.php
@@ -121,50 +121,50 @@ $table->size[1] = '85%';
 $table->data = array ();
 
 $table->data[0][0] = '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_alerts&option=enable_disable_alerts&action=disable_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-$table->data[0][0] .= print_input_hidden('id_alert_template_enabled', $id_alert_templates, true);
+$table->data[0][0] .= html_print_input_hidden('id_alert_template_enabled', $id_alert_templates, true);
 
 $table->data[0][0] .= __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', '', true);
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', '', true);
 
 $table->data[1][0] = __('Agents');
 $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= print_image("images/spinner.png", true);
+$table->data[1][0] .= html_print_image("images/spinner.png", true);
 $table->data[1][0] .= '</span>';
-$table->data[1][1] = print_select (get_group_agents ($id_group, false, "none"),
+$table->data[1][1] = html_print_select (get_group_agents ($id_group, false, "none"),
         'id_agents[]', 0, false, '', '', true, true);
 
 $table->data[2][0] = __('Alert template');
 $table->data[2][0] .= '<span id="template_loading" class="invisible">';
-$table->data[2][0] .= print_image("images/spinner.png", true);
+$table->data[2][0] .= html_print_image("images/spinner.png", true);
 $table->data[2][0] .= '</span>';
-$table->data[2][1] = print_select ('',  'id_alert_templates[]', '', '', '', '', true, true, true, '', true);
+$table->data[2][1] = html_print_select ('',  'id_alert_templates[]', '', '', '', '', true, true, true, '', true);
 	
 $table->data[3][0] = __('Enabled alerts').ui_print_help_tip(__('Format').":<br> ".__('Agent')." - ".__('Module'), true);
 $table->data[3][0] .= '<span id="alerts_loading" class="invisible">';
-$table->data[3][0] .= print_image("images/spinner.png", true);
+$table->data[3][0] .= html_print_image("images/spinner.png", true);
 $table->data[3][0] .= '</span>';
 $agents_alerts = alerts_get_agents_with_alert_template ($id_alert_templates, $id_group,
 	false, array ('tagente.nombre', 'tagente.id_agente'));
-$table->data[3][1] = print_select (index_array ($agents_alerts, 'id_agente', 'nombre'),
+$table->data[3][1] = html_print_select (index_array ($agents_alerts, 'id_agente', 'nombre'),
 	'id_enabled_alerts[]', '', '', '', '', true, true, true, '', $id_alert_templates == 0);
 
 $table->data[4][0] = __('Action');
 
-$table->data[4][1] = "<table border='0' width='100%'><tr><td>".print_input_image ('disable_alerts', 'images/darrowdown.png', 1, 'margin-left: 150px;', true, array ('title' => __('Disable selected alerts')))."</td><td>";
+$table->data[4][1] = "<table border='0' width='100%'><tr><td>".html_print_input_image ('disable_alerts', 'images/darrowdown.png', 1, 'margin-left: 150px;', true, array ('title' => __('Disable selected alerts')))."</td><td>";
 $table->data[4][1] .= '</form>';
 $table->data[4][1] .= '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_alerts&option=enable_disable_alerts&action=enable_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-$table->data[4][1] .= print_input_hidden('id_alert_template_disabled', $id_alert_templates, true);
-$table->data[4][1] .= print_input_image ('enable_alerts', 'images/darrowup.png', 1, 'margin-left: 200px;', true, array ('title' => __('Enable selected alerts')))."</td></tr></table>";
+$table->data[4][1] .= html_print_input_hidden('id_alert_template_disabled', $id_alert_templates, true);
+$table->data[4][1] .= html_print_input_image ('enable_alerts', 'images/darrowup.png', 1, 'margin-left: 200px;', true, array ('title' => __('Enable selected alerts')))."</td></tr></table>";
 
 $table->data[5][0] = __('Disabled alerts').ui_print_help_tip(__('Format').":<br> ".__('Agent')." - ".__('Module'), true);
 $table->data[5][0] .= '<span id="alerts_loading2" class="invisible">';
-$table->data[5][0] .= print_image("images/spinner.png", true);
+$table->data[5][0] .= html_print_image("images/spinner.png", true);
 $table->data[5][0] .= '</span>';
-$table->data[5][1] = print_select (index_array ($agents_alerts, 'id_agente2', 'nombre'),
+$table->data[5][1] = html_print_select (index_array ($agents_alerts, 'id_agente2', 'nombre'),
 	'id_disabled_alerts[]', '', '', '', '', true, true, true, '', $id_alert_templates == 0);
 $table->data[5][1] .= '</form>';
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<h3 class="error invisible" id="message"> </h3>';
 
diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index 5aea8fbaaf..9f69793d81 100644
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -101,20 +101,20 @@ if ($option == '') {
 }
 
 $alertstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_alerts">'
-		. print_image ('images/bell.png', true, array ('title' => __('Alerts operations')))
+		. html_print_image ('images/bell.png', true, array ('title' => __('Alerts operations')))
 		. '</a>', 'active' => $tab == 'massive_alerts');
 		
 
 $userstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_users">'
-		. print_image ('images/group.png', true, array ('title' => __('Users operations')))
+		. html_print_image ('images/group.png', true, array ('title' => __('Users operations')))
 		. '</a>', 'active' => $tab == 'massive_users');
 		
 $agentstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_agents">'
-		. print_image ('images/bricks.png', true, array ('title' => __('Agents operations')))
+		. html_print_image ('images/bricks.png', true, array ('title' => __('Agents operations')))
 		. '</a>', 'active' => $tab == 'massive_agents');
 			
 $modulestab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_modules">'
-		. print_image ('images/brick.png', true, array ('title' => __('Modules operations')))
+		. html_print_image ('images/brick.png', true, array ('title' => __('Modules operations')))
 		. '</a>', 'active' => $tab == 'massive_modules');
 	
 /* Collection */
@@ -134,7 +134,7 @@ echo '<form method="post" id="form_options" action="index.php?sec=gmassive&sec2=
 echo '<table border="0"><tr><td>';
 echo '<h3>'.__('Massive options').':</h3>';
 echo '</td><td>';
-print_select($options, 'option', $option, 'this.form.submit()', '', 0, false, false, false);
+html_print_select($options, 'option', $option, 'this.form.submit()', '', 0, false, false, false);
 if($option == 'edit_agents' || $option == 'edit_modules') 
 	echo '<a href="#" class="tip">&nbsp;<span>' . __("The blank fields will not be updated") . '</span></a>';
 echo '</td></tr></table>';
diff --git a/pandora_console/godmode/massive/massive_standby_alerts.php b/pandora_console/godmode/massive/massive_standby_alerts.php
index 1f4285182f..4153b39c92 100644
--- a/pandora_console/godmode/massive/massive_standby_alerts.php
+++ b/pandora_console/godmode/massive/massive_standby_alerts.php
@@ -123,50 +123,50 @@ $table->data = array ();
 
 $templates = alerts_get_alert_templates (false, array ('id', 'name'));
 $table->data[0][0] = '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_alerts&option=standby_alerts&action=set_standby_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-$table->data[0][0] .= print_input_hidden('id_alert_template_not_standby', $id_alert_templates, true);
+$table->data[0][0] .= html_print_input_hidden('id_alert_template_not_standby', $id_alert_templates, true);
 $table->data[0][0] .= __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'id_group', $id_group,
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
         '', '', '', true, false, true, '');
 
 $table->data[1][0] = __('Agents');
 $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= print_image('images/spinner.png', true);
+$table->data[1][0] .= html_print_image('images/spinner.png', true);
 $table->data[1][0] .= '</span>';
-$table->data[1][1] = print_select (get_group_agents ($id_group, false, "none"),
+$table->data[1][1] = html_print_select (get_group_agents ($id_group, false, "none"),
         'id_agents[]', 0, false, '', '', true, true);
 
 $table->data[2][0] = __('Alert template');
 $table->data[2][0] .= '<span id="template_loading" class="invisible">';
-$table->data[2][0] .= print_image('images/spinner.png', true);
+$table->data[2][0] .= html_print_image('images/spinner.png', true);
 $table->data[2][0] .= '</span>';
-$table->data[2][1] = print_select ('',  'id_alert_templates[]', '', '', '', '', true, true, true, '', true);
+$table->data[2][1] = html_print_select ('',  'id_alert_templates[]', '', '', '', '', true, true, true, '', true);
 	
 $table->data[3][0] = __('Not standby alerts').ui_print_help_tip(__('Format').":<br> ".__('Agent')." - ".__('Module'), true);
 $table->data[3][0] .= '<span id="alerts_loading" class="invisible">';
-$table->data[3][0] .= print_image('images/spinner.png', true);
+$table->data[3][0] .= html_print_image('images/spinner.png', true);
 $table->data[3][0] .= '</span>';
 $agents_alerts = alerts_get_agents_with_alert_template ($id_alert_templates, $id_group,
 	false, array ('tagente.nombre', 'tagente.id_agente'));
-$table->data[3][1] = print_select (index_array ($agents_alerts, 'id_agente', 'nombre'),
+$table->data[3][1] = html_print_select (index_array ($agents_alerts, 'id_agente', 'nombre'),
 	'id_not_standby_alerts[]', '', '', '', '', true, true, true, '', $id_alert_templates == 0);
 
 $table->data[4][0] = __('Action');
 
-$table->data[4][1] = "<table border='0' width='100%'><tr><td>".print_input_image ('standby_alerts', 'images/darrowdown.png', 1, 'margin-left: 150px;', true, array ('title' => __('Set standby selected alerts')))."</td><td>";
+$table->data[4][1] = "<table border='0' width='100%'><tr><td>".html_print_input_image ('standby_alerts', 'images/darrowdown.png', 1, 'margin-left: 150px;', true, array ('title' => __('Set standby selected alerts')))."</td><td>";
 $table->data[4][1] .= '</form>';
 $table->data[4][1] .= '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_alerts&option=standby_alerts&action=set_off_standby_alerts" onsubmit="if (! confirm(\''.__('Are you sure?').'\')) return false;">';
-$table->data[4][1] .= print_input_hidden('id_alert_template_standby', $id_alert_templates, true);
-$table->data[4][1] .= print_input_image ('set_off_standby_alerts', 'images/darrowup.png', 1, 'margin-left: 200px;', true, array ('title' => __('Set standby selected alerts')))."</td></tr></table>";
+$table->data[4][1] .= html_print_input_hidden('id_alert_template_standby', $id_alert_templates, true);
+$table->data[4][1] .= html_print_input_image ('set_off_standby_alerts', 'images/darrowup.png', 1, 'margin-left: 200px;', true, array ('title' => __('Set standby selected alerts')))."</td></tr></table>";
 
 $table->data[5][0] = __('Standby alerts').ui_print_help_tip(__('Format').":<br> ".__('Agent')." - ".__('Module'), true);
 $table->data[5][0] .= '<span id="alerts_loading2" class="invisible">';
-$table->data[5][0] .= print_image('images/spinner.png', true);
+$table->data[5][0] .= html_print_image('images/spinner.png', true);
 $table->data[5][0] .= '</span>';
-$table->data[5][1] = print_select (index_array ($agents_alerts, 'id_agente2', 'nombre'),
+$table->data[5][1] = html_print_select (index_array ($agents_alerts, 'id_agente2', 'nombre'),
 	'id_standby_alerts[]', '', '', '', '', true, true, true, '', $id_alert_templates == 0);
 $table->data[5][1] .= '</form>';
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<h3 class="error invisible" id="message"> </h3>';
 
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index e921e13ecd..2357625bc1 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -121,21 +121,21 @@ foreach ($groups as $group) {
 	$data[1] = get_network_component_group_name ($group['parent']);
 	
 	$data[2] = '<form method="post" onsubmit="if (! confirm (\''.__('Are you sure?').'\')) return false">';
-	$data[2] .= print_input_hidden ('delete', 1, true);
-	$data[2] .= print_input_hidden ('id', $group['id_sg'], true);
-	$data[2] .= print_input_image ('del', 'images/cross.png', 1, '', true,
+	$data[2] .= html_print_input_hidden ('delete', 1, true);
+	$data[2] .= html_print_input_hidden ('id', $group['id_sg'], true);
+	$data[2] .= html_print_input_image ('del', 'images/cross.png', 1, '', true,
 		array ('title' => __('Delete')));
 	$data[2] .= '</form>';
 	
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<form method="post">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('new', 1);
-print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
+html_print_input_hidden ('new', 1);
+html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
 echo '</div>';
 echo '</form>';
 ?>
diff --git a/pandora_console/godmode/modules/manage_nc_groups_form.php b/pandora_console/godmode/modules/manage_nc_groups_form.php
index 9f1c9ef39f..6af095ef92 100644
--- a/pandora_console/godmode/modules/manage_nc_groups_form.php
+++ b/pandora_console/godmode/modules/manage_nc_groups_form.php
@@ -44,22 +44,22 @@ $table->style[0] = 'font-weight: bold';
 $table->data = array ();
 
 $table->data[0][0] = __('Name');
-$table->data[0][1] = print_input_text ('name', $name, '', 15, 255, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 15, 255, true);
 
 $table->data[1][0] = __('Parent');
-$table->data[1][1] = print_select (get_network_component_groups (),
+$table->data[1][1] = html_print_select (get_network_component_groups (),
 	'parent', $parent, false, __('None'), 0, true, false, false);
 
 echo '<form method="post" action="index.php?sec=gmodules&sec2=godmode/modules/manage_nc_groups">';
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id) {
-	print_input_hidden ('update', 1);
-	print_input_hidden ('id', $id);
-	print_submit_button (__('Update'), 'crt', false, 'class="sub upd"');
+	html_print_input_hidden ('update', 1);
+	html_print_input_hidden ('id', $id);
+	html_print_submit_button (__('Update'), 'crt', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('create', 1);
-	print_submit_button (__('Create'), 'crt', false, 'class="sub wand"');
+	html_print_input_hidden ('create', 1);
+	html_print_submit_button (__('Create'), 'crt', false, 'class="sub wand"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index b1da410e6a..e09f371810 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -259,18 +259,18 @@ $table->style[2] = 'font-weight: bold';
 $table->data = array ();
 
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select (get_network_component_groups (),
+$table->data[0][1] = html_print_select (get_network_component_groups (),
 	'search_id_group', $search_id_group, '', __('All'), 0, true, false, false);
 $table->data[0][2] = __('Search');
-$table->data[0][3] = print_input_text ('search_string', $search_string, '', 25,
+$table->data[0][3] = html_print_input_text ('search_string', $search_string, '', 25,
 	255, true);
 $table->data[0][4] = '<div class="action-buttons">';
-$table->data[0][4] .= print_submit_button (__('Search'), 'search', false,
+$table->data[0][4] .= html_print_submit_button (__('Search'), 'search', false,
 	'class="sub search"', true);
 $table->data[0][4] .= '</div>';
 
 echo '<form method="post" action="'.$url.'">';
-print_table ($table);
+html_print_table ($table);
 echo '</form>';
 
 $filter = array ();
@@ -323,25 +323,25 @@ foreach ($components as $component) {
 	
 	$data[6] = '<a style="display: inline; float: left" href="' . $url . '&search_id_group=' . $search_id_group .
 		'search_string=' . $search_string . '&duplicate_network_component=1&source_id=' . $component['id_nc'] . '">' . 
-		print_image('images/copy.png', true, array('alt' => __('Duplicate'), 'title' => __('Duplicate'))) . '</a>';
+		html_print_image('images/copy.png', true, array('alt' => __('Duplicate'), 'title' => __('Duplicate'))) . '</a>';
 	$data[6] .= '<a href="' . $url . '&delete_component=1&id=' . $component['id_nc'] . '&search_id_group=' . $search_id_group .
 		'search_string=' . $search_string . 
 		'" onclick="if (! confirm (\''.__('Are you sure?').'\')) return false" >' . 
-		print_image('images/cross.png', true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>';
+		html_print_image('images/cross.png', true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>';
 	
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<form method="post" action="'.$url.'">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('new_component', 1);
-print_select (array (2 => __('Create a new network component'),
+html_print_input_hidden ('new_component', 1);
+html_print_select (array (2 => __('Create a new network component'),
 	4 => __('Create a new plugin component'),
 	6 => __('Create a new WMI component')),
 	'id_component_type', '', '', '', '', '');
-print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
+html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
 echo '</div>';
 echo '</form>'
 ?>
diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php
index c37275c2ca..6dbc91129e 100644
--- a/pandora_console/godmode/modules/manage_network_components_form.php
+++ b/pandora_console/godmode/modules/manage_network_components_form.php
@@ -111,7 +111,7 @@ if (isset ($id)) {
  * 2 - network component
  * 
  * You can see this values in file godmode/modules/manage_network_components.php
- * in the last lines (in the call function "print_select").
+ * in the last lines (in the call function "html_print_select").
  */
 
 if ($id_component_type == 6) {
@@ -139,20 +139,20 @@ echo '<form name="component" method="post">';
 $table->colspan['description'][1] = 3;
 $data = array ();
 $data[0] = __('Description');
-$data[1] = print_textarea ('description', 2, 65, $description, '', true);
+$data[1] = html_print_textarea ('description', 2, 65, $description, '', true);
 push_table_row ($data, 'description');
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('id_component_type', $id_component_type);
+html_print_input_hidden ('id_component_type', $id_component_type);
 if ($id) {
-	print_input_hidden ('update_component', 1);
-	print_input_hidden ('id', $id);
-	print_submit_button (__('Update'), 'upd', false, 'class="sub upd"');
+	html_print_input_hidden ('update_component', 1);
+	html_print_input_hidden ('id', $id);
+	html_print_submit_button (__('Update'), 'upd', false, 'class="sub upd"');
 } else {
-	print_input_hidden ('create_component', 1);
-	print_submit_button (__('Create'), 'crt', false, 'class="sub wand"');
+	html_print_input_hidden ('create_component', 1);
+	html_print_submit_button (__('Create'), 'crt', false, 'class="sub wand"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php
index 4912eb044d..ad88df151f 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_common.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_common.php
@@ -45,7 +45,7 @@ $table->colspan[0][1] = 3;
 $table->data = array ();
 
 $table->data[0][0] = __('Name');
-$table->data[0][1] = print_input_text ('name', $name, '', 55, 255, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 55, 255, true);
 
 $table->data[1][0] = __('Type') . ' ' . ui_print_help_icon ('module_type', true);
 $sql = sprintf ('SELECT id_tipo, descripcion
@@ -53,44 +53,44 @@ $sql = sprintf ('SELECT id_tipo, descripcion
 	WHERE categoria IN (%s)
 	ORDER BY descripcion',
 	implode (',', $categories));
-$table->data[1][1] = print_select_from_sql ($sql, 'type',
+$table->data[1][1] = html_print_select_from_sql ($sql, 'type',
 	$type, ($id_component_type == 2 ? 'type_change()' : ''), '', '', true,
 	false, false);
 
 $table->data[1][2] = __('Module group');
-$table->data[1][3] = print_select_from_sql ('SELECT id_mg, name FROM tmodule_group ORDER BY name',
+$table->data[1][3] = html_print_select_from_sql ('SELECT id_mg, name FROM tmodule_group ORDER BY name',
 	'id_module_group', $id_module_group, '', '', '', true, false, false);
 
 $table->data[2][0] = __('Group');
-$table->data[2][1] = print_select (get_network_component_groups (),
+$table->data[2][1] = html_print_select (get_network_component_groups (),
 	'id_group', $id_group, '', '', '', true, false, false);
 $table->data[2][2] = __('Interval');
-$table->data[2][3] = print_input_text ('module_interval', $module_interval, '',
+$table->data[2][3] = html_print_input_text ('module_interval', $module_interval, '',
 	5, 15, true);
 
 $table->data[3][0] = __('Warning status');
 $table->data[3][1] = '<em>'.__('Min.').'</em>';
-$table->data[3][1] .= print_input_text ('min_warning', $min_warning,
+$table->data[3][1] .= html_print_input_text ('min_warning', $min_warning,
 	'', 5, 15, true);
 $table->data[3][1] .= '<br /><em>'.__('Max.').'</em>';
-$table->data[3][1] .= print_input_text ('max_warning', $max_warning,
+$table->data[3][1] .= html_print_input_text ('max_warning', $max_warning,
 	'', 5, 15, true);
 $table->data[3][2] = __('Critical status');
 $table->data[3][3] = '<em>'.__('Min.').'</em>';
-$table->data[3][3] .= print_input_text ('min_critical', $min_critical,
+$table->data[3][3] .= html_print_input_text ('min_critical', $min_critical,
 	'', 5, 15, true);
 $table->data[3][3] .= '<br /><em>'.__('Max.').'</em>';
-$table->data[3][3] .= print_input_text ('max_critical', $max_critical,
+$table->data[3][3] .= html_print_input_text ('max_critical', $max_critical,
 	'', 5, 15, true);
 
 $table->data[4][0] = __('FF threshold') . ' ' . ui_print_help_icon ('ff_threshold', true);
-$table->data[4][1] = print_input_text ('ff_event', $ff_event,
+$table->data[4][1] = html_print_input_text ('ff_event', $ff_event,
 	'', 5, 15, true);
 $table->data[4][2] = __('Historical data');
-$table->data[4][3] = print_checkbox ("history_data", 1, $history_data, true);
+$table->data[4][3] = html_print_checkbox ("history_data", 1, $history_data, true);
 
 $table->data[5][0] = __('Min. Value');
-$table->data[5][1] = print_input_text ('min', $min, '', 5, 15, true);
+$table->data[5][1] = html_print_input_text ('min', $min, '', 5, 15, true);
 $table->data[5][2] = __('Max. Value');
-$table->data[5][3] = print_input_text ('max', $max, '', 5, 15, true);
+$table->data[5][3] = html_print_input_text ('max', $max, '', 5, 15, true);
 ?>
diff --git a/pandora_console/godmode/modules/manage_network_components_form_network.php b/pandora_console/godmode/modules/manage_network_components_form_network.php
index 38f5ed0110..7a8e6a899f 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_network.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_network.php
@@ -38,49 +38,49 @@ $snmp_versions['3'] = 'v. 3';
 
 $data = array ();
 $data[0] = __('Port');
-$data[1] = print_input_text ('tcp_port', $tcp_port, '', 5, 20, true);
+$data[1] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, true);
 $data[2] = __('SNMP version');
-$data[3] = print_select ($snmp_versions, 'snmp_version', $snmp_version,
+$data[3] = html_print_select ($snmp_versions, 'snmp_version', $snmp_version,
 		'', '', '', true, false, false, '');
 
 push_table_row ($data, 'snmp_port');
 
 $data = array ();
 $data[0] = __('SNMP OID');
-$data[1] = print_input_text ('snmp_oid', $snmp_oid, '', 30, 400, true);
+$data[1] = html_print_input_text ('snmp_oid', $snmp_oid, '', 30, 400, true);
 //$table->colspan['snmp_2'][1] = 3;
 $data[2] = __('SNMP community');
-$data[3] = print_input_text ('snmp_community', $snmp_community, '', 15, 60, true);
+$data[3] = html_print_input_text ('snmp_community', $snmp_community, '', 15, 60, true);
 
 push_table_row ($data, 'snmp_2');
 
 
 $data = array();
 $data[0] = __('Auth user');
-$data[1] = print_input_text ('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true);
+$data[1] = html_print_input_text ('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true);
 $data[2] = __('Auth password');
 $data[3] = print_input_text ('snmp3_auth_pass', $snmp3_auth_pass, '', 15, 60, true);
-$data[3] .= print_input_hidden('active_snmp_v3', 0, true);
+$data[3] .= html_print_input_hidden('active_snmp_v3', 0, true);
 push_table_row($data, 'field_snmpv3_row1');
 
 $data = array();
 $data[0] = __('Privacy method');
-$data[1] = print_select(array('DES' => __('DES'), 'AES' => __('AES')), 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true);
+$data[1] = html_print_select(array('DES' => __('DES'), 'AES' => __('AES')), 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true);
 $data[2] = __('privacy pass');
-$data[3] = print_input_text ('snmp3_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true);
+$data[3] = html_print_input_text ('snmp3_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true);
 push_table_row($data, 'field_snmpv3_row2');
 
 $data = array();
 $data[0] = __('Auth method');
-$data[1] = print_select(array('MD5' => __('MD5'), 'SHA' => __('SHA')), 'snmp3_auth_method', $snmp3_auth_method, '', '', '', true);
+$data[1] = html_print_select(array('MD5' => __('MD5'), 'SHA' => __('SHA')), 'snmp3_auth_method', $snmp3_auth_method, '', '', '', true);
 $data[2] = __('Security level');
-$data[3] = print_select(array('noAuthNoPriv' => __('Not auth and not privacy method'),
+$data[3] = html_print_select(array('noAuthNoPriv' => __('Not auth and not privacy method'),
 	'authNoPriv' => __('Auth and not privacy method'), 'authPriv' => __('Auth and privacy method')), 'snmp3_security_level', $snmp3_security_level, '', '', '', true);
 push_table_row($data, 'field_snmpv3_row3');
 
 $data = array();
 $data[0] = __('Post process') . ' ' . ui_print_help_icon ('postprocess', true);
-$data[1] = print_input_text ('post_process', $post_process, '', 12, 25, true);
+$data[1] = html_print_input_text ('post_process', $post_process, '', 12, 25, true);
 $data[2] = $data[3] = '';
 push_table_row($data, 'field_process');
 
@@ -89,14 +89,14 @@ push_table_row($data, 'field_process');
 /* Advanced stuff */
 $data = array ();
 $data[0] = __('TCP send') . ' ' . ui_print_help_icon ("tcp_send", true);
-$data[1] = print_textarea ('tcp_send', 2, 65, $tcp_send, '', true);
+$data[1] = html_print_textarea ('tcp_send', 2, 65, $tcp_send, '', true);
 $table->colspan['tcp_send'][1] = 3;
 
 push_table_row ($data, 'tcp_send');
 
 $data = array();
 $data[0] = __('TCP receive');
-$data[1] = print_textarea ('tcp_rcv', 2, 65, $tcp_rcv, '', true);
+$data[1] = html_print_textarea ('tcp_rcv', 2, 65, $tcp_rcv, '', true);
 $table->colspan['tcp_receive'][1] = 3;
 
 push_table_row ($data, 'tcp_receive');
diff --git a/pandora_console/godmode/modules/manage_network_components_form_plugin.php b/pandora_console/godmode/modules/manage_network_components_form_plugin.php
index 71812de187..a8cba43847 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_plugin.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_plugin.php
@@ -22,14 +22,14 @@ echo "<h3>".__('Plugin component').'</h3>';
 
 $data = array ();
 $data[0] = __('Port');
-$data[1] = print_input_text ('tcp_port', $tcp_port, '', 5, 20, true);
+$data[1] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, true);
 $table->colspan['plugin_0'][1] = 3;
 
 push_table_row ($data, 'plugin_0');
 
 $data = array ();
 $data[0] = __('Plugin');
-$data[1] = print_select_from_sql ('SELECT id, name FROM tplugin ORDER BY name',
+$data[1] = html_print_select_from_sql ('SELECT id, name FROM tplugin ORDER BY name',
 	'id_plugin', $id_plugin, '', __('None'), 0, true, false, false);
 $table->colspan['plugin_1'][1] = 3;
 
@@ -37,18 +37,18 @@ push_table_row ($data, 'plugin_1');
 
 $data = array ();
 $data[0] = __('Username');
-$data[1] = print_input_text ('plugin_user', $plugin_user, '', 15, 60, true);
+$data[1] = html_print_input_text ('plugin_user', $plugin_user, '', 15, 60, true);
 $data[2] = _('Password');
-$data[3] = print_input_password ('plugin_pass', $plugin_pass, '', 15, 60, true);
+$data[3] = html_print_input_password ('plugin_pass', $plugin_pass, '', 15, 60, true);
 
 push_table_row ($data, 'plugin_2');
 
 $data = array ();
 $data[0] = __('Plugin parameters');
 $data[0] .= ui_print_help_icon ('plugin_parameters', true);
-$data[1] = print_input_text ('plugin_parameter', $plugin_parameter, '', 30, 255, true);
+$data[1] = html_print_input_text ('plugin_parameter', $plugin_parameter, '', 30, 255, true);
 $data[2] = __('Post process') . ' ' . ui_print_help_icon ('postprocess', true);
-$data[3] = print_input_text ('post_process', $post_process, '', 12, 25, true);
+$data[3] = html_print_input_text ('post_process', $post_process, '', 12, 25, true);
 
 push_table_row ($data, 'plugin_3');
 
diff --git a/pandora_console/godmode/modules/manage_network_components_form_wmi.php b/pandora_console/godmode/modules/manage_network_components_form_wmi.php
index 675742e58d..6b719e4b32 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_wmi.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_wmi.php
@@ -32,31 +32,31 @@ echo "<h3>".__('WMI component management').'</h3>';
 
 $data = array ();
 $data[0] = __('WMI query');
-$data[1] = print_input_text ('snmp_oid', $snmp_oid, '', 25, 255, true);
+$data[1] = html_print_input_text ('snmp_oid', $snmp_oid, '', 25, 255, true);
 $data[2] = __('Key string') . ' ' . ui_print_help_icon ('wmikey', true);
-$data[3] = print_input_text ('snmp_community', $snmp_community, '', 25, 255, true);
+$data[3] = html_print_input_text ('snmp_community', $snmp_community, '', 25, 255, true);
 
 push_table_row ($data, 'wmi_1');
 
 $data = array ();
 $data[0] = __('Field number') . ' ' . ui_print_help_icon ('wmifield', true);
-$data[1] = print_input_text ('tcp_port', $tcp_port, '', 5, 25, true);
+$data[1] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 25, true);
 $data[2] = __('Namespace') . ' ' . ui_print_help_icon ('wminamespace', true);
-$data[3] = print_input_text ('tcp_send', $tcp_send, '', 25, 255, true);
+$data[3] = html_print_input_text ('tcp_send', $tcp_send, '', 25, 255, true);
 
 push_table_row ($data, 'wmi_2');
 
 $data = array ();
 $data[0] = __('Username');
-$data[1] = print_input_text ('plugin_user', $plugin_user, '', 15, 255, true);
+$data[1] = html_print_input_text ('plugin_user', $plugin_user, '', 15, 255, true);
 $data[2] = __('Password');
-$data[3] = print_input_password ('plugin_pass', $plugin_pass, '', 25, 255, true);
+$data[3] = html_print_input_password ('plugin_pass', $plugin_pass, '', 25, 255, true);
 
 push_table_row ($data, 'wmi_3');
 
 $data = array();
 $data[0] = __('Post process') . ' ' . ui_print_help_icon ('postprocess', true);
-$data[1] = print_input_text ('post_process', $post_process, '', 12, 25, true);
+$data[1] = html_print_input_text ('post_process', $post_process, '', 12, 25, true);
 $data[2] = $data[3] = '';
 push_table_row($data, 'field_process');
 
@@ -108,7 +108,7 @@ echo '<tr>';
 // Component group
 echo '<td class="datos">' . __('Group') . '</td>';
 echo '<td class="datos">';
-print_select (get_network_component_groups (),
+html_print_select (get_network_component_groups (),
 	'id_group', $id_group, '', '', '', false, false, false);
 
 // Module group
@@ -206,18 +206,18 @@ echo '</textarea>';
 echo '</td></tr>';
 echo '</table>';
 
-print_input_hidden ('id_modulo', $id_component_type);
+html_print_input_hidden ('id_modulo', $id_component_type);
 
 // Update/Add buttons
 echo '<div class="action-buttons" style="width: 95%">';
 if ($id) {
-	print_input_hidden ('update_component', 1);
-	print_input_hidden ('id', $id);
-	print_submit_button (__('Update'), 'crt', false, 'class="sub upd"');
+	html_print_input_hidden ('update_component', 1);
+	html_print_input_hidden ('id', $id);
+	html_print_submit_button (__('Update'), 'crt', false, 'class="sub upd"');
 }
 else {
-	print_input_hidden ('create_component', 1);
-	print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
+	html_print_input_hidden ('create_component', 1);
+	html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
 }
 echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index 9b281ad473..08551275e4 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -154,23 +154,23 @@ foreach ($result as $row) {
 	$data = array ();
 	$data[0] = '<a href="index.php?sec=gmodules&amp;sec2=godmode/modules/manage_network_templates_form&amp;id_np='.$row["id_np"].'">'. safe_output($row["name"]).'</a>';
 	$data[1] = ui_print_truncate_text(safe_output($row["description"]), 70, true, true, true, true);
-	$data[2] = print_input_image ("delete_profile", "images/cross.png",
+	$data[2] = html_print_input_image ("delete_profile", "images/cross.png",
 		$row["id_np"],'', true,
 		array ('onclick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;'));
-	$data[2] .= print_input_image ("export_profile", "images/lightning_go.png",
+	$data[2] .= html_print_input_image ("export_profile", "images/lightning_go.png",
 		$row["id_np"], '', true);
 	$data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates' .
 		'&delete_profile=1&delete_profile=' . $row['id_np'] . '" ' .
-		'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">' . print_image("images/cross.png", true) . '</a>';
+		'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true) . '</a>';
 	$data[2] .= '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates' .
-		'&export_profile=' . $row['id_np'] . '">' . print_image("images/lightning_go.png", true) . '</a>';
+		'&export_profile=' . $row['id_np'] . '">' . html_print_image("images/lightning_go.png", true) . '</a>';
 	
 	array_push ($table->data, $data);
 }
 
 if (!empty ($table->data)) {
 	echo '<form method="post" action="index.php?sec=gmodules&amp;sec2=godmode/modules/manage_network_templates">';
-	print_table ($table);
+	html_print_table ($table);
 	echo '</form>';
 } else {
 	echo '<div class="nf" style="width:'.$table->width.'">'.__('There are no defined network profiles').'</div>';	
@@ -178,7 +178,7 @@ if (!empty ($table->data)) {
 
 echo '<form method="post" action="index.php?sec=gmodules&amp;sec2=godmode/modules/manage_network_templates_form">';
 echo '<div style="width: '.$table->width.'" class="action-buttons">';
-print_submit_button (__('Create'), "crt", '', 'class="sub next"'); 
+html_print_submit_button (__('Create'), "crt", '', 'class="sub next"'); 
 echo '</div></form>';
 
 ?>
diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php
index 552171e5c1..22baa332b2 100644
--- a/pandora_console/godmode/modules/manage_network_templates_form.php
+++ b/pandora_console/godmode/modules/manage_network_templates_form.php
@@ -123,19 +123,19 @@ else {
 echo '<table width="550" cellpadding="4" cellspacing="4" class="databox_color">';
 
 echo '<tr><td class="datos">'.__('Name').'</td><td class="datos">';
-print_input_text ("name", $name, '', 63);
+html_print_input_text ("name", $name, '', 63);
 echo '</td></tr>';
 
 echo '<tr><td class="datos2">'.__('Description').'</td>';
 echo '<td class="datos2">';
-print_textarea ("description", 2, 60, $description);
+html_print_textarea ("description", 2, 60, $description);
 echo "</td></tr>";
 echo '<tr><td></td><td style="text-align:right;">';
 if ($id_np > 0) {
-	print_submit_button (__("Update"), "updbutton", false, 'class="sub upd"');
+	html_print_submit_button (__("Update"), "updbutton", false, 'class="sub upd"');
 }
 else {
-	print_submit_button (__("Create"), "crtbutton", false, 'class="sub wand"');
+	html_print_submit_button (__("Create"), "crtbutton", false, 'class="sub wand"');
 }
 echo "</td></tr></table></form>";
 
@@ -180,24 +180,24 @@ if ($id_np > 0) {
 	$table->head[2] = __('Description');
 	$table->head[3] = __('Group');
 	$table->align[3] = "center";
-	$table->head[4] = print_checkbox_extended ('allbox', '', false, false, 'CheckAll();', '', true);
+	$table->head[4] = html_print_checkbox_extended ('allbox', '', false, false, 'CheckAll();', '', true);
 	$table->align[4] = "center";
 	
 	foreach ($result as $row) {
 		$data = array ();
 		$data[0] = $row["name"];
-		$data[1] = print_image("images/".show_icon_type($row["type"]), true, array("border" => '0'));
+		$data[1] = html_print_image("images/".show_icon_type($row["type"]), true, array("border" => '0'));
 		$data[2] = mb_strimwidth($row["description"],0,30,"...");
 		$data[3] = get_network_component_group_name ($row["group"]);
-		$data[4] = print_checkbox ("components[]", $row["component_id"], false, true);
+		$data[4] = html_print_checkbox ("components[]", $row["component_id"], false, true);
 		array_push ($table->data, $data);
 	}
 
 	if (!empty ($table->data)) {
 		echo '<form name="component_delete" method="post" action="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np='.$id_np.'&delete_module=1">';
-		print_table ($table);
+		html_print_table ($table);
 		echo '<div style="width:540px; text-align:right">';
-		print_submit_button (__('Delete'), "delbutton", false, 'class="sub delete" onClick="if (!confirm(\'Are you sure?\')) return false;"');
+		html_print_submit_button (__('Delete'), "delbutton", false, 'class="sub delete" onClick="if (!confirm(\'Are you sure?\')) return false;"');
 		echo '</div></form>';
 	}
 	unset ($table);
@@ -226,9 +226,9 @@ if ($id_np > 0) {
 		$groups_compound[$row["id_sg"]] .= $row["name"];
 	}
 	
-	print_select ($groups_compound, "ncgroup", $ncgroup, 'javascript:this.form.submit();', __('Group')." - ".__('All'), -1, false, false, true, '" style="width:350px');
+	html_print_select ($groups_compound, "ncgroup", $ncgroup, 'javascript:this.form.submit();', __('Group')." - ".__('All'), -1, false, false, true, '" style="width:350px');
 	echo '<noscript>';
-	print_submit_button (__('Filter'), 'ncgbutton', false, 'class="sub search"');
+	html_print_submit_button (__('Filter'), 'ncgbutton', false, 'class="sub search"');
 	echo '</noscript></div></form>';
 	
 	echo '<form name="add_module" method="post" action="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np='.$id_np.'&add_module=1">';
@@ -249,9 +249,9 @@ if ($id_np > 0) {
 		$components[$row["id_nc"]] = $row["name"];
 	}
 
-	print_select ($components, "components[]", $id_nc, '', '', -1, false, true, false, '" style="width:350px');
+	html_print_select ($components, "components[]", $id_nc, '', '', -1, false, true, false, '" style="width:350px');
 	echo "&nbsp;&nbsp;";
-	print_submit_button (__('Add'), 'crtbutton', false, 'class="sub wand"');
+	html_print_submit_button (__('Add'), 'crtbutton', false, 'class="sub wand"');
 	echo "</div></form>";
 }
 
diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php
index b059393e1c..fccaf0358c 100644
--- a/pandora_console/godmode/modules/module_list.php
+++ b/pandora_console/godmode/modules/module_list.php
@@ -77,7 +77,7 @@ foreach ($rows as $row) {
 	echo "
 	<tr>
 		<td class='$tdcolor' align='center'>" .
-		print_image("images/".$row["icon"], true, array("border" => '0')) .
+		html_print_image("images/".$row["icon"], true, array("border" => '0')) .
 		"</td>
 		<td class='$tdcolor'>
 		<b>".$row["id_tipo"]."
diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php
index 1c33c6bed8..02fb8d9f53 100644
--- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php
+++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php
@@ -99,14 +99,14 @@ if(count($module_array) > 0){
 		echo "<td class='$tdcolor' align='center'>";
 		echo "<table><tr>";
 		$new_weight = $weight_array[$a]-0.125;
-		echo "<td align='center'><a href='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&edit_graph=1&tab=graph_editor&change_weight=1&weight=".$new_weight."&id=". $id ."&graph=" . $idgs_array[$a] . "'>".print_image('images/down.png', true, array ('title' => __('Decrease Weight')))."</a></td>";
+		echo "<td align='center'><a href='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&edit_graph=1&tab=graph_editor&change_weight=1&weight=".$new_weight."&id=". $id ."&graph=" . $idgs_array[$a] . "'>".html_print_image('images/down.png', true, array ('title' => __('Decrease Weight')))."</a></td>";
 		echo "<td align='center'>$weight_array[$a]</td>";
 		$new_weight = $weight_array[$a]+0.125;
-		echo "<td align='center'><a href='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&edit_graph=1&tab=graph_editor&change_weight=1&weight=".$new_weight."&id=". $id ."&graph=" . $idgs_array[$a] . "'>".print_image('images/up.png', true, array ('title' => __('Increase Weight')))."</a></td>";
+		echo "<td align='center'><a href='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&edit_graph=1&tab=graph_editor&change_weight=1&weight=".$new_weight."&id=". $id ."&graph=" . $idgs_array[$a] . "'>".html_print_image('images/up.png', true, array ('title' => __('Increase Weight')))."</a></td>";
 		echo "</tr></table>";
 		echo "</td>";
 		echo "<td class='$tdcolor' align='center'>";
-		echo "<a href='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&edit_graph=1&tab=graph_editor&delete_module=1&id=". $id ."&delete=" . $idgs_array[$a] . "'>".print_image('images/cross.png', true, array ('title' => __('Delete')))."</a>";
+		echo "<a href='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&edit_graph=1&tab=graph_editor&delete_module=1&id=". $id ."&delete=" . $idgs_array[$a] . "'>".html_print_image('images/cross.png', true, array ('title' => __('Delete')))."</a>";
 
 		echo "</td></tr>";
 	}
@@ -122,15 +122,15 @@ echo "<table width='500' cellpadding='4' cellpadding='4' class='databox_color'>"
 echo "<tr>";
 echo "<td colspan='3'>".__('Filter group')."</td>";
 echo "</tr><tr>";
-echo "<td colspan='3'>".print_select(get_all_groups(), 'group', '', "filterByGroup($('#group').val());", __('All'), '0', true)."</td>";
+echo "<td colspan='3'>".html_print_select(groups_get_all(), 'group', '', "filterByGroup($('#group').val());", __('All'), '0', true)."</td>";
 echo "</tr><tr>";
 echo "<td style='vertical-align: top;'>".__('Agents')."</td>";
 echo "<td></td>";
 echo "<td style='vertical-align: top;'>".__('Modules')."</td>";
 echo "</tr><tr>";
-echo "<td>".print_select (get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;')."</td>";
-echo "<td style='vertical-align: center; text-align: center;'>" . print_image("images/darrowright.png", true) . "</td>";
-echo "<td>".print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:200px;')."</td>";
+echo "<td>".html_print_select (get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;')."</td>";
+echo "<td style='vertical-align: center; text-align: center;'>" . html_print_image("images/darrowright.png", true) . "</td>";
+echo "<td>".html_print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:200px;')."</td>";
 echo "</tr><tr>";
 echo "<td colspan='3'>";
 echo "<table cellpadding='4'><tr>";
diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php
index d748444973..21eaab45b1 100644
--- a/pandora_console/godmode/reporting/graph_builder.main.php
+++ b/pandora_console/godmode/reporting/graph_builder.main.php
@@ -105,7 +105,7 @@ else
 	$return_all_groups = false;
 	
 echo "<td><b>".__('Group')."</b></td><td>" .
-	print_select_groups($config['id_user'], "AR", $return_all_groups, 'graph_id_group', $id_group, '', '', '', true) .
+	html_print_select_groups($config['id_user'], "AR", $return_all_groups, 'graph_id_group', $id_group, '', '', '', true) .
 	"</td></tr>";
 echo "<tr>";
 echo "<td class='datos2'><b>".__('Description')."</b></td>";
@@ -137,7 +137,7 @@ echo "<tr>";
 echo "<td class='datos'>";
 echo "<b>".__('Period')."</b></td>";
 echo "<td class='datos'>";
-print_select ($periods, 'period', $period);
+html_print_select ($periods, 'period', $period);
 echo "</td><td class='datos2'>";
 echo "<b>".__('Stacked')."</b></td>";
 echo "<td class='datos2'>";
@@ -149,21 +149,21 @@ $stackeds = array(
 	GRAPH_STACKED_AREA => __('Stacked area'),
 	GRAPH_LINE => __('Line'),
 	GRAPH_STACKED_LINE => __('Stacked line'));
-print_select ($stackeds, 'stacked', $stacked);
+html_print_select ($stackeds, 'stacked', $stacked);
 echo "</td>";
 
 echo "<tr>";
 echo "<td class='datos'>";
 echo "<b>".__('View events')."</b></td>";
 echo "<td class='datos'>";
-print_checkbox('events', 1, $events);
+html_print_checkbox('events', 1, $events);
 echo "</td>";
 
 echo "<td></td><td></td>";
 /*echo "<td class='datos'>";
 echo "<b>".__('View alerts')."</b></td>";
 echo "<td class='datos'>";
-print_checkbox('alerts', 1, $alerts);
+html_print_checkbox('alerts', 1, $alerts);
 echo "</td>";*/
 
 echo "</tr>";
diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php
index 5284ca400c..be32641653 100644
--- a/pandora_console/godmode/reporting/graph_builder.php
+++ b/pandora_console/godmode/reporting/graph_builder.php
@@ -152,13 +152,13 @@ if($edit_graph) {
 	$buttons = array(
 		'main' => array('active' => false,
 			'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/graph_builder&tab=main&edit_graph=1&id=' . $id_graph . '">' . 
-				print_image("images/setup.png", true, array ("title" => __('Setup'))) .'</a>'),
+				html_print_image("images/setup.png", true, array ("title" => __('Setup'))) .'</a>'),
 		'graph_editor' => array('active' => false,
 			'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=' . $id_graph . '">' . 
-				print_image("images/config.png", true, array ("title" => __('Graph editor'))) .'</a>'),
+				html_print_image("images/config.png", true, array ("title" => __('Graph editor'))) .'</a>'),
 		'preview' => array('active' => false,
 			'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/graph_builder&tab=preview&edit_graph=1&id=' . $id_graph . '">' . 
-				print_image("images/chart_curve.png", true, array ("title" => __('Preview'))) .'</a>')
+				html_print_image("images/chart_curve.png", true, array ("title" => __('Preview'))) .'</a>')
 		);
 		
 	$buttons[$active_tab]['active'] = true;
diff --git a/pandora_console/godmode/reporting/graph_builder.preview.php b/pandora_console/godmode/reporting/graph_builder.preview.php
index 606c20821a..a7713e90a8 100644
--- a/pandora_console/godmode/reporting/graph_builder.preview.php
+++ b/pandora_console/godmode/reporting/graph_builder.preview.php
@@ -155,17 +155,17 @@ echo "<td>";
 echo "<b>".__('Date')."</b>"." ";
 echo "</td>";
 echo "<td>";
-echo print_input_text ('date', $date, '', 12, 10, true). ' ';
+echo html_print_input_text ('date', $date, '', 12, 10, true). ' ';
 echo "</td>";
 echo "<td>";
-echo print_input_text ('time', $time, '', 7, 7, true). ' ';
+echo html_print_input_text ('time', $time, '', 7, 7, true). ' ';
 echo "</td>";
 echo "<td class='datos'>";
 echo "<b>".__('Period')."</b>";
 echo "</td>";
 echo "<td class='datos'>";
 
-print_select (custom_graphs_get_periods (), 'period', intval ($period / 3600),
+html_print_select (custom_graphs_get_periods (), 'period', intval ($period / 3600),
 	'', '', 0, false, false, false);
 
 echo "</td>";
@@ -176,7 +176,7 @@ $stackeds[0] = __('Area');
 $stackeds[1] = __('Stacked area');
 $stackeds[2] = __('Line');
 $stackeds[3] = __('Stacked line');
-print_select ($stackeds, 'stacked', $stacked , '', '', -1, false, false);
+html_print_select ($stackeds, 'stacked', $stacked , '', '', -1, false, false);
 
 echo "</td>";
 echo "<td class='datos'>";
@@ -185,7 +185,7 @@ $zooms[0] = __('Graph defined');
 $zooms[1] = __('Zoom x1');
 $zooms[2] = __('Zoom x2');
 $zooms[3] = __('Zoom x3');
-print_select ($zooms, 'zoom', $zoom , '', '', 0);
+html_print_select ($zooms, 'zoom', $zoom , '', '', 0);
 
 echo "</td>";
 echo "<td class='datos'>";
diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index 1cdc49fb96..762cdf2c9d 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -95,7 +95,7 @@ if (! empty ($graphs)) {
 		$data = array ();
 		
 		$data[0] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.
-			$graph['id_graph'].'">' . print_image('images/eye.png', true) . "</a>" . '</a>';
+			$graph['id_graph'].'">' . html_print_image('images/eye.png', true) . "</a>" . '</a>';
 		$data[1] = '<a href="index.php?sec=greporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.
 			$graph['id_graph'].'">'.$graph['name'].'</a>';
 		$data[2] = $graph["description"];
@@ -106,12 +106,12 @@ if (! empty ($graphs)) {
 		if (check_acl ($config['id_user'], 0, "AW")) {
 			$data[5] = '<a href="index.php?sec=greporting&sec2=godmode/reporting/graphs&delete_graph=1&id='
 				.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
-					return false;">' . print_image("images/cross.png", true) . '</a>';
+					return false;">' . html_print_image("images/cross.png", true) . '</a>';
 		}
 		
 		array_push ($table->data, $data);
 	}
-	print_table ($table);
+	html_print_table ($table);
 }
 else {
 	echo "<div class='nf'>".__('There are no defined reportings')."</div>";
@@ -119,7 +119,7 @@ else {
 
 echo '<form method="post" action="index.php?sec=greporting&sec2=godmode/reporting/graph_builder">';
 echo '<div class="action-buttons" style="width: 720px;">';
-print_submit_button (__('Create graph'), 'create', false, 'class="sub next"');
+html_print_submit_button (__('Create graph'), 'create', false, 'class="sub next"');
 echo "</div>";
 echo "</form>";
 ?>
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index eeb16b1d78..e1145361d4 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -133,12 +133,12 @@ if (!$maps) {
 			$data[1] = ui_print_group_icon ($map['id_group'], true);
 			$data[2] = db_get_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']);
 		
-			$data[3] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.print_image ("images/copy.png", true).'</a>';
-			$data[4] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1">'.print_image ("images/cross.png", true).'</a>';
+			$data[3] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.html_print_image ("images/copy.png", true).'</a>';
+			$data[4] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1">'.html_print_image ("images/cross.png", true).'</a>';
 			array_push ($table->data, $data);
 		}
 	}
-	print_table ($table);
+	html_print_table ($table);
 }
 if (!$maps) {
 	echo '<div class="action-buttons" style="width: 0px;">';
@@ -147,8 +147,8 @@ else {
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
 }
 echo '<form action="index.php?sec=gmap&amp;sec2=godmode/reporting/visual_console_builder" method="post">';
-print_input_hidden ('edit_layout', 1);
-print_submit_button (__('Create'), '', false, 'class="sub next"');
+html_print_input_hidden ('edit_layout', 1);
+html_print_submit_button (__('Create'), '', false, 'class="sub next"');
 echo '</form>';
 echo '</div>';
 ?>
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 11f13b7cc8..6ea56f8e15 100644
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -282,7 +282,7 @@ $intervals[2592000] = human_time_description_raw (2592000);
 $urlForm = 'index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=' . $actionParameter . '&id_report=' . $idReport;
 
 echo '<form action="' . $urlForm . '" method="post">';
-print_input_hidden('id_item', $idItem);
+html_print_input_hidden('id_item', $idItem);
 ?>
 <table style="" class="databox" id="" border="0" cellpadding="4" cellspacing="4" width="95%">
 	<tbody>
@@ -291,7 +291,7 @@ print_input_hidden('id_item', $idItem);
 			<td style="">
 				<?php
 				if ($action == 'new') { 
-					print_select(get_report_types(), 'type', $type, 'chooseType();', '', '');
+					html_print_select(get_report_types(), 'type', $type, 'chooseType();', '', '');
 				}
 				else {
 					echo get_report_name($type);
@@ -302,36 +302,36 @@ print_input_hidden('id_item', $idItem);
 		</tr>
 		<tr id="row_description" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Description'); ?></td>
-			<td style=""><?php echo print_textarea('description', 3, 25, $description); ?></td>
+			<td style=""><?php echo html_print_textarea('description', 3, 25, $description); ?></td>
 		</tr>
 		<tr id="row_period" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Period'); ?></td>
-			<td style=""><?php print_extended_select_for_time ($intervals, 'period', $period, '', '', '0', 10); echo __(" seconds."); ?></td>
+			<td style=""><?php html_print_extended_select_for_time ($intervals, 'period', $period, '', '', '0', 10); echo __(" seconds."); ?></td>
 		</tr>
 		<tr id="row_only_display_wrong" style="" class="datos">
 			<td><?php echo __('Only display wrong SLAs');?></td>
-			<td><?php print_checkbox('checkbox_only_display_wrong', 1, $only_display_wrong);?></td>
+			<td><?php html_print_checkbox('checkbox_only_display_wrong', 1, $only_display_wrong);?></td>
 		</tr>
 		<tr id="row_working_time">
 			<td style="vertical-align: top;"><?php echo __('Working time');?></td>
 			<td>
 				<table border="0">
 					<tr>
-						<td><?php echo __('Monday'); print_checkbox('monday', 1, $monday);?></td>
-						<td><?php echo __('Tuesday'); print_checkbox('tuesday', 1, $tuesday);?></td>
-						<td><?php echo __('Wednesday'); print_checkbox('wednesday', 1, $wednesday);?></td>
-						<td><?php echo __('Thursday'); print_checkbox('thursday', 1, $thursday);?></td>
-						<td><?php echo __('Friday'); print_checkbox('friday', 1, $friday);?></td>
-						<td><?php echo __('Saturday'); print_checkbox('saturday', 1, $saturday);?></td>
-						<td><?php echo __('Sunday'); print_checkbox('sunday', 1, $sunday);?></td>
+						<td><?php echo __('Monday'); html_print_checkbox('monday', 1, $monday);?></td>
+						<td><?php echo __('Tuesday'); html_print_checkbox('tuesday', 1, $tuesday);?></td>
+						<td><?php echo __('Wednesday'); html_print_checkbox('wednesday', 1, $wednesday);?></td>
+						<td><?php echo __('Thursday'); html_print_checkbox('thursday', 1, $thursday);?></td>
+						<td><?php echo __('Friday'); html_print_checkbox('friday', 1, $friday);?></td>
+						<td><?php echo __('Saturday'); html_print_checkbox('saturday', 1, $saturday);?></td>
+						<td><?php echo __('Sunday'); html_print_checkbox('sunday', 1, $sunday);?></td>
 					</tr>
 					<tr>
 						<td><?php echo __('Time from');?></td>
-						<td colspan="6"><?php print_input_text ('time_from', $time_from, '', 7, 7);?></td>
+						<td colspan="6"><?php html_print_input_text ('time_from', $time_from, '', 7, 7);?></td>
 					</tr>
 					<tr>
 						<td><?php echo __('Time to');?></td>
-						<td colspan="6"><?php print_input_text ('time_to', $time_to, '', 7, 7);?></td>
+						<td colspan="6"><?php html_print_input_text ('time_to', $time_to, '', 7, 7);?></td>
 					</tr>
 				</table>
 			</td>
@@ -339,13 +339,13 @@ print_input_hidden('id_item', $idItem);
 		<tr id="row_group" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Group');?></td>
 			<td style="">
-				<?php print_select_groups($config['id_user'], "AR", true, 'combo_group', $group, 'extract_group_agents()');?>
+				<?php html_print_select_groups($config['id_user'], "AR", true, 'combo_group', $group, 'extract_group_agents()');?>
 			</td>
 		</tr>
 		<tr id="row_module_group" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Module group');?></td>
 			<td style="">
-				<?php print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
+				<?php html_print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
 				'combo_modulegroup', $modulegroup, '',__('All'));?>
 			</td>
 		</tr>
@@ -353,8 +353,8 @@ print_input_hidden('id_item', $idItem);
 			<td style="vertical-align: top;"><?php echo __('Agent'); ?></td>
 			<td style="">
 				<?php
-				print_input_hidden('id_agent', $idAgent) .
-					print_input_text_extended ('agent', get_agent_name ($idAgent), 'text-agent', '', 30, 100, false, '',
+				html_print_input_hidden('id_agent', $idAgent) .
+					html_print_input_text_extended ('agent', get_agent_name ($idAgent), 'text-agent', '', 30, 100, false, '',
 						array('style' => 'background: url(images/lightning.png) no-repeat right;'))
 						. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 				?>
@@ -366,7 +366,7 @@ print_input_hidden('id_item', $idItem);
 				<?php
 				if($idAgent) {
 					$sql = "SELECT id_agente_modulo, nombre FROM tagente_modulo WHERE id_agente =  " . $idAgent;
-					print_select_from_sql($sql, 'id_agent_module', $idAgentModule, '', '', '0');
+					html_print_select_from_sql($sql, 'id_agent_module', $idAgentModule, '', '', '0');
 				}
 				else {	
 					?>
@@ -391,25 +391,25 @@ print_input_hidden('id_item', $idItem);
 						$query_sql = 'SELECT id_graph, name FROM tgraph WHERE private = 0 OR (private = 1 AND id_user = \''.$config["id_user"].'\')';
 						break;
 				}
-				print_select_from_sql($query_sql, 'id_custom_graph', $idCustomGraph, '', '--', 0);
+				html_print_select_from_sql($query_sql, 'id_custom_graph', $idCustomGraph, '', '--', 0);
 				?>
 			</td>
 		</tr>
 		<tr id="row_text" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Text'); ?></td>
-			<td style=""><?php print_textarea('text', 5, 25, $text); ?></td>
+			<td style=""><?php html_print_textarea('text', 5, 25, $text); ?></td>
 		</tr>
 		<tr id="row_query" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Query SQL'); ?></td>
-			<td style=""><?php print_textarea('sql', 5, 25, $sql); ?></td>
+			<td style=""><?php html_print_textarea('sql', 5, 25, $sql); ?></td>
 		</tr>
 		<tr id="row_header" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Serialized header') . '<a href="#" class="tip">&nbsp;<span>' . __("The separator character is | .") . '</span></a>';?></td>
-			<td style=""><?php print_input_text('header', $header, '', 40, 90); ?></td>
+			<td style=""><?php html_print_input_text('header', $header, '', 40, 90); ?></td>
 		</tr>
 		<tr id="row_custom" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Custom SQL template'); ?></td>
-			<td style=""><?php print_select_from_sql('SELECT id, name FROM treport_custom_sql', 'id_custom', $idCustom, 'chooseSQLquery()', '--', '0'); ?></td>
+			<td style=""><?php html_print_select_from_sql('SELECT id, name FROM treport_custom_sql', 'id_custom', $idCustom, 'chooseSQLquery()', '--', '0'); ?></td>
 		</tr>
 		<tr id="row_custom_example">
 			<td style="vertical-align: top;"><?php echo __('SQL preview'); ?></td>
@@ -417,82 +417,82 @@ print_input_hidden('id_item', $idItem);
 		</tr>
 		<tr id="row_url" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('URL'); ?></td>
-			<td style=""><?php print_input_text('url', $url, '', 40, 90); ?></td>
+			<td style=""><?php html_print_input_text('url', $url, '', 40, 90); ?></td>
 		</tr>
 		<tr id="row_field_separator" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Field separator'); ?></td>
-			<td style=""><?php print_input_text('field', $field, '', 2, 4); ?></td>
+			<td style=""><?php html_print_input_text('field', $field, '', 2, 4); ?></td>
 		</tr>
 		<tr id="row_line_separator" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Line separator'); ?></td>
-			<td style=""><?php print_input_text('line', $line, '', 2, 4); ?></td>
+			<td style=""><?php html_print_input_text('line', $line, '', 2, 4); ?></td>
 		</tr>
 		<tr id="row_group_by_agent" style="" class="datos">
 			<td><?php echo __('Group by agent');?></td>
-			<td><?php print_checkbox('checkbox_row_group_by_agent', 1, $group_by_agent);?></td>
+			<td><?php html_print_checkbox('checkbox_row_group_by_agent', 1, $group_by_agent);?></td>
 		</tr>
 		<tr id="row_order_uptodown" style="" class="datos">
 			<td><?php echo __('Order');?></td>
 			<td><?php
 				echo __('Ascending');
-				print_radio_button ('radiobutton_order_uptodown', 2, '', $order_uptodown);
+				html_print_radio_button ('radiobutton_order_uptodown', 2, '', $order_uptodown);
 				echo __('Descending');
-				print_radio_button ('radiobutton_order_uptodown', 1, '', $order_uptodown);
+				html_print_radio_button ('radiobutton_order_uptodown', 1, '', $order_uptodown);
 				echo __('By agent name');
-				print_radio_button ('radiobutton_order_uptodown', 3, '', $order_uptodown);
+				html_print_radio_button ('radiobutton_order_uptodown', 3, '', $order_uptodown);
 				?></td>
 		</tr>
 		<tr id="row_quantity" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Quantity (n)'); ?></td>
-			<td style=""><?php print_input_text('quantity', $top_n_value, '', 5, 5); ?></td>
+			<td style=""><?php html_print_input_text('quantity', $top_n_value, '', 5, 5); ?></td>
 		</tr>
 		<tr id="row_max_min_avg" style="" class="datos">
 			<td><?php echo __('Display');?></td>
 			<td><?php
 				echo __('Max');
-				print_radio_button ('radiobutton_max_min_avg', 1, '', $top_n);
+				html_print_radio_button ('radiobutton_max_min_avg', 1, '', $top_n);
 				echo __('Min');
-				print_radio_button ('radiobutton_max_min_avg', 2, '', $top_n);
+				html_print_radio_button ('radiobutton_max_min_avg', 2, '', $top_n);
 				echo __('Avg');
-				print_radio_button ('radiobutton_max_min_avg', 3, '', $top_n);
+				html_print_radio_button ('radiobutton_max_min_avg', 3, '', $top_n);
 				?></td>
 		</tr>
 		<tr id="row_exception_condition_value" style="" class="datos">
 			<td style="vertical-align: top;"><?php echo __('Value'); ?></td>
-			<td style=""><?php print_input_text('exception_condition_value', $exception_condition_value, '', 5, 5); ?></td>
+			<td style=""><?php html_print_input_text('exception_condition_value', $exception_condition_value, '', 5, 5); ?></td>
 		</tr>
 		<tr id="row_exception_condition" style="" class="datos">
 			<td><?php echo __('Condition');?></td>
 			<td><?php
 				echo __('Everything');
-				print_radio_button ('radiobutton_exception_condition', 0, '', $exception_condition);
+				html_print_radio_button ('radiobutton_exception_condition', 0, '', $exception_condition);
 				echo __('>=');
-				print_radio_button ('radiobutton_exception_condition', 1, '', $exception_condition);
+				html_print_radio_button ('radiobutton_exception_condition', 1, '', $exception_condition);
 				echo __('<');
-				print_radio_button ('radiobutton_exception_condition', 2, '', $exception_condition);
+				html_print_radio_button ('radiobutton_exception_condition', 2, '', $exception_condition);
 				echo __('OK');
-				print_radio_button ('radiobutton_exception_condition', 3, '', $exception_condition);
+				html_print_radio_button ('radiobutton_exception_condition', 3, '', $exception_condition);
 				echo __('Not OK');
-				print_radio_button ('radiobutton_exception_condition', 4, '', $exception_condition);
+				html_print_radio_button ('radiobutton_exception_condition', 4, '', $exception_condition);
 				?></td>
 		</tr>
 		<tr id="row_show_graph" style="" class="datos">
 			<td><?php echo __('Show graph');?></td>
-			<td><?php print_select ($show_graph_options, 'combo_graph_options', $show_graph);?></td>
+			<td><?php html_print_select ($show_graph_options, 'combo_graph_options', $show_graph);?></td>
 			
 		</tr>
 		<tr id="row_show_resume" style="" class="datos">
 			<td><?php echo __('Show resume');?></td>
-			<td><?php print_checkbox('checkbox_show_resume', 1, $show_resume);?></td>
+			<td><?php html_print_checkbox('checkbox_show_resume', 1, $show_resume);?></td>
 		</tr>
 		<tr id="row_show_in_two_columns" style="" class="datos">
 			<td><?php echo __('Show in two columns');?></td>
-			<td><?php print_checkbox('show_in_two_columns', 1, $show_in_two_columns, false,
+			<td><?php html_print_checkbox('show_in_two_columns', 1, $show_in_two_columns, false,
 				false, 'if ($(\'input[name=show_in_two_columns]\').is(\':checked\')) $(\'input[name=show_in_landscape]\').attr(\'checked\', false);');?></td>
 		</tr>
 		<tr id="row_show_in_landscape" style="" class="datos">
 			<td><?php echo __('Show in landscape');?></td>
-			<td><?php print_checkbox('show_in_landscape', 1, $show_in_landscape, false, false,
+			<td><?php html_print_checkbox('show_in_landscape', 1, $show_in_landscape, false, false,
 				'if ($(\'input[name=show_in_landscape]\').is(\':checked\')) $(\'input[name=show_in_two_columns]\').attr(\'checked\', false);');?></td>
 		</tr>
 	</tbody>
@@ -502,10 +502,10 @@ print_SLA_list('95%', $action, $idItem);
 print_General_list('95%', $action, $idItem);
 echo '<div class="action-buttons" style="width: 95%">';
 if ($action == 'new') {
-	print_submit_button(__('Create item'), 'create_item', false, 'class="sub wand"');
+	html_print_submit_button(__('Create item'), 'create_item', false, 'class="sub wand"');
 }
 else {
-	print_submit_button(__('Edit item'), 'edit_item', false, 'class="sub upd"');
+	html_print_submit_button(__('Edit item'), 'edit_item', false, 'class="sub upd"');
 }
 echo '</div>';
 echo '</form>';
@@ -559,7 +559,7 @@ function print_SLA_list($width, $action, $idItem = null) {
 								<td>' . $item['sla_max'] . '</td>
 								<td>' . $item['sla_limit'] . '</td>
 								<td style="text-align: center;">
-									<a href="javascript: deleteSLARow(' . $item['id'] . ');">' . print_image("images/cross.png", true) . '</a>
+									<a href="javascript: deleteSLARow(' . $item['id'] . ');">' . html_print_image("images/cross.png", true) . '</a>
 								</td>
 							</tr>';
 					}
@@ -572,7 +572,7 @@ function print_SLA_list($width, $action, $idItem = null) {
 							<td class="sla_min"></td>
 							<td class="sla_max"></td>
 							<td class="sla_limit"></td>
-							<td style="text-align: center;"><a class="delete_button" href="javascript: deleteSLARow(0);"><?php print_image("images/cross.png", false); ?></a></td>
+							<td style="text-align: center;"><a class="delete_button" href="javascript: deleteSLARow(0);"><?php html_print_image("images/cross.png", false); ?></a></td>
 						</tr>
 					</tbody>
 					<tbody>
@@ -584,7 +584,7 @@ function print_SLA_list($width, $action, $idItem = null) {
 							<td><input name="sla_min" id="text-sla_min" size="10" maxlength="10" type="text"></td>
 							<td><input name="sla_max" id="text-sla_max" size="10" maxlength="10" type="text"></td>
 							<td><input name="sla_limit" id="text-sla_limit" size="10" maxlength="10" type="text"></td>
-							<td style="text-align: center;"><a href="javascript: addSLARow();"><?php print_image("images/disk.png", false); ?></a></td>
+							<td style="text-align: center;"><a href="javascript: addSLARow();"><?php html_print_image("images/disk.png", false); ?></a></td>
 						</tr>
 					</tbody>
 					<?php
@@ -634,7 +634,7 @@ function print_General_list($width, $action, $idItem = null) {
 								<td>' . printSmallFont($nameAgent) . '</td>
 								<td>' . printSmallFont($nameModule) . '</td>
 								<td style="text-align: center;">
-									<a href="javascript: deleteGeneralRow(' . $item['id'] . ');">' . print_image("images/cross.png", true) . '</a>
+									<a href="javascript: deleteGeneralRow(' . $item['id'] . ');">' . html_print_image("images/cross.png", true) . '</a>
 								</td>
 							</tr>';
 					}
@@ -644,7 +644,7 @@ function print_General_list($width, $action, $idItem = null) {
 						<tr id="row" style="display: none;" class="datos">
 							<td class="agent_name"></td>
 							<td class="module_name"></td>
-							<td style="text-align: center;"><a class="delete_button" href="javascript: deleteGeneralRow(0);"><?php print_image("images/cross.png", false); ?></a></td>
+							<td style="text-align: center;"><a class="delete_button" href="javascript: deleteGeneralRow(0);"><?php html_print_image("images/cross.png", false); ?></a></td>
 						</tr>
 					</tbody>
 					<tbody>
@@ -653,7 +653,7 @@ function print_General_list($width, $action, $idItem = null) {
 								<input id="hidden-id_agent_general" name="id_agent_general" value="" type="hidden">
 								<input style="background: transparent url(images/lightning.png) no-repeat right;" name="agent_general" id="text-agent_general" size="15" maxlength="20" type="text"><a href="#" class="tip">&nbsp;<span>Type at least two characters to search</span></a></td>
 							<td><select id="id_agent_module_general" name="id_agente_modulo_general" disabled="disabled" style="max-width: 180px"><option value="0"><?php echo __('Select an Agent first'); ?></option></select></td>
-							<td style="text-align: center;"><a href="javascript: addGeneralRow();"><?php print_image("images/disk.png", false); ?></a></td>
+							<td style="text-align: center;"><a href="javascript: addGeneralRow();"><?php html_print_image("images/disk.png", false); ?></a></td>
 						</tr>
 					</tbody>
 					<?php
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 2c38480ef1..4d0b5cec17 100644
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -88,25 +88,25 @@ if (($agentFilter == 0) && ($moduleFilter == 0) && ($typeFilter == 0)) {
 
 $urlFilter = '&agent_filter=' . $agentFilter . '&module_filter=' . $moduleFilter . '&type_filter=' . $typeFilter;
 
-echo '<a href="javascript: toggleFormFilter();"><b>'.__('Items filter').'</b> ' . print_image("images/down.png", true, array("title" => __('Toggle filter(s)'), "id" => 'image_form_filter')) . '</a>';
+echo '<a href="javascript: toggleFormFilter();"><b>'.__('Items filter').'</b> ' . html_print_image("images/down.png", true, array("title" => __('Toggle filter(s)'), "id" => 'image_form_filter')) . '</a>';
 
 $table = null;
 $table->width = '80%';
 $table->data[0][0] = __('Agents');
-$table->data[0][1] = print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true);
+$table->data[0][1] = html_print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true);
 $table->data[0][2] = __('Modules');
-$table->data[0][3] = print_select($modules, 'module_filter', $moduleFilter, '', __('All'), 0, true);
+$table->data[0][3] = html_print_select($modules, 'module_filter', $moduleFilter, '', __('All'), 0, true);
 $table->data[1][0] = __('Type');
-$table->data[1][1] = print_select($types, 'type_filter', $typeFilter, '', __('All'), 0, true);
+$table->data[1][1] = html_print_select($types, 'type_filter', $typeFilter, '', __('All'), 0, true);
 
 echo '<div id="form_filter" style="display: none;">';
 echo '<form method="post" action ="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=filter&&id_report=' . $idReport . '">';
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button(__('Filter'), 'filter', false, 'class="sub upd"');
-print_input_hidden('action', 'filter');
+html_print_submit_button(__('Filter'), 'filter', false, 'class="sub upd"');
+html_print_input_hidden('action', 'filter');
 echo '</div>';
 echo '</form>';
 echo '</div>';
@@ -156,18 +156,18 @@ if ($items){
 	$table->head[0] = '<span title="' . __('Sort') . '">' . __('S.') . '</span>';
 	$table->head[1] = __('Type');
 	if (!$filterEnable) {
-		$table->head[1] .= ' <a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=type&id_report=' . $idReport . $urlFilter . '">' . print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '</a>' .
-			'<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=type&id_report=' . $idReport . $urlFilter . '">' . print_image("images/sort_down.png", true, array("title" => __('Descent'))) . '</a>';
+		$table->head[1] .= ' <a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=type&id_report=' . $idReport . $urlFilter . '">' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '</a>' .
+			'<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=type&id_report=' . $idReport . $urlFilter . '">' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . '</a>';
 	}
 	$table->head[2] = __('Agent');
 	if (!$filterEnable) {
-		$table->head[2] .= ' <a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=agent&id_report=' . $idReport . $urlFilter . '">' . print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '</a>' .
-			'<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=agent&id_report=' . $idReport . $urlFilter . '">' . print_image("images/sort_down.png", true, array("title" => __('Descent'))) . '</a>';
+		$table->head[2] .= ' <a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=agent&id_report=' . $idReport . $urlFilter . '">' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '</a>' .
+			'<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=agent&id_report=' . $idReport . $urlFilter . '">' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . '</a>';
 	}
 	$table->head[3] = __('Module');
 	if (!$filterEnable) {
-		$table->head[3] .= ' <a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=module&id_report=' . $idReport . $urlFilter . '">' . print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '</a>' .
-			'<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=module&id_report=' . $idReport . $urlFilter . '">' . print_image("images/sort_down.png", true, array("title" => __('Descent'))) . '</a>';
+		$table->head[3] .= ' <a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=module&id_report=' . $idReport . $urlFilter . '">' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '</a>' .
+			'<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=module&id_report=' . $idReport . $urlFilter . '">' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . '</a>';
 	}
 	$table->head[4] = __('Period');
 	$table->head[5] = __('Description');
@@ -204,14 +204,14 @@ foreach ($items as $item) {
 		$row[0] = '<span style="display: block; float: left; width: 16px;">&nbsp;</span>';
 	}
 	else {
-		$row[0] = '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . print_image("images/up.png", true, array("title" => __('Move to up'))) . '</a>';
+		$row[0] = '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . html_print_image("images/up.png", true, array("title" => __('Move to up'))) . '</a>';
 	}
 	
 	if ((end($items) == $item) && $lastPage) {
 		$row[0] .= '<span style="width: 16px;">&nbsp;</span>';
 	}
 	else {
-		$row[0] .= '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . print_image("images/down.png", true, array("title" => __('Move to down'))) . '</a>';
+		$row[0] .= '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . html_print_image("images/down.png", true, array("title" => __('Move to down'))) . '</a>';
 	}
 	
 	if ($filterEnable) {
@@ -250,15 +250,15 @@ foreach ($items as $item) {
 		$row[5] = ui_print_truncate_text($item['description'], 25, true, true);
 	}
 	
-	$row[6] = '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=edit&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . '">' . print_image("images/wrench_orange.png", true, array("title" => __('Edit'))) . '</a>';
+	$row[6] = '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=edit&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . '">' . html_print_image("images/wrench_orange.png", true, array("title" => __('Edit'))) . '</a>';
 	$row[6] .= '&nbsp;';
-	$row[6] .= '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . print_image("images/cross.png", true, array("title" => __('Delete'))) .'</a>';
+	$row[6] .= '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete&id_report=' . $idReport . '&id_item=' . $item['id_rc'] . $urlFilter . '">' . html_print_image("images/cross.png", true, array("title" => __('Delete'))) .'</a>';
 	
 	$table->data[] = $row;
 	$count++;
 }
 ui_pagination ($countItems, 'index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . $urlFilter);
-print_table($table);
+html_print_table($table);
 ui_pagination ($countItems, 'index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . $urlFilter);
 ?>
 <script type="text/javascript">
diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php
index ac890c0a61..d8726d3e94 100644
--- a/pandora_console/godmode/reporting/reporting_builder.main.php
+++ b/pandora_console/godmode/reporting/reporting_builder.main.php
@@ -29,12 +29,12 @@ $groups = get_user_groups ();
 
 switch ($action) {
 	case 'new':
-		$actionButtonHtml = print_submit_button(__('Save'), 'add', false, 'class="sub wand"', true);
+		$actionButtonHtml = html_print_submit_button(__('Save'), 'add', false, 'class="sub wand"', true);
 		$hiddenFieldAction = 'save'; 
 		break;
 	case 'update':
 	case 'edit':
-		$actionButtonHtml = print_submit_button(__('Update'), 'edit', false, 'class="sub upd"', true);
+		$actionButtonHtml = html_print_submit_button(__('Update'), 'edit', false, 'class="sub upd"', true);
 		$hiddenFieldAction = 'update'; 
 		break;
 }
@@ -51,7 +51,7 @@ $table->size[1] = '90%';
 $table->style[0] = 'font-weight: bold; vertical-align: top;';
 
 $table->data['name'][0] = __('Name');
-$table->data['name'][1] = print_input_text('name', $reportName, __('Name'), 20, 40, true);
+$table->data['name'][1] = html_print_input_text('name', $reportName, __('Name'), 20, 40, true);
 
 $table->data['group'][0] = __('Group');
 $own_info = get_user_info ($config['id_user']);
@@ -59,17 +59,17 @@ if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
 	$return_all_groups = true;
 else	
 	$return_all_groups = false;
-$table->data['group'][1] = print_select_groups(false, "AR", $return_all_groups, 'id_group', $idGroupReport, false, '', '', true);
+$table->data['group'][1] = html_print_select_groups(false, "AR", $return_all_groups, 'id_group', $idGroupReport, false, '', '', true);
 
 $table->data['description'][0] = __('Description');
-$table->data['description'][1] = print_textarea('description', 5, 15, $description, '', true);
+$table->data['description'][1] = html_print_textarea('description', 5, 15, $description, '', true);
 
 echo '<form class="" method="post">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo $actionButtonHtml;
-print_input_hidden('action', $hiddenFieldAction);
-print_input_hidden('id_report', $idReport);
+html_print_input_hidden('action', $hiddenFieldAction);
+html_print_input_hidden('id_report', $idReport);
 echo '</div></form>';
 ?>
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 9d5c5728b1..b40728f25a 100644
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -97,23 +97,23 @@ switch ($action) {
 					
 				$data[3] = ui_print_group_icon($report['id_group'], true);
 				$data[4] = '<form method="post" style="display:inline" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
-				$data[4] .= print_input_hidden ('id_report', $report['id_report'], true);
-				$data[4] .= print_input_hidden ('action','delete_report', true);
-				$data[4] .= print_input_image ('delete', 'images/cross.png', 1, '',
+				$data[4] .= html_print_input_hidden ('id_report', $report['id_report'], true);
+				$data[4] .= html_print_input_hidden ('action','delete_report', true);
+				$data[4] .= html_print_input_image ('delete', 'images/cross.png', 1, '',
 					true, array ('title' => __('Delete')));
 					$data[4] .= '</form>';
 				
 				array_push ($table->data, $data);
 							
 			}
-			print_table ($table);
+			html_print_table ($table);
 		} else {
 			echo "<div class='nf'>".__('There are no defined reportings')."</div>";
 		}
 		
 		echo '<form method="post" action="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new">';
 		echo '<div class="action-buttons" style="width: 720px;">';
-		print_submit_button (__('Create report'), 'create', false, 'class="sub next"');
+		html_print_submit_button (__('Create report'), 'create', false, 'class="sub next"');
 		echo "</div>";
 		echo "</form>";
 		return;
@@ -490,13 +490,13 @@ if ($enterpriseEnable) {
 $buttons = array(
 	'main' => array('active' => false,
 		'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=main&action=edit&id_report=' . $idReport . '">' . 
-			print_image("images/reporting_edit.png", true, array ("title" => __('Main'))) .'</a>'),
+			html_print_image("images/reporting_edit.png", true, array ("title" => __('Main'))) .'</a>'),
 	'list_items' => array('active' => false,
 		'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . '">' . 
-			print_image("images/god6.png", true, array ("title" => __('List items'))) .'</a>'),
+			html_print_image("images/god6.png", true, array ("title" => __('List items'))) .'</a>'),
 	'item_editor' => array('active' => false,
 		'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=new&id_report=' . $idReport . '">' . 
-			print_image("images/config.png", true, array ("title" => __('Item editor'))) .'</a>')
+			html_print_image("images/config.png", true, array ("title" => __('Item editor'))) .'</a>')
 	);
 	
 if ($enterpriseEnable) {
@@ -505,7 +505,7 @@ if ($enterpriseEnable) {
 
 $buttons['preview'] = array('active' => false,
 	'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&tab=preview&action=edit&id_report=' . $idReport . '">' . 
-			print_image("images/reporting.png", true, array ("title" => __('Preview'))) .'</a>');
+			html_print_image("images/reporting.png", true, array ("title" => __('Preview'))) .'</a>');
 	
 $buttons[$activeTab]['active'] = true;
 
diff --git a/pandora_console/godmode/reporting/reporting_builder.preview.php b/pandora_console/godmode/reporting/reporting_builder.preview.php
index c46f87b4de..8237fc1560 100644
--- a/pandora_console/godmode/reporting/reporting_builder.preview.php
+++ b/pandora_console/godmode/reporting/reporting_builder.preview.php
@@ -49,11 +49,11 @@ $url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id
 
 if ($config["pure"] == 0) {
 	$options[] = "<a href='$url&pure=1'>"
-		. print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
+		. html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
 		. "</a>";
 } else {
 	$options[] = "<a href='$url&pure=0'>"
-		. print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
+		. html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
 		. "</a>";
 }
 
@@ -64,24 +64,24 @@ $table->style[0] = 'font-weight: bold';
 $table->size = array ();
 $table->size[0] = '50px';
 $table->data = array ();
-$table->data[0][0] = print_image("images/reporting.png", true, array("width" => '32', "height" => '32'));
+$table->data[0][0] = html_print_image("images/reporting.png", true, array("width" => '32', "height" => '32'));
 if ($report['description'] != '') {
 	$table->data[0][1] = $report['description'];
 } else {
 	$table->data[0][1] = $report['name'];
 }
 $table->data[1][0] = __('Date');
-$table->data[1][1] = print_input_text ('date', $date, '', 12, 10, true). ' ';
-$table->data[1][1] .= print_input_text ('time', $time, '', 7, 7, true). ' ';
-$table->data[1][1] .= print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true);
+$table->data[1][1] = html_print_input_text ('date', $date, '', 12, 10, true). ' ';
+$table->data[1][1] .= html_print_input_text ('time', $time, '', 7, 7, true). ' ';
+$table->data[1][1] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true);
 
 echo '<form method="post" action="">';
-print_table ($table);
-print_input_hidden ('id_report', $id_report);
+html_print_table ($table);
+html_print_input_hidden ('id_report', $id_report);
 echo '</form>';
 
 echo '<div id="loading">';
-echo print_image("images/wait.gif", true, array("border" => '0')) . '<br />';
+echo html_print_image("images/wait.gif", true, array("border" => '0')) . '<br />';
 echo '<strong>'.__('Loading').'...</strong>';
 echo '</div>';
 
@@ -122,7 +122,7 @@ $table->class = 'databox report_table';
 $table->rowclass = array ();
 $table->rowclass[0] = 'datos3';
 
-$report["group_name"] = get_group_name ($report['id_group']);
+$report["group_name"] = groups_get_name ($report['id_group']);
 
 switch ($config["dbtype"]) {
 	case "mysql":
@@ -147,7 +147,7 @@ foreach ($contents as $content) {
 	
     render_report_html_item ($content, $table, $report);
 	echo '<div style = "overflow:auto;">';
-	print_table ($table);
+	html_print_table ($table);
 	echo "</div>";
 	flush ();
 }
diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index 108a8d26c8..fc21d9320e 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -30,16 +30,16 @@ require_once ('include/functions_users.php');
 switch ($action) {
 	case 'new':
 		echo "<form method='post' action='index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab  . "'>";
-		print_input_hidden('action', 'save');
+		html_print_input_hidden('action', 'save');
 		break;
 	case 'update':
 	case 'save':
 		echo "<form method='post' action='index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab  . "&id_visual_console=" . $idVisualConsole . "'>";
-		print_input_hidden('action', 'update');
+		html_print_input_hidden('action', 'update');
 		break;
 	case 'edit':		
 		echo "<form method='post' action='index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab  . "&id_visual_console=" . $idVisualConsole . "'>";
-		print_input_hidden('action', 'update');
+		html_print_input_hidden('action', 'update');
 		break;
 }
 
@@ -47,7 +47,7 @@ $table->width = '70%';
 $table->data = array ();
 $table->data[0][0] = __('Name:'). ui_print_help_tip (__("Use [ or ( as first character, for example '[*] Map name', to render this map name in main menu"), true);
 
-$table->data[0][1] = print_input_text ('name', $visualConsoleName, '', 21, 30, true);
+$table->data[0][1] = html_print_input_text ('name', $visualConsoleName, '', 21, 30, true);
 $table->data[1][0] = __('Group:');
 $groups = get_user_groups ($config['id_user']);
 
@@ -58,11 +58,11 @@ if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
 else	
 	$display_all_group = false;
 
-$table->data[1][1] = print_select_groups($config['id_user'], "AR", $display_all_group, 'id_group', $idGroup, '', '', '', true);
+$table->data[1][1] = html_print_select_groups($config['id_user'], "AR", $display_all_group, 'id_group', $idGroup, '', '', '', true);
 $backgrounds_list = list_files ('images/console/background/', "jpg", 1, 0);
 $backgrounds_list = array_merge ($backgrounds_list, list_files ('images/console/background/', "png", 1, 0));
 $table->data[2][0] = __('Background');
-$table->data[2][1] = print_select ($backgrounds_list, 'background', $background, '', '', 0, true);
+$table->data[2][1] = html_print_select ($backgrounds_list, 'background', $background, '', '', 0, true);
 if ($action == 'new') {
 	$textButtonSubmit = __('Save');
 	$classButtonSubmit = 'sub wand';
@@ -72,10 +72,10 @@ else {
 	$classButtonSubmit = 'sub upd';
 }
 
-print_table($table);
+html_print_table($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button ($textButtonSubmit, 'update_layout', false, 'class="' . $classButtonSubmit . '"');
+html_print_submit_button ($textButtonSubmit, 'update_layout', false, 'class="' . $classButtonSubmit . '"');
 echo '</div>';
 
 echo "</form>";
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php
index 1d228e2666..ea5ff110c1 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php
@@ -75,7 +75,7 @@ echo '</div>';
 echo '<div style="clear: right; margin-bottom: 10px;"></div>';
 
 echo "<form id='form_visual_map' method='post' action='index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab . "&id_visual_console=" . $idVisualConsole . "'>";
-print_input_hidden('action', 'update');
+html_print_input_hidden('action', 'update');
 $background = $visualConsole['background'];
 $widthBackground = $visualConsole['width'];
 $heightBackground = $visualConsole['height'];
@@ -118,45 +118,45 @@ echo '<div id="properties_panel" style="display: none; position: absolute; borde
 	<tbody>
 		<tr id="label_row" style="" class="static_graph percentile_bar module_graph simple_value label datos">
 			<td style=""><?php echo __('Label');?></td>
-			<td style=""><?php print_input_text ('label', '', '', 20, 200); ?></td>
+			<td style=""><?php html_print_input_text ('label', '', '', 20, 200); ?></td>
 		</tr>
 		<tr id="image_row" style="" class="static_graph icon datos">
 			<td><?php echo __('Image');?></td>
-			<td><?php print_select ($images_list, 'image', '', 'showPreview(this.value);', 'None', '');?></td>
+			<td><?php html_print_select ($images_list, 'image', '', 'showPreview(this.value);', 'None', '');?></td>
 		</tr>
 		<tr id="preview_row" style="" class="static_graph datos icon">
 			<td colspan="2" style="text-align: right;"><div id="preview" style="text-align: right;"></div></td>
 		</tr>
 		<tr id="agent_row" class="static_graph percentile_bar module_graph simple_value datos">
 			<td><?php echo __('Agent') . '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search.") . '</span></a>';?></td>
-			<td><?php print_input_text_extended ('agent', '', 'text-agent', '', 25, 100, false, '',
+			<td><?php html_print_input_text_extended ('agent', '', 'text-agent', '', 25, 100, false, '',
 				array('style' => 'background: #ffffff url(images/lightning.png) no-repeat right;'), false);?></td>
 		</tr>
 		<tr id="module_row" class="static_graph percentile_bar module_graph simple_value datos">
 			<td><?php echo __('Module');?></td>
-			<td><?php print_select (array (), 'module', '', '', __('Any'), 0);?></td>
+			<td><?php html_print_select (array (), 'module', '', '', __('Any'), 0);?></td>
 		</tr>
 		<tr id="background_row_1" class="background datos">
 			<td><?php echo __('Background');?></td>
-			<td><?php print_select($backgrounds_list, 'background_image', $background, '', 'None', '');?></td>
+			<td><?php html_print_select($backgrounds_list, 'background_image', $background, '', 'None', '');?></td>
 		</tr>
 		<tr id="background_row_2" class="background datos">
 			<td><?php echo __('Original Size');?></td>
-			<td><?php print_button(__('Apply'), 'original_false', false, 'setOriginalSizeBackground()', 'class="sub"');?></td>
+			<td><?php html_print_button(__('Apply'), 'original_false', false, 'setOriginalSizeBackground()', 'class="sub"');?></td>
 		</tr>
 		<tr id="background_row_3" class="background datos">
 			<td><?php echo __('Aspect ratio');?></td>
-			<td><?php print_button(__('Width proportional'), 'original_false', false, "setAspectRatioBackground('width')", 'class="sub"');?></td>
+			<td><?php html_print_button(__('Width proportional'), 'original_false', false, "setAspectRatioBackground('width')", 'class="sub"');?></td>
 		</tr>
 		<tr id="background_row_4" class="background datos">
 			<td></td>
-			<td><?php print_button(__('Height proportional'), 'original_false', false, "setAspectRatioBackground('height')", 'class="sub"');?></td>
+			<td><?php html_print_button(__('Height proportional'), 'original_false', false, "setAspectRatioBackground('height')", 'class="sub"');?></td>
 		</tr>
 		<tr id="percentile_bar_row_1" class="percentile_bar datos">
 			<td><?php echo __('Width');?></td>
 			<td>
 				<?php
-				print_input_text('width_percentile', 0, '', 3, 5);
+				html_print_input_text('width_percentile', 0, '', 3, 5);
 				?>
 			</td>
 		</tr>
@@ -164,37 +164,37 @@ echo '<div id="properties_panel" style="display: none; position: absolute; borde
 			<td><?php echo __('Max value');?></td>
 			<td>
 				<?php
-				print_input_text('max_percentile', 0, '', 3, 5);
+				html_print_input_text('max_percentile', 0, '', 3, 5);
 				?>
 			</td>
 		</tr>
 		<tr id="period_row" class="module_graph datos">
 			<td><?php echo __('Period');?></td>
-			<td><?php print_select ($intervals, 'period', '', '', '--', 0, false, false, false);?></td>
+			<td><?php html_print_select ($intervals, 'period', '', '', '--', 0, false, false, false);?></td>
 		</tr>
 		<tr id="module_graph_size_row" class="module_graph datos">
 			<td><?php echo __('Size');?></td>
 			<td>
 				<?php
-				print_input_text('width_module_graph', 300, '', 3, 5);
+				html_print_input_text('width_module_graph', 300, '', 3, 5);
 				echo ' X ';
-				print_input_text('height_module_graph', 180, '', 3, 5);
+				html_print_input_text('height_module_graph', 180, '', 3, 5);
 				?>
 			</td>
 		</tr>
 		<tr id="button_update_row" class="datos">
 			<td colspan="2" style="text-align: right;">
 			<?php
-			print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub cancel"');
-			print_button(__('Update'), 'update_button', false, 'updateAction();', 'class="sub upd"');
+			html_print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub cancel"');
+			html_print_button(__('Update'), 'update_button', false, 'updateAction();', 'class="sub upd"');
 			?>
 			</td>
 		</tr>
 		<tr id="button_create_row" class="datos">
 			<td colspan="2" style="text-align: right;">
 			<?php
-			print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub cancel"');
-			print_button(__('Create'), 'create_button', false, 'createAction();', 'class="sub wand"');
+			html_print_button(__('Cancel'), 'cancel_button', false, 'cancelAction();', 'class="sub cancel"');
+			html_print_button(__('Create'), 'create_button', false, 'createAction();', 'class="sub wand"');
 			?>
 			</td>
 		</tr>
@@ -210,9 +210,9 @@ echo '<div id="properties_panel" style="display: none; position: absolute; borde
 			<td>
 				<?php
 				echo '(';
-				print_input_text('left', '0', '', 3, 5);
+				html_print_input_text('left', '0', '', 3, 5);
 				echo ' , ';
-				print_input_text('top', '0', '', 3, 5);
+				html_print_input_text('top', '0', '', 3, 5);
 				echo ')';
 				?>
 			</td>
@@ -221,9 +221,9 @@ echo '<div id="properties_panel" style="display: none; position: absolute; borde
 			<td><?php echo __('Size') . '<a href="#" class="tip">&nbsp;<span>' . __("For use the original image file size, set 0 width and 0 height.") . '</span></a>';?></td>
 			<td>
 				<?php
-				print_input_text('width', 0, '', 3, 5);
+				html_print_input_text('width', 0, '', 3, 5);
 				echo ' X ';
-				print_input_text('height', 0, '', 3, 5);
+				html_print_input_text('height', 0, '', 3, 5);
 				?>
 			</td>
 		</tr>
@@ -232,7 +232,7 @@ echo '<div id="properties_panel" style="display: none; position: absolute; borde
 			<td>
 				<?php
 				$parents = get_items_parents($visualConsole['id']);
-				print_select($parents, 'parent', '', '', __('None'), 0);
+				html_print_select($parents, 'parent', '', '', __('None'), 0);
 				?>
 			</td>
 		</tr>
@@ -240,13 +240,13 @@ echo '<div id="properties_panel" style="display: none; position: absolute; borde
 			<td><?php echo __('Map linked');?></td>
 			<td>
 				<?php
-				print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != ' . $idVisualConsole, 'map_linked', '', '', 'None', '0');
+				html_print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != ' . $idVisualConsole, 'map_linked', '', '', 'None', '0');
 				?>
 			</td>
 		</tr>
 		<tr id="label_color_row" class="static_graph percentile_bar module_graph simple_value label datos">
 			<td><?php echo __('Label color');?></td>
-			<td><?php print_input_text_extended ('label_color', '#000000', 'text-'.'label_color', '', 7, 7, false, '', 'class="label_color"', false);?></td>
+			<td><?php html_print_input_text_extended ('label_color', '#000000', 'text-'.'label_color', '', 7, 7, false, '', 'class="label_color"', false);?></td>
 		</tr>				
 	</tbody>
 </table>
@@ -270,19 +270,19 @@ foreach ($layoutDatas as $layoutData) {
 		continue;
 	
 	printItemInVisualConsole($layoutData);
-	print_input_hidden('status_'.$layoutData['id'], getStatusElement($layoutData));
+	html_print_input_hidden('status_'.$layoutData['id'], getStatusElement($layoutData));
 }
 
 echo '</div>';
 echo '</div>';
 
-print_input_hidden('background_width', $widthBackground);
-print_input_hidden('background_height', $heightBackground);
+html_print_input_hidden('background_width', $widthBackground);
+html_print_input_hidden('background_height', $heightBackground);
 
 $backgroundSizes = getimagesize('images/console/background/' . $background);
 
-print_input_hidden('background_original_width', $backgroundSizes[0]);
-print_input_hidden('background_original_height', $backgroundSizes[1]);
+html_print_input_hidden('background_original_width', $backgroundSizes[0]);
+html_print_input_hidden('background_original_height', $backgroundSizes[1]);
 echo "</form>";
 
 //Hack to translate messages in javascript
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index df53c7fcf3..cf83af2667 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -84,10 +84,10 @@ $table->data = array();
 //Background
 $table->data[0]['icon'] = '';
 $table->data[0][0] = __('Background');
-$table->data[0][1] = print_select($backgrounds_list, 'background', $visualConsole['background'], '', 'None', '', true, false, true, '', false, 'width: 100px;');
-$table->data[0][2] = print_input_text('width', $visualConsole['width'], '', 3, 5, true) .
+$table->data[0][1] = html_print_select($backgrounds_list, 'background', $visualConsole['background'], '', 'None', '', true, false, true, '', false, 'width: 100px;');
+$table->data[0][2] = html_print_input_text('width', $visualConsole['width'], '', 3, 5, true) .
 	'x' .
-	print_input_text('height', $visualConsole['height'], '', 3, 5, true);
+	html_print_input_text('height', $visualConsole['height'], '', 3, 5, true);
 $table->data[0][3] = $table->data[0][4] = $table->data[0][5] = '';
 
 $i = 1;
@@ -105,22 +105,22 @@ foreach ($layoutDatas as $layoutData) {
 	
 	switch ($layoutData['type']) {
 		case STATIC_GRAPH:
-			$table->data[$i + 1]['icon'] = print_image('images/camera.png', true, array('title' => __('Static Graph')));
+			$table->data[$i + 1]['icon'] = html_print_image('images/camera.png', true, array('title' => __('Static Graph')));
 			break;
 		case PERCENTILE_BAR:
-			$table->data[$i + 1]['icon'] = print_image('images/chart_bar.png', true, array('title' => __('Percentile Bar')));
+			$table->data[$i + 1]['icon'] = html_print_image('images/chart_bar.png', true, array('title' => __('Percentile Bar')));
 			break;
 		case MODULE_GRAPH:
-			$table->data[$i + 1]['icon'] = print_image('images/chart_curve.png', true, array('title' => __('Module Graph')));
+			$table->data[$i + 1]['icon'] = html_print_image('images/chart_curve.png', true, array('title' => __('Module Graph')));
 			break;
 		case SIMPLE_VALUE:
-			$table->data[$i + 1]['icon'] = print_image('images/binary.png', true, array('title' => __('Simple Value')));
+			$table->data[$i + 1]['icon'] = html_print_image('images/binary.png', true, array('title' => __('Simple Value')));
 			break;
 		case LABEL:
-			$table->data[$i + 1]['icon'] = print_image('images/tag_red.png', true, array('title' => __('Label')));
+			$table->data[$i + 1]['icon'] = html_print_image('images/tag_red.png', true, array('title' => __('Label')));
 			break;
 		case ICON:
-			$table->data[$i + 1]['icon'] = print_image('images/photo.png', true, array('title' => __('Icon')));
+			$table->data[$i + 1]['icon'] = html_print_image('images/photo.png', true, array('title' => __('Icon')));
 			break;
 		default:
 			$table->data[$i + 1]['icon'] = '';
@@ -132,8 +132,8 @@ foreach ($layoutDatas as $layoutData) {
 	//Label and color label
 	if ($layoutData['type'] != ICON) {
 		$table->data[$i + 1][0] = '<span style="width: 130px; display: block;">' .
-			print_input_text ('label_' . $idLayoutData, $layoutData['label'], '', 10, 200, true) . 
-			print_input_text_extended ('label_color_' . $idLayoutData, $layoutData['label_color'], 'text-'.'label_color_' . $idLayoutData, '', 7, 7, false, '', 'style="visibility: hidden; width: 0px;" class="label_color"', true) . 
+			html_print_input_text ('label_' . $idLayoutData, $layoutData['label'], '', 10, 200, true) . 
+			html_print_input_text_extended ('label_color_' . $idLayoutData, $layoutData['label_color'], 'text-'.'label_color_' . $idLayoutData, '', 7, 7, false, '', 'style="visibility: hidden; width: 0px;" class="label_color"', true) . 
 			'</span>';
 	}
 	else {
@@ -143,30 +143,30 @@ foreach ($layoutDatas as $layoutData) {
 	
 	//Image
 	if (($layoutData['type'] == STATIC_GRAPH) || ($layoutData['type'] == ICON)) {
-		$table->data[$i + 1][1] = print_select ($images_list, 'image_' . $idLayoutData, $layoutData['image'], '', 'None', '', true);
+		$table->data[$i + 1][1] = html_print_select ($images_list, 'image_' . $idLayoutData, $layoutData['image'], '', 'None', '', true);
 	}
 	else {
 		$table->data[$i + 1][1] = '';
 	}
 	
 	//Width and height
-	$table->data[$i + 1][2] = print_input_text('width_' . $idLayoutData, $layoutData['width'], '', 3, 5, true) .
+	$table->data[$i + 1][2] = html_print_input_text('width_' . $idLayoutData, $layoutData['width'], '', 3, 5, true) .
 		'x' .
-		print_input_text('height_' . $idLayoutData, $layoutData['height'], '', 3, 5, true);
+		html_print_input_text('height_' . $idLayoutData, $layoutData['height'], '', 3, 5, true);
 	
 	//Position
-	$table->data[$i + 1][3] = '(' . print_input_text('left_' . $idLayoutData, $layoutData['pos_x'], '', 3, 5, true) .
-		',' . print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 3, 5, true) .
+	$table->data[$i + 1][3] = '(' . html_print_input_text('left_' . $idLayoutData, $layoutData['pos_x'], '', 3, 5, true) .
+		',' . html_print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 3, 5, true) .
 		')';
 	
 	//Parent
-	$table->data[$i + 1][4] = print_select_from_sql ('SELECT id, label FROM tlayout_data WHERE id_layout = '. $idVisualConsole . ' AND id !=' . $idLayoutData,
+	$table->data[$i + 1][4] = html_print_select_from_sql ('SELECT id, label FROM tlayout_data WHERE id_layout = '. $idVisualConsole . ' AND id !=' . $idLayoutData,
 		'parent_' . $idLayoutData, $layoutData['parent_item'], '', 'None', 0, true);
 	
 	//Delete row button
 	$table->data[$i + 1][5] = '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=' .
 		$activeTab  . '&action=delete&id_visual_console=' . $visualConsole["id"] . '&id_element=' . $idLayoutData . '" ' . 
-		'onclick="javascript: if (!confirm(\'' . __('Are you sure?') . '\')) return false;">' . print_image('images/cross.png', true) . '</a>';
+		'onclick="javascript: if (!confirm(\'' . __('Are you sure?') . '\')) return false;">' . html_print_image('images/cross.png', true) . '</a>';
 	
 	//Second row
 		
@@ -175,7 +175,7 @@ foreach ($layoutDatas as $layoutData) {
 	//Agent
 	if (($layoutData['type'] != ICON) && ($layoutData['type'] != LABEL)) {
 		$table->data[$i + 2][0] = '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search.") . '</span></a>' . 
-			print_input_text_extended ('agent_' . $idLayoutData, get_agent_name($layoutData['id_agent']), 'text-agent_' . $idLayoutData, '', 15, 100, false, '',
+			html_print_input_text_extended ('agent_' . $idLayoutData, get_agent_name($layoutData['id_agent']), 'text-agent_' . $idLayoutData, '', 15, 100, false, '',
 			array('class' => 'text-agent', 'style' => 'background: #ffffff url(images/lightning.png) no-repeat right;'), true);
 	}
 	else {
@@ -185,7 +185,7 @@ foreach ($layoutDatas as $layoutData) {
 	//Modules
 	if (($layoutData['type'] != ICON) && ($layoutData['type'] != LABEL)) {
 		$sql = 'SELECT id_agente_modulo, nombre FROM tagente_modulo WHERE disabled = 0 AND id_agente = ' . $layoutData['id_agent'];
-		$table->data[$i + 2][1] = print_select_from_sql($sql,
+		$table->data[$i + 2][1] = html_print_select_from_sql($sql,
 			'module_' . $idLayoutData, $layoutData['id_agente_modulo'], '', '---', 0, true);
 	}
 	else {
@@ -197,14 +197,14 @@ foreach ($layoutDatas as $layoutData) {
 	
 	//Period
 	if ($layoutData['type'] == MODULE_GRAPH) {
-		$table->data[$i + 2][3] = print_select ($intervals, 'period_' . $idLayoutData, $layoutData['period'], '', '--', 0, true);
+		$table->data[$i + 2][3] = html_print_select ($intervals, 'period_' . $idLayoutData, $layoutData['period'], '', '--', 0, true);
 	}
 	else {
 		$table->data[$i + 2][3] = '';
 	}
 	
 	//Map linked
-	$table->data[$i + 2][4] = print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != ' . $idVisualConsole,
+	$table->data[$i + 2][4] = html_print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != ' . $idVisualConsole,
 					'map_linked_' . $idLayoutData, $layoutData['id_layout_linked'], '', 'None', '', true);
 	$table->data[$i + 2][5] = '';
 	
@@ -224,14 +224,14 @@ foreach ($layoutDatas as $layoutData) {
 
 echo '<form method="post" action="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=' . $activeTab  . '&id_visual_console=' . $visualConsole["id"] . '">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('action', 'update');
-print_input_hidden ('id_visual_console', $visualConsole["id"]);
-print_submit_button (__('Update'), 'go', false, 'class="sub next"');
+html_print_input_hidden ('action', 'update');
+html_print_input_hidden ('id_visual_console', $visualConsole["id"]);
+html_print_submit_button (__('Update'), 'go', false, 'class="sub next"');
 echo '</div>';
-print_table($table);
+html_print_table($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Update'), 'go', false, 'class="sub next"');
+html_print_submit_button (__('Update'), 'go', false, 'class="sub next"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 2cc4622f8b..df70ea8353 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -211,19 +211,19 @@ switch ($activeTab) {
 $buttons = array(
 	'data' => array('active' => false,
 		'text' => '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=data&action=' . $action . '&id_visual_console=' . $idVisualConsole . '">' . 
-			print_image ("images/god9.png", true, array ("title" => __('Data'))) .'</a>'),
+			html_print_image ("images/god9.png", true, array ("title" => __('Data'))) .'</a>'),
 	'list_elements' => array('active' => false,
 		'text' => '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=list_elements&action=' . $action . '&id_visual_console=' . $idVisualConsole . '">' .
-			print_image ("images/god6.png", true, array ("title" => __('List elements'))) .'</a>'),
+			html_print_image ("images/god6.png", true, array ("title" => __('List elements'))) .'</a>'),
 	'wizard' => array('active' => false,
 		'text' => '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=wizard&action=' . $action . '&id_visual_console=' . $idVisualConsole . '">' .
-			print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .'</a>'),
+			html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .'</a>'),
 	'editor' => array('active' => false,
 		'text' => '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=editor&action=' . $action . '&id_visual_console=' . $idVisualConsole . '">' .
-			print_image ("images/config.png", true, array ("title" => __('Editor'))) .'</a>'),
+			html_print_image ("images/config.png", true, array ("title" => __('Editor'))) .'</a>'),
 	'preview' => array('active' => false,
 		'text' => '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=preview&action=' . $action . '&id_visual_console=' . $idVisualConsole . '">' .
-			print_image ("images/eye.png", true, array ("title" => __('Preview'))) .'</a>'),);
+			html_print_image ("images/eye.png", true, array ("title" => __('Preview'))) .'</a>'),);
 
 if ($action == 'new' || $idVisualConsole === false){
 	$buttons = array('data' => $buttons['data']); //Show only the data tab
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index c7c6fa4240..dcb88cc327 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -51,29 +51,29 @@ foreach ($all_images as $image_file) {
 }
 
 $table->data[0][0] = __('Image');
-$table->data[0][1] = print_select ($images_list, 'image', '', '', '', '', true);
+$table->data[0][1] = html_print_select ($images_list, 'image', '', '', '', '', true);
 
 $table->data[1][0] = __('Image range (px)');
-$table->data[1][1] = print_input_text ('range', 50, '', 5, 5, true);
+$table->data[1][1] = html_print_input_text ('range', 50, '', 5, 5, true);
 
 $table->data[2][0] = __('Image size (px)');
-$table->data[2][1] = __('Width').': '.print_input_text ('width', 0, '', 5, 5, true);
-$table->data[2][1] .= '<br />'.__('Height').': '.print_input_text ('height', 0, '', 5, 5, true);
+$table->data[2][1] = __('Width').': '.html_print_input_text ('width', 0, '', 5, 5, true);
+$table->data[2][1] .= '<br />'.__('Height').': '.html_print_input_text ('height', 0, '', 5, 5, true);
 
 $table->data[3][0] = __('Agents');
-$table->data[3][1] = print_select (get_group_agents ($visualConsole['id_group'], false, "none", false, true),
+$table->data[3][1] = html_print_select (get_group_agents ($visualConsole['id_group'], false, "none", false, true),
 	'id_agents[]', 0, false, '', '', true, true);
 	
 $table->data[4][0] = __('Modules');
-$table->data[4][1] = print_select (array (), 'module[]', 0, false, '', '', true, true);
+$table->data[4][1] = html_print_select (array (), 'module[]', 0, false, '', '', true, true);
 
 echo '<form method="post" action="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=' . $activeTab  . '&id_visual_console=' . $visualConsole["id"] . '" onsubmit="if (! confirm(\''.__('Are you sure to add many elements\nin visual map?').'\')) return false;">';
-print_table ($table);
+html_print_table ($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_input_hidden ('action', 'update');
-print_input_hidden ('id_visual_console', $visualConsole["id"]);
-print_submit_button (__('Add'), 'go', false, 'class="sub wizard wand"');
+html_print_input_hidden ('action', 'update');
+html_print_input_hidden ('id_visual_console', $visualConsole["id"]);
+html_print_submit_button (__('Add'), 'go', false, 'class="sub wizard wand"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php
index 380c0637a2..5a4af25f4d 100644
--- a/pandora_console/godmode/servers/manage_recontask.php
+++ b/pandora_console/godmode/servers/manage_recontask.php
@@ -195,11 +195,11 @@ if ($result !== false) {
 			
 		if ($row["id_recon_script"] == 0){
 		// Network recon task
-			$data[2] = print_image ("images/network.png", true, array ("title" => __('Network recon task')))."&nbsp;&nbsp;";
+			$data[2] = html_print_image ("images/network.png", true, array ("title" => __('Network recon task')))."&nbsp;&nbsp;";
 			$data[2] .= get_networkprofile_name ($row["id_network_profile"]);
 		} else {
 			// APP recon task
-			$data[2] = print_image ("images/plugin.png", true). "&nbsp;&nbsp;";
+			$data[2] = html_print_image ("images/plugin.png", true). "&nbsp;&nbsp;";
 			$data[2] .= db_get_sql (sprintf("SELECT name FROM trecon_script WHERE id_recon_script = %d", $row["id_recon_script"]));
 		}	
 			
@@ -234,14 +234,14 @@ if ($result !== false) {
 		}
 		
 		// ACTION
-		$data[8] = "<a href='index.php?sec=estado_server&sec2=operation/servers/view_server_detail&server_id=".$row["id_recon_server"]."'>" . print_image("images/eye.png", true) . "</a>&nbsp;".
-			'<a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask&delete='.$row["id_rt"].'">' . print_image("images/cross.png", true, array("border" => '0')) . '</a>&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&update='.$row["id_rt"].'">' .
-			print_image("images/config.png", true) . '</a>';
+		$data[8] = "<a href='index.php?sec=estado_server&sec2=operation/servers/view_server_detail&server_id=".$row["id_recon_server"]."'>" . html_print_image("images/eye.png", true) . "</a>&nbsp;".
+			'<a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask&delete='.$row["id_rt"].'">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&update='.$row["id_rt"].'">' .
+			html_print_image("images/config.png", true) . '</a>';
 		
 		$table->data[] = $data;
 	}
 	
-	print_table ($table);
+	html_print_table ($table);
 	unset ($table);
 } else {
 	echo '<div class="nf">'.__('There are no recon task configured').'</div>';
@@ -249,7 +249,7 @@ if ($result !== false) {
 
 echo '<div class="action-buttons" style="width: 700px">';
 echo '<form method="post" action="index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&create">';
-echo print_submit_button (__('Create'),"crt",false,'class="sub next"',true);
+echo html_print_submit_button (__('Create'),"crt",false,'class="sub next"',true);
 echo '</form>';
 echo "</div>";
 
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index 5a0167b80a..f870f50217 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -93,12 +93,12 @@ $table->rowclass[14]="recon_script";
 $table->rowclass[15]="recon_script";
 // Name
 $table->data[0][0] = "<b>".__('Task name')."</b>";
-$table->data[0][1] = print_input_text ('name', $name, '', 25, 0, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 25, 0, true);
 
 // Recon server
 $table->data[1][0] = "<b>".__('Recon server').'<a href="#" class="tip">&nbsp;<span>'.__('You must select a Recon Server for the Task, otherwise the Recon Task will never run').'</span></a>';
 
-$table->data[1][1] = print_select_from_sql ('SELECT id_server, name
+$table->data[1][1] = html_print_select_from_sql ('SELECT id_server, name
 	FROM tserver
 	WHERE server_type = 3 ORDER BY name', "id_recon_server", $id_recon_server, '', '', '', true);
 
@@ -108,12 +108,12 @@ $fields['recon_script'] = __("Custom script");
 
 
 $table->data[2][0] = "<b>".__('Mode')."</b>";
-$table->data[2][1] = print_select ($fields, "mode", $mode, '', '', 0, true);
+$table->data[2][1] = html_print_select ($fields, "mode", $mode, '', '', 0, true);
 
 		
 // Network 
 $table->data[3][0] = "<b>".__('Network');
-$table->data[3][1] = print_input_text ('network', $network, '', 25, 0, true);
+$table->data[3][1] = html_print_input_text ('network', $network, '', 25, 0, true);
 
 // Interval
 $values = array ();
@@ -129,74 +129,74 @@ $values[1209600] = __('%d weeks', 2);
 $values[2592000] = __('%d month', 1);
 
 $table->data[4][0] = "<b>".__('Interval');
-$table->data[4][1] = print_select ($values, "interval", $interval, '', '', '', true);
+$table->data[4][1] = html_print_select ($values, "interval", $interval, '', '', '', true);
 
 // Module template
 $table->data[5][0] = "<b>".__('Module template');
-$table->data[5][1] = print_select_from_sql ('SELECT id_np, name FROM tnetwork_profile',
+$table->data[5][1] = html_print_select_from_sql ('SELECT id_np, name FROM tnetwork_profile',
 	"id_network_profile", $id_network_profile, '', '', '', true);
 
 // Recon script
 $table->data[6][0] = "<b>".__('Recon script');
-$table->data[6][1] = print_select_from_sql ('SELECT id_recon_script, name FROM trecon_script', "id_recon_script", $id_recon_script, '', '', '', true);
+$table->data[6][1] = html_print_select_from_sql ('SELECT id_recon_script, name FROM trecon_script', "id_recon_script", $id_recon_script, '', '', '', true);
 
 
 // OS
 $table->data[7][0] = "<b>".__('OS');
-$table->data[7][1] = print_select_from_sql ('SELECT id_os, name FROM tconfig_os ORDER BY name',
+$table->data[7][1] = html_print_select_from_sql ('SELECT id_os, name FROM tconfig_os ORDER BY name',
 	"id_os", $id_os, '', __('Any'), -1, true);
 
 // Recon ports
 $table->data[8][0] = "<b>".__('Ports');
-$table->data[8][1] =  print_input_text ('recon_ports', $recon_ports, '', 25, 0, true);
+$table->data[8][1] =  html_print_input_text ('recon_ports', $recon_ports, '', 25, 0, true);
 $table->data[8][1] .= '<a href="#" class="tip">&nbsp;<span>'.__('Ports defined like: 80 or 80,443,512 or even 0-1024 (Like Nmap command line format). If dont want to do a sweep using portscan, left it in blank').'</span></a>';
 
 // Group
 $table->data[9][0] = "<b>".__('Group');
 $groups = get_user_groups (false, "AR", false);
-$table->data[9][1] = print_select_groups(false, "AR", false, 'id_group', $id_group, '', '', 0, true);
+$table->data[9][1] = html_print_select_groups(false, "AR", false, 'id_group', $id_group, '', '', 0, true);
 
 // Incident
 $values = array (0 => __('No'), 1 => __('Yes'));
 $table->data[10][0] = "<b>".__('Incident');
-$table->data[10][1] = print_select ($values, "create_incident", $create_incident,
+$table->data[10][1] = html_print_select ($values, "create_incident", $create_incident,
 	'','','',true) . ' ' . ui_print_help_tip (__('Choose if the discovery of a new system creates an incident or not.'), true);
 
 // SNMP default community
 $table->data[11][0] = "<b>".__('SNMP Default community');
-$table->data[11][1] =  print_input_text ('snmp_community', $snmp_community, '', 35, 0, true);
+$table->data[11][1] =  html_print_input_text ('snmp_community', $snmp_community, '', 35, 0, true);
 
 // Field1
 $table->data[12][0] = "<b>".__('Script field #1');
-$table->data[12][1] =  print_input_text ('field1', $field1, '', 40, 0, true);
+$table->data[12][1] =  html_print_input_text ('field1', $field1, '', 40, 0, true);
 
 // Field2
 $table->data[13][0] = "<b>".__('Script field #2');
-$table->data[13][1] =  print_input_text ('field2', $field2, '', 40, 0, true);
+$table->data[13][1] =  html_print_input_text ('field2', $field2, '', 40, 0, true);
 
 // Field3
 $table->data[14][0] = "<b>".__('Script field #3');
-$table->data[14][1] =  print_input_text ('field3', $field3, '', 40, 0, true);
+$table->data[14][1] =  html_print_input_text ('field3', $field3, '', 40, 0, true);
 
 // Field4
 $table->data[15][0] = "<b>".__('Script field #4');
-$table->data[15][1] =  print_input_text ('field4', $field4, '', 40, 0, true);
+$table->data[15][1] =  html_print_input_text ('field4', $field4, '', 40, 0, true);
 
 
 // Comments
 $table->data[16][0] = "<b>".__('Comments');
-$table->data[16][1] =  print_input_text ('description', $description, '', 45, 0, true);
+$table->data[16][1] =  html_print_input_text ('description', $description, '', 45, 0, true);
 
 
 // Different Form url if it's a create or if it's a update form
 echo '<form name="modulo" method="post" action="index.php?sec=gservers&sec2=godmode/servers/manage_recontask&'.(($id_rt != -1) ? 'update='.$id_rt : 'create=1').'">';
 
-print_table ($table);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 if ($id_rt != -1) 
-	print_submit_button (__('Update'), "crt", false, 'class="sub upd"');
+	html_print_submit_button (__('Update'), "crt", false, 'class="sub upd"');
 else
-	print_submit_button (__('Add'), "crt", false, 'class="sub wand"');
+	html_print_submit_button (__('Add'), "crt", false, 'class="sub wand"');
 echo "</div>";
 
 echo "</form>";
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 496cc13cfe..b79ba628d9 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -34,7 +34,7 @@ if (isset($_GET["server"])) {
 	$sql = sprintf("SELECT name, ip_address, description FROM tserver WHERE id_server = %d",$id_server);
 	$row = db_get_row_sql ($sql);
 	echo '<form name="servers" method="POST" action="index.php?sec=gservers&sec2=godmode/servers/modificar_server&update=1">';
-	print_input_hidden ("server",$id_server);
+	html_print_input_hidden ("server",$id_server);
 	
 	$table->cellpadding=4;
 	$table->cellspacing=4;
@@ -42,9 +42,9 @@ if (isset($_GET["server"])) {
 	$table->class="databox_color";
 	
 	$table->data[] = array (__('Name'),$row["name"]);
-	$table->data[] = array (__('IP Address'),print_input_text ('address',$row["ip_address"],'',50,0,true));
-	$table->data[] = array (__('Description'),print_input_text ('description',$row["description"],'',50,0,true));
-	print_table ($table);
+	$table->data[] = array (__('IP Address'),html_print_input_text ('address',$row["ip_address"],'',50,0,true));
+	$table->data[] = array (__('Description'),html_print_input_text ('description',$row["description"],'',50,0,true));
+	html_print_table ($table);
 
 
 	echo '<div class="action-buttons" style="width: 450px">';
@@ -123,12 +123,12 @@ else {
 			$data[4] = human_time_comparation ($server["laststart"]);
 			$data[5] = human_time_comparation ($server["keepalive"]);
 			$data[6] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
-			$data[6] .= print_image ('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
+			$data[6] .= html_print_image ('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
 			$data[6] .= '</a>';
 			
 			array_push ($table->data, $data);
 		}
-		print_table ($table);
+		html_print_table ($table);
 		
 		//Legend
 		echo "<table>";
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 3e980c104c..0ed1f8f493 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -96,7 +96,7 @@ if (($create != "") OR ($view != "")){
 	echo '<td class="datos2">';
 	$fields[0]= __("Standard");
 	$fields[1]= __("Nagios");
-	print_select ($fields, "form_plugin_type", $form_plugin_type);
+	html_print_select ($fields, "form_plugin_type", $form_plugin_type);
 	
 	echo '<tr><td class="datos">'.__('Max. timeout');
 	echo '<td class="datos">';
@@ -256,7 +256,7 @@ else {
 			echo "</td><td class=$tdcolor>";
 			echo $row["execute"];
 			echo "</td><td class=$tdcolor>";
-			echo "<a href='index.php?sec=gservers&sec2=godmode/servers/plugin&kill_plugin=".$row["id"]."'>" . print_image("images/cross.png", true, array("border" => '0')) . "</a>";
+			echo "<a href='index.php?sec=gservers&sec2=godmode/servers/plugin&kill_plugin=".$row["id"]."'>" . html_print_image("images/cross.png", true, array("border" => '0')) . "</a>";
 			echo "</td></tr>";
 		}
 		echo "</table>";
diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php
index 09aee82df2..2aac7cc402 100644
--- a/pandora_console/godmode/servers/recon_script.php
+++ b/pandora_console/godmode/servers/recon_script.php
@@ -189,7 +189,7 @@ else {
 			echo "</td><td class='$tdcolor'>";
 			echo $row["description"];
 			echo "</td><td align='center' class='$tdcolor'>";
-			echo "<a href='index.php?sec=gservers&sec2=godmode/servers/recon_script&kill_reconscript=".$row["id_recon_script"]."'>" . print_image("images/cross.png", true, array("border" => '0')) . "</a>";
+			echo "<a href='index.php?sec=gservers&sec2=godmode/servers/recon_script&kill_reconscript=".$row["id_recon_script"]."'>" . html_print_image("images/cross.png", true, array("border" => '0')) . "</a>";
 			echo "</td></tr>";
 		}
 		echo "</table>";
diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php
index 2df22fbc10..fd92e70c67 100644
--- a/pandora_console/godmode/setup/file_manager.php
+++ b/pandora_console/godmode/setup/file_manager.php
@@ -105,10 +105,10 @@ $available_directories[$directory] = $directory;
 
 $real_directory = realpath ($config['homedir'].'/'.$directory);
 
-//box_upload_file_explorer($real_directory, $directory);
+//filemanager_box_upload_file_explorer($real_directory, $directory);
 
 
 echo '<h3>'.__('Index of %s', $directory).'</h3>';
 
-file_explorer($real_directory, $directory, 'index.php?sec=gsetup&sec2=godmode/setup/file_manager');
+filemanager_file_explorer($real_directory, $directory, 'index.php?sec=gsetup&sec2=godmode/setup/file_manager');
 ?>
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 749ac60666..0bd581ad42 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -49,7 +49,7 @@ switch ($action) {
 	case 'delete_connection':
 		$idConnectionMap = get_parameter('id_connection_map');
 	
-		$result = deleteMapConnection($idConnectionMap);
+		$result = gis_delete_map_connection($idConnectionMap);
 		
 		if($result === false)
 			echo '<h3 class="error">'.__('Could not be deleted').'</h3>';
@@ -79,16 +79,16 @@ if ($mapsConnections !== false) {
 			ui_print_group_icon ($mapsConnection['group_id'], true),
 			'<a href="index.php?sec=gsetup&sec2=godmode/setup/gis&amp;id_connection_map=' . 
 				$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
-				onClick="javascript: if (!confirm(\'' . __('Do you wan delete this connection?') . '\')) return false;">' . print_image ("images/cross.png", true).'</a>'); 
+				onClick="javascript: if (!confirm(\'' . __('Do you wan delete this connection?') . '\')) return false;">' . html_print_image ("images/cross.png", true).'</a>'); 
 	}
 }
 
-print_table($table);
+html_print_table($table);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form action="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2" method="post">';
-print_input_hidden ('action','create_connection_map');
-print_submit_button (__('Create'), '', false, 'class="sub next"');
+html_print_input_hidden ('action','create_connection_map');
+html_print_submit_button (__('Create'), '', false, 'class="sub next"');
 echo '</form>';
 echo '</div>';
 ?>
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index 0f71899d1f..5bebc25f01 100755
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -51,7 +51,7 @@ switch ($action) {
 		$mapConnection_centerAltitude = '0';
 		$mapConnectionData = null;
 		
-		print_input_hidden('action', 'save_map_connection');
+		html_print_input_hidden('action', 'save_map_connection');
 		break;
 	case 'edit_connection_map':
 		// Header
@@ -73,8 +73,8 @@ switch ($action) {
 		$mapConnection_centerAltitude = $mapConnection['initial_altitude'];
 		$mapConnectionData = json_decode($mapConnection['conection_data'], true);
 		
-		print_input_hidden('id_connection_map', $idConnectionMap);
-		print_input_hidden('action', 'save_edit_map_connection');
+		html_print_input_hidden('id_connection_map', $idConnectionMap);
+		html_print_input_hidden('action', 'save_edit_map_connection');
 		break;
 	case 'save_map_connection':
 	case 'save_edit_map_connection':
@@ -127,7 +127,7 @@ switch ($action) {
 				
 		//TODO VALIDATE PARAMETERS
 		if ($mapConnection_name != "" && $mapConnection_type != ""){
-			saveMapConnection($mapConnection_name, $mapConnection_group,
+			gis_save_map_connection($mapConnection_name, $mapConnection_group,
 				$mapConnection_numLevelsZoom, $mapConnection_defaultZoom,
 				$mapConnection_defaultLatitude, $mapConnection_defaultLongitude,
 				$mapConnection_defaultAltitude, $mapConnection_centerLatitude,
@@ -147,20 +147,20 @@ $table->width = '90%';
 
 $table->data = array();
 $table->data[0][0] = __('Connection Name') . ui_print_help_tip (__('Descriptive name for the connection'), true). ":";
-$table->data[0][1] = print_input_text ('name', $mapConnection_name, '', 30, 60, true);
+$table->data[0][1] = html_print_input_text ('name', $mapConnection_name, '', 30, 60, true);
 
 $table->data[1][0] = __("Group") . ui_print_help_tip (__('Group that owns the connection'), true) . ":";
-$table->data[1][1] = print_select_groups(false, false, false, 'group', $mapConnection_group, '', __('All'), '0', true);
+$table->data[1][1] = html_print_select_groups(false, false, false, 'group', $mapConnection_group, '', __('All'), '0', true);
 
 $table->data[2][0] = __('Number of zoom levels') . ":";
-$table->data[2][1] = print_input_text ('num_levels_zoom', $mapConnection_numLevelsZoom, '', 4, 10, true);
+$table->data[2][1] = html_print_input_text ('num_levels_zoom', $mapConnection_numLevelsZoom, '', 4, 10, true);
 
 
 $table->data[3][0] = __('Default zoom level') . ui_print_help_tip (__('Zoom level used when the map is opened'), true). ":";
-$table->data[3][1] = print_input_text ('initial_zoom', $mapConnection_defaultZoom, '', 4, 10, true);
+$table->data[3][1] = html_print_input_text ('initial_zoom', $mapConnection_defaultZoom, '', 4, 10, true);
 
 echo "<h3>" . __('Basic configuration') . "</h3>";
-print_table($table);
+html_print_table($table);
 
 $table->width = '60%';
 $table->data = array();
@@ -168,10 +168,10 @@ $types["OSM"] = __('Open Street Maps');
 $types["Gmap"] = __('Google Maps');
 $types["Static_Image"] = __('Static Image');
 $table->data[0][0] = __('Type') . ":";
-$table->data[0][1] = print_select($types, 'sel_type', $mapConnection_type, "selMapConnectionType();", __('Please select the connection type'), 0, true);
+$table->data[0][1] = html_print_select($types, 'sel_type', $mapConnection_type, "selMapConnectionType();", __('Please select the connection type'), 0, true);
 
 echo "<h3>" . __('Map connection type') . "</h3>";
-print_table ($table);
+html_print_table ($table);
 
 $optionsConnectionTypeTable = '';
 $mapConnectionDataUrl = '';
@@ -207,7 +207,7 @@ if ($mapConnectionData != null) {
 $optionsConnectionOSMTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="50%">' .
 		'<tr class="row_0">' .
 			'<td>'  . htmlentities(__("Tile Server URL"), ENT_QUOTES, "UTF-8") . ':</td>' .
-			'<td><input id="type" type="hidden" name="type" value="OSM" />' . print_input_text ('url', $mapConnectionDataUrl, '', 45, 90, true) . '</td>' .
+			'<td><input id="type" type="hidden" name="type" value="OSM" />' . html_print_input_text ('url', $mapConnectionDataUrl, '', 45, 90, true) . '</td>' .
 		'</tr>' . 
 	'</table>';
 
@@ -219,44 +219,44 @@ $gmaps_types["G_SATELITE_MAP"] = __('Google Satelite');
 $optionsConnectionGmapTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="90%">' .
 		'<tr class="row_0">' .
 			'<td>'  . __("Google Map Type") . ':</td>' .
-			'<td><input id="type" type="hidden" name="type" value="Gmap" />'.trim(print_select($gmaps_types,'gmap_type', $gmap_type, "", '', 0, true)) . '</td>' .
+			'<td><input id="type" type="hidden" name="type" value="Gmap" />'.trim(html_print_select($gmaps_types,'gmap_type', $gmap_type, "", '', 0, true)) . '</td>' .
 		'</tr>' . 
 		'<tr class="row_2">' .
 			'<td>'  . __("Google Maps Key") . ':</td>' .
 		'</tr>' . 
 		'<tr class="row_3">' .
-			'<td colspan="2">' . print_input_text ('gmap_key', $gmap_key, '', 90, 128, true) . '</td>' .
+			'<td colspan="2">' . html_print_input_text ('gmap_key', $gmap_key, '', 90, 128, true) . '</td>' .
 		'</tr>' . 
 	'</table>';
 // Image Map Connection
 $optionsConnectionImageTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="50%">' .
 		'<tr class="row_0">' .
 			'<td>'  . __("Image URL") . ':</td>' .
-			'<td colspan="3"><input id="type" type="hidden" name="type" value="Static_Image" />' . print_input_text ('url', $mapConnectionDataUrl, '', 45, 90, true) . '</td>' .
+			'<td colspan="3"><input id="type" type="hidden" name="type" value="Static_Image" />' . html_print_input_text ('url', $mapConnectionDataUrl, '', 45, 90, true) . '</td>' .
 		'</tr>' . 
 		'<tr class="row_1">' .
 			'<td colspan="4"><strong>'  . __("Corners of the area of the image") . ':</strong></td>' .
 		'</tr>' . 
 		'<tr class="row_2">' .
 			'<td>'  . __("Left") . ':</td>' .
-			'<td>'. print_input_text ('bb_left', $bb_left, '', 25, 25, true) . '</td>' .
+			'<td>'. html_print_input_text ('bb_left', $bb_left, '', 25, 25, true) . '</td>' .
 			'<td>'  . __("Bottom") . ':</td>' .
-			'<td>'. print_input_text ('bb_bottom', $bb_bottom, '',25 , 25, true) . '</td>' .
+			'<td>'. html_print_input_text ('bb_bottom', $bb_bottom, '',25 , 25, true) . '</td>' .
 		'</tr>' . 
 		'<tr class="row_3">' .
 			'<td>'  . __("Right") . ':</td>' .
-			'<td>'. print_input_text ('bb_right', $bb_right, '', 25, 25, true) . '</td>' .
+			'<td>'. html_print_input_text ('bb_right', $bb_right, '', 25, 25, true) . '</td>' .
 			'<td>'  . __("Top") . ':</td>' .
-			'<td>'. print_input_text ('bb_top', $bb_top, '', 25, 25, true) . '</td>' .
+			'<td>'. html_print_input_text ('bb_top', $bb_top, '', 25, 25, true) . '</td>' .
 		'</tr>' . 
 		'<tr class="row_4">' .
 			'<td colspan="4"><strong>'  . __("Image Size") . ':</strong></td>' .
 		'</tr>' . 
 		'<tr class="row_5">' .
 			'<td>'  . __("Width") . ':</td>' .
-			'<td>'. print_input_text ('image_width', $image_width, '', 25, 25, true) . '</td>' .
+			'<td>'. html_print_input_text ('image_width', $image_width, '', 25, 25, true) . '</td>' .
 			'<td>'  . __("Height") . ':</td>' .
-			'<td>'. print_input_text ('image_height', $image_height, '', 25, 25, true) . '</td>' .
+			'<td>'. html_print_input_text ('image_height', $image_height, '', 25, 25, true) . '</td>' .
 		'</tr>' . 
 	'</table>';
 if ($mapConnectionData != null) {
@@ -276,7 +276,7 @@ if ($mapConnectionData != null) {
 echo "<div id='form_map_connection_type'>" . $optionsConnectionTypeTable . "</div>";
 
 echo "<h3>" . __('Preview to select the center of the map and the default position of an agent without gis data') . "</h3>";
-print_button(__("Load preview map"),'button_refresh', false, 'refreshMapView();', 'class="sub"');
+html_print_button(__("Load preview map"),'button_refresh', false, 'refreshMapView();', 'class="sub"');
 echo "<br /><br />";
 echo "<div id='map' style='width: 300px; height: 300px; border: 1px solid black; float: left'></div>";
 
@@ -289,24 +289,24 @@ $table->data[0][1] = __('Map Center') . ui_print_help_tip (__('Position to cente
 $table->data[0][2] = __("Default position for agents without GIS data");
 
 $table->data[1][0] = __('Change in the map'). ui_print_help_tip (__('This selects what to change by clicking on the map'), true);
-$table->data[1][1] = print_radio_button_extended('radio_button', 1, '', 1, false, "changeSetManualPosition(true, false)", '', true);
-$table->data[1][2] = print_radio_button_extended('radio_button', 2, '', 0, false, "changeSetManualPosition(false, true)", '', true);
+$table->data[1][1] = html_print_radio_button_extended('radio_button', 1, '', 1, false, "changeSetManualPosition(true, false)", '', true);
+$table->data[1][2] = html_print_radio_button_extended('radio_button', 2, '', 0, false, "changeSetManualPosition(false, true)", '', true);
 
 $table->data[2][0] = __('Latitude') . ":";
-$table->data[2][1] = print_input_text ('center_latitude', $mapConnection_centerLatitude, '', 10, 10, true);
-$table->data[2][2] = print_input_text ('default_latitude', $mapConnection_defaultLatitude, '', 10, 10, true);
+$table->data[2][1] = html_print_input_text ('center_latitude', $mapConnection_centerLatitude, '', 10, 10, true);
+$table->data[2][2] = html_print_input_text ('default_latitude', $mapConnection_defaultLatitude, '', 10, 10, true);
 
 $table->data[3][0] = __('Longitude') . ":";
-$table->data[3][1] = print_input_text ('center_longitude', $mapConnection_centerLongitude, '', 10, 10, true);
-$table->data[3][2] = print_input_text ('default_longitude', $mapConnection_defaultLongitude, '', 10, 10, true);
+$table->data[3][1] = html_print_input_text ('center_longitude', $mapConnection_centerLongitude, '', 10, 10, true);
+$table->data[3][2] = html_print_input_text ('default_longitude', $mapConnection_defaultLongitude, '', 10, 10, true);
 
 $table->data[4][0] = __('Altitude') . ":";
-$table->data[4][1] = print_input_text ('center_altitude', $mapConnection_centerAltitude, '', 10, 10, true);
-$table->data[4][2] = print_input_text ('default_altitude', $mapConnection_defaultAltitude, '', 10, 10, true);
-print_table($table);
+$table->data[4][1] = html_print_input_text ('center_altitude', $mapConnection_centerAltitude, '', 10, 10, true);
+$table->data[4][2] = html_print_input_text ('default_altitude', $mapConnection_defaultAltitude, '', 10, 10, true);
+html_print_table($table);
 
 echo '<div class="action-buttons" style="clear: left; width: 90%; float: left;">';
-print_submit_button (__('Save'), '', false, 'class="sub save wand"');
+html_print_submit_button (__('Save'), '', false, 'class="sub save wand"');
 echo '</div>';
 echo "</form>";
 
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index 1f03785a88..a59ecffb73 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -136,7 +136,7 @@ else {  // Main list view for Links editor
 			$color = 1;
 		}
 		echo "<tr><td class='$tdcolor'><b><a href='index.php?sec=gsetup&sec2=godmode/setup/links&form_edit=1&id_link=".$row["id_link"]."'>".$row["name"]."</a></b></td>";
-		echo '<td class="'.$tdcolor.'" align="center"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row["id_link"].'&borrar='.$row["id_link"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . print_image("images/cross.png", true) . '</a></td></tr>';
+		echo '<td class="'.$tdcolor.'" align="center"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row["id_link"].'&borrar='.$row["id_link"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true) . '</a></td></tr>';
 	}
 	echo "</table>";
 	echo "<table width='290px'>";
diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php
index 73b4e5617a..e42fe59ec8 100644
--- a/pandora_console/godmode/setup/news.php
+++ b/pandora_console/godmode/setup/news.php
@@ -154,7 +154,7 @@ else {
 		echo "<td class='$tdcolor'>".$row["author"]."</b></td>";
 		echo "<td class='$tdcolor'>".$row["timestamp"]."</b></td>";
 		
-		echo '<td class="'.$tdcolor.'" align="center"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row["id_news"].'&borrar='.$row["id_news"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . print_image("images/cross.png", true, array("border" => '0')) . '</a></td></tr>';
+		echo '<td class="'.$tdcolor.'" align="center"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row["id_news"].'&borrar='.$row["id_news"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a></td></tr>';
 	}
 	echo "</table>";
 	echo "<table width='90%'>";
diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php
index 17308cb6da..e9dfb65deb 100644
--- a/pandora_console/godmode/setup/os.builder.php
+++ b/pandora_console/godmode/setup/os.builder.php
@@ -31,22 +31,22 @@ $table->width = '50%';
 $table->style[0] = 'font-weight: bolder; vertical-align: top;';
 
 $table->data[0][0] = __('Name:');
-$table->data[0][1] = print_input_text('name', $name, __('Name'), 20, 30, true);
+$table->data[0][1] = html_print_input_text('name', $name, __('Name'), 20, 30, true);
 $table->data[1][0] = __('Description');
-$table->data[1][1] = print_textarea('description', 5, 10, $description, '', true);
+$table->data[1][1] = html_print_textarea('description', 5, 10, $description, '', true);
 $icons = get_list_os_icons_dir();
 $table->data[2][0] = __('Icon');
-$table->data[2][1] = print_select($icons, 'icon',  $icon, 'show_icon_OS();', __('None'), 0, true);
+$table->data[2][1] = html_print_select($icons, 'icon',  $icon, 'show_icon_OS();', __('None'), 0, true);
 $table->data[2][1] .= ' <span id="icon_image">' . ui_print_os_icon($idOS, false, true) . '</span>';
 
 echo '<form action="post">';
-print_table($table);
+html_print_table($table);
 
-print_input_hidden('id_os', $idOS);
-print_input_hidden ('action', $actionHidden);
+html_print_input_hidden('id_os', $idOS);
+html_print_input_hidden ('action', $actionHidden);
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button ($textButton, 'update_button', false, $classButton);
+html_print_submit_button ($textButton, 'update_button', false, $classButton);
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 5fc1139e2f..866943a44d 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -45,7 +45,7 @@ foreach ($osList as $os) {
 	$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&tab=builder&id_os=' . $os['id_os'] . '">' . safe_output($os['name']) . '</a>';
 	$data[] = ui_print_truncate_text(safe_output($os['description']), 25, true, true);
 	if ($os['id_os'] > 13) {
-		$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=delete&tab=list&id_os=' . $os['id_os'] . '">' . print_image("images/cross.png", true) . '</a>';
+		$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=delete&tab=list&id_os=' . $os['id_os'] . '">' . html_print_image("images/cross.png", true) . '</a>';
 	}
 	else {
 		//The original icons of pandora don't delete.
@@ -55,5 +55,5 @@ foreach ($osList as $os) {
 	$table->data[] = $data;
 }
 
-print_table($table);
+html_print_table($table);
 ?>
\ No newline at end of file
diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php
index 2c4970e1c6..75412c8952 100644
--- a/pandora_console/godmode/setup/os.php
+++ b/pandora_console/godmode/setup/os.php
@@ -119,11 +119,11 @@ $buttons = array(
 	'list' => array(
 		'active' => false,
 		'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&tab=list">' . 
-			print_image ("images/god6.png", true, array ("title" => __('List OS'))) .'</a>'),
+			html_print_image ("images/god6.png", true, array ("title" => __('List OS'))) .'</a>'),
 	'builder' => array(
 		'active' => false,
 		'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&tab=builder">' . 
-			print_image ("images/config.png", true, array ("title" => __('Builder OS'))) .'</a>'));
+			html_print_image ("images/config.png", true, array ("title" => __('Builder OS'))) .'</a>'));
 
 			
 $buttons[$tab]['active'] = true;
diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php
index c93d79f81d..5f6bef4ea8 100644
--- a/pandora_console/godmode/setup/performance.php
+++ b/pandora_console/godmode/setup/performance.php
@@ -44,55 +44,55 @@ $table->data = array ();
 
 
 $table->data[1][0] = __('Max. days before delete events');
-$table->data[1][1] = print_input_text ('event_purge', $config["event_purge"], '', 5, 5, true);
+$table->data[1][1] = html_print_input_text ('event_purge', $config["event_purge"], '', 5, 5, true);
 
 $table->data[2][0] = __('Max. days before delete traps');
-$table->data[2][1] = print_input_text ('trap_purge', $config["trap_purge"], '', 5, 5, true);
+$table->data[2][1] = html_print_input_text ('trap_purge', $config["trap_purge"], '', 5, 5, true);
 
 $table->data[3][0] = __('Max. days before delete audit events');
-$table->data[3][1] = print_input_text ('audit_purge', $config["audit_purge"], '', 5, 5, true);
+$table->data[3][1] = html_print_input_text ('audit_purge', $config["audit_purge"], '', 5, 5, true);
 
 $table->data[4][0] = __('Max. days before delete string data');
-$table->data[4][1] = print_input_text ('string_purge', $config["string_purge"], '', 5, 5, true);
+$table->data[4][1] = html_print_input_text ('string_purge', $config["string_purge"], '', 5, 5, true);
 
 $table->data[5][0] = __('Max. days before delete GIS data');
-$table->data[5][1] = print_input_text ('gis_purge', $config["gis_purge"], '', 5, 5, true);
+$table->data[5][1] = html_print_input_text ('gis_purge', $config["gis_purge"], '', 5, 5, true);
 
 $table->data[6][0] = __('Max. days before purge');
-$table->data[6][1] = print_input_text ('days_purge', $config["days_purge"], '', 5, 5, true);
+$table->data[6][1] = html_print_input_text ('days_purge', $config["days_purge"], '', 5, 5, true);
 
 $table->data[7][0] = __('Max. days before compact data');
-$table->data[7][1] = print_input_text ('days_compact', $config["days_compact"], '', 5, 5, true);
+$table->data[7][1] = html_print_input_text ('days_compact', $config["days_compact"], '', 5, 5, true);
 
 $table->data[8][0] = __('Compact interpolation in hours (1 Fine-20 bad)');
-$table->data[8][1] = print_input_text ('step_compact', $config["step_compact"], '', 5, 5, true);
+$table->data[8][1] = html_print_input_text ('step_compact', $config["step_compact"], '', 5, 5, true);
 
 $table->data[9][0] = __('SLA period (seconds)');
-$table->data[9][1] = print_input_text ('sla_period', $config["sla_period"], '', 8, 8, true);
+$table->data[9][1] = html_print_input_text ('sla_period', $config["sla_period"], '', 8, 8, true);
 
 $table->data[10][0] = __('Default hours for event view');
-$table->data[10][1] = print_input_text ('event_view_hr', $config["event_view_hr"], '', 5, 5, true);
+$table->data[10][1] = html_print_input_text ('event_view_hr', $config["event_view_hr"], '', 5, 5, true);
 
 //$table->data[11][0] = __('Compact CSS and JS into header');
-//$table->data[11][1] = __('Yes').'&nbsp;'.print_radio_button ('compact_header', 1, '', $config["compact_header"], true).'&nbsp;&nbsp;';
-//$table->data[11][1] .= __('No').'&nbsp;'.print_radio_button ('compact_header', 0, '', $config["compact_header"], true);
+//$table->data[11][1] = __('Yes').'&nbsp;'.html_print_radio_button ('compact_header', 1, '', $config["compact_header"], true).'&nbsp;&nbsp;';
+//$table->data[11][1] .= __('No').'&nbsp;'.html_print_radio_button ('compact_header', 0, '', $config["compact_header"], true);
 
 $table->data[12][0] = __('Use realtime statistics');
-$table->data[12][1] = __('Yes').'&nbsp;'.print_radio_button ('realtimestats', 1, '', $config["realtimestats"], true).'&nbsp;&nbsp;';
-$table->data[12][1] .= __('No').'&nbsp;'.print_radio_button ('realtimestats', 0, '', $config["realtimestats"], true);
+$table->data[12][1] = __('Yes').'&nbsp;'.html_print_radio_button ('realtimestats', 1, '', $config["realtimestats"], true).'&nbsp;&nbsp;';
+$table->data[12][1] .= __('No').'&nbsp;'.html_print_radio_button ('realtimestats', 0, '', $config["realtimestats"], true);
 
 $table->data[13][0] = __('Batch statistics period (secs)');
-$table->data[13][1] = print_input_text ('stats_interval', $config["stats_interval"], '', 5, 5, true);
+$table->data[13][1] = html_print_input_text ('stats_interval', $config["stats_interval"], '', 5, 5, true);
 
 $table->data[14][0] = __('Use agent access graph') . ui_print_help_icon("agent_access", true);
-$table->data[14][1] = __('Yes').'&nbsp;'.print_radio_button ('agentaccess', 1, '', $config["agentaccess"], true).'&nbsp;&nbsp;';
-$table->data[14][1] .= __('No').'&nbsp;'.print_radio_button ('agentaccess', 0, '', $config["agentaccess"], true);
+$table->data[14][1] = __('Yes').'&nbsp;'.html_print_radio_button ('agentaccess', 1, '', $config["agentaccess"], true).'&nbsp;&nbsp;';
+$table->data[14][1] .= __('No').'&nbsp;'.html_print_radio_button ('agentaccess', 0, '', $config["agentaccess"], true);
 
 echo '<form id="form_setup" method="post">';
-print_input_hidden ('update_config', 1);
-print_table ($table);
+html_print_input_hidden ('update_config', 1);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
+html_print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
 echo '</div>';
 echo '</form>';
 ?>
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 06def14c7d..836eaba20a 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -74,60 +74,60 @@ if ($current_system_lang == ""){
 }
 
 $table->data[0][0] = __('Language code for Pandora');
-$table->data[0][1] = print_select_from_sql ('SELECT id_language, name FROM tlanguage',
+$table->data[0][1] = html_print_select_from_sql ('SELECT id_language, name FROM tlanguage',
 	'language', $current_system_lang , '', '', '', true);
 
 $table->data[1][0] = __('Remote config directory');
-$table->data[1][1] = print_input_text ('remote_config', $config["remote_config"], '', 30, 100, true);
+$table->data[1][1] = html_print_input_text ('remote_config', $config["remote_config"], '', 30, 100, true);
 
 $table->data[6][0] = __('Auto login (hash) password');
-$table->data[6][1] = print_input_text ('loginhash_pwd', $config["loginhash_pwd"], '', 15, 15, true);
+$table->data[6][1] = html_print_input_text ('loginhash_pwd', $config["loginhash_pwd"], '', 15, 15, true);
 
 $table->data[8][0] = __('Timestamp or time comparation') . ui_print_help_icon ("time_stamp-comparation", true);
 $table->data[8][1] = __('Comparation in rollover').' ';
-$table->data[8][1] .= print_radio_button ('prominent_time', "comparation", '', $config["prominent_time"], true);
+$table->data[8][1] .= html_print_radio_button ('prominent_time', "comparation", '', $config["prominent_time"], true);
 $table->data[8][1] .= '<br />'.__('Timestamp in rollover').' ';
-$table->data[8][1] .= print_radio_button ('prominent_time', "timestamp", '', $config["prominent_time"], true);
+$table->data[8][1] .= html_print_radio_button ('prominent_time', "timestamp", '', $config["prominent_time"], true);
 
 $table->data[9][0] = __('Time source') . ui_print_help_icon ("timesource", true);
 $sources["system"] = __('System');
 $sources["sql"] = __('Database');
-$table->data[9][1] = print_select ($sources, 'timesource', $config["timesource"], '', '', '', true);
+$table->data[9][1] = html_print_select ($sources, 'timesource', $config["timesource"], '', '', '', true);
 
 $table->data[10][0] = __('Automatic update check');
-$table->data[10][1] = __('Yes').'&nbsp;'.print_radio_button ('autoupdate', 1, '', $config["autoupdate"], true).'&nbsp;&nbsp;';
-$table->data[10][1] .= __('No').'&nbsp;'.print_radio_button ('autoupdate', 0, '', $config["autoupdate"], true);
+$table->data[10][1] = __('Yes').'&nbsp;'.html_print_radio_button ('autoupdate', 1, '', $config["autoupdate"], true).'&nbsp;&nbsp;';
+$table->data[10][1] .= __('No').'&nbsp;'.html_print_radio_button ('autoupdate', 0, '', $config["autoupdate"], true);
 
 $table->data[11][0] = __('Enforce https');
-$table->data[11][1] = __('Yes').'&nbsp;'.print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'&nbsp;&nbsp;';
-$table->data[11][1] .= __('No').'&nbsp;'.print_radio_button ('https', 0, '', $config["https"], true);
+$table->data[11][1] = __('Yes').'&nbsp;'.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'&nbsp;&nbsp;';
+$table->data[11][1] .= __('No').'&nbsp;'.html_print_radio_button ('https', 0, '', $config["https"], true);
 
 $table->data[14][0] = __('Attachment store');
-$table->data[14][1] = print_input_text ('attachment_store', $config["attachment_store"], '', 50, 255, true);
+$table->data[14][1] = html_print_input_text ('attachment_store', $config["attachment_store"], '', 50, 255, true);
 
 $table->data[15][0] = __('IP list with API access') . 
 	ui_print_help_tip (__("The list of IPs separate with carriage return."), true);
 $list_ACL_IPs_for_API = get_parameter('list_ACL_IPs_for_API', implode("\n", $config['list_ACL_IPs_for_API']));
-$table->data[15][1] = print_textarea('list_ACL_IPs_for_API', 2, 25, $list_ACL_IPs_for_API, 'style="height: 50px; width: 300px"', true);
+$table->data[15][1] = html_print_textarea('list_ACL_IPs_for_API', 2, 25, $list_ACL_IPs_for_API, 'style="height: 50px; width: 300px"', true);
 
 $table->data[16][0] = __('API password') . 
 	ui_print_help_tip (__("Please be careful if you put a password put https access."), true);
-$table->data[16][1] = print_input_text('api_password', $config['api_password'], '', 25, 255, true);
+$table->data[16][1] = html_print_input_text('api_password', $config['api_password'], '', 25, 255, true);
 
 $table->data[17][0] = __('Enable GIS features in Pandora Console');
-$table->data[17][1] = __('Yes').'&nbsp;'.print_radio_button ('activate_gis', 1, '', $config["activate_gis"], true).'&nbsp;&nbsp;';
-$table->data[17][1] .= __('No').'&nbsp;'.print_radio_button ('activate_gis', 0, '', $config["activate_gis"], true);
+$table->data[17][1] = __('Yes').'&nbsp;'.html_print_radio_button ('activate_gis', 1, '', $config["activate_gis"], true).'&nbsp;&nbsp;';
+$table->data[17][1] .= __('No').'&nbsp;'.html_print_radio_button ('activate_gis', 0, '', $config["activate_gis"], true);
 
 $table->data[18][0] = __('Enable Integria incidents in Pandora Console');
-$table->data[18][1] = __('Yes').'&nbsp;'.print_radio_button ('integria_enabled', 1, '', $config["integria_enabled"], true).'&nbsp;&nbsp;';
-$table->data[18][1] .= __('No').'&nbsp;'.print_radio_button ('integria_enabled', 0, '', $config["integria_enabled"], true);
+$table->data[18][1] = __('Yes').'&nbsp;'.html_print_radio_button ('integria_enabled', 1, '', $config["integria_enabled"], true).'&nbsp;&nbsp;';
+$table->data[18][1] .= __('No').'&nbsp;'.html_print_radio_button ('integria_enabled', 0, '', $config["integria_enabled"], true);
 
 if($config["integria_enabled"]) {
 	$table->data[19][0] = __('Integria URL');
-	$table->data[19][1] = print_input_text ('integria_url', $config["integria_url"], '', 25, 255, true);
+	$table->data[19][1] = html_print_input_text ('integria_url', $config["integria_url"], '', 25, 255, true);
 
 	$table->data[20][0] = __('Integria API password');
-	$table->data[20][1] = print_input_text ('integria_api_password', $config["integria_api_password"], '', 25, 25, true);
+	$table->data[20][1] = html_print_input_text ('integria_api_password', $config["integria_api_password"], '', 25, 25, true);
 	
 	require_once('include/functions_incidents.php');
 	$invent = call_api($config['integria_url']."/include/api.php?user=".$config['id_user']."&pass=".$config['integria_api_password']."&op=get_inventories");
@@ -146,26 +146,26 @@ if($config["integria_enabled"]) {
 	}
 	
 	$table->data[21][0] = __('Integria inventory');
-	$table->data[21][1] = print_select($inventories, 'integria_inventory', $config["integria_inventory"], '', '', '', true);
+	$table->data[21][1] = html_print_select($inventories, 'integria_inventory', $config["integria_inventory"], '', '', '', true);
 }
 
 $table->data[22][0] = __('Timezone setup');
-$table->data[22][1] = print_input_text ('timezone', $config["timezone"], '', 25, 25, true);
+$table->data[22][1] = html_print_input_text ('timezone', $config["timezone"], '', 25, 25, true);
 
 $sounds = get_sounds();
 $table->data[23][0] = __('Sound for Alert fired');
-$table->data[23][1] = print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true);
-$table->data[23][1] .= ' <a href="javascript: toggleButton(\'alert\');">' . print_image("images/control_play.png", true, array("id" => "button_sound_alert", "style" => "vertical-align: middle;", "width" => "16")) . '</a>';
+$table->data[23][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true);
+$table->data[23][1] .= ' <a href="javascript: toggleButton(\'alert\');">' . html_print_image("images/control_play.png", true, array("id" => "button_sound_alert", "style" => "vertical-align: middle;", "width" => "16")) . '</a>';
 $table->data[23][1] .= '<div id="layer_sound_alert"></div>';
 
 $table->data[24][0] = __('Sound for Monitor critical');
-$table->data[24][1] = print_select($sounds, 'sound_critical', $config['sound_critical'], 'replaySound(\'critical\');', '', '', true);
-$table->data[24][1] .= ' <a href="javascript: toggleButton(\'critical\');">' . print_image("images/control_play.png", true, array("id" => "button_sound_critical", "style" => "vertical-align: middle;", "width" => "16")) . '</a>';
+$table->data[24][1] = html_print_select($sounds, 'sound_critical', $config['sound_critical'], 'replaySound(\'critical\');', '', '', true);
+$table->data[24][1] .= ' <a href="javascript: toggleButton(\'critical\');">' . html_print_image("images/control_play.png", true, array("id" => "button_sound_critical", "style" => "vertical-align: middle;", "width" => "16")) . '</a>';
 $table->data[24][1] .= '<div id="layer_sound_critical"></div>';
 
 $table->data[25][0] = __('Sound for Monitor warning');
-$table->data[25][1] = print_select($sounds, 'sound_warning', $config['sound_warning'], 'replaySound(\'warning\');', '', '', true);
-$table->data[25][1] .= ' <a href="javascript: toggleButton(\'warning\');">' . print_image("images/control_play.png", true, array("id" => "button_sound_warning", "style" => "vertical-align: middle;", "width" => "16")) . '</a>';
+$table->data[25][1] = html_print_select($sounds, 'sound_warning', $config['sound_warning'], 'replaySound(\'warning\');', '', '', true);
+$table->data[25][1] .= ' <a href="javascript: toggleButton(\'warning\');">' . html_print_image("images/control_play.png", true, array("id" => "button_sound_warning", "style" => "vertical-align: middle;", "width" => "16")) . '</a>';
 $table->data[25][1] .= '<div id="layer_sound_warning"></div>';
 ?>
 <script type="text/javascript">
@@ -192,10 +192,10 @@ function replaySound(type) {
 enterprise_hook ('setup');
 
 echo '<form id="form_setup" method="post">';
-print_input_hidden ('update_config', 1);
-print_table ($table);
+html_print_input_hidden ('update_config', 1);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
+html_print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index dcd2af56b7..41db69d20b 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -39,41 +39,41 @@ $table->size[0] = '30%';
 $table->data[0][0] = __('Authentication method');
 $auth_methods = array ('mysql' => __('Local Pandora FMS'), __('ldap') => 'LDAP');
 enterprise_hook ('add_enterprise_auth_methods', array (&$auth_methods));
-$table->data[0][1] = print_select ($auth_methods, 'auth', $config['auth'], 'show_selected_rows ();', '', 0, true);
+$table->data[0][1] = html_print_select ($auth_methods, 'auth', $config['auth'], 'show_selected_rows ();', '', 0, true);
 
 $table->data[1][0] = __('Autocreate remote users');
-$table->data[1][1] = __('Yes').'&nbsp;'.print_radio_button_extended ('autocreate_remote_users', 1, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true).'&nbsp;&nbsp;';
-$table->data[1][1] .= __('No').'&nbsp;'.print_radio_button_extended ('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true);
+$table->data[1][1] = __('Yes').'&nbsp;'.html_print_radio_button_extended ('autocreate_remote_users', 1, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true).'&nbsp;&nbsp;';
+$table->data[1][1] .= __('No').'&nbsp;'.html_print_radio_button_extended ('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, 'enable_profile_options ();', '', true);
 $table->rowstyle[1] = $config['auth'] != 'mysql' ? '' : 'display: none;';
 $table->data[2][0] = __('Autocreate profile');
 $profile_list = get_profiles ();
 if ($profile_list === false) {
 	$profile_list = array ();
 }	
-$table->data[2][1] = print_select ($profile_list, 'default_remote_profile', $config['default_remote_profile'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
+$table->data[2][1] = html_print_select ($profile_list, 'default_remote_profile', $config['default_remote_profile'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
 $table->data[3][0] = __('Autocreate profile group');
-$table->data[3][1] = print_select_groups ($config['id_user'], "AR", true, 'default_remote_group', $config['default_remote_group'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
+$table->data[3][1] = html_print_select_groups ($config['id_user'], "AR", true, 'default_remote_group', $config['default_remote_group'], '', '', '', true, false, true, '', $config['autocreate_remote_users'] == 0);
 $table->data[4][0] = __('Autocreate blacklist') . ui_print_help_icon ('autocreate_blacklist', true);
-$table->data[4][1] = print_input_text ('autocreate_blacklist', $config['autocreate_blacklist'], '', 60, 100, true);
+$table->data[4][1] = html_print_input_text ('autocreate_blacklist', $config['autocreate_blacklist'], '', 60, 100, true);
 for ($i = 1; $i <= 4; $i++) {
 	$table->rowstyle[$i] = $config['auth'] != 'mysql' ? '' : 'display: none;';
 	$table->rowclass[$i] = 'remote';
 }
 
 $table->data[5][0] = __('LDAP server');
-$table->data[5][1] = print_input_text ('ldap_server', $config['ldap_server'], '', 30, 100, true);
+$table->data[5][1] = html_print_input_text ('ldap_server', $config['ldap_server'], '', 30, 100, true);
 $table->data[6][0] = __('LDAP port');
-$table->data[6][1] = print_input_text ('ldap_port', $config['ldap_port'], '', 10, 100, true);
+$table->data[6][1] = html_print_input_text ('ldap_port', $config['ldap_port'], '', 10, 100, true);
 $table->data[7][0] = __('LDAP version');
 $ldap_versions = array (1 => 'LDAPv1', 2 => 'LDAPv2', 3 => 'LDAPv3');
-$table->data[7][1] = print_select ($ldap_versions, 'ldap_version', $config['ldap_version'], '', '', 0, true);
+$table->data[7][1] = html_print_select ($ldap_versions, 'ldap_version', $config['ldap_version'], '', '', 0, true);
 $table->data[8][0] = __('Start TLS');
-$table->data[8][1] = __('Yes').'&nbsp;'.print_radio_button ('ldap_start_tls', 1, '', $config['ldap_start_tls'], true).'&nbsp;&nbsp;';
-$table->data[8][1] .= __('No').'&nbsp;'.print_radio_button ('ldap_start_tls', 0, '', $config['ldap_start_tls'], true);
+$table->data[8][1] = __('Yes').'&nbsp;'.html_print_radio_button ('ldap_start_tls', 1, '', $config['ldap_start_tls'], true).'&nbsp;&nbsp;';
+$table->data[8][1] .= __('No').'&nbsp;'.html_print_radio_button ('ldap_start_tls', 0, '', $config['ldap_start_tls'], true);
 $table->data[9][0] = __('Base DN');
-$table->data[9][1] = print_input_text ('ldap_base_dn', $config['ldap_base_dn'], '', 60, 100, true);
+$table->data[9][1] = html_print_input_text ('ldap_base_dn', $config['ldap_base_dn'], '', 60, 100, true);
 $table->data[10][0] = __('Login attribute');
-$table->data[10][1] = print_input_text ('ldap_login_attr', $config['ldap_login_attr'], '', 60, 100, true);
+$table->data[10][1] = html_print_input_text ('ldap_login_attr', $config['ldap_login_attr'], '', 60, 100, true);
 
 // Hide LDAP configuration options
 for ($i = 5; $i <= 10; $i++) {
@@ -85,10 +85,10 @@ for ($i = 5; $i <= 10; $i++) {
 enterprise_hook ('add_enterprise_auth_options', array (&$table, 11));
 
 echo '<form id="form_setup" method="post">';
-print_input_hidden ('update_config', 1);
-print_table ($table);
+html_print_input_hidden ('update_config', 1);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
+html_print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
 echo '</div>';
 echo '</form>';
 ?>
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 309a1eb139..ce6cfdadbe 100644
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -46,44 +46,44 @@ $table->data = array ();
 
 $table->data[1][0] = __('Date format string') . ui_print_help_icon("date_format", true);
 $table->data[1][1] = '<em>'.__('Example').'</em> '.date ($config["date_format"]);
-$table->data[1][1] .= print_input_text ('date_format', $config["date_format"], '', 30, 100, true);
+$table->data[1][1] .= html_print_input_text ('date_format', $config["date_format"], '', 30, 100, true);
 
 $table->data[2][0] = __('Graph color (min)');
-$table->data[2][1] = print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true);
+$table->data[2][1] = html_print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true);
 
 $table->data[3][0] = __('Graph color (avg)');
-$table->data[3][1] = print_input_text ('graph_color2', $config["graph_color2"], '', 8, 8, true);
+$table->data[3][1] = html_print_input_text ('graph_color2', $config["graph_color2"], '', 8, 8, true);
 
 $table->data[4][0] = __('Graph color (max)');
-$table->data[4][1] = print_input_text ('graph_color3', $config["graph_color3"], '', 8, 8, true);
+$table->data[4][1] = html_print_input_text ('graph_color3', $config["graph_color3"], '', 8, 8, true);
 
 $table->data[5][0] = __('Graphic resolution (1-low, 5-high)');
-$table->data[5][1] = print_input_text ('graph_res', $config["graph_res"], '', 5, 5, true);
+$table->data[5][1] = html_print_input_text ('graph_res', $config["graph_res"], '', 5, 5, true);
 
 $table->data[6][0] = __('Style template');
-$table->data[6][1] = print_select (get_css_themes (), 'style', $config["style"].'.css', '', '', '', true);
+$table->data[6][1] = html_print_select (get_css_themes (), 'style', $config["style"].'.css', '', '', '', true);
 
 $table->data[7][0] = __('Block size for pagination');
-$table->data[7][1] = print_input_text ('block_size', $config["block_size"], '', 5, 5, true);
+$table->data[7][1] = html_print_input_text ('block_size', $config["block_size"], '', 5, 5, true);
 
 $table->data[8][0] = __('Use round corners');
-$table->data[8][1] = __('Yes').'&nbsp;'.print_radio_button ('round_corner', 1, '', $config["round_corner"], true).'&nbsp;&nbsp;';
-$table->data[8][1] .= __('No').'&nbsp;'.print_radio_button ('round_corner', 0, '', $config["round_corner"], true);
+$table->data[8][1] = __('Yes').'&nbsp;'.html_print_radio_button ('round_corner', 1, '', $config["round_corner"], true).'&nbsp;&nbsp;';
+$table->data[8][1] .= __('No').'&nbsp;'.html_print_radio_button ('round_corner', 0, '', $config["round_corner"], true);
 
 $table->data[9][0] = __('Status icon set');
 $iconsets["default"] = __('Colors');
 $iconsets["faces"] = __('Faces');
 $iconsets["color_text"] = __('Colors and text');
-$table->data[9][1] = print_select ($iconsets, 'status_images_set', $config["status_images_set"], '', '', '', true);
+$table->data[9][1] = html_print_select ($iconsets, 'status_images_set', $config["status_images_set"], '', '', '', true);
 
 
 $table->data[10][0] = __('Font path');
 $fonts = load_fonts();
-$table->data[10][1] = print_select($fonts, 'fontpath', $config["fontpath"], '', '', 0, true);
+$table->data[10][1] = html_print_select($fonts, 'fontpath', $config["fontpath"], '', '', 0, true);
 
 
 $table->data[11][0] = __('Font size');
-$table->data[11][1] = print_select(range(1, 15), 'font_size', $config["font_size"], '', '', 0, true); 
+$table->data[11][1] = html_print_select(range(1, 15), 'font_size', $config["font_size"], '', '', 0, true); 
 
 $table->data[12][0] = __('Flash charts');
 $table->data[12][1] = __('Yes').'&nbsp;'.print_radio_button ('flash_charts', 1, '', $config["flash_charts"], true).'&nbsp;&nbsp;';
@@ -91,14 +91,14 @@ $table->data[12][1] .= __('No').'&nbsp;'.print_radio_button ('flash_charts', 0,
 
 if (!defined ('PANDORA_ENTERPRISE')){
 	$table->data[13][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true);
-	$table->data[13][1] = print_select (list_files ('images/custom_logo', "png", 1, 0), 'custom_logo', $config["custom_logo"], '', '', '', true);
+	$table->data[13][1] = html_print_select (list_files ('images/custom_logo', "png", 1, 0), 'custom_logo', $config["custom_logo"], '', '', '', true);
 }
 
 echo '<form id="form_setup" method="post">';
-print_input_hidden ('update_config', 1);
-print_table ($table);
+html_print_input_hidden ('update_config', 1);
+html_print_table ($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
+html_print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
 echo '</div>';
 echo '</form>';
 
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index b8fd59dec9..f484dfe787 100644
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -164,49 +164,49 @@ if (isset ($_GET["update_alert"])) {
 		$fields[$row["id"]] = $row["name"];
 	}
 	
-	print_select_from_sql ('SELECT id, name FROM talert_actions ORDER BY name',
+	html_print_select_from_sql ('SELECT id, name FROM talert_actions ORDER BY name',
 		"alert_type", $alert_type, '', '', 0, false, false, false);
 	echo '</td></tr>';
 	
 	// Description
 	echo '<tr><td class="datos">'.__('Description').'</td><td class="datos">';
-	print_input_text ("description", $description, '', 60);
+	html_print_input_text ("description", $description, '', 60);
 	echo '</td></tr>';
 	
 	// OID
 	echo '<tr id="tr-oid"><td class="datos2">'.__('OID').'</td><td class="datos2">';
-	print_input_text ("oid", $oid, '', 30);
+	html_print_input_text ("oid", $oid, '', 30);
 	echo '</td></tr>';
 
 	// OID Custom
 	echo '<tr id="tr-custom_value"><td class="datos">'.__('Custom Value')."/".__("OID").'</td><td class="datos">';
-	print_input_text ("custom_value", $custom_value, '', 30);
+	html_print_input_text ("custom_value", $custom_value, '', 30);
 	echo '</td></tr>';
 
 	// SNMP Agent
 	echo '<tr id="tr-source_ip"><td class="datos2">'.__('SNMP Agent').' (IP)</td><td class="datos2">';
-	print_input_text ("source_ip", $source_ip, '', 30);
+	html_print_input_text ("source_ip", $source_ip, '', 30);
 	echo '</td></tr>';
 		
 	// Alert fields
 	echo '<tr><td class="datos">'.__('Field #1 (Alias, name)').'</td><td class="datos">';
-	print_input_text ("al_field1", $al_field1, '', 30);
+	html_print_input_text ("al_field1", $al_field1, '', 30);
 	echo '</td></tr>';
 	
 	echo '<tr><td class="datos2">'.__('Field #2 (Single Line)').'</td><td class="datos2">';
-	print_input_text ("al_field2", $al_field2, '', 30);
+	html_print_input_text ("al_field2", $al_field2, '', 30);
 	echo '</td></tr>';
 	
 	echo '<tr><td class="datos" valign="top">'.__('Field #3 (Full Text)').'<td class="datos">';
-	print_textarea ("al_field3", $al_field3, 4, $al_field3, 'style="width:400px"');
+	html_print_textarea ("al_field3", $al_field3, 4, $al_field3, 'style="width:400px"');
 	echo '</td></tr>';
 	
 	// Max / Min alerts
 	echo '<tr><td class="datos2">'.__('Min. number of alerts').'</td><td class="datos2">';
-	print_input_text ("min_alerts", $min_alerts, '', 3);
+	html_print_input_text ("min_alerts", $min_alerts, '', 3);
 	
 	echo '</td></tr><tr><td class="datos">'.__('Max. number of alerts').'</td><td class="datos">';
-	print_input_text ("max_alerts", $max_alerts, '', 3);
+	html_print_input_text ("max_alerts", $max_alerts, '', 3);
 	echo '</td></tr>';
 
 	// Time Threshold
@@ -226,22 +226,22 @@ if (isset ($_GET["update_alert"])) {
 	$fields[604800] = human_time_description_raw (604800);
 	$fields[-1] = __('Other value');
 	
-	print_select ($fields, "time_threshold", $time_threshold, '', '', '0', false, false, false, '" style="margin-right:60px');
+	html_print_select ($fields, "time_threshold", $time_threshold, '', '', '0', false, false, false, '" style="margin-right:60px');
 	echo '<div id="div-time_other" style="display:none">';
-	print_input_text ("time_other", 0, '', 6);
+	html_print_input_text ("time_other", 0, '', 6);
 	echo ' '.__('seconds').'</div></td></tr>';
 		
 	// Priority
 	echo '<tr><td class="datos">'.__('Priority').'</td><td class="datos">';
-	echo print_select (get_priorities (), "priority", $priority, '', '', '0', false, false, false);
+	echo html_print_select (get_priorities (), "priority", $priority, '', '', '0', false, false, false);
 	echo '</td></tr>';
 
 	//Button
 	echo '<tr><td></td><td align="right">';
 	if ($id_as > 0) {
-		print_submit_button (__('Update'), "submit", false, 'class="sub upd"', false);
+		html_print_submit_button (__('Update'), "submit", false, 'class="sub upd"', false);
 	} else {
-		print_submit_button (__('Create'), "submit", false, 'class="sub wand"', false);
+		html_print_submit_button (__('Create'), "submit", false, 'class="sub wand"', false);
 	}
 	
 	// End table
@@ -311,9 +311,9 @@ if (isset ($_GET["update_alert"])) {
 		}
 		
 		$data[7] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">' .
-				print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>&nbsp;
+				html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>&nbsp;
 				<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' .
-				print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
+				html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
 		$idx = count ($table->data); //The current index of the table is 1 less than the count of table data so we count before adding to table->data
 		array_push ($table->data, $data);
 		
@@ -321,14 +321,14 @@ if (isset ($_GET["update_alert"])) {
 	}
 
 	if (!empty ($table->data)) {
-		print_table ($table);
+		html_print_table ($table);
 	}
 	
 	unset ($table);	
 	
 	echo '<div style="text-align:right; width:740px">';
 	echo '<form name="agente" method="post" action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert=-1">';
-	print_submit_button (__('Create'), "add_alert", false, 'class="sub next"');
+	html_print_submit_button (__('Create'), "add_alert", false, 'class="sub next"');
 	echo "</form></div>";
 
 	echo '<div style="margin-left: 30px; line-height: 17px; vertical-align: top; width:120px;">';
diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php
index 8e5b05c9dc..c4a36a35ba 100644
--- a/pandora_console/godmode/snmpconsole/snmp_filters.php
+++ b/pandora_console/godmode/snmpconsole/snmp_filters.php
@@ -91,18 +91,18 @@ if ($edit_filter > -2) {
 	$table->data = array ();
 	$table->width = '90%';
 	$table->data[0][0] = __('Description');
-	$table->data[0][1] = print_input_text ('description', $description, '', 60, 100, true);
+	$table->data[0][1] = html_print_input_text ('description', $description, '', 60, 100, true);
 	$table->data[1][0] = __('Filter');
-	$table->data[1][1] = print_input_text ('filter', $filter, '', 60, 100, true);
+	$table->data[1][1] = html_print_input_text ('filter', $filter, '', 60, 100, true);
 
 	echo '<form action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters" method="post">';
-	print_input_hidden ('update_filter', $edit_filter);
-	print_table ($table);
+	html_print_input_hidden ('update_filter', $edit_filter);
+	html_print_table ($table);
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
 	if ($edit_filter > -1) {
-		print_submit_button (__('Update'), 'submit_button', false, 'class="sub upd"');
+		html_print_submit_button (__('Update'), 'submit_button', false, 'class="sub upd"');
 	} else {
-		print_submit_button (__('Create'), 'submit_button', false, 'class="sub upd"');
+		html_print_submit_button (__('Create'), 'submit_button', false, 'class="sub upd"');
 	}
 	echo '</div>';
 	echo '</form>';
@@ -134,21 +134,21 @@ if ($edit_filter > -2) {
 		$data[0] = $row['description'];
 		$data[1] = $row['filter'];
 		$data[2] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&delete_filter='.$row['id_snmp_filter'].'">' .
-				print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>&nbsp;
+				html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>&nbsp;
 				<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter='.$row['id_snmp_filter'].'">' .
-				print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
+				html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
 		array_push ($table->data, $data);
 	}
 
 	if (!empty ($table->data)) {
-		print_table ($table);
+		html_print_table ($table);
 	}
 	
 	unset ($table);	
 	
 	echo '<div style="text-align:right; width:740px">';
 	echo '<form name="agente" method="post" action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_filters&edit_filter=-1">';
-	print_submit_button (__('Create'), 'submit_button', false, 'class="sub next"');
+	html_print_submit_button (__('Create'), 'submit_button', false, 'class="sub next"');
 	echo '</form></div>';
 }
 
diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php
index f963cf1d38..fe8d9a2d32 100644
--- a/pandora_console/godmode/users/configure_profile.php
+++ b/pandora_console/godmode/users/configure_profile.php
@@ -210,40 +210,40 @@ if ($id_profile || $new_profile) {
 	$table->data = array ();
 	
 	$table->data[0][0] = __('Profile name');
-	$table->data[0][1] = print_input_text ('name', $name, '', 30, 60, true);
+	$table->data[0][1] = html_print_input_text ('name', $name, '', 30, 60, true);
 	$table->data[1][0] = __('View incidents');
-	$table->data[1][1] = print_checkbox ('incident_view', 1, $incident_view, true);
+	$table->data[1][1] = html_print_checkbox ('incident_view', 1, $incident_view, true);
 	$table->data[2][0] = __('Edit incidents');
-	$table->data[2][1] = print_checkbox ('incident_edit', 1, $incident_edit, true);
+	$table->data[2][1] = html_print_checkbox ('incident_edit', 1, $incident_edit, true);
 	$table->data[3][0] = __('Manage incidents');
-	$table->data[3][1] = print_checkbox ('incident_management', 1, $incident_management, true);
+	$table->data[3][1] = html_print_checkbox ('incident_management', 1, $incident_management, true);
 	$table->data[4][0] = __('View agents');
-	$table->data[4][1] = print_checkbox ('agent_view', 1, $agent_view, true);
+	$table->data[4][1] = html_print_checkbox ('agent_view', 1, $agent_view, true);
 	$table->data[5][0] = __('Edit agents');
-	$table->data[5][1] = print_checkbox ('agent_edit', 1, $agent_edit, true);
+	$table->data[5][1] = html_print_checkbox ('agent_edit', 1, $agent_edit, true);
 	$table->data[6][0] = __('Edit alerts');
-	$table->data[6][1] = print_checkbox ('alert_edit', 1, $alert_edit, true);
+	$table->data[6][1] = html_print_checkbox ('alert_edit', 1, $alert_edit, true);
 	$table->data[7][0] = __('Manage alerts');
-	$table->data[7][1] = print_checkbox ('alert_management', 1, $alert_management, true);
+	$table->data[7][1] = html_print_checkbox ('alert_management', 1, $alert_management, true);
 	$table->data[8][0] = __('Manage users');
-	$table->data[8][1] = print_checkbox ('user_management', 1, $user_management, true);
+	$table->data[8][1] = html_print_checkbox ('user_management', 1, $user_management, true);
 	$table->data[9][0] = __('Manage Database');
-	$table->data[9][1] = print_checkbox ('db_management', 1, $db_management, true);
+	$table->data[9][1] = html_print_checkbox ('db_management', 1, $db_management, true);
 	$table->data[10][0] = __('Pandora management');
-	$table->data[10][1] = print_checkbox ('pandora_management', 1, $pandora_management, true);
+	$table->data[10][1] = html_print_checkbox ('pandora_management', 1, $pandora_management, true);
 	
 	echo '<form method="post" action="index.php?sec=gusuarios&sec2=godmode/users/configure_profile">';
 	
-	print_table ($table);
+	html_print_table ($table);
 	
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
 	if ($new_profile) {
-		print_submit_button (__('Add'), "crt", false, 'class="sub wand"');
-		print_input_hidden ('create_profile', 1);
+		html_print_submit_button (__('Add'), "crt", false, 'class="sub wand"');
+		html_print_input_hidden ('create_profile', 1);
 	} else {
-		print_input_hidden ('id', $id_profile);
-		print_input_hidden ('update_profile', 1);
-		print_submit_button (__('Update'), "upd", false, 'class="sub upd"');
+		html_print_input_hidden ('id', $id_profile);
+		html_print_input_hidden ('update_profile', 1);
+		html_print_submit_button (__('Update'), "upd", false, 'class="sub upd"');
 	}
 	echo "</div></form>";
 
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index a059c895b6..98c5d58546 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -257,23 +257,23 @@ $table->style = array ();
 $table->style[0] = 'font-weight: bold; vertical-align: top';
 
 $table->data[0][0] = __('User ID');
-$table->data[0][1] = print_input_text_extended ('id_user', $id, '', '', 20, 60,
+$table->data[0][1] = html_print_input_text_extended ('id_user', $id, '', '', 20, 60,
 	!$new_user || $view_mode, '', '', true);
 
 $table->data[1][0] = __('Full (display) name');
-$table->data[1][1] = print_input_text_extended ('fullname', $user_info['fullname'],
+$table->data[1][1] = html_print_input_text_extended ('fullname', $user_info['fullname'],
 	'', '', 30, 255, $view_mode, '', '', true);
 
 $table->data[2][0] = __('Language');
-$table->data[2][1] = print_select_from_sql ('SELECT id_language, name FROM tlanguage',
+$table->data[2][1] = html_print_select_from_sql ('SELECT id_language, name FROM tlanguage',
 	'language', $user_info["language"], '', '', '', true);
 
 if ($config['user_can_update_password']) {
 	$table->data[4][0] = __('Password');
-	$table->data[4][1] = print_input_text_extended ('password_new', '', '', '',
+	$table->data[4][1] = html_print_input_text_extended ('password_new', '', '', '',
 		15, 255, $view_mode, '', '', true, true);
 	$table->data[5][0] = __('Password confirmation');
-	$table->data[5][1] = print_input_text_extended ('password_confirm', '', '',
+	$table->data[5][1] = html_print_input_text_extended ('password_confirm', '', '',
 		'', 15, 255, $view_mode, '', '', true, true);
 }
 
@@ -282,26 +282,26 @@ if ($config['admin_can_make_admin']) {
 	$table->data[6][0] = __('Global Profile');
 	$table->data[6][1] = '';
 	if ($own_info['is_admin'] || $user_info['is_admin']){
-		$table->data[6][1] = print_radio_button ('is_admin', 1, '', $user_info['is_admin'], true);
+		$table->data[6][1] = html_print_radio_button ('is_admin', 1, '', $user_info['is_admin'], true);
 		$table->data[6][1] .= __('Administrator');
 		$table->data[6][1] .= ui_print_help_tip (__("This user has permissions to manage all. This is admin user and overwrites all permissions given in profiles/groups"), true);
 		$table->data[6][1] .= '<br />';
 	}
-	$table->data[6][1] .= print_radio_button ('is_admin', 0, '', $user_info['is_admin'], true);
+	$table->data[6][1] .= html_print_radio_button ('is_admin', 0, '', $user_info['is_admin'], true);
 	$table->data[6][1] .= __('Standard User');
 	$table->data[6][1] .= ui_print_help_tip (__("This user has separated permissions to view data in his group agents, create incidents belong to his groups, add notes in another incidents, create personal assignments or reviews and other tasks, on different profiles"), true);
 }
 
 $table->data[7][0] = __('E-mail');
-$table->data[7][1] = print_input_text_extended ("email", $user_info['email'],
+$table->data[7][1] = html_print_input_text_extended ("email", $user_info['email'],
 	'', '', 20, 100, $view_mode, '', '', true);
 
 $table->data[8][0] = __('Phone number');
-$table->data[8][1] = print_input_text_extended ("phone", $user_info['phone'],
+$table->data[8][1] = html_print_input_text_extended ("phone", $user_info['phone'],
 	'', '', 10, 30, $view_mode, '', '', true);
 
 $table->data[9][0] = __('Comments');
-$table->data[9][1] = print_textarea ("comments", 2, 65, $user_info['comments'],
+$table->data[9][1] = html_print_textarea ("comments", 2, 65, $user_info['comments'],
 	($view_mode ? 'readonly="readonly"' : ''), true);
 
 // If we want to create a new user, skins displayed are the skins of the creator's group. If we want to update, skins displayed are the skins of the modified user.  
@@ -331,22 +331,22 @@ $table->data[11][0] = __('Flash charts');
 $values = array(-1 => __('Use global conf'), 1 => __('Yes'), 0 => __('No'));
 $table->data[11][1] = print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false); 
 $table->data[12][0] = __('Block size for pagination');
-$table->data[12][1] = print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);
+$table->data[12][1] = html_print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);
 
 echo '<form method="post">';
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div style="width: '.$table->width.'" class="action-buttons">';
 if ($new_user) {
 	if ($config['admin_can_add_user']){
-		print_input_hidden ('create_user', 1);
-		print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
+		html_print_input_hidden ('create_user', 1);
+		html_print_submit_button (__('Create'), 'crtbutton', false, 'class="sub wand"');
 	}
 } else {
 	if ($config['user_can_update_info']) {
-		print_input_hidden ('update_user', 1);
-		print_submit_button (__('Update'), 'uptbutton', false, 'class="sub upd"');
+		html_print_input_hidden ('update_user', 1);
+		html_print_submit_button (__('Update'), 'uptbutton', false, 'class="sub upd"');
 	}
 }
 echo '</div>';
@@ -380,12 +380,12 @@ foreach ($result as $profile) {
 	$data = array ();
 
 	$data[0] = '<a href="index.php?sec=gusaurios&amp;sec2=godmode/users/configure_profile&id='.$profile['id_perfil'].'">'.get_profile_name ($profile['id_perfil']).'</a>';
-	$data[1] = ui_print_group_icon($profile["id_grupo"],true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'">' . ui_print_truncate_text(get_group_name ($profile['id_grupo'], True), 35).'</a>';
+	$data[1] = ui_print_group_icon($profile["id_grupo"],true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'">' . ui_print_truncate_text(groups_get_name ($profile['id_grupo'], True), 35).'</a>';
 	$data[2] = '<form method="post" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
-	$data[2] .= print_input_hidden ('delete_profile', 1, true);
-	$data[2] .= print_input_hidden ('id_user_profile', $profile['id_up'], true);
-	$data[2] .= print_input_hidden ('id_user', $id, true);
-	$data[2] .= print_input_image ('del', 'images/cross.png', 1, '', true);
+	$data[2] .= html_print_input_hidden ('delete_profile', 1, true);
+	$data[2] .= html_print_input_hidden ('id_user_profile', $profile['id_up'], true);
+	$data[2] .= html_print_input_hidden ('id_user', $id, true);
+	$data[2] .= html_print_input_image ('del', 'images/cross.png', 1, '', true);
 	$data[2] .= '</form>';
 	
 	array_push ($table->data, $data);
@@ -394,23 +394,23 @@ foreach ($result as $profile) {
 $data = array ();
 $data[0] = '<form method="post">';
 if (check_acl ($config['id_user'], 0, "PM")) {
-	$data[0] .= print_select (get_profiles (), 'assign_profile', 0, '', __('None'),
+	$data[0] .= html_print_select (get_profiles (), 'assign_profile', 0, '', __('None'),
 		0, true, false, false);
 }
 else {
-	$data[0] .= print_select (get_profiles (array ('pandora_management' => '<> 1', 'db_management' => '<> 1')), 'assign_profile', 0, '', __('None'),
+	$data[0] .= html_print_select (get_profiles (array ('pandora_management' => '<> 1', 'db_management' => '<> 1')), 'assign_profile', 0, '', __('None'),
 		0, true, false, false);
 }
-$data[1] = print_select_groups($config['id_user'], "UM", $own_info['is_admin'],
+$data[1] = html_print_select_groups($config['id_user'], "UM", $own_info['is_admin'],
 	'assign_group', -1, '', __('None'), -1, true, false, false);
-$data[2] = print_input_image ('add', 'images/add.png', 1, '', true);
-$data[2] .= print_input_hidden ('id', $id, true);
-$data[2] .= print_input_hidden ('add_profile', 1, true);
+$data[2] = html_print_input_image ('add', 'images/add.png', 1, '', true);
+$data[2] .= html_print_input_hidden ('id', $id, true);
+$data[2] .= html_print_input_hidden ('add_profile', 1, true);
 $data[2] .= '</form>';
 
 array_push ($table->data, $data);
 
-print_table ($table);
+html_print_table ($table);
 echo '</form>';
 
 unset ($table);
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 684cee200f..1784754a92 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -127,14 +127,14 @@ $table->align = array ();
 $table->size = array ();
 
 $table->head[0] = __('User ID') . ' ' .
-	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=id_user&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectUserIDUp)) . '</a>' .
-	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=id_user&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectUserIDDown)) . '</a>';
+	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=id_user&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectUserIDUp)) . '</a>' .
+	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=id_user&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectUserIDDown)) . '</a>';
 $table->head[1] = __('Name') . ' ' .
-	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=fullname&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectFullnameUp )) . '</a>' .
-	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=fullname&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectFullnameDown)) . '</a>';
+	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=fullname&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectFullnameUp )) . '</a>' .
+	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=fullname&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectFullnameDown)) . '</a>';
 $table->head[2] = __('Last contact') . ' ' . 
-	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=last_connect&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectLastConnectUp )) . '</a>' .
-	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=last_connect&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectLastConnectDown)) . '</a>';
+	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=last_connect&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastConnectUp )) . '</a>' .
+	'<a href="?sec=gusuarios&sec2=godmode/users/user_list&sort_field=last_connect&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastConnectDown)) . '</a>';
 $table->head[3] = __('Profile');
 $table->head[4] = __('Description');
 $table->head[5] = __('Delete');
@@ -190,11 +190,11 @@ foreach ($info as $user_id => $user_info) {
 	$data[2] = ui_print_timestamp ($user_info["last_connect"], true);
 	
 	if ($user_info["is_admin"]) {
-		$data[3] = print_image ("images/user_suit.png", true,
+		$data[3] = html_print_image ("images/user_suit.png", true,
 			array ("alt" => __('Admin'),
 				"title" => __('Administrator'))).'&nbsp;';
 	} else {
-		$data[3] = print_image ("images/user_green.png", true,
+		$data[3] = html_print_image ("images/user_green.png", true,
 			array ("alt" => __('User'),
 				"title" => __('Standard User'))).'&nbsp;';
 	}
@@ -205,7 +205,7 @@ foreach ($info as $user_id => $user_info) {
 		foreach ($result as $row) {
 			$data[3] .= get_profile_name ($row["id_perfil"]);
 			$data[3] .= " / ";
-			$data[3] .= get_group_name ($row["id_grupo"]);
+			$data[3] .= groups_get_name ($row["id_grupo"]);
 			$data[3] .= "<br />";
 		}
 	} else {
@@ -216,21 +216,21 @@ foreach ($info as $user_id => $user_info) {
 	$data[4] = ui_print_string_substr ($user_info["comments"], 24, true);
 
 	if ($config["admin_can_delete_user"] && $user_info['id_user'] != $config['id_user']) {
-		$data[5] = "<a href='index.php?sec=gusuarios&sec2=godmode/users/user_list&user_del=1&delete_user=".$user_info['id_user']."'>".print_image('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" .__('Deleting User'). " ". $user_info['id_user'] . ". " . __('Are you sure?') ."')) return false"))."</a>";
+		$data[5] = "<a href='index.php?sec=gusuarios&sec2=godmode/users/user_list&user_del=1&delete_user=".$user_info['id_user']."'>".html_print_image('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" .__('Deleting User'). " ". $user_info['id_user'] . ". " . __('Are you sure?') ."')) return false"))."</a>";
 	} else {
 		$data[5] = ''; //Delete button not in this mode
 	}
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 
 echo '<div style="width: '.$table->width.'" class="action-buttons">';
 unset ($table);
 if ($config["admin_can_add_user"] !== false) {
 	echo '<form method="post" action="index.php?sec=gusuarios&amp;sec2=godmode/users/configure_user">';
-	print_input_hidden ('new_user', 1);
-	print_submit_button (__('Create user'), "crt", false, 'class="sub next"');
+	html_print_input_hidden ('new_user', 1);
+	html_print_submit_button (__('Create user'), "crt", false, 'class="sub next"');
 	echo '</form>';
 }
 else {
@@ -269,7 +269,7 @@ $table->size = array_fill (1, 10, 40);
 
 $profiles = db_get_all_rows_in_table ("tperfil");
 
-$img = print_image ("images/ok.png", true, array ("border" => 0)); 
+$img = html_print_image ("images/ok.png", true, array ("border" => 0)); 
 
 foreach ($profiles as $profile) {
 	$data[0] = '<a href="index.php?sec=gusuarios&amp;sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'"><b>'.$profile["name"].'</b></a>';
@@ -283,15 +283,15 @@ foreach ($profiles as $profile) {
 	$data[8] = ($profile["db_management"] ? $img : '');
 	$data[9] = ($profile["alert_management"] ? $img : '');
 	$data[10] = ($profile["pandora_management"] ? $img : '');
-	$data[11] = '<a href="index.php?sec=gagente&sec2=godmode/users/configure_profile&delete_profile=1&id='.$profile["id_perfil"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'. print_image("images/cross.png", true) . '</a>';	
+	$data[11] = '<a href="index.php?sec=gagente&sec2=godmode/users/configure_profile&delete_profile=1&id='.$profile["id_perfil"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'. html_print_image("images/cross.png", true) . '</a>';	
 	array_push ($table->data, $data);
 }
 	
 	echo '<form method="post" action="index.php?sec=gusuarios&sec2=godmode/users/configure_profile">';
-	print_table ($table);
+	html_print_table ($table);
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
-	print_input_hidden ('new_profile', 1);
-	print_submit_button (__('Create'), "crt", false, 'class="sub next"');
+	html_print_input_hidden ('new_profile', 1);
+	html_print_submit_button (__('Create'), "crt", false, 'class="sub next"');
 	echo "</div>";
 	echo '</form>';
 	unset ($table);
diff --git a/pandora_console/include/ajax/skins.ajax.php b/pandora_console/include/ajax/skins.ajax.php
index 72fad4f16d..e9edc903cc 100644
--- a/pandora_console/include/ajax/skins.ajax.php
+++ b/pandora_console/include/ajax/skins.ajax.php
@@ -31,7 +31,7 @@ if ($get_image_path){
 	$img_src = get_parameter("img_src");
 	$only_src = get_parameter("only_src", 0);
 
-	return print_image($img_src, false, '', $only_src);
+	return html_print_image($img_src, false, '', $only_src);
 }
 
 ?>
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 2db1b807f4..0934c2701b 100644
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -316,11 +316,11 @@ if ($get_image_path_status){
 
 	$result = array();
 	
-	$result['bad'] = print_image($img_src . '_bad.png', true, '', $only_src);
-	$result['ok'] = print_image($img_src . '_ok.png', true, '', $only_src);
-	$result['warning'] = print_image($img_src . '_warning.png', true, '', $only_src);
-	$result['ok'] = print_image($img_src . '_ok.png', true, '', $only_src);
-	$result['normal'] = print_image($img_src . '.png', true, '', $only_src);
+	$result['bad'] = html_print_image($img_src . '_bad.png', true, '', $only_src);
+	$result['ok'] = html_print_image($img_src . '_ok.png', true, '', $only_src);
+	$result['warning'] = html_print_image($img_src . '_warning.png', true, '', $only_src);
+	$result['ok'] = html_print_image($img_src . '_ok.png', true, '', $only_src);
+	$result['normal'] = html_print_image($img_src . '.png', true, '', $only_src);
 
 	echo json_encode($result);
 }
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 25edea4883..4255fa5849 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -115,7 +115,7 @@ function safe_url_extraclean ($string, $default_string = '') {
 function no_permission () {
 	require ("config.php");
 	echo "<h3 class='error'>".__('You don\'t have access')."</h3>";
-	echo print_image('images/noaccess.png', true, array("alt" => 'No access', "width" => '120')) . "<br /><br />";
+	echo html_print_image('images/noaccess.png', true, array("alt" => 'No access', "width" => '120')) . "<br /><br />";
 	echo "<table width=550>";
 	echo "<tr><td>";
 	echo __('You don\'t have enough permission to access this resource');
@@ -134,7 +134,7 @@ function no_permission () {
 function unmanaged_error ($error = "") {
 	require_once ("config.php");
 	echo "<h3 class='error'>".__('Unmanaged error')."</h3>";
-	echo print_image('images/error.png', true, array("alt" => 'error')) . "<br /><br />";
+	echo html_print_image('images/error.png', true, array("alt" => 'error')) . "<br /><br />";
 	echo "<table width=550>";
 	echo "<tr><td>";
 	echo __('Unmanaged error');
@@ -1014,7 +1014,7 @@ function is_ajax () {
  * Transform an array of database result into an indexed array.
  *
  * This function is useful when the results of a database needs to be used
- * in a print_select() function.
+ * in a html_print_select() function.
  *
  * @param array Array with the results.
  * @param string Field of each row in the given array that will act as index. False
@@ -1150,10 +1150,10 @@ function string2image($string, $width, $height, $fontsize = 3,
 	global $config;
 				
 	$im = ImageCreate($width,$height);
-	$bgrgb = html2rgb($bgcolor);
+	$bgrgb = html_html2rgb($bgcolor);
 	$bgc = ImageColorAllocate($im,$bgrgb[0],$bgrgb[1],$bgrgb[2]);
 	// Set the string
-	$textrgb = html2rgb($textcolor);
+	$textrgb = html_html2rgb($textcolor);
 	imagestring($im, $fontsize, $padding_left, $padding_top, $string, ImageColorAllocate($im,$textrgb[0],$textrgb[1],$textrgb[2]));
 	// Rotates the image
 	$rotated = imagerotate($im, $degrees, 0) ; 
@@ -1265,7 +1265,7 @@ function check_acl($id_user, $id_group, $access) {
 	$parents_id = array($id_group);
 	if ($id_group != 0) {
 		$group = db_get_row_filter('tgrupo', array('id_grupo' => $id_group));
-		$parents = get_parents($group['parent'], true);
+		$parents = groups_get_parents($group['parent'], true);
 
 		foreach ($parents as $parent) {
 			$parents_id[] = $parent['id_grupo'];
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 6a2356354f..91ad45545a 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -729,7 +729,7 @@ function get_group_agents ($id_group = 0, $search = false, $case = "lower", $noA
 
 
 	if (!$noACL) {
-		$id_group = safe_acl_group($config["id_user"], $id_group, "AR");
+		$id_group = groups_safe_acl($config["id_user"], $id_group, "AR");
 
 		if (empty ($id_group)) {
 			//An empty array means the user doesn't have access
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 4407a0869b..8a633c1303 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -1044,12 +1044,12 @@ function db_print_database_debug () {
 		array_push ($table->data, $data);
 
 		if (($i % 100) == 0) {
-			print_table ($table);
+			html_print_table ($table);
 			$table->data = array ();
 		}
 	}
 
-	print_table ($table);
+	html_print_table ($table);
 }
 
 /**
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 63dc8ce1e5..42a6f4207d 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -384,7 +384,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 					break;
 			}
 	
-			$data[0] = print_image ($img, true, 
+			$data[0] = html_print_image ($img, true, 
 				array ("class" => "image_status",
 					"width" => 16,
 					"height" => 16,
@@ -409,7 +409,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 					break;
 			}
 			
-			$data[1] = print_image ($img, true, 
+			$data[1] = html_print_image ($img, true, 
 				array ("class" => "image_status",
 					"width" => 12,
 					"height" => 12,
@@ -452,7 +452,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 			array_push ($table->data, $data);
 		}
 		
-		$return = print_table ($table, $return);
+		$return = html_print_table ($table, $return);
 		unset ($table);
 		return $return;
 	}
@@ -472,50 +472,50 @@ function events_print_type_img ($type, $return = false) {
 	
 	switch ($type) {
 	case "alert_recovered": 
-		$output .= print_image ("images/error.png", true,
+		$output .= html_print_image ("images/error.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "alert_manual_validation": 
-		$output .= print_image ("images/eye.png", true,
+		$output .= html_print_image ("images/eye.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "going_up_warning":
-		$output .= print_image ("images/b_yellow.png", true,
+		$output .= html_print_image ("images/b_yellow.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "going_down_critical":
 	case "going_up_critical": //This is to be backwards compatible
-		$output .= print_image ("images/b_red.png", true,
+		$output .= html_print_image ("images/b_red.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "going_up_normal":
 	case "going_down_normal": //This is to be backwards compatible
-		$output .= print_image ("images/b_green.png", true,
+		$output .= html_print_image ("images/b_green.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "going_down_warning":
-		$output .= print_image ("images/b_yellow.png", true,
+		$output .= html_print_image ("images/b_yellow.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "alert_fired":
-		$output .= print_image ("images/bell.png", true,
+		$output .= html_print_image ("images/bell.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "system";
-		$output .= print_image ("images/cog.png", true,
+		$output .= html_print_image ("images/cog.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "recon_host_detected";
-		$output .= print_image ("images/network.png", true,
+		$output .= html_print_image ("images/network.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "new_agent";
-		$output .= print_image ("images/wand.png", true,
+		$output .= html_print_image ("images/wand.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	case "unknown": 
 	default:
-		$output .= print_image ("images/err.png", true,
+		$output .= html_print_image ("images/err.png", true,
 			array ("title" => events_print_type_description($type, true)));
 		break;
 	}
@@ -594,7 +594,7 @@ function events_print_type_description ($type, $return = false) {
 function events_get_group_events ($id_group, $period, $date) {
 	global $config;
 
-	$id_group = safe_acl_group ($config["id_user"], $id_group, "AR");
+	$id_group = groups_safe_acl ($config["id_user"], $id_group, "AR");
 
 	if (empty ($id_group)) {
 		//An empty array means the user doesn't have access
diff --git a/pandora_console/include/functions_exportserver.php b/pandora_console/include/functions_exportserver.php
index bc1cbfad29..5e04cd03b2 100644
--- a/pandora_console/include/functions_exportserver.php
+++ b/pandora_console/include/functions_exportserver.php
@@ -26,7 +26,7 @@
  *
  * @return (array) An array of server information (similar to server_info) but without the other servers
 **/
-function get_exportservers ($active = 1) {
+function exportserver_get_exportservers ($active = 1) {
 	$query = "SELECT * FROM tserver WHERE export_server = 1";
 	$return = array ();
 		
@@ -54,10 +54,10 @@ function get_exportservers ($active = 1) {
  * @param (bool) $active (bool) Whether or not to exclude inactive servers (defaults to 1 => no inactive servers)
  * @param (string) $row What row to select from the server info table
  *
- * @return (array) An array of server information (similar to get_exportservers) but without the extra data
+ * @return (array) An array of server information (similar to exportserver_get_exportservers) but without the extra data
  **/
-function get_exportservers_info ($active = 1, $row = "name") {
-	$exportservers = get_exportservers ();
+function exportserver_get_info ($active = 1, $row = "name") {
+	$exportservers = exportserver_get_exportservers ();
 	$return = array ();
 	
 	foreach ($exportservers as $server_id => $server_info) {
@@ -74,7 +74,7 @@ function get_exportservers_info ($active = 1, $row = "name") {
  *
  * @return string The name of given server.
  */
-function dame_nombre_servidorexportacion ($id_server) {
+function exportserver_get_name ($id_server) {
 	return (string) db_get_value ('name', 'tserver_export', 'id', (int) $id_server);
 }
 
diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php
index c6a9759817..99e4661e99 100644
--- a/pandora_console/include/functions_extensions.php
+++ b/pandora_console/include/functions_extensions.php
@@ -23,9 +23,9 @@ $extension_file = '';
 
 
 /**
- * TODO: Document extensions
+ * Callback function for extensions in the console 
  *
- * @param string $filename
+ * @param string $filename with contents of the extension
  */
 function extension_call_main_function ($filename) {
 	global $config;
@@ -38,9 +38,9 @@ function extension_call_main_function ($filename) {
 }
 
 /**
- * TODO: Document extensions
+ * Callback function for godmode extensions
  *
- * @param string $filename
+ * @param string $filename File with extension contents
  */
 function extension_call_godmode_function ($filename) {
 	global $config;
@@ -53,7 +53,7 @@ function extension_call_godmode_function ($filename) {
 }
 
 /**
- * TODO: Document extensions
+ * Callback login function for extensions
  */
 function extensions_call_login_function () {
 	global $config;
@@ -67,9 +67,9 @@ function extensions_call_login_function () {
 }
 
 /**
- * TODO: Document extensions
+ * Checks if the current page is an extension 
  *
- * @param string $page
+ * @param string $page To check
  */
 function is_extension ($page) {
 	global $config;
@@ -128,6 +128,9 @@ function get_extensions ($enterprise = false) {
 	return $extensions;
 }
 
+/**
+ * Get disabled open and enterprise extensions 
+ */
 function get_disabled_extensions() {
 	global $config;
 	
@@ -214,6 +217,9 @@ function get_disabled_extensions() {
 	return $extensions;	
 }
 
+/**
+ * Get info of all extensions (enabled/disabled)
+ */
 function getExtensionInfo() {
 	global $config;
 	
@@ -269,7 +275,7 @@ function getExtensionInfo() {
 }
 
 /**
- * TODO: Document extensions
+ * Load all extensions 
  *
  * @param array $extensions
  */
@@ -284,11 +290,11 @@ function load_extensions ($extensions) {
 }
 
 /**
- * TODO: Document extensions
+ * This function adds a link to the extension with the given name in Operation menu.
  *
- * @param string name
- * @param string fatherId
- * @param string icon
+ * @param string name Name of the extension in the Operation menu  
+ * @param string fatherId Id of the parent menu item for the current extension 
+ * @param string icon Path to the icon image (18x18 px). If this parameter is blank then predefined icon will be used
  */
 function add_operation_menu_option ($name, $fatherId = null, $icon = null) {
 	global $config;
@@ -307,12 +313,12 @@ function add_operation_menu_option ($name, $fatherId = null, $icon = null) {
 }
 
 /**
- * TODO: Document extensions
+ * This function adds a link to the extension with the given name in Godmode menu.
  *
- * @param string name
- * @param string acl
- * @param string fatherId
- * @param string icon
+ * @param string name Name of the extension in the Godmode menu  
+ * @param string acl User ACL level required to see this extension in the godmode menu 
+ * @param string fatherId Id of the parent menu item for the current extension 
+ * @param string icon Path to the icon image (18x18 px). If this parameter is blank then predefined icon will be used
  */
 function add_godmode_menu_option ($name, $acl, $fatherId = null, $icon = null) {
 	global $config;
@@ -331,12 +337,12 @@ function add_godmode_menu_option ($name, $acl, $fatherId = null, $icon = null) {
 }
 
 /**
- * Add in the header tabs in godmode agent the extension tab.
+ * Add in the header tabs in Godmode agent menu the extension tab. 
  * 
- * @param $tabId
- * @param $tabName
- * @param $tabIcon
- * @param $tabFunction
+ * @param tabId Id of the extension tab   
+ * @param tabName Name of the extension tab
+ * @param tabIcon Path to the image icon 
+ * @param tabFunction Name of the function to execute when this extension is called
  */
 function add_extension_godmode_tab_agent($tabId, $tabName, $tabIcon, $tabFunction) {
 	global $config;
@@ -351,12 +357,12 @@ function add_extension_godmode_tab_agent($tabId, $tabName, $tabIcon, $tabFunctio
 }
 
 /**
- * Add in the header tabs in operation agent the extension tab.
+ * Add in the header tabs in Operation agent menu the extension tab.
  * 
- * @param unknown_type $tabId
- * @param unknown_type $tabName
- * @param unknown_type $tabIcon
- * @param unknown_type $tabFunction
+ * @param tabId Id of the extension tab
+ * @param tabName Name of the extension tab
+ * @param tabIcon Path to the image icon 
+ * @param tabFunction Name of the function to execute when this extension is called
  */
 function add_extension_opemode_tab_agent($tabId, $tabName, $tabIcon, $tabFunction) {
 	global $config;
@@ -371,9 +377,9 @@ function add_extension_opemode_tab_agent($tabId, $tabName, $tabIcon, $tabFunctio
 }
 
 /**
- * Add the function to call in OPERATION
+ * Add the function to call when user clicks on the Operation menu link
  *
- * @param string $function_name
+ * @param string $function_name Callback function name
  */
 function add_extension_main_function ($function_name) {
 	global $config;
@@ -384,9 +390,9 @@ function add_extension_main_function ($function_name) {
 }
 
 /**
- * TODO: Document extensions
+ * Add the function to call when user clicks on the Godmode menu link
  *
- * @param string $function_name
+ * @param string $function_name Callback function name
  */
 function add_extension_godmode_function ($function_name) {
 	global $config;
@@ -397,9 +403,9 @@ function add_extension_godmode_function ($function_name) {
 }
 
 /**
- * TODO: Document extensions
+ * Adds extension function when user login on Pandora console
  *
- * @param string $function_name
+ * @param string $function_name Callback function name
  */
 function add_extension_login_function ($function_name) {
 	global $config;
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index e757685e68..2510e04595 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -354,7 +354,7 @@ if ($delete_file) {
  * 
  * @param string $dir The dir to deletete
  */
-function delete_directory($dir)
+function filemanager_delete_directory($dir)
 {
 	if ($handle = opendir($dir))
 	{
@@ -365,7 +365,7 @@ function delete_directory($dir)
 				{
 					if (!rmdir($dir . $file))
 					{
-						delete_directory($dir . $file . '/');
+						filemanager_delete_directory($dir . $file . '/');
 					}
 				}
 				else
@@ -388,7 +388,7 @@ function delete_directory($dir)
  * 
  * @return array The files in the dirs, empty array for empty dir of files.
  */
-function read_recursive_dir($dir, $relative_path = '') {
+function filemanager_read_recursive_dir($dir, $relative_path = '') {
 	$return = array();
 	
 	if ($handle = opendir($dir))
@@ -397,7 +397,7 @@ function read_recursive_dir($dir, $relative_path = '') {
 			if (($entry != ".") && ($entry != "..")) {
 				if (is_dir($dir . $entry))
 				{
-					$return = array_merge($return, read_recursive_dir($dir . $entry . '/', $relative_path . $entry . '/' ));
+					$return = array_merge($return, filemanager_read_recursive_dir($dir . $entry . '/', $relative_path . $entry . '/' ));
 				}
 				else
 				{
@@ -420,7 +420,7 @@ function read_recursive_dir($dir, $relative_path = '') {
  * @param string $father The directory father don't navigate bottom this.
  * @param boolean $editor The flag to set the edition of text files.
  */
-function file_explorer($real_directory, $relative_directory, $url, $father = '', $editor = false, $readOnly = false) {
+function filemanager_file_explorer($real_directory, $relative_directory, $url, $father = '', $editor = false, $readOnly = false) {
 	global $config;
 	
 	?>
@@ -462,7 +462,7 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 		return;
 	}
 	
-	$files = list_file_manager_dir ($real_directory);
+	$files = filemanager_list_dir ($real_directory);
 	
 	$table->width = '90%';
 	$table->class = 'listing';
@@ -491,7 +491,7 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 	}
 	
 	if (($prev_dir_str != '') && ($father != $relative_directory)) {
-		$table->data[0][0] = print_image ('images/go_previous.png', true);
+		$table->data[0][0] = html_print_image ('images/go_previous.png', true);
 		$table->data[0][1] = '<a href="' . $url . '&directory='.$prev_dir_str.'&hash2=' . md5($prev_dir_str.$config['dbpass']) . '">';
 		$table->data[0][1] .= __('Parent directory');
 		$table->data[0][1] .='</a>';
@@ -504,49 +504,49 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 		$table->data[1][0] = '';
 		$table->data[1][1] = '';
 //		$table->data[1][1] -= '<div id="main_buttons">';
-//		$table->data[1][1] .= print_button(__('Create folder'), 'folder', false, 'show_form_create_folder();', "class='sub'", true);
-//		$table->data[1][1] .= print_button(__('Upload file/s'), 'up_files', false, 'show_upload_file();', "class='sub'", true);
-//		$table->data[1][1] .= print_button(__('Create text file'), 'create_file', false, 'show_create_text_file();', "class='sub'", true);
+//		$table->data[1][1] .= html_print_button(__('Create folder'), 'folder', false, 'show_form_create_folder();', "class='sub'", true);
+//		$table->data[1][1] .= html_print_button(__('Upload file/s'), 'up_files', false, 'show_upload_file();', "class='sub'", true);
+//		$table->data[1][1] .= html_print_button(__('Create text file'), 'create_file', false, 'show_create_text_file();', "class='sub'", true);
 //		$table->data[1][1] .= '</div>';
 		
 		$table->data[1][1] .= '<div id="create_folder" style="display: none;">';
-		$table->data[1][1] .= print_button(__('Close'), 'close', false, 'show_main_buttons_folder();', "class='sub' style='float: left;'", true);
+		$table->data[1][1] .= html_print_button(__('Close'), 'close', false, 'show_main_buttons_folder();', "class='sub' style='float: left;'", true);
 		$table->data[1][1] .= '<form method="post" action="' . $url . '">';
-		$table->data[1][1] .= print_input_text ('dirname', '', '', 15, 255, true);
-		$table->data[1][1] .= print_submit_button (__('Create'), 'crt', false, 'class="sub next"', true);
-		$table->data[1][1] .= print_input_hidden ('directory', $relative_directory, true);
-		$table->data[1][1] .= print_input_hidden ('create_dir', 1, true);
-		$table->data[1][1] .= print_input_hidden('hash', md5($relative_directory . $config['dbpass']), true);
-		$table->data[1][1] .= print_input_hidden('hash2', md5($relative_directory . $config['dbpass']), true);
+		$table->data[1][1] .= html_print_input_text ('dirname', '', '', 15, 255, true);
+		$table->data[1][1] .= html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"', true);
+		$table->data[1][1] .= html_print_input_hidden ('directory', $relative_directory, true);
+		$table->data[1][1] .= html_print_input_hidden ('create_dir', 1, true);
+		$table->data[1][1] .= html_print_input_hidden('hash', md5($relative_directory . $config['dbpass']), true);
+		$table->data[1][1] .= html_print_input_hidden('hash2', md5($relative_directory . $config['dbpass']), true);
 		$table->data[1][1] .= '</form>';
 		$table->data[1][1] .= '</div>';
 		
 		$table->data[1][1] .= '<div id="upload_file" style="display: none;">';
-		$table->data[1][1] .= print_button(__('Close'), 'close', false, 'show_main_buttons_folder();', "class='sub' style='float: left;'", true);
+		$table->data[1][1] .= html_print_button(__('Close'), 'close', false, 'show_main_buttons_folder();', "class='sub' style='float: left;'", true);
 		$table->data[1][1] .= '<form method="post" action="' . $url . '" enctype="multipart/form-data">';
 		$table->data[1][1] .= ui_print_help_tip (__("The zip upload in this dir, easy to upload multiple files."), true);
-		$table->data[1][1] .= print_input_file ('file', true, false);
-		$table->data[1][1] .= print_checkbox('decompress', 1, false, true);
+		$table->data[1][1] .= html_print_input_file ('file', true, false);
+		$table->data[1][1] .= html_print_checkbox('decompress', 1, false, true);
 		$table->data[1][1] .= __('Decompress');
 		$table->data[1][1] .= '&nbsp;&nbsp;&nbsp;';
-		$table->data[1][1] .= print_submit_button (__('Go'), 'go', false, 'class="sub next"', true);
-		$table->data[1][1] .= print_input_hidden ('real_directory', $real_directory, true);
-		$table->data[1][1] .= print_input_hidden ('directory', $relative_directory, true);
-		$table->data[1][1] .= print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
-		$table->data[1][1] .= print_input_hidden('hash2', md5($relative_directory . $config['dbpass']), true);
-		$table->data[1][1] .= print_input_hidden ('upload_file_or_zip', 1, true);
+		$table->data[1][1] .= html_print_submit_button (__('Go'), 'go', false, 'class="sub next"', true);
+		$table->data[1][1] .= html_print_input_hidden ('real_directory', $real_directory, true);
+		$table->data[1][1] .= html_print_input_hidden ('directory', $relative_directory, true);
+		$table->data[1][1] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
+		$table->data[1][1] .= html_print_input_hidden('hash2', md5($relative_directory . $config['dbpass']), true);
+		$table->data[1][1] .= html_print_input_hidden ('upload_file_or_zip', 1, true);
 		$table->data[1][1] .= '</form>';	
 		$table->data[1][1] .= '</div>';
 		
 		$table->data[1][1] .= '<div id="create_text_file" style="display: none;">';
-		$table->data[1][1] .= print_button(__('Close'), 'close', false, 'show_main_buttons_folder();', "class='sub' style='float: left;'", true);
+		$table->data[1][1] .= html_print_button(__('Close'), 'close', false, 'show_main_buttons_folder();', "class='sub' style='float: left;'", true);
 		$table->data[1][1] .= '<form method="post" action="' . $url . '">';
-		$table->data[1][1] .= print_input_text('name_file', '', '', 30, 50, true);
-		$table->data[1][1] .= print_submit_button (__('Create'), 'create', false, 'class="sub"', true);
-		$table->data[1][1] .= print_input_hidden ('real_directory', $real_directory, true);
-		$table->data[1][1] .= print_input_hidden ('directory', $relative_directory, true);
-		$table->data[1][1] .= print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
-		$table->data[1][1] .= print_input_hidden ('create_text_file', 1, true);
+		$table->data[1][1] .= html_print_input_text('name_file', '', '', 30, 50, true);
+		$table->data[1][1] .= html_print_submit_button (__('Create'), 'create', false, 'class="sub"', true);
+		$table->data[1][1] .= html_print_input_hidden ('real_directory', $real_directory, true);
+		$table->data[1][1] .= html_print_input_hidden ('directory', $relative_directory, true);
+		$table->data[1][1] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
+		$table->data[1][1] .= html_print_input_hidden ('create_text_file', 1, true);
 		$table->data[1][1] .= '</form>';	
 		$table->data[1][1] .= '</div>';
 		
@@ -558,19 +558,19 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 		
 		switch ($fileinfo['mime']) {
 			case MIME_DIR:
-				$data[0] = print_image ('images/mimetypes/directory.png', true);
+				$data[0] = html_print_image ('images/mimetypes/directory.png', true);
 				break;
 			case MIME_IMAGE:
-				$data[0] = print_image ('images/mimetypes/image.png', true);
+				$data[0] = html_print_image ('images/mimetypes/image.png', true);
 				break;
 			case MIME_ZIP:
-				$data[0] = print_image ('images/mimetypes/zip.png', true);
+				$data[0] = html_print_image ('images/mimetypes/zip.png', true);
 				break;
 			case MIME_TEXT:
-				$data[0] = print_image ('images/mimetypes/text.png', true);
+				$data[0] = html_print_image ('images/mimetypes/text.png', true);
 				break;
 			default:
-				$data[0] = print_image ('images/mimetypes/unknown.png', true);
+				$data[0] = html_print_image ('images/mimetypes/unknown.png', true);
 				break;
 		}
 		
@@ -598,14 +598,14 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 			(! is_dir ($fileinfo['realpath']) || count (scandir ($fileinfo['realpath'])) < 3)) {
 			$data[4] .= '<form method="post" action="' . $url . '" style="display: inline;">';
 			$data[4] .= '<input type="image" src="images/cross.png" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-			$data[4] .= print_input_hidden ('filename', $fileinfo['realpath'], true);
-			$data[4] .= print_input_hidden('hash', md5($fileinfo['realpath'] . $config['dbpass']), true);
-			$data[4] .= print_input_hidden ('delete_file', 1, true);
+			$data[4] .= html_print_input_hidden ('filename', $fileinfo['realpath'], true);
+			$data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'] . $config['dbpass']), true);
+			$data[4] .= html_print_input_hidden ('delete_file', 1, true);
 			$data[4] .= '</form>';
 			
 			if (($editor) && (!$readOnly)) {
 				if ($fileinfo['mime'] == MIME_TEXT) {
-					$data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&location_file=" . $fileinfo['realpath'] . "&hash=" . md5($fileinfo['realpath'] . $config['dbpass']) . "' style='float: left;'>" . print_image('images/edit.png', true, array("style" => 'margin-top: 2px;')) . "</a>";
+					$data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&location_file=" . $fileinfo['realpath'] . "&hash=" . md5($fileinfo['realpath'] . $config['dbpass']) . "' style='float: left;'>" . html_print_image('images/edit.png', true, array("style" => 'margin-top: 2px;')) . "</a>";
 				}
 			}
 		}
@@ -618,13 +618,13 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 		if (is_writable ($real_directory)) {
 			echo "<div style='text-align: right; width: " . $table->width . ";'>";
 			echo "<a href='javascript:show_form_create_folder();' style='margin-right: 3px;' title='" . __('Create directory') . "'>";
-			echo print_image('images/mimetypes/directory.png', true); 
+			echo html_print_image('images/mimetypes/directory.png', true); 
 			echo "</a>";
 			echo "<a href='javascript: show_create_text_file();' style='margin-right: 3px;' title='" . __('Create text') . "'>";
-			echo print_image('images/mimetypes/text.png', true);
+			echo html_print_image('images/mimetypes/text.png', true);
 			echo "</a>";
 			echo "<a href='javascript: show_upload_file();' title='" . __('Upload file/s') . "'>";
-			echo print_image('images/mimetypes/unknown.png', true); 
+			echo html_print_image('images/mimetypes/unknown.png', true); 
 			echo "</a>";
 			echo "</div>";
 		}
@@ -634,7 +634,7 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 			echo "</div>";
 		}
 	}
-	print_table ($table);
+	html_print_table ($table);
 }
 
 /**
@@ -643,33 +643,33 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
  * @param string $relative_directory The string of dir as relative path.
  * @param string $url The url to set in the forms and some links in the explorer.
  */
-function box_upload_file_complex($real_directory, $relative_directory, $url = '') {
+function filemanager_box_upload_file_complex($real_directory, $relative_directory, $url = '') {
 	global $config;
 	
 	$table->width = '100%';
 	
 	$table->data = array ();
 	
-	if (! is_file_manager_writable_dir ($real_directory)) {
+	if (! filemanager_is_writable_dir ($real_directory)) {
 		echo "<h3 class='error'>".__('Current directory is not writable by HTTP Server')."</h3>";
 		echo '<p>';
 		echo __('Please check that current directory has write rights for HTTP server');
 		echo '</p>';
 	} else {
 		$table->data[1][0] = __('Upload') . ui_print_help_tip (__("The zip upload in this dir, easy to upload multiple files."), true);
-		$table->data[1][1] = print_input_file ('file', true, false);
-		$table->data[1][2] = print_radio_button('zip_or_file', 'zip', __('Multiple files zipped'), false, true);
-		$table->data[1][3] = print_radio_button('zip_or_file', 'file', __('One'), true, true);
-		$table->data[1][4] = print_submit_button (__('Go'), 'go', false,
+		$table->data[1][1] = html_print_input_file ('file', true, false);
+		$table->data[1][2] = html_print_radio_button('zip_or_file', 'zip', __('Multiple files zipped'), false, true);
+		$table->data[1][3] = html_print_radio_button('zip_or_file', 'file', __('One'), true, true);
+		$table->data[1][4] = html_print_submit_button (__('Go'), 'go', false,
 			'class="sub next"', true);
-		$table->data[1][4] .= print_input_hidden ('real_directory', $real_directory, true);
-		$table->data[1][4] .= print_input_hidden ('directory', $relative_directory, true);
-		$table->data[1][4] .= print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
-		$table->data[1][4] .= print_input_hidden ('upload_file_or_zip', 1, true);
+		$table->data[1][4] .= html_print_input_hidden ('real_directory', $real_directory, true);
+		$table->data[1][4] .= html_print_input_hidden ('directory', $relative_directory, true);
+		$table->data[1][4] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
+		$table->data[1][4] .= html_print_input_hidden ('upload_file_or_zip', 1, true);
 	}
 	
 	echo '<form method="post" action="' . $url . '" enctype="multipart/form-data">';
-	print_table ($table);
+	html_print_table ($table);
 	echo '</form>';	
 }
 
@@ -680,31 +680,31 @@ function box_upload_file_complex($real_directory, $relative_directory, $url = ''
  * @param string $relative_directory The string of dir as relative path.
  * @param string $url The url to set in the forms and some links in the explorer.
  */
-function box_upload_file_explorer($real_directory, $relative_directory, $url = '') {
+function filemanager_box_upload_file_explorer($real_directory, $relative_directory, $url = '') {
 	global $config;
 	
 	$table->width = '50%';
 	
 	$table->data = array ();
 	
-	if (! is_file_manager_writable_dir ($real_directory)) {
+	if (! filemanager_is_writable_dir ($real_directory)) {
 		echo "<h3 class='error'>".__('Current directory is not writable by HTTP Server')."</h3>";
 		echo '<p>';
 		echo __('Please check that current directory has write rights for HTTP server');
 		echo '</p>';
 	} else {
 		$table->data[1][0] = __('Upload file');
-		$table->data[1][1] = print_input_file ('file', true, false);
-		$table->data[1][2] = print_submit_button (__('Go'), 'go', false,
+		$table->data[1][1] = html_print_input_file ('file', true, false);
+		$table->data[1][2] = html_print_submit_button (__('Go'), 'go', false,
 			'class="sub next"', true);
-		$table->data[1][2] .= print_input_hidden ('real_directory', $real_directory, true);
-		$table->data[1][2] .= print_input_hidden ('directory', $relative_directory, true);
-		$table->data[1][2] .= print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
-		$table->data[1][2] .= print_input_hidden ('upload_file', 1, true);
+		$table->data[1][2] .= html_print_input_hidden ('real_directory', $real_directory, true);
+		$table->data[1][2] .= html_print_input_hidden ('directory', $relative_directory, true);
+		$table->data[1][2] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
+		$table->data[1][2] .= html_print_input_hidden ('upload_file', 1, true);
 	}
 	
 	echo '<form method="post" action="' . $url . '" enctype="multipart/form-data">';
-	print_table ($table);
+	html_print_table ($table);
 	echo '</form>';
 }
 
@@ -715,31 +715,31 @@ function box_upload_file_explorer($real_directory, $relative_directory, $url = '
  * @param unknown_type $relative_directory
  * @param string $url The url to set in the forms and some links in the explorer.
  */
-function box_upload_zip_explorer($real_directory, $relative_directory, $url = '') {
+function filemanager_box_upload_zip_explorer($real_directory, $relative_directory, $url = '') {
 	global $config;
 	
 	$table->width = '60%';
 	
 	$table->data = array ();
 	
-	if (! is_file_manager_writable_dir ($real_directory)) {
+	if (! filemanager_is_writable_dir ($real_directory)) {
 		echo "<h3 class='error'>".__('Current directory is not writable by HTTP Server')."</h3>";
 		echo '<p>';
 		echo __('Please check that current directory has write rights for HTTP server');
 		echo '</p>';
 	} else {
 		$table->data[1][0] = __('Upload zip file: ') . ui_print_help_tip (__("The zip upload in this dir, easy to upload multiple files."), true);
-		$table->data[1][1] = print_input_file ('file', true, false);
-		$table->data[1][2] = print_submit_button (__('Go'), 'go', false,
+		$table->data[1][1] = html_print_input_file ('file', true, false);
+		$table->data[1][2] = html_print_submit_button (__('Go'), 'go', false,
 			'class="sub next"', true);
-		$table->data[1][2] .= print_input_hidden ('real_directory', $real_directory, true);
-		$table->data[1][2] .= print_input_hidden ('directory', $relative_directory, true);
-		$table->data[1][2] .= print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
-		$table->data[1][2] .= print_input_hidden ('upload_zip', 1, true);
+		$table->data[1][2] .= html_print_input_hidden ('real_directory', $real_directory, true);
+		$table->data[1][2] .= html_print_input_hidden ('directory', $relative_directory, true);
+		$table->data[1][2] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
+		$table->data[1][2] .= html_print_input_hidden ('upload_zip', 1, true);
 	}
 	
 	echo '<form method="post" action="' . $url . '" enctype="multipart/form-data">';
-	print_table ($table);
+	html_print_table ($table);
 	echo '</form>';
 }
 
@@ -750,31 +750,31 @@ function box_upload_zip_explorer($real_directory, $relative_directory, $url = ''
  * @param unknown_type $relative_directory
  * @param string $url The url to set in the forms and some links in the explorer.
  */
-function box_create_text_explorer($real_directory, $relative_directory, $url = '') {
+function filemanager_box_create_text_explorer($real_directory, $relative_directory, $url = '') {
 	global $config;
 	
 	$table->width = '60%';
 	
 	$table->data = array ();
 	
-	if (! is_file_manager_writable_dir ($real_directory)) {
+	if (! filemanager_is_writable_dir ($real_directory)) {
 		echo "<h3 class='error'>".__('Current directory is not writable by HTTP Server')."</h3>";
 		echo '<p>';
 		echo __('Please check that current directory has write rights for HTTP server');
 		echo '</p>';
 	} else {
 		$table->data[1][0] = __('Create text file: ');
-		$table->data[1][1] = print_input_text('name_file', '', '', 30, 50, true);
-		$table->data[1][2] = print_submit_button (__('Create'), 'create', false,
+		$table->data[1][1] = html_print_input_text('name_file', '', '', 30, 50, true);
+		$table->data[1][2] = html_print_submit_button (__('Create'), 'create', false,
 			'class="sub"', true);
-		$table->data[1][2] .= print_input_hidden ('real_directory', $real_directory, true);
-		$table->data[1][2] .= print_input_hidden ('directory', $relative_directory, true);
-		$table->data[1][2] .= print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
-		$table->data[1][2] .= print_input_hidden ('create_text_file', 1, true);
+		$table->data[1][2] .= html_print_input_hidden ('real_directory', $real_directory, true);
+		$table->data[1][2] .= html_print_input_hidden ('directory', $relative_directory, true);
+		$table->data[1][2] .= html_print_input_hidden('hash', md5($real_directory . $relative_directory . $config['dbpass']), true);
+		$table->data[1][2] .= html_print_input_hidden ('create_text_file', 1, true);
 	}
 	
 	echo '<form method="post" action="' . $url . '">';
-	print_table ($table);
+	html_print_table ($table);
 	echo '</form>';
 }
 
@@ -784,7 +784,7 @@ function box_create_text_explorer($real_directory, $relative_directory, $url = '
  * @return array An array with all the directories where the file manager can
  * operate.
  */
-function get_file_manager_available_directories () {
+function filemanager_get_available_directories () {
 	global $config;
 	
 	$dirs = array ();
@@ -817,8 +817,8 @@ function get_file_manager_available_directories () {
  * @return array An array with all the directories where the file manager can
  * operate.
  */
-function is_file_manager_available_directory ($dirname) {
-	$dirs = get_file_manager_available_directories ();
+function filemanager_is_available_directory ($dirname) {
+	$dirs = filemanager_get_available_directories ();
 	
 	return isset ($dirs[$dirname]);
 }
@@ -831,10 +831,10 @@ function is_file_manager_available_directory ($dirname) {
  *
  * @param bool Wheter the directory is writeable or not.
  */
-function is_file_manager_writable_dir ($dirpath, $force = false) {
-	if (is_file_manager_available_directory (basename ($dirpath)))
+function filemanager_is_writable_dir ($dirpath, $force = false) {
+	if (filemanager_is_available_directory (basename ($dirpath)))
 		return is_writable ($dirpath);
-	if (is_file_manager_writable_dir (realpath ($dirpath.'/..')))
+	if (filemanager_is_writable_dir (realpath ($dirpath.'/..')))
 		return true;
 	else if (! $force)
 			return is_writable ($dirpath);
@@ -850,7 +850,7 @@ function is_file_manager_writable_dir ($dirpath, $force = false) {
  *
  * @param bool Wheter the directory is writeable or not.
  */
-function get_file_manager_file_info ($filepath) {
+function filemanager_get_file_info ($filepath) {
 	global $config;
 	
 	$realpath = realpath ($filepath);
@@ -893,7 +893,7 @@ function get_file_manager_file_info ($filepath) {
  *
  * @param bool Wheter the directory is writeable or not.
  */
-function list_file_manager_dir ($dirpath) {
+function filemanager_list_dir ($dirpath) {
 	$files = array ();
 	$dirs = array ();
 	$dir = opendir ($dirpath);
@@ -901,7 +901,7 @@ function list_file_manager_dir ($dirpath) {
 		/* Ignore hidden files */
 		if ($file[0] == '.')
 			continue;
-		$info = get_file_manager_file_info ($dirpath.'/'.$file);
+		$info = filemanager_get_file_info ($dirpath.'/'.$file);
 		if ($info['is_dir']) {
 			$dirs[$file] = $info;
 		} else {
diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php
index acbcffa9ec..7d76515e74 100644
--- a/pandora_console/include/functions_fsgraph.php
+++ b/pandora_console/include/functions_fsgraph.php
@@ -364,7 +364,7 @@ function clean_flash_string ($string) {
 function fs_error_image () {
 	global $config;
 
-	return print_image("images/image_problem.png", true, array("border" => '0'));
+	return html_print_image("images/image_problem.png", true, array("border" => '0'));
 }
 
 ?>
diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php
index 62df6a0aac..e92b11632d 100644
--- a/pandora_console/include/functions_gis.php
+++ b/pandora_console/include/functions_gis.php
@@ -23,8 +23,8 @@ include_once($config['homedir'] . "/include/functions_agents.php");
  * 
  * @return None
  */
-function addParentLines() {
-	makeLayer(__('Hierarchy of agents'));
+function gis_add_parent_lines() {
+	gis_make_layer(__('Hierarchy of agents'));
 	
 	echo "<script type='text/javascript'>";
 	echo "$(document).ready (function () {
@@ -46,7 +46,7 @@ function addParentLines() {
  * @param boolean $returnEmptyArrayInFail The set return a empty array when fail and true.
  * @return Array The row of agent in tgis_data_status, and it's a associative array.
  */
-function getDataLastPositionAgent($idAgent, $returnEmptyArrayInFail = false) {
+function gis_get_data_last_position_agent($idAgent, $returnEmptyArrayInFail = false) {
 	$returnVar = db_get_row('tgis_data_status', 'tagente_id_agente', $idAgent);
 	
 	if (($returnVar === false) && ($returnEmptyArrayInFail)) {
@@ -68,7 +68,7 @@ function getDataLastPositionAgent($idAgent, $returnEmptyArrayInFail = false) {
  * 
  * @return None
  */
-function printMap($idDiv, $iniZoom, $latCenter, $lonCenter, $baselayers, $controls = null) {
+function gis_print_map($idDiv, $iniZoom, $latCenter, $lonCenter, $baselayers, $controls = null) {
 	ui_require_javascript_file('OpenLayers/OpenLayers');
 	
 	echo "<script type='text/javascript'>";
@@ -129,7 +129,7 @@ function printMap($idDiv, $iniZoom, $latCenter, $lonCenter, $baselayers, $contro
 	echo "</script>";
 }
 
-function makeLayer($name, $visible = true, $dot = null, $idLayer = null) {
+function gis_make_layer($name, $visible = true, $dot = null, $idLayer = null) {
 	if ($dot == null) {
 		$dot['url'] = 'images/dot_green.png';
 		$dot['width'] = 20; //11;
@@ -219,7 +219,7 @@ function makeLayer($name, $visible = true, $dot = null, $idLayer = null) {
 	<?php
 }
 
-function activateSelectControl($layers=null) {
+function gis_activate_select_control($layers=null) {
 ?>
 	<script type="text/javascript">
 	$(document).ready (
@@ -242,7 +242,7 @@ function activateSelectControl($layers=null) {
  * 
  * @return None
  */
-function activateAjaxRefresh($layers = null, $lastTimeOfData = null) {
+function gis_activate_ajax_refresh($layers = null, $lastTimeOfData = null) {
 	if ($lastTimeOfData === null) $lastTimeOfData = time();
 	
 	ui_require_jquery_file ('json');
@@ -356,7 +356,7 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) {
 	<?php
 }
 
-function addAgentPoint($layerName, $pointName, $lat, $lon, $icon = null, $width = 20,
+function gis_add_agent_point($layerName, $pointName, $lat, $lon, $icon = null, $width = 20,
 	$height = 20, $point_id = '', $status = -1, $type_string = '', $idParent = 0) {
 	?>
 	<script type="text/javascript">
@@ -386,7 +386,7 @@ function addAgentPoint($layerName, $pointName, $lat, $lon, $icon = null, $width
  * 
  * @return array The array rows of tagente of agents in the layer.
  */
-function getAgentsLayer($idLayer, $fields = null) {
+function gis_get_agents_layer($idLayer, $fields = null) {
 	
 	if ($fields === null) {
 		$select = '*';
@@ -415,7 +415,7 @@ function getAgentsLayer($idLayer, $fields = null) {
 	return $agents;
 }
 
-function addPointPath($layerName, $lat, $lon, $color, $manual = 1, $id) {
+function gis_add_point_path($layerName, $lat, $lon, $color, $manual = 1, $id) {
 	?>
 	<script type="text/javascript">
 	$(document).ready (
@@ -427,7 +427,7 @@ function addPointPath($layerName, $lat, $lon, $color, $manual = 1, $id) {
 	<?php
 }
 
-function getMaps() {
+function gis_get_maps() {
 	return db_get_all_rows_in_table ('tgis_map', 'map_name');
 }
 /**
@@ -437,7 +437,7 @@ function getMaps() {
  *
  * @return An array of arrays of configuration parameters
  */
-function getMapConf($idMap) {
+function gis_get_map_conf($idMap) {
 	$mapConfs= db_get_all_rows_sql('SELECT tconn.*, trel.default_map_connection
 		FROM tgis_map_connection AS tconn, tgis_map_has_tgis_map_connection AS trel
 		WHERE trel.tgis_map_connection_id_tmap_connection = tconn.id_tmap_connection
@@ -445,11 +445,11 @@ function getMapConf($idMap) {
 	return $mapConfs;
 }
 
-function getMapConnection($idMapConnection) {
+function gis_get_map_connection($idMapConnection) {
 	return db_get_row('tgis_map_connection', 'id_tmap_connection', $idMapConnection);
 }
 
-function getLayers($idMap) {
+function gis_get_layers($idMap) {
 	$layers = db_get_all_rows_sql('SELECT *
 		FROM tgis_map_layer
 		WHERE tgis_map_id_tgis_map = ' . $idMap);
@@ -457,11 +457,11 @@ function getLayers($idMap) {
 	return $layers;
 }
 
-function get_agent_icon_map($idAgent, $state = false, $status = null) {
+function gis_get_agent_icon_map($idAgent, $state = false, $status = null) {
 	$row = db_get_row_sql('SELECT id_grupo, icon_path FROM tagente WHERE id_agente = ' . $idAgent);
 	
 	if (($row['icon_path'] === null) || (strlen($row['icon_path']) == 0)) {
-		$icon = "images/groups_small/" . get_group_icon($row['id_grupo']);
+		$icon = "images/groups_small/" . groups_get_icon($row['id_grupo']);
 	}
 	else {
 		$icon = "images/gis_map/icons/" . $row['icon_path'];
@@ -512,7 +512,7 @@ function get_agent_icon_map($idAgent, $state = false, $status = null) {
  * 
  * @return None
  */
-function addPath($layerName, $idAgent, $lastPosition = null, $history_time = null) {
+function gis_add_path($layerName, $idAgent, $lastPosition = null, $history_time = null) {
 	global $config;
 	
 	if ($history_time === null) {
@@ -579,19 +579,19 @@ function addPath($layerName, $idAgent, $lastPosition = null, $history_time = nul
 	if ($listPoints != false) {
 		foreach($listPoints as $point) {
 			if ((end($listPoints) != $point) || (($lastPosition !== null)))
-				addPointPath($layerName, $point['latitude'], $point['longitude'], $color, (int)$point['manual_placement'], $point['id_tgis_data']);
+				gis_add_point_path($layerName, $point['latitude'], $point['longitude'], $color, (int)$point['manual_placement'], $point['id_tgis_data']);
 		}
 	}
 }
 
-function deleteMapConnection($idConectionMap) {
+function gis_delete_map_connection($idConectionMap) {
 	
 	db_process_sql_delete ('tgis_map_connection', array('id_tmap_connection' => $idConectionMap));
 	
 	//TODO DELETE IN OTHER TABLES
 }
 
-function saveMapConnection($mapConnection_name, $mapConnection_group,
+function gis_save_map_connection($mapConnection_name, $mapConnection_group,
 			$mapConnection_numLevelsZoom, $mapConnection_defaultZoom,
 			$mapConnection_defaultLatitude, $mapConnection_defaultLongitude,
 			$mapConnection_defaultAltitude, $mapConnection_centerLatitude,
@@ -645,7 +645,7 @@ function saveMapConnection($mapConnection_name, $mapConnection_group,
  * @param $idMap integer The id of map.
  * @return None
  */
-function deleteMap($idMap) {
+function gis_delete_map($idMap) {
 	$listIdLayers = db_get_all_rows_sql("SELECT id_tmap_layer FROM tgis_map_layer WHERE tgis_map_id_tgis_map = " . $idMap);
 	
 	if ($listIdLayers !== false) {
@@ -681,7 +681,7 @@ function deleteMap($idMap) {
  * @param $map_connection_list
  * @param $arrayLayers
  */
-function saveMap($map_name, $map_initial_longitude, $map_initial_latitude,
+function gis_save_map($map_name, $map_initial_longitude, $map_initial_latitude,
 	$map_initial_altitude, $map_zoom_level, $map_background,
 	$map_default_longitude, $map_default_latitude, $map_default_altitude,
 	$map_group_id, $map_connection_list, $arrayLayers) {
@@ -738,7 +738,7 @@ function saveMap($map_name, $map_initial_longitude, $map_initial_latitude,
 	}
 }
 
-function updateMap($idMap, $map_name, $map_initial_longitude, $map_initial_latitude,
+function gis_update_map($idMap, $map_name, $map_initial_longitude, $map_initial_latitude,
 	$map_initial_altitude, $map_zoom_level, $map_background,
 	$map_default_longitude, $map_default_latitude, $map_default_altitude,
 	$map_group_id, $map_connection_list, $arrayLayers) {
@@ -811,7 +811,7 @@ function updateMap($idMap, $map_name, $map_initial_longitude, $map_initial_latit
  *
  * @result: An array with all the configuration parameters
  */
-function getConectionConf($idConnection) {
+function gis_get_conection_conf($idConnection) {
 	$confParameters = db_get_row_sql('SELECT * FROM tgis_map_connection WHERE id_tmap_connection = ' . $idConnection);
 	return $confParameters;
 }
@@ -828,7 +828,7 @@ function getConectionConf($idConnection) {
  *
  * @return boolean True ok and false fail. 
  */
-function getAgentMap($agent_id, $heigth, $width, $show_history = false, $centerInAgent = true, $history_time = 86400) {
+function gis_get_agent_map($agent_id, $heigth, $width, $show_history = false, $centerInAgent = true, $history_time = 86400) {
 	$defaultMap = db_get_all_rows_sql("
 		SELECT t1.*, t3.conection_name, t3.connection_type, t3.conection_data, t3.num_zoom_levels
 		FROM tgis_map AS t1, 
@@ -843,7 +843,7 @@ function getAgentMap($agent_id, $heigth, $width, $show_history = false, $centerI
 	
 	$defaultMap = $defaultMap[0];
 	
-	$agent_position = getDataLastPositionAgent($agent_id);
+	$agent_position = gis_get_data_last_position_agent($agent_id);
 	if ($agent_position === false) {
 		$agentPositionLongitude = $defaultMap['default_longitude'];
 		$agentPositionLatitude = $defaultMap['default_latitude'];
@@ -893,22 +893,22 @@ function getAgentMap($agent_id, $heigth, $width, $show_history = false, $centerI
 		<?php
 	}
 	
-	printMap($agent_name."_agent_map", $defaultMap['zoom_level'],
+	gis_print_map($agent_name."_agent_map", $defaultMap['zoom_level'],
 		$defaultMap['initial_latitude'],
 		$defaultMap['initial_longitude'], $baselayers, $controls);
 		
-	makeLayer("layer_for_agent_".$agent_name);
+	gis_make_layer("layer_for_agent_".$agent_name);
 	
-	$agent_icon = get_agent_icon_map($agent_id, true);
+	$agent_icon = gis_get_agent_icon_map($agent_id, true);
 	$status = get_agent_status($agent_id);
 	
 	/* If show_history is true, show the path of the agent */
 	if ($show_history) {
 		$lastPosition = array('longitude' => $agentPositionLongitude, 'latitude' => $agentPositionLatitude);
-		addPath("layer_for_agent_".$agent_name,$agent_id, $lastPosition, $history_time);
+		gis_add_path("layer_for_agent_".$agent_name,$agent_id, $lastPosition, $history_time);
 	}
 	
-	addAgentPoint("layer_for_agent_".$agent_name, $agent_name, $agentPositionLatitude, $agentPositionLongitude, $agent_icon, 20, 20, $agent_id, $status, 'point_agent_info');
+	gis_add_agent_point("layer_for_agent_".$agent_name, $agent_name, $agentPositionLatitude, $agentPositionLongitude, $agent_icon, 20, 20, $agent_id, $status, 'point_agent_info');
 	
 	if ($centerInAgent) {
 		?>
@@ -933,7 +933,7 @@ function getAgentMap($agent_id, $heigth, $width, $show_history = false, $centerI
  * 
  * @return Array The array is [N][3], where the N index is name base of icon and [N]['ok'] ok image, [N]['bad'] bad image, [N]['warning'] warning image and [N]['default] default image 
  */
-function getArrayListIcons($fullpath = true) {
+function gis_get_array_list_icons($fullpath = true) {
 	$return = array();
 	$validExtensions = array('jpg', 'jpeg', 'gif', 'png');
 	
@@ -968,7 +968,7 @@ function getArrayListIcons($fullpath = true) {
 	return $return;
 }
 
-function validateMapData($map_name, $map_zoom_level,
+function gis_validate_map_data($map_name, $map_zoom_level,
 	$map_initial_longitude, $map_initial_latitude, $map_initial_altitude,
 	$map_default_longitude, $map_default_latitude, $map_default_altitude,
 	$map_connection_list, $map_levels_zoom) {
@@ -1041,7 +1041,7 @@ function validateMapData($map_name, $map_zoom_level,
  * 
  * @return Array Return a asociative array whith the items 'map', 'connections' and 'layers'. And in 'layers' has data and item 'agents'.
  */
-function getMapData($idMap) {
+function gis_get_map_data($idMap) {
 	global $config;
 	
 	$returnVar = array();
@@ -1104,24 +1104,24 @@ function getMapData($idMap) {
  * 
  * @return String The html source code.
  */
-function addConectionMapsInForm($map_connection_list) {
+function gis_add_conection_maps_in_form($map_connection_list) {
 	$returnVar = '';
 	
 	foreach ($map_connection_list as $mapConnection) {
-		$mapConnectionRowDB = getMapConnection($mapConnection['id_conection']);
+		$mapConnectionRowDB = gis_get_map_connection($mapConnection['id_conection']);
 		
 		if ($mapConnection['default']) {
-			$radioButton = print_radio_button_extended('map_connection_default', $mapConnection['id_conection'], '', $mapConnection['id_conection'], false, 'changeDefaultConection(this.value)', '', true);
+			$radioButton = html_print_radio_button_extended('map_connection_default', $mapConnection['id_conection'], '', $mapConnection['id_conection'], false, 'changeDefaultConection(this.value)', '', true);
 		}
 		else
-			$radioButton = print_radio_button_extended('map_connection_default', $mapConnection['id_conection'], '', null, false, 'changeDefaultConection(this.value)', '', true);
+			$radioButton = html_print_radio_button_extended('map_connection_default', $mapConnection['id_conection'], '', null, false, 'changeDefaultConection(this.value)', '', true);
 		
 		$returnVar .= '
 			<tbody id="map_connection_' . $mapConnection['id_conection'] . '">
 				<tr class="row_0">
-					<td>' . print_input_text ('map_connection_name_' . $mapConnection['id_conection'], $mapConnectionRowDB['conection_name'], '', 20, 40, true, true) . '</td>
+					<td>' . html_print_input_text ('map_connection_name_' . $mapConnection['id_conection'], $mapConnectionRowDB['conection_name'], '', 20, 40, true, true) . '</td>
 					<td>' . $radioButton . '</td>
-					<td><a id="delete_row" href="javascript: deleteConnectionMap(\'' . $mapConnection['id_conection'] . '\')">' . print_image("images/cross.png", true, array("alt" => "")) . '</a></td>
+					<td><a id="delete_row" href="javascript: deleteConnectionMap(\'' . $mapConnection['id_conection'] . '\')">' . html_print_image("images/cross.png", true, array("alt" => "")) . '</a></td>
 				</tr>
 			</tbody>
 			<script type="text/javascript">
@@ -1140,7 +1140,7 @@ function addConectionMapsInForm($map_connection_list) {
  * 
  * @return integer The num zoom levels.
  */
-function getNumZoomLevelsOfConnectionDefault($map_connection_list) {
+function gis_get_num_zoom_levels_connection_default($map_connection_list) {
 	foreach ($map_connection_list as $connection) {
 		if ($connection['default']) {
 			return $connection['num_zoom_levels'];
@@ -1157,7 +1157,7 @@ function getNumZoomLevelsOfConnectionDefault($map_connection_list) {
  * 
  * @return String The html source code.
  */
-function addLayerList($layer_list) {
+function gis_add_layer_list($layer_list) {
 	$returnVar = '';
 	
 	$count = 0;
@@ -1179,14 +1179,14 @@ function addLayerList($layer_list) {
 			<tbody id="layer_item_' . $count . '">
 				<tr>
 					<td class="col1">' . $layer['layer_name'] . '</td>
-					<td class="up_arrow"><a id="up_arrow" href="javascript: upLayer(' . $count . ');">' . print_image("images/up.png", true, array("alt" => "")) . '</a></td>
-					<td class="down_arrow"><a id="down_arrow" href="javascript: downLayer(' . $count . ');">' . print_image("images/down.png", true, array("alt" => "")) . '</a></td>
+					<td class="up_arrow"><a id="up_arrow" href="javascript: upLayer(' . $count . ');">' . html_print_image("images/up.png", true, array("alt" => "")) . '</a></td>
+					<td class="down_arrow"><a id="down_arrow" href="javascript: downLayer(' . $count . ');">' . html_print_image("images/down.png", true, array("alt" => "")) . '</a></td>
 					<td class="col3">
-						<a id="edit_layer" href="javascript: editLayer(' . $count . ');">' . print_image("images/config.png", true, array("alt" => "")) . '</a>
+						<a id="edit_layer" href="javascript: editLayer(' . $count . ');">' . html_print_image("images/config.png", true, array("alt" => "")) . '</a>
 					</td>
 					<td class="col4">
 						<input type="hidden" name="layer_values_' . $count . '" value=\'' . $layerDataJSON . '\' id="layer_values_' . $count . '" />
-						<a id="delete_row" href="javascript: deleteLayer(' . $count . ')">' . print_image("images/cross.png", true, array("alt" => "")) . '</a>
+						<a id="delete_row" href="javascript: deleteLayer(' . $count . ')">' . html_print_image("images/cross.png", true, array("alt" => "")) . '</a>
 					</td>
 				</tr>
 			</tbody>
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index b2d3dfd818..f76eb85e1f 100755
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1455,7 +1455,7 @@ function fs_agent_event_chart2 ($data, $width, $height, $step = 1) {
 function fs_error_image2 () {
 	global $config;
 
-	return print_image("images/image_problem.png", true, array("border" => '0'));
+	return html_print_image("images/image_problem.png", true, array("border" => '0'));
 }
 
 
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index 7ac80d1496..f322c03671 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -23,7 +23,7 @@ require_once ($config['homedir'].'/include/functions_users.php');
  * 
  * @return bool Return false if the group is unused in the Pandora, else true.
  */
-function checkUsedGroup($idGroup) {
+function groups_check_used($idGroup) {
 	global $config;
 
 	$return = array();
@@ -232,7 +232,7 @@ function checkUsedGroup($idGroup) {
  * @param integer $parent The id_group parent to search the childrens.
  * @param array $groups The groups, its for optimize the querys to DB.
  */
-function get_childrens($parent, $groups = null) {
+function groups_get_childrens($parent, $groups = null) {
 	if (empty($groups)) {
 		$groups = db_get_all_rows_in_table('tgrupo');
 	}
@@ -244,7 +244,7 @@ function get_childrens($parent, $groups = null) {
 			continue;
 		}
 		if ($group['parent'] == $parent) {
-			$return = $return + array($group['id_grupo'] => $group) + get_childrens($group['id_grupo'], $groups);
+			$return = $return + array($group['id_grupo'] => $group) + groups_get_childrens($group['id_grupo'], $groups);
 		}
 	}
 
@@ -258,7 +258,7 @@ function get_childrens($parent, $groups = null) {
  * @param boolean $onlyPropagate Flag to search only parents that true to propagate.
  * @param array $groups The groups, its for optimize the querys to DB.
  */
-function get_parents($parent, $onlyPropagate = false, $groups = null) {
+function groups_get_parents($parent, $onlyPropagate = false, $groups = null) {
 	if (empty($groups)) {
 		$groups = db_get_all_rows_in_table('tgrupo');
 	}
@@ -270,7 +270,7 @@ function get_parents($parent, $onlyPropagate = false, $groups = null) {
 			continue;
 		}
 		if (($group['id_grupo'] == $parent) && ($group['propagate'] || !$onlyPropagate)) {
-			$return = $return + array($group['id_grupo'] => $group) + get_parents($group['parent'], $groups);
+			$return = $return + array($group['id_grupo'] => $group) + groups_get_parents($group['parent'], $groups);
 		}
 	}
 
@@ -298,7 +298,7 @@ function get_parents($parent, $onlyPropagate = false, $groups = null) {
  *
  * @return array Groups the user DOES have acces to (or an empty array)
  */
-function safe_acl_group ($id_user, $id_groups, $access) {
+function groups_safe_acl ($id_user, $id_groups, $access) {
 	if (!is_array ($id_groups) && check_acl ($id_user, $id_groups, $access)) {
 		/* Return all the user groups if it's the group All */
 		if ($id_groups == 0)
@@ -326,7 +326,7 @@ function safe_acl_group ($id_user, $id_groups, $access) {
  *
  * @return bool Disabled field of given group
  */
-function give_disabled_group ($id_group) {
+function groups_give_disabled_group ($id_group) {
 	return (bool) db_get_value ('disabled', 'tgrupo', 'id_grupo', (int) $id_group);
 }
 
@@ -337,7 +337,7 @@ function give_disabled_group ($id_group) {
  *
  * @return bool It's true when the array is all groups in db.
  */
-function isAllGroups($idGroups) {
+function groups_is_all_group($idGroups) {
 	if (!is_array($idGroups))
 	$arrayGroups = array($idGroups);
 	else
@@ -363,7 +363,7 @@ function isAllGroups($idGroups) {
  *
  * @return string Icon path of the given group
  */
-function get_group_icon ($id_group) {
+function groups_get_icon ($id_group) {
 	if ($id_group == 0) {
 		return 'world';
 	}
@@ -379,7 +379,7 @@ function get_group_icon ($id_group) {
  *
  * @return Array with all groups selected
  */
-function get_all_groups($groupWithAgents = false) {
+function groups_get_all($groupWithAgents = false) {
 	global $config;
 
 	$sql = 'SELECT id_grupo, nombre FROM tgrupo';
@@ -418,7 +418,7 @@ function get_all_groups($groupWithAgents = false) {
  *
  * @return Array with all result groups
  */
-function get_id_groups_recursive($id_parent, $all = false) {
+function groups_get_id_recursive($id_parent, $all = false) {
 	$return = array();
 
 	$return = array_merge($return, array($id_parent));
@@ -440,7 +440,7 @@ function get_id_groups_recursive($id_parent, $all = false) {
 		}
 
 		foreach ($children as $id_children) {
-			$return = array_merge($return, get_id_groups_recursive($id_children, $all));
+			$return = array_merge($return, groups_get_id_recursive($id_children, $all));
 		}
 	}
 
@@ -456,7 +456,7 @@ function get_id_groups_recursive($id_parent, $all = false) {
  *
  * @return array The treefield list of groups.
  */
-function get_user_groups_tree_recursive($groups, $parent = 0, $deep = 0) {
+function groups_get_groups_tree_recursive($groups, $parent = 0, $deep = 0) {
 	$return = array();
 
 	foreach ($groups as $key => $group) {
@@ -468,7 +468,7 @@ function get_user_groups_tree_recursive($groups, $parent = 0, $deep = 0) {
 		}
 		else if ($group['parent'] == $parent) {
 			$group['deep'] = $deep;
-			$branch = get_user_groups_tree_recursive($groups, $key, $deep + 1);
+			$branch = groups_get_groups_tree_recursive($groups, $key, $deep + 1);
 			if (empty($branch)) {
 				$group['hash_branch'] = false;
 			}
@@ -489,7 +489,7 @@ function get_user_groups_tree_recursive($groups, $parent = 0, $deep = 0) {
  *
  * @return int Status of the agents.
  */
-function get_group_status ($id_group = 0) {
+function groups_get_status ($id_group = 0) {
 	$agents = get_group_agents($id_group);
 
 	$agents_status = array();
@@ -497,10 +497,10 @@ function get_group_status ($id_group = 0) {
 		$agents_status[] = get_agent_status($key);
 	}
 
-	$childrens = get_childrens($id_group);
+	$childrens = groups_get_childrens($id_group);
 
 	foreach($childrens as $key => $child){
-		$agents_status[] = get_group_status($key);
+		$agents_status[] = groups_get_status($key);
 	}
 
 	// Status is 0 for normal, 1 for critical, 2 for warning and 3/-1 for unknown. 4 for fired alerts
@@ -540,7 +540,7 @@ function get_group_status ($id_group = 0) {
  *
  * @return string The group name
  */
-function get_group_name ($id_group, $returnAllGroup = false) {
+function groups_get_name ($id_group, $returnAllGroup = false) {
 	if($id_group > 0)
 	return (string) db_get_value ('nombre', 'tgrupo', 'id_grupo', (int) $id_group);
 	elseif($returnAllGroup)
@@ -554,7 +554,7 @@ function get_group_name ($id_group, $returnAllGroup = false) {
  *
  * @return array An array with all the users or an empty array
  */
-function get_group_users ($id_group, $filter = false) {
+function groups_get_users ($id_group, $filter = false) {
 	if (! is_array ($filter))
 		$filter = array ();
 	
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 300211cfce..12d5b2ad71 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -36,7 +36,7 @@ require_once ($config['homedir'].'/include/functions_groups.php');
 /**
  * Prints the print_r with < pre > tags
  */
-function debugPrint ($var, $file = '') {
+function html_debug_print ($var, $file = '') {
 	if ($file === true)
 		$file = '/tmp/logDebug';
 	if (strlen($file) > 0) {
@@ -54,7 +54,7 @@ function debugPrint ($var, $file = '') {
 	}
 }
 
-function f2str($function, $params) {
+function html_f2str($function, $params) {
 	ob_start();
 	
 	call_user_func_array($function, $params);
@@ -81,7 +81,7 @@ function f2str($function, $params) {
  *
  * @return string HTML code if return parameter is true.
  */
-function print_select_style ($fields, $name, $selected = '', $style='', $script = '', $nothing = '', $nothing_value = 0, $return = false, $multiple = false, $sort = true, $class = '', $disabled = false) {
+function html_print_select_style ($fields, $name, $selected = '', $style='', $script = '', $nothing = '', $nothing_value = 0, $return = false, $multiple = false, $sort = true, $class = '', $disabled = false) {
 	$output = "\n";
 	
 	static $idcounter = array ();
@@ -178,7 +178,7 @@ function print_select_style ($fields, $name, $selected = '', $style='', $script
  *
  * @return string HTML code if return parameter is true.
  */
-function print_select_groups($id_user = false, $privilege = "AR", $returnAllGroup = true,
+function html_print_select_groups($id_user = false, $privilege = "AR", $returnAllGroup = true,
 	$name, $selected = '', $script = '', $nothing = '', $nothing_value = 0, $return = false, 
 	$multiple = false, $sort = true, $class = '', $disabled = false, $style = false, $option_style = false, $id_group = false) {
 	global $config;
@@ -186,14 +186,14 @@ function print_select_groups($id_user = false, $privilege = "AR", $returnAllGrou
 	$user_groups = get_user_groups ($id_user, $privilege, $returnAllGroup, true);
 	
 	if ($id_group !== false) {
-		$childrens = get_childrens($id_group);
+		$childrens = groups_get_childrens($id_group);
 		foreach ($childrens as $child) {
 			unset($user_groups[$child['id_grupo']]);
 		}
 		unset($user_groups[$id_group]);
 	}
 	
-	$user_groups_tree = get_user_groups_tree_recursive($user_groups);
+	$user_groups_tree = groups_get_groups_tree_recursive($user_groups);
 	
 	$fields = array();
 	foreach ($user_groups_tree as $group) {
@@ -207,7 +207,7 @@ function print_select_groups($id_user = false, $privilege = "AR", $returnAllGrou
 		$fields[$group['id_grupo']] = str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;", $group['deep']) . $groupName;
 	}
 	
-	$output = print_select ($fields, $name, $selected, $script, $nothing, $nothing_value,
+	$output = html_print_select ($fields, $name, $selected, $script, $nothing, $nothing_value,
 		$return, $multiple, false, $class, $disabled, $style, $option_style);
 		
 	if ($return) {
@@ -234,7 +234,7 @@ function print_select_groups($id_user = false, $privilege = "AR", $returnAllGrou
  *
  * @return string HTML code if return parameter is true.
  */
-function print_select ($fields, $name, $selected = '', $script = '', $nothing = '', $nothing_value = 0, $return = false, 
+function html_print_select ($fields, $name, $selected = '', $script = '', $nothing = '', $nothing_value = 0, $return = false, 
 	$multiple = false, $sort = true, $class = '', $disabled = false, $style = false, $option_style = false) {
 	
 	$output = "\n";
@@ -358,7 +358,7 @@ function print_select ($fields, $name, $selected = '', $script = '', $nothing =
  *
  * @return string HTML code if return parameter is true.
  */
-function print_select_from_sql ($sql, $name, $selected = '', $script = '', $nothing = '', $nothing_value = '0', $return = false,
+function html_print_select_from_sql ($sql, $name, $selected = '', $script = '', $nothing = '', $nothing_value = '0', $return = false,
 	$multiple = false, $sort = true, $disabled = false, $style = false) {
 	global $config;
 	
@@ -378,7 +378,7 @@ function print_select_from_sql ($sql, $name, $selected = '', $script = '', $noth
 		}
 	}
 	
-	return print_select ($fields, $name, $selected, $script, $nothing, $nothing_value, $return, $multiple, $sort,'',$disabled, $style);
+	return html_print_select ($fields, $name, $selected, $script, $nothing, $nothing_value, $return, $multiple, $sort,'',$disabled, $style);
 }
 
 /**
@@ -397,7 +397,7 @@ function print_select_from_sql ($sql, $name, $selected = '', $script = '', $noth
  * @return string HTML code if return parameter is true.
  */
 
-function print_extended_select_for_time ($fields, $name, $selected = '', $script = '', $nothing = '',
+function html_print_extended_select_for_time ($fields, $name, $selected = '', $script = '', $nothing = '',
 	$nothing_value = '0', $size = false, $return = false, $select_style = false) {
 	
 	if (($selected !== false) && (!isset($fields[$selected]))) {
@@ -406,9 +406,9 @@ function print_extended_select_for_time ($fields, $name, $selected = '', $script
 	
 	ob_start();
 	
-	print_select ($fields, $name . '_select', $selected,"javascript: $('#text-" . $name . "').val($('#" . $name . "_select').val());" . $script,
+	html_print_select ($fields, $name . '_select', $selected,"javascript: $('#text-" . $name . "').val($('#" . $name . "_select').val());" . $script,
 		$nothing, $nothing_value, false, false, false, '', false, $select_style);
-	print_input_text ($name, $selected, '', $size);
+	html_print_input_text ($name, $selected, '', $size);
 	
 	$returnString = ob_get_clean();
 	
@@ -419,12 +419,12 @@ function print_extended_select_for_time ($fields, $name, $selected = '', $script
 }
 
 /**
- * Render an input text element. Extended version, use print_input_text() to simplify.
+ * Render an input text element. Extended version, use html_print_input_text() to simplify.
  * 
  * @param string $name Input name.
  * @param string $value Input value.
  * @param string $id Input HTML id.
- * @param string $alt Do not use, invalid for text and password. Use print_input_image
+ * @param string $alt Do not use, invalid for text and password. Use html_print_input_image
  * @param int $size Size of the input.
  * @param int $maxlength Maximum length allowed.
  * @param bool $disabled Disable the button (optional, button enabled by default).
@@ -435,7 +435,7 @@ function print_extended_select_for_time ($fields, $name, $selected = '', $script
  *
  * @return string HTML code if return parameter is true.
  */
-function print_input_text_extended ($name, $value, $id, $alt, $size, $maxlength, $disabled, $script, $attributes, $return = false, $password = false) {
+function html_print_input_text_extended ($name, $value, $id, $alt, $size, $maxlength, $disabled, $script, $attributes, $return = false, $password = false) {
 	static $idcounter = 0;
 	
 	if ($maxlength == 0)
@@ -520,8 +520,8 @@ function print_input_text_extended ($name, $value, $id, $alt, $size, $maxlength,
  *
  * @return string HTML code if return parameter is true.
  */
-function print_input_password ($name, $value, $alt = '', $size = 50, $maxlength = 255, $return = false, $disabled = false) {
-	$output = print_input_text_extended ($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', '', true, true);
+function html_print_input_password ($name, $value, $alt = '', $size = 50, $maxlength = 255, $return = false, $disabled = false) {
+	$output = html_print_input_text_extended ($name, $value, 'password-'.$name, $alt, $size, $maxlength, $disabled, '', '', true, true);
 
 	if ($return)
 		return $output;
@@ -543,14 +543,14 @@ function print_input_password ($name, $value, $alt = '', $size = 50, $maxlength
  *
  * @return string HTML code if return parameter is true.
  */
-function print_input_text ($name, $value, $alt = '', $size = 50, $maxlength = 255, $return = false, $disabled = false) {
+function html_print_input_text ($name, $value, $alt = '', $size = 50, $maxlength = 255, $return = false, $disabled = false) {
 	if ($maxlength == 0)
 		$maxlength = 255;
 	
 	if ($size == 0)
 		$size = 10;
 		
-	return print_input_text_extended ($name, $value, 'text-'.$name, '', $size, $maxlength, $disabled, '', '', $return);
+	return html_print_input_text_extended ($name, $value, 'text-'.$name, '', $size, $maxlength, $disabled, '', '', $return);
 }
 
 /**
@@ -566,7 +566,7 @@ function print_input_text ($name, $value, $alt = '', $size = 50, $maxlength = 25
  *
  * @return string HTML code if return parameter is true.
  */
-function print_input_image ($name, $src, $value, $style = '', $return = false, $options = false) {
+function html_print_input_image ($name, $src, $value, $style = '', $return = false, $options = false) {
 	global $config;
 	static $idcounter = 0;
 	
@@ -616,7 +616,7 @@ function print_input_image ($name, $src, $value, $style = '', $return = false, $
  *
  * @return string HTML code if return parameter is true.
  */
-function print_input_hidden ($name, $value, $return = false, $class = false) {
+function html_print_input_hidden ($name, $value, $return = false, $class = false) {
 	if ($class !== false) {
 		$classText = 'class="' . $class . '"';
 	}
@@ -644,7 +644,7 @@ function print_input_hidden ($name, $value, $return = false, $class = false) {
  *
  * @return string HTML code if return parameter is true.
  */
-function print_submit_button ($label = 'OK', $name = '', $disabled = false, $attributes = '', $return = false) {
+function html_print_submit_button ($label = 'OK', $name = '', $disabled = false, $attributes = '', $return = false) {
 	if (!$name) {
 		$name="unnamed";
 	}
@@ -682,7 +682,7 @@ function print_submit_button ($label = 'OK', $name = '', $disabled = false, $att
  *
  * @return string HTML code if return parameter is true.
  */
-function print_button ($label = 'OK', $name = '', $disabled = false, $script = '', $attributes = '', $return = false, $imageButton = false) {
+function html_print_button ($label = 'OK', $name = '', $disabled = false, $script = '', $attributes = '', $return = false, $imageButton = false) {
 	$output = '';
 
 	$alt = $title = '';
@@ -715,7 +715,7 @@ function print_button ($label = 'OK', $name = '', $disabled = false, $script = '
  *
  * @return string HTML code if return parameter is true.
  */
-function print_textarea ($name, $rows, $columns, $value = '', $attributes = '', $return = false) {
+function html_print_textarea ($name, $rows, $columns, $value = '', $attributes = '', $return = false) {
 	static $idcounter = array ();
 	
 	//If duplicate names exist, it will start numbering. Otherwise it won't
@@ -768,7 +768,7 @@ function print_textarea ($name, $rows, $columns, $value = '', $attributes = '',
  *
  * @return string HTML code if return parameter is true.
  */
-function print_table (&$table, $return = false) {
+function html_print_table (&$table, $return = false) {
 	$output = '';
 	static $table_count = 0;
 
@@ -976,7 +976,7 @@ function print_table (&$table, $return = false) {
 
 
 /**
- * Render a radio button input. Extended version, use print_radio_button() to simplify.
+ * Render a radio button input. Extended version, use html_print_radio_button() to simplify.
  *
  * @param string Input name.
  * @param string Input value.
@@ -989,7 +989,7 @@ function print_table (&$table, $return = false) {
  *
  * @return string HTML code if return parameter is true.
  */
-function print_radio_button_extended ($name, $value, $label, $checkedvalue, $disabled, $script, $attributes, $return = false) {
+function html_print_radio_button_extended ($name, $value, $label, $checkedvalue, $disabled, $script, $attributes, $return = false) {
 	static $idcounter = 0;
 
 	$output = '';
@@ -1031,8 +1031,8 @@ function print_radio_button_extended ($name, $value, $label, $checkedvalue, $dis
  *
  * @return string HTML code if return parameter is true.
  */
-function print_radio_button ($name, $value, $label = '', $checkedvalue = '', $return = false) {
-	$output = print_radio_button_extended ($name, $value, $label, $checkedvalue, false, '', '', true);
+function html_print_radio_button ($name, $value, $label = '', $checkedvalue = '', $return = false) {
+	$output = html_print_radio_button_extended ($name, $value, $label, $checkedvalue, false, '', '', true);
 	
 	if ($return)
 		return $output;
@@ -1041,7 +1041,7 @@ function print_radio_button ($name, $value, $label = '', $checkedvalue = '', $re
 }
 
 /**
- * Render a checkbox button input. Extended version, use print_checkbox() to simplify.
+ * Render a checkbox button input. Extended version, use html_print_checkbox() to simplify.
  *
  * @param string Input name.
  * @param string Input value.
@@ -1054,7 +1054,7 @@ function print_radio_button ($name, $value, $label = '', $checkedvalue = '', $re
  *
  * @return string HTML code if return parameter is true.
  */
-function print_checkbox_extended ($name, $value, $checked, $disabled, $script, $attributes, $return = false) {
+function html_print_checkbox_extended ($name, $value, $checked, $disabled, $script, $attributes, $return = false) {
 	static $idcounter = array ();
 	
 	//If duplicate names exist, it will start numbering. Otherwise it won't
@@ -1098,8 +1098,8 @@ function print_checkbox_extended ($name, $value, $checked, $disabled, $script, $
  *
  * @return string HTML code if return parameter is true.
  */
-function print_checkbox ($name, $value, $checked = false, $return = false, $disabled = false, $script = '') {
-	$output = print_checkbox_extended ($name, $value, (bool) $checked, $disabled, $script, '', true);
+function html_print_checkbox ($name, $value, $checked = false, $return = false, $disabled = false, $script = '') {
+	$output = html_print_checkbox_extended ($name, $value, (bool) $checked, $disabled, $script, '', true);
 
 	if ($return === false)
 		echo $output;
@@ -1118,7 +1118,7 @@ function print_checkbox ($name, $value, $checked = false, $return = false, $disa
  *
  * @return string HTML code if return parameter is true.
  */
-function print_image ($src, $return = false, $options = false, $return_src = false) {
+function html_print_image ($src, $return = false, $options = false, $return_src = false) {
 	global $config;
 
 	/* Checks if user's skin is available */
@@ -1207,7 +1207,7 @@ function print_image ($src, $return = false, $options = false, $return_src = fal
 }
 
 /**
- * Render an input text element. Extended version, use print_input_text() to simplify.
+ * Render an input text element. Extended version, use html_print_input_text() to simplify.
  *
  * @param string Input name.
  * @param bool Whether to return an output string or echo now (optional, echo by default).
@@ -1216,7 +1216,7 @@ function print_image ($src, $return = false, $options = false, $return_src = fal
  *	Key disabled: Whether to disable the input or not.
  *	Key class: HTML class
  */
-function print_input_file ($name, $return = false, $options = false) {
+function html_print_input_file ($name, $return = false, $options = false) {
 	$output = '';
 	
 	$output .= '<input type="file" value="" name="'.$name.'" id="file-'.$name.'" ';
@@ -1249,7 +1249,7 @@ function print_input_file ($name, $return = false, $options = false) {
  *	Key html: Extra HTML to add after the label.
  *	Key class: HTML class
  */
-function print_label ($text, $id, $return = false, $options = false) {
+function html_print_label ($text, $id, $return = false, $options = false) {
 	$output = '';
 	
 	$output .= '<label id="label-'.$id.'" ';
@@ -1279,7 +1279,7 @@ function print_label ($text, $id, $return = false, $options = false) {
  *
  * @param string color in format #FFFFFF, FFFFFF, #FFF or FFF
  */
-function html2rgb($htmlcolor)
+function html_html2rgb($htmlcolor)
 {
 	if ($htmlcolor[0] == '#') {
 		$htmlcolor = substr($htmlcolor, 1);
@@ -1322,7 +1322,7 @@ function html2rgb($htmlcolor)
  * 
  * @return mixed If the $return is true, return the output as string.
  */
-function print_autocomplete_modules($name = 'module', $default = '', $id_agents = false, $ACL = true, $scriptResult = '', $filter = array(), $return = false) {
+function html_print_autocomplete_modules($name = 'module', $default = '', $id_agents = false, $ACL = true, $scriptResult = '', $filter = array(), $return = false) {
 	global $config;
 	
 	if ($id_agents === false) {
@@ -1412,7 +1412,7 @@ function print_autocomplete_modules($name = 'module', $default = '', $id_agents
 	</script>
 	<?php
 	
-	print_input_text_extended ($name, $default, 'text-' . $name, '', 30, 100, false, '',
+	html_print_input_text_extended ($name, $default, 'text-' . $name, '', 30, 100, false, '',
 		array('style' => 'background: url(images/lightning_blue.png) no-repeat right;'));
 	echo '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search the module.") . '</span></a>';
 
diff --git a/pandora_console/include/functions_incidents.php b/pandora_console/include/functions_incidents.php
index fd05219341..cfca3fb470 100644
--- a/pandora_console/include/functions_incidents.php
+++ b/pandora_console/include/functions_incidents.php
@@ -46,22 +46,22 @@ function get_incidents_priorities () {
 function print_incidents_priority_img ($id_priority, $return = false) {
 	switch ($id_priority) {
 	case 0:
-		$img = print_image ("images/dot_green.png", true, array('title' => __('Informative'))).print_image ("images/dot_green.png", true, array('title' => __('Informative'))).print_image ("images/dot_yellow.png", true, array('title' => __('Informative')));
+		$img = html_print_image ("images/dot_green.png", true, array('title' => __('Informative'))).html_print_image ("images/dot_green.png", true, array('title' => __('Informative'))).html_print_image ("images/dot_yellow.png", true, array('title' => __('Informative')));
 		break;
 	case 1:
-		$img = print_image ("images/dot_green.png", true, array('title' => __('Low'))).print_image ("images/dot_yellow.png", true, array('title' => __('Low'))).print_image ("images/dot_yellow.png", true, array('title' => __('Low')));
+		$img = html_print_image ("images/dot_green.png", true, array('title' => __('Low'))).html_print_image ("images/dot_yellow.png", true, array('title' => __('Low'))).html_print_image ("images/dot_yellow.png", true, array('title' => __('Low')));
 		break;
 	case 2:
-		$img = print_image ("images/dot_yellow.png", true, array('title' => __('Medium'))).print_image ("images/dot_yellow.png", true, array('title' => __('Medium'))).print_image ("images/dot_red.png", true, array('title' => __('Medium')));
+		$img = html_print_image ("images/dot_yellow.png", true, array('title' => __('Medium'))).html_print_image ("images/dot_yellow.png", true, array('title' => __('Medium'))).html_print_image ("images/dot_red.png", true, array('title' => __('Medium')));
 		break;
 	case 3:
-		$img = print_image ("images/dot_yellow.png", true, array('title' => __('Serious'))).print_image ("images/dot_red.png", true, array('title' => __('Serious'))).print_image ("images/dot_red.png", true, array('title' => __('Serious')));
+		$img = html_print_image ("images/dot_yellow.png", true, array('title' => __('Serious'))).html_print_image ("images/dot_red.png", true, array('title' => __('Serious'))).html_print_image ("images/dot_red.png", true, array('title' => __('Serious')));
 		break;
 	case 4:
-		$img = print_image ("images/dot_red.png", true, array('title' => __('Very serious'))).print_image ("images/dot_red.png", true, array('title' => __('Very serious'))).print_image ("images/dot_red.png", true, array('title' => __('Very serious')));
+		$img = html_print_image ("images/dot_red.png", true, array('title' => __('Very serious'))).html_print_image ("images/dot_red.png", true, array('title' => __('Very serious'))).html_print_image ("images/dot_red.png", true, array('title' => __('Very serious')));
 		break;
 	case 10:
-		$img = print_image ("images/dot_green.png", true, array('title' => __('Maintenance'))).print_image ("images/dot_green.png", true, array('title' => __('Maintenance'))).print_image ("images/dot_green.png", true, array('title' => __('Maintenance')));
+		$img = html_print_image ("images/dot_green.png", true, array('title' => __('Maintenance'))).html_print_image ("images/dot_green.png", true, array('title' => __('Maintenance'))).html_print_image ("images/dot_green.png", true, array('title' => __('Maintenance')));
 		break;
 	}
 	
@@ -98,19 +98,19 @@ function get_incidents_status () {
 function print_incidents_status_img ($id_status, $return = false) {
 	switch ($id_status) {
 		case 0:
-			$img = print_image ("images/dot_red.png", true, array('title' => __('Active incidents')));
+			$img = html_print_image ("images/dot_red.png", true, array('title' => __('Active incidents')));
 		break;
 		case 1:
-			$img = print_image ("images/dot_yellow.png", true, array('title' => __('Active incidents, with comments')));
+			$img = html_print_image ("images/dot_yellow.png", true, array('title' => __('Active incidents, with comments')));
 		break;
 		case 2:
-			$img = print_image ("images/dot_blue.png", true, array('title' => __('Rejected incidents')));
+			$img = html_print_image ("images/dot_blue.png", true, array('title' => __('Rejected incidents')));
 		break;
 		case 3:
-			$img = print_image ("images/dot_green.png", true, array('title' => __('Expired incidents')));
+			$img = html_print_image ("images/dot_green.png", true, array('title' => __('Expired incidents')));
 		break;
 		case 13:
-			$img = print_image ("images/dot_white.png", true, array('title' => __('Closed incidents')));
+			$img = html_print_image ("images/dot_white.png", true, array('title' => __('Closed incidents')));
 		break;
 	}
 	
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 6d71f8926c..6007ae0020 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -175,7 +175,7 @@ function print_menu (&$menu) {
 
 		//Print out the first level
 		$output .= '<li class="'.implode (" ", $classes).'" id="icon_'.$id.'">';
-		$output .= '<a href="index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'">'.$main["text"].'</a>' . print_image("include/styles/images/toggle.png", true, array("class" => "toggle", "alt" => "toogle"));
+		$output .= '<a href="index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'">'.$main["text"].'</a>' . html_print_image("include/styles/images/toggle.png", true, array("class" => "toggle", "alt" => "toogle"));
 		if ($submenu_output != '') {
 			//WARNING: IN ORDER TO MODIFY THE VISIBILITY OF MENU'S AND SUBMENU'S (eg. with cookies) YOU HAVE TO ADD TO THIS ELSEIF. DON'T MODIFY THE CSS
 			if ($visible || in_array ("selected", $classes)) {
diff --git a/pandora_console/include/functions_messages.php b/pandora_console/include/functions_messages.php
index 5441bf9b15..3435b22ac4 100644
--- a/pandora_console/include/functions_messages.php
+++ b/pandora_console/include/functions_messages.php
@@ -69,7 +69,7 @@ function create_message ($usuario_origen, $usuario_destino, $subject, $mensaje)
  */
 function create_message_group ($usuario_origen, $dest_group, $subject, $mensaje) {
 	$users = get_users_info ();
-	$group_users = get_group_users ($dest_group);
+	$group_users = groups_get_users ($dest_group);
 	
 	if (! array_key_exists ($usuario_origen, $users)) {
 		//Users don't exist in the system
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 3ae6939511..48a73b7bf8 100644
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -328,7 +328,7 @@ function format_delete($id)
 	$txt = "";
 
 	if (check_acl ($config['id_user'], $group, "AW") ==1) {
-		$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">' . print_image("images/cross.png", true, array("border" => '0')) . '</a>';
+		$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
 	}
 	return $txt;
 }
@@ -340,7 +340,7 @@ function format_delete_string($id)
 	$txt = "";
 
 	if (check_acl ($config['id_user'], $group, "AW") ==1) {
-		$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">' . print_image("images/cross.png", true, array("border" => '0')) . '</a>';
+		$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
 	}
 	return $txt;
 }
@@ -352,7 +352,7 @@ function format_delete_log4x($id)
 	$txt = "";
 
 	if (check_acl ($config['id_user'], $group, "AW") ==1) {
-		$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">' . print_image("images/cross.png", true, array("border" => '0')) . '</a>';
+		$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
 	}
 	return $txt;
 }
diff --git a/pandora_console/include/functions_network_components.php b/pandora_console/include/functions_network_components.php
index 00e3fe29c5..1d4811557d 100644
--- a/pandora_console/include/functions_network_components.php
+++ b/pandora_console/include/functions_network_components.php
@@ -116,8 +116,8 @@ function get_network_component_group ($id_network_component_group, $filter = fal
 /**
  * Get a list of network component groups.
  * 
- * The values returned can be passed directly to print_select(). Child groups
- * are indented, so ordering on print_select() is NOT recommendable.
+ * The values returned can be passed directly to html_print_select(). Child groups
+ * are indented, so ordering on html_print_select() is NOT recommendable.
  * 
  * @param int id_module_components If provided, groups must have at least one component
  * of the module provided. Parents will be included in that case even if they don't have
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 04804b05e9..70bdeeb838 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -130,7 +130,7 @@ function generate_dot_groups ($pandora_name, $group = 0, $simple = 0, $font_size
 	// Get groups data
 	if ($group > 0) {
 		$groups = array();
-		$id_groups = get_id_groups_recursive($group, true);
+		$id_groups = groups_get_id_recursive($group, true);
 		
 		foreach($id_groups as $id_group) {
 			if(check_acl($config["id_user"], $id_group, 'AR')) {
@@ -303,7 +303,7 @@ function create_edge ($head, $tail, $layout, $nooverlap, $pure, $zoom, $ranksep,
 
 // Returns a group node definition
 function create_group_node ($group, $simple = 0, $font_size = 10) {
-	$status = get_group_status ($group['id_grupo']);
+	$status = groups_get_status ($group['id_grupo']);
 	
 	// Set node status
 	switch($status) {
@@ -324,17 +324,17 @@ function create_group_node ($group, $simple = 0, $font_size = 10) {
 			break;
 	}
 	
-	$icon = get_group_icon($group['id_grupo']);
+	$icon = groups_get_icon($group['id_grupo']);
 	
 	if ($simple == 0){
 		// Set node icon
 		if (file_exists ('images/groups_small/'.$icon.'.png')) { 
-			$img_node = print_image("images/groups_small/" . $icon . ".png", true);
+			$img_node = html_print_image("images/groups_small/" . $icon . ".png", true);
 		} else {
 			$img_node = '-';
 		}
 
-		$name = get_group_name($group['id_grupo']);
+		$name = groups_get_name($group['id_grupo']);
 		
 		$node = $group['id_node'].' [ color="'.$status_color.'", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.30, height=0.30, label=<<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR><TD>'.$img_node.'</TD></TR>
 		 <TR><TD>'.$name.'</TD></TR></TABLE>>,
@@ -382,7 +382,7 @@ function create_agent_node ($agent, $simple = 0, $font_size = 10) {
 			$img_node = 'images/networkmap/0.png';
 		}
 
-		$node = $agent['id_node'].' [ color="'.$status_color.'", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.40, height=0.40, label=<<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR><TD>' . print_image($img_node, true) . '</TD></TR>
+		$node = $agent['id_node'].' [ color="'.$status_color.'", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.40, height=0.40, label=<<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR><TD>' . html_print_image($img_node, true) . '</TD></TR>
 		 <TR><TD>'.$name.'</TD></TR></TABLE>>,
 		 shape="doublecircle", URL="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'",
 		 tooltip="ajax.php?page=operation/agentes/ver_agente&get_agent_status_tooltip=1&id_agent='.$agent['id_agente'].'"];';
@@ -429,7 +429,7 @@ function create_module_node ($module, $simple = 0, $font_size = 10) {
 
 // Returns the definition of the central module
 function create_pandora_node ($name, $font_size = 10, $simple = 0) {
-	$img = '<TR><TD>' . print_image("images/networkmap/pandora_node.png", true) . '</TD></TR>';
+	$img = '<TR><TD>' . html_print_image("images/networkmap/pandora_node.png", true) . '</TD></TR>';
 	$name = '<TR><TD BGCOLOR="#FFFFFF">'.$name.'</TD></TR>';
 	$label = '<TABLE BORDER="0">'.$img.$name.'</TABLE>';
 	if ($simple == 1){
@@ -444,12 +444,12 @@ function create_pandora_node ($name, $font_size = 10, $simple = 0) {
 
 // Opens a group definition
 function open_group ($id) {
-	$img = 'images/'.get_group_icon ($id).'.png';
-	$name = get_group_name ($id);
+	$img = 'images/'.groups_get_icon ($id).'.png';
+	$name = groups_get_name ($id);
 	
 	$group = 'subgraph cluster_' . $id . 
 		' { style=filled; color=darkolivegreen3; label=<<TABLE BORDER="0">
-		<TR><TD>' . print_image($img, true) . '</TD><TD>'.$name.'</TD></TR>
+		<TR><TD>' . html_print_image($img, true) . '</TD><TD>'.$name.'</TD></TR>
 		</TABLE>>; tooltip="'.$name.'";
 		URL="index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id='
 		. $id . '";';
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 014bbe22c2..342e408750 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -928,9 +928,9 @@ function event_reporting ($id_group, $period, $date = 0, $return = false) {
 	foreach ($events as $event) {
 		$data = array ();
 		if ($event["estado"] == 0)
-			$data[0] = print_image("images/dot_red.png", true);
+			$data[0] = html_print_image("images/dot_red.png", true);
 		else
-			$data[0] = print_image("images/dot_green.png", true);
+			$data[0] = html_print_image("images/dot_green.png", true);
 		$data[1] = $event['evento'];
 		$data[2] = $event['id_usuario'] != '0' ? $event['id_usuario'] : '';
 		$data[3] = $event["timestamp"];
@@ -938,7 +938,7 @@ function event_reporting ($id_group, $period, $date = 0, $return = false) {
 	}
 
 	if (empty ($return))
-		print_table ($table);
+		html_print_table ($table);
 	return $table;
 }
 
@@ -1081,7 +1081,7 @@ function alert_reporting_agent ($id_agent, $period = 0, $date = 0, $return = tru
 	}
 	
 	if ($html) {
-		return print_table ($table, $return);
+		return html_print_table ($table, $return);
 	}
 	else {
 		return $table;
@@ -1167,7 +1167,7 @@ function alert_reporting_module ($id_agent_module, $period = 0, $date = 0, $retu
 	}
 	
 	if ($html) {
-		return print_table ($table, $return);
+		return html_print_table ($table, $return);
 	}
 	else {
 		return $table;
@@ -1223,7 +1223,7 @@ function alert_reporting ($id_group, $period = 0, $date = 0, $return = false) {
 	$table->style = array ();
 	$table->style[0] = 'font-weight: bold';
 	
-	$output .= print_table ($table, true);
+	$output .= html_print_table ($table, true);
 	
 	if (!$return)
 		echo $output;
@@ -1271,7 +1271,7 @@ function monitor_health_reporting ($id_group, $period = 0, $date = 0, $return =
 	$table->size = array ();
 	$table->size[0] = '100px';
 	
-	$output .= print_table ($table, true);
+	$output .= html_print_table ($table, true);
 	
 	$data = array();
 	$data[__('Monitors OK')] = $down_percentage;
@@ -1507,14 +1507,14 @@ function get_agent_detailed_reporting ($id_agent, $period = 0, $date = 0, $retur
 	$output .= '<h4>'.__('Modules').'</h3>';
 	$table_modules = get_agent_modules_reporting_table ($id_agent, $period, $date);
 	$table_modules->width = '99%';
-	$output .= print_table ($table_modules, true);
+	$output .= html_print_table ($table_modules, true);
 	
 	/* Show alerts in agent */
 	$table_alerts = get_agent_alerts_reporting_table ($id_agent, $period, $date);
 	$table_alerts->width = '99%';
 	if (sizeof ($table_alerts->data)) {
 		$output .= '<h4>'.__('Alerts').'</h4>';
-		$output .= print_table ($table_alerts, true);
+		$output .= html_print_table ($table_alerts, true);
 	}
 	
 	/* Show monitor status in agent (if any) */
@@ -1531,7 +1531,7 @@ function get_agent_detailed_reporting ($id_agent, $period = 0, $date = 0, $retur
 	$table_monitors->size = array ();
 	$table_monitors->align[1] = '10%';
 	$output .= '<h4>'.__('Monitors').'</h4>';
-	$output .= print_table ($table_monitors, true);
+	$output .= html_print_table ($table_monitors, true);
 	
 	$output .= '</div>';
 	
@@ -1624,7 +1624,7 @@ function get_agents_detailed_event_reporting ($id_agents, $period = 0, $date = 0
 	}
 
 	if ($events)	
-		return print_table ($table, $return);
+		return html_print_table ($table, $return);
 }
 
 /**
@@ -1668,7 +1668,7 @@ function get_group_detailed_event_reporting ($id_group, $period = 0, $date = 0,
 		}
 		
 		if ($html) {
-			return print_table ($table, $return);
+			return html_print_table ($table, $return);
 		}
 		else {
 			return $table;
@@ -1739,7 +1739,7 @@ function get_module_detailed_event_reporting ($id_modules, $period = 0, $date =
 		}
 	
 		if ($html) {
-			return print_table ($table, $return);
+			return html_print_table ($table, $return);
 		}
 		else {
 			return $table;
@@ -1847,7 +1847,7 @@ function get_agent_module_info ($id_agent, $filter = false) {
 		$return["alert_img"] = ui_print_status_image (STATUS_ALERT_FIRED, __('Alert fired'), true);
 		$return["alert_value"] = STATUS_ALERT_FIRED;
 	}
-	elseif (give_disabled_group ($return["agent_group"])) {
+	elseif (groups_give_disabled_group ($return["agent_group"])) {
 		$return["alert_status"] = "disabled";
 		$return["alert_value"] = STATUS_ALERT_DISABLED;
 		$return["alert_img"] = ui_print_status_image (STATUS_ALERT_DISABLED, __('Alert disabled'), true);
@@ -2120,7 +2120,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 			$table->colspan[2][0] = 3;
 			if ($show_graph == 0 || $show_graph == 1) {
 				$data = array();
-				$data[0] = print_table($table1, true);
+				$data[0] = html_print_table($table1, true);
 				array_push ($table->data, $data);
 			}
 
@@ -2156,7 +2156,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 				}
 				$table->colspan[4][0] = 3;
 				$data = array();
-				$data[0] = print_table($table2, true);
+				$data[0] = html_print_table($table2, true);
 				array_push ($table->data, $data);
 			}
 			break;
@@ -2185,12 +2185,12 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 				$monitor_value = format_numeric ($monitor_value);
 			}
 			$data[0] = '<p style="font: bold '.$sizem.'em Arial, Sans-serif; color: #000000;">';
-			$data[0] .= $monitor_value.' % ' . print_image("images/b_green.png", true, array("height" => "32", "width" => "32")) . '</p>';
+			$data[0] .= $monitor_value.' % ' . html_print_image("images/b_green.png", true, array("height" => "32", "width" => "32")) . '</p>';
 			if ($monitor_value !== __('Unknown')) {
 				$monitor_value = format_numeric (100 - $monitor_value, 2) ;
 			}
 			$data[1] = '<p style="font: bold '.$sizem.'em Arial, Sans-serif; color: #ff0000;">';
-			$data[1] .= $monitor_value.' % ' . print_image("images/b_red.png", true, array("height" => "32", "width" => "32")) . '</p>';
+			$data[1] .= $monitor_value.' % ' . html_print_image("images/b_red.png", true, array("height" => "32", "width" => "32")) . '</p>';
 			array_push ($table->data, $data);
 			
 			break;
@@ -2411,7 +2411,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 				': *, delete, drop, alter, modify, union, password, pass, insert '.__('or')." update.</div>"));
 			}
 			
-			$cellContent = print_table($table2, true);
+			$cellContent = html_print_table($table2, true);
 			array_push($table->data, array($cellContent));
 			break;
 
@@ -2450,7 +2450,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 		case 'event_report_group':
 			$data = array ();
 			$data[0] = $sizh . __('Group detailed event') . $sizhfin;
-			$data[1] = $sizh . ui_print_truncate_text(get_group_name($content['id_group']), 60, false) . $sizhfin;
+			$data[1] = $sizh . ui_print_truncate_text(groups_get_name($content['id_group']), 60, false) . $sizhfin;
 			array_push ($table->data, $data);
 			
 			// Put description at the end of the module (if exists)
@@ -2595,7 +2595,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 				} 
 			}
 			
-			$cellContent = print_table($table2, true);
+			$cellContent = html_print_table($table2, true);
 			array_push($table->data, array($cellContent));
 			$table->colspan[1][0] = 2;
 			break;
@@ -2800,7 +2800,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 					
 					$table->colspan[2][0] = 3;
 					$data = array();
-					$data[0] = print_table($table1, true);
+					$data[0] = html_print_table($table1, true);
 					array_push ($table->data, $data);
 					break;
 				//1 means group by agent
@@ -2875,7 +2875,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 					
 					$table->colspan[2][0] = 3;
 					$data = array();
-					$data[0] = print_table($table2, true);
+					$data[0] = html_print_table($table2, true);
 					array_push ($table->data, $data);
 					break;
 			}
@@ -3077,7 +3077,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 			$table->colspan[2][0] = 3;
 			if ($show_graph == 0 || $show_graph == 1) {
 				$data = array();
-				$data[0] = print_table($table1, true);
+				$data[0] = html_print_table($table1, true);
 				array_push ($table->data, $data);
 			}
 			
@@ -3326,7 +3326,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 			$table->colspan[2][0] = 3;
 			if ($show_graph == 0 || $show_graph == 1) {
 				$data = array();
-				$data[0] = print_table($table1, true);
+				$data[0] = html_print_table($table1, true);
 				array_push ($table->data, $data);
 			}
 			
@@ -3440,7 +3440,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 				}
 				
 				$file_name = string2image(ui_print_truncate_text($module['name'],15, false, true, false, '...'), 115, 13, 3, 270, '#9EAC8B', 'FFF', 4, 0);
-				$table_data .= '<th width="22px">'.print_image($file_name, true, array('title' => $module['name']))."</th>";
+				$table_data .= '<th width="22px">'.html_print_image($file_name, true, array('title' => $module['name']))."</th>";
 			}
 			
 			if ($block < $nmodules) {
@@ -3487,7 +3487,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
 				$table_data .= "<tr style='height: 35px;'>";
 				
 				$file_name = string2image(ui_print_truncate_text($agent['nombre'],19, false, true, false, '...'), 140, 15, 3, 0, $rowcolor, $textcolor, 4, 0);
-				$table_data .= "<td style='background-color: ".$rowcolor.";'>".print_image($file_name, true, array('title' => $agent['nombre']))."</td>";
+				$table_data .= "<td style='background-color: ".$rowcolor.";'>".html_print_image($file_name, true, array('title' => $agent['nombre']))."</td>";
 				$agent_modules = get_agent_modules($agent['id_agente']);
 				
 				$nmodules = 0;
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index d9b18bd246..050463ed38 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -148,52 +148,52 @@ function get_server_info ($id_server = -1) {
 	foreach ($result as $server) {
 		switch ($server['server_type']) {
 			case 0:
-				$server["img"] = print_image ("images/data.png", true, array ("title" => __('Data server')));
+				$server["img"] = html_print_image ("images/data.png", true, array ("title" => __('Data server')));
 				$server["type"] = "data";
 				$id_modulo = 1;
 				break;
 			case 1:
-				$server["img"] = print_image ("images/network.png", true, array ("title" => __('Network server')));
+				$server["img"] = html_print_image ("images/network.png", true, array ("title" => __('Network server')));
 				$server["type"] = "network";
 				$id_modulo = 2;
 				break;
 			case 2:
-				$server["img"] = print_image ("images/snmp.png", true, array ("title" => __('SNMP server')));
+				$server["img"] = html_print_image ("images/snmp.png", true, array ("title" => __('SNMP server')));
 				$server["type"] = "snmp";
 				$id_modulo = 0;
 				break;
 			case 3:
-				$server["img"] = print_image ("images/recon.png", true, array ("title" => __('Recon server')));
+				$server["img"] = html_print_image ("images/recon.png", true, array ("title" => __('Recon server')));
 				$server["type"] = "recon";
 				$id_modulo = 0;
 				break;
 			case 4:
-				$server["img"] = print_image ("images/plugin.png", true, array ("title" => __('Plugin server')));
+				$server["img"] = html_print_image ("images/plugin.png", true, array ("title" => __('Plugin server')));
 				$server["type"] = "plugin";
 				$id_modulo = 4;
 				break;
 			case 5:
-				$server["img"] = print_image ("images/chart_bar.png", true, array ("title" => __('Prediction server')));
+				$server["img"] = html_print_image ("images/chart_bar.png", true, array ("title" => __('Prediction server')));
 				$server["type"] = "prediction";
 				$id_modulo = 5;
 				break;
 			case 6:
-				$server["img"] = print_image ("images/wmi.png", true, array ("title" => __('WMI server')));
+				$server["img"] = html_print_image ("images/wmi.png", true, array ("title" => __('WMI server')));
 				$server["type"] = "wmi";
 				$id_modulo = 6;
 				break;
 			case 7:
-				$server["img"] = print_image ("images/server_export.png", true, array ("title" => __('Export server')));
+				$server["img"] = html_print_image ("images/server_export.png", true, array ("title" => __('Export server')));
 				$server["type"] = "export";
 				$id_modulo = 0;
 				break;
 			case 8:
-				$server["img"] = print_image ("images/page_white_text.png", true, array ("title" => __('Inventory server')));
+				$server["img"] = html_print_image ("images/page_white_text.png", true, array ("title" => __('Inventory server')));
 				$server["type"] = "inventory";
 				$id_modulo = 0;
 				break;
 			case 9:
-				$server["img"] = print_image ("images/world.png", true, array ("title" => __('Web server')));
+				$server["img"] = html_print_image ("images/world.png", true, array ("title" => __('Web server')));
 				$server["type"] = "web";
 				$id_modulo = 0;
 				break;
@@ -402,22 +402,22 @@ function show_server_type ($id) {
 
 	switch ($id) {
 		case 1:
-			return print_image("images/database.png", true, array("title" => "Pandora FMS Data server"));
+			return html_print_image("images/database.png", true, array("title" => "Pandora FMS Data server"));
 			break;
 		case 2:
-			return print_image("images/network.png", true, array("title" => "Pandora FMS Network server"));
+			return html_print_image("images/network.png", true, array("title" => "Pandora FMS Network server"));
 			break;
 		case 4:
-			return print_image("images/plugin.png", true, array("title" => "Pandora FMS Plugin server"));
+			return html_print_image("images/plugin.png", true, array("title" => "Pandora FMS Plugin server"));
 			break;
 		case 5:
-			return print_image("images/chart_bar.png", true, array("title" => "Pandora FMS Prediction server"));
+			return html_print_image("images/chart_bar.png", true, array("title" => "Pandora FMS Prediction server"));
 			break;
 		case 6:
-			return print_image("images/wmi.png", true, array("title" => "Pandora FMS WMI server"));
+			return html_print_image("images/wmi.png", true, array("title" => "Pandora FMS WMI server"));
 			break;
 		case 7:
-			return print_image("images/server_web.png", true, array("title" => "Pandora FMS WEB server"));
+			return html_print_image("images/server_web.png", true, array("title" => "Pandora FMS WEB server"));
 			break;
 		default:
 			return "--";
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 5251a2077d..8fa4a6a33d 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -305,9 +305,9 @@ function ui_print_group_icon ($id_group, $return = false, $path = "groups_small"
 		$output = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$id_group.'">';
 	
 	if (empty ($icon))
-		$output .= '<span title="'. get_group_name($id_group, true).'">&nbsp;-&nbsp</span>';
+		$output .= '<span title="'. groups_get_name($id_group, true).'">&nbsp;-&nbsp</span>';
 	else
-		$output .= print_image("images/" . $path . "/" . $icon . ".png", true, array("style" => $style, "class" => "bot", "alt" => get_group_name($id_group, true), "title" => get_group_name ($id_group, true)));
+		$output .= html_print_image("images/" . $path . "/" . $icon . ".png", true, array("style" => $style, "class" => "bot", "alt" => groups_get_name($id_group, true), "title" => groups_get_name ($id_group, true)));
 	
 	if ($link) 
 		$output .= '</a>';
@@ -341,9 +341,9 @@ function ui_print_group_icon_path ($id_group, $return = false, $path = "images/g
 		$output = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$id_group.'">';
 	
 	if (empty ($icon))
-		$output .= '<span title="'. get_group_name($id_group, true).'">&nbsp;-&nbsp</span>';
+		$output .= '<span title="'. groups_get_name($id_group, true).'">&nbsp;-&nbsp</span>';
 	else
-		$output .= '<img style="' . $style . '" class="bot" src="'.$path.'/'.$icon.'.png" alt="'.get_group_name ($id_group, true).'" title="'.get_group_name ($id_group, true).'" />';
+		$output .= '<img style="' . $style . '" class="bot" src="'.$path.'/'.$icon.'.png" alt="'.groups_get_name ($id_group, true).'" title="'.groups_get_name ($id_group, true).'" />';
 	
 	if ($link) 
 		$output .= '</a>';
@@ -370,7 +370,7 @@ function ui_print_os_icon ($id_os, $name = true, $return = false) {
 		return "-";
 	}
 	
-	$output = print_image("images/os_icons/".$icon, true, array("alt" => $os_name, "title" => $os_name)); 
+	$output = html_print_image("images/os_icons/".$icon, true, array("alt" => $os_name, "title" => $os_name)); 
 	
 	if ($name === true) {
 		$output .= ' - '.$os_name;
@@ -488,7 +488,7 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
 			$img = 'images/policies.png';
 				
 			$data[$index['policy']] = '<a href="?sec=gpolicies&amp;sec2=enterprise/godmode/policies/policies&amp;id=' . $policyInfo['id'] . '">' . 
-				print_image($img,true, array('title' => $policyInfo['name'])) .
+				html_print_image($img,true, array('title' => $policyInfo['name'])) .
 				'</a>';
 		}
 	}
@@ -498,7 +498,7 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
 	// Standby
 	$data[$index['standby']] = '';
 	if (isset ($alert["standby"]) && $alert["standby"] == 1) {
-		$data[$index['standby']] = print_image ('images/bell_pause.png', true, array('title' => __('Standby on')));
+		$data[$index['standby']] = html_print_image ('images/bell_pause.png', true, array('title' => __('Standby on')));
 	} 
 	
 	// Force alert execution
@@ -506,11 +506,11 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
 	if (! $compound) {
 		if ($alert["force_execution"] == 0) {
 			$data[$index['force_execution']] =
-				'<a href="'.$url.'&amp;id_alert='.$alert["id"].'&amp;force_execution=1&refr=60">' . print_image("images/target.png", true) . '</a>';
+				'<a href="'.$url.'&amp;id_alert='.$alert["id"].'&amp;force_execution=1&refr=60">' . html_print_image("images/target.png", true) . '</a>';
 		} 
 		else {
 			$data[$index['force_execution']] =
-				'<a href="'.$url.'&amp;id_alert='.$alert["id"].'&amp;refr=60">' . print_image("images/refresh.png", true) . '</a>';
+				'<a href="'.$url.'&amp;id_alert='.$alert["id"].'&amp;refr=60">' . html_print_image("images/refresh.png", true) . '</a>';
 		}
 	}
 	
@@ -530,7 +530,7 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
 	$data[$index['description']] = '';
 	if (! $compound) {
 		$data[$index['template']] .= '<a class="template_details" href="ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'].'">';
-		$data[$index['template']] .= print_image ('images/zoom.png', true);
+		$data[$index['template']] .= html_print_image ('images/zoom.png', true);
 		$data[$index['template']] .= '</a> ';
 		$actionDefault = db_get_value_sql("SELECT id_alert_action
 			FROM talert_templates WHERE id = " . $alert['id_alert_template']);
@@ -580,10 +580,10 @@ function ui_format_alert_row ($alert, $compound = false, $agent = true, $url = '
 	$data[$index['status']] = ui_print_status_image($status, $title, true);
 	
 	if ($compound) {
-		$data[$index['validate']] = print_checkbox ("validate_compound[]", $alert["id"], false, true);
+		$data[$index['validate']] = html_print_checkbox ("validate_compound[]", $alert["id"], false, true);
 	}
 	else {
-		$data[$index['validate']] = print_checkbox ("validate[]", $alert["id"], false, true);
+		$data[$index['validate']] = html_print_checkbox ("validate[]", $alert["id"], false, true);
 	}
 	
 	return $data;
@@ -632,7 +632,7 @@ function ui_print_string_substr ($string, $cutoff = 16, $return = false) {
 function ui_print_alert_template_example ($id_alert_template, $return = false, $print_values = true) {
 	$output = '';
 	
-	$output .= print_image("images/information.png", true);
+	$output .= html_print_image("images/information.png", true);
 	$output .= '<span id="example">';
 	$template = alerts_get_alert_template ($id_alert_template);
 	
@@ -705,7 +705,7 @@ function ui_print_alert_template_example ($id_alert_template, $return = false, $
  * @return string The help tip
  */
 function ui_print_help_icon ($help_id, $return = false) {
-	$output = '&nbsp;'.print_image ("images/help.png", true, 
+	$output = '&nbsp;'.html_print_image ("images/help.png", true, 
 		array ("class" => "img_help",
 			"title" => __('Help'),
 			"onclick" => "open_help ('".$help_id."')"));
@@ -1090,13 +1090,13 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
 	
 	$output = '<div class="pagination">';
 	// Show GOTO FIRST button
-	$output .= '<a class="pagination go_first" href="'.$url.'&amp;'.$offset_name.'=0">'.print_image ("images/go_first.png", true, array ("class" => "bot")).'</a>&nbsp;';
+	$output .= '<a class="pagination go_first" href="'.$url.'&amp;'.$offset_name.'=0">'.html_print_image ("images/go_first.png", true, array ("class" => "bot")).'</a>&nbsp;';
 	// Show PREVIOUS button
 	if ($index_page > 0) {
 		$index_page_prev = ($index_page - (floor ($block_limit / 2))) * $pagination;
 		if ($index_page_prev < 0)
 			$index_page_prev = 0;
-		$output .= '<a class="pagination go_rewind" href="'.$url.'&amp;'.$offset_name.'='.$index_page_prev.'">'.print_image ("images/go_previous.png", true, array ("class" => "bot")).'</a>';
+		$output .= '<a class="pagination go_rewind" href="'.$url.'&amp;'.$offset_name.'='.$index_page_prev.'">'.html_print_image ("images/go_previous.png", true, array ("class" => "bot")).'</a>';
 	}
 	$output .= "&nbsp;&nbsp;";
 	// Draw blocks markers
@@ -1127,7 +1127,7 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
 		$prox_bloque = ($i + ceil ($block_limit / 2)) * $pagination;
 		if ($prox_bloque > $count)
 			$prox_bloque = ($count -1) - $pagination;
-		$output .= '<a class="pagination go_fastforward" href="'.$url.'&amp;'.$offset_name.'='.$prox_bloque.'">'.print_image ("images/go_next.png", true, array ("class" => "bot")).'</a>';
+		$output .= '<a class="pagination go_fastforward" href="'.$url.'&amp;'.$offset_name.'='.$prox_bloque.'">'.html_print_image ("images/go_next.png", true, array ("class" => "bot")).'</a>';
 		$i = $index_counter;
 	}
 	// if exists more registers than i can put in a page (defined by $block_size config parameter)
@@ -1136,7 +1136,7 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
 	// as painted in last block (last integer block).	
 	if (($count - $pagination) > 0) {
 		$myoffset = floor (($count - 1) / $pagination) * $pagination;
-		$output .= '<a class="pagination go_last" href="'.$url.'&amp;'.$offset_name.'='.$myoffset.'">'.print_image ("images/go_last.png", true, array ("class" => "bot")).'</a>';
+		$output .= '<a class="pagination go_last" href="'.$url.'&amp;'.$offset_name.'='.$myoffset.'">'.html_print_image ("images/go_last.png", true, array ("class" => "bot")).'</a>';
 	}
 	// End div and layout
 	$output .= "</div>";
@@ -1255,7 +1255,7 @@ function ui_print_moduletype_icon ($id_moduletype, $return = false) {
 	if (! file_exists ($config['homedir'].'/'.$imagepath))
 		$imagepath = ENTERPRISE_DIR.'/'.$imagepath;
 	
-	return print_image ($imagepath, $return,
+	return html_print_image ($imagepath, $return,
 		array ("border" => 0,
 			"title" => $type["descripcion"]));
 }
@@ -1341,7 +1341,7 @@ function ui_print_status_image ($type, $title = "", $return = false, $options =
 	
 	$options['title'] = $title;
 	
-	return print_image ($imagepath, $return, $options);
+	return html_print_image ($imagepath, $return, $options);
 }
 
 /**
@@ -1462,7 +1462,7 @@ if($hidde_default) {
 	$image_b = "images/go.png";
 }
 // Link to toggle
-echo '<a href="#" id="tgl_ctrl_'.$uniqid.'"><b>'.$name.'</b>&nbsp;'.print_image ($image_b, true, array ("title" => $title, "id" => "image_".$uniqid)).'</a><br /><br />';
+echo '<a href="#" id="tgl_ctrl_'.$uniqid.'"><b>'.$name.'</b>&nbsp;'.html_print_image ($image_b, true, array ("title" => $title, "id" => "image_".$uniqid)).'</a><br /><br />';
 
 // Code into a div
 echo "<div id='tgl_div_".$uniqid."' style='".$style."'>\n";
@@ -1644,7 +1644,7 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
 	$buffer = '<div id="'.$type2.'" style=""><div id="menu_tab_left">';
 
 
-	$buffer .= '<ul class="mn"><li class="'.$type.'">&nbsp;' . print_image($icon, true, array("style" => "margin-bottom: -3px;", "class" => "bottom", "border" => "0", "alt" => "")) . '&nbsp; ';
+	$buffer .= '<ul class="mn"><li class="'.$type.'">&nbsp;' . html_print_image($icon, true, array("style" => "margin-bottom: -3px;", "class" => "bottom", "border" => "0", "alt" => "")) . '&nbsp; ';
 	$buffer .= $title;
 	if ($help != "")
 		$buffer .= "&nbsp;&nbsp;" . ui_print_help_icon ($help, true);
diff --git a/pandora_console/include/functions_ui_renders.php b/pandora_console/include/functions_ui_renders.php
index e69b9d4239..d53f29ed62 100644
--- a/pandora_console/include/functions_ui_renders.php
+++ b/pandora_console/include/functions_ui_renders.php
@@ -35,7 +35,7 @@ function render_agent_field ($agent, $field, $field_value = false, $return = fal
 		if (! isset ($agent['id_grupo']))
 			return '';
 		
-		$output = get_group_name ($agent['id_grupo'], true);
+		$output = groups_get_name ($agent['id_grupo'], true);
 		
 		break;
 	case 'group_icon':
@@ -50,7 +50,7 @@ function render_agent_field ($agent, $field, $field_value = false, $return = fal
 		
 		$output = ui_print_group_icon ($agent['id_grupo'], true);
 		$output .= ' ';
-		$output .= get_group_name ($agent['id_grupo']);
+		$output .= groups_get_name ($agent['id_grupo']);
 		
 		break;
 	case 'view_link':
@@ -99,7 +99,7 @@ function render_agent_field ($agent, $field, $field_value = false, $return = fal
 			$text = $field_value['name'];
 		
 		if (isset ($field_value['image']))
-			$text = print_image ($field_value['image'], true, array ('title' => $text));
+			$text = html_print_image ($field_value['image'], true, array ('title' => $text));
 		
 		$output = '<a href="#" onclick="'.$field_value['callback'].'(this, '.$parameters.'); return false"">';
 		$output .= $text;
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index 934c80c2f4..4af6169908 100644
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -80,7 +80,7 @@ function get_user_groups ($id_user = false, $privilege = "AR", $returnAllGroup =
 		//Get recursive id groups
 		$list_id_groups = array();
 		foreach ((array)$id_groups as $id_group) {
-			$list_id_groups = array_merge($list_id_groups, get_id_groups_recursive($id_group));
+			$list_id_groups = array_merge($list_id_groups, groups_get_id_recursive($id_group));
 		}
 
 		$list_id_groups = array_unique($list_id_groups);
@@ -144,7 +144,7 @@ function get_user_groups ($id_user = false, $privilege = "AR", $returnAllGroup =
 function get_user_groups_tree($id_user = false, $privilege = "AR", $returnAllGroup = true) {
 	$user_groups = get_user_groups ($id_user, $privilege, $returnAllGroup, true);
 
-	$user_groups_tree = get_user_groups_tree_recursive($user_groups);
+	$user_groups_tree = groups_get_groups_tree_recursive($user_groups);
 
 	return $user_groups_tree;
 }
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index ce857069e3..3e631d084b 100644
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -34,7 +34,7 @@ function printButtonEditorVisualConsole($idDiv, $label, $float = 'left', $disabl
 		$margin = 'margin-left';
 	}
 	
-	print_button($label, 'button_toolbox2', $disabled, "click2('" . $idDiv . "');", 'class="sub ' . $idDiv . ' ' . $class . '" style="float: ' . $float . ';"', false, $imageButton);
+	html_print_button($label, 'button_toolbox2', $disabled, "click2('" . $idDiv . "');", 'class="sub ' . $idDiv . ' ' . $class . '" style="float: ' . $float . ';"', false, $imageButton);
 	return;
 	
 	if (!$disabled) $disableClass = '';
@@ -94,9 +94,9 @@ function printItemInVisualConsole($layoutData) {
 			echo '<div id="' . $id . '" class="item static_graph" style="left: 0px; top: 0px; text-align: center; color: ' . $color . '; position: absolute; ' . $sizeStyle . ' margin-top: ' . $top . 'px; margin-left: ' . $left . 'px;">';
 			if ($layoutData['image'] != null) {
 				if (($width != 0) && ($height != 0)) 
-					echo print_image($img, true, array("class" => "image", "id" => "image_" . $id, "width" => "$width", "height" => "$height", "style" => $borderStyle));
+					echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id, "width" => "$width", "height" => "$height", "style" => $borderStyle));
 				else
-					echo print_image($img, true, array("class" => "image", "id" => "image_" . $id, "style" => $borderStyle));
+					echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id, "style" => $borderStyle));
 				echo '<br />';
 			}
 			echo $text;
@@ -151,9 +151,9 @@ function printItemInVisualConsole($layoutData) {
 			if ($layoutData['image'] != null) {
 
 				if (($width != 0) && ($height != 0)) 
-					echo print_image($img, true, array("class" => "image", "id" => "image_" . $id, "width" => "$width", "height" => "$height"));
+					echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id, "width" => "$width", "height" => "$height"));
 				else
-					echo print_image($img, true, array("class" => "image", "id" => "image_" . $id));
+					echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id));
 				echo '<br />';
 			}
 			echo "</div>";
@@ -618,7 +618,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
 				else
 					$img_style["height"] = (integer)($proportion * $infoImage[1]);
 				
-				print_image ($img, false, $img_style);
+				html_print_image ($img, false, $img_style);
 		
 				echo "</a>";
 				
@@ -720,7 +720,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
 					else
 						$img_style["height"] = (integer)($proportion * $infoImage[1]);
 				
-					print_image ($img, false, $img_style);
+					html_print_image ($img, false, $img_style);
 					
 					if ($endTagA) echo "</a>";
 					
@@ -866,7 +866,7 @@ function get_layout_data_types () {
  *
  * @param int User id.
  * @param bool Wheter to return all the fields or only the name (to use in
- * print_select() directly)
+ * html_print_select() directly)
  * @param array Additional filters to filter the layouts.
  * @param bool Whether to return All group or not.
  *
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index 616ebd9921..f15a3a721c 100755
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -163,7 +163,7 @@ switch($graph_type) {
 				}
 				
 				foreach($fine as $i => $fine_color) {
-					$rgb_fine = html2rgb($fine_color);
+					$rgb_fine = html_html2rgb($fine_color);
 					$fine_colors[$i]['R'] = $rgb_fine[0];
 					$fine_colors[$i]['G'] = $rgb_fine[1];
 					$fine_colors[$i]['B'] = $rgb_fine[2];
@@ -226,12 +226,12 @@ if (!isset($colors))
 	$colors = array();
 
 foreach($colors as $i => $color) {		
-	$rgb['border'] = html2rgb($color['border']);
+	$rgb['border'] = html_html2rgb($color['border']);
 	$rgb_color[$i]['border']['R'] = $rgb['border'][0];
 	$rgb_color[$i]['border']['G'] = $rgb['border'][1];
 	$rgb_color[$i]['border']['B'] = $rgb['border'][2];
 	
-	$rgb['color'] = html2rgb($color['color']);
+	$rgb['color'] = html_html2rgb($color['color']);
 	$rgb_color[$i]['color']['R'] = $rgb['color'][0];
 	$rgb_color[$i]['color']['G'] = $rgb['color'][1];
 	$rgb_color[$i]['color']['B'] = $rgb['color'][2];
@@ -241,14 +241,14 @@ foreach($colors as $i => $color) {
 
 /*foreach($colors as $i => $color) {
 	if (isset($color['border'])) {
-		$rgb['border'] = html2rgb($color['border']);
+		$rgb['border'] = html_html2rgb($color['border']);
 		$rgb_color[$i]['border']['R'] = $rgb['border'][0];
 		$rgb_color[$i]['border']['G'] = $rgb['border'][1];
 		$rgb_color[$i]['border']['B'] = $rgb['border'][2];
 	}
 	
 	if (isset($color['color'])) {
-		$rgb['color'] = html2rgb($color['color']);
+		$rgb['color'] = html_html2rgb($color['color']);
 		$rgb_color[$i]['color']['R'] = $rgb['color'][0];
 		$rgb_color[$i]['color']['G'] = $rgb['color'][1];
 		$rgb_color[$i]['color']['B'] = $rgb['color'][2];
@@ -317,7 +317,7 @@ function pch_slicebar_graph ($graph_type, $data, $width, $height, $colors, $font
 	/* Color stuff */
 	$colorsrgb = array();
 	foreach($colors as $key => $col) {
-		$rgb = html2rgb($col);
+		$rgb = html_html2rgb($col);
 		$colorsrgb[$key]['R'] = $rgb[0];
 		$colorsrgb[$key]['G'] = $rgb[1];
 		$colorsrgb[$key]['B'] = $rgb[2];
diff --git a/pandora_console/include/help/en/help_agent_status.php b/pandora_console/include/help/en/help_agent_status.php
index 5131ea8f46..1af8959fc9 100644
--- a/pandora_console/include/help/en/help_agent_status.php
+++ b/pandora_console/include/help/en/help_agent_status.php
@@ -21,13 +21,13 @@ Possible values of an <b>agent status</b> are:
 
 <table width="750px">
 <tr>
-	<td class="f9i"><?php print_image("images/status_sets/default/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?><?php print_image("images/status_sets/faces/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?></td><td>At least one monitor fails</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?><?php print_image("images/status_sets/faces/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?></td><td>Change between Green/Red state</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?><?php print_image("images/status_sets/faces/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?></td><td>All Monitors OK</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?><?php html_print_image("images/status_sets/faces/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?></td><td>At least one monitor fails</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?><?php html_print_image("images/status_sets/faces/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?></td><td>Change between Green/Red state</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?><?php html_print_image("images/status_sets/faces/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?></td><td>All Monitors OK</td>
 
 </tr><tr>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?><?php print_image("images/status_sets/faces/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?></td><td>Agent without data</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?><?php print_image("images/status_sets/faces/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?></td><td>Agent down</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?><?php html_print_image("images/status_sets/faces/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?></td><td>Agent without data</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?><?php html_print_image("images/status_sets/faces/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?></td><td>Agent down</td>
 </tr>
 </table>
 
@@ -37,9 +37,9 @@ Possible values of <b>alert status</b> are:
 <br><br>
 <table width="450px">
 <tr>
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?><?php print_image("images/status_sets/faces/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?></td><td>Alert fired</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?><?php print_image("images/status_sets/faces/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?></td><td>Alerts disabled</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?><?php print_image("images/status_sets/faces/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?></td><td>Alert not fired</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?><?php html_print_image("images/status_sets/faces/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?></td><td>Alert fired</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?><?php html_print_image("images/status_sets/faces/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?></td><td>Alerts disabled</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?><?php html_print_image("images/status_sets/faces/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?></td><td>Alert not fired</td>
 
 </tr>
 </table>
diff --git a/pandora_console/include/help/en/help_cascade_protection.php b/pandora_console/include/help/en/help_cascade_protection.php
index e38ecc7a8d..3ff48b9c98 100644
--- a/pandora_console/include/help/en/help_cascade_protection.php
+++ b/pandora_console/include/help/en/help_cascade_protection.php
@@ -1,7 +1,7 @@
 <h1>Cascade protection</h1>
 
 
-<?php print_image("images/help/cascade_protection_ilustration.png", false); ?>
+<?php html_print_image("images/help/cascade_protection_ilustration.png", false); ?>
 <br>
 <p>
 This option is designed to avoid a "storm" of alerts coming because a group of agents are unreachable. This kind of behaviour happen when an intermediate device, as for example a router, is down, and all devices behind it are just not reachable, probably that devices are not down and even that devices are working behind another router, in HA mode, but if you don't do nothing probably Pandora FMS thinks they are down because cannot remotely test it with a Remote ICMP Proc test (a ping).
diff --git a/pandora_console/include/help/en/help_configure_gis_map.php b/pandora_console/include/help/en/help_configure_gis_map.php
index b8824d4dc5..3aeefe5e1d 100644
--- a/pandora_console/include/help/en/help_configure_gis_map.php
+++ b/pandora_console/include/help/en/help_configure_gis_map.php
@@ -14,7 +14,7 @@ Each map has a desciptive name used to recognice the map within Pandora FMS.
 </p>
 <h2>Select Connections</h2>
 <p>
-The first step is to select the main <strong>connection</strong> used in this GIS Map. At least one connection must be selected to configure the GIS Map, but it's possible to add more by pressing the <?php print_image("images/add.png", false, array("alt" => "Add")); ?> (Add) icon.
+The first step is to select the main <strong>connection</strong> used in this GIS Map. At least one connection must be selected to configure the GIS Map, but it's possible to add more by pressing the <?php html_print_image("images/add.png", false, array("alt" => "Add")); ?> (Add) icon.
 </p>
 <p>
 When the firs connection is set, Pandora FMS asks if you want to use the default values of the connection for the map, to avoid to write again all the information. Also if the default connection for the map is changed (using the radio button), Pandora FMS will ask again if you want to use the values of the new default connection.
@@ -49,7 +49,7 @@ Once the selection of the connection (or connections) is done, there is a posibi
 Each map has one or more layers<sup><span style="font-size:75%">1</span></sup> to show the agents. Each layer can have show the agents of a <strong>group</strong> and/or a <strong>list of agents</strong>. This way it's easy to set up the agents that will be shown on each Layer.
 </p>
 <p>
-The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php print_image("images/up.png", false, array("alt" => "move up icon")); ?> and <?php print_image("images/down.png", false, array("alt" => "move down icon")); ?>) them, <strong>delete</strong> (<?php print_image("images/cross.png", false, array("alt" => "delete icon")); ?>), or <strong>edited</strong> (<?php print_image("images/config.png", false, array("alt" => "edit icon")); ?>) again.
+The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php html_print_image("images/up.png", false, array("alt" => "move up icon")); ?> and <?php html_print_image("images/down.png", false, array("alt" => "move down icon")); ?>) them, <strong>delete</strong> (<?php html_print_image("images/cross.png", false, array("alt" => "delete icon")); ?>), or <strong>edited</strong> (<?php html_print_image("images/config.png", false, array("alt" => "edit icon")); ?>) again.
 </p>
 <hr/>
 <sup><span style="font-size:75%;">1</span></sup> <span style="font-size:85%;">The default map can have 0 layers as is the one used in the agent GIS view and only uses one layer with the agent name.</span>
diff --git a/pandora_console/include/help/en/help_eventview.php b/pandora_console/include/help/en/help_eventview.php
index b60f1ab909..58bcc49d5a 100644
--- a/pandora_console/include/help/en/help_eventview.php
+++ b/pandora_console/include/help/en/help_eventview.php
@@ -10,24 +10,24 @@
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>Validate</h3>
-	<?php print_image("images/tick.png", false, array("title" => "Validated event", "alt" => "Validated event", "width" => '10', "height" => '10')); ?> - Validated event<br>
-	<?php print_image("images/cross.png", false, array("title" => "Event not validated", "alt" => "Event not validated", "width" => '10', "height" => '10')); ?> - Event not validated
+	<?php html_print_image("images/tick.png", false, array("title" => "Validated event", "alt" => "Validated event", "width" => '10', "height" => '10')); ?> - Validated event<br>
+	<?php html_print_image("images/cross.png", false, array("title" => "Event not validated", "alt" => "Event not validated", "width" => '10', "height" => '10')); ?> - Event not validated
 </div>
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>Severity</h3>
-	<?php print_image("images/status_sets/default/severity_maintenance.png", false, array("title" => "Maintenance event", "alt" => "Maintenance event")); ?> - Maintenance event<br>
-	<?php print_image("images/status_sets/default/severity_informational.png", false, array("title" => "Informational event", "alt" => "Informational event")); ?> - Informational event<br>
-	<?php print_image("images/status_sets/default/severity_normal.png", false, array("title" => "Normal event", "alt" => "Normal event")); ?> - Normal event<br>
-	<?php print_image("images/status_sets/default/severity_warning.png", false, array("title" => "Warning event", "alt" => "Warning event")); ?> - Warning event<br>
-	<?php print_image("images/status_sets/default/severity_critical.png", false, array("title" => "Critical event", "alt" => "Critical event")); ?> - Critical event<br>
+	<?php html_print_image("images/status_sets/default/severity_maintenance.png", false, array("title" => "Maintenance event", "alt" => "Maintenance event")); ?> - Maintenance event<br>
+	<?php html_print_image("images/status_sets/default/severity_informational.png", false, array("title" => "Informational event", "alt" => "Informational event")); ?> - Informational event<br>
+	<?php html_print_image("images/status_sets/default/severity_normal.png", false, array("title" => "Normal event", "alt" => "Normal event")); ?> - Normal event<br>
+	<?php html_print_image("images/status_sets/default/severity_warning.png", false, array("title" => "Warning event", "alt" => "Warning event")); ?> - Warning event<br>
+	<?php html_print_image("images/status_sets/default/severity_critical.png", false, array("title" => "Critical event", "alt" => "Critical event")); ?> - Critical event<br>
 </div>
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>Actions</h3>
-	<?php print_image("images/ok.png", false, array("title" => "Validate event", "alt" => "Validate event")); ?> - Validate event<br>
-	<?php print_image("images/cross.png", false, array("title" => "Delete event", "alt" => "Delete event")); ?> - Delete event<br>
-	<?php print_image("images/page_lightning.png", false, array("title" => "Create incident from event", "alt" => "Create incident from event")); ?> - Create incident from event
+	<?php html_print_image("images/ok.png", false, array("title" => "Validate event", "alt" => "Validate event")); ?> - Validate event<br>
+	<?php html_print_image("images/cross.png", false, array("title" => "Delete event", "alt" => "Delete event")); ?> - Delete event<br>
+	<?php html_print_image("images/page_lightning.png", false, array("title" => "Create incident from event", "alt" => "Create incident from event")); ?> - Create incident from event
 </div>
 
 <div style="clear: both;">&nbsp;</div>
diff --git a/pandora_console/include/help/en/help_gis_map_builder.php b/pandora_console/include/help/en/help_gis_map_builder.php
index de39280598..a24d349775 100644
--- a/pandora_console/include/help/en/help_gis_map_builder.php
+++ b/pandora_console/include/help/en/help_gis_map_builder.php
@@ -18,11 +18,11 @@ Options:
 <dl>
 <dt>Map name</dt>
 <dd>Click on the <strong>Map Name</strong> corresponding to the map you want edit the map </dd>
-<dt><?php print_image("images/eye.png", false, array("alt" => "View")); ?> View</dt>
+<dt><?php html_print_image("images/eye.png", false, array("alt" => "View")); ?> View</dt>
 <dd>Click on the view icon to <strong>view</strong> the map.</dd>
 <dt>Default radio button</dt>
 <dd>Click on the <strong>radio button</strong> corresponding to the map you want to make the default to set the <strong>default map</strong> </dd>
-<dt><?php print_image("images/cross.png", false, array("alt" => "Delete")); ?> Delete</dt>
+<dt><?php html_print_image("images/cross.png", false, array("alt" => "Delete")); ?> Delete</dt>
 <dd>Click on the delete icon to <strong>delete</strong> the map.</dd>
 <dt>Create Button</dt>
 <dd>Click on Create button to <strong>create</strong> a new map.</dd>
diff --git a/pandora_console/include/help/en/help_setup_gis_index.php b/pandora_console/include/help/en/help_setup_gis_index.php
index 2c7d1b78f6..7f1b1cfd71 100644
--- a/pandora_console/include/help/en/help_setup_gis_index.php
+++ b/pandora_console/include/help/en/help_setup_gis_index.php
@@ -9,5 +9,5 @@
 This page is the place where the admin can configure <strong>connections to GIS Map Servers</strong>.
 </p>
 <p>
-Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php print_image("images/cross.png", false, array("alt" => "delete icon")); ?>) or <strong>create</strong> new connections using the create button.
+Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php html_print_image("images/cross.png", false, array("alt" => "delete icon")); ?>) or <strong>create</strong> new connections using the create button.
 </p>
diff --git a/pandora_console/include/help/es/help_agent_status.php b/pandora_console/include/help/es/help_agent_status.php
index b4dd7bcd8a..029f19602a 100644
--- a/pandora_console/include/help/es/help_agent_status.php
+++ b/pandora_console/include/help/es/help_agent_status.php
@@ -23,13 +23,13 @@ Los valores posibles del <b>estado de un agente </b> son:
 
 <table width="750px">
 <tr>
-	<td class="f9i"><?php print_image("images/status_sets/default/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?><?php print_image("images/status_sets/faces/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?></td><td>Al menos un monitor falla</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?><?php print_image("images/status_sets/faces/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?></td><td>Cambia entre el estado Verde/Rojo</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?><?php print_image("images/status_sets/faces/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?></td><td>Todos los monitores están OK</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?><?php html_print_image("images/status_sets/faces/module_critical.png", false, array("title" => "At least one monitor fails", "alt" => "At least one monitor fails")); ?></td><td>Al menos un monitor falla</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?><?php html_print_image("images/status_sets/faces/module_warning.png", false, array("title" => "Change between Green/Red state", "alt" => "Change between Green/Red state")); ?></td><td>Cambia entre el estado Verde/Rojo</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?><?php html_print_image("images/status_sets/faces/agent_ok.png", false, array("title" => "All Monitors OK", "alt" => "All Monitors OK")); ?></td><td>Todos los monitores están OK</td>
 
 </tr><tr>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?><?php print_image("images/status_sets/faces/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?></td><td>Agente sin datos</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?><?php print_image("images/status_sets/faces/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?></td><td>Agente caído</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?><?php html_print_image("images/status_sets/faces/agent_no_data.png", false, array("title" => "Agent without data", "alt" => "Agent without data")); ?></td><td>Agente sin datos</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?><?php html_print_image("images/status_sets/faces/agent_down.png", false, array("title" => "Agent down", "alt" => "Agent down")); ?></td><td>Agente caído</td>
 </tr>
 </table>
 
@@ -39,9 +39,9 @@ Los valores posibles del <b>estado de alerta </b> son:
 <br><br>
 <table width="450px">
 <tr>
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?><?php print_image("images/status_sets/faces/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?></td><td>Alerta disparada</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?><?php print_image("images/status_sets/faces/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?></td><td>Alerta desactivada</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?><?php print_image("images/status_sets/faces/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?></td><td>Alerta no disparada</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?><?php html_print_image("images/status_sets/faces/alert_fired.png", false, array("title" => "Alert fired", "alt" => "Alert fired")); ?></td><td>Alerta disparada</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?><?php html_print_image("images/status_sets/faces/alert_disabled.png", false, array("title" => "Alert disabled", "alt" => "Alert disabled")); ?></td><td>Alerta desactivada</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?><?php html_print_image("images/status_sets/faces/alert_not_fired.png", false, array("title" => "Alert not fired", "alt" => "Alert not fired")); ?></td><td>Alerta no disparada</td>
 
 </tr>
 </table>
diff --git a/pandora_console/include/help/es/help_cascade_protection.php b/pandora_console/include/help/es/help_cascade_protection.php
index ec2aa76d32..c88e406cc9 100644
--- a/pandora_console/include/help/es/help_cascade_protection.php
+++ b/pandora_console/include/help/es/help_cascade_protection.php
@@ -1,7 +1,7 @@
 <h1>Protección en Cascada</h1>
 
 
-<?php print_image("images/help/cascade_protection_ilustration.png", false); ?>
+<?php html_print_image("images/help/cascade_protection_ilustration.png", false); ?>
 <br>
 <p>
 Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente Pandora FMS piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
diff --git a/pandora_console/include/help/es/help_configure_gis_map.php b/pandora_console/include/help/es/help_configure_gis_map.php
index 29e42ce9d3..0cb1e2558a 100644
--- a/pandora_console/include/help/es/help_configure_gis_map.php
+++ b/pandora_console/include/help/es/help_configure_gis_map.php
@@ -15,7 +15,7 @@ Cada mapa tiene un nombre descriptivo que se utiliza para reconocer el mapa dent
 </p>
 <h2>Seleccionar Conexiones</h2>
 <p>
-El primer paso es seleccionar la principal <strong>conexión </strong> empleada en este Mapa GIS. Al menos una conexión debe ser seleccionada para configurar el MAPA GIS, pero es posible añadir más presionando el icono(Add) <?php print_image("images/add.png", false, array("alt" => "Add")); ?>
+El primer paso es seleccionar la principal <strong>conexión </strong> empleada en este Mapa GIS. Al menos una conexión debe ser seleccionada para configurar el MAPA GIS, pero es posible añadir más presionando el icono(Add) <?php html_print_image("images/add.png", false, array("alt" => "Add")); ?>
 
 </p>
 <p>
diff --git a/pandora_console/include/help/es/help_eventview.php b/pandora_console/include/help/es/help_eventview.php
index 7eca851fc7..a01bf52eae 100644
--- a/pandora_console/include/help/es/help_eventview.php
+++ b/pandora_console/include/help/es/help_eventview.php
@@ -10,24 +10,24 @@
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>Validar</h3>
-	<?php print_image("images/tick.png", false, array("title" => "Validated event", "alt" => "Validated event", "width" => '10', "height" => '10')); ?> - Validar evento<br>
-	<?php print_image("images/cross.png", false, array("title" => "Event not validated", "alt" => "Event not validated", "width" => '10', "height" => '10')); ?> - Evento no validado
+	<?php html_print_image("images/tick.png", false, array("title" => "Validated event", "alt" => "Validated event", "width" => '10', "height" => '10')); ?> - Validar evento<br>
+	<?php html_print_image("images/cross.png", false, array("title" => "Event not validated", "alt" => "Event not validated", "width" => '10', "height" => '10')); ?> - Evento no validado
 </div>
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>Severidad</h3>
-	<?php print_image("images/status_sets/default/severity_maintenance.png", false, array("title" => "Maintenance event", "alt" => "Maintenance event")); ?> - Evento de mantenimiento<br>
-	<?php print_image("images/status_sets/default/severity_informational.png", false, array("title" => "Informational event", "alt" => "Informational event")); ?> - Evento informativo<br>
-	<?php print_image("images/status_sets/default/severity_normal.png", false, array("title" => "Normal event", "alt" => "Normal event")); ?> - Evento normal<br>
-	<?php print_image("images/status_sets/default/severity_warning.png", false, array("title" => "Warning event", "alt" => "Warning event")); ?> - Evento de alerta<br>
-	<?php print_image("images/status_sets/default/severity_critical.png", false, array("title" => "Critical event", "alt" => "Critical event")); ?> - Evento crítico<br>
+	<?php html_print_image("images/status_sets/default/severity_maintenance.png", false, array("title" => "Maintenance event", "alt" => "Maintenance event")); ?> - Evento de mantenimiento<br>
+	<?php html_print_image("images/status_sets/default/severity_informational.png", false, array("title" => "Informational event", "alt" => "Informational event")); ?> - Evento informativo<br>
+	<?php html_print_image("images/status_sets/default/severity_normal.png", false, array("title" => "Normal event", "alt" => "Normal event")); ?> - Evento normal<br>
+	<?php html_print_image("images/status_sets/default/severity_warning.png", false, array("title" => "Warning event", "alt" => "Warning event")); ?> - Evento de alerta<br>
+	<?php html_print_image("images/status_sets/default/severity_critical.png", false, array("title" => "Critical event", "alt" => "Critical event")); ?> - Evento crítico<br>
 </div>
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>Acciones</h3>
-	<?php print_image("images/ok.png", false, array("title" => "Validate event", "alt" => "Validate event")); ?> - Validar evento<br>
-	<?php print_image("images/cross.png", false, array("title" => "Delete event", "alt" => "Delete event")); ?> - Borrar evento<br>
-	<?php print_image("images/page_lightning.png", false, array("title" => "Create incident from event", "alt" => "Create incident from event")); ?> - Crear incidente del evento
+	<?php html_print_image("images/ok.png", false, array("title" => "Validate event", "alt" => "Validate event")); ?> - Validar evento<br>
+	<?php html_print_image("images/cross.png", false, array("title" => "Delete event", "alt" => "Delete event")); ?> - Borrar evento<br>
+	<?php html_print_image("images/page_lightning.png", false, array("title" => "Create incident from event", "alt" => "Create incident from event")); ?> - Crear incidente del evento
 </div>
 
 <div style="clear: both;">&nbsp;</div>
diff --git a/pandora_console/include/help/es/help_gis_map_builder.php b/pandora_console/include/help/es/help_gis_map_builder.php
index 953c6826f9..7b9156109c 100644
--- a/pandora_console/include/help/es/help_gis_map_builder.php
+++ b/pandora_console/include/help/es/help_gis_map_builder.php
@@ -22,11 +22,11 @@ Opciones:
 <dl>
 <dt>Nombre del Mapa</dt>
 <dd>Haga click en el<strong>Nombre del Mapa</strong> que se corresponda con el mapa que quiere editar </dd>
-<dt><?php print_image("images/eye.png", false, array("alt" => "View")); ?>Vista</dt>
+<dt><?php html_print_image("images/eye.png", false, array("alt" => "View")); ?>Vista</dt>
 <dd>Haga click en icono de visualizar para <strong>visualizar</strong> el mapa.</dd>
 <dt>Botón radio por defecto</dt>
 <dd>Haga click en el <strong> botón radio </strong> que se corresponda con el mapa que quiere por defecto para instalar <strong>mapa por defecto</strong> </dd>
-<dt><?php print_image("images/cross.png", false, array("alt" => "Delete")); ?> Eliminar</dt>
+<dt><?php html_print_image("images/cross.png", false, array("alt" => "Delete")); ?> Eliminar</dt>
 <dd>Haga click en el botón de eliminar para <strong>eliminar</strong> el mapa</dd>
 <dt>Crear botón </dt>
 <dd>Haga click en el Botón de Crear para <strong>crear</strong> un mapa nuevo</dd>
diff --git a/pandora_console/include/help/ja/help_agent_status.php b/pandora_console/include/help/ja/help_agent_status.php
index ffc29b3656..b43844164f 100644
--- a/pandora_console/include/help/ja/help_agent_status.php
+++ b/pandora_console/include/help/ja/help_agent_status.php
@@ -10,19 +10,19 @@
 <br><br>
 
 <table width=750px><tr>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_ok.png", false, array("title" => "すべての監視項目が正常", "alt" => "すべての監視項目が正常")); ?></td><td>すべての監視項目が正常</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/module_critical.png", false, array("title" => "1つ以上の監視項目で障害", "alt" => "1つ以上の監視項目で障害")); ?></td><td>1つ以上の監視項目で障害</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/module_warning.png", false, array("title" => "緑/赤 の状態変化発生", "alt" => "緑/赤 の状態変化発生")); ?></td><td>緑/赤 の状態変化発生</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_ok.png", false, array("title" => "すべての監視項目が正常", "alt" => "すべての監視項目が正常")); ?></td><td>すべての監視項目が正常</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/module_critical.png", false, array("title" => "1つ以上の監視項目で障害", "alt" => "1つ以上の監視項目で障害")); ?></td><td>1つ以上の監視項目で障害</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/module_warning.png", false, array("title" => "緑/赤 の状態変化発生", "alt" => "緑/赤 の状態変化発生")); ?></td><td>緑/赤 の状態変化発生</td>
 
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_fired.png", false, array("title" => "アラート発生中", "alt" => "アラート発生中")); ?></td><td>アラート発生中</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_disabled.png", false, array("title" => "アラートが無効", "alt" => "アラートが無効")); ?></td><td>アラートが無効</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_fired.png", false, array("title" => "アラート発生中", "alt" => "アラート発生中")); ?></td><td>アラート発生中</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_disabled.png", false, array("title" => "アラートが無効", "alt" => "アラートが無効")); ?></td><td>アラートが無効</td>
 
 	</tr><tr>
 
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_no_data.png", false, array("title" => "データ収集対象外エージェント", "alt" => "データ収集対象外エージェント")); ?></td><td>データ収集対象外エージェント</td>
-	<td class="f9i"><?php print_image("images/status_sets/default/agent_down.png", false, array("title" => "エージェント停止中", "alt" => "エージェント停止中")); ?></td><td>エージェント停止中</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_no_data.png", false, array("title" => "データ収集対象外エージェント", "alt" => "データ収集対象外エージェント")); ?></td><td>データ収集対象外エージェント</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/agent_down.png", false, array("title" => "エージェント停止中", "alt" => "エージェント停止中")); ?></td><td>エージェント停止中</td>
 	
-	<td class="f9i"><?php print_image("images/status_sets/default/alert_not_fired.png", false, array("title" => "アラート未発生", "alt" => "アラート未発生")); ?></td><td>アラート未発生</td>
+	<td class="f9i"><?php html_print_image("images/status_sets/default/alert_not_fired.png", false, array("title" => "アラート未発生", "alt" => "アラート未発生")); ?></td><td>アラート未発生</td>
 
 	</tr>
 	</table>
diff --git a/pandora_console/include/help/ja/help_cascade_protection.php b/pandora_console/include/help/ja/help_cascade_protection.php
index b840370afb..20f08bee8c 100644
--- a/pandora_console/include/help/ja/help_cascade_protection.php
+++ b/pandora_console/include/help/ja/help_cascade_protection.php
@@ -1,7 +1,7 @@
 <h1>関連障害検知抑制</h1>
 
 
-<?php print_image("images/help/cascade_protection_ilustration.png", false); ?>
+<?php html_print_image("images/help/cascade_protection_ilustration.png", false); ?>
 <br>
 <p>
 このオプションは、あるエージェントの障害により他のエージェントの状態が確認できなくなった時に、大量のアラートが上がるのを避けるために利用します。
diff --git a/pandora_console/include/help/ja/help_configure_gis_map.php b/pandora_console/include/help/ja/help_configure_gis_map.php
index 70b495fe7c..9f132e4e3a 100644
--- a/pandora_console/include/help/ja/help_configure_gis_map.php
+++ b/pandora_console/include/help/ja/help_configure_gis_map.php
@@ -16,7 +16,7 @@
 <p>
 最初のステップは、GIS マップで利用する<strong>メインのマップ</strong>を定義することです。
 GIS マップを設定するためには、少なくとも一つ選択されている必要があります。
-<?php print_image("images/add.png", false, array("alt" => "Add")); ?>(追加)アイコンをクリックして、追加することも可能です。
+<?php html_print_image("images/add.png", false, array("alt" => "Add")); ?>(追加)アイコンをクリックして、追加することも可能です。
 </p>
 <p>
 意図しない設定情報の再入力を防ぐために、利用マップが設定されると、それを Pandora FMS はデフォルトのマップとして利用するかどうか尋ねます。
@@ -57,7 +57,7 @@ GIS マップを設定するためには、少なくとも一つ選択されて
 <p>
 レイヤは、<strong>表示</strong>、<strong>非表示</strong>の設定ができ、<strong>グループ</strong>を選択や<strong>エージェント</strong>の追加ができます。
 一度レイヤが定義されると、左側の定義済レイヤに移ります。(定義は、マップ全体が保存されるまでは保存されません。)
-ここでは、再度、<strong>順番の変更</strong> (<?php print_image("images/up.png", false, array("alt" => "move up icon")); ?>、<?php print_image("images/down.png", false, array("alt" => "move down icon")); ?>)、<strong>削除</strong> (<?php print_image("images/cross.png", false, array("alt" => "delete icon")); ?>)、<strong>編集</strong> (<?php print_image("images/config.png", false, array("alt" => "edit icon")); ?>) ができます。
+ここでは、再度、<strong>順番の変更</strong> (<?php html_print_image("images/up.png", false, array("alt" => "move up icon")); ?>、<?php html_print_image("images/down.png", false, array("alt" => "move down icon")); ?>)、<strong>削除</strong> (<?php html_print_image("images/cross.png", false, array("alt" => "delete icon")); ?>)、<strong>編集</strong> (<?php html_print_image("images/config.png", false, array("alt" => "edit icon")); ?>) ができます。
 </p>
 <hr/>
 <sup><span style="font-size:75%;">1</span></sup> <span style="font-size:85%;">デフォルトマップでは、エージェント名で一つのレイヤしか表示しない場合は、レイヤを持たない設定も可能です。</span>
diff --git a/pandora_console/include/help/ja/help_eventview.php b/pandora_console/include/help/ja/help_eventview.php
index 077e9691d7..1a8284e271 100644
--- a/pandora_console/include/help/ja/help_eventview.php
+++ b/pandora_console/include/help/ja/help_eventview.php
@@ -10,24 +10,24 @@
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>承諾</h3>
-	<?php print_image("images/tick.png", false, array("title" => "承諾済", "alt" => "承諾済", "width" => '10', "height" => '10')); ?> - 承諾済<br>
-	<?php print_image("images/tick_off.png", false, array("title" => "未承諾", "alt" => "未承諾", "width" => '10', "height" => '10')); ?> - 未承諾
+	<?php html_print_image("images/tick.png", false, array("title" => "承諾済", "alt" => "承諾済", "width" => '10', "height" => '10')); ?> - 承諾済<br>
+	<?php html_print_image("images/tick_off.png", false, array("title" => "未承諾", "alt" => "未承諾", "width" => '10', "height" => '10')); ?> - 未承諾
 </div>
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>重要度</h3>
-	<?php print_image("images/status_sets/default/severity_maintenance.png", false, array("title" => "メンテナンス", "alt" => "メンテナンス")); ?>  - メンテナンス<br>
-	<?php print_image("images/status_sets/default/severity_informational.png", false, array("title" => "情報", "alt" => "情報")); ?> - 情報<br>
-	<?php print_image("images/status_sets/default/severity_normal.png", false, array("title" => "正常", "alt" => "正常")); ?> - 正常<br>
-	<?php print_image("images/status_sets/default/severity_warning.png", false, array("title" => "警告", "alt" => "警告")); ?> - 警告<br>
-	<?php print_image("images/status_sets/default/severity_critical.png", false, array("title" => "障害", "alt" => "障害")); ?> - 障害<br>
+	<?php html_print_image("images/status_sets/default/severity_maintenance.png", false, array("title" => "メンテナンス", "alt" => "メンテナンス")); ?>  - メンテナンス<br>
+	<?php html_print_image("images/status_sets/default/severity_informational.png", false, array("title" => "情報", "alt" => "情報")); ?> - 情報<br>
+	<?php html_print_image("images/status_sets/default/severity_normal.png", false, array("title" => "正常", "alt" => "正常")); ?> - 正常<br>
+	<?php html_print_image("images/status_sets/default/severity_warning.png", false, array("title" => "警告", "alt" => "警告")); ?> - 警告<br>
+	<?php html_print_image("images/status_sets/default/severity_critical.png", false, array("title" => "障害", "alt" => "障害")); ?> - 障害<br>
 </div>
 
 <div style="padding-left: 30px; width: 150px; float: left; line-height: 17px;">
 	<h3>アクション</h3>
-	<?php print_image("images/ok.png", false, array("title" => "承諾する", "alt" => "承諾する")); ?> - 承諾する<br>
-	<?php print_image("images/cross.png", false, array("title" => "削除する", "alt" => "削除する")); ?> - 削除する<br>
-	<?php print_image("images/page_lightning.png", false, array("title" => "インシデントを作成する", "alt" => "インシデントを作成する")); ?> - インシデントを作成する
+	<?php html_print_image("images/ok.png", false, array("title" => "承諾する", "alt" => "承諾する")); ?> - 承諾する<br>
+	<?php html_print_image("images/cross.png", false, array("title" => "削除する", "alt" => "削除する")); ?> - 削除する<br>
+	<?php html_print_image("images/page_lightning.png", false, array("title" => "インシデントを作成する", "alt" => "インシデントを作成する")); ?> - インシデントを作成する
 </div>
 
 <div style="clear: both;">&nbsp;</div>
diff --git a/pandora_console/include/help/ja/help_gis_map_builder.php b/pandora_console/include/help/ja/help_gis_map_builder.php
index 1e64fa8c71..b96bf062f8 100644
--- a/pandora_console/include/help/ja/help_gis_map_builder.php
+++ b/pandora_console/include/help/ja/help_gis_map_builder.php
@@ -21,11 +21,11 @@
 <dl>
 <dt>マップ名</dt>
 <dd><strong>マップ名</strong>をクリックすると、そのマップを編集できます。</dd>
-<dt><?php print_image("images/eye.png", false, array("alt" => "View")); ?> View</dt>
+<dt><?php html_print_image("images/eye.png", false, array("alt" => "View")); ?> View</dt>
 <dd>表示アイコンをクリックすると、マップを<strong>参照</strong>できます。</dd>
 <dt>デフォルトラジオボタン</dt>
 <dd><strong>ラジオボタン</strong>をクリックすると、そのマップが<strong>デフォルトマップ</strong>に設定されます。</dd>
-<dt><?php print_image("images/cross.png", false, array("alt" => "Delete")); ?> 削除</dt>
+<dt><?php html_print_image("images/cross.png", false, array("alt" => "Delete")); ?> 削除</dt>
 <dd>削除アイコンをクリックすると、そのマップを<strong>削除</strong>します。</dd>
 <dt>作成ボタン</dt>
 <dd>作成ボタンをクリックすると、新しいマップを<strong>作成</strong>できます。</dd>
diff --git a/pandora_console/include/help/ja/help_setup_gis_index.php b/pandora_console/include/help/ja/help_setup_gis_index.php
index eb8fbb00ba..9e6872f02c 100644
--- a/pandora_console/include/help/ja/help_setup_gis_index.php
+++ b/pandora_console/include/help/ja/help_setup_gis_index.php
@@ -11,6 +11,6 @@
 <p>
 設定済の利用マップ定義一覧の参照できます。
 <strong>編集</strong>するにはマップ名をクリックします。
-<strong>削除</strong>するには削除アイコン(<?php print_image("images/cross.png", false, array("alt" => "delete icon")) ?> )をクリックします。
+<strong>削除</strong>するには削除アイコン(<?php html_print_image("images/cross.png", false, array("alt" => "delete icon")) ?> )をクリックします。
 また、新たな設定を<strong>作成</strong>するには、「作成」ボタンをクリックします。
 </p>
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e9bdd3924f..1e83a68247 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -400,7 +400,7 @@ td.datos3 {
 	background-color: #d4ddc6;
 }
 td.datos4 {
-	/*Add !important because in php the function print_table write style in cell and this is style head.*/
+	/*Add !important because in php the function html_print_table write style in cell and this is style head.*/
 	text-align: center !important;
 	background-color: #d4ddc6;
 }
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index 7530fc2bad..a77efab037 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -74,7 +74,7 @@ class User {
 		global $pandora_version;
 		
 		echo "<form action='index.php' method='post'>";
-		print_input_hidden('action', 'login');
+		html_print_input_hidden('action', 'login');
 		?>
 		<div id="center_div">
 			<div id="table_version_negative_position_div">
@@ -86,17 +86,17 @@ class User {
 									<td style="color: #036A3A; height: 20px;" colspan="2" valign="top" align="left"><?php echo $pandora_version;?> <?php echo $text;?></td>
 									<td style="width: 80px; height: 80px;" valign="bottom" align="left" rowspan="4">
 										<?php
-										print_submit_button('', 'login', false, 'class="login_button" alt="' . __('Login') . '" title="' . __('Login') . '"');
+										html_print_submit_button('', 'login', false, 'class="login_button" alt="' . __('Login') . '" title="' . __('Login') . '"');
 										?>
 									</td>
 								</tr>
 								<tr>
 									<td style="width: 20px; height: 25px;">&nbsp;</td>
-									<td valign="top" align="left"><?php print_input_text('user', $this->user, __('User'), 10, 20);?></td>
+									<td valign="top" align="left"><?php html_print_input_text('user', $this->user, __('User'), 10, 20);?></td>
 								</tr>
 								<tr>
 									<td style="width: 20px; height: 15px;">&nbsp;</td>
-									<td valign="top" align="left"><?php print_input_password('password', '', __('Password'), 10, 20);?></td>
+									<td valign="top" align="left"><?php html_print_input_password('password', '', __('Password'), 10, 20);?></td>
 								</tr>
 								<tr>
 									<td style="height: 20px;">&nbsp;</td>
@@ -146,10 +146,10 @@ class User {
 					<?php
 					echo "<form id='login_box' method='post' style=''>";
 					echo "<div id='version'>" . $pandora_version . "</div>";
-					print_input_hidden('action', 'login');
-					print_input_text('user', $this->user, __('User'), 10, 20);
-					print_input_password('password', '', __('Password'), 10, 20);
-					print_submit_button(__(''), 'login', false, 'onclick="javascript: click();" class="login_button" alt="' . __('Login') . '" title="' . __('Login') . '"');
+					html_print_input_hidden('action', 'login');
+					html_print_input_text('user', $this->user, __('User'), 10, 20);
+					html_print_input_password('password', '', __('Password'), 10, 20);
+					html_print_submit_button(__(''), 'login', false, 'onclick="javascript: click();" class="login_button" alt="' . __('Login') . '" title="' . __('Login') . '"');
 					echo "</form>";
 					?>
 				</div>
diff --git a/pandora_console/mobile/operation/agents/group_view.php b/pandora_console/mobile/operation/agents/group_view.php
index 6ffc904e55..4937787328 100644
--- a/pandora_console/mobile/operation/agents/group_view.php
+++ b/pandora_console/mobile/operation/agents/group_view.php
@@ -65,7 +65,7 @@ class GroupView {
 			
 			$data = array();
 			
-			$groupName = get_group_name($idGroup);
+			$groupName = groups_get_name($idGroup);
 			
 			$data[] = '<a href="index.php?page=agents&filter_group=' . $idGroup . '">' . $groupName . '</a>';
 //			$data[] = $groupData['total_agents'];
@@ -80,7 +80,7 @@ class GroupView {
 			$table->data[] = $data;
 		}
 		
-		print_table($table);
+		html_print_table($table);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/mobile/operation/agents/monitor_status.php b/pandora_console/mobile/operation/agents/monitor_status.php
index a2b2e18918..9c339d061c 100644
--- a/pandora_console/mobile/operation/agents/monitor_status.php
+++ b/pandora_console/mobile/operation/agents/monitor_status.php
@@ -44,7 +44,7 @@ class MonitorStatus {
 		$table->colspan[1][2] = 2;
 		
 		$table->data[0][0] = '<span alt="' . __('Group') . '" title="' . __('Group') . '"><b>' . __('G') . '</b></span>';
-		$table->data[0][1] = print_select_groups($this->system->getConfig("id_user"), "IR", true, 'group', $group, '', '', 0, true, false, false, 'w130');
+		$table->data[0][1] = html_print_select_groups($this->system->getConfig("id_user"), "IR", true, 'group', $group, '', '', 0, true, false, false, 'w130');
 		$table->data[0][2] = '<span alt="' . __('Monitor status') . '" title="' . __('Monitor Status') . '"><b>' . __('M') . '</b></span>';
 		$fields = array ();
 		$fields[-1] = __('All');
@@ -57,15 +57,15 @@ class MonitorStatus {
 		foreach ($fields as $key => $field) {
 			$fields[$key] = ui_print_truncate_text($field, $config['text_char_long'], false, true, false);
 		}
-		$table->data[0][3] = print_select ($fields, "status", $status, '', '', -1, true);
+		$table->data[0][3] = html_print_select ($fields, "status", $status, '', '', -1, true);
 		$table->data[1][0] = '<span alt="' . __('Module group') . '" title="' . __('Module group') . '"><b>' . __('M') . '</b></span>';
-		$table->data[1][1] = print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
+		$table->data[1][1] = html_print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
 			'module_group', $modulegroup, '',__('All'), 0, true);
-		$table->data[1][2] = print_input_text('search', $search, '', 5, 20, true);
+		$table->data[1][2] = html_print_input_text('search', $search, '', 5, 20, true);
 		$table->data[1][2] .= "<input type='submit' class='button_filter' name='submit_button' value='' alt='" . __('Filter') . "' title='" . __('Filter') . "' />";
 		
 		echo "<form method='post'>";
-		print_table($table);
+		html_print_table($table);
 		echo "</form>";
 		
 		
@@ -229,7 +229,7 @@ class MonitorStatus {
 			$table->data[] = $data;
 		}
 		
-		print_table($table);
+		html_print_table($table);
 		
 		$pagination = pagination ($total,
 			ui_get_url_refresh (array ()),
diff --git a/pandora_console/mobile/operation/agents/tactical.php b/pandora_console/mobile/operation/agents/tactical.php
index 7c0cdc84be..7ec8ee93ab 100644
--- a/pandora_console/mobile/operation/agents/tactical.php
+++ b/pandora_console/mobile/operation/agents/tactical.php
@@ -76,7 +76,7 @@ class Tactical {
 		$table->data[8][2] = '<a href="index.php?page=events&event_type=alert_fired" class="tactical_link" style="color: #ff8800;">' . __('Alerts fired') . '</a>';
 		$table->data[8][3] = '<a href="index.php?page=events&event_type=alert_fired" class="tactical_link" style="color: #ff8800;">' . $data["monitor_alerts_fired"] . '</a>';
 		
-		print_table($table);
+		html_print_table($table);
 		
 		echo "<h3 class='title_h3_server'>" . __('Server performance') . "</h3>";
 		
@@ -99,7 +99,7 @@ class Tactical {
 		$table->data[4][0] = '<span style="color: #000;">' . __('Total running modules') . '</span>';
 		$table->data[4][1] = '<span style="color: #000;">' . format_numeric($server_performance ["total_modules"]) . '</span>';
 		
-		print_table($table);
+		html_print_table($table);
 		
 		echo "<h3 class='title_h3_server'>" . __('Summary') . "</h3>";
 		
@@ -113,7 +113,7 @@ class Tactical {
 		$table->data[2][0] = '<span style="color: #aaa;">' . __('Agents unknown') . '</span>';
 		$table->data[2][1] = '<span style="color: #aaa;">' . $data["agents_unknown"] . '</span>';
 		
-		print_table($table);
+		html_print_table($table);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/mobile/operation/agents/view_agents.php b/pandora_console/mobile/operation/agents/view_agents.php
index 081eeb467a..bb89f0188b 100644
--- a/pandora_console/mobile/operation/agents/view_agents.php
+++ b/pandora_console/mobile/operation/agents/view_agents.php
@@ -36,11 +36,11 @@ class ViewAgents {
 	
 	private function showForm() {
 		echo "<form>";
-		print_input_hidden('page', 'agents');
+		html_print_input_hidden('page', 'agents');
 		global $config;
 		$config['text_char_long'] = 12;
-		print_select_groups($this->user->getIdUser(), "AR", true, 'filter_group', $this->filterGroup);
-		print_input_text('filter_text', $this->filterText, __('Free text search'), 5, 20);
+		html_print_select_groups($this->user->getIdUser(), "AR", true, 'filter_group', $this->filterGroup);
+		html_print_input_text('filter_text', $this->filterText, __('Free text search'), 5, 20);
 		echo "<input type='submit' class='button_filter' name='submit_button' value='' alt='" . __('Filter') . "' title='" . __('Filter') . "' />";
 		echo "<form>";
 	}
@@ -135,7 +135,7 @@ class ViewAgents {
 			$table->data[] = $data;
 		}
 		
-		print_table($table);
+		html_print_table($table);
 		
 		$pagination = pagination ($total_agents,
 			ui_get_url_refresh (array ('filter_group' => $this->filterGroup, 'filter_group' => $this->filterGroup)),
@@ -195,7 +195,7 @@ class ViewAgent {
 		$table->data[3][0] = __('Last contact');
 		$table->data[3][1] = $this->agent['ultimo_contacto'];
 		
-		print_table($table);
+		html_print_table($table);
 		
 		$sql = sprintf ("
 			SELECT *
@@ -318,7 +318,7 @@ class ViewAgent {
 			$table->data[] = $data;
 		}
 		
-		print_table($table);
+		html_print_table($table);
 		
 		$table->head = array();
 		$table->head[0] = __('Module');
@@ -375,7 +375,7 @@ class ViewAgent {
 			
 			$table->data[] = $data;
 		}
-		print_table($table);
+		html_print_table($table);
 	}
 }
 
@@ -422,7 +422,7 @@ class viewGraph {
 		$intervals[86400] = human_time_description_raw (86400); // 1 day 
 		$intervals[604800] = human_time_description_raw (604800); // 1 week
 		$intervals[2592000] = human_time_description_raw (2592000); // 1 month
-		echo print_extended_select_for_time ($intervals, 'period', $this->period, 'this.form.submit();', '', '0', 5) . __(" secs");
+		echo html_print_extended_select_for_time ($intervals, 'period', $this->period, 'this.form.submit();', '', '0', 5) . __(" secs");
 		echo "</form><br />";
 		
 		$moduletype_name = get_moduletype_name (get_agentmodule_type ($this->idAgentModule));
@@ -524,7 +524,7 @@ class viewGraph {
 			array_push ($table->data, $data);
 		}
 		
-		print_table($table);
+		html_print_table($table);
 		
 		$pagination = ui_pagination ($count,
 			ui_get_url_refresh (array ('period' => $this->period)),
diff --git a/pandora_console/mobile/operation/agents/view_alerts.php b/pandora_console/mobile/operation/agents/view_alerts.php
index 4b1c64e2c5..bd3f5dd927 100644
--- a/pandora_console/mobile/operation/agents/view_alerts.php
+++ b/pandora_console/mobile/operation/agents/view_alerts.php
@@ -91,7 +91,7 @@ class ViewAlerts {
 			$table->data[] = $data;
 		}
 		
-		print_table($table);
+		html_print_table($table);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/mobile/operation/events/events.php b/pandora_console/mobile/operation/events/events.php
index 5ef5dc5858..c685ae12b4 100644
--- a/pandora_console/mobile/operation/events/events.php
+++ b/pandora_console/mobile/operation/events/events.php
@@ -50,16 +50,16 @@ class EventsView {
 		$table->colspan[1][2] = 2;
 		
 		$table->data[0][0] = '<span alt="' . __('Group') . '" title="' . __('Group') . '"><b>' . __('G') . '</b></span>';
-		$table->data[0][1] = print_select_groups($this->system->getConfig("id_user"), "IR", true, 'ev_group', $ev_group, '', '', 0, true, false, false, 'w130');
+		$table->data[0][1] = html_print_select_groups($this->system->getConfig("id_user"), "IR", true, 'ev_group', $ev_group, '', '', 0, true, false, false, 'w130');
 		$table->data[0][2] = '<span alt="' . __('Event type') . '" title="' . __('Event type') . '"><b>' . __('E') . '</b></span>';
-		$table->data[0][3] = print_select ($types, 'event_type', $event_type, '', __('All'), '', true);
+		$table->data[0][3] = html_print_select ($types, 'event_type', $event_type, '', __('All'), '', true);
 		$table->data[1][0] = '<span alt="' . __('Severity') . '" title="' . __('Severity') . '"><b>' . __('S') . '</b></span>';
-		$table->data[1][1] = print_select (get_priorities (), "severity", $severity, '', __('All'), '-1', true);
-		$table->data[1][2] = print_input_text('search', $search, '', 5, 20, true);
+		$table->data[1][1] = html_print_select (get_priorities (), "severity", $severity, '', __('All'), '-1', true);
+		$table->data[1][2] = html_print_input_text('search', $search, '', 5, 20, true);
 		$table->data[1][2] .= "<input type='submit' class='button_filter' name='submit_button' value='' alt='" . __('Filter') . "' title='" . __('Filter') . "' />";
 		
 		echo "<form method='post'>";
-		print_table($table);
+		html_print_table($table);
 		echo "</form>";
 		
 		
@@ -197,7 +197,7 @@ class EventsView {
 			$table->data[] = $data;
 		}
 		
-		print_table($table);
+		html_print_table($table);
 		
 		$pagination = ui_pagination ($count,
 			ui_get_url_refresh(array("offset" => $offset, "ev_group" => $ev_group,
diff --git a/pandora_console/mobile/operation/servers/view_servers.php b/pandora_console/mobile/operation/servers/view_servers.php
index 460a4cc1f5..9c651a0b96 100644
--- a/pandora_console/mobile/operation/servers/view_servers.php
+++ b/pandora_console/mobile/operation/servers/view_servers.php
@@ -63,7 +63,7 @@ class ViewServers {
 			$table->data[] = $data;
 		}
 		
-		print_table($table);
+		html_print_table($table);
 	}
 }
 
diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php
index 3d8d234259..c23b1af3af 100755
--- a/pandora_console/operation/agentes/alerts_status.functions.php
+++ b/pandora_console/operation/agentes/alerts_status.functions.php
@@ -43,7 +43,7 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
 	$table->style = array ();
 	
 	$table->data[0][0] = __('Group');
-	$table->data[0][1] = print_select_groups(false, "AR", true, "ag_group", $id_group,
+	$table->data[0][1] = html_print_select_groups(false, "AR", true, "ag_group", $id_group,
 		'javascript:this.form.submit();', '', '', true);
 		
 	$alert_status_filter = array();
@@ -59,17 +59,17 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st
 	$alert_standby['standby_off'] = __('Standby off');
 		
 	$table->data[0][2] = __('Status');
-	$table->data[0][3] = print_select ($alert_status_filter, "filter", $filter, 'javascript:this.form.submit();', '', '', true);
+	$table->data[0][3] = html_print_select ($alert_status_filter, "filter", $filter, 'javascript:this.form.submit();', '', '', true);
 	$table->data[0][4] = '';
 	$table->data[1][0] = __('Free text for search')
 		. '<a href="#" class="tip">&nbsp;<span>' . __("Filter by agent name, module name, template name or action name") . '</span></a>';
-	$table->data[1][1] = print_input_text('free_search', $free_search, '', 20, 40, true);
+	$table->data[1][1] = html_print_input_text('free_search', $free_search, '', 20, 40, true);
 	$table->data[1][2] = __('Standby');
-	$table->data[1][3] = print_select ($alert_standby, "filter_standby", $filter_standby, 'javascript:this.form.submit();', '', '', true);
-	$table->data[1][4] = print_submit_button(__('Filter'), 'filter_button', false, 'class="sub search"', true);
+	$table->data[1][3] = html_print_select ($alert_standby, "filter_standby", $filter_standby, 'javascript:this.form.submit();', '', '', true);
+	$table->data[1][4] = html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub search"', true);
 	
 	$data = '<form method="post" action="'.$url.'">';
-	$data .= print_table ($table, true);
+	$data .= html_print_table ($table, true);
 	$data .= '</form>';
 	
 	if($return) {
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 36874bb995..fd9c571e7b 100644
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -249,14 +249,14 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 		$table->head[1] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span>";
 		$table->head[2] = "<span title='" . __('Force execution') . "'>" . __('F.') . "</span>";
 		$table->head[3] = __('Agent') . ' ' .
-			'<a href="' . $url . '&sort_field=agent&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=agent&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=agent&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=agent&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
 		$table->head[4] = __('Module') . ' ' .
-			'<a href="' . $url . '&sort_field=module&sort=up">' . print_image("images/sort_up.png", true, array("style" =>$selectModuleUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=module&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=module&sort=up">' . html_print_image("images/sort_up.png", true, array("style" =>$selectModuleUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=module&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
 		$table->head[5] = __('Template') . ' ' .
-			'<a href="' . $url . '&sort_field=template&sort=up">' . print_image("images/sort_up.png", true, array("style" =>$selectTemplateUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=template&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=template&sort=up">' . html_print_image("images/sort_up.png", true, array("style" =>$selectTemplateUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=template&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
 		$table->head[6] = __('Action');
 		$table->head[7] = __('Last fired');
 		$table->head[8] = __('Status');
@@ -279,11 +279,11 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 		$table->head[1] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span>";
 		$table->head[2] = "<span title='" . __('Force execution') . "'>" . __('F.') . "</span>";
 		$table->head[3] = __('Module') . ' ' .
-			'<a href="' . $url . '&sort_field=module&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=module&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=module&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=module&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
 		$table->head[4] = __('Template') . ' ' .
-			'<a href="' . $url . '&sort_field=template&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=template&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=template&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=template&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
 		$table->head[5] = __('Action');
 		$table->head[6] = __('Last fired');
 		$table->head[7] = __('Status');
@@ -308,14 +308,14 @@ else
 		$table->head[0] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span>";
 		$table->head[1] = "<span title='" . __('Force execution') . "'>" . __('F.') . "</span>";
 		$table->head[2] = __('Agent') . ' ' .
-			'<a href="' . $url . '&sort_field=agent&sort=up">'. print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=agent&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=agent&sort=up">'. html_print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=agent&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
 		$table->head[3] = __('Module') . ' ' .
-			'<a href="' . $url . '&sort_field=module&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=module&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=module&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=module&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
 		$table->head[4] = __('Template') . ' ' .
-			'<a href="' . $url . '&sort_field=template&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=template&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=template&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=template&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
 		$table->head[5] = __('Action');
 		$table->head[6] = __('Last fired');
 		$table->head[7] = __('Status');
@@ -336,11 +336,11 @@ else
 		$table->head[0] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span>";
 		$table->head[1] = "<span title='" . __('Force execution') . "'>" . __('F.') . "</span>";
 		$table->head[2] = __('Module') . ' ' .
-			'<a href="' . $url . '&sort_field=module&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=module&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=module&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=module&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
 		$table->head[3] = __('Template') . ' ' .
-			'<a href="' . $url . '&sort_field=template&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
-			'<a href="' . $url . '&sort_field=template&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
+			'<a href="' . $url . '&sort_field=template&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
+			'<a href="' . $url . '&sort_field=template&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
 		$table->head[4] = __('Action');
 		$table->head[5] = __('Last fired');
 		$table->head[6] = __('Status');
@@ -372,7 +372,7 @@ echo '<form method="post" action="'.$url.'">';
 
 if (!empty ($table->data)) {
 	ui_pagination ($countAlertsSimple, $url,  $offset_simple, 0, false, 'offset_simple');
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo '<div class="nf">'.__('No simple alerts found').'</div>';
 }
@@ -402,12 +402,12 @@ foreach ($alerts['alerts_combined'] as $alert) {
 
 if (!empty ($table->data)) {
 	ui_pagination ($countAlertsCombined, $url, $offset_combined, 0, false, 'offset_combined');
-	print_table ($table);
+	html_print_table ($table);
 }
 
 if (count($alerts['alerts_simple']) > 0 || count($alerts['alerts_combined']) > 0) {
 	echo '<div class="action-buttons" style="width: '.$table->width.';">';
-	print_submit_button (__('Validate'), 'alert_validate', false, 'class="sub upd"', false);
+	html_print_submit_button (__('Validate'), 'alert_validate', false, 'class="sub upd"', false);
 	echo '</div>';
 }
 
diff --git a/pandora_console/operation/agentes/custom_fields.php b/pandora_console/operation/agentes/custom_fields.php
index d85f467403..c4fd43eb38 100644
--- a/pandora_console/operation/agentes/custom_fields.php
+++ b/pandora_console/operation/agentes/custom_fields.php
@@ -58,9 +58,9 @@ if($fields === false) {
 		$data[0] = '<b>'.$field['name'].'</b>';
 
 		if($field['display_on_front']) {
-			$data[1] = print_image('images/tick.png', true);
+			$data[1] = html_print_image('images/tick.png', true);
 		}else {
-			$data[1] = print_image('images/delete.png', true);
+			$data[1] = html_print_image('images/delete.png', true);
 		}
 		
 		$custom_value = db_get_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente));
@@ -74,6 +74,6 @@ if($fields === false) {
 		array_push ($table->data, $data);
 	}
 
-	print_table ($table);
+	html_print_table ($table);
 }
 ?>
diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php
index 17d309a0c7..f067da15e1 100644
--- a/pandora_console/operation/agentes/datos_agente.php
+++ b/pandora_console/operation/agentes/datos_agente.php
@@ -136,7 +136,7 @@ $intervals[3600] = human_time_description_raw (3600); // 1 hour
 $intervals[86400] = human_time_description_raw (86400); // 1 day 
 $intervals[604800] = human_time_description_raw (604800); // 1 week
 $intervals[2592000] = human_time_description_raw (2592000); // 1 month
-echo print_extended_select_for_time ($intervals, 'period', $period, 'this.form.submit();', '', '0', 10) . __(" seconds.");
+echo html_print_extended_select_for_time ($intervals, 'period', $period, 'this.form.submit();', '', '0', 10) . __(" seconds.");
 echo "</form><br />";
 
 //
@@ -169,7 +169,7 @@ if (empty ($table->data)) {
 }
 else {
 	ui_pagination($count);
-	print_table ($table);
+	html_print_table ($table);
 	unset ($table);
 }
 
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index e0ea2c4e0f..e78326af49 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -109,17 +109,17 @@ echo '<table cellpadding="4" cellspacing="4" class="databox" width="95%">';
 echo '<tr><td style="white-space:nowrap;">'.__('Group').': ';
 
 $groups = get_user_groups ();
-print_select_groups(false, "AR", true, 'group_id', $group_id, 'this.form.submit()', '', '');
+html_print_select_groups(false, "AR", true, 'group_id', $group_id, 'this.form.submit()', '', '');
 
 echo '</td><td style="white-space:nowrap;">';
 
 echo __('Free text for search').' (*): ';
 
-print_input_text ("search", $search, '', 15);
+html_print_input_text ("search", $search, '', 15);
 
 echo '</td><td style="white-space:nowrap;">';
 
-print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub search")); 
+html_print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub search")); 
 
 echo '</td><td style="width:40%;">&nbsp;</td></tr></table></form>';
 
@@ -273,23 +273,23 @@ $table->class = "databox";
 
 $table->head = array ();
 $table->head[0] = __('Agent'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=name&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=name&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
+	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
 $table->head[1] = __('OS'). ' ' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=os&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectOsUp, "alt" => "up"))  . '</a>' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=os&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectOsDown, "alt" => "down")) . '</a>';
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=os&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp, "alt" => "up"))  . '</a>' .
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=os&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown, "alt" => "down")) . '</a>';
 $table->head[2] = __('Interval'). ' ' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=interval&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '</a>' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=interval&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . '</a>';
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=interval&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '</a>' .
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=interval&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . '</a>';
 $table->head[3] = __('Group'). ' ' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=group&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectGroupUp, "alt" => "up")) . '</a>' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=group&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectGroupDown, "alt" => "down")) . '</a>';
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=group&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp, "alt" => "up")) . '</a>' .
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=group&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown, "alt" => "down")) . '</a>';
 $table->head[4] = __('Modules');
 $table->head[5] = __('Status');
 $table->head[6] = __('Alerts');
 $table->head[7] = __('Last contact'). ' ' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=last_contact&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
-		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=last_contact&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=last_contact&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
+		'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;search=' . $search . '&amp;sort_field=last_contact&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
 
 $table->align = array ();
 $table->align[1] = "center";
@@ -319,7 +319,7 @@ foreach ($agents as $agent) {
 	$data[0] = '';
 	if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) {
 		$data[0] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent["id_agente"].'">';
-		$data[0] .= print_image ("images/setup.png", true, array ("border" => 0, "width" => 16));
+		$data[0] .= html_print_image ("images/setup.png", true, array ("border" => 0, "width" => 16));
 		$data[0] .= '</a>&nbsp;';
 	}
 		
@@ -376,7 +376,7 @@ foreach ($agents as $agent) {
 }
 
 if (!empty ($table->data)) {
-	print_table ($table);
+	html_print_table ($table);
 	ui_pagination ($total_agents, ui_get_url_refresh (array ('group_id' => $group_id, 'search' => $search, 'sort_field' => $sortField, 'sort' => $sort)));
 	unset ($table);
 } else {
@@ -390,8 +390,8 @@ if (check_acl ($config['id_user'], 0, "LM") || check_acl ($config['id_user'], 0,
 		|| check_acl ($config['id_user'], 0, "UM")) {
 	
 	echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
-		print_input_hidden ('new_agent', 1);
-		print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
+		html_print_input_hidden ('new_agent', 1);
+		html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
 	echo '</form>';
 }
 */
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 56b032e5b5..a3e5eef771 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -70,8 +70,8 @@ else {
 	$cellName = ui_print_agent_name ($agent["id_agente"], true, 35, "upper", true);
 }
 echo '<td class="datos"><b>'.$cellName.'</b></td>';
-echo '<td class="datos" width="40"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60">' . print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '</a>&nbsp;';
-echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'">' . print_image("images/target.png", true, array("border" => '0', "title" => __('Flag'), "alt" => "")) . '</a></td></tr>';
+echo '<td class="datos" width="40"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60">' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '</a>&nbsp;';
+echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'">' . html_print_image("images/target.png", true, array("border" => '0', "title" => __('Flag'), "alt" => "")) . '</a></td></tr>';
 
 //Addresses
 echo '<tr><td class="datos2"><b>'.__('IP Address').'</b></td>';
@@ -90,7 +90,7 @@ if (!empty($address)) {
 
 $ips = array_unique($ips);
 
-print_select($ips, "not_used", get_agent_address ($id_agente));
+html_print_select($ips, "not_used", get_agent_address ($id_agente));
 echo '</td></tr>';
 
 //OS
@@ -124,7 +124,7 @@ echo '<tr><td class="datos"><b>'.__('Group').'</b></td>';
 echo '<td class="datos" colspan="2">';
 echo ui_print_group_icon ($agent["id_grupo"], true);
 echo '&nbsp;(<b>';
-echo ui_print_truncate_text(get_group_name ($agent["id_grupo"]));
+echo ui_print_truncate_text(groups_get_name ($agent["id_grupo"]));
 echo '</b>)</td></tr>';
 
 // Agent version
@@ -133,7 +133,7 @@ echo '<td class="datos2" colspan="2">'.$agent["agent_version"].'</td></tr>';
 
 // Position Information
 if ($config['activate_gis']) {
-	$dataPositionAgent = getDataLastPositionAgent($agent['id_agente']);
+	$dataPositionAgent = gis_get_data_last_position_agent($agent['id_agente']);
 	
 	echo '<tr><td class="datos2"><b>'.__('Position (Long, Lat)'). '</b></td>';
     echo '<td class="datos2" colspan="2">';
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 36d77d19c9..8e5c1cba65 100644
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -163,22 +163,22 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 }
 
 $table->head[2] = __('Type') . ' ' .
-	'<a href="' . $url . '&sort_field=type&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTypeUp, "alt" => "up")) . '</a>' .
-	'<a href="' . $url . '&sort_field=type&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTypeDown, "alt" => "down")) . '</a>';
+	'<a href="' . $url . '&sort_field=type&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTypeUp, "alt" => "up")) . '</a>' .
+	'<a href="' . $url . '&sort_field=type&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTypeDown, "alt" => "down")) . '</a>';
 $table->head[3] = __('Module name') . ' ' .
-	'<a href="' . $url . '&sort_field=name&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' .
-	'<a href="' . $url . '&sort_field=name&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+	'<a href="' . $url . '&sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' .
+	'<a href="' . $url . '&sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
 $table->head[4] = __('Description');
 $table->head[5] = __('Status') . ' ' .
-	'<a href="' . $url . '&sort_field=status&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectStatusUp, "alt" => "up")) . '</a>' .
-	'<a href="' . $url . '&sort_field=status&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectStatusDown, "alt" => "down")) . '</a>';
+	'<a href="' . $url . '&sort_field=status&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectStatusUp, "alt" => "up")) . '</a>' .
+	'<a href="' . $url . '&sort_field=status&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectStatusDown, "alt" => "down")) . '</a>';
 $table->head[6] = __('Data') . ' ' .
-	'<a href="' . $url . '&sort_field=data&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectDataUp, "alt" => "up")) . '</a>' .
-	'<a href="' . $url . '&sort_field=data&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectDataDown, "alt" => "down")) . '</a>';
+	'<a href="' . $url . '&sort_field=data&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectDataUp, "alt" => "up")) . '</a>' .
+	'<a href="' . $url . '&sort_field=data&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectDataDown, "alt" => "down")) . '</a>';
 $table->head[7] = __('Graph');
 $table->head[8] = __('Last contact') . ' ' .
-	'<a href="' . $url . '&sort_field=last_contact&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
-	'<a href="' . $url . '&sort_field=last_contact&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
+	'<a href="' . $url . '&sort_field=last_contact&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
+	'<a href="' . $url . '&sort_field=last_contact&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
 
 $table->align = array("left","left","left","left","left","center");
 
@@ -203,10 +203,10 @@ foreach ($modules as $module) {
 	$data = array ();
 	if (($module["id_modulo"] != 1) && ($module["id_tipo_modulo"] != 100)) {
 		if ($module["flag"] == 0) {
-			$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module["id_agente_modulo"].'&amp;flag=1&amp;refr=60">' . print_image("images/target.png", true, array("border" => '0', "alt" => "target")) . '</a>';
+			$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module["id_agente_modulo"].'&amp;flag=1&amp;refr=60">' . html_print_image("images/target.png", true, array("border" => '0', "alt" => "target")) . '</a>';
 		}
 		else {
-			$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module["id_agente_modulo"].'&amp;refr=60">' . print_image("images/refresh.png", true, array("border" => "0", "alt" => "refresh")) . '</a>';
+			$data[0] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module["id_agente_modulo"].'&amp;refr=60">' . html_print_image("images/refresh.png", true, array("border" => "0", "alt" => "refresh")) . '</a>';
 		}
 	}
 	else {
@@ -252,7 +252,7 @@ foreach ($modules as $module) {
 			}
 
 			$data[1] = '<a href="?sec=gpolicies&amp;sec2=enterprise/godmode/policies/policies&amp;id=' . $id_policy . '">' . 
-				print_image($img,true, array('title' => $title)) .
+				html_print_image($img,true, array('title' => $title)) .
 				'</a>';
 		}
 		else {
@@ -263,7 +263,7 @@ foreach ($modules as $module) {
 	$data[2] = show_server_type ($module['id_modulo']);
 
 	if (check_acl ($config['id_user'], $id_grupo, "AW")) 
-	  $data[2] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module["id_agente_modulo"].'&amp;edit_module='.$module["id_modulo"].'">' . print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>';
+	  $data[2] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module["id_agente_modulo"].'&amp;edit_module='.$module["id_modulo"].'">' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>';
 	  
 	$data[3] = ui_print_string_substr ($module["nombre"], 25, true);
 	$data[4] = ui_print_string_substr ($module["descripcion"], 30, true);
@@ -336,7 +336,7 @@ foreach ($modules as $module) {
 				$salida = "<span id='value_module_" . $module["id_agente_modulo"] . "'
 					title='".$module_value."' style='white-space: nowrap;'>" . 
 					'<span id="value_module_text_' . $module["id_agente_modulo"] . '">' . $sub_string . '</span> ' .
-					"<a href='javascript: toggle_full_value(" . $module["id_agente_modulo"] . ")'>" . print_image("images/rosette.png", true) . "" . "</span>";
+					"<a href='javascript: toggle_full_value(" . $module["id_agente_modulo"] . ")'>" . html_print_image("images/rosette.png", true) . "" . "</span>";
 			}
 		}
 	}
@@ -354,8 +354,8 @@ foreach ($modules as $module) {
 		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&amp;period=86400&amp;id=".$module["id_agente_modulo"]."&amp;label=".base64_encode($module["nombre"])."&amp;refresh=600','day_".$win_handle."')";
 
 	//	if ($nombre_tipo_modulo != "log4x")
-			$data[7] .= '<a href="javascript:'.$link.'">' . print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a>';
-		$data[7] .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&tab=data_view&amp;period=86400&amp;id=".$module["id_agente_modulo"]."'>" . print_image('images/binary.png', true, array("border" => '0', "alt" => "")) . "</a>"; 
+			$data[7] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a>';
+		$data[7] .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&tab=data_view&amp;period=86400&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("border" => '0', "alt" => "")) . "</a>"; 
 	}
 	
 	if ($module['estado'] == 3) {
@@ -388,7 +388,7 @@ if (empty ($table->data)) {
 }
 else {
 	echo "<h3>".__('Full list of monitors')."</h3>";
-	print_table ($table);
+	html_print_table ($table);
 }
 
 unset ($table);
diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php
index 5e9fec6bf3..7e84b366dd 100644
--- a/pandora_console/operation/agentes/estado_ultimopaquete.php
+++ b/pandora_console/operation/agentes/estado_ultimopaquete.php
@@ -59,7 +59,7 @@ $last_label = "";
 
 // Title
 echo "<h3>".__('Display of last data modules received by agent');
-echo "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data'>" . print_image('images/refresh.png', true, array("alt" => '')) . "</a>";
+echo "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data'>" . html_print_image('images/refresh.png', true, array("alt" => '')) . "</a>";
 echo "</h3>";
 
 $sortField = get_parameter('sort_field');
@@ -198,27 +198,27 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 	echo "<th><span title='" . __('Policy') . "'>".__('P.')."</span></th>";
 }
 echo "<th>".__('Module name') . ' ' .
-			'<a href="' . $url . '&amp;sort_field=name&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' .
-			'<a href="' . $url . '&amp;sort_field=name&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+			'<a href="' . $url . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' .
+			'<a href="' . $url . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
 echo "</th>";
 echo "<th>".__('Type') . ' ' .
-			'<a href="' . $url . '&amp;sort_field=type&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTypeUp, "alt" => "up")) . '</a>' .
-			'<a href="' . $url . '&amp;sort_field=type&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTypeDown, "alt" => "down")) . '</a>';
+			'<a href="' . $url . '&amp;sort_field=type&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTypeUp, "alt" => "up")) . '</a>' .
+			'<a href="' . $url . '&amp;sort_field=type&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTypeDown, "alt" => "down")) . '</a>';
 echo "</th>";
 echo "<th>".__('int') . ' ' .
-			'<a href="' . $url . '&amp;sort_field=interval&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '</a>' .
-			'<a href="' . $url . '&amp;sort_field=interval&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . '</a>';
+			'<a href="' . $url . '&amp;sort_field=interval&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '</a>' .
+			'<a href="' . $url . '&amp;sort_field=interval&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . '</a>';
 echo "</th>";
 echo "<th>".__('Description') . "</th>";
 echo "<th>".__('Data') . ' ' .
-	'<a href="' . $url . '&amp;sort_field=data&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectDataUp, "alt" => "up")) . '</a>' .
-	'<a href="' . $url . '&amp;sort_field=data&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectDataDown, "alt" => "down")) . '</a>';
+	'<a href="' . $url . '&amp;sort_field=data&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectDataUp, "alt" => "up")) . '</a>' .
+	'<a href="' . $url . '&amp;sort_field=data&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectDataDown, "alt" => "down")) . '</a>';
 echo "</th>";
 echo "<th>".__('Graph')."</th>";
 echo "<th>".__('Raw Data')."</th>";
 echo "<th>".__('Timestamp') . ' ' .
-	'<a href="' . $url . '&amp;sort_field=timestamp&amp;sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTimestampUp, "alt" => "up")) . '</a>' .
-	'<a href="' . $url . '&amp;sort_field=timestamp&amp;sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTimestampDown, "alt" => "down")) . '</a>';
+	'<a href="' . $url . '&amp;sort_field=timestamp&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTimestampUp, "alt" => "up")) . '</a>' .
+	'<a href="' . $url . '&amp;sort_field=timestamp&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTimestampDown, "alt" => "down")) . '</a>';
 echo "</th>";
 $texto=''; $last_modulegroup = 0;
 $color = 1;
@@ -251,10 +251,10 @@ foreach ($modules as $module) {
 	// Has flag = 0
 	if ($write && $module["id_modulo"] > 1 && $module["id_tipo_modulo"] < 100) {
 		if ($module["flag"] == 0) {
-			echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."&amp;id_agente_modulo=".$module["id_agente_modulo"]."&amp;flag=1&amp;tab=data&amp;refr=60'>" . print_image('images/target.png', true, array("border" => '0', "alt" => "")) . "</a>";
+			echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."&amp;id_agente_modulo=".$module["id_agente_modulo"]."&amp;flag=1&amp;tab=data&amp;refr=60'>" . html_print_image('images/target.png', true, array("border" => '0', "alt" => "")) . "</a>";
 		}
 		else {
-			echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."&amp;id_agente_modulo=".$module["id_agente_modulo"]."&amp;tab=data&amp;refr=60'>" . print_image('images/refresh.png', true, array("border" => '0', "alt" => '')) . "</a>";
+			echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."&amp;id_agente_modulo=".$module["id_agente_modulo"]."&amp;tab=data&amp;refr=60'>" . html_print_image('images/refresh.png', true, array("border" => '0', "alt" => '')) . "</a>";
 		}
 	}
 	echo "</td>";
@@ -295,7 +295,7 @@ foreach ($modules as $module) {
 			echo "<td>";
 			
 			echo'<a href="?sec=gpolicies&amp;sec2=enterprise/godmode/policies/policies&amp;id=' . $id_policy . '">' . 
-				print_image($img,true, array('title' => $title)) .
+				html_print_image($img,true, array('title' => $title)) .
 				'</a>';
 			echo "</td>";
 		}
@@ -383,16 +383,16 @@ foreach ($modules as $module) {
 		echo "<td class=".$tdcolor." width='78'>";
 		$graph_label = safe_output($module["nombre"]);
 		
-		echo "<a href='javascript:winopeng(\"operation/agentes/stat_win.php?type=$graph_type&period=2419200&id=".$module["id_agente_modulo"]."&label=".base64_encode($graph_label)."&refresh=180000\", \"month_".$win_handle."\")'>" . print_image('images/grafica_m.png' , true, array("border" => '0', "alt" => '')) . "</a>&nbsp;";
+		echo "<a href='javascript:winopeng(\"operation/agentes/stat_win.php?type=$graph_type&period=2419200&id=".$module["id_agente_modulo"]."&label=".base64_encode($graph_label)."&refresh=180000\", \"month_".$win_handle."\")'>" . html_print_image('images/grafica_m.png' , true, array("border" => '0', "alt" => '')) . "</a>&nbsp;";
 		
 		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=604800&id=".$module["id_agente_modulo"]."&label=".base64_encode($graph_label)."&refresh=6000','week_".$win_handle."')";
-		echo '<a href="javascript:'.$link.'">' . print_image("images/grafica_w.png", true, array("border" => '0', "alt" => '')) . '</a>&nbsp;';
+		echo '<a href="javascript:'.$link.'">' . html_print_image("images/grafica_w.png", true, array("border" => '0', "alt" => '')) . '</a>&nbsp;';
 		
 		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".base64_encode($graph_label)."&refresh=600','day_".$win_handle."')";
-		echo '<a href="javascript:'.$link.'">' . print_image("images/grafica_d.png", true, array("border" => '0', "alt" => '')) . '</a>&nbsp;';
+		echo '<a href="javascript:'.$link.'">' . html_print_image("images/grafica_d.png", true, array("border" => '0', "alt" => '')) . '</a>&nbsp;';
 
 		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=3600&id=".$module["id_agente_modulo"]."&label=".base64_encode($graph_label)."&refresh=60','hour_".$win_handle."')";
-		echo '<a href="javascript:'.$link.'">' . print_image("images/grafica_h.png", true, array("border" => '0', "alt" => "")) . '</a>';
+		echo '<a href="javascript:'.$link.'">' . html_print_image("images/grafica_h.png", true, array("border" => '0', "alt" => "")) . '</a>';
 
 	}
 	
@@ -400,9 +400,9 @@ foreach ($modules as $module) {
 	if ($module['history_data'] == 1) {
 	// RAW Table data
 		echo "<td class=".$tdcolor." width=70>";
-		echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data_view&amp;period=2592000&amp;id=".$module["id_agente_modulo"]."'>" . print_image('images/data_m.png', true, array("border" => '0', "alt" => '')) . "</a>&nbsp;&nbsp;";
-		echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data_view&amp;period=604800&amp;id=".$module["id_agente_modulo"]."'>" . print_image('images/data_w.png', true, array("border" => '0', "alt" => '')) . "</a>&nbsp;&nbsp;";
-		echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data_view&amp;period=86400&amp;id=".$module["id_agente_modulo"]."'>" . print_image('images/data_d.png', true, array("border" => '0', "alt" => '')) . "</a>";
+		echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data_view&amp;period=2592000&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/data_m.png', true, array("border" => '0', "alt" => '')) . "</a>&nbsp;&nbsp;";
+		echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data_view&amp;period=604800&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/data_w.png', true, array("border" => '0', "alt" => '')) . "</a>&nbsp;&nbsp;";
+		echo "<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=$id_agente&amp;tab=data_view&amp;period=86400&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/data_d.png', true, array("border" => '0', "alt" => '')) . "</a>";
 	}
 	else {
 		echo "<td class=".$tdcolor."></td>";
diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php
index b22a852aa5..f79366156e 100644
--- a/pandora_console/operation/agentes/exportdata.php
+++ b/pandora_console/operation/agentes/exportdata.php
@@ -304,7 +304,7 @@ $table->data[0][0] = '<b>'.__('Group').'</b>';
 	
 $groups = get_user_groups ($config['id_user'], "AR");
 	
-$table->data[0][1] = print_select_groups($config['id_user'], "AR", true, "group", $group, 'this.form.submit();', '', 0, true, false, true, 'w130', false);
+$table->data[0][1] = html_print_select_groups($config['id_user'], "AR", true, "group", $group, 'this.form.submit();', '', 0, true, false, true, 'w130', false);
 	
 //Agent selector
 $table->data[1][0] = '<b>'.__('Source agent').'</b>';
@@ -326,8 +326,8 @@ if (!in_array ($agent, array_keys ($agents))) {
 	$agent = current (array_keys ($agents));
 }
 
-//$table->data[1][1] = print_select ($agents, "agent", $agent, 'this.form.submit();', '', 0, true, false, true, 'w130', false);
-$table->data[1][1] = print_input_text_extended ('agent', get_agent_name ($agent), 'text-agent', '', 30, 100, false, '',
+//$table->data[1][1] = html_print_select ($agents, "agent", $agent, 'this.form.submit();', '', 0, true, false, true, 'w130', false);
+$table->data[1][1] = html_print_input_text_extended ('agent', get_agent_name ($agent), 'text-agent', '', 30, 100, false, '',
 	array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
 	. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 	
@@ -340,20 +340,20 @@ if ($agent > 0) {
 	$modules = array ();
 }
 
-$table->data[2][1] = print_select ($modules, "module_arr[]", array_keys ($modules), '', '', 0, true, true, true, 'w130', false);
+$table->data[2][1] = html_print_select ($modules, "module_arr[]", array_keys ($modules), '', '', 0, true, true, true, 'w130', false);
 
 //Start date selector
 $table->data[3][0] = '<b>'.__('Begin date').'</b>';
 
-$table->data[3][1] = print_input_text ('start_date', date ("Y-m-d", get_system_time () - 86400), false, 10, 10, true);
-$table->data[3][1] .= print_image ("images/calendar_view_day.png", true, array ("alt" => "calendar", "onclick" => "scwShow(scwID('text-start_date'),this);"));
-$table->data[3][1] .= print_input_text ('start_time', date ("H:m", get_system_time () - 86400), false, 10, 5, true);
+$table->data[3][1] = html_print_input_text ('start_date', date ("Y-m-d", get_system_time () - 86400), false, 10, 10, true);
+$table->data[3][1] .= html_print_image ("images/calendar_view_day.png", true, array ("alt" => "calendar", "onclick" => "scwShow(scwID('text-start_date'),this);"));
+$table->data[3][1] .= html_print_input_text ('start_time', date ("H:m", get_system_time () - 86400), false, 10, 5, true);
 	
 //End date selector
 $table->data[4][0] = '<b>'.__('End date').'</b>';
-$table->data[4][1] = print_input_text ('end_date', date ("Y-m-d", get_system_time ()), false, 10, 10, true);
-$table->data[4][1] .= print_image ("images/calendar_view_day.png", true, array ("alt" => "calendar", "onclick" => "scwShow(scwID('text-end_date'),this);"));
-$table->data[4][1] .= print_input_text ('end_time', date ("H:m", get_system_time ()), false, 10, 5, true);
+$table->data[4][1] = html_print_input_text ('end_date', date ("Y-m-d", get_system_time ()), false, 10, 10, true);
+$table->data[4][1] .= html_print_image ("images/calendar_view_day.png", true, array ("alt" => "calendar", "onclick" => "scwShow(scwID('text-end_date'),this);"));
+$table->data[4][1] .= html_print_input_text ('end_time', date ("H:m", get_system_time ()), false, 10, 5, true);
 	
 //Export type
 $table->data[5][0] = '<b>'.__('Export type').'</b>';
@@ -364,13 +364,13 @@ $export_types["csv"] = __('CSV');
 $export_types["excel"] = __('MS Excel');
 $export_types["avg"] = __('Average per hour/day');
 
-$table->data[5][1] = print_select ($export_types, "export_type", $export_type, '', '', 0, true, false, true, 'w130', false);
+$table->data[5][1] = html_print_select ($export_types, "export_type", $export_type, '', '', 0, true, false, true, 'w130', false);
 
-print_table ($table);
+html_print_table ($table);
 
 // Submit button
 echo '<div class="action-buttons" style="width:550px;">';
-	print_submit_button (__('Export'), 'export_btn', false, 'class="sub wand"');
+	html_print_submit_button (__('Export'), 'export_btn', false, 'class="sub wand"');
 echo '</div></form>';
 
 ui_require_jquery_file ('pandora.controls');
diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php
index 40d9863d2e..89d0566d57 100644
--- a/pandora_console/operation/agentes/gis_view.php
+++ b/pandora_console/operation/agentes/gis_view.php
@@ -34,7 +34,7 @@ ui_require_javascript_file('openlayers.pandora');
 $period = get_parameter ("period", 86400);
 $agentId = get_parameter('id_agente');
 $agent_name = get_agent_name($agentId); 
-$agentData = getDataLastPositionAgent($id_agente);
+$agentData = gis_get_data_last_position_agent($id_agente);
 
 $url = '';
 //These variables come from index.php
@@ -46,7 +46,7 @@ echo "<div style='margin-bottom: 30px;'></div>";
 
 /* Map with the current position */
 echo "<div id=\"".$agent_name."_agent_map\" style=\"border:1px solid black; width:98%; height: 39em;\"></div>";
-if (!getAgentMap($agentId, "500px", "98%", true, true, $period)) {
+if (!gis_get_agent_map($agentId, "500px", "98%", true, true, $period)) {
 	echo "<br /><div class='nf'>" . __("There is no default map.") . "</div>";
 } 
 
@@ -62,8 +62,8 @@ switch ($config["dbtype"]) {
 		break;
 }
 
-activateAjaxRefresh(null, $timestampLastOperation);
-activateSelectControl();
+gis_activate_ajax_refresh(null, $timestampLastOperation);
+gis_activate_select_control();
 
 if ($agentData === false) {
 	echo "<p>" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "</p>";
@@ -83,7 +83,7 @@ $intervals[172800] = human_time_description_raw (172800);
 $intervals[604800] = human_time_description_raw (604800);
 
 echo "<br />";
-$dataLastPosition = getDataLastPositionAgent($agentId);
+$dataLastPosition = gis_get_data_last_position_agent($agentId);
 if ($dataLastPosition !== false) {
 	echo "<b>" . __("Last position in ") . $dataLastPosition['start_timestamp'] . ":</b> " .
 		$dataLastPosition['stored_longitude'] . ", " . $dataLastPosition['stored_latitude'] . ", " . $dataLastPosition['stored_altitude'];
@@ -91,9 +91,9 @@ if ($dataLastPosition !== false) {
 echo "<br />";
 echo "<form action='index.php?" . $url . "' method='POST'>";
 echo __("Period to show data as path") . ": ";
-print_extended_select_for_time ($intervals, 'period', $period, '', '', '0', 10);
+html_print_extended_select_for_time ($intervals, 'period', $period, '', '', '0', 10);
 echo __(" seconds.") . "&nbsp;";
-print_submit_button(__('Refresh path'), 'refresh', false, 'class = "sub upd"');
+html_print_submit_button(__('Refresh path'), 'refresh', false, 'class = "sub upd"');
 echo "</form>";
 
 echo "<h3>" . __("Positional data from the last") . " " . human_time_description_raw ($period) ."</h3>";
@@ -124,7 +124,7 @@ else {
 	$table->id = $agent_name.'_position_data_table';
 	$table->title = $agent_name." ". __("positional data");
 	$table->titlestyle = "background-color:#799E48;";
-	print_table($table); unset($table);
+	html_print_table($table); unset($table);
 
 	ui_pagination ($countData, false) ;
 	echo "<h3>" . __('Total') . ' ' . $countData . ' ' . __('Data') . "</h3>";
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index 8f2ebdc2d1..32e9afb69b 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -65,13 +65,13 @@ foreach ($modules as $id => $module) {
 	$checked = false;
 	if (isset($modulesChecked[$id]))
 		$checked = (bool) $modulesChecked[$id];
-	$listModules[] = '<span style="white-space: nowrap;">' . print_checkbox('modules[' .  $id . ']', 1, $checked, true) . ' ' . $module . '</span>';
+	$listModules[] = '<span style="white-space: nowrap;">' . html_print_checkbox('modules[' .  $id . ']', 1, $checked, true) . ' ' . $module . '</span>';
 }
 $table->data[0][1] = implode(' ', $listModules);
 
 $table->data[1][0] = __('Begin date');
-$table->data[1][1] = print_input_text ("start_date", substr ($start_date, 0, 10),'', 10, 40, true);
-$table->data[1][1] .= print_image ("images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
+$table->data[1][1] = html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 10, 40, true);
+$table->data[1][1] .= html_print_image ("images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
 
 $table->data[2][0] = __('Zoom factor');
 $options = array ();
@@ -80,7 +80,7 @@ $options[1] = 'x1';
 $options[2] = 'x2';
 $options[3] = 'x3';
 $options[4] = 'x4';
-$table->data[2][1] = print_select ($options, "zoom", $zoom, '', '', 0, true);
+$table->data[2][1] = html_print_select ($options, "zoom", $zoom, '', '', 0, true);
 
 $table->data[3][0] = __('Time range');
 $options = array ();
@@ -96,18 +96,18 @@ $options[1296000] = human_time_description_raw (1296000);
 $options[2592000] = human_time_description_raw (2592000);
 $options[5184000] = human_time_description_raw (5184000);
 $options[15552000] = human_time_description_raw (15552000);
-$table->data[3][1] = print_extended_select_for_time($options, 'period', $period, '', '', 0, 7, true) . ' ' . __('secs');
+$table->data[3][1] = html_print_extended_select_for_time($options, 'period', $period, '', '', 0, 7, true) . ' ' . __('secs');
 
 $table->data[4][0] = __('Show events');
-$table->data[4][1] = print_checkbox ("draw_events", 1, (bool) $draw_events, true);
+$table->data[4][1] = html_print_checkbox ("draw_events", 1, (bool) $draw_events, true);
 $table->data[5][0] = __('Show alerts');
-$table->data[5][1] = print_checkbox ("draw_alerts", 1, (bool) $draw_alerts, true);
+$table->data[5][1] = html_print_checkbox ("draw_alerts", 1, (bool) $draw_alerts, true);
 
 $htmlForm = '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=graphs&id_agente=' . $id_agente . '" >';
-$htmlForm .= print_table($table, true);
-$htmlForm .= print_input_hidden('filter', 1, true);
+$htmlForm .= html_print_table($table, true);
+$htmlForm .= html_print_input_hidden('filter', 1, true);
 $htmlForm .= '<div class="action-buttons" style="width: '.$table->width.'">';
-$htmlForm .= print_submit_button (__('Filter'), 'filter_button', false, 'class="sub upd"', true);
+$htmlForm .= html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub upd"', true);
 $htmlForm .= '</div>';
 $htmlForm .= '</form>';
 
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 37aa62ccf3..7f469926b4 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -123,7 +123,7 @@ foreach ($groups as $id_group => $group_name) {
 	echo "</td>";
 	echo "<td style='text-align: center; vertica-align: middle;'>";
 	if (check_acl ($config['id_user'], $id_group, "AW")) {
-		echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' . print_image("images/target.png", true, array("border" => '0')) . '</a>';
+		echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' . html_print_image("images/target.png", true, array("border" => '0')) . '</a>';
 	}
 	echo "</td>";
 
diff --git a/pandora_console/operation/agentes/networkmap.groups.php b/pandora_console/operation/agentes/networkmap.groups.php
index 18e7da2a2d..819fab9a73 100644
--- a/pandora_console/operation/agentes/networkmap.groups.php
+++ b/pandora_console/operation/agentes/networkmap.groups.php
@@ -83,7 +83,7 @@ if ($result !== false) {
 		echo "<br /><br /> Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?";
 		return;
 	}
-	print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap"));
+	html_print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap"));
 	require ($filename_map);
 } else {
 	ui_print_error_message (__('Map could not be generated'));
diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php
index 2794f4ba29..4869fcde1b 100644
--- a/pandora_console/operation/agentes/networkmap.php
+++ b/pandora_console/operation/agentes/networkmap.php
@@ -145,34 +145,34 @@ if($recenter_networkmap) {
 if ($pure == 1) {
 	$buttons['screen'] = array('active' => false,
 		'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;tab='.$activeTab.'">' . 
-				print_image("images/normalscreen.png", true, array ('title' => __('Normal screen'))) .'</a>');
+				html_print_image("images/normalscreen.png", true, array ('title' => __('Normal screen'))) .'</a>');
 			
 } else {
 	$buttons['screen'] = array('active' => false,
 		'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;pure=1&amp;tab='.$activeTab.'">' . 
-				print_image("images/fullscreen.png", true, array ('title' => __('Full screen'))) .'</a>');
+				html_print_image("images/fullscreen.png", true, array ('title' => __('Full screen'))) .'</a>');
 }
 if($config['enterprise_installed']) {
 	$buttons['policies'] = array('active' => $activeTab == 'policies',
 		'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;tab=policies&amp;pure='.$pure.'">' . 
-				print_image("images/policies.png", true, array ("title" => __('Policies view'))) .'</a>');
+				html_print_image("images/policies.png", true, array ("title" => __('Policies view'))) .'</a>');
 }
 			
 $buttons['groups'] = array('active' => $activeTab == 'groups',
 	'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;tab=groups&amp;pure='.$pure.'">' . 
-			print_image("images/group.png", true, array ("title" => __('Groups view'))) .'</a>');
+			html_print_image("images/group.png", true, array ("title" => __('Groups view'))) .'</a>');
 			
 $buttons['topology'] = array('active' => $activeTab == 'topology',
 	'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;tab=topology&amp;pure='.$pure.'">' . 
-			print_image("images/recon.png", true, array ("title" => __('Topology view'))) .'</a>');
+			html_print_image("images/recon.png", true, array ("title" => __('Topology view'))) .'</a>');
 			
 $buttons['separator'] = array('separator' => '');
 
 $combolist = '<form name="query_sel" method="post" action="index.php?sec=estado&sec2=operation/agentes/networkmap">';
 
-$combolist .= print_select($networkmaps, 'id_networkmap', $id_networkmap, 'onchange:this.form.submit()', __('No selected'), 0, true, false, false, '', false, 'margin-top:4px; margin-left:3px; width:150px;');
+$combolist .= html_print_select($networkmaps, 'id_networkmap', $id_networkmap, 'onchange:this.form.submit()', __('No selected'), 0, true, false, false, '', false, 'margin-top:4px; margin-left:3px; width:150px;');
 
-$combolist .= print_input_hidden('hidden_options',$hidden_options, true);
+$combolist .= html_print_input_hidden('hidden_options',$hidden_options, true);
 
 $combolist .= '</form>';
 
@@ -180,12 +180,12 @@ $buttons['combolist'] = $combolist;
 
 $buttons['addmap'] = array('active' => $activeTab == false,
 	'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;add_networkmap=1&amp;tab='.$activeTab.'&amp;pure='.$pure.'">' . 
-			print_image("images/add.png", true, array ("title" => __('Add map'))) .'</a>');
+			html_print_image("images/add.png", true, array ("title" => __('Add map'))) .'</a>');
 
 if(!$nomaps && $id_networkmap != 0) {			
 	$buttons['deletemap'] = array('active' => $activeTab == false,
 		'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;id_networkmap='.$id_networkmap.'&amp;delete_networkmap=1&amp;tab='.$activeTab.'&amp;pure='.$pure.'">' . 
-				print_image("images/cross.png", true, array ("title" => __('Delete map'))) .'</a>');
+				html_print_image("images/cross.png", true, array ("title" => __('Delete map'))) .'</a>');
 
 	$buttons['savemap'] = array('active' => $activeTab == false,
 		'text' => '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;id_networkmap='.$id_networkmap.'&amp;save_networkmap=1
@@ -194,7 +194,7 @@ if(!$nomaps && $id_networkmap != 0) {
 					&amp;zoom='.$zoom.'&amp;ranksep='.$ranksep.'&amp;fontsize='.$font_size.'&amp;depth='.$depth.'
 					&amp;modwithalerts='.$modwithalerts.'&amp;hidepolicymodules='.$hidepolicymodules.'
 					&amp;module_group='.$module_group.'&amp;pure='.$pure.'&amp;hidden_options='.(int)$hidden_options.'">' . 
-				print_image("images/file.png", true, array ("title" => __('Save map'))) .'</a>');
+				html_print_image("images/file.png", true, array ("title" => __('Save map'))) .'</a>');
 }
 
 switch($activeTab){
@@ -241,31 +241,31 @@ $options_form .= '<table cellpadding="0" cellspacing="0" border="0" width="100%"
 $options_form .= '<tr>';
 $options_form .= '<td>';
 $options_form .= __('Name') . '<br />';
-$options_form .= print_input_text ('name', $name, '', 10, 25, true);
+$options_form .= html_print_input_text ('name', $name, '', 10, 25, true);
 $options_form .= '</td>';
 $options_form .= '<td valign="top">' . __('Group') . '<br />';
-$options_form .= print_select_groups(false, 'AR', false, 'group', $group, '', 'All', 0, true);
+$options_form .= html_print_select_groups(false, 'AR', false, 'group', $group, '', 'All', 0, true);
 $options_form .= '</td>';
 if($activeTab == 'groups' || $activeTab == 'policies'){
 	$options_form .= '<td valign="top">' . __('Module group') . '<br />';
-	$options_form .= print_select_from_sql ('SELECT id_mg, name FROM tmodule_group', 'module_group', $module_group, '', 'All', 0, true);
+	$options_form .= html_print_select_from_sql ('SELECT id_mg, name FROM tmodule_group', 'module_group', $module_group, '', 'All', 0, true);
 	$options_form .= '</td>';
 }
 $options_form .= '<td valign="top">' . __('Layout') . '<br />';
-$options_form .= print_select ($layout_array, 'layout', $layout, '', '', '', true);
+$options_form .= html_print_select ($layout_array, 'layout', $layout, '', '', '', true);
 $options_form .= '</td>';
 
 if($activeTab == 'groups'){
 	$options_form .= '<td valign="top">' . __('Depth') . '<br />';
 	$depth_levels = array('all' => __('All'), 'agent' => __('Agents'), 'group' => __('Groups'));
-	$options_form .= print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
+	$options_form .= html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
 	$options_form .= '</td>';
 }
 
 if($activeTab == 'policies'){
 	$options_form .= '<td valign="top">' . __('Depth') . '<br />';
 	$depth_levels = array('all' => __('All'), 'agent' => __('Agents'), 'policy' => __('Policies'));
-	$options_form .= print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
+	$options_form .= html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
 	$options_form .= '</td>';
 }
 
@@ -273,29 +273,29 @@ $options_form .= '</tr></table>';
 $options_form .= '</td></tr><tr><td>';
 $options_form .= '<table cellpadding="0" cellspacing="0" border="0" width="100%">';
 $options_form .= '<tr><td valign="top">' . __('No Overlap') . '<br />';
-$options_form .= print_checkbox ('nooverlap', '1', $nooverlap, true);
+$options_form .= html_print_checkbox ('nooverlap', '1', $nooverlap, true);
 $options_form .= '</td>';
 
 if(($activeTab == 'groups' || $activeTab == 'policies') && $depth == 'all') {
 	$options_form .= '<td valign="top">' . __('Only modules with alerts') . '<br />';
-	$options_form .= print_checkbox ('modwithalerts', '1', $modwithalerts, true);
+	$options_form .= html_print_checkbox ('modwithalerts', '1', $modwithalerts, true);
 	$options_form .= '</td>';
 
 	if($activeTab == 'groups') {
 		if($config['enterprise_installed']) {
 			$options_form .= '<td valign="top">' . __('Hide policy modules') . '<br />';
-			$options_form .= print_checkbox ('hidepolicymodules', '1', $hidepolicymodules, true);
+			$options_form .= html_print_checkbox ('hidepolicymodules', '1', $hidepolicymodules, true);
 			$options_form .= '</td>';
 		}
 	}
 }
 
 $options_form .= '<td valign="top">' . __('Simple') . '<br />';
-$options_form .= print_checkbox ('simple', '1', $simple, true);
+$options_form .= html_print_checkbox ('simple', '1', $simple, true);
 $options_form .= '</td>';
 
 $options_form .= '<td valign="top">' . __('Regenerate') . '<br />';
-$options_form .= print_checkbox ('regen', '1', $regen, true);
+$options_form .= html_print_checkbox ('regen', '1', $regen, true);
 $options_form .= '</td>';
 
 if ($pure == "1") {
@@ -310,7 +310,7 @@ if ($pure == "1") {
 	);
 
 	$options_form .= '<td valign="top">' . __('Zoom') . '<br />';
-	$options_form .= print_select ($zoom_array, 'zoom', $zoom, '', '', '', true, false, false, false);
+	$options_form .= html_print_select ($zoom_array, 'zoom', $zoom, '', '', '', true, false, false, false);
 	$options_form .= '</td>';
 	
 }
@@ -318,19 +318,19 @@ if ($pure == "1") {
 if ($nooverlap == 1){
 	$options_form .= "<td>";
 	$options_form .= __('Distance between nodes') . '<br />';
-	$options_form .= print_input_text ('ranksep', $ranksep, __('Separation between elements in the map (in Non-overlap mode)'), 3, 4, true);
+	$options_form .= html_print_input_text ('ranksep', $ranksep, __('Separation between elements in the map (in Non-overlap mode)'), 3, 4, true);
 	$options_form .= "</td>";
 }
 
 $options_form .= "<td>";
 $options_form .= __('Font') . '<br />';
-$options_form .= print_input_text ('font_size', $font_size, $alt = 'Font size (in pt)', 2, 4, true);
+$options_form .= html_print_input_text ('font_size', $font_size, $alt = 'Font size (in pt)', 2, 4, true);
 $options_form .= "</td>";
 
 $options_form .= '<td>';
-$options_form .= print_input_hidden('update_networkmap',1, true);
-$options_form .= print_input_hidden('hidden_options',0, true);
-$options_form .= print_submit_button (__('Update'), "updbutton", false, 'class="sub upd"', true);
+$options_form .= html_print_input_hidden('update_networkmap',1, true);
+$options_form .= html_print_input_hidden('hidden_options',0, true);
+$options_form .= html_print_submit_button (__('Update'), "updbutton", false, 'class="sub upd"', true);
 $options_form .= '</td></tr>';
 $options_form .= '</table></table></form>';
 
diff --git a/pandora_console/operation/agentes/networkmap.topology.php b/pandora_console/operation/agentes/networkmap.topology.php
index 0f85816b9e..fb62724ba5 100644
--- a/pandora_console/operation/agentes/networkmap.topology.php
+++ b/pandora_console/operation/agentes/networkmap.topology.php
@@ -83,7 +83,7 @@ if ($result !== false) {
 		echo "<br /><br /> Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?";
 		return;
 	}
-	print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap"));
+	html_print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap"));
 	require ($filename_map);
 } else {
 	ui_print_error_message (__('Map could not be generated'));
diff --git a/pandora_console/operation/agentes/sla_view.php b/pandora_console/operation/agentes/sla_view.php
index d222d50bc9..5be08c7bba 100644
--- a/pandora_console/operation/agentes/sla_view.php
+++ b/pandora_console/operation/agentes/sla_view.php
@@ -88,9 +88,9 @@ foreach ($modules as $module_id => $module) {
 	//TODO: Make this work for all new status
 	$status = get_agentmodule_status ($module_id);
 	if ($status == 1){
-		$data[3] = print_image ("images/pixel_red.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Down')));
+		$data[3] = html_print_image ("images/pixel_red.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Down')));
 	} else {
-		$data[3] = print_image ("images/pixel_green.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Up')));
+		$data[3] = html_print_image ("images/pixel_green.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Up')));
 	}
 			
 	if ($module["module_interval"] > 0) {
@@ -102,7 +102,7 @@ foreach ($modules as $module_id => $module) {
 	$loc++;
 }
 
-print_table ($table);
+html_print_table ($table);
 unset ($table);
 
 // Get all SLA report components
@@ -131,13 +131,13 @@ if ($result !== false) {
 		$data[2] = format_numeric (get_agentmodule_sla ($sla_data["id_agent_module"], $config["sla_period"], 1)).'%';
 		$status = get_agentmodule_status ($sla_data["id_agent_module"]);
 		if ($status == 1){
-			$data[3] = print_image ("images/pixel_red.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Down')));
+			$data[3] = html_print_image ("images/pixel_red.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Down')));
 		} else {
-			$data[3] = print_image ("images/pixel_green.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Up')));
+			$data[3] = html_print_image ("images/pixel_green.png", true, array ("width" => 40, "height" => 18, "title" => __('Module Up')));
 		}
 		array_push ($table->data, $data);
 	}
-	print_table ($table);
+	html_print_table ($table);
 	unset ($table);
 }
 ?>
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 1939d8be96..17ac1a014c 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -172,26 +172,26 @@ switch ($graph_type) {
 //z-index is 1 because 2 made the calendar show under the divmenu.
 echo '<div id="divmenu" class="menu" style="z-index:1;"><b>'.__('Pandora FMS Graph configuration menu').'</b><br />'.__('Please, make your changes and apply with the <i>Reload</i> button');
 echo '<form method="get" action="stat_win.php">';
-print_input_hidden ("id", $id);
-print_input_hidden ("label", $label);
+html_print_input_hidden ("id", $id);
+html_print_input_hidden ("label", $label);
 
 if (isset($_GET["type"])) {
 	$type = get_parameter_get ("type");
-	print_input_hidden ("type", $type);
+	html_print_input_hidden ("type", $type);
 }
 echo '<table class="databox_frame" cellspacing="5">';
 echo '<tr><td>'.__('Refresh time').'</td><td colspan="2">';
 
-print_input_text ("refresh", $refresh, '', 5);
+html_print_input_text ("refresh", $refresh, '', 5);
 
 echo '&nbsp;&nbsp;&nbsp;'.__('Avg. Only');
 
-print_checkbox ("avg_only", 1, (bool) $avg_only);
+html_print_checkbox ("avg_only", 1, (bool) $avg_only);
 
 echo '<tr><td>'.__('Begin date').'</td><td>';
 
-print_input_text ("start_date", substr ($start_date, 0, 10),'', 10);
-print_image ("images/calendar_view_day.png", false, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
+html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 10);
+html_print_image ("images/calendar_view_day.png", false, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
 
 echo '</td></tr><tr><td>'.__('Zoom factor').'</td>';
 echo '<td>';
@@ -203,7 +203,7 @@ $options[2] = 'x2';
 $options[3] = 'x3';
 $options[4] = 'x4';
 
-print_select ($options, "zoom", $zoom);
+html_print_select ($options, "zoom", $zoom);
 
 echo '</td></tr><tr><td>'.__('Time range').'</td><td>';
 
@@ -221,26 +221,26 @@ $options[2592000] = human_time_description_raw (2592000);
 $options[5184000] = human_time_description_raw (5184000);
 $options[15552000] = human_time_description_raw (15552000);
 
-print_extended_select_for_time($options, 'period', $period, '', '', 0, 7);
-//print_select ($options, "period_select", $period,"javascript: $('#text-period').val($('#period_select').val());");
-//print_input_text ("period", $period, '', 10);
+html_print_extended_select_for_time($options, 'period', $period, '', '', 0, 7);
+//html_print_select ($options, "period_select", $period,"javascript: $('#text-period').val($('#period_select').val());");
+//html_print_input_text ("period", $period, '', 10);
 echo ' '.__('secs.');
 echo '</td></tr><tr><td>'.__('Show events').'</td><td>';
 
-print_checkbox ("draw_events", 1, (bool) $draw_events);
+html_print_checkbox ("draw_events", 1, (bool) $draw_events);
 
 echo '</td></tr><tr><td>'.__('Show alerts').'</td><td>';
 
-print_checkbox ("draw_alerts", 1, (bool) $draw_alerts);
+html_print_checkbox ("draw_alerts", 1, (bool) $draw_alerts);
 
 if ($config['enterprise_installed'] && $graph_type == "sparse") {
 	echo '</td></tr><tr><td>'.__('Draw baseline').'</td><td>';
-	print_checkbox ("baseline", 1, (bool) $baseline);
+	html_print_checkbox ("baseline", 1, (bool) $baseline);
 }
 
 echo '</td><td>';
 
-print_submit_button ('GO', "submit", false, 'class="sub next"');
+html_print_submit_button ('GO', "submit", false, 'class="sub next"');
 
 echo '</td></tr></table></form></div></body></html>';
 ?>
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 2300ef5dcd..5de33793c4 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -50,7 +50,7 @@ echo '<table cellspacing="4" cellpadding="4" width="750" class="databox">';
 echo '<tr><td valign="middle">'.__('Group').'</td>';
 echo '<td valign="middle">';
 
-print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();',
+html_print_select_groups(false, "AR", true, "ag_group", $ag_group, 'this.form.submit();',
 	'', '0', false, false, false, 'w130', false, 'width:150px;');
 
 echo "</td>";
@@ -64,12 +64,12 @@ $fields[3] = __('Unknown');
 $fields[4] = __('Not normal'); //default
 $fields[5] = __('Not init');
 
-print_select ($fields, "status", $status, 'this.form.submit();', __('All'), -1, false, false, true, '', false, 'width: 125px;');
+html_print_select ($fields, "status", $status, 'this.form.submit();', __('All'), -1, false, false, true, '', false, 'width: 125px;');
 echo '</td>';
 
 echo '<td valign="middle">'.__('Module group').'</td>';
 echo '<td valign="middle">';
-print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
+html_print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
 	'modulegroup', $modulegroup, 'this.form.submit();',__('All'), 0, false, false, true, false, 'width: 100px;');
 
 echo '</td></tr><tr><td valign="middle">'.__('Module name').'</td>';
@@ -188,16 +188,16 @@ switch ($config["dbtype"]) {
 
 $modules = db_get_all_rows_sql($sql);
 
-print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
+html_print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
 	$ag_modulename, 'this.form.submit();', __('All'), '', false, false, true, '', false, 'width: 150px;');
 
 echo '</td><td valign="middle" align="right">'.__('Search').'</td>';
 
 echo '<td valign="middle">';
-print_input_text ("ag_freestring", $ag_freestring, '', 20,30, false);
+html_print_input_text ("ag_freestring", $ag_freestring, '', 20,30, false);
 
 echo '</td><td valign="middle">';
-print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"');
+html_print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"');
 
 echo "</td><tr>";
 echo "</table>";
@@ -409,7 +409,7 @@ foreach ($result as $row) {
 			}
 				
 			$data[0] = '<a href="?sec=gpolicies&amp;sec2=enterprise/godmode/policies/policies&amp;id=' . $policyInfo['id_policy'] . '">' . 
-				print_image($img,true, array('title' => $title)) .
+				html_print_image($img,true, array('title' => $title)) .
 				'</a>';
 		}
 	}
@@ -418,7 +418,7 @@ foreach ($result as $row) {
 	$data[1] .= substr ($row["agent_name"], 0, 25);
 	$data[1] .= '</a></strong>';
 	
-	$data[2] = print_image("images/" . show_icon_type ($row["module_type"]), true); 
+	$data[2] = html_print_image("images/" . show_icon_type ($row["module_type"]), true); 
 	
 	$data[3] = mb_strimwidth (safe_output($row["module_name"]), 0, 30);
 
@@ -464,8 +464,8 @@ foreach ($result as $row) {
 
 		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$row["id_agente_modulo"]."&label=".base64_encode($row["module_name"])."&refresh=600','day_".$win_handle."')";
 
-		$data[6] = '<a href="javascript:'.$link.'">' . print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) .  '</a>';
-		$data[6] .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$row["id_agent"]."&amp;tab=data_view&period=86400&amp;id=".$row["id_agente_modulo"]."'>" . print_image('images/binary.png', true, array("style" => '0', "alt" => '')) . "</a>";
+		$data[6] = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) .  '</a>';
+		$data[6] .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$row["id_agent"]."&amp;tab=data_view&period=86400&amp;id=".$row["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("style" => '0', "alt" => '')) . "</a>";
 	}
 
 	if (is_numeric($row["datos"]))
@@ -488,7 +488,7 @@ foreach ($result as $row) {
 	array_push ($table->data, $data);
 }
 if (!empty ($table->data)) {
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo '<div class="nf">'.__('This group doesn\'t have any monitor').'</div>';
 }
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index 1a98d485d0..e737291fbb 100644
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -109,7 +109,7 @@ $table->style[7] = "padding-top:4px; padding-bottom:4px;";
 $table->data[7][0] =
 	progress_bar2($data["alert_level"], 140, 20, $data["alert_level"].'% '.__('of defined alerts not fired'), 0);
 	
-print_table ($table);
+html_print_table ($table);
 unset ($table);
 
 echo '<table class="databox" cellpadding="4" cellspacing="4" width="100%">';
@@ -291,7 +291,7 @@ if($is_admin) {
 	}
 
 	if (!empty ($table->data)) {
-		print_table ($table);
+		html_print_table ($table);
 	} else {
 		echo '<div class="nf">'.__('There are no servers configured in the database').'</div>';
 	}
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index ed6225102b..24ba962bbe 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -205,8 +205,8 @@ if (is_ajax ()) {
 		echo '<h3>'.$agent['nombre'].'</h3>';
 		echo '<strong>'.__('Main IP').':</strong> '.$agent['direccion'].'<br />';
 		echo '<strong>'.__('Group').':</strong> ';
-		echo print_image('images/groups_small/'.get_group_icon ($agent['id_grupo']).'.png', true); 
-		echo get_group_name ($agent['id_grupo']).'<br />';
+		echo html_print_image('images/groups_small/'.groups_get_icon ($agent['id_grupo']).'.png', true); 
+		echo groups_get_name ($agent['id_grupo']).'<br />';
 
 		echo '<strong>'.__('Last contact').':</strong> '.human_time_comparation($agent['ultimo_contacto']).'<br />';
 		echo '<strong>'.__('Last remote contact').':</strong> '.human_time_comparation($agent['ultimo_contacto_remoto']).'<br />';
@@ -281,12 +281,12 @@ if (is_ajax ()) {
 		$id_module = (int) get_parameter ('id_module');
 		$module = db_get_row ('tagente_modulo', 'id_agente_modulo', $id_module);
 		echo '<h3>';
-		echo print_image("images/brick.png", true) . '&nbsp;'; 
+		echo html_print_image("images/brick.png", true) . '&nbsp;'; 
 		echo ui_print_truncate_text($module['nombre'],25,false,true,false).'</h3>';
 		echo '<strong>'.__('Type').':</strong> ';
 		$agentmoduletype = get_agentmodule_type ($module['id_agente_modulo']);
 		echo get_moduletype_name ($agentmoduletype).'&nbsp;';
-		echo print_image("images/" . get_module_type_icon ($agentmoduletype), true) . '<br />';
+		echo html_print_image("images/" . get_module_type_icon ($agentmoduletype), true) . '<br />';
 		echo '<strong>'.__('Module group').':</strong> ';
 		$modulegroup =  get_modulegroup_name (get_agentmodule_modulegroup ($module['id_agente_modulo']));
 		if($modulegroup === false){
@@ -304,7 +304,7 @@ if (is_ajax ()) {
 	if ($get_group_status_tooltip) {
 		$id_group = (int) get_parameter ('id_group');
 		$group = db_get_row ('tgrupo', 'id_grupo', $id_group);
-		echo '<h3>' . print_image("images/groups_small/" . get_group_icon ($group['id_grupo']) . ".png", true);
+		echo '<h3>' . html_print_image("images/groups_small/" . groups_get_icon ($group['id_grupo']) . ".png", true);
 		echo ui_print_truncate_text($group['nombre'],25,false,true,false).'</h3>';
 		echo '<strong>'.__('Parent').':</strong> ';
 		if($group['parent'] == 0) {
@@ -312,7 +312,7 @@ if (is_ajax ()) {
 		}
 		else {
 			$group_parent = db_get_row ('tgrupo', 'id_grupo', $group['parent']);
-			echo print_image("images/groups_small/" . get_group_icon ($group['parent']) . ".png", true); 
+			echo html_print_image("images/groups_small/" . groups_get_icon ($group['parent']) . ".png", true); 
 			echo $group_parent['nombre'].'<br />';
 		}
 		echo '<strong>'.__('Sons').':</strong> ';
@@ -323,7 +323,7 @@ if (is_ajax ()) {
 		else{
 			echo '<br /><br />';
 			foreach($groups_sons as $group_son) {
-				echo print_image("images/groups_small/" . get_group_icon ($group_son['id_grupo']) . ".png", true);
+				echo html_print_image("images/groups_small/" . groups_get_icon ($group_son['id_grupo']) . ".png", true);
 				echo $group_son['nombre'].'<br />';
 			}
 		}
@@ -367,7 +367,7 @@ if ($flag_agent !== ''){
 }
 
 if ($agent["icon_path"]) {
-	$icon = get_agent_icon_map($agent["id_agente"], true);
+	$icon = gis_get_agent_icon_map($agent["id_agente"], true);
 }
 else {
 	$icon = 'images/bricks.png';
@@ -382,7 +382,7 @@ $managetab = "";
 
 if (check_acl ($config['id_user'],$id_grupo, "AW")) {
 	$managetab['text'] ='<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'">'
-		. print_image("images/setup.png", true, array ("title" => __('Manage')))
+		. html_print_image("images/setup.png", true, array ("title" => __('Manage')))
 		. '</a>';
 
 	if ($tab == 'manage')
@@ -393,7 +393,7 @@ if (check_acl ($config['id_user'],$id_grupo, "AW")) {
 
 /* Main tab */
 $maintab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'">'
-		. print_image("images/monitor.png", true, array("title" => __('Main')))
+		. html_print_image("images/monitor.png", true, array("title" => __('Main')))
 		. '</a>';
 		
 if ($tab == 'main')
@@ -403,7 +403,7 @@ else
 	
 /* Data */
 $datatab['text']= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&tab=data">'
-	. print_image("images/lightbulb.png", true, array("title" => __('Data')))
+	. html_print_image("images/lightbulb.png", true, array("title" => __('Data')))
 	. '</a>';
 
 if (($tab == 'data') OR ($tab == 'data_view'))
@@ -413,7 +413,7 @@ else
 
 /* Alert tab */
 $alerttab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&tab=alert">'
-		. print_image("images/bell.png", true, array("title" => __('Alerts')))
+		. html_print_image("images/bell.png", true, array("title" => __('Alerts')))
 		. '</a>';
 		
 if ($tab == 'alert')
@@ -423,7 +423,7 @@ else
 	
 /* SLA view */
 $slatab['text']= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=sla&id_agente='.$id_agente.'">'
-		. print_image("images/images.png", true, array("title" => __('S.L.A.')))
+		. html_print_image("images/images.png", true, array("title" => __('S.L.A.')))
 		. '</a>';
 
 if ($tab == 'sla') {
@@ -453,7 +453,7 @@ if ($policyTab == -1)
 /* Group tab */
 
 $grouptab['text']= '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id='.$id_grupo.'">'
-	. print_image("images/agents_group.png", true, array( "title" =>  __('Group')))
+	. html_print_image("images/agents_group.png", true, array( "title" =>  __('Group')))
 	. '</a>';
 	
 $grouptab['active']=false;
@@ -463,7 +463,7 @@ $gistab="";
 if ($config['activate_gis']) {
 	
 	$gistab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente='.$id_agente.'">'
-		.print_image("images/world.png", true, array( "title" => __('GIS data')))
+		.html_print_image("images/world.png", true, array( "title" => __('GIS data')))
 		.'</a>';
 	
 	if ($tab == 'gis')
@@ -473,7 +473,7 @@ if ($config['activate_gis']) {
 }
 
 $custom_fields['text']= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=custom_fields&id_agente='.$id_agente.'">'
-		. print_image("images/note.png", true, array("title" => __('Custom fields')))
+		. html_print_image("images/note.png", true, array("title" => __('Custom fields')))
 		. '</a>';
 
 if ($tab == 'custom_fields') {
@@ -484,7 +484,7 @@ else {
 }
 
 $graphs['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=graphs&id_agente='.$id_agente.'">'
-		. print_image("images/chart_curve.png", true, array("title" => __('Graphs')))
+		. html_print_image("images/chart_curve.png", true, array("title" => __('Graphs')))
 		. '</a>';
 if ($tab == 'graphs') {
 	$graphs['active'] = true;
@@ -516,7 +516,7 @@ foreach($config['extensions'] as $extension) {
 		
 		$url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=extension&id_agente='.$id_agente . '&id_extension=' . $id;
 		
-		$extension_tab = array('text' => '<a href="' . $url .'">' . print_image ($image, true, array ( "title" => $name)) . '</a>', 'active' => $active);
+		$extension_tab = array('text' => '<a href="' . $url .'">' . html_print_image ($image, true, array ( "title" => $name)) . '</a>', 'active' => $active);
 		
 		$onheader = $onheader + array($id => $extension_tab);	
 	}
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 6c81a88fde..3270e09648 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -188,20 +188,20 @@ if ($config["pure"] == 0) {
 	$buttons = array(
 		'fullscreen' => array('active' => false,
 			'text' => '<a href="'.$url.'&amp;pure=1">' . 
-				print_image("images/fullscreen.png", true, array ("title" => __('Full screen'))) .'</a>'),
+				html_print_image("images/fullscreen.png", true, array ("title" => __('Full screen'))) .'</a>'),
 		'rss' => array('active' => false,
 			'text' => '<a href="operation/events/events_rss.php?user=' . $config['id_user'] . '&hashup=' . $hashup . 
 				'&text_agent=' . $text_agent . '&ev_group='.$ev_group.'&amp;event_type='.$event_type.'&amp;search='.rawurlencode ($search).'&amp;severity='.$severity.'&amp;status='.$status.'&amp;event_view_hr='.$event_view_hr.'&amp;id_agent='.$id_agent.'">' . 
-				print_image("images/rss.png", true, array ("title" => __('RSS Events'))) .'</a>'),
+				html_print_image("images/rss.png", true, array ("title" => __('RSS Events'))) .'</a>'),
 		'marquee' => array('active' => false,
 			'text' => '<a href="operation/events/events_marquee.php">' . 
-				print_image("images/heart.png", true, array ("title" => __('Marquee display'))) .'</a>'),
+				html_print_image("images/heart.png", true, array ("title" => __('Marquee display'))) .'</a>'),
 		'csv' => array('active' => false,
 			'text' => '<a href="operation/events/export_csv.php?ev_group=' . $ev_group . 
 				'&text_agent=' . $text_agent . '&amp;event_type='.$event_type.'&amp;search='.rawurlencode ($search).'&amp;severity='.$severity.'&amp;status='.$status.'&amp;event_view_hr='.$event_view_hr.'&amp;id_agent='.$id_agent.'">' . 
-				print_image("images/disk.png", true, array ("title" => __('Export to CSV file'))) .'</a>'),
+				html_print_image("images/disk.png", true, array ("title" => __('Export to CSV file'))) .'</a>'),
 		'sound_event' => array('active' => false,
-			'text' => '<a href="javascript: openSoundEventWindow();">' . print_image('images/music_note.png', true, array('title' => __('Sound events'))) . '</a>')
+			'text' => '<a href="javascript: openSoundEventWindow();">' . html_print_image('images/music_note.png', true, array('title' => __('Sound events'))) . '</a>')
 		);
 	
 	ui_print_page_header (__("Events"), "images/lightning_go.png", false, "eventview", false, $buttons);
@@ -223,7 +223,7 @@ else {
 	echo "&nbsp;";
 
 	echo '<a target="_top" href="'.$url.'&amp;pure=0">';
-	print_image ("images/normalscreen.png", false, array ("title" => __('Back to normal mode')));
+	html_print_image ("images/normalscreen.png", false, array ("title" => __('Back to normal mode')));
 	echo '</a>';
 	echo "</h2>";
 }
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 16457030c5..da08fda4bc 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -140,7 +140,7 @@ $url = "index.php?sec=eventos&amp;sec2=operation/events/events&amp;search=" .
 	$event_view_hr . "&amp;id_user_ack=" . $id_user_ack . "&amp;offset=" . $offset;
 
 //Link to toggle filter
-echo '<a href="#" id="tgl_event_control"><b>'.__('Event control filter').'</b>&nbsp;'.print_image ("images/down.png", true, array ("title" => __('Toggle filter(s)'))).'</a><br><br>';
+echo '<a href="#" id="tgl_event_control"><b>'.__('Event control filter').'</b>&nbsp;'.html_print_image ("images/down.png", true, array ("title" => __('Toggle filter(s)'))).'</a><br><br>';
 
 //Start div
 echo '<div id="event_control" style="display:none">';
@@ -151,7 +151,7 @@ echo '<table style="float:left;" width="550" cellpadding="4" cellspacing="4" cla
 
 // Group combo
 echo "<td>".__('Group')."</td><td>";
-print_select_groups($config["id_user"], "IR", true, 'ev_group', $ev_group, '', '', 0, false, false, false, 'w130');
+html_print_select_groups($config["id_user"], "IR", true, 'ev_group', $ev_group, '', '', 0, false, false, false, 'w130');
 echo "</td>";
 
 // Event type
@@ -159,14 +159,14 @@ echo "<td>".__('Event type')."</td><td>";
 $types = get_event_types ();
 // Expand standard array to add not_normal (not exist in the array, used only for searches)
 $types["not_normal"] = __("Not normal");
-print_select ($types, 'event_type', $event_type, '', __('All'), '');
+html_print_select ($types, 'event_type', $event_type, '', __('All'), '');
 
 
 echo "</td></tr><tr>";
 
 // Severity
 echo "<td>".__('Severity')."</td><td>";
-print_select (get_priorities (), "severity", $severity, '', __('All'), '-1');
+html_print_select (get_priorities (), "severity", $severity, '', __('All'), '-1');
 echo '</td>';
 
 // Status
@@ -178,19 +178,19 @@ $fields[1] = __('Only validated');
 $fields[2] = __('Only in process');
 $fields[3] = __('Only not validated');
 
-print_select ($fields, 'status', $status, '', '', '');
+html_print_select ($fields, 'status', $status, '', '', '');
 
 //NEW LINE
 echo "</td></tr><tr>";
 
 // Free search
 echo "<td>".__('Free search')."</td><td>";
-print_input_text ('search', $search, '', 15);
+html_print_input_text ('search', $search, '', 15);
 echo '</td>';
 
 //Agent search
 echo "<td>".__('Agent search')."</td><td>";
-print_input_text_extended ('text_agent', $text_agent, 'text_id_agent', '', 30, 100, false, '',
+html_print_input_text_extended ('text_agent', $text_agent, 'text_id_agent', '', 30, 100, false, '',
 array('style' => 'background: url(images/lightning.png) no-repeat right;'))
 . '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
 
@@ -208,12 +208,12 @@ $lpagination[200] = 200;
 $lpagination[500] = 500;
 
 echo "<td>";
-print_select ($lpagination, "pagination", $pagination, '', __('Default'), $config["block_size"]);
+html_print_select ($lpagination, "pagination", $pagination, '', __('Default'), $config["block_size"]);
 echo "</td>";
 
 echo "<td>".__('Max. hours old')."</td>";
 echo "<td>";
-print_input_text ('event_view_hr', $event_view_hr, '', 5);
+html_print_input_text ('event_view_hr', $event_view_hr, '', 5);
 echo "</td>";
 
 
@@ -221,7 +221,7 @@ echo "</tr><tr>";
 echo "<td>".__('User ack.')."</td>";
 echo "<td>";
 $users = get_users_info ();
-print_select ($users, "id_user_ack", $id_user_ack, '', __('Any'), 0);
+html_print_select ($users, "id_user_ack", $id_user_ack, '', __('Any'), 0);
 echo "</td>";
 
 echo "<td>";
@@ -230,12 +230,12 @@ echo "</td><td>";
 
 $repeated_sel[0] = __("All events");
 $repeated_sel[1] = __("Group events");
-print_select ($repeated_sel, "group_rep", $group_rep, '');
+html_print_select ($repeated_sel, "group_rep", $group_rep, '');
 echo "</td></tr>";
 
 echo '<tr><td colspan="4" style="text-align:right">';
 //The buttons
-print_submit_button (__('Update'), '', false, 'class="sub upd"');
+html_print_submit_button (__('Update'), '', false, 'class="sub upd"');
 
 echo "</td></tr></table></form>"; //This is the filter div
 echo '<div style="width:220px; float:left;">';
@@ -352,7 +352,7 @@ $table->head[4] = __('Action');
 $table->align[4] = 'center';
 $table->size[4] = '80px';
 
-$table->head[5] = print_checkbox ("allbox", "1", false, true);
+$table->head[5] = html_print_checkbox ("allbox", "1", false, true);
 $table->align[5] = 'center';
 
 $idx = 0;
@@ -379,7 +379,7 @@ foreach ($result as $event) {
 			break;
 	}
 
-	$data[0] = print_image ($img_st, true, 
+	$data[0] = html_print_image ($img_st, true, 
 		array ("class" => "image_status",
 			"width" => 16,
 			"height" => 16,
@@ -440,44 +440,44 @@ foreach ($result as $event) {
 	// Validate event
 	if (($event["estado"] != 1) and (check_acl ($config["id_user"], $event["id_grupo"], "IW") == 1)) {
 		$data[4] .= '<a href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">';
-		$data[4] .= print_image ("images/ok.png", true,
+		$data[4] .= html_print_image ("images/ok.png", true,
 			array ("title" => __('Validate event')));
 		$data[4] .= '</a>&nbsp;';
 	}
 	else {
-		$data[4] .= print_image ("images/tick.png", true,
+		$data[4] .= html_print_image ("images/tick.png", true,
 			array ("title" => __('Event validated'))).'&nbsp;';
 	}
 	// Delete event
 	if (check_acl ($config["id_user"], $event["id_grupo"], "IM") == 1) {
 		if($event['estado'] != 2) {
 			$data[4] .= '<a class="delete_event" href="#"  onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;" id="delete-'.$event['id_evento'].'">';
-			$data[4] .= print_image ("images/cross.png", true,
+			$data[4] .= html_print_image ("images/cross.png", true,
 				array ("title" => __('Delete event')));
 			$data[4] .= '</a>&nbsp;';
 		}
 		else {
-			$data[4] .= print_image ("images/cross.disabled.png", true,
+			$data[4] .= html_print_image ("images/cross.disabled.png", true,
 				array ("title" => __('Is not allowed delete events in process'))).'&nbsp;';
 		}
 	}
 	
 	$data[4] .= '<a href="javascript: toggleVisibleExtendedInfo(' . $event["id_evento"] . ');">';
-	$data[4] .= print_image ("images/eye.png", true,
+	$data[4] .= html_print_image ("images/eye.png", true,
 			array ("title" => __('Show more')));	
 	$data[4] .= '</a>&nbsp;';
 	
 	// Create incident from this event
 	if (check_acl ($config["id_user"], $event["id_grupo"], "IW") == 1) {
 		$data[4] .= '<a href="index.php?sec=incidencias&amp;sec2=operation/incidents/incident_detail&amp;insert_form&amp;from_event='.$event["id_evento"].'">';
-		$data[4] .= print_image ("images/page_lightning.png", true,
+		$data[4] .= html_print_image ("images/page_lightning.png", true,
 			array ("title" => __('Create incident from event')));
 		$data[4] .= '</a>';
 	}
 	
 	//Checkbox
 	if($event["estado"] != 1) {
-		$data[5] = print_checkbox_extended ("eventid[]", $event["id_evento"], false, false, false, 'class="chk"', true);
+		$data[5] = html_print_checkbox_extended ("eventid[]", $event["id_evento"], false, false, false, 'class="chk"', true);
 	}
 	else {
 		$data[5] = '';
@@ -488,22 +488,22 @@ foreach ($result as $event) {
 	$string = '';//$string = '<form method="post" action="'.$url.'&amp;section=list">';
 	$string .= '<table border="0" style="width:80%; margin-left: 10%;"><tr><td align="left" valign="top" width="30px">';
 	$string .=  '<td align="right"><b>' . __('Comment:') . '</b></td>';
-	$string .=  '<td align="left" width="450px"><b>' . print_textarea("comment_".$event["id_evento"], 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . '</b></td>';
+	$string .=  '<td align="left" width="450px"><b>' . html_print_textarea("comment_".$event["id_evento"], 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . '</b></td>';
 	$string .= '<td align="left" width="200px">'; 
 	$string .= '<div style="text-align:center;">';
 	if($event["estado"] == 0) {
-		$string .= print_select(array('1' => __('Validate'), '2' => __('Set in process')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
+		$string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
 	}
 	$string .= '<a class="validate_event" href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">';
 	if($event["estado"] == 2) {
-		$string .= print_button (__('Validate'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
+		$string .= html_print_button (__('Validate'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
 	}else {
-		$string .= print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
+		$string .= html_print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
 	}
 	$string .= '</a>';
 	$string .= '</td><td width="400px">';
 	if($event["id_alert_am"] != 0) {
-		$string .= '<div class="standby_alert_checkbox" style="display: none">'.__('Set alert on standby').'<br>'.print_checkbox('standby-alert-'.$event["id_evento"], 'ff2', false, true).'</div>';
+		$string .= '<div class="standby_alert_checkbox" style="display: none">'.__('Set alert on standby').'<br>'.html_print_checkbox('standby-alert-'.$event["id_evento"], 'ff2', false, true).'</div>';
 	}
 	$string .= '</td></tr></table>'; //</form>';	
 	
@@ -524,7 +524,7 @@ foreach ($result as $event) {
 	$string .= '</td></tr><tr>';
 	$string .= '<td align="left" valign="top" width="15%">';
 	$string .= '<b>' . __('Severity') . ':</b></td><td align="left">';
-	$string .= print_image ($img_sev, true, 
+	$string .= html_print_image ($img_sev, true, 
 		array ("class" => "image_status",
 			"width" => 12,
 			"height" => 12,
@@ -555,11 +555,11 @@ foreach ($result as $event) {
 		$string .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$event["id_agente"].'&amp;tab=alert">';
 		$standby = db_get_value('standby', 'talert_template_modules', 'id', $event["id_alert_am"]);
 		if(!$standby) {
-			$string .= print_image ("images/bell.png", true,
+			$string .= html_print_image ("images/bell.png", true,
 				array ("title" => __('Go to data overview')));
 		}
 		else {
-			$string .= print_image ("images/bell_pause.png", true,
+			$string .= html_print_image ("images/bell_pause.png", true,
 				array ("title" => __('Go to data overview')));
 		}
 		
@@ -579,7 +579,7 @@ foreach ($result as $event) {
 	$string .= '<td align="left" valign="top" width="15%">';
 	$string .= '<b>' . __('Group') . ':</b></td><td align="left">';
 	$string .= ui_print_group_icon ($event["id_grupo"], true);
-	$string .= ' '. get_group_name ($event["id_grupo"], true);
+	$string .= ' '. groups_get_name ($event["id_grupo"], true);
 	$string .= '</td></tr><tr>';
 	$string .= '<td align="left" valign="top" width="15%">';
 	if ($group_rep == 0) {
@@ -634,15 +634,15 @@ if (!empty ($table->data)) {
 	echo '<form method="post" id="form_events" action="'.$url.'&amp;section=validate">';
 	echo "<input type='hidden' name='delete' id='hidden_delete_events' value='0' />";
 
-	print_table ($table);
+	html_print_table ($table);
 
 	echo '<div style="width:'.$table->width.';" class="action-buttons">';
 	if (check_acl ($config["id_user"], 0, "IW") == 1) {
-		print_submit_button (__('Change status'), 'validate_btn', false, 'class="sub ok"');
+		html_print_submit_button (__('Change status'), 'validate_btn', false, 'class="sub ok"');
 	}
 	if (check_acl ($config["id_user"], 0,"IM") == 1) {
 
-		print_button(__('Delete'), 'delete_button', false, 'submit_delete();', 'class="sub delete"');
+		html_print_button(__('Delete'), 'delete_button', false, 'submit_delete();', 'class="sub delete"');
 		?>
 		<script type="text/javascript">
 		function submit_delete() {
diff --git a/pandora_console/operation/events/events_validate.php b/pandora_console/operation/events/events_validate.php
index 2689b5b536..4c57b76684 100644
--- a/pandora_console/operation/events/events_validate.php
+++ b/pandora_console/operation/events/events_validate.php
@@ -73,7 +73,7 @@ foreach($ids as $key => $id) {
 			break;
 	}
 
-	$icon = print_image ($img_st, true, 
+	$icon = html_print_image ($img_st, true, 
 		array ("class" => "image_status",
 			"width" => 16,
 			"height" => 16,
@@ -94,24 +94,24 @@ foreach($ids as $key => $id) {
 $string = '<form  method="post" action="'.$url_val.'">';
 $string .= '<table border="0" style="width:80%; margin-left: 10%;"><tr><td align="left" valign="top" width="30px">';
 $string .=  '<td align="right"><b>' . __('Comment:') . '</b></td>';
-$string .= print_input_hidden('eventid', implode(',',$ids), true);
-$string .=  '<td align="left" width="450px"><b>' . print_textarea("comment", 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . '</b></td>';
+$string .= html_print_input_hidden('eventid', implode(',',$ids), true);
+$string .=  '<td align="left" width="450px"><b>' . html_print_textarea("comment", 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . '</b></td>';
 $string .= '<td align="left" width="200px">'; 
 $string .= '<div style="text-align:center;">';
 if(!$any_inprocess) {
-	$string .= print_select(array('1' => __('Validate'), '2' => __('Set in process')), 'select_validate', '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
-	$string .= print_submit_button (__('Change status'), 'validate', false, 'class="sub ok validate_event" id="validate"', true).'</div>';
+	$string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process')), 'select_validate', '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
+	$string .= html_print_submit_button (__('Change status'), 'validate', false, 'class="sub ok validate_event" id="validate"', true).'</div>';
 }else {
-	$string .= print_submit_button (__('Validate'), 'validate', false, 'class="sub ok validate_event" id="validate"', true).'</div>';
+	$string .= html_print_submit_button (__('Validate'), 'validate', false, 'class="sub ok validate_event" id="validate"', true).'</div>';
 }
 $string .= '</td><td width="400px">';
 if($any_alert) {
-	$string .= '<div class="standby_alert_checkbox" style="display: none">'.__('Set alert on standby').'<br>'.print_checkbox('standby-alert', 'ff2', false, true).'</div>';
+	$string .= '<div class="standby_alert_checkbox" style="display: none">'.__('Set alert on standby').'<br>'.html_print_checkbox('standby-alert', 'ff2', false, true).'</div>';
 }
 $string .= '</td></tr></table></form>';	
 
 echo $string;
 
-print_table($table);
+html_print_table($table);
 
 ?>
diff --git a/pandora_console/operation/events/export_csv.php b/pandora_console/operation/events/export_csv.php
index ac5b135cef..ed36c540c2 100644
--- a/pandora_console/operation/events/export_csv.php
+++ b/pandora_console/operation/events/export_csv.php
@@ -114,7 +114,7 @@ while ($event = db_get_all_row_by_steps_sql($new, $result, $sql)) {
 	echo ",";
 	echo get_agent_name($event["id_agente"]);
 	echo ",";
-	echo get_group_name($event["id_grupo"]);
+	echo groups_get_name($event["id_grupo"]);
 	echo ",";
 	echo $event["evento"];
 	echo ",";
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 1018957f98..d4b19b2a85 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -62,7 +62,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
 echo "</head>";
 echo "<body>";
 
-echo "<h1 style='background: #66AA44; color: #fff;'>" . print_image('images/pandora_header_logo.png', true) . __("Sound Events") . "</h1>";
+echo "<h1 style='background: #66AA44; color: #fff;'>" . html_print_image('images/pandora_header_logo.png', true) . __("Sound Events") . "</h1>";
 
 $table = null;
 $table->width = '100%';
@@ -72,16 +72,16 @@ $table->size[1] = '90%';
 $table->style[0] = 'font-weight: bold; vertical-align: top;';
 
 $table->data[0][0] = __('Group');
-$table->data[0][1] = print_select_groups(false, "AR", true, 'group', '', 'changeGroup();', '', 0, true);
+$table->data[0][1] = html_print_select_groups(false, "AR", true, 'group', '', 'changeGroup();', '', 0, true);
 $table->data[1][0] = __('Type');
-$table->data[1][1] = print_checkbox('alert_fired', 'alert_fired', true, true, false, 'changeType();') . __('Alert fired') . '<br />' .
-	print_checkbox('critical', 'critical', true, true, false, 'changeType();') . __('Monitor critical') . '<br />' .
-	print_checkbox('warning', 'warning', true, true, false, 'changeType();') . __('Monitor warning') . '<br />' .
+$table->data[1][1] = html_print_checkbox('alert_fired', 'alert_fired', true, true, false, 'changeType();') . __('Alert fired') . '<br />' .
+	html_print_checkbox('critical', 'critical', true, true, false, 'changeType();') . __('Monitor critical') . '<br />' .
+	html_print_checkbox('warning', 'warning', true, true, false, 'changeType();') . __('Monitor warning') . '<br />' .
 $table->data[2][0] = '';
-$table->data[2][1] = '<a href="javascript: toggleButton();">' . print_image("images/play.button.png", true, array("id" => "button")) . '</a>';
-$table->data[2][1] .= '<a href="javascript: ok();">' . print_image("images/ok.button.png", true, array("style" => "margin-left: 10px;")) . '</a>';
+$table->data[2][1] = '<a href="javascript: toggleButton();">' . html_print_image("images/play.button.png", true, array("id" => "button")) . '</a>';
+$table->data[2][1] .= '<a href="javascript: ok();">' . html_print_image("images/ok.button.png", true, array("style" => "margin-left: 10px;")) . '</a>';
 
-print_table($table);
+html_print_table($table);
 ?>
 <script src="../../include/javascript/jquery.js" type="text/javascript"></script>
 <script type="text/javascript">
diff --git a/pandora_console/operation/extensions.php b/pandora_console/operation/extensions.php
index 51c8ba50ab..a6be0acbd5 100644
--- a/pandora_console/operation/extensions.php
+++ b/pandora_console/operation/extensions.php
@@ -67,5 +67,5 @@ foreach ($config['extensions'] as $extension) {
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 ?>
diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php
index ed71243627..c0058ad6c6 100644
--- a/pandora_console/operation/gis_maps/ajax.php
+++ b/pandora_console/operation/gis_maps/ajax.php
@@ -114,7 +114,7 @@ switch ($opt) {
 			$status = get_agent_status($row['tagente_id_agente']);
 			
 			$agents[$row['tagente_id_agente']] = array(
-				'icon_path' => get_agent_icon_map($row['tagente_id_agente'], true, $status),
+				'icon_path' => gis_get_agent_icon_map($row['tagente_id_agente'], true, $status),
 				'name' => $row['nombre'],
 				'status' => $status,
 				'stored_longitude' => $row['stored_longitude'],
@@ -145,7 +145,7 @@ switch ($opt) {
 	case 'point_agent_info':
 		$id = get_parameter('id');
 		$row = db_get_row_sql('SELECT * FROM tagente WHERE id_agente = ' . $id);
-		$agentDataGIS =  getDataLastPositionAgent($row['id_agente']);
+		$agentDataGIS =  gis_get_data_last_position_agent($row['id_agente']);
 		
 		$returnJSON = array();
 		$returnJSON['correct'] = 1;
@@ -177,7 +177,7 @@ switch ($opt) {
 		if ($agent_description || $agent_description != '') {
 			$returnJSON['content'] .= __('Description').': '.$agent_description.'<br />';
 		}
-		$returnJSON['content'] .= __('Group').': ' . ui_print_group_icon ($row["id_grupo"], true).'&nbsp;(<strong>'.get_group_name ($row["id_grupo"]).'</strong>)<br />';
+		$returnJSON['content'] .= __('Group').': ' . ui_print_group_icon ($row["id_grupo"], true).'&nbsp;(<strong>'.groups_get_name ($row["id_grupo"]).'</strong>)<br />';
 		$returnJSON['content'] .= __('Agent Version').': '.$row["agent_version"].'<br />';
 		$returnJSON['content'] .= __('Last contact') . ": ";
 		if ($row["ultimo_contacto_remoto"] == "0000-00-00 00:00:00") {
diff --git a/pandora_console/operation/gis_maps/index.php b/pandora_console/operation/gis_maps/index.php
index e08547a0c4..10ef050a63 100644
--- a/pandora_console/operation/gis_maps/index.php
+++ b/pandora_console/operation/gis_maps/index.php
@@ -25,7 +25,7 @@ ui_require_javascript_file('openlayers.pandora');
 
 ui_print_page_header(__('GIS Maps')." &raquo; ".__('Summary'), "images/server_web.png", false, "");
 
-$maps = getMaps();
+$maps = gis_get_maps();
 
 $table->width = "70%";
 $table->data = array ();
@@ -61,7 +61,7 @@ if ($maps !== false) {
 }
 
 if (!empty ($table->data)) {
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo '<div class="nf">'.__('No maps found').'</div>';
 }
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 276e9d4974..4afa765232 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -27,7 +27,7 @@ $idMap = (int) get_parameter ('map_id');
 $show_history = get_parameter ('show_history', 'n');
 
 $map = db_get_row ('tgis_map', 'id_tgis_map', $idMap);
-$confMap = getMapConf($idMap);
+$confMap = gis_get_map_conf($idMap);
 
 if (! check_acl ($config['id_user'], $map['group_id'], "IR")) {
 	db_pandora_audit("ACL Violation", "Trying to access map builder");
@@ -80,7 +80,7 @@ if ($gmap_layer === true) {
 
 $controls = array('PanZoomBar', 'ScaleLine', 'Navigation', 'MousePosition', 'layerSwitcher');
 
-$layers = getLayers($idMap);
+$layers = gis_get_layers($idMap);
 
 // Render map
 
@@ -88,17 +88,17 @@ $buttons = array();
 
 if ($config["pure"] == 0) {
 	$buttons[] = '<a href="index.php?sec=visualc&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'&amp;pure=1">' .
-		print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) . "</a>";
+		html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) . "</a>";
 }
 else {
 	$buttons[] = '<a href="index.php?sec=visualc&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'">' . 
-		print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . "</a>";
+		html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . "</a>";
 }
 
 if (check_acl ($config["id_user"], $map['group_id'], "IW"))
-	$buttons [] = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&action=edit_map&map_id='. $idMap.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
+	$buttons [] = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&action=edit_map&map_id='. $idMap.'">'.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
 	
-$buttonsString = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3">' . print_image("images/bricks.png", true, array("class" => "top", "border" => '0')) . '&nbsp; Agent&nbsp;-&nbsp;test_gis1</a></li></ul></div><div id="menu_tab"><ul class="mn"><li class="nomn"><a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente=3">' . print_image("images/setup.png", true, array("class" => "top", "title" => "Manage", "border" => "0", "width" => "16", "title" => "Manage")) . '&nbsp;</a></li><li class="nomn_high"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3">' . print_image("images/monitor.png", true, array("class" => "top", "title" => "Main", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3&amp;tab=data">' . print_image("images/lightbulb.png", true, array("class" => "top", "title" => "Data", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3&amp;tab=alert">' . print_image("images/bell.png", true, array("class" => "top", "title" => "Alerts", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=sla&amp;id_agente=3">' . print_image("images/images.png", true, array("class" => "top", "title" => "S.L.A.", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;group_id=2">' . print_image("images/agents_group.png", true, array("class" => "top", "title" => "Group", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=inventory&amp;id_agente=3">' . print_image("images/page_white_text.png", true, array("class" => "top", "title" => "Inventory", "border" => "0", "width" => "16")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente=3">' . print_image("images/world.png", array("class" => "top", "title" => "GIS data", "border" => "0")) . '&nbsp;</a>';
+$buttonsString = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3">' . html_print_image("images/bricks.png", true, array("class" => "top", "border" => '0')) . '&nbsp; Agent&nbsp;-&nbsp;test_gis1</a></li></ul></div><div id="menu_tab"><ul class="mn"><li class="nomn"><a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente=3">' . html_print_image("images/setup.png", true, array("class" => "top", "title" => "Manage", "border" => "0", "width" => "16", "title" => "Manage")) . '&nbsp;</a></li><li class="nomn_high"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3">' . html_print_image("images/monitor.png", true, array("class" => "top", "title" => "Main", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3&amp;tab=data">' . html_print_image("images/lightbulb.png", true, array("class" => "top", "title" => "Data", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3&amp;tab=alert">' . html_print_image("images/bell.png", true, array("class" => "top", "title" => "Alerts", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=sla&amp;id_agente=3">' . html_print_image("images/images.png", true, array("class" => "top", "title" => "S.L.A.", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;group_id=2">' . html_print_image("images/agents_group.png", true, array("class" => "top", "title" => "Group", "border" => "0")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=inventory&amp;id_agente=3">' . html_print_image("images/page_white_text.png", true, array("class" => "top", "title" => "Inventory", "border" => "0", "width" => "16")) . '&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente=3">' . html_print_image("images/world.png", array("class" => "top", "title" => "GIS data", "border" => "0")) . '&nbsp;</a>';
 
 $times = array(
 	5 => 5 . ' ' . __('seconds'),
@@ -112,18 +112,18 @@ $times = array(
 	7200 => 2 . ' ' . __('hours')
 	);
 
-$buttons[] = '&nbsp;' . __('Refresh: ') . print_select($times, 'refresh_time', 60, 'changeRefreshTime(this.value);', '', 0, true, false, false) . "&nbsp;";
+$buttons[] = '&nbsp;' . __('Refresh: ') . html_print_select($times, 'refresh_time', 60, 'changeRefreshTime(this.value);', '', 0, true, false, false) . "&nbsp;";
 
 $buttons[] = '<a id="button_status_all" href="javascript: changeShowStatus(\'all\');" style="border: 1px black solid;">' .
 	__('All') . '</a>';
 $buttons[] = '<a id="button_status_bad" href="javascript: changeShowStatus(\'bad\');"><div style="height: 18px;">' . 
-	print_image("images/status_sets/default/agent_critical_ball.png", true, array("title" => __('Critical'))) . '</div></a>';
+	html_print_image("images/status_sets/default/agent_critical_ball.png", true, array("title" => __('Critical'))) . '</div></a>';
 $buttons[] = '<a id="button_status_warning" href="javascript: changeShowStatus(\'warning\');"><div style="height: 18px;">' .
-	print_image("images/status_sets/default/agent_warning_ball.png", true, array("title" => __('Warning'))) . '</div></a>';
+	html_print_image("images/status_sets/default/agent_warning_ball.png", true, array("title" => __('Warning'))) . '</div></a>';
 $buttons[] = '<a id="button_status_ok" href="javascript: changeShowStatus(\'ok\');"><div style="height: 18px;">' .
-	print_image("images/status_sets/default/agent_ok_ball.png", true, array("title" => __('Ok'))) . '</div></a>';
+	html_print_image("images/status_sets/default/agent_ok_ball.png", true, array("title" => __('Ok'))) . '</div></a>';
 $buttons[] = '<a id="button_status_default" href="javascript: changeShowStatus(\'default\');"><div style="height: 18px;">' .
-	print_image("images/status_sets/default/agent_no_monitors_ball.png", true, array("title" => __('Other'))) . '</div></a>';
+	html_print_image("images/status_sets/default/agent_no_monitors_ball.png", true, array("title" => __('Other'))) . '</div></a>';
 $buttons[] = __('Show agents by state: ');
 
 
@@ -136,22 +136,22 @@ else {
 	echo "<div id='map' style='position:absolute;top:40px; z-index:100; width: 98%; height:94%; border: 1px solid black;' ></div>";
 }
 
-printMap('map', $map['zoom_level'], $map['initial_latitude'],
+gis_print_map('map', $map['zoom_level'], $map['initial_latitude'],
 	$map['initial_longitude'], $baselayers, $controls);
 
 if ($layers != false) {
 	foreach ($layers as $layer) {
-		makeLayer($layer['layer_name'], $layer['view_layer'], null, $layer['id_tmap_layer']);
+		gis_make_layer($layer['layer_name'], $layer['view_layer'], null, $layer['id_tmap_layer']);
 		
 		// calling get_group_agents with none to obtain the names in the same case as they are in the DB.	
 		$agentNamesByGroup = get_group_agents($layer['tgrupo_id_grupo'],false,'none', true);
-		$agentNamesByLayer = getAgentsLayer($layer['id_tmap_layer'], array('nombre'));
+		$agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer'], array('nombre'));
 		
 		$agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer);
 		
 		foreach ($agentNames as $agentName) {
 			$idAgent = get_agent_id($agentName);
-			$coords = getDataLastPositionAgent($idAgent);
+			$coords = gis_get_data_last_position_agent($idAgent);
 			
 			if ($coords === false) {
 				$coords['stored_latitude'] = $map['default_latitude'];
@@ -160,18 +160,18 @@ if ($layers != false) {
 			else {
 				if ($show_history == 'y') {
 					$lastPosition = array('longitude' => $coords['stored_longitude'], 'latitude' => $coords['stored_latitude']);
-					addPath($layer['layer_name'], $idAgent, $lastPosition);
+					gis_add_path($layer['layer_name'], $idAgent, $lastPosition);
 				}
 			}
-			$icon = get_agent_icon_map($idAgent, true);
+			$icon = gis_get_agent_icon_map($idAgent, true);
 			$status = get_agent_status($idAgent);
 			$parent = db_get_value('id_parent', 'tagente', 'id_agente', $idAgent);
 			
-			addAgentPoint($layer['layer_name'], $agentName, $coords['stored_latitude'],
+			gis_add_agent_point($layer['layer_name'], $agentName, $coords['stored_latitude'],
 				$coords['stored_longitude'], $icon, 20, 20, $idAgent, $status, 'point_agent_info', $parent);
 		}
 	}
-	addParentLines();
+	gis_add_parent_lines();
 
 	switch ($config["dbtype"]) {
 		case "mysql":
@@ -185,7 +185,7 @@ if ($layers != false) {
 			break;
 	}
 	
-	activateSelectControl();
-	activateAjaxRefresh($layers, $timestampLastOperation);
+	gis_activate_select_control();
+	gis_activate_ajax_refresh($layers, $timestampLastOperation);
 }
 ?>
diff --git a/pandora_console/operation/incidents/incident.files.php b/pandora_console/operation/incidents/incident.files.php
index 791d91ea5f..583275c7dd 100644
--- a/pandora_console/operation/incidents/incident.files.php
+++ b/pandora_console/operation/incidents/incident.files.php
@@ -20,16 +20,16 @@ $table->class = "databox";
 $table->data = array();
 
 $profiles = array();
-$table->data[0][0] = "<b>".__('File')."</b><br/>".print_input_file ('new_file', true, array('size' => "50%"));
+$table->data[0][0] = "<b>".__('File')."</b><br/>".html_print_input_file ('new_file', true, array('size' => "50%"));
 
-$table->data[1][0] = "<b>".__('Description')."</b><br/>".print_textarea('description', 3, 6, '' , '', true);
+$table->data[1][0] = "<b>".__('Description')."</b><br/>".html_print_textarea('description', 3, 6, '' , '', true);
 
 $form = "<form method='post' action='' enctype='multipart/form-data'>";
-$form .= print_table($table, true);
-$form .= print_submit_button(__('Add'), 'submit_button', false, '', true);
-$form .= print_input_hidden('tab', 'files', true);
-$form .= print_input_hidden('attach_file', '1', true);
-$form .= print_input_hidden('id_incident', $id_incident, true);
+$form .= html_print_table($table, true);
+$form .= html_print_submit_button(__('Add'), 'submit_button', false, '', true);
+$form .= html_print_input_hidden('tab', 'files', true);
+$form .= html_print_input_hidden('attach_file', '1', true);
+$form .= html_print_input_hidden('id_incident', $id_incident, true);
 $form .= "</form>";
 
 ui_toggle($form, __('Add a file'));
@@ -63,10 +63,10 @@ foreach($files as $value) {
 	}
 	$table->data[$row][2] = $value['description'];
 	$table->data[$row][3] = $value['size'];
-	$table->data[$row][4] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&tab=files&id_incident=".$value['id_incidencia']."&delete_file=".$value['id_attachment']."'>".print_image("images/cross.png", true, array('title' => __('Delete file')))."</a>";
+	$table->data[$row][4] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&tab=files&id_incident=".$value['id_incidencia']."&delete_file=".$value['id_attachment']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete file')))."</a>";
 	$row++;
 }
 
-print_table($table);
+html_print_table($table);
 
 ?>
diff --git a/pandora_console/operation/incidents/incident.incident.php b/pandora_console/operation/incidents/incident.incident.php
index f7087fba44..1962f16de3 100644
--- a/pandora_console/operation/incidents/incident.incident.php
+++ b/pandora_console/operation/incidents/incident.incident.php
@@ -68,52 +68,52 @@ $table->colspan[0][0] = 3;
 $table->colspan[3][0] = 3;
 $table->colspan[4][0] = 3;
 
-$table->data[0][0] = "<b>".__('Title')."</b><br/>".print_input_text("title", $result['titulo'], '', 50, 255, true);
+$table->data[0][0] = "<b>".__('Title')."</b><br/>".html_print_input_text("title", $result['titulo'], '', 50, 255, true);
 if(isset($result['id_incidencia'])) {
-	$table->data[1][2] = "<b>".__('Assigned user')."</b><br/>".print_select ($users, 'id_user', $result['id_usuario'], '', '', 0, true, false, false);
+	$table->data[1][2] = "<b>".__('Assigned user')."</b><br/>".html_print_select ($users, 'id_user', $result['id_usuario'], '', '', 0, true, false, false);
 }
 else {
 	$table->data[1][2] = "";
 }
 
-$table->data[1][0] = "<b>".__('Group')."</b><br/>".print_select ($groups, 'group', $result['id_grupo'], '', '', 0, true, false, false);
-$table->data[1][1] = "<b>".__('Priority')."</b><br/>".print_select (get_incidents_priorities (), 'priority', $result['prioridad'], '', '', 0, true, false, false);
+$table->data[1][0] = "<b>".__('Group')."</b><br/>".html_print_select ($groups, 'group', $result['id_grupo'], '', '', 0, true, false, false);
+$table->data[1][1] = "<b>".__('Priority')."</b><br/>".html_print_select (get_incidents_priorities (), 'priority', $result['prioridad'], '', '', 0, true, false, false);
 $table->data[1][2] = "<b>".__('Creator')."</b><br/>".$result['id_creator'];
 
 if(isset($result['id_incidencia'])) {
-	$table->data[2][0] = "<b>".__('Source')."</b><br/>".print_select ($sources, 'source', $result['origen'], '', '', 0, true, false, false);
-	$table->data[2][1] = "<b>".__('Resolution')."</b><br/>".print_select ($resolutions, 'resolution', $result['resolution'], '', '', 0, true, false, false);
-	$table->data[2][2] = "<b>".__('Status')."</b><br/>".print_select ($status, 'status', $result['estado'], '', '', 0, true, false, false);
+	$table->data[2][0] = "<b>".__('Source')."</b><br/>".html_print_select ($sources, 'source', $result['origen'], '', '', 0, true, false, false);
+	$table->data[2][1] = "<b>".__('Resolution')."</b><br/>".html_print_select ($resolutions, 'resolution', $result['resolution'], '', '', 0, true, false, false);
+	$table->data[2][2] = "<b>".__('Status')."</b><br/>".html_print_select ($status, 'status', $result['estado'], '', '', 0, true, false, false);
 }
 
 if(is_array($result['descripcion'])) {
 	$result['descripcion'] = "";
 }
 
-$table->data[3][0] = "<b>".__('Description')."</b><br/>".print_textarea("description", 10, 6, $result['descripcion'] , '', true);
+$table->data[3][0] = "<b>".__('Description')."</b><br/>".html_print_textarea("description", 10, 6, $result['descripcion'] , '', true);
 
 if(isset($result['id_incidencia'])) {
 if(is_array($result['epilog'])) {
 	$result['epilog'] = implode(',', $result['epilog']);
 }
-$table->data[4][0] = "<b>".__('Resolution epilog')."</b><br/>".print_textarea("epilog", 10, 6, $result['epilog'] , '', true);
+$table->data[4][0] = "<b>".__('Resolution epilog')."</b><br/>".html_print_textarea("epilog", 10, 6, $result['epilog'] , '', true);
 }
 
 if(isset($result['id_incidencia'])) {
 	echo "<form method='post' action=''>";
-	print_table($table);
-	print_submit_button(__('Update'), 'submit_button');
-	print_input_hidden('tab', 'incident');
-	print_input_hidden('update_incident', '1');
-	print_input_hidden('id_incident', $result['id_incidencia']);
+	html_print_table($table);
+	html_print_submit_button(__('Update'), 'submit_button');
+	html_print_input_hidden('tab', 'incident');
+	html_print_input_hidden('update_incident', '1');
+	html_print_input_hidden('id_incident', $result['id_incidencia']);
 	echo "</form>";
 }
 else {
 	echo "<form method='post' action=''>";
-	print_table($table);
-	print_submit_button(__('Create'), 'submit_button');
-	print_input_hidden('tab', 'incident');
-	print_input_hidden('create_incident', '1');
+	html_print_table($table);
+	html_print_submit_button(__('Create'), 'submit_button');
+	html_print_input_hidden('tab', 'incident');
+	html_print_input_hidden('create_incident', '1');
 	echo "</form>";
 }
 ?>
diff --git a/pandora_console/operation/incidents/incident.list.php b/pandora_console/operation/incidents/incident.list.php
index 781dc0796b..eb0a57d6ab 100644
--- a/pandora_console/operation/incidents/incident.list.php
+++ b/pandora_console/operation/incidents/incident.list.php
@@ -60,16 +60,16 @@ echo "<b>".__('Group')."</b>";
 echo '</td>';
 echo '</tr><tr>';
 echo '<td>';
-print_input_text('search_string', $search_string, '');
+html_print_input_text('search_string', $search_string, '');
 echo '</td>';
 echo '<td>';
-print_select ($status, 'search_status', $search_status, '', '', 0, false);
+html_print_select ($status, 'search_status', $search_status, '', '', 0, false);
 echo '</td>';
 echo '<td>';
-print_select ($groups, 'search_group', $search_group, '', '', 0, false, false, false);
+html_print_select ($groups, 'search_group', $search_group, '', '', 0, false, false, false);
 echo '</td>';
 echo '<td>';
-print_submit_button (__('Search'));
+html_print_submit_button (__('Search'));
 echo '</td>';
 echo '</tr></table>';
 
@@ -130,10 +130,10 @@ foreach ($incidents as $row) {
 	$data[7] = $row["workunits_hours"]." ".__('Hours')."<br/>".$row["workunits_count"]." ".__('Workunits');
 	$data[8] = $row["id_creator"];
 	$data[9] = $row["id_usuario"];
-	$data[10] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&delete_incident=".$row['id_incidencia']."'>".print_image("images/cross.png", true, array('title' => __('Delete incident')))."</a><a href='index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident=".$row["id_incidencia"]."'>".print_image("images/config.png", true, array('title' => __('View incident details')))."</a>";
+	$data[10] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&delete_incident=".$row['id_incidencia']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete incident')))."</a><a href='index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident=".$row["id_incidencia"]."'>".html_print_image("images/config.png", true, array('title' => __('View incident details')))."</a>";
 
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 ?>
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index f76abdcb4e..f021b39b08 100755
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -36,34 +36,34 @@ if($tab == 'list' || $tab == 'editor') {
 			'list' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=list">' . 
-					print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
+					html_print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
 			'editor' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=editor">' . 
-					print_image ("images/add.png", true, array ("title" => __('New Incident'))) .'</a>'));
+					html_print_image ("images/add.png", true, array ("title" => __('New Incident'))) .'</a>'));
 }
 else {
 	$buttons = array(
 			'list' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=list">' . 
-					print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
+					html_print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
 			'incident' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident='.$id_incident.'">' . 
-					print_image ("images/eye.png", true, array ("title" => __('Incident details'))) .'</a>'),
+					html_print_image ("images/eye.png", true, array ("title" => __('Incident details'))) .'</a>'),
 			'workunits' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=workunits&id_incident='.$id_incident.'">' . 
-					print_image ("images/computer.png", true, array ("title" => __('Workunits'))) .'</a>'),
+					html_print_image ("images/computer.png", true, array ("title" => __('Workunits'))) .'</a>'),
 			'files' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=files&id_incident='.$id_incident.'"">' . 
-					print_image ("images/file.png", true, array ("title" => __('Files'))) .'</a>'),
+					html_print_image ("images/file.png", true, array ("title" => __('Files'))) .'</a>'),
 			'tracking' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=tracking&id_incident='.$id_incident.'"">' . 
-					print_image ("images/comments.png", true, array ("title" => __('Tracking'))) .'</a>'));
+					html_print_image ("images/comments.png", true, array ("title" => __('Tracking'))) .'</a>'));
 }
 	
 $buttons[$tab]['active'] = true;
diff --git a/pandora_console/operation/incidents/incident.tracking.php b/pandora_console/operation/incidents/incident.tracking.php
index 8226d7d511..336fb3e17d 100644
--- a/pandora_console/operation/incidents/incident.tracking.php
+++ b/pandora_console/operation/incidents/incident.tracking.php
@@ -40,6 +40,6 @@ foreach($tracking as $value) {
 	$row++;
 }
 
-print_table($table);
+html_print_table($table);
 
 ?>
diff --git a/pandora_console/operation/incidents/incident.workunits.php b/pandora_console/operation/incidents/incident.workunits.php
index d2f8376a1b..7350810434 100644
--- a/pandora_console/operation/incidents/incident.workunits.php
+++ b/pandora_console/operation/incidents/incident.workunits.php
@@ -24,19 +24,19 @@ $table->colspan[1][0] = 3;
 
 $profiles = array();
 $default_time = "0.25";
-$table->data[0][0] = "<b>".__('Time used')."</b><br/>".print_input_text ('time_used', $default_time, '', 10, 255, true);
-$table->data[0][1] = "<b>".__('Have cost')."</b><br/>".print_checkbox ('have_cost', '', false, true);
-$table->data[0][2] = "<b>".__('Public')."</b><br/>".print_checkbox ('public', '', true, true);
+$table->data[0][0] = "<b>".__('Time used')."</b><br/>".html_print_input_text ('time_used', $default_time, '', 10, 255, true);
+$table->data[0][1] = "<b>".__('Have cost')."</b><br/>".html_print_checkbox ('have_cost', '', false, true);
+$table->data[0][2] = "<b>".__('Public')."</b><br/>".html_print_checkbox ('public', '', true, true);
 
-$table->data[1][0] = "<b>".__('Description')."</b><br/>".print_textarea('description', 3, 6, '' , '', true);
+$table->data[1][0] = "<b>".__('Description')."</b><br/>".html_print_textarea('description', 3, 6, '' , '', true);
 
 $form = "<form method='post' action=''>";
-$form .= print_table($table, true);
-$form .= print_submit_button(__('Add'), 'submit_button', false, '', true);
-$form .= print_input_hidden('tab', 'workunits', true);
-$form .= print_input_hidden('create_workunit', '1', true);
-$form .= print_input_hidden('id_incident', $id_incident, true);
-$form .= print_input_hidden('profile', '0', true);
+$form .= html_print_table($table, true);
+$form .= html_print_submit_button(__('Add'), 'submit_button', false, '', true);
+$form .= html_print_input_hidden('tab', 'workunits', true);
+$form .= html_print_input_hidden('create_workunit', '1', true);
+$form .= html_print_input_hidden('id_incident', $id_incident, true);
+$form .= html_print_input_hidden('profile', '0', true);
 $form .= "</form>";
 
 ui_toggle($form, __('Add workunit'));
@@ -62,6 +62,6 @@ foreach($workunits as $value) {
 	
 	$table->data[1][0] = $value['description'];
 
-	print_table($table);
+	html_print_table($table);
 }
 ?>
diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php
index 2329aa958c..67986f7279 100755
--- a/pandora_console/operation/incidents/incident_detail.php
+++ b/pandora_console/operation/incidents/incident_detail.php
@@ -221,9 +221,9 @@ echo '<table cellpadding="4" cellspacing="4" class="databox" width="650px">';
 echo '<tr><td class="datos"><b>'.__('Incident').'</b></td><td colspan="3" class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_input_text ("titulo", $titulo,'', 70);
+	html_print_input_text ("titulo", $titulo,'', 70);
 } else {
-	print_input_text_extended ("titulo", $titulo, "", "", 70, "", false, "", "readonly"); 
+	html_print_input_text_extended ("titulo", $titulo, "", "", 70, "", false, "", "readonly"); 
 }
 
 echo '</td></tr>';
@@ -234,17 +234,17 @@ echo '<td class="datos2"><b>'.__('Updated at').'</b><td class="datos2"><i>'.date
 echo '<tr><td class="datos"><b>'.__('Owner').'</b></td><td class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135");
+	html_print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135");
 } else {
-	print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135", true);
+	html_print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135", true);
 }
 echo '</td><td class="datos"><b>'.__('Status').'</b></td><td class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135');
+	html_print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135');
 }
 else {
-	print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135', true);
+	html_print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135', true);
 }
 echo '</td></tr>';
 
@@ -261,26 +261,26 @@ foreach ($return as $row) {
 
 // Only owner could change source or user with Incident management privileges
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135');
+	html_print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135');
 }
 else {
-	print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135', true);
+	html_print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135', true);
 }
 echo '</td><td class="datos2"><b>'.__('Group').'</b></td><td class="datos2">';
 
 // Group combo
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, false, 'w135');
+	html_print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, false, 'w135');
 } else {
-	print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, true, 'w135', true);
+	html_print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, true, 'w135', true);
 }
 
 echo '</td></tr><tr><td class="datos"><b>'.__('Priority').'</b></td><td class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135');
+	html_print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135');
 } else {
-	print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135', true);
+	html_print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135', true);
 }
 
 echo '</td><td class="datos"><b>'.__('Creator').'</b></td><td class="datos">';
@@ -293,20 +293,20 @@ if (empty ($id_creator)) {
 echo '</td></tr><tr><td class="datos2" colspan="4">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;"');
+	html_print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;"');
 } else {
-	print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;" disabled');
+	html_print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;" disabled');
 }
 
 echo '</td></tr></table><div style="width: 650px; text-align:right;">';
 
 // Only if user is the used who opened incident or (s)he is admin
 if (isset ($id_inc) AND ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"]))) {
-	print_submit_button (__('Update incident'), "accion", false, 'class="sub upd"');
+	html_print_submit_button (__('Update incident'), "accion", false, 'class="sub upd"');
 } elseif (check_acl ($config["id_user"], $id_grupo, "IW")) {
-	print_submit_button (__('Create'), "accion", false, 'class="sub wand"');
+	html_print_submit_button (__('Create'), "accion", false, 'class="sub wand"');
 } else {
-	print_submit_button (__('Submit'), "accion", true, 'class="sub upd"');
+	html_print_submit_button (__('Submit'), "accion", true, 'class="sub upd"');
 }
 echo "</div></form>";
 
@@ -319,7 +319,7 @@ if (isset ($id_inc)) {
 	echo '<div>';
 
 	echo '<a class="note_control" href="#">';
-	echo print_image ('images/add.png', true);
+	echo html_print_image ('images/add.png', true);
 	echo __('Add note');
 	echo '</a>';
 	echo '</div><div>';
@@ -340,14 +340,14 @@ if (isset ($id_inc)) {
 	
 	foreach ($result as $row) {
 		$data = array ();
-		$data[0] = print_image("images/page_white_text.png", true, array("border" => '0')); 
+		$data[0] = html_print_image("images/page_white_text.png", true, array("border" => '0')); 
 		$data[1] = __('Author').': ' . ui_print_username ($row["id_usuario"], true).' (' . ui_print_timestamp ($row["timestamp"], true).')';
 		array_push ($table->data, $data);
 		
 		$data = array ();
 		$data[0] = '';
 		if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($row["id_usuario"] == $config["id_user"])) {
-			$data[0] .= print_input_image ("delete_nota", "images/cross.png", $row["id_nota"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
+			$data[0] .= html_print_input_image ("delete_nota", "images/cross.png", $row["id_nota"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
 		}
 		$data[1] = $row["nota"];
 		array_push ($table->data, $data);
@@ -356,7 +356,7 @@ if (isset ($id_inc)) {
 	if (!empty ($table->data)) {
 		echo "<h3>".__('Notes attached to incident').'</h3>';
 		echo '<form method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
-		print_table ($table);
+		html_print_table ($table);
 		echo '</form>';
 	}
 	unset ($table);
@@ -384,11 +384,11 @@ if (isset ($id_inc)) {
 	$table->align[3] = "center";
 
 	foreach ($result as $row) {
-		$data[0] = print_image("images/disk.png", true, array("border" => '0', "align" => "top")) . '&nbsp;&nbsp;<a target="_new" href="attachment/pand'.$row["id_attachment"].'_'.$row["filename"].'"><b>'.$row["filename"].'</b></a>';
+		$data[0] = html_print_image("images/disk.png", true, array("border" => '0', "align" => "top")) . '&nbsp;&nbsp;<a target="_new" href="attachment/pand'.$row["id_attachment"].'_'.$row["filename"].'"><b>'.$row["filename"].'</b></a>';
 		$data[1] = $row["description"];
 		$data[2] = format_for_graph ($row["size"])."B";
 		if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-			$data[3] = print_input_image ("delete_file", "images/cross.png", $row["id_attachment"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
+			$data[3] = html_print_input_image ("delete_file", "images/cross.png", $row["id_attachment"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
 		} else {
 			$data[3] = '';
 		}
@@ -398,7 +398,7 @@ if (isset ($id_inc)) {
 	if (!empty ($table->data)) {
 		echo "<h3>".__('Attached files')."</h3>";
 		echo '<form method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
-		print_table ($table);
+		html_print_table ($table);
 		echo '</form>';
 	}
 	unset ($table);
@@ -413,7 +413,7 @@ if (isset ($id_inc)) {
 
 		echo '<div>';
 		echo '<a class="attachment" href="#">';
-		echo print_image ('images/add.png', true);
+		echo html_print_image ('images/add.png', true);
 		echo __('Add attachment');
 		echo '</a>';
 		echo '</div>';
diff --git a/pandora_console/operation/integria_incidents/incident.files.php b/pandora_console/operation/integria_incidents/incident.files.php
index 791d91ea5f..583275c7dd 100644
--- a/pandora_console/operation/integria_incidents/incident.files.php
+++ b/pandora_console/operation/integria_incidents/incident.files.php
@@ -20,16 +20,16 @@ $table->class = "databox";
 $table->data = array();
 
 $profiles = array();
-$table->data[0][0] = "<b>".__('File')."</b><br/>".print_input_file ('new_file', true, array('size' => "50%"));
+$table->data[0][0] = "<b>".__('File')."</b><br/>".html_print_input_file ('new_file', true, array('size' => "50%"));
 
-$table->data[1][0] = "<b>".__('Description')."</b><br/>".print_textarea('description', 3, 6, '' , '', true);
+$table->data[1][0] = "<b>".__('Description')."</b><br/>".html_print_textarea('description', 3, 6, '' , '', true);
 
 $form = "<form method='post' action='' enctype='multipart/form-data'>";
-$form .= print_table($table, true);
-$form .= print_submit_button(__('Add'), 'submit_button', false, '', true);
-$form .= print_input_hidden('tab', 'files', true);
-$form .= print_input_hidden('attach_file', '1', true);
-$form .= print_input_hidden('id_incident', $id_incident, true);
+$form .= html_print_table($table, true);
+$form .= html_print_submit_button(__('Add'), 'submit_button', false, '', true);
+$form .= html_print_input_hidden('tab', 'files', true);
+$form .= html_print_input_hidden('attach_file', '1', true);
+$form .= html_print_input_hidden('id_incident', $id_incident, true);
 $form .= "</form>";
 
 ui_toggle($form, __('Add a file'));
@@ -63,10 +63,10 @@ foreach($files as $value) {
 	}
 	$table->data[$row][2] = $value['description'];
 	$table->data[$row][3] = $value['size'];
-	$table->data[$row][4] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&tab=files&id_incident=".$value['id_incidencia']."&delete_file=".$value['id_attachment']."'>".print_image("images/cross.png", true, array('title' => __('Delete file')))."</a>";
+	$table->data[$row][4] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&tab=files&id_incident=".$value['id_incidencia']."&delete_file=".$value['id_attachment']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete file')))."</a>";
 	$row++;
 }
 
-print_table($table);
+html_print_table($table);
 
 ?>
diff --git a/pandora_console/operation/integria_incidents/incident.incident.php b/pandora_console/operation/integria_incidents/incident.incident.php
index f7087fba44..1962f16de3 100644
--- a/pandora_console/operation/integria_incidents/incident.incident.php
+++ b/pandora_console/operation/integria_incidents/incident.incident.php
@@ -68,52 +68,52 @@ $table->colspan[0][0] = 3;
 $table->colspan[3][0] = 3;
 $table->colspan[4][0] = 3;
 
-$table->data[0][0] = "<b>".__('Title')."</b><br/>".print_input_text("title", $result['titulo'], '', 50, 255, true);
+$table->data[0][0] = "<b>".__('Title')."</b><br/>".html_print_input_text("title", $result['titulo'], '', 50, 255, true);
 if(isset($result['id_incidencia'])) {
-	$table->data[1][2] = "<b>".__('Assigned user')."</b><br/>".print_select ($users, 'id_user', $result['id_usuario'], '', '', 0, true, false, false);
+	$table->data[1][2] = "<b>".__('Assigned user')."</b><br/>".html_print_select ($users, 'id_user', $result['id_usuario'], '', '', 0, true, false, false);
 }
 else {
 	$table->data[1][2] = "";
 }
 
-$table->data[1][0] = "<b>".__('Group')."</b><br/>".print_select ($groups, 'group', $result['id_grupo'], '', '', 0, true, false, false);
-$table->data[1][1] = "<b>".__('Priority')."</b><br/>".print_select (get_incidents_priorities (), 'priority', $result['prioridad'], '', '', 0, true, false, false);
+$table->data[1][0] = "<b>".__('Group')."</b><br/>".html_print_select ($groups, 'group', $result['id_grupo'], '', '', 0, true, false, false);
+$table->data[1][1] = "<b>".__('Priority')."</b><br/>".html_print_select (get_incidents_priorities (), 'priority', $result['prioridad'], '', '', 0, true, false, false);
 $table->data[1][2] = "<b>".__('Creator')."</b><br/>".$result['id_creator'];
 
 if(isset($result['id_incidencia'])) {
-	$table->data[2][0] = "<b>".__('Source')."</b><br/>".print_select ($sources, 'source', $result['origen'], '', '', 0, true, false, false);
-	$table->data[2][1] = "<b>".__('Resolution')."</b><br/>".print_select ($resolutions, 'resolution', $result['resolution'], '', '', 0, true, false, false);
-	$table->data[2][2] = "<b>".__('Status')."</b><br/>".print_select ($status, 'status', $result['estado'], '', '', 0, true, false, false);
+	$table->data[2][0] = "<b>".__('Source')."</b><br/>".html_print_select ($sources, 'source', $result['origen'], '', '', 0, true, false, false);
+	$table->data[2][1] = "<b>".__('Resolution')."</b><br/>".html_print_select ($resolutions, 'resolution', $result['resolution'], '', '', 0, true, false, false);
+	$table->data[2][2] = "<b>".__('Status')."</b><br/>".html_print_select ($status, 'status', $result['estado'], '', '', 0, true, false, false);
 }
 
 if(is_array($result['descripcion'])) {
 	$result['descripcion'] = "";
 }
 
-$table->data[3][0] = "<b>".__('Description')."</b><br/>".print_textarea("description", 10, 6, $result['descripcion'] , '', true);
+$table->data[3][0] = "<b>".__('Description')."</b><br/>".html_print_textarea("description", 10, 6, $result['descripcion'] , '', true);
 
 if(isset($result['id_incidencia'])) {
 if(is_array($result['epilog'])) {
 	$result['epilog'] = implode(',', $result['epilog']);
 }
-$table->data[4][0] = "<b>".__('Resolution epilog')."</b><br/>".print_textarea("epilog", 10, 6, $result['epilog'] , '', true);
+$table->data[4][0] = "<b>".__('Resolution epilog')."</b><br/>".html_print_textarea("epilog", 10, 6, $result['epilog'] , '', true);
 }
 
 if(isset($result['id_incidencia'])) {
 	echo "<form method='post' action=''>";
-	print_table($table);
-	print_submit_button(__('Update'), 'submit_button');
-	print_input_hidden('tab', 'incident');
-	print_input_hidden('update_incident', '1');
-	print_input_hidden('id_incident', $result['id_incidencia']);
+	html_print_table($table);
+	html_print_submit_button(__('Update'), 'submit_button');
+	html_print_input_hidden('tab', 'incident');
+	html_print_input_hidden('update_incident', '1');
+	html_print_input_hidden('id_incident', $result['id_incidencia']);
 	echo "</form>";
 }
 else {
 	echo "<form method='post' action=''>";
-	print_table($table);
-	print_submit_button(__('Create'), 'submit_button');
-	print_input_hidden('tab', 'incident');
-	print_input_hidden('create_incident', '1');
+	html_print_table($table);
+	html_print_submit_button(__('Create'), 'submit_button');
+	html_print_input_hidden('tab', 'incident');
+	html_print_input_hidden('create_incident', '1');
 	echo "</form>";
 }
 ?>
diff --git a/pandora_console/operation/integria_incidents/incident.list.php b/pandora_console/operation/integria_incidents/incident.list.php
index 1a71c99f2b..16c4cc2410 100644
--- a/pandora_console/operation/integria_incidents/incident.list.php
+++ b/pandora_console/operation/integria_incidents/incident.list.php
@@ -54,16 +54,16 @@ echo "<b>".__('Group')."</b>";
 echo '</td>';
 echo '</tr><tr>';
 echo '<td>';
-print_input_text('search_string', $search_string, '');
+html_print_input_text('search_string', $search_string, '');
 echo '</td>';
 echo '<td>';
-print_select ($status, 'search_status', $search_status, '', '', 0, false);
+html_print_select ($status, 'search_status', $search_status, '', '', 0, false);
 echo '</td>';
 echo '<td>';
-print_select ($groups, 'search_group', $search_group, '', '', 0, false, false, false);
+html_print_select ($groups, 'search_group', $search_group, '', '', 0, false, false, false);
 echo '</td>';
 echo '<td>';
-print_submit_button (__('Search'));
+html_print_submit_button (__('Search'));
 echo '</td>';
 echo '</tr></table>';
 
@@ -124,10 +124,10 @@ foreach ($incidents as $row) {
 	$data[7] = $row["workunits_hours"]." ".__('Hours')."<br/>".$row["workunits_count"]." ".__('Workunits');
 	$data[8] = $row["id_creator"];
 	$data[9] = $row["id_usuario"];
-	$data[10] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&delete_incident=".$row['id_incidencia']."'>".print_image("images/cross.png", true, array('title' => __('Delete incident')))."</a><a href='index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident=".$row["id_incidencia"]."'>".print_image("images/config.png", true, array('title' => __('View incident details')))."</a>";
+	$data[10] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&delete_incident=".$row['id_incidencia']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete incident')))."</a><a href='index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident=".$row["id_incidencia"]."'>".html_print_image("images/config.png", true, array('title' => __('View incident details')))."</a>";
 
 	array_push ($table->data, $data);
 }
 
-print_table ($table);
+html_print_table ($table);
 ?>
diff --git a/pandora_console/operation/integria_incidents/incident.php b/pandora_console/operation/integria_incidents/incident.php
index f76abdcb4e..f021b39b08 100755
--- a/pandora_console/operation/integria_incidents/incident.php
+++ b/pandora_console/operation/integria_incidents/incident.php
@@ -36,34 +36,34 @@ if($tab == 'list' || $tab == 'editor') {
 			'list' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=list">' . 
-					print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
+					html_print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
 			'editor' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=editor">' . 
-					print_image ("images/add.png", true, array ("title" => __('New Incident'))) .'</a>'));
+					html_print_image ("images/add.png", true, array ("title" => __('New Incident'))) .'</a>'));
 }
 else {
 	$buttons = array(
 			'list' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=list">' . 
-					print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
+					html_print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
 			'incident' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident='.$id_incident.'">' . 
-					print_image ("images/eye.png", true, array ("title" => __('Incident details'))) .'</a>'),
+					html_print_image ("images/eye.png", true, array ("title" => __('Incident details'))) .'</a>'),
 			'workunits' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=workunits&id_incident='.$id_incident.'">' . 
-					print_image ("images/computer.png", true, array ("title" => __('Workunits'))) .'</a>'),
+					html_print_image ("images/computer.png", true, array ("title" => __('Workunits'))) .'</a>'),
 			'files' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=files&id_incident='.$id_incident.'"">' . 
-					print_image ("images/file.png", true, array ("title" => __('Files'))) .'</a>'),
+					html_print_image ("images/file.png", true, array ("title" => __('Files'))) .'</a>'),
 			'tracking' => array(
 				'active' => false,
 				'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=tracking&id_incident='.$id_incident.'"">' . 
-					print_image ("images/comments.png", true, array ("title" => __('Tracking'))) .'</a>'));
+					html_print_image ("images/comments.png", true, array ("title" => __('Tracking'))) .'</a>'));
 }
 	
 $buttons[$tab]['active'] = true;
diff --git a/pandora_console/operation/integria_incidents/incident.tracking.php b/pandora_console/operation/integria_incidents/incident.tracking.php
index 8226d7d511..336fb3e17d 100644
--- a/pandora_console/operation/integria_incidents/incident.tracking.php
+++ b/pandora_console/operation/integria_incidents/incident.tracking.php
@@ -40,6 +40,6 @@ foreach($tracking as $value) {
 	$row++;
 }
 
-print_table($table);
+html_print_table($table);
 
 ?>
diff --git a/pandora_console/operation/integria_incidents/incident.workunits.php b/pandora_console/operation/integria_incidents/incident.workunits.php
index d2f8376a1b..7350810434 100644
--- a/pandora_console/operation/integria_incidents/incident.workunits.php
+++ b/pandora_console/operation/integria_incidents/incident.workunits.php
@@ -24,19 +24,19 @@ $table->colspan[1][0] = 3;
 
 $profiles = array();
 $default_time = "0.25";
-$table->data[0][0] = "<b>".__('Time used')."</b><br/>".print_input_text ('time_used', $default_time, '', 10, 255, true);
-$table->data[0][1] = "<b>".__('Have cost')."</b><br/>".print_checkbox ('have_cost', '', false, true);
-$table->data[0][2] = "<b>".__('Public')."</b><br/>".print_checkbox ('public', '', true, true);
+$table->data[0][0] = "<b>".__('Time used')."</b><br/>".html_print_input_text ('time_used', $default_time, '', 10, 255, true);
+$table->data[0][1] = "<b>".__('Have cost')."</b><br/>".html_print_checkbox ('have_cost', '', false, true);
+$table->data[0][2] = "<b>".__('Public')."</b><br/>".html_print_checkbox ('public', '', true, true);
 
-$table->data[1][0] = "<b>".__('Description')."</b><br/>".print_textarea('description', 3, 6, '' , '', true);
+$table->data[1][0] = "<b>".__('Description')."</b><br/>".html_print_textarea('description', 3, 6, '' , '', true);
 
 $form = "<form method='post' action=''>";
-$form .= print_table($table, true);
-$form .= print_submit_button(__('Add'), 'submit_button', false, '', true);
-$form .= print_input_hidden('tab', 'workunits', true);
-$form .= print_input_hidden('create_workunit', '1', true);
-$form .= print_input_hidden('id_incident', $id_incident, true);
-$form .= print_input_hidden('profile', '0', true);
+$form .= html_print_table($table, true);
+$form .= html_print_submit_button(__('Add'), 'submit_button', false, '', true);
+$form .= html_print_input_hidden('tab', 'workunits', true);
+$form .= html_print_input_hidden('create_workunit', '1', true);
+$form .= html_print_input_hidden('id_incident', $id_incident, true);
+$form .= html_print_input_hidden('profile', '0', true);
 $form .= "</form>";
 
 ui_toggle($form, __('Add workunit'));
@@ -62,6 +62,6 @@ foreach($workunits as $value) {
 	
 	$table->data[1][0] = $value['description'];
 
-	print_table($table);
+	html_print_table($table);
 }
 ?>
diff --git a/pandora_console/operation/integria_incidents/incident_detail.php b/pandora_console/operation/integria_incidents/incident_detail.php
index 2329aa958c..67986f7279 100755
--- a/pandora_console/operation/integria_incidents/incident_detail.php
+++ b/pandora_console/operation/integria_incidents/incident_detail.php
@@ -221,9 +221,9 @@ echo '<table cellpadding="4" cellspacing="4" class="databox" width="650px">';
 echo '<tr><td class="datos"><b>'.__('Incident').'</b></td><td colspan="3" class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_input_text ("titulo", $titulo,'', 70);
+	html_print_input_text ("titulo", $titulo,'', 70);
 } else {
-	print_input_text_extended ("titulo", $titulo, "", "", 70, "", false, "", "readonly"); 
+	html_print_input_text_extended ("titulo", $titulo, "", "", 70, "", false, "", "readonly"); 
 }
 
 echo '</td></tr>';
@@ -234,17 +234,17 @@ echo '<td class="datos2"><b>'.__('Updated at').'</b><td class="datos2"><i>'.date
 echo '<tr><td class="datos"><b>'.__('Owner').'</b></td><td class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135");
+	html_print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135");
 } else {
-	print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135", true);
+	html_print_select (get_users_info (), "usuario_form", $usuario, '', 'SYSTEM', '', false, false, true, "w135", true);
 }
 echo '</td><td class="datos"><b>'.__('Status').'</b></td><td class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135');
+	html_print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135');
 }
 else {
-	print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135', true);
+	html_print_select (get_incidents_status (), "estado_form", $estado, '', '', '', false, false, false, 'w135', true);
 }
 echo '</td></tr>';
 
@@ -261,26 +261,26 @@ foreach ($return as $row) {
 
 // Only owner could change source or user with Incident management privileges
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135');
+	html_print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135');
 }
 else {
-	print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135', true);
+	html_print_select ($fields, "origen_form", $estado, '', '', '', false, false, false, 'w135', true);
 }
 echo '</td><td class="datos2"><b>'.__('Group').'</b></td><td class="datos2">';
 
 // Group combo
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, false, 'w135');
+	html_print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, false, 'w135');
 } else {
-	print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, true, 'w135', true);
+	html_print_select_groups($config["id_user"], "IR", true, "grupo_form", $id_grupo, '', '', '', false, false, true, 'w135', true);
 }
 
 echo '</td></tr><tr><td class="datos"><b>'.__('Priority').'</b></td><td class="datos">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135');
+	html_print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135');
 } else {
-	print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135', true);
+	html_print_select (get_incidents_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135', true);
 }
 
 echo '</td><td class="datos"><b>'.__('Creator').'</b></td><td class="datos">';
@@ -293,20 +293,20 @@ if (empty ($id_creator)) {
 echo '</td></tr><tr><td class="datos2" colspan="4">';
 
 if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-	print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;"');
+	html_print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;"');
 } else {
-	print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;" disabled');
+	html_print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;" disabled');
 }
 
 echo '</td></tr></table><div style="width: 650px; text-align:right;">';
 
 // Only if user is the used who opened incident or (s)he is admin
 if (isset ($id_inc) AND ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"]))) {
-	print_submit_button (__('Update incident'), "accion", false, 'class="sub upd"');
+	html_print_submit_button (__('Update incident'), "accion", false, 'class="sub upd"');
 } elseif (check_acl ($config["id_user"], $id_grupo, "IW")) {
-	print_submit_button (__('Create'), "accion", false, 'class="sub wand"');
+	html_print_submit_button (__('Create'), "accion", false, 'class="sub wand"');
 } else {
-	print_submit_button (__('Submit'), "accion", true, 'class="sub upd"');
+	html_print_submit_button (__('Submit'), "accion", true, 'class="sub upd"');
 }
 echo "</div></form>";
 
@@ -319,7 +319,7 @@ if (isset ($id_inc)) {
 	echo '<div>';
 
 	echo '<a class="note_control" href="#">';
-	echo print_image ('images/add.png', true);
+	echo html_print_image ('images/add.png', true);
 	echo __('Add note');
 	echo '</a>';
 	echo '</div><div>';
@@ -340,14 +340,14 @@ if (isset ($id_inc)) {
 	
 	foreach ($result as $row) {
 		$data = array ();
-		$data[0] = print_image("images/page_white_text.png", true, array("border" => '0')); 
+		$data[0] = html_print_image("images/page_white_text.png", true, array("border" => '0')); 
 		$data[1] = __('Author').': ' . ui_print_username ($row["id_usuario"], true).' (' . ui_print_timestamp ($row["timestamp"], true).')';
 		array_push ($table->data, $data);
 		
 		$data = array ();
 		$data[0] = '';
 		if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($row["id_usuario"] == $config["id_user"])) {
-			$data[0] .= print_input_image ("delete_nota", "images/cross.png", $row["id_nota"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
+			$data[0] .= html_print_input_image ("delete_nota", "images/cross.png", $row["id_nota"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
 		}
 		$data[1] = $row["nota"];
 		array_push ($table->data, $data);
@@ -356,7 +356,7 @@ if (isset ($id_inc)) {
 	if (!empty ($table->data)) {
 		echo "<h3>".__('Notes attached to incident').'</h3>';
 		echo '<form method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
-		print_table ($table);
+		html_print_table ($table);
 		echo '</form>';
 	}
 	unset ($table);
@@ -384,11 +384,11 @@ if (isset ($id_inc)) {
 	$table->align[3] = "center";
 
 	foreach ($result as $row) {
-		$data[0] = print_image("images/disk.png", true, array("border" => '0', "align" => "top")) . '&nbsp;&nbsp;<a target="_new" href="attachment/pand'.$row["id_attachment"].'_'.$row["filename"].'"><b>'.$row["filename"].'</b></a>';
+		$data[0] = html_print_image("images/disk.png", true, array("border" => '0', "align" => "top")) . '&nbsp;&nbsp;<a target="_new" href="attachment/pand'.$row["id_attachment"].'_'.$row["filename"].'"><b>'.$row["filename"].'</b></a>';
 		$data[1] = $row["description"];
 		$data[2] = format_for_graph ($row["size"])."B";
 		if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
-			$data[3] = print_input_image ("delete_file", "images/cross.png", $row["id_attachment"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
+			$data[3] = html_print_input_image ("delete_file", "images/cross.png", $row["id_attachment"], 'border:0px;" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;', true);
 		} else {
 			$data[3] = '';
 		}
@@ -398,7 +398,7 @@ if (isset ($id_inc)) {
 	if (!empty ($table->data)) {
 		echo "<h3>".__('Attached files')."</h3>";
 		echo '<form method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
-		print_table ($table);
+		html_print_table ($table);
 		echo '</form>';
 	}
 	unset ($table);
@@ -413,7 +413,7 @@ if (isset ($id_inc)) {
 
 		echo '<div>';
 		echo '<a class="attachment" href="#">';
-		echo print_image ('images/add.png', true);
+		echo html_print_image ('images/add.png', true);
 		echo __('Add attachment');
 		echo '</a>';
 		echo '</div>';
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index eae83e6aaa..f8b0a94644 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -57,7 +57,7 @@ if (!empty ($dest_group) && isset ($_GET["send_message"])) {
 	$return = create_message_group ($config["id_user"], $dest_group, $subject, $message);
 	ui_print_result_message ($return,
 		__('Message successfully sent'),
-		__('Error sending message to group %s', get_group_name ($dest_group)));
+		__('Error sending message to group %s', groups_get_name ($dest_group)));
 }
 
 if (isset ($_GET["mark_read"]) || isset ($_GET["mark_unread"])) {
@@ -86,7 +86,7 @@ if (isset ($_GET["new_msg"])) { //create message
 		<td class="datos2">'.__('Message to').':</td>
 		<td class="datos2">';
 	
-	$users_full = get_group_users(array_keys(get_user_groups()));
+	$users_full = groups_get_users(array_keys(get_user_groups()));
 
 	$users = array();
 	foreach ($users_full as $user_id => $user_info) {
@@ -95,20 +95,20 @@ if (isset ($_GET["new_msg"])) { //create message
 		
 	$groups = get_user_groups ($config["id_user"], "AR"); //Get a list of all groups
 		
-	print_select ($users, "dest_user", $dest_user, '', __('-Select user-'), false, false, false, '', false);
+	html_print_select ($users, "dest_user", $dest_user, '', __('-Select user-'), false, false, false, '', false);
 	echo ' - '.__('OR').' - ';
-	print_select_groups($config["id_user"], "AR", true, "dest_group", $dest_group, '', __('-Select group-'), false, false, false, '', false);
+	html_print_select_groups($config["id_user"], "AR", true, "dest_group", $dest_group, '', __('-Select group-'), false, false, false, '', false);
 	
 	echo '</td></tr><tr><td class="datos">'.__('Subject').':</td><td class="datos">';
-	print_input_text ("subject", $subject, '', 50, 70, false);
+	html_print_input_text ("subject", $subject, '', 50, 70, false);
 	
 	echo '</td></tr><tr><td class="datos2">'.__('Message').':</td><td class="datos">';
 	
-	print_textarea ("mensaje", 15, 70, $message, '', false);
+	html_print_textarea ("mensaje", 15, 70, $message, '', false);
 	
 	echo '</td></tr><tr><td></td><td colspan="3">';
 	
-	print_submit_button (__('Send message'), 'send_mes', false, 'class="sub wand"', false);
+	html_print_submit_button (__('Send message'), 'send_mes', false, 'class="sub wand"', false);
 	
 	echo '</td></tr></table></form>';
 
@@ -155,12 +155,12 @@ if (isset ($_GET["new_msg"])) { //create message
 	//Start the message much like an e-mail reply 
 	$new_msg = "\n\n\nOn ".date ($config["date_format"], $message["timestamp"]).' '.get_user_fullname ($message["sender"]).' '.__('wrote').":\n\n".$message["message"];
 	
-	print_input_hidden ("dest_user", $message["sender"]);
-	print_input_hidden ("subject", urlencode ($new_subj));
-	print_input_hidden ("message", urlencode ($new_msg));
+	html_print_input_hidden ("dest_user", $message["sender"]);
+	html_print_input_hidden ("subject", urlencode ($new_subj));
+	html_print_input_hidden ("message", urlencode ($new_msg));
 	
 	echo '<div style="text-align:right; width:600px;">';
-	print_submit_button (__('Reply'), "reply_btn", false, 'class="sub next"'); 
+	html_print_submit_button (__('Reply'), "reply_btn", false, 'class="sub next"'); 
 	echo '</div></form>';
 	return;
 } 
@@ -179,7 +179,7 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) {
 	$messages = get_message_overview ($order, $order_dir);
 	
 	if ($num_messages > 0 && empty ($config["pure"]) && !is_ajax ()) {
-		echo '<p>'.__('You have').' <b>'.$num_messages.'</b> '.print_image ("images/email.png", true).' '.__('unread message(s)').'.</p>';
+		echo '<p>'.__('You have').' <b>'.$num_messages.'</b> '.html_print_image ("images/email.png", true).' '.__('unread message(s)').'.</p>';
 	}
 	
 	if (empty ($messages)) {
@@ -216,11 +216,11 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) {
 			$data[0] = '';
 			if ($message["status"] == 1) {
 				$data[0] .= '<a href="index.php?sec=messages&amp;sec2=operation/messages/message&amp;mark_unread='.$message_id.'">';
-				$data[0] .= print_image ("images/email_open.png", true, array ("border" => 0, "title" => __('Mark as unread')));
+				$data[0] .= html_print_image ("images/email_open.png", true, array ("border" => 0, "title" => __('Mark as unread')));
 				$data[0] .= '</a>';
 			} else {
 				$data[0] .= '<a href="index.php?sec=messages&amp;sec2=operation/messages/message&amp;read_message='.$message_id.'">';
-				$data[0] .= print_image ("images/email.png", true, array ("border" => 0, "title" => __('Message unread - click to read')));
+				$data[0] .= html_print_image ("images/email.png", true, array ("border" => 0, "title" => __('Message unread - click to read')));
 				$data[0] .= '</a>';
 			}
 			
@@ -236,17 +236,17 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) {
 			
 			$data[3] = ui_print_timestamp ($message["timestamp"], true, array ("prominent" => "timestamp"));
 			
-			$data[4] = print_input_image ("delete_message", "images/cross.png", $message_id, 'border:0px;', true);
+			$data[4] = html_print_input_image ("delete_message", "images/cross.png", $message_id, 'border:0px;', true);
 			array_push ($table->data, $data);
 		}
 
 		echo '<form method="post" action="index.php?sec=messages&amp;sec2=operation/messages/message">';
-		print_table ($table);
+		html_print_table ($table);
 		echo '</form>';
 	}
 	echo '<div class="action-buttons" style="width:85%">';
 	echo '<form method="post" action="index.php?sec=messages&amp;sec2=operation/messages/message&amp;new_msg=1">';
-	print_submit_button (__('New message'), "send_mes", false, 'class="sub next"');
+	html_print_submit_button (__('New message'), "send_mes", false, 'class="sub next"');
 	echo '</form></div>';
 }
 ?>
diff --git a/pandora_console/operation/reporting/custom_reporting.php b/pandora_console/operation/reporting/custom_reporting.php
index 7e30c35ca3..69fe34c350 100644
--- a/pandora_console/operation/reporting/custom_reporting.php
+++ b/pandora_console/operation/reporting/custom_reporting.php
@@ -59,11 +59,11 @@ foreach ($reports as $report) {
 	$data[0] = $report['name'];
 	$data[1] = $report['description'];
 	$data[2] = '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'">' .
-			print_image("images/reporting.png", true) . '</a>';
-	$data[3] = '<a href="ajax.php?page=operation/reporting/reporting_xml&id='.$report['id_report'].'">' . print_image("images/database_lightning.png", true) . '</a>'; //I chose ajax.php because it's supposed to give XML anyway
+			html_print_image("images/reporting.png", true) . '</a>';
+	$data[3] = '<a href="ajax.php?page=operation/reporting/reporting_xml&id='.$report['id_report'].'">' . html_print_image("images/database_lightning.png", true) . '</a>'; //I chose ajax.php because it's supposed to give XML anyway
 
 	enterprise_hook ('load_custom_reporting_2');
 	array_push ($table->data, $data);
 }
-print_table ($table);
+html_print_table ($table);
 ?>
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index fbfd9416de..cbe344766d 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -107,11 +107,11 @@ if ($view_graph) {
 
 	if ($config["pure"] == 0) {
 		$options['screen'] = "<a href='$url&pure=1'>"
-			. print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
+			. html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
 			. "</a>";
 	} else {
 		$options['screen'] = "<a href='$url&pure=0'>"
-			. print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
+			. html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
 			. "</a>";
 	}
 
@@ -130,17 +130,17 @@ if ($view_graph) {
 	echo "<b>".__('Date')."</b>"." ";
 	echo "</td>";
 	echo "<td>";
-	echo print_input_text ('date', $date, '', 12, 10, true). ' ';
+	echo html_print_input_text ('date', $date, '', 12, 10, true). ' ';
 	echo "</td>";
 	echo "<td>";
-	echo print_input_text ('time', $time, '', 7, 7, true). ' ';
+	echo html_print_input_text ('time', $time, '', 7, 7, true). ' ';
 	echo "</td>";
 	echo "<td class='datos'>";
 	echo "<b>".__('Period')."</b>";
 	echo "</td>";
 	echo "<td class='datos'>";
 	
-	print_select (custom_graphs_get_periods (), 'period', intval ($period / 3600),
+	html_print_select (custom_graphs_get_periods (), 'period', intval ($period / 3600),
 		'', '', 0, false, false, false);
 
 	echo "</td>";
@@ -151,7 +151,7 @@ if ($view_graph) {
 	$stackeds[1] = __('Stacked area');
 	$stackeds[2] = __('Line');
 	$stackeds[3] = __('Stacked line');
-	print_select ($stackeds, 'stacked', $stacked , '', '', -1, false, false);
+	html_print_select ($stackeds, 'stacked', $stacked , '', '', -1, false, false);
 
 	echo "</td>";
 	echo "<td class='datos'>";
@@ -160,7 +160,7 @@ if ($view_graph) {
 	$zooms[1] = __('Zoom x1');
 	$zooms[2] = __('Zoom x2');
 	$zooms[3] = __('Zoom x3');
-	print_select ($zooms, 'zoom', $zoom , '', '', 0);
+	html_print_select ($zooms, 'zoom', $zoom , '', '', 0);
 
 	echo "</td>";
 	echo "<td class='datos'>";
@@ -222,7 +222,7 @@ if (! empty ($graphs)) {
 		
 		array_push ($table->data, $data);
 	}
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo "<div class='nf'>".__('There are no defined reportings')."</div>";
 }
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index ae6d0e3fff..8744ec1492 100644
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -57,11 +57,11 @@ $url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id
 
 if ($config["pure"] == 0) {
 	$options['screen'] = "<a href='$url&pure=1'>"
-		. print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
+		. html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
 		. "</a>";
 } else {
 	$options['screen'] = "<a href='$url&pure=0'>"
-		. print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
+		. html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
 		. "</a>";
 }
 
@@ -74,24 +74,24 @@ $table->style[0] = 'font-weight: bold';
 $table->size = array ();
 $table->size[0] = '50px';
 $table->data = array ();
-$table->data[0][0] = print_image("images/reporting.png", true, array("width" => "32", "height" => "32")); 
+$table->data[0][0] = html_print_image("images/reporting.png", true, array("width" => "32", "height" => "32")); 
 if ($report['description'] != '') {
 	$table->data[0][1] = $report['description'];
 } else {
 	$table->data[0][1] = $report['name'];
 }
 $table->data[1][0] = __('Date');
-$table->data[1][1] = print_input_text ('date', $date, '', 12, 10, true). ' ';
-$table->data[1][1] .= print_input_text ('time', $time, '', 7, 7, true). ' ';
-$table->data[1][1] .= print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true);
+$table->data[1][1] = html_print_input_text ('date', $date, '', 12, 10, true). ' ';
+$table->data[1][1] .= html_print_input_text ('time', $time, '', 7, 7, true). ' ';
+$table->data[1][1] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true);
 
 echo '<form method="post" action="">';
-print_table ($table);
-print_input_hidden ('id_report', $id_report);
+html_print_table ($table);
+html_print_input_hidden ('id_report', $id_report);
 echo '</form>';
 
 echo '<div id="loading">';
-echo print_image("images/wait.gif", true, array("border" => '0'));
+echo html_print_image("images/wait.gif", true, array("border" => '0'));
 echo '<strong>'.__('Loading').'...</strong>';
 echo '</div>';
 
@@ -132,7 +132,7 @@ $table->class = 'databox report_table';
 $table->rowclass = array ();
 $table->rowclass[0] = 'datos3';
 
-$report["group_name"] = get_group_name ($report['id_group']);
+$report["group_name"] = groups_get_name ($report['id_group']);
 
 switch ($config["dbtype"]) {
 	case "mysql":
@@ -158,7 +158,7 @@ foreach ($contents as $content) {
 	
 	render_report_html_item ($content, $table, $report);
 
-	print_table ($table);
+	html_print_table ($table);
 	flush ();
 }
 ?>
diff --git a/pandora_console/operation/reporting/reporting_xml.php b/pandora_console/operation/reporting/reporting_xml.php
index 4ab64377a1..61f5bd5840 100644
--- a/pandora_console/operation/reporting/reporting_xml.php
+++ b/pandora_console/operation/reporting/reporting_xml.php
@@ -145,7 +145,7 @@ if ($datetime === false || $datetime == -1) {
 	exit;
 }
 
-$group_name = get_group_name ($report['id_group']);
+$group_name = groups_get_name ($report['id_group']);
 switch ($config["dbtype"]) {
 	case "mysql":
 		$contents = db_get_all_rows_field_filter ('treport_content', 'id_report', $id_report, '`order`');
@@ -417,7 +417,7 @@ foreach ($contents as $content) {
 			break;
 		case 'event_report_group':
 			$data["title"] = __('Group detailed event');
-			$data['group'] = get_group_name($content['id_agent']);
+			$data['group'] = groups_get_name($content['id_agent']);
 			$data["objdata"]["event_report_group"] = array();
 			
 			$events = get_group_detailed_event_reporting($content['id_agent'], $content['period'], $report["datetime"], true, false);
diff --git a/pandora_console/operation/search_agents.php b/pandora_console/operation/search_agents.php
index a96e846e4d..b66a636567 100755
--- a/pandora_console/operation/search_agents.php
+++ b/pandora_console/operation/search_agents.php
@@ -167,23 +167,23 @@ else {
 	
 		$table->head = array ();
 		$table->head[0] = __('Agent') . ' ' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
 		$table->head[1] = __('OS'). ' ' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=os&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '</a>' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=os&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . '</a>';
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=os&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '</a>' .
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=os&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . '</a>';
 		$table->head[2] = __('Interval'). ' ' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=interval&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectIntervalUp)) . '</a>' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=interval&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectIntervalDown)) . '</a>';
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=interval&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp)) . '</a>' .
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=interval&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown)) . '</a>';
 		$table->head[3] = __('Group'). ' ' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=group&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '</a>' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=group&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . '</a>';
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=group&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '</a>' .
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=group&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . '</a>';
 	$table->head[4] = __('Modules');
 	$table->head[5] = __('Status');
 	$table->head[6] = __('Alerts');
 	$table->head[7] = __('Last contact'). ' ' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectLastContactUp)) . '</a>' .
-			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectLastContactDown)) . '</a>';
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp)) . '</a>' .
+			'<a href="index.php?search_category=agents&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown)) . '</a>';
 	$table->head[8] = '';
 	
 	$table->align = array ();
@@ -232,7 +232,7 @@ else {
 		$manage_agent = '';
 		if (check_acl ($config['id_user'], $agent['id_grupo'], "AW")) {
 			$manage_agent = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='. $agent["id_agente"] . '">' .
-				print_image("images/setup.png", true, array("title" => __('Manage'), "alt" => __('Manage'))) . '</a>';
+				html_print_image("images/setup.png", true, array("title" => __('Manage'), "alt" => __('Manage'))) . '</a>';
 		}
 	
 		array_push($table->data, array(
@@ -248,7 +248,7 @@ else {
 	
 	echo "<br />";
 	ui_pagination ($totalAgents);
-	print_table ($table);
+	html_print_table ($table);
 	unset($table);
 	ui_pagination ($totalAgents);
 }
diff --git a/pandora_console/operation/search_alerts.php b/pandora_console/operation/search_alerts.php
index 155d297ec6..a19cff2cb9 100755
--- a/pandora_console/operation/search_alerts.php
+++ b/pandora_console/operation/search_alerts.php
@@ -200,17 +200,17 @@ else {
 	
 	$table->head = array ();
 	$table->head[0] = '' . ' ' . 
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=disabled&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectDisabledUp)) . '</a>' .
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=disabled&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectDisabledDown)) . '</a>';
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=disabled&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectDisabledUp)) . '</a>' .
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=disabled&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectDisabledDown)) . '</a>';
 	$table->head[1] = __('Agent') . ' ' . 
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=agent&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=agent&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=agent&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectAgentUp)) . '</a>' .
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=agent&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectAgentDown)) . '</a>';
 	$table->head[2] = __('Module') . ' ' . 
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=module&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=module&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=module&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectModuleUp)) . '</a>' .
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=module&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleDown)) . '</a>';
 	$table->head[3] = __('Template') . ' ' . 
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=template&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
-		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=template&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=template&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectTemplateUp)) . '</a>' .
+		'<a href="index.php?search_category=alerts&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=template&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectTemplateDown)) . '</a>';
 	$table->head[4] = __('Action');
 	
 	$table->align = array ();
@@ -230,9 +230,9 @@ else {
 	$table->data = array ();
 	foreach ($alerts as $alert) {
 		if ($alert['disabled'])
-			$disabledCell = print_image ('images/lightbulb_off.png', true, array('title' => 'disable', 'alt' => 'disable'));
+			$disabledCell = html_print_image ('images/lightbulb_off.png', true, array('title' => 'disable', 'alt' => 'disable'));
 		else
-			$disabledCell = print_image ('images/lightbulb.png', true, array('alt' => 'enable', 'title' => 'enable'));
+			$disabledCell = html_print_image ('images/lightbulb.png', true, array('alt' => 'enable', 'title' => 'enable'));
 		
 		$actionCell = '';
 		if (strlen($alert["actions"]) > 0) {
@@ -253,7 +253,7 @@ else {
 	}
 	
 	echo "<br />";ui_pagination ($totalAlerts);
-	print_table ($table); unset($table);
+	html_print_table ($table); unset($table);
 	ui_pagination ($totalAlerts);
 }
 ?>
diff --git a/pandora_console/operation/search_graphs.php b/pandora_console/operation/search_graphs.php
index 4b2edfb68e..6aed815332 100755
--- a/pandora_console/operation/search_graphs.php
+++ b/pandora_console/operation/search_graphs.php
@@ -72,7 +72,7 @@ else {
 	}
 	
 	echo "<br />";ui_pagination ($totalGraphs);
-	print_table ($table); unset($table);
+	html_print_table ($table); unset($table);
 	ui_pagination ($totalGraphs);
 }
 
diff --git a/pandora_console/operation/search_maps.php b/pandora_console/operation/search_maps.php
index c2083b1664..574355c5d7 100755
--- a/pandora_console/operation/search_maps.php
+++ b/pandora_console/operation/search_maps.php
@@ -80,7 +80,7 @@ else {
 	}
 	
 	echo "<br />";ui_pagination ($totalMaps);
-	print_table ($table); unset($table);
+	html_print_table ($table); unset($table);
 	ui_pagination ($totalMaps);
 }
 ?>
diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php
index 6cd03b1a37..2bc2613431 100644
--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@@ -158,17 +158,17 @@ else {
 	$table->head[0] = __('Module') . ' ' .
 		'<a href="index.php?search_category=modules&keywords=' . 
 			$config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . 
-			'&sort_field=module_name&sort=up">'. print_image("images/sort_up.png", true, array("style" => $selectModuleNameUp)) . '</a>' .
+			'&sort_field=module_name&sort=up">'. html_print_image("images/sort_up.png", true, array("style" => $selectModuleNameUp)) . '</a>' .
 		'<a href="index.php?search_category=modules&keywords=' .
 			$config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . 
-			'&sort_field=module_name&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectModuleNameDown)) . '</a>';	
+			'&sort_field=module_name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectModuleNameDown)) . '</a>';	
 	$table->head[1] = __('Agent') . ' ' .
 		'<a href="index.php?search_category=modules&keywords=' . 
 			$config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . 
-			'&sort_field=agent_name&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectAgentNameUp)) . '</a>' .
+			'&sort_field=agent_name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectAgentNameUp)) . '</a>' .
 		'<a href="index.php?search_category=modules&keywords=' .
 			$config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . 
-			'&sort_field=agent_name&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectAgentNameDown)) .'</a>';
+			'&sort_field=agent_name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectAgentNameDown)) .'</a>';
 	$table->head[2] = __('Type');
 	$table->head[3] = __('Interval');
 	$table->head[4] = __('Status');
@@ -237,8 +237,8 @@ else {
 	
 			$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".base64_encode($module["module_name"])."&refresh=600','day_".$win_handle."')";
 	
-			$graphCell = '<a href="javascript:'.$link.'">' . print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . '</a>';
-			$graphCell .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$module["id_agente"]."&amp;tab=data_view&period=86400&amp;id=".$module["id_agente_modulo"]."'>" . print_image('images/binary.png', true, array("border" => "0", "alt" => "")) . "</a>";
+			$graphCell = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . '</a>';
+			$graphCell .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$module["id_agente"]."&amp;tab=data_view&period=86400&amp;id=".$module["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("border" => "0", "alt" => "")) . "</a>";
 		}
 		
 		if (is_numeric($module["datos"]))
@@ -267,7 +267,7 @@ else {
 	
 	echo "<br />";
 	ui_pagination ($totalModules);
-	print_table ($table);
+	html_print_table ($table);
 	unset($table);
 	ui_pagination ($totalModules);
 }	
diff --git a/pandora_console/operation/search_reports.php b/pandora_console/operation/search_reports.php
index c303104a17..d4a6c48d5e 100755
--- a/pandora_console/operation/search_reports.php
+++ b/pandora_console/operation/search_reports.php
@@ -89,8 +89,8 @@ else {
 		$data = array(
 			$reportstring,
 			$report['description'],
-			'<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'">' . print_image("images/reporting.png", true) . '</a>',
-			'<a href="ajax.php?page=operation/reporting/reporting_xml&id='.$report['id_report'].'">' . print_image("images/database_lightning.png", true) . '</a>'
+			'<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'">' . html_print_image("images/reporting.png", true) . '</a>',
+			'<a href="ajax.php?page=operation/reporting/reporting_xml&id='.$report['id_report'].'">' . html_print_image("images/database_lightning.png", true) . '</a>'
 		);
 		enterprise_hook ('load_custom_reporting_2');
 		
@@ -98,7 +98,7 @@ else {
 	}
 		
 	echo "<br />";ui_pagination ($totalReports);
-	print_table ($table); unset($table);
+	html_print_table ($table); unset($table);
 	ui_pagination ($totalReports);
 }
 ?>
diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php
index 8419540b74..3ad022f5aa 100644
--- a/pandora_console/operation/search_results.php
+++ b/pandora_console/operation/search_results.php
@@ -54,7 +54,7 @@ $selected = 'border: 1px solid black;';
 
 if ($searchAgents) {
 	$agents_tab = array('text' => "<a href='index.php?search_category=agents&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-			. print_image ("images/bricks.png", true, array ("title" => __('Agents'))) . "</a>", 'active' => $searchTab == "agents");
+			. html_print_image ("images/bricks.png", true, array ("title" => __('Agents'))) . "</a>", 'active' => $searchTab == "agents");
 }
 else {
 	$agents_tab = '';
@@ -62,7 +62,7 @@ else {
 
 if ($searchUsers) {
 	$users_tab = array('text' => "<a href='index.php?search_category=users&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-			. print_image ("images/group.png", true, array ("title" => __('Users'))) . "</a>", 'active' => $searchTab == "users");
+			. html_print_image ("images/group.png", true, array ("title" => __('Users'))) . "</a>", 'active' => $searchTab == "users");
 }
 else {
 	$users_tab = '';
@@ -70,7 +70,7 @@ else {
 
 if ($searchAlerts) {
 	$alerts_tab = array('text' => "<a href='index.php?search_category=alerts&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-			. print_image ("images/god2.png", true, array ("title" => __('Alerts'))) . "</a>", 'active' => $searchTab == "alerts");
+			. html_print_image ("images/god2.png", true, array ("title" => __('Alerts'))) . "</a>", 'active' => $searchTab == "alerts");
 }
 else {
 	$alerts_tab = '';
@@ -78,7 +78,7 @@ else {
 		
 if ($searchGraphs) {
 	$graphs_tab = array('text' => "<a href='index.php?search_category=graphs&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-			. print_image ("images/chart_curve.png", true, array ("title" => __('Graphs'))) . "</a>", 'active' => $searchTab == "graphs");
+			. html_print_image ("images/chart_curve.png", true, array ("title" => __('Graphs'))) . "</a>", 'active' => $searchTab == "graphs");
 }
 else {
 	$graphs_tab = '';
@@ -86,7 +86,7 @@ else {
 
 if ($searchReports) {
 	$reports_tab = array('text' => "<a href='index.php?search_category=reports&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-			. print_image ("images/reporting.png", true, array ("title" => __('Reports'))) . "</a>", 'active' => $searchTab == "reports");
+			. html_print_image ("images/reporting.png", true, array ("title" => __('Reports'))) . "</a>", 'active' => $searchTab == "reports");
 }
 else {
 	$reports_tab = '';
@@ -94,7 +94,7 @@ else {
 
 if ($searchMaps) {
 	$maps_tab = array('text' => "<a href='index.php?search_category=maps&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-			. print_image ("images/camera.png", true, array ("title" => __('Maps'))) . "</a>", 'active' => $searchTab == "maps");
+			. html_print_image ("images/camera.png", true, array ("title" => __('Maps'))) . "</a>", 'active' => $searchTab == "maps");
 }
 else {
 	$maps_tab = '';
@@ -102,7 +102,7 @@ else {
 
 if ($searchModules) {
 	$modules_tab = array('text' => "<a href='index.php?search_category=modules&keywords=".$config['search_keywords']."&head_search_keywords=Search'>"
-			. print_image ("images/lightbulb.png", true, array ("title" => __('Modules'))) . "</a>", 'active' => $searchTab == "modules");
+			. html_print_image ("images/lightbulb.png", true, array ("title" => __('Modules'))) . "</a>", 'active' => $searchTab == "modules");
 }
 else {
 	$modules_tab = '';
diff --git a/pandora_console/operation/search_users.php b/pandora_console/operation/search_users.php
index a2756823c9..cc4b83a455 100755
--- a/pandora_console/operation/search_users.php
+++ b/pandora_console/operation/search_users.php
@@ -181,20 +181,20 @@ else {
 	
 	$table->head = array ();
 	$table->head[0] = __('User ID') . ' ' . 
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=id_user&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectUserIDUp)) . '</a>' .
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=id_user&sort=down">' . print_image("images/sort_down.png", true, array("style"=> $selectUserIDDown)) . '</a>';
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=id_user&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectUserIDUp)) . '</a>' .
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=id_user&sort=down">' . html_print_image("images/sort_down.png", true, array("style"=> $selectUserIDDown)) . '</a>';
 	$table->head[1] = __('Name') . ' ' . 
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
 	$table->head[2] = __('Email') . ' ' . 
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=email&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectEmailUp)) . '</a>' .
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=email&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectEmailDown)) . '</a>';
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=email&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectEmailUp)) . '</a>' .
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=email&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectEmailDown)) . '</a>';
 	$table->head[3] = __('Last contact') . ' ' . 
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectLastContactUp)) . '</a>' .
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectLastContactDown)) . '</a>';
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp)) . '</a>' .
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=last_contact&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown)) . '</a>';
 	$table->head[4] = __('Profile') . ' ' . 
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=profile&sort=up">' . print_image("images/sort_up.png", true, array("style" => $selectProfileUp)) . '</a>' .
-		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=profile&sort=down">' . print_image("images/sort_down.png", true, array("style" => $selectProfileDown)) . '</a>';
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=profile&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectProfileUp)) . '</a>' .
+		'<a href="index.php?search_category=users&keywords=' . $config['search_keywords'] . '&head_search_keywords=abc&offset=' . $offset . '&sort_field=profile&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectProfileDown)) . '</a>';
 	$table->head[5] = __('Description');
 
 	$table->data = array ();
@@ -204,12 +204,12 @@ else {
 				$user['id_user'] . "'>" . $user['id_user'] . "</a>";
 		
 		if ($user["is_admin"]) {
-			$profileCell = print_image ("images/user_suit.png", true,
+			$profileCell = html_print_image ("images/user_suit.png", true,
 			array ("alt" => __('Admin'),
 				"title" => __('Administrator'))).'&nbsp;';
 		}
 		else {
-			$profileCell = print_image ("images/user_green.png", true,
+			$profileCell = html_print_image ("images/user_green.png", true,
 			array ("alt" => __('User'),
 				"title" => __('Standard User'))).'&nbsp;';
 		}
@@ -219,7 +219,7 @@ else {
 			foreach ($result as $row) {
 				$profileCell .= get_profile_name ($row["id_perfil"]);
 				$profileCell .= " / ";
-				$profileCell .= get_group_name ($row["id_grupo"]);
+				$profileCell .= groups_get_name ($row["id_grupo"]);
 				$profileCell .= "<br />";
 			}
 		}
@@ -238,7 +238,7 @@ else {
 	}
 
 	echo "<br />";ui_pagination ($totalUsers);
-	print_table ($table); unset($table);
+	html_print_table ($table); unset($table);
 	ui_pagination ($totalUsers);
 }
 ?>
diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php
index 397e86eba4..eba7ef4089 100644
--- a/pandora_console/operation/servers/view_server.php
+++ b/pandora_console/operation/servers/view_server.php
@@ -88,5 +88,5 @@ foreach ($servers as $server) {
 	array_push ($table->data, $data);
 }
 
-print_table ($table);	
+html_print_table ($table);	
 ?>
diff --git a/pandora_console/operation/servers/view_server_detail.php b/pandora_console/operation/servers/view_server_detail.php
index 5e33e4b753..4887366ce1 100644
--- a/pandora_console/operation/servers/view_server_detail.php
+++ b/pandora_console/operation/servers/view_server_detail.php
@@ -25,7 +25,7 @@ require_once ($config['homedir'] . "/include/functions_network_profiles.php");
 
 $id_server = (int) get_parameter ("server_id", -1);
 
-$options = "<li><a href='index.php?sec=estado_server&sec2=operation/servers/view_server_detail&server_id=$id_server'>" . print_image("images/refresh.png", true) . "</a></li>";
+$options = "<li><a href='index.php?sec=estado_server&sec2=operation/servers/view_server_detail&server_id=$id_server'>" . html_print_image("images/refresh.png", true) . "</a></li>";
 
 ui_print_page_header (__('Pandora servers'), "images/server.png", false, "", false, $options);
 
@@ -100,7 +100,7 @@ foreach ($recon_tasks as $task) {
 	$data = array ();
 	
 	$data[0] = '<a href="index.php?sec=estado_server&amp;sec2=operation/servers/view_server_detail&amp;server_id='.$id_server.'&amp;force='.$task["id_rt"].'">';
-	$data[0] .= print_image ("images/target.png", true, array ("title" => __('Force')));
+	$data[0] .= html_print_image ("images/target.png", true, array ("title" => __('Force')));
 	$data[0] .= '</a>';
 	
 	$data[1] = '<b>'. $task["name"].'</b>';
@@ -123,12 +123,12 @@ foreach ($recon_tasks as $task) {
 
 	if ($task["id_recon_script"] == 0){
 		// Network recon task
-		$data[5] = print_image ("images/network.png", true, array ("title" => __('Network recon task')))."&nbsp;&nbsp;";
+		$data[5] = html_print_image ("images/network.png", true, array ("title" => __('Network recon task')))."&nbsp;&nbsp;";
 		$data[5] .= get_networkprofile_name ($task["id_network_profile"]);
 	}
 	else {
 		// APP recon task
-		$data[5] = print_image ("images/plugin.png", true). "&nbsp;&nbsp;";
+		$data[5] = html_print_image ("images/plugin.png", true). "&nbsp;&nbsp;";
 		$data[5] .= db_get_sql (sprintf("SELECT name FROM trecon_script WHERE id_recon_script = %d", $task["id_recon_script"]));
 	}
 		
@@ -142,7 +142,7 @@ foreach ($recon_tasks as $task) {
 	$data[7] = ui_print_timestamp ($task["utimestamp"], true);
 
 	if (check_acl ($config["id_user"], $task["id_group"], "PM")) {
-		$data[8] = '<a href="index.php?sec=gservers&amp;sec2=godmode/servers/manage_recontask_form&amp;update='.$task["id_rt"].'">'.print_image ("images/wrench_orange.png", true).'</a>';
+		$data[8] = '<a href="index.php?sec=gservers&amp;sec2=godmode/servers/manage_recontask_form&amp;update='.$task["id_rt"].'">'.html_print_image ("images/wrench_orange.png", true).'</a>';
 	}
 	else {
 		$data[8] = '';
@@ -155,7 +155,7 @@ if (empty ($table->data)) {
 	echo '<div class="nf">'.__("This server has no recon tasks assigned").'</div>';
 }
 else {
-	print_table ($table);
+	html_print_table ($table);
 }
 unset ($table);
 ?>
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index b84ab93fb9..f8cf85b317 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -41,11 +41,11 @@ $offset = (int) get_parameter ('offset',0);
 $url = "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_agent=".$filter_agent."&filter_oid=".$filter_oid."&filter_severity=".$filter_severity."&filter_fired=".$filter_fired."&search_string=".$search_string."&pagination=".$pagination."&offset=".$offset;
 
 if ($config["pure"]) {
-	$link = '<a target="_top" href="'.$url.'&pure=0&refr=30">' . print_image("images/normalscreen.png", true, array("title" => __('Normal screen')))  . '</a>';
+	$link = '<a target="_top" href="'.$url.'&pure=0&refr=30">' . html_print_image("images/normalscreen.png", true, array("title" => __('Normal screen')))  . '</a>';
 }
 else {
 	// Fullscreen
-	$link = '<a target="_top" href="'.$url.'&pure=1&refr=0">' . print_image("images/fullscreen.png", true, array("title" => __('Full screen'))) . '</a>';
+	$link = '<a target="_top" href="'.$url.'&pure=1&refr=0">' . html_print_image("images/fullscreen.png", true, array("title" => __('Full screen'))) . '</a>';
 }
 
 // Header
@@ -147,7 +147,7 @@ if (empty ($traps)) {
 }
 
 // Toggle filters
-echo '<a href="#" onmousedown="toggleDiv(\'filters\');"><b>'.__('Toggle filter(s)').'</b>&nbsp;' . print_image("images/down.png", true) . '</a>';
+echo '<a href="#" onmousedown="toggleDiv(\'filters\');"><b>'.__('Toggle filter(s)').'</b>&nbsp;' . html_print_image("images/down.png", true) . '</a>';
 
 echo '<form method="POST" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&refr='.$config["refr"].'&pure='.$config["pure"].'">';
 $table->width = '90%';
@@ -281,19 +281,19 @@ else {
 
 // Agent select
 $table->data[0][0] = '<strong>'.__('Agent').'</strong>';
-$table->data[0][1] = print_select ($agents, 'filter_agent', $filter_agent, 'javascript:this.form.submit();', __('All'), '', true);
+$table->data[0][1] = html_print_select ($agents, 'filter_agent', $filter_agent, 'javascript:this.form.submit();', __('All'), '', true);
 
 // OID select
 $table->data[0][2] = '<strong>'.__('OID').'</strong>';
-$table->data[0][3] = print_select ($oids, 'filter_oid', $filter_oid, 'javascript:this.form.submit();', __('All'), '', true);
+$table->data[0][3] = html_print_select ($oids, 'filter_oid', $filter_oid, 'javascript:this.form.submit();', __('All'), '', true);
 
 // Alert status select
 $table->data[1][0] = '<strong>'.__('Alert').'</strong>';
-$table->data[1][1] = print_select ($alerted, "filter_fired", $filter_fired, 'javascript:this.form.submit();', __('All'), '-1', true);
+$table->data[1][1] = html_print_select ($alerted, "filter_fired", $filter_fired, 'javascript:this.form.submit();', __('All'), '-1', true);
 
 // String search_string
 $table->data[1][2] = '<strong>'.__('Search value').'</strong>';
-$table->data[1][3] = print_input_text ('search_string', $search_string, '', 25, 0, true);
+$table->data[1][3] = html_print_input_text ('search_string', $search_string, '', 25, 0, true);
 
 // Block size for pagination select
 $table->data[2][0] = '<strong>'.__('Block size for pagination').'</strong>';
@@ -302,20 +302,20 @@ $paginations[50] = 50;
 $paginations[100] = 100;
 $paginations[200] = 200;
 $paginations[500] = 500;
-$table->data[2][1] = print_select ($paginations, "pagination", $pagination, 'this.form.submit();', __('Default'), $config["block_size"], true);
+$table->data[2][1] = html_print_select ($paginations, "pagination", $pagination, 'this.form.submit();', __('Default'), $config["block_size"], true);
 
 // Severity select
 $table->data[2][2] = '<strong>'.__('Severity').'</strong>';
-$table->data[2][3] = print_select ($severities, 'filter_severity', $filter_severity, 'this.form.submit();', __('All'), -1, true);
+$table->data[2][3] = html_print_select ($severities, 'filter_severity', $filter_severity, 'this.form.submit();', __('All'), -1, true);
 
 // Status
 $table->data[3][0] = '<strong>'.__('Status').'</strong>';
 $status[-1] = __('All');
 $status[0] = __('Not validated');
 $status[1] = __('Validated');
-$table->data[3][1] = print_select ($status, 'filter_status', $filter_status, 'this.form.submit();', '', '', true);
+$table->data[3][1] = html_print_select ($status, 'filter_status', $filter_status, 'this.form.submit();', '', '', true);
 
-print_table ($table);
+html_print_table ($table);
 unset ($table);
 
 echo '</form>';
@@ -379,7 +379,7 @@ $table->head[8] = __('Action');
 $table->align[8] = "center";
 $table->size[8] = '10%';
 
-$table->head[9] = print_checkbox_extended ("allbox", 1, false, false, "javascript:CheckAll();", 'class="chk" title="'.__('All').'"', true);
+$table->head[9] = html_print_checkbox_extended ("allbox", 1, false, false, "javascript:CheckAll();", 'class="chk" title="'.__('All').'"', true);
 $table->align[9] = "center";
 $table->size[9] = '5%';
 
@@ -398,9 +398,9 @@ if ($traps !== false) {
 		
 		//Status
 		if ($trap["status"] == 0) {
-			$data[0] = print_image("images/pixel_red.png", true, array("title" => __('Not validated'), "width" => "20", "height" => "20"));
+			$data[0] = html_print_image("images/pixel_red.png", true, array("title" => __('Not validated'), "width" => "20", "height" => "20"));
 		} else {
-			$data[0] = print_image("images/pixel_green.png", true, array("title" => __('Validated'), "width" => "20", "height" => "20"));
+			$data[0] = html_print_image("images/pixel_green.png", true, array("title" => __('Validated'), "width" => "20", "height" => "20"));
 		}
 	
 		// Agent matching source address
@@ -457,9 +457,9 @@ if ($traps !== false) {
 		
 		// Use alert severity if fired
 		if (!empty ($trap["alerted"])) {
-			$data[7] = print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert fired'))); 		
+			$data[7] = html_print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert fired'))); 		
 		} else {
-			$data[7] = print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert not fired')));
+			$data[7] = html_print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert not fired')));
 		}
 	
 		// Severity	
@@ -469,14 +469,14 @@ if ($traps !== false) {
 		$data[8] = "";
 		
 		if (empty ($trap["status"]) && check_acl ($config["id_user"], 0, "IW")) {
-			$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&check='.$trap["id_trap"].'">' . print_image("images/ok.png", true, array("border" => '0', "title" => __('Validate'))) . '</a>';
+			$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&check='.$trap["id_trap"].'">' . html_print_image("images/ok.png", true, array("border" => '0', "title" => __('Validate'))) . '</a>';
 		}
 		if (check_acl ($config["id_user"], 0, "IM")) {
-			$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&delete='.$trap["id_trap"].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">' . print_image("images/cross.png", true, array("border" => "0", "title" => __('Delete'))) . '</a>';
+			$data[8] .= '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&delete='.$trap["id_trap"].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">' . html_print_image("images/cross.png", true, array("border" => "0", "title" => __('Delete'))) . '</a>';
 		}
-		$data[8] .= '<a href="javascript: toggleVisibleExtendedInfo(' . $trap["id_trap"] . ');">' . print_image("images/eye.png", true, array("alt" => __('Show more'), "title" => __('Show more'))) .'</a>';
+		$data[8] .= '<a href="javascript: toggleVisibleExtendedInfo(' . $trap["id_trap"] . ');">' . html_print_image("images/eye.png", true, array("alt" => __('Show more'), "title" => __('Show more'))) .'</a>';
 		
-		$data[9] = print_checkbox_extended ("snmptrapid[]", $trap["id_trap"], false, false, '', 'class="chk"', true);
+		$data[9] = html_print_checkbox_extended ("snmptrapid[]", $trap["id_trap"], false, false, '', 'class="chk"', true);
 	
 		array_push ($table->data, $data);
 		
@@ -502,40 +502,40 @@ if ($traps !== false) {
 if ($idx == 0) {
 	echo '<div class="nf">'.__('No matching traps found').'</div>';
 } else {
-	print_table ($table);	
+	html_print_table ($table);	
 }
 
 unset ($table);
 
 echo '<div style="width:735px; text-align:right;">';
 if (check_acl ($config["id_user"], 0, "IW")) {
-	print_submit_button (__('Validate'), "updatebt", false, 'class="sub ok"');
+	html_print_submit_button (__('Validate'), "updatebt", false, 'class="sub ok"');
 }
 
 if (check_acl ($config['id_user'], 0, "IM")) {
 	echo "&nbsp;";
-	print_submit_button (__('Delete'), "deletebt", false, 'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"');
+	html_print_submit_button (__('Delete'), "deletebt", false, 'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"');
 }
 echo "</div></form>";
 
 
 echo '<div style="float:left; padding-left:30px; line-height: 17px; vertical-align: top; width:120px;">';
 echo '<h3>' . __('Status') . '</h3>';
-echo print_image("images/pixel_green.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Validated');
+echo html_print_image("images/pixel_green.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Validated');
 echo '<br />';
-echo print_image("images/pixel_red.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not validated');
+echo html_print_image("images/pixel_red.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not validated');
 echo '</div>';
 echo '<div style="float:left; padding-left:30px; line-height: 17px; vertical-align: top; width:120px;">';
 echo '<h3>' . __('Alert') . '</h3>';
-echo print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20")) . ' - ' .__('Fired');
+echo html_print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20")) . ' - ' .__('Fired');
 echo '<br />';
-echo print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not fired');
+echo html_print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not fired');
 echo '</div>';
 echo '<div style="float:left; padding-left:30px; line-height: 19px; vertical-align: top; width:120px;">';
 echo '<h3>' . __('Action') . '</h3>';
-echo print_image("images/ok.png", true, array("width" => "20", "height" => "20")) . ' - ' .__('Validate');
+echo html_print_image("images/ok.png", true, array("width" => "20", "height" => "20")) . ' - ' .__('Validate');
 echo '<br />';
-echo print_image("images/cross.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Delete');
+echo html_print_image("images/cross.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Delete');
 echo '</div>';
 echo '<div style="float:left; padding-left:30px; line-height: 17px; vertical-align: top; width:120px;">';
 echo '<h3>'.__('Legend').'</h3>';
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 2f9286899e..de74a8f22d 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -99,49 +99,49 @@ echo "</td>";
 // Show "Picture" (in future versions, why not, allow users to upload it's own avatar here.
 echo "<td rowspan=4>";
 if (is_user_admin ($id)) {
-	echo print_image('images/people_1.png', true); 
+	echo html_print_image('images/people_1.png', true); 
 } 
 else {
-	echo print_image('images/people_2.png', true); 
+	echo html_print_image('images/people_2.png', true); 
 }
 
 echo '</td></tr><tr><td class="datos2">'.__('Full (display) name').'</td><td class="datos2">';
-print_input_text_extended ("fullname", $user_info["fullname"], '', '', 35, 100, $view_mode, '', 'class="input"');
+html_print_input_text_extended ("fullname", $user_info["fullname"], '', '', 35, 100, $view_mode, '', 'class="input"');
 
 // Not used anymore. In 3.0 database schema continues storing it, but will be removed in the future, or we will 'reuse'
 // the database fields for anything more useful.
 
 /*
 echo '</td></tr><tr><td class="datos">'.__('First name').'</td><td class="datos">';
-print_input_text_extended ("firstname", $user_info["firstname"], '', '', 25, 100, $view_mode, '', 'class="input"');
+html_print_input_text_extended ("firstname", $user_info["firstname"], '', '', 25, 100, $view_mode, '', 'class="input"');
 
 echo '</td></tr><tr><td class="datos2">'.__('Last name').'</td><td class="datos2">';
-print_input_text_extended ("lastname", $user_info["lastname"], '', '', 25, 100, $view_mode, '', 'class="input"');
+html_print_input_text_extended ("lastname", $user_info["lastname"], '', '', 25, 100, $view_mode, '', 'class="input"');
 
 */
 if ($view_mode === false) {
 	if ($config["user_can_update_password"]) {
 		echo '</td></tr><tr><td class="datos">'.__('New Password').'</td><td class="datos">';
-		print_input_text_extended ("password_new", "", '', '', '15', '25', $view_mode, '', 'class="input"', false, true);
+		html_print_input_text_extended ("password_new", "", '', '', '15', '25', $view_mode, '', 'class="input"', false, true);
 		echo '</td></tr><tr><td class="datos">'.__('Password confirmation').'</td><td class="datos">';
-		print_input_text_extended ("password_conf", "", '', '', '15', '25', $view_mode, '', 'class="input"', false, true);
+		html_print_input_text_extended ("password_conf", "", '', '', '15', '25', $view_mode, '', 'class="input"', false, true);
 	} else {
 		echo '<i>'.__('You can not change your password from Pandora FMS under the current authentication scheme').'</i>';
 	}
 }
 
 echo '</td></tr><tr><td class="datos2">'.__('E-mail').'</td><td class="datos2">';
-print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"');
+html_print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"');
 
 echo '</td></tr><tr><td class="datos">'.__('Phone number').'</td><td class="datos">';
-print_input_text_extended ("phone", $user_info["phone"], '', '', '10', '30', $view_mode, '', 'class="input"');
+html_print_input_text_extended ("phone", $user_info["phone"], '', '', '10', '30', $view_mode, '', 'class="input"');
 
 echo '</td></tr><tr><td class="datos">'.__('Language').'</td><td class="datos2">';
-echo print_select_from_sql ('SELECT id_language, name FROM tlanguage',
+echo html_print_select_from_sql ('SELECT id_language, name FROM tlanguage',
 	'language', $user_info["language"], '', '', '', true);
 
 echo '</td></tr><tr><td class="datos2">'.__('Comments').'</td><td class="datos">';
-print_textarea ("comments", 2, 60, $user_info["comments"], ($view_mode ? 'readonly="readonly"' : ''));
+html_print_textarea ("comments", 2, 60, $user_info["comments"], ($view_mode ? 'readonly="readonly"' : ''));
    
 $own_info = get_user_info ($config['id_user']);
 if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
@@ -164,9 +164,9 @@ if (count($usr_groups) > 1){
 
 echo '</td></tr><tr><td class="datos">'.__('Flash charts').'</td><td class="datos2">';
 $values = array(-1 => __('Default'),1 => __('Yes'),0 => __('No'));
-echo print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
+echo html_print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
 echo '</td></tr><tr><td class="datos">'.__('Block size for pagination').'</td><td class="datos2">';
-echo print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);
+echo html_print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);
 
 echo '</td></tr></table>';
 
@@ -174,7 +174,7 @@ echo '<div style="width:90%; text-align:right;">';
 if (!$config["user_can_update_info"]) {
 	echo '<i>'.__('You can not change your user info from Pandora FMS under the current authentication scheme').'</i>';
 } else {
-	print_submit_button (__('Update'), 'uptbutton', $view_mode, 'class="sub upd"');
+	html_print_submit_button (__('Update'), 'uptbutton', $view_mode, 'class="sub upd"');
 }
 echo '</div></form>';
 
@@ -199,12 +199,12 @@ if ($result === false) {
 
 foreach ($result as $profile) {
 	$data[0] = '<b>'.get_profile_name ($profile["id_perfil"]).'</b>';
-	$data[1] = ui_print_group_icon ($profile["id_grupo"], true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'">'.get_group_name ($profile["id_grupo"], true).'</a>';
+	$data[1] = ui_print_group_icon ($profile["id_grupo"], true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'">'.groups_get_name ($profile["id_grupo"], true).'</a>';
 	array_push ($table->data, $data);
 }
 
 if (!empty ($table->data)) {
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo '<div class="nf">'.__('This user doesn\'t have any assigned profile/group').'</div>'; 
 }
diff --git a/pandora_console/operation/visual_console/index.php b/pandora_console/operation/visual_console/index.php
index 6fa8369c77..a77802e3d3 100644
--- a/pandora_console/operation/visual_console/index.php
+++ b/pandora_console/operation/visual_console/index.php
@@ -54,14 +54,14 @@ foreach ($layouts as $layout) {
 	$data[0] = '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.
 		$layout['id'].'">'.$layout['name'].'</a> ';
 	$data[1] = ui_print_group_icon ($layout["id_group"], true);
-	$data[1] .= "&nbsp;".get_group_name ($layout["id_group"], true);
+	$data[1] .= "&nbsp;".groups_get_name ($layout["id_group"], true);
 	$data[2] = db_get_value ('COUNT(*)', 'tlayout_data', 'id_layout', $layout['id']);
 		
 	array_push ($table->data, $data);
 }
 
 if (!empty ($table->data)) {
-	print_table ($table);
+	html_print_table ($table);
 } else {
 	echo '<div class="nf">'.__('No layouts found').'</div>';
 }
diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index 713524220d..20a3eee47e 100644
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -55,18 +55,18 @@ if (! check_acl ($config["id_user"], $id_group, "AR")) {
 $options = array();
 
 if (check_acl ($config["id_user"], $id_group, "AW")) {
-	$options['setup']['text'] = '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=data&action=edit&id_visual_console='.$id_layout.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
+	$options['setup']['text'] = '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=data&action=edit&id_visual_console='.$id_layout.'">'.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
 	$options['setup']['active'] = false;
 }
 
 if ($config["pure"] == 0) {
 	$options['pure']['text'] = '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'&amp;pure=1">'
-		. print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
+		. html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode')))
 		. "</a>";
 }
 else {
 	$options['pure']['text'] = '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'">'
-		. print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
+		. html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode')))
 		. "</a>";
 }
 $options['pure']['active'] = false;
@@ -88,8 +88,8 @@ $values[1800] = human_time_description_raw (1800);
 $table->width = 500;
 $table->data = array ();
 $table->data[0][0] = __('Autorefresh time');
-$table->data[0][1] = print_select ($values, 'refr', $config["refr"], '', 'N/A', 0, true, false, false);
-$table->data[0][2] = print_submit_button (__('Refresh'), '', false, 'class="sub next"', true);
+$table->data[0][1] = html_print_select ($values, 'refr', $config["refr"], '', 'N/A', 0, true, false, false);
+$table->data[0][2] = html_print_submit_button (__('Refresh'), '', false, 'class="sub next"', true);
 
 echo '<div style="height:30px">&nbsp;</div>';
 
@@ -100,9 +100,9 @@ if ($config['pure'] && $config["refr"] != 0) {
 echo '<div style="height:30px">&nbsp;</div>';
 
 echo '<form method="post" action="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view">';
-print_input_hidden ('pure', $config["pure"]);
-print_input_hidden ('id', $id_layout);
-print_table ($table);
+html_print_input_hidden ('pure', $config["pure"]);
+html_print_input_hidden ('id', $id_layout);
+html_print_table ($table);
 echo '</form>';
 
 if ($config["pure"] && $config["refr"] != 0) {