diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e27777d532..930b2545af 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2013-05-23 Miguel de Dios + + * operation/agentes/alerts_status.functions.php, + operation/search_users.php, + godmode/servers/manage_recontask_form.php, + godmode/massive/massive_copy_modules.php, + godmode/massive/massive_operations.php, + include/functions_visual_map_editor.php: replaced the deprecated + code to show the help tip in the page of the bug and others. + + Fixes: #2237 + 2013-05-22 Miguel de Dios * godmode/reporting/visual_console_builder.editor.js: fixed the diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php index ad7a7feae1..b1ce566e4c 100644 --- a/pandora_console/godmode/massive/massive_copy_modules.php +++ b/pandora_console/godmode/massive/massive_copy_modules.php @@ -81,10 +81,6 @@ $table->data[0][4] .= ''; $table->data[0][5] = html_print_select (agents_get_group_agents ($source_id_group, false, "none"), 'source_id_agent', $source_id_agent, false, __('Select'), 0, true); -//$table->data[0][5] = 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) -// . ' ' . __("Type two chars at least for search") . ''; - echo '
'; echo '
'; diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 1dc4a13498..261ee2e9af 100644 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -206,8 +206,7 @@ echo ''; html_print_select($options, 'option', $option, 'this.form.submit()', '', 0, false, false, false); if($option == 'edit_agents' || $option == 'edit_modules') - echo ' ' . - __("The blank fields will not be updated") . ''; + ui_print_help_tip(__("The blank fields will not be updated")); echo ''; echo ''; echo "
"; diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index ef03092ffc..fa60ab0485 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -42,7 +42,8 @@ if (is_ajax ()) { return; } -if (isset ($_GET["update"]) or (isset($_GET["crt"]))) { // Edit mode +// Edit mode +if (isset ($_GET["update"]) or (isset($_GET["crt"]))) { $update_recon = true; if (isset ($_GET["crt"])) { @@ -53,7 +54,7 @@ if (isset ($_GET["update"]) or (isset($_GET["crt"]))) { // Edit mode $id_rt = get_parameter("upd"); } } - + if ($update_recon) { if (!isset($id_rt)) { $id_rt = (int) get_parameter_get ("update"); @@ -146,15 +147,18 @@ $table->rowclass[14]="recon_script"; $table->rowclass[15]="recon_script"; $table->rowclass[16]="recon_script"; // Name -$table->data[0][0] = "".__('Task name').""; +$table->data[0][0] = "" . __('Task name') . ""; $table->data[0][1] = html_print_input_text ('name', $name, '', 25, 0, true); // Recon server -$table->data[1][0] = "".__('Recon server').' '.__('You must select a Recon Server for the Task, otherwise the Recon Task will never run').''; +$table->data[1][0] = "" . __('Recon server') . + ui_print_help_tip( + __('You must select a Recon Server for the Task, otherwise the Recon Task will never run'), true); $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); + WHERE server_type = 3 + ORDER BY name', "id_recon_server", $id_recon_server, '', '', '', true); $fields['network_sweep'] = __("Network sweep"); @@ -196,7 +200,8 @@ $table->data[7][1] = html_print_select_from_sql ('SELECT id_os, name FROM tconfi // Recon ports $table->data[8][0] = "".__('Ports'); $table->data[8][1] = html_print_input_text ('recon_ports', $recon_ports, '', 25, 0, true); -$table->data[8][1] .= ' '.__('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').''; +$table->data[8][1] .= ui_print_help_tip( + __('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'), true); // Group $table->data[9][0] = "".__('Group'); diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index 2b97ef8e42..8e75049009 100644 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -284,9 +284,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $form_items_advance['size_row']['items'] = array('background', 'static_graph', 'icon datos'); $form_items_advance['size_row']['html'] = '' . - __('Size') . ' ' . - __("For use the original image file size, set 0 width and 0 height.") . - '' . ' + __('Size') . + ui_print_help_tip ( + __("For use the original image file size, set 0 width and 0 height."), true) . + ' ' . html_print_input_text('width', 0, '', 3, 5, true) . ' X ' . html_print_input_text('height', 0, '', 3, 5, true) . diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php index 1690f1a730..4bb3ae3182 100755 --- a/pandora_console/operation/agentes/alerts_status.functions.php +++ b/pandora_console/operation/agentes/alerts_status.functions.php @@ -57,8 +57,10 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url, $filter_st $table->data[0][2] = __('Status'); $table->data[0][3] = html_print_select ($alert_status_filter, "filter", $filter, '', '', '', true); $table->data[0][4] = ''; - $table->data[1][0] = __('Free text for search') - . ' ' . __("Filter by agent name, module name, template name or action name") . ''; + $table->data[1][0] = __('Free text for search') . + ui_print_help_tip( + __("Filter by agent name, module name, template name or action name"), + 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] = html_print_select ($alert_standby, "filter_standby", $filter_standby, '', '', '', true); diff --git a/pandora_console/operation/search_users.php b/pandora_console/operation/search_users.php index faca8518bc..a96d4756b9 100755 --- a/pandora_console/operation/search_users.php +++ b/pandora_console/operation/search_users.php @@ -68,20 +68,20 @@ else { array ("alt" => __('User'), "title" => __('Standard User'))).' '; } - $profileCell .= ''; + $result = db_get_all_rows_field_filter ("tusuario_perfil", "id_usuario", $user['id_user']); if ($result !== false) { foreach ($result as $row) { - $profileCell .= profile_get_name ($row["id_perfil"]); - $profileCell .= " / "; - $profileCell .= groups_get_name ($row["id_grupo"]); - $profileCell .= "
"; + $text_tip .= profile_get_name ($row["id_perfil"]); + $text_tip .= " / "; + $text_tip .= groups_get_name ($row["id_grupo"]); + $text_tip .= "
"; } } else { - $profileCell .= __('The user doesn\'t have any assigned profile/group'); + $text_tip .= __('The user doesn\'t have any assigned profile/group'); } - $profileCell .= ""; + $profileCell .= ui_print_help_tip($text_tip, true); array_push($table->data, array( $userIDCell,