From e31259bb8a70a439aefa44701367bfac8754cd4c Mon Sep 17 00:00:00 2001 From: darode Date: Fri, 22 Feb 2013 09:02:05 +0000 Subject: [PATCH] 2013-02-22 Dario Rodriguez * godmode/servers/manage_recontask_form.php: Changed interval combo input for new customizable combo. MERGED FROM 4.0.3 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7701 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ .../godmode/servers/manage_recontask_form.php | 16 ++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5268971bec..873e28ea99 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-02-22 Dario Rodriguez + + * godmode/servers/manage_recontask_form.php: Changed interval combo + input for new customizable combo. + + MERGED FROM 4.0.3 + 2013-02-21 Sergio Martin * include/functions_html.php: Supress a safe_input diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index 10d3b6f2eb..d1b13ef9fd 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -170,20 +170,12 @@ $table->data[3][0] = "".__('Network'); $table->data[3][1] = html_print_input_text ('network', $network, '', 25, 0, true); // Interval -$values = array (); -$values[0] = __('Manual'); -$values[SECONDS_1HOUR] = __('%d hour', 1); -$values[SECONDS_2HOUR] = __('%d hours', 2); -$values[SECONDS_6HOURS] = __('%d hours', 6); -$values[SECONDS_12HOURS] = __('%d hours', 12); -$values[SECONDS_1DAY] = __('%d day', 1); -$values[SECONDS_5DAY] = __('%d days', 5); -$values[SECONDS_1WEEK] = __('%d week', 1); -$values[SECONDS_2WEEK] = __('%d weeks', 2); -$values[SECONDS_1MONTH] = __('%d month', 1); + $table->data[4][0] = "".__('Interval'); -$table->data[4][1] = html_print_select ($values, "interval", $interval, '', '', '', true); +$table->data[4][1] = html_print_extended_select_for_time ('interval' , $interval, '', '', '0', false, true, false, false); +$table->data[4][1] .= ui_print_help_tip (__('The minimum recomended interval for Recon Task is 5 minutes'), true); + // Module template $table->data[5][0] = "".__('Module template');