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

Discovery Tasklist minor fixes 

Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
This commit is contained in:
fbsanchez 2019-02-23 12:13:54 +01:00
parent 6105ef1116
commit 797f922748
2 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/godmode/servers/discovery.php
View File

@ -125,19 +125,10 @@ if ($classname_selected !== null) {
$wiz = new $classname_selected($page); $wiz = new $classname_selected($page);
$result = $wiz->run(); $result = $wiz->run();
if (is_array($result) === true) { if (is_array($result) === true) {
if ($result['result'] === 0) { // Redirect control and messages to DiscoveryTasklist.
// Success.
ui_print_success_message($result['msg']);
// TODO: Show task progress before redirect to main discovery menu.
} else {
// Failed.
ui_print_error_message($result['msg']);
}
// Redirect to Tasklist.
$classname_selected = 'DiscoveryTaskList'; $classname_selected = 'DiscoveryTaskList';
$wiz = new $classname_selected($page); $wiz = new $classname_selected($page);
$result = $wiz->run(); $result = $wiz->run($result['msg'], $result['result']);
} }
} }

39
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -74,12 +74,30 @@ class DiscoveryTaskList extends Wizard
* *
* @return mixed Returns null if wizard is ongoing. Result if done. * @return mixed Returns null if wizard is ongoing. Result if done.
*/ */
public function run() public function run($message='', $status=null)
{ {
global $config; global $config;
// Load styles. // Load styles.
parent::run(); parent::run();
$this->prepareBreadcrum(
[
[
'link' => 'index.php?sec=gservers&sec2=godmode/servers/discovery',
'label' => 'Discovery',
],
]
);
$this->printHeader();
// Show redirected messages from discovery.php.
if ($status === 0) {
ui_print_success_message($message);
} else if ($status !== null) {
ui_print_error_message($message);
}
$force_run = (bool) get_parameter('force_run'); $force_run = (bool) get_parameter('force_run');
if ($force_run === true) { if ($force_run === true) {
return $this->forceConsoleTask(); return $this->forceConsoleTask();
@ -349,7 +367,7 @@ class DiscoveryTaskList extends Wizard
$table->head[4] = __('Status'); $table->head[4] = __('Status');
$table->align[4] = 'left'; $table->align[4] = 'left';
$table->head[5] = __('Template'); $table->head[5] = __('Task type');
$table->align[5] = 'left'; $table->align[5] = 'left';
$table->head[6] = __('Progress'); $table->head[6] = __('Progress');
@ -370,15 +388,24 @@ class DiscoveryTaskList extends Wizard
).'">'; ).'">';
$data[0] .= html_print_image('images/target.png', true, ['title' => __('Force')]); $data[0] .= html_print_image('images/target.png', true, ['title' => __('Force')]);
$data[0] .= '</a>'; $data[0] .= '</a>';
} else if ($task['disabled'] == 2) {
$data[0] = ui_print_help_tip(
__('This task has not been completely defined, please edit it'),
true
);
} else { } else {
$data[0] = ''; $data[0] = '';
} }
$data[1] = '<b>'.$task['name'].'</b>'; $data[1] = '<b>'.$task['name'].'</b>';
if ($task['interval_sweep'] > 0) {
$data[2] = human_time_description_raw( $data[2] = human_time_description_raw(
$task['interval_sweep'] $task['interval_sweep']
); );
} else {
$data[2] = __('Manual');
}
if ($task['id_recon_script'] == 0) { if ($task['id_recon_script'] == 0) {
$data[3] = $task['subnet']; $data[3] = $task['subnet'];
@ -393,11 +420,11 @@ class DiscoveryTaskList extends Wizard
} }
if ($task['id_recon_script'] == 0) { if ($task['id_recon_script'] == 0) {
// Network recon task. // Discovery NetScan.
$data[5] = html_print_image( $data[5] = html_print_image(
'images/network.png', 'images/network.png',
true, true,
['title' => __('Network recon task')] ['title' => __('Discovery NetScan')]
).'&nbsp;&nbsp;'; ).'&nbsp;&nbsp;';
$data[5] .= network_profiles_get_name( $data[5] .= network_profiles_get_name(
$task['id_network_profile'] $task['id_network_profile']
@ -428,10 +455,14 @@ class DiscoveryTaskList extends Wizard
); );
} }
if ($task['utimestamp'] > 0) {
$data[7] = ui_print_timestamp( $data[7] = ui_print_timestamp(
$task['utimestamp'], $task['utimestamp'],
true true
); );
} else {
$data[7] = __('Not executed yet');
}
if (check_acl( if (check_acl(
$config['id_user'], $config['id_user'],