tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-05-23 Miguel de Dios <miguel.dedios@artica.es> 

* 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




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8194 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-05-23 11:00:55 +00:00
parent e2c182283b
commit 101acf9496
7 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2013-05-23 Miguel de Dios <miguel.dedios@artica.es>
* 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 <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the

4
pandora_console/godmode/massive/massive_copy_modules.php
View File

@ -81,10 +81,6 @@ $table->data[0][4] .= '</span>';
$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)
// . '<a href="#" class="tip">&nbsp;<span>' . __("Type two chars at least for search") . '</span></a>';
echo '<form action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=copy_modules" id="manage_config_form" method="post">';
echo '<fieldset id="fieldset_source">';

3
pandora_console/godmode/massive/massive_operations.php
View File

@ -206,8 +206,7 @@ echo '</td><td>';
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>';
ui_print_help_tip(__("The blank fields will not be updated"));
echo '</td></tr></table>';
echo '</form>';
echo "<br />";

17
pandora_console/godmode/servers/manage_recontask_form.php
View File

@ -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] = "<b>".__('Task name')."</b>";
$table->data[0][0] = "<b>" . __('Task name') . "</b>";
$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][0] = "<b>" . __('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] = "<b>".__('Ports');
$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>';
$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] = "<b>".__('Group');

7
pandora_console/include/functions_visual_map_editor.php
View File

@ -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'] = '<td align="left">' .
__('Size') . '<a href="#" class="tip">&nbsp;<span>' .
__("For use the original image file size, set 0 width and 0 height.") .
'</span></a>' . '</td>
__('Size') .
ui_print_help_tip (
__("For use the original image file size, set 0 width and 0 height."), true) .
'</td>
<td align="left">' . html_print_input_text('width', 0, '', 3, 5, true) .
' X ' .
html_print_input_text('height', 0, '', 3, 5, true) .

6
pandora_console/operation/agentes/alerts_status.functions.php
View File

@ -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')
. '<a href="#" class="tip">&nbsp;<span>' . __("Filter by agent name, module name, template name or action name") . '</span></a>';
$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);

14
pandora_console/operation/search_users.php
View File

@ -68,20 +68,20 @@ else {
array ("alt" => __('User'),
"title" => __('Standard User'))).'&nbsp;';
}
$profileCell .= '<a href="#" class="tip"><span>';
$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 .= "<br />";
$text_tip .= profile_get_name ($row["id_perfil"]);
$text_tip .= " / ";
$text_tip .= groups_get_name ($row["id_grupo"]);
$text_tip .= "<br />";
}
}
else {
$profileCell .= __('The user doesn\'t have any assigned profile/group');
$text_tip .= __('The user doesn\'t have any assigned profile/group');
}
$profileCell .= "</span></a>";
$profileCell .= ui_print_help_tip($text_tip, true);
array_push($table->data, array(
$userIDCell,