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

2011-04-13 Sancho Lerena <slerena@artica.es> 

* operation/servers/view_server_detail.php,
	godmode/servers/manage_recontask.php,
	godmode/servers/manage_recontask_form.php: Fixes bug #3286027. Also implement
	the new "manual" mode for recon tasks.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4210 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2011-04-13 15:12:40 +00:00
parent d74a0a7f87
commit 56deb99c7d
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-04-13 Sancho Lerena <slerena@artica.es>
* operation/servers/view_server_detail.php,
godmode/servers/manage_recontask.php,
godmode/servers/manage_recontask_form.php: Fixes bug #3286027. Also implement
the new "manual" mode for recon tasks.
2011-04-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php,

7
pandora_console/godmode/servers/manage_recontask.php
View File

@ -218,8 +218,11 @@ if ($result !== false) {
} else {
$data[5] = "-";
}
// INTEVAL
$data[6] =human_time_description_raw($row["interval_sweep"]);
// INTERVAL
if ($row["interval_sweep"]==0)
$data[6] = __("Manual");
else
$data[6] =human_time_description_raw($row["interval_sweep"]);
// PORTS
if ($row["id_recon_script"] == 0){

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

@ -13,7 +13,6 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
global $config;
@ -56,10 +55,10 @@ if (isset ($_GET["update"])) { // Edit mode
$network = "";
$description = "";
$id_recon_server = 0;
$interval = 43200;
$interval = 0;
$id_group = 0;
$create_incident = 1;
$snmp_community = "public";
$snmp_community = "public";
$id_network_profile = 1;
$id_os = -1; // Any
$recon_ports = ""; // Any
@ -116,6 +115,7 @@ $table->data[3][1] = print_input_text ('network', $network, '', 25, 0, true);
// Interval
$values = array ();
$values[0] = __('Manual');
$values[3600] = __('%d hour', 1);
$values[7200] = __('%d hours', 2);
$values[21600] = __('%d hours', 6);

7
pandora_console/operation/servers/view_server_detail.php
View File

@ -103,7 +103,12 @@ foreach ($recon_tasks as $task) {
$data[1] = '<b>'. $task["name"].'</b>';
$data[2] = human_time_description_raw ($task["interval_sweep"]);
if ($task["interval_sweep"] == 0){
$data[2] = __("Manual");
}
else {
$data[2] = human_time_description_raw ($task["interval_sweep"]);
}
if ($task["id_recon_script"] == 0){
$data[3] = $task["subnet"];