diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2b5f9b19ea..ab10570a08 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,209 @@ +2011-04-13 Juan Manuel Ramon + + * include/functions_events.php + include/functions_html.php + include/functions_modules.php + include/functions_reporting.php + include/functions_filemanager.php + include/functions_gis.php + include/functions_networkmap.php + include/functions_visual_map.php + include/ajax/reporting.ajax.php + include/help/en/help_timesource.php + include/help/es/help_timesource.php + include/help/ja/help_timesource.php + include/functions_ui.php + include/functions.php + include/functions_db.php + include/functions_ui_renders.php + index.php + extensions/insert_data.php + extensions/system_info.php + extensions/extension_uploader.php + extensions/pandora_logs.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 + extensions/plugin_registration.php + operation/incidents/incident.php + operation/incidents/incident.files.php + operation/incidents/incident_detail.php + operation/incidents/incident.workunits.php + operation/incidents/incident.list.php + operation/incidents/incident_statistics.php + operation/search_modules.php + operation/visual_console/render_view.php + operation/visual_console/index.php + operation/extensions.php + operation/agentes/status_monitor.php + operation/agentes/alerts_status.php + operation/agentes/datos_agente.php + operation/agentes/estado_ultimopaquete.php + operation/agentes/custom_fields.php + operation/agentes/estado_generalagente.php + operation/agentes/networkmap.topology.php + operation/agentes/estado_agente.php + operation/agentes/alerts_status.functions.php + operation/agentes/networkmap.groups.php + operation/agentes/bulbs.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/agent_fields.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/gis_maps/render_view.php + operation/gis_maps/ajax.php + operation/gis_maps/index.php + operation/integria_incidents/incident.php + operation/integria_incidents/incident.files.php + operation/integria_incidents/incident_detail.php + operation/integria_incidents/incident.workunits.php + operation/integria_incidents/incident.list.php + operation/integria_incidents/incident_statistics.php + operation/events/event_statistics.php + operation/events/events_list.php + operation/events/events.php + operation/search_alerts.php + operation/messages/message.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 + extras/pandora_diag.php + mobile/operation/agents/monitor_status.php + mobile/operation/agents/view_agents.php + mobile/operation/agents/view_alerts.php + mobile/operation/events/events.php + mobile/operation/servers/view_servers.php + mobile/include/functions_web.php + general/footer.php + general/noaccess.php + general/logon_ok.php + general/main_menu.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/db/db_main.php + godmode/db/db_audit.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/extensions.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/module_manager_editor_prediction.php + godmode/agentes/agent_conf_gis.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/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/snmpconsole/snmp_alert.php + godmode/snmpconsole/snmp_filters.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_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/visual_console_builder.php + godmode/reporting/reporting_builder.preview.php + godmode/reporting/visual_console_builder.data.php + godmode/reporting/visual_console_builder.elements.php + godmode/reporting/graph_builder.php + godmode/reporting/visual_console_builder.preview.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 all functions of + include/functions_ui have ui_ prefix. + 2011-04-13 Miguel de Dios * include/functions_graph.php, godmode/db/db_info.php, diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 24b1fa6f14..f7cef6d74d 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -49,7 +49,7 @@ function mainAgentsModules() { if ($config["realtimestats"] == 0) { - $updated_info = __('Last update'). " : ". print_timestamp (get_db_sql ("SELECT min(utimestamp) FROM tgroup_stat"), true); + $updated_info = __('Last update'). " : ". ui_print_timestamp (get_db_sql ("SELECT min(utimestamp) FROM tgroup_stat"), true); } else { $updated_info = __("Updated at realtime"); @@ -67,18 +67,18 @@ function mainAgentsModules() { $groups = get_user_groups (); - $filter_module_groups = '
'; + $filter_module_groups = ''; $filter_module_groups .= ''.__('Module group').''; $filter_module_groups .= 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 .= '
'; - $filter_groups = '
'; + $filter_groups = ''; $filter_groups .= ''.__('Group').''; $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 .= '
'; - $comborefr = '
'; + $comborefr = ''; $comborefr .= ''.__('Refresh').''; $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 .= "
"; @@ -104,7 +104,7 @@ function mainAgentsModules() { } // Header - print_page_header (__("Agents/Modules"), "images/bricks.png", false, "", false, $onheader); + ui_print_page_header (__("Agents/Modules"), "images/bricks.png", false, "", false, $onheader); // Old style table, we need a lot of special formatting,don't use table function // Prepare old-style table @@ -174,7 +174,7 @@ function mainAgentsModules() { continue; } - $file_name = string2image(printTruncateText($module['name'],15, false, true, false, '...'), 115, 13, 3, 270, '#9EAC8B', 'FFF', 4, 0); + $file_name = string2image(ui_print_truncate_text($module['name'],15, false, true, false, '...'), 115, 13, 3, 270, '#9EAC8B', 'FFF', 4, 0); echo ''.print_image($file_name, true, array('title' => $module['name'])).""; } @@ -188,7 +188,7 @@ function mainAgentsModules() { $filter_agents = array('id_grupo' => $group_id); } // Prepare pagination - pagination ((int)count(get_agents ($filter_agents))); + ui_pagination ((int)count(get_agents ($filter_agents))); echo "
"; foreach ($agents as $agent) { @@ -222,7 +222,7 @@ function mainAgentsModules() { echo ""; - $file_name = string2image(printTruncateText($agent['nombre'],19, false, true, false, '...'), 140, 15, 3, 0, $rowcolor, $textcolor, 4, 0); + $file_name = string2image(ui_print_truncate_text($agent['nombre'],19, false, true, false, '...'), 140, 15, 3, 0, $rowcolor, $textcolor, 4, 0); echo "".print_image($file_name, true, array('title' => $agent['nombre'])).""; $agent_modules = get_agent_modules($agent['id_agente']); @@ -247,19 +247,19 @@ function mainAgentsModules() { echo ''; switch($status){ case 0: - print_status_image ('module_ok.png', $module['name']." in ".$agent['nombre'].": ".__('NORMAL'), false, array('width' => '20px', 'height' => '20px')); + ui_print_status_image ('module_ok.png', $module['name']." in ".$agent['nombre'].": ".__('NORMAL'), false, array('width' => '20px', 'height' => '20px')); break; case 1: - print_status_image ('module_critical.png', $module['name']." in ".$agent['nombre'].": ".__('CRITICAL'), false, array('width' => '20px', 'height' => '20px')); + ui_print_status_image ('module_critical.png', $module['name']." in ".$agent['nombre'].": ".__('CRITICAL'), false, array('width' => '20px', 'height' => '20px')); break; case 2: - print_status_image ('module_warning.png', $module['name']." in ".$agent['nombre'].": ".__('WARNING'), false, array('width' => '20px', 'height' => '20px')); + ui_print_status_image ('module_warning.png', $module['name']." in ".$agent['nombre'].": ".__('WARNING'), false, array('width' => '20px', 'height' => '20px')); break; case 3: - print_status_image ('module_unknown.png', $module['name']." in ".$agent['nombre'].": ".__('UNKNOWN'), false, array('width' => '20px', 'height' => '20px')); + ui_print_status_image ('module_unknown.png', $module['name']." in ".$agent['nombre'].": ".__('UNKNOWN'), false, array('width' => '20px', 'height' => '20px')); break; case 4: - print_status_image ('module_alertsfired.png', $module['name']." in ".$agent['nombre'].": ".__('ALERTS FIRED'), false, array('width' => '20px', 'height' => '20px')); + ui_print_status_image ('module_alertsfired.png', $module['name']." in ".$agent['nombre'].": ".__('ALERTS FIRED'), false, array('width' => '20px', 'height' => '20px')); break; } echo ''; diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php index 5c70e8e6bc..611f2e2427 100644 --- a/pandora_console/extensions/dbmanager.php +++ b/pandora_console/extensions/dbmanager.php @@ -79,7 +79,7 @@ function dbmanager_query ($sql, &$error) { function dbmgr_extension_main () { - require_css_file ('dbmanager', 'extensions/dbmanager/'); + ui_require_css_file ('dbmanager', 'extensions/dbmanager/'); global $config; @@ -91,7 +91,7 @@ function dbmgr_extension_main () { $sql = (string) get_parameter ('sql'); - print_page_header (__('Database interface'), "", false, false, true); + ui_print_page_header (__('Database interface'), "", false, false, true); echo '
'; echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that you can damage your Pandora FMS installation if you don't know exactly what are you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used only by experienced users with a depth knowledge of Pandora FMS internals."; diff --git a/pandora_console/extensions/extension_uploader.php b/pandora_console/extensions/extension_uploader.php index 396d06d143..870d3a665b 100644 --- a/pandora_console/extensions/extension_uploader.php +++ b/pandora_console/extensions/extension_uploader.php @@ -17,7 +17,7 @@ function extension_uploader_extensions() { global $config; - print_page_header (__("Uploader extension"), "images/extensions.png", false, "", true, ""); + ui_print_page_header (__("Uploader extension"), "images/extensions.png", false, "", true, ""); $upload = (bool)get_parameter('upload', 0); @@ -46,7 +46,7 @@ function extension_uploader_extensions() { pandora_audit ("Extension manager", "Upload extension " . $_FILES['extension']['name']); } - print_result_message ($result, __('Success to upload extension'), + ui_print_result_message ($result, __('Success to upload extension'), __('Fail to upload extension')); } @@ -56,7 +56,7 @@ function extension_uploader_extensions() { $table->data = array(); $table->data[0][0] = __('Upload extension'); $table->data[0][1] = print_input_file('extension', true) . - print_help_tip (__("Upload the extension as a zip file."), true); + ui_print_help_tip (__("Upload the extension as a zip file."), true); echo "
"; print_table($table); diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php index aa14788a7f..b599053f8d 100644 --- a/pandora_console/extensions/insert_data.php +++ b/pandora_console/extensions/insert_data.php @@ -35,17 +35,17 @@ function createXMLData($agent, $agentModule, $time, $data) { safe_output($agentModule['nombre']), safe_output($agentModule['descripcion']), get_module_type_name($agentModule['id_tipo_modulo']), $data); if (false === @file_put_contents($config['remote_config'] . '/' . safe_output($agent['nombre']) . '.' . strtotime($time) . '.data', $xml)) { - print_error_message(sprintf(__('Can\'t save agent (%s), module (%s) data xml.'), $agent['nombre'], $agentModule['nombre'])); + ui_print_error_message(sprintf(__('Can\'t save agent (%s), module (%s) data xml.'), $agent['nombre'], $agentModule['nombre'])); } else { - print_success_message(sprintf(__('Save agent (%s), module (%s) data xml.'), $agent['nombre'], $agentModule['nombre'])); + ui_print_success_message(sprintf(__('Save agent (%s), module (%s) data xml.'), $agent['nombre'], $agentModule['nombre'])); } } function mainInsertData() { global $config; - print_page_header (__("Insert data"), "images/extensions.png", false, "", true, ""); + ui_print_page_header (__("Insert data"), "images/extensions.png", false, "", true, ""); if (! check_acl ($config['id_user'], 0, "AW") && ! is_user_admin ($config['id_user'])) { pandora_audit("ACL Violation", "Trying to access Setup Management"); @@ -74,7 +74,7 @@ function mainInsertData() { if ($save) { if (!check_acl($config['id_user'], get_agent_group(get_agent_id($id_agent)), "AW")) { - print_error_message(__('You haven\'t privileges for insert data in the agent.')); + ui_print_error_message(__('You haven\'t privileges for insert data in the agent.')); } else { $agent = get_db_row_filter('tagente', array('nombre' => $id_agent)); @@ -138,11 +138,11 @@ function mainInsertData() { echo "
"; - require_css_file ('datepicker'); - require_jquery_file ('ui.core'); - require_jquery_file ('ui.datepicker'); - require_jquery_file ('timeentry'); - require_jquery_file ('autocomplete'); + ui_require_css_file ('datepicker'); + ui_require_jquery_file ('ui.core'); + ui_require_jquery_file ('ui.datepicker'); + ui_require_jquery_file ('timeentry'); + ui_require_jquery_file ('autocomplete'); ?> diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index 0ca3baf63d..594885cd3f 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -49,7 +49,7 @@ if ($a_template !== false){ exit; }else // Header - print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "", true); + ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "", true); // If user tries to duplicate/edit a template of others groups }else{ $own_info = get_user_info ($config['id_user']); @@ -61,7 +61,7 @@ if ($a_template !== false){ // Then template group have to be in his own groups if ($is_in_group) // Header - print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "", true); + ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "", true); else{ pandora_audit("ACL Violation", "Trying to access Alert Management"); @@ -72,7 +72,7 @@ if ($a_template !== false){ // This prevents to duplicate the header in case duplicate/edit_template action is performed }else // Header - print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "", true); + ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "", true); if ($duplicate_template) { @@ -87,7 +87,7 @@ if ($duplicate_template) { pandora_audit("Template alert management", "Fail try to duplicate alert template " . $source_id); } - print_result_message ($id, + ui_print_result_message ($id, __('Successfully created from %s', get_alert_template_name ($source_id)), __('Could not be created')); } @@ -323,7 +323,7 @@ if ($create_template) { pandora_audit("Command management", "Fail try to create alert command", false, false, json_encode($values)); } - print_result_message ($result, + ui_print_result_message ($result, __('Successfully created'), __('Could not be created')); /* Go to previous step in case of error */ @@ -336,7 +336,7 @@ if ($create_template) { if ($update_template) { $result = update_template ($step - 1); - print_result_message ($result, + ui_print_result_message ($result, __('Successfully updated'), __('Could not be updated')); /* Go to previous step in case of error */ @@ -445,13 +445,13 @@ if ($step == 2) { $table->data[3][3] = print_input_text ('max_alerts', $max_alerts, '', 5, 7, true); - $table->data['field1'][0] = __('Field 1') . print_help_icon ('alert_macros', 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['field2'][0] = __('Field 2') . print_help_icon ('alert_macros', 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['field3'][0] = __('Field 3') . print_help_icon ('alert_macros', 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[4][0] = __('Default action'); @@ -459,7 +459,7 @@ if ($step == 2) { $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, 'default_action', $default_action, '', __('None'), 0, - true, false, false).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); + 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) { /* Alert recover */ if (! $recovery_notify) { @@ -563,7 +563,7 @@ if ($step == 2) { $table->data['max'][0] = __('Max.'); $table->data['max'][1] = print_input_text ('max', $max, '', 5, 255, true); - $table->data['example'][1] = print_alert_template_example ($id, true, false); + $table->data['example'][1] = ui_print_alert_template_example ($id, true, false); $table->colspan['example'][1] = 2; } @@ -592,9 +592,9 @@ if ($step >= LAST_STEP) { echo '
'; echo ''; -require_jquery_file ('ui.core'); -require_jquery_file ('timeentry'); -require_javascript_file ('pandora_alerts'); +ui_require_jquery_file ('ui.core'); +ui_require_jquery_file ('timeentry'); +ui_require_javascript_file ('pandora_alerts'); ?> '; * relative by default * @param bool Whether to add POST values to the URL. */ -function get_url_refresh ($params = false, $relative = true, $add_post = true) { +function ui_get_url_refresh ($params = false, $relative = true, $add_post = true) { // Agent selection filters and refresh global $config; $url = ''; @@ -1550,7 +1552,7 @@ function get_url_refresh ($params = false, $relative = true, $add_post = true) { $url = htmlspecialchars ($url); if (! $relative) { - return get_full_url ($url); + return ui_get_full_url ($url); } return $url; @@ -1565,7 +1567,7 @@ function get_url_refresh ($params = false, $relative = true, $add_post = true) { * * @return string A full URL in Pandora. */ -function get_full_url ($url = false) { +function ui_get_full_url ($url = false) { global $config; $was_empty = false; @@ -1612,7 +1614,7 @@ function get_full_url ($url = false) { * @return string Header HTML */ -function print_page_header ($title, $icon = "", $return = false, $help = "", $godmode = false, $options = ""){ +function ui_print_page_header ($title, $icon = "", $return = false, $help = "", $godmode = false, $options = ""){ $title = safe_input_html($title); if (($icon == "") && ($godmode == true)){ $icon = "images/setup.png"; @@ -1640,7 +1642,7 @@ function print_page_header ($title, $icon = "", $return = false, $help = "", $go $buffer .= ''; if (is_array($options)) { diff --git a/pandora_console/include/functions_ui_renders.php b/pandora_console/include/functions_ui_renders.php index 7f65494ab4..c1974e1881 100644 --- a/pandora_console/include/functions_ui_renders.php +++ b/pandora_console/include/functions_ui_renders.php @@ -39,14 +39,14 @@ function render_agent_field ($agent, $field, $field_value = false, $return = fal case 'group_icon': if (! isset ($agent['id_grupo'])) return ''; - $output = print_group_icon ($agent['id_grupo'], true); + $output = ui_print_group_icon ($agent['id_grupo'], true); break; case 'group': if (! isset ($agent['id_grupo'])) return ''; - $output = print_group_icon ($agent['id_grupo'], true); + $output = ui_print_group_icon ($agent['id_grupo'], true); $output .= ' '; $output .= get_group_name ($agent['id_grupo']); @@ -71,7 +71,7 @@ function render_agent_field ($agent, $field, $field_value = false, $return = fal break; case 'status': if (! isset ($agent['id_agente'])) - return print_status_image (STATUS_AGENT_NO_DATA, '', $return); + return ui_print_status_image (STATUS_AGENT_NO_DATA, '', $return); require_once ('include/functions_reporting.php'); $info = get_agent_module_info ($agent['id_agente']); diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index dda0e801a1..e5238838cd 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1000,11 +1000,11 @@ function createInternalNameItem($label = null, $type, $image, $agent = null, $id } if (!empty($agent)) { - $text .= " (" . printTruncateText($agent, 10, false); + $text .= " (" . ui_print_truncate_text($agent, 10, false); $moduleName = safe_output(get_db_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id_module)); if (!empty($moduleName)) { - $text .= " - " . printTruncateText($moduleName, 10, false); + $text .= " - " . ui_print_truncate_text($moduleName, 10, false); } $text .= ")"; diff --git a/pandora_console/include/help/en/help_timesource.php b/pandora_console/include/help/en/help_timesource.php index 54c6a648ac..9ce552a075 100644 --- a/pandora_console/include/help/en/help_timesource.php +++ b/pandora_console/include/help/en/help_timesource.php @@ -32,7 +32,7 @@ var unixtime = parseInt(unixtime_ms / 1000); "timestamp"); ?> -Current System time: +Current System time:
Current Database time:
Your browser time: diff --git a/pandora_console/include/help/es/help_timesource.php b/pandora_console/include/help/es/help_timesource.php index 906928aa95..d39af73581 100644 --- a/pandora_console/include/help/es/help_timesource.php +++ b/pandora_console/include/help/es/help_timesource.php @@ -32,7 +32,7 @@ var unixtime = parseInt(unixtime_ms / 1000); "timestamp"); ?> -Hora actual del sistema: +Hora actual del sistema:
Hora actual de la base de datos:
Hora de su navegador: diff --git a/pandora_console/include/help/ja/help_timesource.php b/pandora_console/include/help/ja/help_timesource.php index 4ad266cb2f..2693600983 100644 --- a/pandora_console/include/help/ja/help_timesource.php +++ b/pandora_console/include/help/ja/help_timesource.php @@ -27,7 +27,7 @@ var unixtime = parseInt(unixtime_ms / 1000); "timestamp"); ?> -現在のシステムの時刻: +現在のシステムの時刻:
現在のデータベースの時刻:
あなたのブラウザの時刻: diff --git a/pandora_console/index.php b/pandora_console/index.php index df6c0a199a..bbcb5bc3fd 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -109,16 +109,16 @@ echo ''."\n"; echo ''; //This starts the page head. In the call back function, things from $page['head'] array will be processed into the head -ob_start ('process_page_head'); +ob_start ('ui_process_page_head'); // Enterprise main enterprise_include ('index.php'); -// This tag is included in the buffer passed to process_page_head so +// This tag is included in the buffer passed to ui_process_page_head so // technically it can be stripped echo ''."\n"; require_once ("include/functions_themes.php"); -ob_start ('process_page_body'); +ob_start ('ui_process_page_body'); $config["remote_addr"] = $_SERVER['REMOTE_ADDR']; diff --git a/pandora_console/mobile/include/functions_web.php b/pandora_console/mobile/include/functions_web.php index 6a67459759..48239f1feb 100644 --- a/pandora_console/mobile/include/functions_web.php +++ b/pandora_console/mobile/include/functions_web.php @@ -79,7 +79,7 @@ function footer() { $field) { - $fields[$key] = printTruncateText($field, $config['text_char_long'], false, true, false); + $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[1][0] = '' . __('M') . ''; @@ -184,43 +184,43 @@ class MonitorStatus { $data = array(); if($row['utimestamp'] == 0 && (($row['module_type'] < 21 || $row['module_type'] > 23) && $row['module_type'] != 100)){ - $statusImg = print_status_image(STATUS_MODULE_NO_DATA, __('NOT INIT'), true); + $statusImg = ui_print_status_image(STATUS_MODULE_NO_DATA, __('NOT INIT'), true); } elseif ($row["estado"] == 0) { - $statusImg = print_status_image(STATUS_MODULE_OK, __('NORMAL').": ".$row["datos"], true); + $statusImg = ui_print_status_image(STATUS_MODULE_OK, __('NORMAL').": ".$row["datos"], true); } elseif ($row["estado"] == 1) { - $statusImg = print_status_image(STATUS_MODULE_CRITICAL, __('CRITICAL').": ".$row["datos"], true); + $statusImg = ui_print_status_image(STATUS_MODULE_CRITICAL, __('CRITICAL').": ".$row["datos"], true); } elseif ($row["estado"] == 2) { - $statusImg = print_status_image(STATUS_MODULE_WARNING, __('WARNING').": ".$row["datos"], true); + $statusImg = ui_print_status_image(STATUS_MODULE_WARNING, __('WARNING').": ".$row["datos"], true); } else { $last_status = get_agentmodule_last_status($row['id_agente_modulo']); switch($last_status) { case 0: - $statusImg = print_status_image(STATUS_MODULE_OK, __('UNKNOWN')." - ".__('Last status')." ".__('NORMAL').": ".$row["datos"], true); + $statusImg = ui_print_status_image(STATUS_MODULE_OK, __('UNKNOWN')." - ".__('Last status')." ".__('NORMAL').": ".$row["datos"], true); break; case 1: - $statusImg = print_status_image(STATUS_MODULE_CRITICAL, __('UNKNOWN')." - ".__('Last status')." ".__('CRITICAL').": ".$row["datos"], true); + $statusImg = ui_print_status_image(STATUS_MODULE_CRITICAL, __('UNKNOWN')." - ".__('Last status')." ".__('CRITICAL').": ".$row["datos"], true); break; case 2: - $statusImg = print_status_image(STATUS_MODULE_WARNING, __('UNKNOWN')." - ".__('Last status')." ".__('WARNING').": ".$row["datos"], true); + $statusImg = ui_print_status_image(STATUS_MODULE_WARNING, __('UNKNOWN')." - ".__('Last status')." ".__('WARNING').": ".$row["datos"], true); break; } } $data[] = str_replace('' . printTruncateText($row['agent_name'], 25, true, true) . ''; + $data[] = '' . ui_print_truncate_text($row['agent_name'], 25, true, true) . ''; $data[] = '' . - printTruncateText($row['module_name'], 25, true, true) . ''; + ui_print_truncate_text($row['module_name'], 25, true, true) . ''; if (is_numeric($row["datos"])) $data[] = format_numeric($row["datos"]); else $data[] = "".substr(safe_output($row["datos"]),0,12).""; - $data[] = print_timestamp ($row["utimestamp"], true, array('units' => 'tiny')); + $data[] = ui_print_timestamp ($row["utimestamp"], true, array('units' => 'tiny')); $table->data[] = $data; } @@ -228,7 +228,7 @@ class MonitorStatus { print_table($table); $pagination = pagination ($total, - get_url_refresh (array ()), + ui_get_url_refresh (array ()), 0, 0, true); $pagination = str_replace('images/go_first.png', '../images/go_first.png', $pagination); diff --git a/pandora_console/mobile/operation/agents/view_agents.php b/pandora_console/mobile/operation/agents/view_agents.php index d4732beffd..5d2d2cd586 100644 --- a/pandora_console/mobile/operation/agents/view_agents.php +++ b/pandora_console/mobile/operation/agents/view_agents.php @@ -107,9 +107,9 @@ class ViewAgents { $data = array(); - $truncName = printTruncateText($agent['nombre'], 25, true, true); + $truncName = ui_print_truncate_text($agent['nombre'], 25, true, true); - $data[] = print_group_icon_with_path($agent["id_grupo"], true, "../images/groups_small", '', false); + $data[] = ui_print_group_icon_path($agent["id_grupo"], true, "../images/groups_small", '', false); $data[] = '' . $truncName . ''; $moduleInfo = ''; @@ -137,7 +137,7 @@ class ViewAgents { print_table($table); $pagination = pagination ($total_agents, - get_url_refresh (array ('filter_group' => $this->filterGroup, 'filter_group' => $this->filterGroup)), + ui_get_url_refresh (array ('filter_group' => $this->filterGroup, 'filter_group' => $this->filterGroup)), 0, 0, true); $pagination = str_replace('images/go_first.png', '../images/go_first.png', $pagination); @@ -190,7 +190,7 @@ class ViewAgent { $table->data[1][0] = __('IP:'); $table->data[1][1] = implode(',', $this->ips); $table->data[2][0] = __('OS:'); - $table->data[2][1] = str_replace('images/os_icons/', '../images/os_icons/', print_os_icon($this->agent['id_os'], true, true)); + $table->data[2][1] = str_replace('images/os_icons/', '../images/os_icons/', ui_print_os_icon($this->agent['id_os'], true, true)); $table->data[3][0] = __('Last contact'); $table->data[3][1] = $this->agent['ultimo_contacto']; @@ -239,7 +239,7 @@ class ViewAgent { $data = array(); $data[] = '' . - printTruncateText($module["nombre"], 20, true, true) . ''; + ui_print_truncate_text($module["nombre"], 20, true, true) . ''; $status = STATUS_MODULE_WARNING; $title = ""; @@ -281,7 +281,7 @@ class ViewAgent { } $data[] = str_replace(array('images/status_sets', ' 'tiny')); + $lastTime .= ui_print_timestamp ($module["utimestamp"], true, array('units' => 'tiny')); $lastTime .= ''; $data[] = $lastTime; @@ -346,12 +346,12 @@ class ViewAgent { $data = array(); - $data[] = printTruncateText(get_agentmodule_name($alert["id_agent_module"]), 20, true, true); + $data[] = ui_print_truncate_text(get_agentmodule_name($alert["id_agent_module"]), 20, true, true); $template = safe_output(get_alert_template ($alert['id_alert_template'])); - $data[] = printTruncateText(safe_output($template['name']), 20, true, true); + $data[] = ui_print_truncate_text(safe_output($template['name']), 20, true, true); - $data[] = print_timestamp ($alert["last_fired"], true, array('units' => 'tiny')); + $data[] = ui_print_timestamp ($alert["last_fired"], true, array('units' => 'tiny')); $status = STATUS_ALERT_NOT_FIRED; $title = ""; @@ -370,7 +370,7 @@ class ViewAgent { } $data[] = str_replace(array('images/status_sets', 'data[] = $data; } @@ -525,8 +525,8 @@ class viewGraph { print_table($table); - $pagination = pagination ($count, - get_url_refresh (array ('period' => $this->period)), + $pagination = ui_pagination ($count, + ui_get_url_refresh (array ('period' => $this->period)), 0, 0, true); $pagination = str_replace('images/go_first.png', '../images/go_first.png', $pagination); diff --git a/pandora_console/mobile/operation/agents/view_alerts.php b/pandora_console/mobile/operation/agents/view_alerts.php index eae28117d6..0b881bd269 100644 --- a/pandora_console/mobile/operation/agents/view_alerts.php +++ b/pandora_console/mobile/operation/agents/view_alerts.php @@ -58,10 +58,10 @@ class ViewAlerts { $idAgent = get_agentmodule_agent($alert["id_agent_module"]); - $data[] = '' . printTruncateText(get_agentmodule_name($alert["id_agent_module"]), 20, true, true) . ''; + $data[] = '' . ui_print_truncate_text(get_agentmodule_name($alert["id_agent_module"]), 20, true, true) . ''; $template = safe_output(get_alert_template ($alert['id_alert_template'])); - $data[] = printTruncateText(safe_output($template['name']), 20, true, true); - $data[] = print_timestamp ($alert["last_fired"], true, array('units' => 'tiny')); + $data[] = ui_print_truncate_text(safe_output($template['name']), 20, true, true); + $data[] = ui_print_timestamp ($alert["last_fired"], true, array('units' => 'tiny')); $status = STATUS_ALERT_NOT_FIRED; $title = ""; @@ -80,7 +80,7 @@ class ViewAlerts { } $data[] = str_replace(array('images/status_sets', 'data[] = $data; } diff --git a/pandora_console/mobile/operation/events/events.php b/pandora_console/mobile/operation/events/events.php index a9466c9089..f7732b4195 100644 --- a/pandora_console/mobile/operation/events/events.php +++ b/pandora_console/mobile/operation/events/events.php @@ -176,19 +176,19 @@ class EventsView { $table->rowclass[$iterator] = get_priority_class($row["criticity"]); $iterator++; - $data[] = print_timestamp($row["timestamp"], true, array('units' => 'tiny')); + $data[] = ui_print_timestamp($row["timestamp"], true, array('units' => 'tiny')); $data[] = $row["evento"]; if ($row["event_type"] == "system") { - $data[] = printTruncateText(__('System'), 20, true, true); + $data[] = ui_print_truncate_text(__('System'), 20, true, true); } elseif ($row["id_agente"] > 0) { // Agent name - $data[] = '' . printTruncateText(get_agent_name($row["id_agente"]), 20, true, true) . ''; + $data[] = '' . ui_print_truncate_text(get_agent_name($row["id_agente"]), 20, true, true) . ''; } else { - $data[] = printTruncateText(__('Alert SNMP'), 20, true, true); + $data[] = ui_print_truncate_text(__('Alert SNMP'), 20, true, true); } $table->data[] = $data; @@ -196,8 +196,8 @@ class EventsView { print_table($table); - $pagination = pagination ($count, - get_url_refresh(array("offset" => $offset, "ev_group" => $ev_group, + $pagination = ui_pagination ($count, + ui_get_url_refresh(array("offset" => $offset, "ev_group" => $ev_group, "event_type" => $event_type, "severity" => $severity, "search" => $search)), 0, 0, true); diff --git a/pandora_console/mobile/operation/servers/view_servers.php b/pandora_console/mobile/operation/servers/view_servers.php index f6f515bce3..460a4cc1f5 100644 --- a/pandora_console/mobile/operation/servers/view_servers.php +++ b/pandora_console/mobile/operation/servers/view_servers.php @@ -47,10 +47,10 @@ class ViewServers { $data = array(); if ($server['status'] == 0) { - $server_status = print_status_image(STATUS_SERVER_DOWN, '', true); + $server_status = ui_print_status_image(STATUS_SERVER_DOWN, '', true); } else { - $server_status = print_status_image(STATUS_SERVER_OK, '', true); + $server_status = ui_print_status_image(STATUS_SERVER_OK, '', true); } $data[] = strip_tags($server["name"]); $data[] = str_replace('images/', '../images/', $server['img']); diff --git a/pandora_console/operation/agentes/agent_fields.php b/pandora_console/operation/agentes/agent_fields.php index a9a96dd9ca..a226619e3a 100755 --- a/pandora_console/operation/agentes/agent_fields.php +++ b/pandora_console/operation/agentes/agent_fields.php @@ -39,14 +39,14 @@ if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR")) { require_once ("general/noaccess.php"); return; } -print_page_header (__('Agent custom fields'), 'images/note.png', false, "", false); +ui_print_page_header (__('Agent custom fields'), 'images/note.png', false, "", false); echo ''; // Custom fields $fields = get_db_all_rows_filter('tagent_custom_fields', array('display_on_front' => 1)); foreach($fields as $field) { - echo ''; + echo ''; $custom_value = get_db_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente)); if($custom_value === false || $custom_value == '') { $custom_value = '-'.__('empty').'-'; diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php index 2d3378c1de..81b99f038c 100755 --- a/pandora_console/operation/agentes/alerts_status.functions.php +++ b/pandora_console/operation/agentes/alerts_status.functions.php @@ -31,7 +31,7 @@ function validateAlert() { $result2 = validate_alert_compound ($compound_ids); $result = $result1 || $result2; - print_result_message ($result, + ui_print_result_message ($result, __('Alert(s) validated'), __('Error processing alert(s)')); } diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 50b04f3d45..d9109d059b 100644 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -80,7 +80,7 @@ else { $print_agent = true; - print_page_header (__('Alert detail'), "images/bricks.png", false, "alert_validation"); + ui_print_page_header (__('Alert detail'), "images/bricks.png", false, "alert_validation"); } if ($alert_validate) { @@ -222,7 +222,7 @@ if ($tab != null) { // Filter form if ($print_agent) { - toggle(printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, true),__('Alert control filter'), __('Toggle filter(s)')); + ui_toggle(printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_standby, true),__('Alert control filter'), __('Toggle filter(s)')); } $table->width = '95%'; @@ -370,7 +370,7 @@ foreach ($alerts['alerts_simple'] as $alert) { echo ''; if (!empty ($table->data)) { - pagination ($countAlertsSimple, $url, $offset_simple, 0, false, 'offset_simple'); + ui_pagination ($countAlertsSimple, $url, $offset_simple, 0, false, 'offset_simple'); print_table ($table); } else { echo '
'.__('No simple alerts found').'
'; @@ -400,7 +400,7 @@ foreach ($alerts['alerts_combined'] as $alert) { } if (!empty ($table->data)) { - pagination ($countAlertsCombined, $url, $offset_combined, 0, false, 'offset_combined'); + ui_pagination ($countAlertsCombined, $url, $offset_combined, 0, false, 'offset_combined'); print_table ($table); } @@ -412,8 +412,8 @@ if (count($alerts['alerts_simple']) > 0 || count($alerts['alerts_combined']) > 0 echo ''; -require_css_file('cluetip'); -require_jquery_file('cluetip'); +ui_require_css_file('cluetip'); +ui_require_jquery_file('cluetip'); ?> "; if (isset ($id_inc)) { //If $id_inc is set (when $_GET["id"] is set, not $_GET["insert_form"] - print_page_header (__('Incident details'). ' #'.$id_inc, "images/book_edit.png", false, "", false, ""); + ui_print_page_header (__('Incident details'). ' #'.$id_inc, "images/book_edit.png", false, "", false, ""); echo ''; echo ''; } else { - print_page_header (__('Create incident'), "images/book_edit.png", false, "", false, ""); + ui_print_page_header (__('Create incident'), "images/book_edit.png", false, "", false, ""); echo ''; } @@ -340,7 +340,7 @@ if (isset ($id_inc)) { foreach ($result as $row) { $data = array (); $data[0] = print_image("images/page_white_text.png", true, array("border" => '0')); - $data[1] = __('Author').': '.print_username ($row["id_usuario"], true).' ('.print_timestamp ($row["timestamp"], true).')'; + $data[1] = __('Author').': ' . ui_print_username ($row["id_usuario"], true).' (' . ui_print_timestamp ($row["timestamp"], true).')'; array_push ($table->data, $data); $data = array (); diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php index 36623ad6e1..57cb9d3a27 100755 --- a/pandora_console/operation/incidents/incident_statistics.php +++ b/pandora_console/operation/incidents/incident_statistics.php @@ -25,7 +25,7 @@ if (! check_acl ($config['id_user'], 0, "IR") == 1) { require ("general/noaccess.php"); exit; } -print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, ""); +ui_print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, ""); echo '
'.$field['name'].print_help_tip (__('Custom field'), true).'
'.$field['name'] . ui_print_help_tip (__('Custom field'), true).'

'.__('Incidents by status').'

'; diff --git a/pandora_console/operation/integria_incidents/incident.files.php b/pandora_console/operation/integria_incidents/incident.files.php index 08659bf498..791d91ea5f 100644 --- a/pandora_console/operation/integria_incidents/incident.files.php +++ b/pandora_console/operation/integria_incidents/incident.files.php @@ -32,7 +32,7 @@ $form .= print_input_hidden('attach_file', '1', true); $form .= print_input_hidden('id_incident', $id_incident, true); $form .= ""; -toggle($form, __('Add a file')); +ui_toggle($form, __('Add a file')); unset($table); diff --git a/pandora_console/operation/integria_incidents/incident.list.php b/pandora_console/operation/integria_incidents/incident.list.php index 1890489738..1a71c99f2b 100644 --- a/pandora_console/operation/integria_incidents/incident.list.php +++ b/pandora_console/operation/integria_incidents/incident.list.php @@ -120,7 +120,7 @@ foreach ($incidents as $row) { $data[3] = $groups[$row["id_grupo"]]; $data[4] = $status[$row["estado"]]."
".$resolutions[$row["resolution"]].""; $data[5] = print_incidents_priority_img ($row["prioridad"], true); - $data[6] = print_timestamp ($row["actualizacion"], true)."
".print_timestamp ($row["inicio"], true).""; + $data[6] = ui_print_timestamp ($row["actualizacion"], true)."
" . ui_print_timestamp ($row["inicio"], true).""; $data[7] = $row["workunits_hours"]." ".__('Hours')."
".$row["workunits_count"]." ".__('Workunits'); $data[8] = $row["id_creator"]; $data[9] = $row["id_usuario"]; diff --git a/pandora_console/operation/integria_incidents/incident.php b/pandora_console/operation/integria_incidents/incident.php index c0209b613e..5146a20ed8 100755 --- a/pandora_console/operation/integria_incidents/incident.php +++ b/pandora_console/operation/integria_incidents/incident.php @@ -68,7 +68,7 @@ else { $buttons[$tab]['active'] = true; -print_page_header (__('Incident management'), "images/book_edit.png", false, "", false, $buttons); +ui_print_page_header (__('Incident management'), "images/book_edit.png", false, "", false, $buttons); $update_incident = get_parameter('update_incident', 0); diff --git a/pandora_console/operation/integria_incidents/incident.workunits.php b/pandora_console/operation/integria_incidents/incident.workunits.php index d8aefcd454..d2f8376a1b 100644 --- a/pandora_console/operation/integria_incidents/incident.workunits.php +++ b/pandora_console/operation/integria_incidents/incident.workunits.php @@ -39,7 +39,7 @@ $form .= print_input_hidden('id_incident', $id_incident, true); $form .= print_input_hidden('profile', '0', true); $form .= ""; -toggle($form, __('Add workunit')); +ui_toggle($form, __('Add workunit')); if(isset($result['workunit'][0]) && is_array($result['workunit'][0])){ $workunits = $result['workunit']; diff --git a/pandora_console/operation/integria_incidents/incident_detail.php b/pandora_console/operation/integria_incidents/incident_detail.php index 373483c435..9d21df91fe 100755 --- a/pandora_console/operation/integria_incidents/incident_detail.php +++ b/pandora_console/operation/integria_incidents/incident_detail.php @@ -64,7 +64,7 @@ if (isset ($_GET["id"])) { if ($id_nota !== false) { process_incidents_touch ($id_inc); } - print_result_message ($id_nota, + ui_print_result_message ($id_nota, __('Successfully added'), __('Could not be added')); } @@ -82,7 +82,7 @@ if (isset ($_GET["id"])) { if (!empty ($result)) { process_incidents_touch ($id_inc); } - print_result_message ($id_nota, + ui_print_result_message ($id_nota, __('Successfully deleted'), __('Could not be deleted')); } @@ -100,7 +100,7 @@ if (isset ($_GET["id"])) { process_incidents_touch ($id_inc); } - print_result_message ($result, + ui_print_result_message ($result, __('Successfully deleted'), __('Could not be deleted')); } @@ -151,7 +151,7 @@ if (isset ($_GET["id"])) { process_sql_delete('tattachment', array('id_attachment' => $id_attachment)); } - print_result_message ($result, + ui_print_result_message ($result, __('File uploaded'), __('File could not be uploaded')); } @@ -208,11 +208,11 @@ echo ""; if (isset ($id_inc)) { //If $id_inc is set (when $_GET["id"] is set, not $_GET["insert_form"] - print_page_header (__('Incident details'). ' #'.$id_inc, "images/book_edit.png", false, "", false, ""); + ui_print_page_header (__('Incident details'). ' #'.$id_inc, "images/book_edit.png", false, "", false, ""); echo '
'; echo ''; } else { - print_page_header (__('Create incident'), "images/book_edit.png", false, "", false, ""); + ui_print_page_header (__('Create incident'), "images/book_edit.png", false, "", false, ""); echo ''; } @@ -340,7 +340,7 @@ if (isset ($id_inc)) { foreach ($result as $row) { $data = array (); $data[0] = print_image("images/page_white_text.png", true, array("border" => '0')); - $data[1] = __('Author').': '.print_username ($row["id_usuario"], true).' ('.print_timestamp ($row["timestamp"], true).')'; + $data[1] = __('Author').': ' . ui_print_username ($row["id_usuario"], true).' (' . ui_print_timestamp ($row["timestamp"], true).')'; array_push ($table->data, $data); $data = array (); diff --git a/pandora_console/operation/integria_incidents/incident_statistics.php b/pandora_console/operation/integria_incidents/incident_statistics.php index 36623ad6e1..57cb9d3a27 100755 --- a/pandora_console/operation/integria_incidents/incident_statistics.php +++ b/pandora_console/operation/integria_incidents/incident_statistics.php @@ -25,7 +25,7 @@ if (! check_acl ($config['id_user'], 0, "IR") == 1) { require ("general/noaccess.php"); exit; } -print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, ""); +ui_print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, ""); echo '

'.__('Incidents by status').'

'; diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php index 3e6c62d729..c34486a15b 100644 --- a/pandora_console/operation/messages/message.php +++ b/pandora_console/operation/messages/message.php @@ -26,18 +26,18 @@ $subject = get_parameter ("subject"); $message = get_parameter ("mensaje"); if (isset ($_GET["new_msg"])) - print_page_header (__('Messages'). " » ".__('New message'), "images/email.png", false, "", false, "" ); + ui_print_page_header (__('Messages'). " » ".__('New message'), "images/email.png", false, "", false, "" ); elseif (isset ($_GET["read_message"])) - print_page_header (__('Messages'). " » ".__('Read message'), "images/email.png", false, "", false, "" ); + ui_print_page_header (__('Messages'). " » ".__('Read message'), "images/email.png", false, "", false, "" ); else if (empty ($config["pure"]) && !is_ajax ()) - print_page_header (__('Messages'). " » ".__('Message overview'), "images/email.png", false, "", false, "" ); + ui_print_page_header (__('Messages'). " » ".__('Message overview'), "images/email.png", false, "", false, "" ); if (isset ($_POST["delete_message"])) { $id = (int) get_parameter_post ("delete_message"); $result = delete_message ($id); //Delete message function will actually check the credentials - print_result_message ($result, + ui_print_result_message ($result, __('Successfully deleted'), __('Could not be deleted')); } @@ -45,7 +45,7 @@ if (isset ($_POST["delete_message"])) { if (!empty ($dest_user) && isset ($_GET["send_message"])) { // Create message $return = create_message ($config["id_user"], $dest_user, $subject, $message); - print_result_message ($return, + ui_print_result_message ($return, __('Message successfully sent to user %s', get_user_fullname ($dest_user)), __('Error sending message to user %s', get_user_fullname ($dest_user))); } @@ -53,7 +53,7 @@ if (!empty ($dest_user) && isset ($_GET["send_message"])) { if (!empty ($dest_group) && isset ($_GET["send_message"])) { // Create message to groups $return = create_message_group ($config["id_user"], $dest_group, $subject, $message); - print_result_message ($return, + ui_print_result_message ($return, __('Message successfully sent'), __('Error sending message to group %s', get_group_name ($dest_group))); } @@ -73,13 +73,13 @@ if (isset ($_GET["mark_read"]) || isset ($_GET["mark_unread"])) { if (isset ($_GET["new_msg"])) { //create message // Header -// print_page_header (__('Messages'). " » ".__('New message'), "images/email.png", false, "", false, "" ); +// ui_print_page_header (__('Messages'). " » ".__('New message'), "images/email.png", false, "", false, "" ); echo ' - +
'.__('Message from').':'.print_username ($config["id_user"], true).'' . ui_print_username ($config["id_user"], true).'
'.__('Message to').': '; @@ -112,7 +112,7 @@ if (isset ($_GET["new_msg"])) { //create message } elseif (isset ($_GET["read_message"])) { -// print_page_header (__('Messages'). " » ".__('Read message'), "images/email.png", false, "", false, "" ); +// ui_print_page_header (__('Messages'). " » ".__('Read message'), "images/email.png", false, "", false, "" ); $message_id = (int) get_parameter ("read_message"); $message = get_message ($message_id); @@ -127,7 +127,7 @@ if (isset ($_GET["new_msg"])) { //create message echo ' - '; + '; // Subject echo ' @@ -165,7 +165,7 @@ if (isset ($_GET["new_msg"])) { //create message if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) { // if (empty ($config["pure"]) && !is_ajax ()) { -// print_page_header (__('Messages'). " » ".__('Message overview'), "images/email.png", false, "", false, "" ); +// ui_print_page_header (__('Messages'). " » ".__('Message overview'), "images/email.png", false, "", false, "" ); // } //Get number of messages @@ -222,7 +222,7 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) { $data[0] .= ''; } - $data[1] = print_username ($message["sender"], true); + $data[1] = ui_print_username ($message["sender"], true); $data[2] = ''; if ($message["subject"] == "") { @@ -232,7 +232,7 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) { } $data[2] .= ''; - $data[3] = print_timestamp ($message["timestamp"], true, array ("prominent" => "timestamp")); + $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); array_push ($table->data, $data); diff --git a/pandora_console/operation/reporting/custom_reporting.php b/pandora_console/operation/reporting/custom_reporting.php index e45b83eb71..7e30c35ca3 100644 --- a/pandora_console/operation/reporting/custom_reporting.php +++ b/pandora_console/operation/reporting/custom_reporting.php @@ -24,7 +24,7 @@ require_once ('include/functions_reports.php'); enterprise_include ('operation/reporting/custom_reporting.php'); // Header -print_page_header (__('Reporting'). " » ".__('Custom reporting'), "images/reporting.png", false, "", false, "" ); +ui_print_page_header (__('Reporting'). " » ".__('Custom reporting'), "images/reporting.png", false, "", false, "" ); $reports = get_reports (); diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php index acd98cebce..6f35174c7c 100644 --- a/pandora_console/operation/reporting/graph_viewer.php +++ b/pandora_console/operation/reporting/graph_viewer.php @@ -116,7 +116,7 @@ if ($view_graph) { } // Header - print_page_header (__('Reporting'). " » ". __('Combined image render'), "images/reporting.png", false, "", false, $options); + ui_print_page_header (__('Reporting'). " » ". __('Combined image render'), "images/reporting.png", false, "", false, $options); echo "
'.__('Message from').':'.print_username ($message["sender"], true).' '.__('at').' '.print_timestamp ($message["timestamp"], true, array ("prominent" => "timestamp")).'
' . ui_print_username ($message["sender"], true).' '.__('at').' ' . ui_print_timestamp ($message["timestamp"], true, array ("prominent" => "timestamp")).'
'.__('Subject').':
"; echo "
"; @@ -172,10 +172,10 @@ if ($view_graph) { /* We must add javascript here. Otherwise, the date picker won't work if the date is not correct because php is returning. */ - require_css_file ('datepicker'); - require_jquery_file ('ui.core'); - require_jquery_file ('ui.datepicker'); - require_jquery_file ('timeentry'); + ui_require_css_file ('datepicker'); + ui_require_jquery_file ('ui.core'); + ui_require_jquery_file ('ui.datepicker'); + ui_require_jquery_file ('timeentry'); ?>