'.__('Last execution').': ';
+ $message_conf_cron .= date('Y/m/d H:i:s', $config['cron_last_run']).'
';
+ $message_conf_cron .= '';
+ $message_conf_cron .= __('Please check process is no locked.').'
';
+ }
+
+ ui_print_warning_message($message_conf_cron, '', false);
+ }
+ }
+
+ $ret = $this->showListConsoleTask();
+ $ret2 = $this->showList();
+
+ if ($ret === false && $ret2 === false) {
+ include_once $config['homedir'].'/general/firts_task/recon_view.php';
+ }
+
+ return $ret;
+ }
+
+
+ /**
+ * Implements load method.
+ *
+ * @return mixed Skeleton for button.
+ */
+ public function load()
+ {
+ return [
+ 'icon' => $this->icon,
+ 'label' => $this->label,
+ 'url' => $this->url,
+
+ ];
+
+ }
+
+
+ /**
+ * Delete a recon task.
+ *
+ * @return void
+ */
+ public function deleteTask()
+ {
+ global $config;
+
+ if (! check_acl($config['id_user'], 0, 'PM')) {
+ db_pandora_audit(
+ 'ACL Violation',
+ 'Trying to access recon task viewer'
+ );
+ include 'general/noaccess.php';
+ return;
+ }
+
+ $task = get_parameter('task', null);
+
+ if ($task !== null) {
+ $result = db_process_sql_delete(
+ 'trecon_task',
+ ['id_rt' => $task]
+ );
+
+ if ($result == 1) {
+ return [
+ 'result' => 0,
+ 'msg' => __('Task successfully deleted'),
+ 'id' => false,
+ ];
+ }
+
+ // Trick to avoid double execution.
+ header('Location: '.$this->url);
+ }
+
+ }
+
+
+ /**
+ * Force console task.
+ *
+ * @return void
+ */
+ public function forceConsoleTask()
+ {
+ global $config;
+
+ if (! check_acl($config['id_user'], 0, 'PM')) {
+ db_pandora_audit(
+ 'ACL Violation',
+ 'Trying to access recon task viewer'
+ );
+ include 'general/noaccess.php';
+ return;
+ }
+
+ $id_console_task = (int) get_parameter('id_console_task');
+
+ if ($id_console_task !== null) {
+ cron_task_run($id_console_task, true);
+ // Trick to avoid double execution.
+ header('Location: '.$this->url);
+ }
+
+ }
+
+
+ /**
+ * Delete a Console task.
+ *
+ * @return void
+ */
+ public function deleteConsoleTask()
+ {
+ global $config;
+
+ if (! check_acl($config['id_user'], 0, 'PM')) {
+ db_pandora_audit(
+ 'ACL Violation',
+ 'Trying to access recon task viewer'
+ );
+ include 'general/noaccess.php';
+ return;
+ }
+
+ $id_console_task = (int) get_parameter('id_console_task');
+
+ if ($id_console_task !== null) {
+ $result = db_process_sql_delete(
+ 'tuser_task_scheduled',
+ ['id' => $id_console_task]
+ );
+
+ if ($result == 1) {
+ return [
+ 'result' => 0,
+ 'msg' => __('Console Task successfully deleted'),
+ 'id' => false,
+ ];
+ }
+
+ // Trick to avoid double execution.
+ header('Location: '.$this->url);
+ }
+
+ }
+
+
+ /**
+ * Show complete list of running tasks.
+ *
+ * @return boolean Success or not.
+ */
+ public function showList()
+ {
+ global $config;
+
+ check_login();
+
+ if (! check_acl($config['id_user'], 0, 'PM')) {
+ db_pandora_audit(
+ 'ACL Violation',
+ 'Trying to access recon task viewer'
+ );
+ include 'general/noaccess.php';
+ return false;
+ }
+
+ // Get all recon servers.
+ $servers = db_get_all_rows_sql('SELECT * FROM tserver WHERE server_type = 3');
+ if ($servers === false) {
+ $servers = [];
+ ui_print_error_message(__('Discovery Server is disabled'));
+ return false;
+ } else {
+ $recon_task = db_get_all_rows_sql('SELECT * FROM trecon_task');
+ if ($recon_task === false) {
+ return false;
+ } else {
+ include_once $config['homedir'].'/include/functions_graph.php';
+ include_once $config['homedir'].'/include/functions_servers.php';
+ include_once $config['homedir'].'/include/functions_network_profiles.php';
+
+ $modules_server = 0;
+ $total_modules = 0;
+ $total_modules_data = 0;
+
+ // --------------------------------
+ // FORCE A RECON TASK
+ // --------------------------------
+ if (check_acl($config['id_user'], 0, 'PM')) {
+ if (isset($_GET['force'])) {
+ $id = (int) get_parameter_get('force', 0);
+ servers_force_recon_task($id);
+ header(
+ 'Location: '.ui_get_full_url(
+ 'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist'
+ )
+ );
+ }
+ }
+
+ foreach ($servers as $serverItem) {
+ $id_server = $serverItem['id_server'];
+ $server_name = servers_get_name($id_server);
+ $recon_tasks = db_get_all_rows_field_filter(
+ 'trecon_task',
+ 'id_recon_server',
+ $id_server
+ );
+
+ $user_groups = implode(',', array_keys(users_get_groups()));
+ $defined_tasks = db_get_all_rows_filter(
+ 'tuser_task_scheduled',
+ 'id_grupo IN ('.$user_groups.')'
+ );
+
+ if (isset($tasks_console) === true
+ && is_array($tasks_console) === true
+ ) {
+ foreach ($tasks_console as $key => $value) {
+ $value['parameters'] = unserialize(
+ $value['parameters']
+ );
+
+ $value['type'] = 'Cron';
+ array_push($recon_tasks, $value);
+ }
+ }
+
+ // Show network tasks for Recon Server.
+ if ($recon_tasks === false) {
+ $recon_tasks = [];
+ }
+
+ $table = new StdClass();
+ $table->cellpadding = 4;
+ $table->cellspacing = 4;
+ $table->width = '100%';
+ $table->class = 'databox data';
+ $table->head = [];
+ $table->data = [];
+ $table->align = [];
+ $table->headstyle = [];
+ for ($i = 0; $i < 9; $i++) {
+ $table->headstyle[$i] = 'text-align: left;';
+ }
+
+ $table->head[0] = __('Force');
+ $table->align[0] = 'left';
+
+ $table->head[1] = __('Task name');
+ $table->align[1] = 'left';
+
+ $table->head[2] = __('Interval');
+ $table->align[2] = 'left';
+
+ $table->head[3] = __('Network');
+ $table->align[3] = 'left';
+
+ $table->head[4] = __('Status');
+ $table->align[4] = 'left';
+
+ $table->head[5] = __('Task type');
+ $table->align[5] = 'left';
+
+ $table->head[6] = __('Progress');
+ $table->align[6] = 'left';
+
+ $table->head[7] = __('Updated at');
+ $table->align[7] = 'left';
+
+ $table->head[8] = __('Operations');
+ $table->align[8] = 'left';
+
+ foreach ($recon_tasks as $task) {
+ $data = [];
+
+ if ($task['disabled'] == 0) {
+ $data[0] = ''.html_print_submit_button(
+ ((isset($data['label']) === true) ? $data['label'] : 'OK'),
+ ((isset($data['name']) === true) ? $data['name'] : ''),
+ ((isset($data['disabled']) === true) ? $data['disabled'] : false),
+ ((isset($data['attributes']) === true) ? $data['attributes'] : ''),
+ ((isset($data['return']) === true) ? $data['return'] : false)
+ ).'
';
+
+ case 'checkbox':
+ return html_print_checkbox(
+ $data['name'],
+ $data['value'],
+ ((isset($data['checked']) === true) ? $data['checked'] : false),
+ ((isset($data['return']) === true) ? $data['return'] : false),
+ ((isset($data['disabled']) === true) ? $data['disabled'] : false),
+ ((isset($data['script']) === true) ? $data['script'] : ''),
+ ((isset($data['disabled_hidden']) === true) ? $data['disabled_hidden'] : false)
+ );
+
+ case 'switch':
+ return html_print_switch($data);
+
+ case 'interval':
+ return html_print_extended_select_for_time(
+ $data['name'],
+ $data['value'],
+ ((isset($data['script']) === true) ? $data['script'] : ''),
+ ((isset($data['nothing']) === true) ? $data['nothing'] : ''),
+ ((isset($data['nothing_value']) === true) ? $data['nothing_value'] : 0),
+ ((isset($data['size']) === true) ? $data['size'] : false),
+ ((isset($data['return']) === true) ? $data['return'] : false),
+ ((isset($data['style']) === true) ? $data['selected'] : false),
+ ((isset($data['unique']) === true) ? $data['unique'] : false)
+ );
+
+ case 'textarea':
+ return html_print_textarea(
+ $data['name'],
+ $data['rows'],
+ $data['columns'],
+ ((isset($data['value']) === true) ? $data['value'] : ''),
+ ((isset($data['attributes']) === true) ? $data['attributes'] : ''),
+ ((isset($data['return']) === true) ? $data['return'] : false),
+ ((isset($data['class']) === true) ? $data['class'] : '')
+ );
+
+ default:
+ // Ignore.
+ break;
+ }
+
+ return '';
+ }
+
+
+ /**
+ * Prints a go back button redirecting to main page.
+ *
+ * @return void
+ */
+ public function printGoBackButton($url=null)
+ {
+ if (isset($url) === false) {
+ $url = ui_get_full_url(
+ 'index.php?sec=gservers&sec2=godmode/servers/discovery'
+ );
+ }
+
+ $form = [
+ 'form' => [
+ 'method' => 'POST',
+ 'action' => $url,
+ ],
+ 'inputs' => [
+ [
+ 'arguments' => [
+ 'name' => 'submit',
+ 'label' => __('Go back'),
+ 'type' => 'submit',
+ 'attributes' => 'class="sub cancel"',
+ 'return' => true,
+ ],
+ ],
+ ],
+ ];
+
+ $this->printForm($form);
+ }
+
+
+ /**
+ * Print a block of inputs.
+ *
+ * @param array $input Definition of target block to be printed.
+ * @param boolean $return Return as string or direct output.
+ *
+ * @return string HTML content.
+ */
+ public function printBlock(array $input, bool $return=false)
+ {
+ $output = '';
+ if ($input['hidden'] == 1) {
+ $class = ' class="hidden"';
+ } else {
+ $class = '';
+ }
+
+ if (is_array($input['block_content']) === true) {
+ // Print independent block of inputs.
+ $output .= '";
- echo $prompt.sprintf("(Event #$event_id) ".__('Executing command: %s', $command));
+ echo $prompt.sprintf(
+ '(Event #'.$event_id.') '.__(
+ 'Executing command: %s',
+ $command
+ )
+ );
echo '
'.$tabs.$notifications.$loading.$general.$details.$custom_fields.$comments.$responses.$custom_data.html_print_input_hidden('id_event', $event['id_evento']).'
';
+ $out = ''.$tabs.$notifications.$loading.$general.$details.$related.$custom_fields.$comments.$responses.$custom_data.html_print_input_hidden('id_event', $event['id_evento']).'
';
$js = '';
+ $js .= '});';
+
+ if (events_has_extended_info($event['id_evento']) === true) {
+ $js .= '
+ $("#link_related").click(function (){
+ $.post ({
+ url : "ajax.php",
+ data : {
+ page: "include/ajax/events_extended",
+ get_extended_info: 1,
+ id_event: '.$event['id_evento'].'
+ },
+ dataType : "html",
+ success: function (data) {
+ $("#related_data").html(data);
+ console.log("vamos puta");
+ }
+ });
+ });';
+ }
+
+ $js .= '';
echo $out.$js;
}
@@ -543,6 +628,10 @@ if ($get_events_details) {
$img = ui_get_full_url('images/hourglass.png', false, false, false);
$title = __('Event in process');
break;
+
+ default:
+ // Ignore.
+ break;
}
$out .= '';
@@ -594,7 +683,8 @@ if ($table_events) {
$id_agente = (int) get_parameter('id_agente', 0);
$all_events_24h = (int) get_parameter('all_events_24h', 0);
- // Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!)
+ // Fix: for tag functionality groups have to be all user_groups
+ // (propagate ACL funct!).
$groups = users_get_groups($config['id_user']);
$tags_condition = tags_get_acl_tags(
@@ -612,7 +702,7 @@ if ($table_events) {
if ($all_events_24h) {
events_print_event_table(
- "utimestamp > $date_subtract_day",
+ 'utimestamp > '.$date_subtract_day,
200,
'100%',
false,
@@ -621,7 +711,7 @@ if ($table_events) {
);
} else {
events_print_event_table(
- "estado <> 1 $tags_condition",
+ 'estado <> 1 '.$tags_condition,
200,
'100%',
false,
diff --git a/pandora_console/include/ajax/events_extended.php b/pandora_console/include/ajax/events_extended.php
new file mode 100644
index 0000000000..4993014ddf
--- /dev/null
+++ b/pandora_console/include/ajax/events_extended.php
@@ -0,0 +1,104 @@
+width = '100%';
+ $table->data = [];
+ $table->head = [];
+ $table->style[0] = 'min-width:120px; text-align: left;';
+ $table->style[1] = 'text-align: left;';
+ $table->cellspacing = 2;
+ $table->cellpadding = 2;
+ $table->class = 'alternate rounded_cells';
+
+ $output = [];
+ $output[] = ''.__('Timestamp').' ';
+ $output[] = ''.__('Description').' ';
+ $table->data[] = $output;
+
+ foreach ($extended_info as $data) {
+ $output = [];
+ $output[] = date('Y/m/d H:i:s', $data['utimestamp']);
+ $output[] = io_safe_output($data['description']);
+ $table->data[] = $output;
+ }
+
+ html_print_table($table);
+}
diff --git a/pandora_console/include/ajax/reporting.ajax.php b/pandora_console/include/ajax/reporting.ajax.php
index a5737ea71e..55ed7dd216 100755
--- a/pandora_console/include/ajax/reporting.ajax.php
+++ b/pandora_console/include/ajax/reporting.ajax.php
@@ -198,12 +198,7 @@ if ($get_metaconsole_hash_data) {
$console_password = $auth_serialized['console_password'];
}
- $pwd = $auth_token;
- // Create HASH login info
- $user = str_rot13($config['id_user']);
- $hashdata = $user.$pwd;
- $hashdata = md5($hashdata);
- $url_hash = "&loginhash=auto&loginhash_data=$hashdata&loginhash_user=$user";
+ $url_hash = metaconsole_get_servers_url_hash($server);
echo $url_hash;
return;
diff --git a/pandora_console/include/ajax/tree.ajax.php b/pandora_console/include/ajax/tree.ajax.php
index 6c8365a924..9ea0a86e8e 100644
--- a/pandora_console/include/ajax/tree.ajax.php
+++ b/pandora_console/include/ajax/tree.ajax.php
@@ -43,6 +43,7 @@ if (is_ajax()) {
include_once $config['homedir'].'/include/class/TreeModule.class.php';
include_once $config['homedir'].'/include/class/TreeTag.class.php';
include_once $config['homedir'].'/include/class/TreeGroup.class.php';
+ include_once $config['homedir'].'/include/class/TreeService.class.php';
include_once $config['homedir'].'/include/class/TreeGroupEdition.class.php';
enterprise_include_once('include/class/TreePolicies.class.php');
enterprise_include_once('include/class/TreeGroupMeta.class.php');
@@ -120,6 +121,10 @@ if (is_ajax()) {
$tree = new TreeGroupEdition($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
break;
+ case 'services':
+ $tree = new TreeService($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+ break;
+
default:
// FIXME. No error handler
return;
@@ -127,6 +132,7 @@ if (is_ajax()) {
$tree->setFilter($filter);
ob_clean();
+
echo json_encode(['success' => 1, 'tree' => $tree->getArray()]);
return;
}
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 69e848d805..aab0b4c9e4 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -1369,8 +1369,12 @@ function local_ldap_search($ldap_host, $ldap_port=389, $ldap_version=3, $dn, $ac
$tls = ' -ZZ ';
}
- $ldap_host = ' -h '.$ldap_host;
- $ldap_port = ' -p '.$ldap_port;
+ if (stripos($ldap_host, 'ldap') !== false) {
+ $ldap_host = ' -H '.$ldap_host.':'.$ldap_port;
+ } else {
+ $ldap_host = ' -h '.$ldap_host.' -p '.$ldap_port;
+ }
+
$ldap_version = ' -P '.$ldap_version;
if (!empty($ldap_admin_user)) {
$ldap_admin_user = " -D '".$ldap_admin_user."'";
@@ -1382,7 +1386,7 @@ function local_ldap_search($ldap_host, $ldap_port=389, $ldap_version=3, $dn, $ac
$dn = " -b '".$dn."'";
- $shell_ldap_search = explode("\n", shell_exec('ldapsearch -LLL -o ldif-wrap=no -x'.$ldap_host.$ldap_port.$ldap_version.' -E pr=10000/noprompt '.$ldap_admin_user.$ldap_admin_pass.$dn.$filter.$tls.' | grep -v "^#\|^$" | sed "s/:\+ /=>/g"'));
+ $shell_ldap_search = explode("\n", shell_exec('ldapsearch -LLL -o ldif-wrap=no -x'.$ldap_host.$ldap_version.' -E pr=10000/noprompt '.$ldap_admin_user.$ldap_admin_pass.$dn.$filter.$tls.' | grep -v "^#\|^$" | sed "s/:\+ /=>/g"'));
foreach ($shell_ldap_search as $line) {
$values = explode('=>', $line);
if (!empty($values[0]) && !empty($values[1])) {
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 96124afa4c..e7133fd79e 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -88,16 +88,13 @@ if (file_exists('languages/'.$user_language.'.mo')) {
$params['menu'] = false;
if ((!isset($params['width']) || ($params['width'] <= 0))) {
- $params['width'] = 1048;
+ $params['width'] = 650;
}
$params_combined = json_decode($_REQUEST['data_combined'], true);
$module_list = json_decode($_REQUEST['data_module_list'], true);
$type_graph_pdf = $_REQUEST['type_graph_pdf'];
- $aux_font_size = $config['font_size'];
- $config['font_size'] = ($config['font_size'] + 3);
-
echo '';
switch ($type_graph_pdf) {
case 'combined':
@@ -216,7 +213,6 @@ if (file_exists('languages/'.$user_language.'.mo')) {
echo '
';
- $config['font_size'] = $aux_font_size;
?>
';
+ ';
}
@@ -2322,10 +2856,31 @@ function reporting_html_text(&$table, $item)
}
-function reporting_html_availability(&$table, $item)
+/**
+ * Report availability
+ *
+ * @param string $table Reference table in pdf a false.
+ * @param array $item Parameters for item pdf.
+ * @param boolean $pdf Send pdf.
+ *
+ * @return html
+ */
+function reporting_html_availability($table, $item, $pdf=0)
{
- $style = db_get_value('style', 'treport_content', 'id_rc', $item['id_rc']);
- $style = json_decode(io_safe_output($style), true);
+ $retun_pdf = '';
+
+ $style = db_get_value(
+ 'style',
+ 'treport_content',
+ 'id_rc',
+ $item['id_rc']
+ );
+
+ $style = json_decode(
+ io_safe_output($style),
+ true
+ );
+
$same_agent_in_resume = '';
global $config;
@@ -2338,7 +2893,7 @@ function reporting_html_availability(&$table, $item)
$table1->head = [];
$table1->head[0] = __('Agent');
// HACK it is saved in show_graph field.
- // Show interfaces instead the modules
+ // Show interfaces instead the modules.
if ($item['kind_availability'] == 'address') {
$table1->head[1] = __('IP Address');
} else {
@@ -2381,7 +2936,7 @@ function reporting_html_availability(&$table, $item)
$table2->head = [];
$table2->head[0] = __('Agent');
// HACK it is saved in show_graph field.
- // Show interfaces instead the modules
+ // Show interfaces instead the modules.
if ($item['kind_availability'] == 'address') {
$table2->head[1] = __('IP Address');
} else {
@@ -2392,7 +2947,7 @@ function reporting_html_availability(&$table, $item)
$table2->head[3] = __('Checks failed');
$table2->head[4] = __('Checks OK');
$table2->head[5] = __('Checks Uknown');
- // $table2->head[6] = __('% Ok');
+
$table2->headstyle = [];
$table2->headstyle[0] = 'text-align: left';
$table2->headstyle[1] = 'text-align: left';
@@ -2400,53 +2955,73 @@ function reporting_html_availability(&$table, $item)
$table2->headstyle[3] = 'text-align: right';
$table2->headstyle[4] = 'text-align: right';
$table2->headstyle[5] = 'text-align: right';
- // $table2->headstyle[6] = 'text-align: right';
+
$table2->style[0] = 'text-align: left';
$table2->style[1] = 'text-align: left';
$table2->style[2] = 'text-align: right';
$table2->style[3] = 'text-align: right';
$table2->style[4] = 'text-align: right';
$table2->style[5] = 'text-align: right';
- // $table2->style[6] = 'text-align: right';
+
foreach ($item['data'] as $row) {
- $the_first_men_time = get_agent_first_time(io_safe_output($row['agent']));
+ $the_first_men_time = get_agent_first_time(
+ io_safe_output($row['agent'])
+ );
$table_row = [];
$table_row[] = $row['agent'];
$table_row[] = $row['availability_item'];
if ($row['time_total'] != 0) {
- $table_row[] = human_time_description_raw($row['time_total'], true);
+ $table_row[] = human_time_description_raw(
+ $row['time_total'],
+ true
+ );
} else {
$table_row[] = '--';
}
if ($row['time_error'] != 0) {
- $table_row[] = human_time_description_raw($row['time_error'], true);
+ $table_row[] = human_time_description_raw(
+ $row['time_error'],
+ true
+ );
} else {
$table_row[] = '--';
}
if ($row['time_ok'] != 0) {
- $table_row[] = human_time_description_raw($row['time_ok'], true);
+ $table_row[] = human_time_description_raw(
+ $row['time_ok'],
+ true
+ );
} else {
$table_row[] = '--';
}
if ($row['time_unknown'] != 0) {
- $table_row[] = human_time_description_raw($row['time_unknown'], true);
+ $table_row[] = human_time_description_raw(
+ $row['time_unknown'],
+ true
+ );
} else {
$table_row[] = '--';
}
if ($row['time_not_init'] != 0) {
- $table_row[] = human_time_description_raw($row['time_not_init'], true);
+ $table_row[] = human_time_description_raw(
+ $row['time_not_init'],
+ true
+ );
} else {
$table_row[] = '--';
}
if ($row['time_downtime'] != 0) {
- $table_row[] = human_time_description_raw($row['time_downtime'], true);
+ $table_row[] = human_time_description_raw(
+ $row['time_downtime'],
+ true
+ );
} else {
$table_row[] = '--';
}
@@ -2469,16 +3044,30 @@ function reporting_html_availability(&$table, $item)
$table->data['error']['cell'] = __('There are no Agent/Modules defined');
}
- $table->colspan[1][0] = 2;
- $table->colspan[2][0] = 2;
- $data = [];
- $data[0] = html_print_table($table1, true);
- array_push($table->data, $data);
+ if ($pdf === 0) {
+ $table->colspan[1][0] = 2;
+ $table->colspan[2][0] = 2;
+ $data = [];
+ $data[0] = html_print_table($table1, true);
+ array_push($table->data, $data);
+ } else {
+ $table1->title = $item['title'];
+ $table1->titleclass = 'title_table_pdf';
+ $table1->titlestyle = 'text-align:left;';
+ $return_pdf .= html_print_table($table1, true);
+ }
if ($item['resume']['resume']) {
- $data2 = [];
- $data2[0] = html_print_table($table2, true);
- array_push($table->data, $data2);
+ if ($pdf === 0) {
+ $data2 = [];
+ $data2[0] = html_print_table($table2, true);
+ array_push($table->data, $data2);
+ } else {
+ $table2->title = $item['title'];
+ $table2->titleclass = 'title_table_pdf';
+ $table2->titlestyle = 'text-align:left;';
+ $return_pdf .= html_print_table($table2, true);
+ }
}
if ($item['resume']['resume'] && !empty($item['data'])) {
@@ -2508,27 +3097,60 @@ function reporting_html_availability(&$table, $item)
$table1->data[] = [
'max_text' => $item['resume']['max_text'],
- 'max' => sla_truncate($item['resume']['max'], $config['graph_precision']).'%',
+ 'max' => sla_truncate(
+ $item['resume']['max'],
+ $config['graph_precision']
+ ).'%',
'min_text' => $item['resume']['min_text'],
- 'min' => sla_truncate($item['resume']['min'], $config['graph_precision']).'%',
+ 'min' => sla_truncate(
+ $item['resume']['min'],
+ $config['graph_precision']
+ ).'%',
'avg' => ''.sla_truncate($item['resume']['avg'], $config['graph_precision']).'% ',
];
- $table->colspan[3][0] = 3;
- $data = [];
- $data[0] = html_print_table($table1, true);
- array_push($table->data, $data);
+ if ($pdf === 0) {
+ $table->colspan[3][0] = 3;
+ $data = [];
+ $data[0] = html_print_table(
+ $table1,
+ true
+ );
+ array_push($table->data, $data);
+ } else {
+ $table1->title = $item['title'];
+ $table1->titleclass = 'title_table_pdf';
+ $table1->titlestyle = 'text-align:left;';
+ $return_pdf .= html_print_table(
+ $table1,
+ true
+ );
+ }
}
}
+
+ if ($pdf !== 0) {
+ return $return_pdf;
+ }
}
-function reporting_html_availability_graph(&$table, $item, $pdf=0)
+/**
+ * The availability report shows in detail the reached
+ * status of a module in a given time interval.
+ *
+ * @param string $table Reference table in pdf a false.
+ * @param array $item Parameters for item pdf.
+ * @param boolean $pdf Send pdf.
+ *
+ * @return html
+ */
+function reporting_html_availability_graph($table, $item, $pdf=0)
{
global $config;
$metaconsole_on = is_metaconsole();
- if ($metaconsole_on) {
+ if ($metaconsole_on !== false) {
$hack_metaconsole = '../../';
} else {
$hack_metaconsole = '';
@@ -2570,7 +3192,10 @@ function reporting_html_availability_graph(&$table, $item, $pdf=0)
break;
}
- $sla_value = sla_truncate($chart['sla_value'], $config['graph_precision']).'%';
+ $sla_value = sla_truncate(
+ $chart['sla_value'],
+ $config['graph_precision']
+ ).'%';
$checks_resume = '('.$chart['checks_ok'].'/'.$chart['checks_total'].')';
}
@@ -2578,11 +3203,14 @@ function reporting_html_availability_graph(&$table, $item, $pdf=0)
$table1->data[0][1] = $chart['chart'];
$table1->data[0][2] = "".$sla_value.' ';
$table1->data[0][3] = $checks_resume;
- $tables_chart .= html_print_table($table1, true);
+ $tables_chart .= html_print_table(
+ $table1,
+ true
+ );
}
if ($item['type'] == 'availability_graph') {
- // table_legend_graphs;
+ // Table_legend_graphs.
$table2 = new stdClass();
$table2->width = '99%';
$table2->data = [];
@@ -2618,22 +3246,62 @@ function reporting_html_availability_graph(&$table, $item, $pdf=0)
$table2->data[0][11] = ''.__('Ignore time').' ';
}
- $table->colspan['charts']['cell'] = 2;
- $table->data['charts']['cell'] = $tables_chart;
- $table->colspan['legend']['cell'] = 2;
- $table->data['legend']['cell'] = html_print_table($table2, true);
-
- if ($pdf) {
- return $tables_chart.''.__('Summary').' ';
- $table->colspan['summary_table']['cell'] = 3;
- $table->data['summary_table']['cell'] = html_print_table($table_summary, true);
+ if ($pdf !== 0) {
+ $return_pdf .= html_print_table($table_summary, true);
+ } else {
+ $table->colspan['summary_title']['cell'] = 3;
+ $table->data['summary_title']['cell'] = ''.__('Summary').' ';
+ $table->colspan['summary_table']['cell'] = 3;
+ $table->data['summary_table']['cell'] = html_print_table(
+ $table_summary,
+ true
+ );
+ }
+ }
+
+ if ($pdf !== 0) {
+ return $return_pdf;
}
}
-function get_agent_first_time($agent_name)
-{
- $id = agents_get_agent_id($agent_name, true);
-
- $utimestamp = db_get_all_rows_sql(
- 'SELECT utimestamp FROM tagente_datos WHERE id_agente_modulo IN
- (SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = '.$id.')
- ORDER BY utimestamp ASC LIMIT 1'
- );
- $utimestamp = $utimestamp[0]['utimestamp'];
-
- return $utimestamp;
-}
-
-
-function reporting_html_sql(&$table, $item)
+/**
+ * Function to print to HTML query sql.
+ *
+ * @param object $table Head table or false if it comes from pdf.
+ * @param array $item Items data.
+ * @param boolean $pdf If it comes from pdf.
+ *
+ * @return html
+ */
+function reporting_html_sql($table, $item, $pdf=0)
{
+ $return_pdf = '';
if (!$item['correct']) {
- $table->colspan['error']['cell'] = 3;
- $table->data['error']['cell'] = $item['error'];
+ if ($pdf === 0) {
+ $table->colspan['error']['cell'] = 3;
+ $table->data['error']['cell'] = $item['error'];
+ } else {
+ $return_pdf .= $item['error'];
+ }
} else {
$first = true;
@@ -2825,10 +3513,10 @@ function reporting_html_sql(&$table, $item)
$table2->width = '100%';
foreach ($item['data'] as $row) {
- if ($first) {
+ if ($first === true) {
$first = false;
- // Print the header
+ // Print the header.
foreach ($row as $key => $value) {
$table2->head[] = $key;
}
@@ -2837,18 +3525,44 @@ function reporting_html_sql(&$table, $item)
$table2->data[] = $row;
}
- $table->colspan['data']['cell'] = 3;
- $table->cellstyle['data']['cell'] = 'text-align: center;';
- $table->data['data']['cell'] = html_print_table($table2, true);
+ if ($pdf === 0) {
+ $table->colspan['data']['cell'] = 3;
+ $table->cellstyle['data']['cell'] = 'text-align: center;';
+ $table->data['data']['cell'] = html_print_table(
+ $table2,
+ true
+ );
+ } else {
+ $table2->title = $item['title'];
+ $table2->titleclass = 'title_table_pdf';
+ $table2->titlestyle = 'text-align:left;';
+ $return_pdf .= html_print_table(
+ $table2,
+ true
+ );
+ }
+ }
+
+ if ($pdf !== 0) {
+ return $return_pdf;
}
}
+/**
+ * Function for stats.
+ *
+ * @param array $data Array item.
+ * @param integer $graph_width Items data.
+ * @param integer $graph_height If it comes from pdf.
+ *
+ * @return html
+ */
function reporting_get_stats_summary($data, $graph_width, $graph_height)
{
global $config;
- // Alerts table
+ // Alerts table.
$table_sum = html_get_predefined_table();
$tdata = [];
@@ -2868,25 +3582,33 @@ function reporting_get_stats_summary($data, $graph_width, $graph_height)
$table_sum->cellstyle[count($table_sum->data)][2] = 'text-align: center;';
if ($data['monitor_checks'] > 0) {
- // Fixed width non interactive charts
+ // Fixed width non interactive charts.
$status_chart_width = $graph_width;
- $tdata[0] = ''.'
'.graph_agent_status(false, $graph_width, $graph_height, true, true).'
'.'
'.graph_agent_status(false, $graph_width, $graph_height, true, true).'
'.graph_alert_status($data['monitor_alerts'], $data['monitor_alerts_fired'], $graph_width, $graph_height, true, true).'
';
} else {
- $tdata[2] = html_print_image('images/image_problem_area_small.png', true, ['width' => $graph_width]);
+ $tdata[2] = html_print_image(
+ 'images/image_problem_area_small.png',
+ true,
+ ['width' => $graph_width]
+ );
}
$table_sum->rowclass[] = '';
$table_sum->data[] = $tdata;
$output = '
- '.__('Summary').' '.html_print_table($table_sum, true).' ';
+ '.__('Summary').' '.html_print_table($table_sum, true).'';
return $output;
}
@@ -2898,10 +3620,11 @@ function reporting_get_stats_summary($data, $graph_width, $graph_height)
* It construct a table object with all the events happened in a group
* during a period of time.
*
- * @param int Group id to get the report.
- * @param int Period of time to get the report.
- * @param int Beginning date of the report
- * @param int Flag to return or echo the report table (echo by default).
+ * @param integer $id_group Group id to get the report.
+ * @param integer $period Period of time to get the report.
+ * @param integer $date Beginning date of the report.
+ * @param boolean $return Flag to return or echo the
+ * report table (echo by default).
*
* @return object A table object
*/
@@ -2934,7 +3657,7 @@ function reporting_event_reporting($id_group, $period, $date=0, $return=false)
}
$data[1] = $event['evento'];
- $data[2] = $event['id_usuario'] != '0' ? $event['id_usuario'] : '';
+ $data[2] = ($event['id_usuario'] != '0') ? $event['id_usuario'] : '';
$data[3] = $event['timestamp'];
array_push($table->data, $data);
}
@@ -2950,8 +3673,9 @@ function reporting_event_reporting($id_group, $period, $date=0, $return=false)
/**
* Get a table report from a alerts fired array.
*
- * @param array Alerts fired array.
- * @see function get_alerts_fired ()
+ * @param array $alerts_fired Alerts fired array.
+ *
+ * @see function get_alerts_fired ()
*
* @return object A table object with a report of the fired alerts.
*/
@@ -2966,7 +3690,7 @@ function reporting_get_fired_alerts_table($alerts_fired)
$alert_module = alerts_get_alert_agent_module($id_alert);
$template = alerts_get_alert_template($id_alert);
- // Add alerts fired to $agents_fired_alerts indexed by id_agent
+ // Add alerts fired to $agents_fired_alerts indexed by id_agent.
$id_agent = db_get_value(
'id_agente',
'tagente_modulo',
@@ -3012,8 +3736,9 @@ function reporting_get_fired_alerts_table($alerts_fired)
/**
* Get a report table with all the monitors down.
*
- * @param array An array with all the monitors down
- * @see function modules_get_monitors_down()
+ * @param array $monitors_down An array with all the monitors down.
+ *
+ * @see Function modules_get_monitors_down().
*
* @return object A table object with a monitors down report.
*/
@@ -3027,7 +3752,7 @@ function reporting_get_monitors_down_table($monitors_down)
$agents = [];
if ($monitors_down) {
foreach ($monitors_down as $monitor) {
- // Add monitors fired to $agents_fired_alerts indexed by id_agent
+ // Add monitors fired to $agents_fired_alerts indexed by id_agent.
$id_agent = $monitor['id_agente'];
if (!isset($agents[$id_agent])) {
$agents[$id_agent] = [];
@@ -3067,8 +3792,8 @@ function reporting_get_monitors_down_table($monitors_down)
*
* It shows the number of agents and no more things right now.
*
- * @param int Group to get the report
- * @param bool Flag to return or echo the report (by default).
+ * @param integer $id_group Group to get the report.
+ * @param boolean $return Flag to return or echo the report (by default).
*
* @return HTML string with group report
*/
@@ -3088,9 +3813,10 @@ function reporting_print_group_reporting($id_group, $return=false)
/**
* Get a report table of the fired alerts group by agents.
*
- * @param int Agent id to generate the report.
- * @param int Period of time of the report.
- * @param int Beginning date of the report in UNIX time (current date by default).
+ * @param integer $id_agent Agent id to generate the report.
+ * @param integer $period Period of time of the report.
+ * @param integer $date Beginning date of the report in
+ * UNIX time (current date by default).
*
* @return object A table object with the alert reporting..
*/
@@ -3123,6 +3849,7 @@ function reporting_get_agent_alerts_table($id_agent, $period=0, $date=0)
switch ($template['type']) {
case 'regex':
+ default:
if ($template['matches_value']) {
$data[2] = '≃ "'.$template['value'].'"';
} else {
@@ -3133,23 +3860,19 @@ function reporting_get_agent_alerts_table($id_agent, $period=0, $date=0)
case 'equal':
case 'not_equal':
$data[2] = $template['value'];
-
break;
case 'max-min':
$data[2] = __('Min.').': '.$template['min_value'].' ';
$data[2] .= __('Max.').': '.$template['max_value'].' ';
-
break;
case 'max':
$data[2] = $template['max_value'];
-
break;
case 'min':
$data[2] = $template['min_value'];
-
break;
}
@@ -3167,9 +3890,10 @@ function reporting_get_agent_alerts_table($id_agent, $period=0, $date=0)
/**
* Get a report of monitors in an agent.
*
- * @param int Agent id to get the report
- * @param int Period of time of the report.
- * @param int Beginning date of the report in UNIX time (current date by default).
+ * @param integer $id_agent Agent id to get the report.
+ * @param integer $period Period of time of the report.
+ * @param integer $date Beginning date of the report in UNIX time
+ * (current date by default).
*
* @return object A table object with the report.
*/
@@ -3187,7 +3911,11 @@ function reporting_get_agent_monitors_table($id_agent, $period=0, $date=0)
}
foreach ($monitors as $monitor) {
- $downs = modules_get_monitor_downs_in_period($monitor['id_agente_modulo'], $period, $date);
+ $downs = modules_get_monitor_downs_in_period(
+ $monitor['id_agente_modulo'],
+ $period,
+ $date
+ );
if (! $downs) {
continue;
}
@@ -3199,7 +3927,11 @@ function reporting_get_agent_monitors_table($id_agent, $period=0, $date=0)
$data[0] = $monitor['nombre'];
}
- $data[1] = modules_get_last_down_timestamp_in_period($monitor['id_agente_modulo'], $period, $date);
+ $data[1] = modules_get_last_down_timestamp_in_period(
+ $monitor['id_agente_modulo'],
+ $period,
+ $date
+ );
array_push($table->data, $data);
}
@@ -3210,9 +3942,10 @@ function reporting_get_agent_monitors_table($id_agent, $period=0, $date=0)
/**
* Get a report of all the modules in an agent.
*
- * @param int Agent id to get the report.
- * @param int Period of time of the report
- * @param int Beginning date of the report in UNIX time (current date by default).
+ * @param integer $id_agent Agent id to get the report.
+ * @param integer $period Period of time of the report.
+ * @param integer $date Beginning date of the report in UNIX time
+ * (current date by default).
*
* @return object
*/
@@ -3244,19 +3977,24 @@ function reporting_get_agent_modules_table($id_agent, $period=0, $date=0)
/**
* Get a detailed report of an agent
*
- * @param int Agent to get the report.
- * @param int Period of time of the desired report.
- * @param int Beginning date of the report in UNIX time (current date by default).
- * @param bool Flag to return or echo the report (by default).
+ * @param integer $id_agent Agent to get the report.
+ * @param integer $period Period of time of the desired report.
+ * @param integer $date Beginning date of the report in UNIX time
+ * (current date by default).
+ * @param boolean $return Flag to return or echo the report (by default).
*
* @return string
*/
-function reporting_get_agent_detailed($id_agent, $period=0, $date=0, $return=false)
-{
+function reporting_get_agent_detailed(
+ $id_agent,
+ $period=0,
+ $date=0,
+ $return=false
+) {
$output = '';
$n_a_string = __('N/A(*)');
- // Show modules in agent
+ // Show modules in agent.
$output .= '';
$output .= '
'.__('Agent').' - '.agents_get_alias($id_agent).' ';
$output .= ''.__('Modules').'';
@@ -3264,17 +4002,17 @@ function reporting_get_agent_detailed($id_agent, $period=0, $date=0, $return=fal
$table_modules->width = '99%';
$output .= html_print_table($table_modules, true);
- // Show alerts in agent
+ // Show alerts in agent.
$table_alerts = reporting_get_agent_alerts_table($id_agent, $period, $date);
$table_alerts->width = '99%';
- if (sizeof($table_alerts->data)) {
+ if (count($table_alerts->data)) {
$output .= ''.__('Alerts').' ';
$output .= html_print_table($table_alerts, true);
}
- // Show monitor status in agent (if any)
+ // Show monitor status in agent (if any).
$table_monitors = reporting_get_agent_monitors_table($id_agent, $period, $date);
- if (sizeof($table_monitors->data) == 0) {
+ if (count($table_monitors->data) == 0) {
$output .= ' ';
if (! $return) {
echo $output;
@@ -3467,12 +4205,12 @@ function reporting_get_agents_by_status($data, $graph_width=250, $graph_height=1
if (!defined('METACONSOLE')) {
$agents_data = '
- '.__('Agents by status').' '.html_print_table($table_agent, true).' ';
+ '.__('Agents by status').' '.html_print_table($table_agent, true).'';
} else {
$table_agent->style = [];
$table_agent->class = 'tactical_view';
$agents_data = '
- '.__('Agents by status').' '.html_print_table($table_agent, true).' ';
+ '.__('Agents by status').' '.html_print_table($table_agent, true).'';
}
return $agents_data;
@@ -3495,7 +4233,7 @@ function reporting_get_total_agents_and_monitors($data, $graph_width=250, $graph
$total_data[3] = $total_module <= 0 ? '-' : $total_module;
$table_total->data[] = $total_data;
$total_agent_module = '
- '.__('Total agents and monitors').' '.html_print_table($table_total, true).' ';
+ '.__('Total agents and monitors').' '.html_print_table($table_total, true).'';
return $total_agent_module;
}
@@ -3514,12 +4252,12 @@ function reporting_get_total_servers($num_servers)
if (!defined('METACONSOLE')) {
$node_overview = '
- '.__('Node overview').' '.html_print_table($table_node, true).' ';
+ '.__('Node overview').' '.html_print_table($table_node, true).'';
} else {
$table_node->style = [];
$table_node->class = 'tactical_view';
$node_overview = '
- '.__('Node overview').' '.html_print_table($table_node, true).' ';
+ '.__('Node overview').' '.html_print_table($table_node, true).'';
}
return $node_overview;
@@ -3563,7 +4301,7 @@ function reporting_get_events($data, $links=false)
if (!defined('METACONSOLE')) {
$event_view = '
- '.__('Events by severity').' '.html_print_table($table_events, true).' ';
+ '.__('Events by severity').' '.html_print_table($table_events, true).'';
} else {
$table_events->class = 'tactical_view';
$table_events->styleTable = 'text-align:center;';
@@ -3573,7 +4311,7 @@ function reporting_get_events($data, $links=false)
$table_events->size[3] = '10%';
$event_view = '
- '.__('Important Events by Criticity').' '.html_print_table($table_events, true).' ';
+ '.__('Important Events by Criticity').' '.html_print_table($table_events, true).'';
}
return $event_view;
@@ -3605,9 +4343,9 @@ function reporting_get_last_activity()
case 'mysql':
$sql = sprintf(
'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
- FROM tsesion
- WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.")
- AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5",
+ FROM tsesion
+ WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.")
+ AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5",
$config['id_user']
);
break;
@@ -3615,9 +4353,9 @@ function reporting_get_last_activity()
case 'postgresql':
$sql = sprintf(
"SELECT \"id_usuario\", accion, fecha, \"ip_origen\", descripcion, utimestamp
- FROM tsesion
- WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_1WEEK.")
- AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 5",
+ FROM tsesion
+ WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_1WEEK.")
+ AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 5",
$config['id_user']
);
break;
@@ -3625,9 +4363,9 @@ function reporting_get_last_activity()
case 'oracle':
$sql = sprintf(
"SELECT id_usuario, accion, fecha, ip_origen, descripcion, utimestamp
- FROM tsesion
- WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_1WEEK.")
- AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC",
+ FROM tsesion
+ WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_1WEEK.")
+ AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC",
$config['id_user']
);
break;
@@ -3805,7 +4543,7 @@ function reporting_get_event_histogram($events, $text_header_event=false)
if (!defined('METACONSOLE')) {
if (!$text_header_event) {
$event_graph = '
- '.$text_header_event.' '.html_print_table($table, true).' ';
+ '.$text_header_event.' '.html_print_table($table, true).'';
} else {
$table->class = 'noclass';
$event_graph = html_print_table($table, true);
@@ -3903,9 +4641,9 @@ function reporting_get_event_histogram_meta($width)
$time_condition = 'utimestamp > '.$bottom.' AND utimestamp < '.$top;
$sql = sprintf(
'SELECT criticity,utimestamp
- FROM tmetaconsole_event
- WHERE %s %s %s
- ORDER BY criticity DESC',
+ FROM tmetaconsole_event
+ WHERE %s %s %s
+ ORDER BY criticity DESC',
$time_condition,
$groups_condition,
$status_condition
@@ -3989,7 +4727,7 @@ function reporting_get_event_histogram_meta($width)
if (!$text_header_event) {
$event_graph = '
- '.$text_header_event.' '.html_print_table($table, true).' ';
+ '.$text_header_event.' '.html_print_table($table, true).'';
} else {
$table->class = 'noclass';
$event_graph = html_print_table($table, true);
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 3081e076b6..ba6659ddc1 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -1,22 +1,33 @@
__('Recon server')]);
+ case SERVER_TYPE_DISCOVERY:
+ $server['img'] = html_print_image('images/recon.png', true, ['title' => __('Discovery server')]);
$server['type'] = 'recon';
$id_modulo = 0;
break;
@@ -589,11 +600,11 @@ function servers_get_info($id_server=-1)
$server['lag'] = 0;
$server['module_lag'] = 0;
}
- // Recon server
- else if ($server['server_type'] == SERVER_TYPE_RECON) {
+ // Discovery server
+ else if ($server['server_type'] == SERVER_TYPE_DISCOVERY) {
$server['name'] = ''.$server['name'].' ';
- // Total jobs running on this recon server
+ // Total jobs running on this Discovery server
$server['modules'] = db_get_sql(
'SELECT COUNT(id_rt)
FROM trecon_task
@@ -921,3 +932,64 @@ function servers_get_status($id_server)
$serverinfo = servers_get_info($id_server);
return $serverinfo[$id_server];
}
+
+
+/**
+ * Return server name based on identifier.
+ *
+ * @param integer $server Server identifier.
+ *
+ * @return string Server name
+ */
+function servers_get_server_string_name(int $server)
+{
+ switch ($server) {
+ case SERVER_TYPE_DATA:
+ return __('Data server');
+
+ case SERVER_TYPE_NETWORK:
+ return __('Network server');
+
+ case SERVER_TYPE_SNMP:
+ return __('SNMP server');
+
+ case SERVER_TYPE_ENTERPRISE_ICMP:
+ return __('Enterprise ICMP server');
+
+ case SERVER_TYPE_ENTERPRISE_SNMP:
+ return __('Enterprise SNMP server');
+
+ case SERVER_TYPE_PLUGIN:
+ return __('Plugin server');
+
+ case SERVER_TYPE_PREDICTION:
+ return __('Prediction Server');
+
+ case SERVER_TYPE_WMI:
+ return __('WMI server');
+
+ case SERVER_TYPE_WEB:
+ return __('Web server');
+
+ case SERVER_TYPE_EXPORT:
+ return __('Export server');
+
+ case SERVER_TYPE_INVENTORY:
+ return __('Inventory server');
+
+ case SERVER_TYPE_EVENT:
+ return __('Event server');
+
+ case SERVER_TYPE_DISCOVERY:
+ return __('Discovery server');
+
+ case SERVER_TYPE_SYSLOG:
+ return __('Syslog server');
+
+ case SERVER_TYPE_WUX:
+ return __('WUX server');
+
+ default:
+ return __('N/A');
+ }
+}
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 57bc416c76..4920816c89 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -27,7 +27,7 @@ $nfdump_date_format = 'Y/m/d.H:i:s';
* @param id string Level ID. Do not set, used for recursion.
* @param depth string Branch depth. Do not set, used for recursion.
*/
-function snmp_browser_print_tree($tree, $id=0, $depth=0, $last=0, $last_array=[])
+function snmp_browser_print_tree($tree, $id=0, $depth=0, $last=0, $last_array=[], $sufix=false, $checked=[])
{
static $url = false;
@@ -52,13 +52,13 @@ function snmp_browser_print_tree($tree, $id=0, $depth=0, $last=0, $last_array=[]
}
foreach ($tree['__LEAVES__'] as $level => $sub_level) {
- // Id used to expand leafs
+ // Id used to expand leafs.
$sub_id = time().rand(0, getrandmax());
- // Display the branch
+ // Display the branch.
echo "";
- // Indent sub branches
+ // Indent sub branches.
for ($i = 1; $i <= $depth; $i++) {
if ($last_array[$i] == 1) {
echo '";
if ($depth == 0 && $count == 0) {
@@ -84,7 +84,7 @@ function snmp_browser_print_tree($tree, $id=0, $depth=0, $last=0, $last_array=[]
echo ' ';
}
- // Leave
+ // Leave.
else {
if ($depth == 0 && $count == 0) {
if ($count == $total) {
@@ -106,15 +106,18 @@ function snmp_browser_print_tree($tree, $id=0, $depth=0, $last=0, $last_array=[]
echo '';
}
- echo html_print_checkbox("create_$sub_id", 0, false, true, false, '').' '.$level.' ';
+ $checkbox_name_sufix = ($sufix === true) ? '_'.$level : '';
+ $checkbox_name = 'create_'.$sub_id.$checkbox_name_sufix;
+ $status = (!empty($checked) && isset($checked[$level]));
+ echo html_print_checkbox($checkbox_name, 0, $status, true, false, '').' '.$level.' ';
if (isset($sub_level['__VALUE__'])) {
echo ' = '.$sub_level['__VALUE__'].' ';
}
echo ' ';
- // Recursively print sub levels
- snmp_browser_print_tree($sub_level, $sub_id, ($depth + 1), ($count == $total ? 1 : 0), $last_array);
+ // Recursively print sub levels.
+ snmp_browser_print_tree($sub_level, $sub_id, ($depth + 1), ($count == $total ? 1 : 0), $last_array, $sufix, $checked);
$count++;
}
@@ -838,7 +841,7 @@ function snmp_browser_print_container($return=false, $width='100%', $height='500
if ($(this).is(':checked') ) {
$('input[name*=create_network_component]').show();
var id_input = $(this).attr("id");
- id_input = id_input.split("checkbox-create_");
+ id_input = id_input.match("checkbox-create_([0-9]+)");
var checks = $('#ul_'+id_input[1]).find('input').map(function(){
if(this.id.indexOf('checkbox-create_')!=-1){
return this.id;
@@ -851,7 +854,7 @@ function snmp_browser_print_container($return=false, $width='100%', $height='500
} else {
var id_input = $(this).attr("id");
- id_input = id_input.split("checkbox-create_");
+ id_input = id_input.match("checkbox-create_([0-9]+)");
var checks = $('#ul_'+id_input[1]).find('input').map(function(){
if(this.id.indexOf('checkbox-create_')!=-1){
return this.id;
diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php
index 2969a80dcd..ebbc2ac376 100644
--- a/pandora_console/include/functions_tags.php
+++ b/pandora_console/include/functions_tags.php
@@ -748,7 +748,7 @@ function tags_get_acl_tags(
$id_user = $config['id_user'];
}
- if (is_user_admin($id_user)) {
+ if (is_user_admin($id_user) && empty($childrens_ids)) {
switch ($return_mode) {
case 'data':
return [];
@@ -797,7 +797,8 @@ function tags_get_acl_tags(
// Return the condition of the tags for tagente_modulo table
$condition = tags_get_acl_tags_module_condition(
$acltags,
- $query_table
+ $query_table,
+ empty($childrens_ids) ? [] : $childrens_ids
);
if (!empty($condition)) {
return " $query_prefix ".$condition;
@@ -825,7 +826,7 @@ function tags_get_acl_tags(
*
* @return string SQL condition for tagente_module
*/
-function tags_get_acl_tags_module_condition($acltags, $modules_table='')
+function tags_get_acl_tags_module_condition($acltags, $modules_table='', $force_tags=[])
{
if (!empty($modules_table)) {
$modules_table .= '.';
@@ -839,6 +840,17 @@ function tags_get_acl_tags_module_condition($acltags, $modules_table='')
// The acltags array contains the groups with the acl propagation applied
// after the changes done into the 'tags_get_user_groups_and_tags' function.
foreach ($acltags as $group_id => $group_tags) {
+ if (empty($group_tags)) {
+ $group_tags = [];
+ if (!empty($force_tags)) {
+ $group_tags = $force_tags;
+ }
+ }
+
+ if (!empty($group_tags)) {
+ $group_tags = array_intersect($force_tags, $group_tags);
+ }
+
$tag_join = '';
if (!empty($group_tags)) {
$tag_join = sprintf('AND ttag_module.id_tag IN (%s)', is_array($group_tags) ? implode(',', $group_tags) : $group_tags);
@@ -849,7 +861,7 @@ function tags_get_acl_tags_module_condition($acltags, $modules_table='')
}
$group_conditions[] = $agent_condition;
- } else {
+ } else if (!empty($force_tags)) {
$without_tags[] = $group_id;
}
}
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 45713c8f24..151014cd01 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -1313,20 +1313,79 @@ function visual_map_editor_print_hack_translate_strings()
echo ''.__('Any').' ';
echo ''.__('IP').' ';
- // Hack to translate messages in javascript
- echo ''.__('No image or name defined.').' ';
- echo ''.__('No label defined.').' ';
- echo ''.__('No image defined.').' ';
- echo ''.__('No process defined.').' ';
- echo ''.__('No Max value defined.').' ';
- echo ''.__('No width defined.').' ';
- echo ''.__('No height defined.').' ';
- echo ''.__('No period defined.').' ';
- echo ''.__('No agent defined.').' ';
- echo ''.__('No module defined.').' ';
+ // Hack to translate messages in javascript.
+ echo "";
+ echo "
".__('Min allowed size is 1024x768.').'
';
+ echo '
";
+ echo "
".__('No custom graph defined.').'
';
+ echo '
";
+ echo "
".__('No image or name defined.').'
';
+ echo '
";
+ echo "
".__('No label defined.').'
';
+ echo '
";
+ echo "
".__('No service defined.').'
';
+ echo '
";
+ echo "
".__('No image defined.').'
';
+ echo '
";
+ echo "
".__('No process defined.').'
';
+ echo '
";
+ echo "
".__('No Max value defined.').'
';
+ echo '
";
+ echo "
".__('No width defined.').'
';
+ echo '
";
+ echo "
".__('No height defined.').'
';
+ echo '
";
+ echo "
".__('The width must not exceed the size of the visual console container.').'
';
+ echo '
";
+ echo "
".__('The height must not exceed the size of the visual console container.').'
';
+ echo '
";
+ echo "
".__('No period defined.').'
';
+ echo '
";
+ echo "
".__('No agent defined.').'
';
+ echo '
";
+ echo "
".__('No module defined.').'
';
+ echo '
";
+ echo "
".__('No module defined. This module must be string type.').'
';
+ echo '
";
+ echo "
".__('Successfully save the changes.').'
';
+ echo '
";
+ echo "
".__('Could not be save.').'
';
+ echo '
'.__('Successfully save the changes.').' ';
- echo ''.__('Could not be save').' ';
}
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 0460b55c99..dd6fb0645e 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -856,11 +856,12 @@ function pandoraFlotSlicebar(
}
var font_size = parseInt(font_size);
- var font = font
- .split("/")
- .pop()
- .split(".")
- .shift();
+ if (font != undefined)
+ var font = font
+ .split("/")
+ .pop()
+ .split(".")
+ .shift();
// Check possible adapt_keys on classes
check_adaptions(graph_id);
diff --git a/pandora_console/include/help/en/help_column_macros.php b/pandora_console/include/help/en/help_column_macros.php
new file mode 100644
index 0000000000..85fe72f39f
--- /dev/null
+++ b/pandora_console/include/help/en/help_column_macros.php
@@ -0,0 +1,14 @@
+
+Module macros
+
+
+The following macros are available:
+
+_agentcustomfield_n _: Agent custom field number n (eg. _agentcustomfield_9_).
+
+
+
diff --git a/pandora_console/include/help/en/help_reconscript_definition.php b/pandora_console/include/help/en/help_reconscript_definition.php
index 3259b34dd2..f7562acbfc 100644
--- a/pandora_console/include/help/en/help_reconscript_definition.php
+++ b/pandora_console/include/help/en/help_reconscript_definition.php
@@ -7,7 +7,7 @@
The "ReconScripts" allows to work with more flexible capabilities. The recon scripts are developped in an individual way with completely specific targets, such as the network plugins or the agent plugins. Each ReconScript is different and has one purpose.
-Its basic idea consist on "detect" things in the system it recognizes and automatically log in one monitoring (network, plugin or wmi) so in a completely customized way we could automatically log in requests in an Oracle database, new virtual host in a VmWare that is managed with VirtualCenter or we also can detect new requests in an WebLogic application Server. It is possible to do an script or application that does the task that are wanted and schedule its execution through the Recon Server.
+Its basic idea consist on "detect" things in the system it recognizes and automatically log in one monitoring (network, plugin or wmi) so in a completely customized way we could automatically log in requests in an Oracle database, new virtual host in a VmWare that is managed with VirtualCenter or we also can detect new requests in an WebLogic application Server. It is possible to do an script or application that does the task that are wanted and schedule its execution through the Discovery Server.
A field with importance is:
diff --git a/pandora_console/include/help/en/help_recontask.php b/pandora_console/include/help/en/help_recontask.php
index 0223d66e5b..b56a0a85c6 100644
--- a/pandora_console/include/help/en/help_recontask.php
+++ b/pandora_console/include/help/en/help_recontask.php
@@ -11,9 +11,9 @@ If you choose to edit or create a new task of network recon, then you should fil
Name of the discovery task. It's only a descriptive value to could distinguish the task in case it would have several of them with different values of filter or template. Recon server Discovery server Mode Event associated module name: _module_name_Event owner user: _owner_user_User ID: _user_id_Id of the user who fires the response: _current_user_Custom fields
diff --git a/pandora_console/include/help/es/help_column_macros.php b/pandora_console/include/help/es/help_column_macros.php
new file mode 100644
index 0000000000..b34ede1555
--- /dev/null
+++ b/pandora_console/include/help/es/help_column_macros.php
@@ -0,0 +1,13 @@
+
+Macros de módulos
+
+
+Las siguientes macros están disponibles:
+
+
+_agentcustomfield_n _: Campo personalizado número n del agente (eg. _agentcustomfield_9_).
+
diff --git a/pandora_console/include/help/es/help_response_macros.php b/pandora_console/include/help/es/help_response_macros.php
index adc43b4f48..5a860f1548 100644
--- a/pandora_console/include/help/es/help_response_macros.php
+++ b/pandora_console/include/help/es/help_response_macros.php
@@ -33,6 +33,7 @@ Las macros aceptadas son las siguientes:
Nombre del módulo asociado al evento: _module_name_Usuario propietario del evento: _owner_user_Id del usuario: _user_id_Id del usuario que ejecuta la respuesta: _current_user_Campos personalizados
diff --git a/pandora_console/include/help/ja/help_column_macros.php b/pandora_console/include/help/ja/help_column_macros.php
new file mode 100644
index 0000000000..9d925b1193
--- /dev/null
+++ b/pandora_console/include/help/ja/help_column_macros.php
@@ -0,0 +1,15 @@
+
+モジュールマクロ
+
+
+次のマクロが利用できます:
+
+
+_agentcustomfield_n _ : エージェントカスタムフィールド番号n (例: _agentcustomfield_9_).
+
+
+
diff --git a/pandora_console/include/help/ja/help_recontask.php b/pandora_console/include/help/ja/help_recontask.php
index 790c2cdb48..182b249653 100644
--- a/pandora_console/include/help/ja/help_recontask.php
+++ b/pandora_console/include/help/ja/help_recontask.php
@@ -12,7 +12,7 @@
検出タスクの名前です。フィルターやテンプレートとは異なり、タスクを区別しやすい説明を入れるだけです。自動検出サーバ(Recon server) 自動検出サーバ(Discovery server) Event associated module name: _module_name_Event owner user: _owner_user_User ID: _user_id_Id of the user who fires the response: _current_user_Custom fields
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 37a9987812..c30736cd8b 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -503,6 +503,14 @@ function module_changed_by_multiple_modules(event, id_module, selected) {
selection_mode = "common";
}
+ var tags_selected = [];
+
+ var tags_to_search = $("#tags").val();
+ if (tags_to_search != null) {
+ if (tags_to_search[0] != -1) {
+ tags_selected = tags_to_search;
+ }
+ }
jQuery.post(
"ajax.php",
{
@@ -510,7 +518,8 @@ function module_changed_by_multiple_modules(event, id_module, selected) {
get_agents_json_for_multiple_modules: 1,
status_module: status_module,
"module_name[]": idModules,
- selection_mode: selection_mode
+ selection_mode: selection_mode,
+ tags: tags_selected
},
function(data) {
$("#agents").append(
diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index e3f7260de4..1ce416e770 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -115,8 +115,21 @@ var TreeController = {
}
};
+ var serviceCounterTitles = {
+ total_services: {
+ totals: "Services"
+ },
+ total_agents: {
+ totals: "Agents"
+ },
+ total_modules: {
+ totals: "Modules"
+ }
+ };
+
try {
var title = "";
+
switch (elementType) {
case "group":
if (
@@ -144,6 +157,9 @@ var TreeController = {
title = defaultCounterTitles[counterType].modules;
}
break;
+ case "services":
+ title = serviceCounterTitles[counterType].totals;
+ break;
default:
if (
typeof controller.counterTitles != "undefined" &&
@@ -169,109 +185,227 @@ var TreeController = {
}
}
- var $counters = $("
");
- $counters.addClass("tree-node-counters");
-
- if (typeof counters.total != "undefined" && counters.total >= 0) {
- var $totalCounter = $("
");
- $totalCounter
- .addClass("tree-node-counter")
- .addClass("total")
- .html(counters.total);
-
- _processNodeCounterTitle($totalCounter, type, "total");
-
- // Open the parentheses
- $counters.append(" (");
-
- $counters.append($totalCounter);
+ if (type == "services") {
+ var $counters = $("
");
+ $counters.addClass("tree-node-counters");
if (
- typeof counters.alerts != "undefined" &&
- counters.alerts > 0
+ counters.total_services +
+ counters.total_agents +
+ counters.total_modules >
+ 0
) {
- var $firedCounter = $("
");
- $firedCounter
- .addClass("tree-node-counter")
- .addClass("alerts")
- .addClass("orange")
- .html(counters.alerts);
+ // Open the parentheses
+ $counters.append(" (");
- _processNodeCounterTitle($firedCounter, type, "alerts");
+ if (
+ typeof counters.total_services != "undefined" &&
+ counters.total_services >= 0
+ ) {
+ var $servicesCounter = $("
");
+ $servicesCounter
+ .addClass("tree-node-counter")
+ .addClass("total")
+ .html(counters.total_services);
- $counters.append(" : ").append($firedCounter);
+ _processNodeCounterTitle(
+ $servicesCounter,
+ type,
+ "total_services"
+ );
+
+ $counters.append($servicesCounter);
+ } else {
+ var $servicesCounter = $("
");
+ $servicesCounter
+ .addClass("tree-node-counter")
+ .addClass("total")
+ .html("0");
+
+ _processNodeCounterTitle(
+ $servicesCounter,
+ type,
+ "total_services"
+ );
+
+ $counters.append($servicesCounter);
+ }
+
+ if (
+ typeof counters.total_agents != "undefined" &&
+ counters.total_agents > 0
+ ) {
+ var $agentsCounter = $("
");
+ $agentsCounter
+ .addClass("tree-node-counter")
+ .html(counters.total_agents);
+
+ _processNodeCounterTitle(
+ $agentsCounter,
+ type,
+ "total_agents"
+ );
+
+ $counters.append(" : ").append($agentsCounter);
+ } else {
+ var $agentsCounter = $("
");
+ $agentsCounter
+ .addClass("tree-node-counter")
+ .addClass("total")
+ .html("0");
+
+ _processNodeCounterTitle(
+ $agentsCounter,
+ type,
+ "total_agents"
+ );
+
+ $counters.append(" : ").append($agentsCounter);
+ }
+
+ if (
+ typeof counters.total_modules != "undefined" &&
+ counters.total_modules > 0
+ ) {
+ var $modulesCounter = $("
");
+ $modulesCounter
+ .addClass("tree-node-counter")
+ .addClass("total")
+ .html(counters.total_modules);
+
+ _processNodeCounterTitle(
+ $modulesCounter,
+ type,
+ "total_modules"
+ );
+
+ $counters.append(" : ").append($modulesCounter);
+ } else {
+ var $modulesCounter = $("
");
+ $modulesCounter
+ .addClass("tree-node-counter")
+ .addClass("total")
+ .html("0");
+
+ _processNodeCounterTitle(
+ $modulesCounter,
+ type,
+ "total_modules"
+ );
+
+ $counters.append(" : ").append($modulesCounter);
+ }
+
+ // Close the parentheses
+ $counters.append(")");
+
+ hasCounters = true;
}
- if (
- typeof counters.critical != "undefined" &&
- counters.critical > 0
- ) {
- var $criticalCounter = $("
");
- $criticalCounter
+ } else {
+ var $counters = $("
");
+ $counters.addClass("tree-node-counters");
+
+ if (typeof counters.total != "undefined" && counters.total >= 0) {
+ var $totalCounter = $("
");
+ $totalCounter
.addClass("tree-node-counter")
- .addClass("critical")
- .addClass("red")
- .html(counters.critical);
+ .addClass("total")
+ .html(counters.total);
- _processNodeCounterTitle($criticalCounter, type, "critical");
+ _processNodeCounterTitle($totalCounter, type, "total");
- $counters.append(" : ").append($criticalCounter);
- }
- if (
- typeof counters.warning != "undefined" &&
- counters.warning > 0
- ) {
- var $warningCounter = $("
");
- $warningCounter
- .addClass("tree-node-counter")
- .addClass("warning")
- .addClass("yellow")
- .html(counters.warning);
+ // Open the parentheses
+ $counters.append(" (");
- _processNodeCounterTitle($warningCounter, type, "warning");
+ $counters.append($totalCounter);
- $counters.append(" : ").append($warningCounter);
- }
- if (
- typeof counters.unknown != "undefined" &&
- counters.unknown > 0
- ) {
- var $unknownCounter = $("
");
- $unknownCounter
- .addClass("tree-node-counter")
- .addClass("unknown")
- .addClass("grey")
- .html(counters.unknown);
+ if (
+ typeof counters.alerts != "undefined" &&
+ counters.alerts > 0
+ ) {
+ var $firedCounter = $("
");
+ $firedCounter
+ .addClass("tree-node-counter")
+ .addClass("alerts")
+ .addClass("orange")
+ .html(counters.alerts);
- _processNodeCounterTitle($unknownCounter, type, "unknown");
+ _processNodeCounterTitle($firedCounter, type, "alerts");
- $counters.append(" : ").append($unknownCounter);
- }
- if (
- typeof counters.not_init != "undefined" &&
- counters.not_init > 0
- ) {
- var $notInitCounter = $("
");
- $notInitCounter
- .addClass("tree-node-counter")
- .addClass("not_init")
- .addClass("blue")
- .html(counters.not_init);
+ $counters.append(" : ").append($firedCounter);
+ }
+ if (
+ typeof counters.critical != "undefined" &&
+ counters.critical > 0
+ ) {
+ var $criticalCounter = $("
");
+ $criticalCounter
+ .addClass("tree-node-counter")
+ .addClass("critical")
+ .addClass("red")
+ .html(counters.critical);
- _processNodeCounterTitle($notInitCounter, type, "not_init");
+ _processNodeCounterTitle($criticalCounter, type, "critical");
- $counters.append(" : ").append($notInitCounter);
- }
- if (typeof counters.ok != "undefined" && counters.ok > 0) {
- var $okCounter = $("
");
- $okCounter
- .addClass("tree-node-counter")
- .addClass("ok")
- .addClass("green")
- .html(counters.ok);
+ $counters.append(" : ").append($criticalCounter);
+ }
+ if (
+ typeof counters.warning != "undefined" &&
+ counters.warning > 0
+ ) {
+ var $warningCounter = $("
");
+ $warningCounter
+ .addClass("tree-node-counter")
+ .addClass("warning")
+ .addClass("yellow")
+ .html(counters.warning);
- _processNodeCounterTitle($okCounter, type, "ok");
+ _processNodeCounterTitle($warningCounter, type, "warning");
- $counters.append(" : ").append($okCounter);
+ $counters.append(" : ").append($warningCounter);
+ }
+ if (
+ typeof counters.unknown != "undefined" &&
+ counters.unknown > 0
+ ) {
+ var $unknownCounter = $("
");
+ $unknownCounter
+ .addClass("tree-node-counter")
+ .addClass("unknown")
+ .addClass("grey")
+ .html(counters.unknown);
+
+ _processNodeCounterTitle($unknownCounter, type, "unknown");
+
+ $counters.append(" : ").append($unknownCounter);
+ }
+ if (
+ typeof counters.not_init != "undefined" &&
+ counters.not_init > 0
+ ) {
+ var $notInitCounter = $("
");
+ $notInitCounter
+ .addClass("tree-node-counter")
+ .addClass("not_init")
+ .addClass("blue")
+ .html(counters.not_init);
+
+ _processNodeCounterTitle($notInitCounter, type, "not_init");
+
+ $counters.append(" : ").append($notInitCounter);
+ }
+ if (typeof counters.ok != "undefined" && counters.ok > 0) {
+ var $okCounter = $("
");
+ $okCounter
+ .addClass("tree-node-counter")
+ .addClass("ok")
+ .addClass("green")
+ .html(counters.ok);
+
+ _processNodeCounterTitle($okCounter, type, "ok");
+
+ $counters.append(" : ").append($okCounter);
+ }
}
// Close the parentheses
@@ -436,7 +570,120 @@ var TreeController = {
$content.append($alertImage);
}
- $content.append(element.alias);
+
+ // Events by agent
+ if (element.showEventsBtn == 1) {
+ if (typeof element.eventAgent != "undefined") {
+ $content.append(
+ ''
+ );
+ var $eventImage = $(
+ ' " +
- controller.foundMessage +
- ": " +
- controller.tree.length +
- "
" +
- " " +
+ controller.foundMessage +
+ ": " +
+ controller.tree.length +
+ "
" +
+ "
Checking software dependencies';
echo '
';
$res = 0;
- $res += check_variable(phpversion(), '5.2', 'PHP version >= 5.2', 1);
+ $res += check_variable(phpversion(), '7.0', 'PHP version >= 7.0', 1);
$res += check_extension('gd', 'PHP GD extension');
$res += check_extension('ldap', 'PHP LDAP extension');
$res += check_extension('snmp', 'PHP SNMP extension');
@@ -564,7 +564,6 @@ function install_step2()
font-size: 8.5pt;margin-top: 2px; font-weight: bolder;'>DB Engines";
echo '';
echo ' ';
- check_extension('mysql', 'PHP MySQL extension');
check_extension('mysqli', 'PHP MySQL(mysqli) extension');
echo '
';
diff --git a/pandora_console/mobile/operation/alerts.php b/pandora_console/mobile/operation/alerts.php
index b95ba9492d..8991f0d8b3 100644
--- a/pandora_console/mobile/operation/alerts.php
+++ b/pandora_console/mobile/operation/alerts.php
@@ -313,7 +313,7 @@ class Alerts
$row = [];
if (isset($this->columns['agent']) && $this->columns['agent']) {
- $row[__('Agent')] = sprintf($disabled_style, io_safe_output($alert['agent_name']));
+ $row[__('Agent')] = sprintf($disabled_style, io_safe_output($alert['agent_alias']));
}
$row[__('Module')] = sprintf(
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index ada6cd6ec6..0dd536ac7f 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -37,12 +37,37 @@ enterprise_include_once('include/functions_metaconsole.php');
$isFunctionPolicies = enterprise_include_once('include/functions_policies.php');
if (! defined('METACONSOLE')) {
- // Header
- ui_print_page_header(
- __('Monitor detail'),
- 'images/brick.png',
- false
- );
+ $section = (string) get_parameter('section', 'view');
+
+ $buttons['fields'] = [
+ 'active' => false,
+ 'text' => '
'.html_print_image('images/custom_columns.png', true, ['title' => __('Custom fields')]).' ',
+ 'operation' => true,
+ ];
+
+ $buttons['view'] = [
+ 'active' => false,
+ 'text' => '
'.html_print_image('images/list.png', true, ['title' => __('View')]).' ',
+ 'operation' => true,
+ ];
+
+ switch ($section) {
+ case 'fields':
+ $buttons['fields']['active'] = true;
+ $subpage = ' - '.__('Custom fields');
+ break;
+
+ default:
+ $buttons['view']['active'] = true;
+ break;
+ }
+
+ ui_print_page_header(__('Monitor detail').$subpage, '', false, '', true, $buttons);
+
+ if ($section == 'fields') {
+ include_once $config['homedir'].'/godmode/agentes/status_monitor_custom_fields.php';
+ exit();
+ }
} else {
ui_meta_print_header(__('Monitor view'));
}
@@ -1045,48 +1070,77 @@ if (!empty($result)) {
$table->size = [];
$table->align = [];
- if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
- $table->head[0] = '
'.__('P.').' ';
+ $show_fields = explode(',', $config['status_monitor_fields']);
+
+
+ if (in_array('policy', $show_fields)) {
+ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+ $table->head[0] = '
'.__('P.').' ';
+ }
}
- $table->head[1] = __('Agent');
- $table->head[1] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectAgentNameUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectAgentNameDown, 'alt' => 'down']).' ';
-
- $table->head[2] = __('Data Type');
- $table->head[2] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown, 'alt' => 'down']).' ';
-
- $table->align[2] = 'left';
-
- $table->head[3] = __('Module name');
- $table->head[3] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).' ';
-
- $table->head[4] = __('Server type');
- $table->head[4] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).' ';
-
- $table->head[5] = __('Interval');
- $table->head[5] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown, 'alt' => 'down']).' ';
- $table->align[5] = 'left';
-
- $table->head[6] = __('Status');
- $table->head[6] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).' ';
-
- $table->align[6] = 'left';
-
- $table->head[7] = __('Graph');
- $table->align[7] = 'left';
-
- $table->head[8] = __('Warn');
- $table->align[8] = 'left';
-
- $table->head[9] = __('Data');
- $table->align[9] = 'left';
- if (is_metaconsole()) {
- $table->head[9] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).' ';
+ if (in_array('agent', $show_fields) || is_metaconsole()) {
+ $table->head[1] = __('Agent');
+ $table->head[1] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectAgentNameUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectAgentNameDown, 'alt' => 'down']).' ';
}
- $table->head[10] = __('Timestamp');
- $table->head[10] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectTimestampUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectTimestampDown, 'alt' => 'down']).' ';
- $table->align[10] = 'left';
+ if (in_array('data_type', $show_fields) || is_metaconsole()) {
+ $table->head[2] = __('Data Type');
+ $table->head[2] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown, 'alt' => 'down']).' ';
+
+ $table->align[2] = 'left';
+ }
+
+ if (in_array('module_name', $show_fields) || is_metaconsole()) {
+ $table->head[3] = __('Module name');
+ $table->head[3] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).' ';
+ }
+
+ if (in_array('server_type', $show_fields) || is_metaconsole()) {
+ $table->head[4] = __('Server type');
+ $table->head[4] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).' ';
+ }
+
+ if (in_array('interval', $show_fields) || is_metaconsole()) {
+ $table->head[5] = __('Interval');
+ $table->head[5] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown, 'alt' => 'down']).' ';
+ $table->align[5] = 'left';
+ }
+
+ if (in_array('status', $show_fields) || is_metaconsole()) {
+ $table->head[6] = __('Status');
+ $table->head[6] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).' ';
+
+ $table->align[6] = 'left';
+ }
+
+ if (in_array('graph', $show_fields) || is_metaconsole()) {
+ $table->head[7] = __('Graph');
+ $table->align[7] = 'left';
+ }
+
+ if (in_array('warn', $show_fields) || is_metaconsole()) {
+ $table->head[8] = __('Warn');
+ $table->align[8] = 'left';
+ }
+
+ if (in_array('data', $show_fields) || is_metaconsole()) {
+ $table->head[9] = __('Data');
+ $table->align[9] = 'left';
+ if (is_metaconsole()) {
+ $table->head[9] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).' ';
+ }
+ }
+
+ if (in_array('timestamp', $show_fields) || is_metaconsole()) {
+ $table->head[10] = __('Timestamp');
+ $table->head[10] .= '
'.html_print_image('images/sort_up.png', true, ['style' => $selectTimestampUp, 'alt' => 'up']).' '.'
'.html_print_image('images/sort_down.png', true, ['style' => $selectTimestampDown, 'alt' => 'down']).' ';
+ $table->align[10] = 'left';
+ }
+
+ if (in_array('to_critical', $show_fields)) {
+ $table->head[11] = __('Last status change');
+ }
$id_type_web_content_string = db_get_value(
'id_tipo',
@@ -1110,459 +1164,487 @@ if (!empty($result)) {
]
);
- // Fixed the goliat sends the strings from web
- // without HTML entities
+ // Fixed the goliat sends the strings from web
+ // without HTML entities
if ($is_web_content_string) {
$row['datos'] = io_safe_input($row['datos']);
}
- // Fixed the data from Selenium Plugin
+ // Fixed the data from Selenium Plugin
if ($row['datos'] != strip_tags($row['datos'])) {
$row['datos'] = io_safe_input($row['datos']);
}
- $data = [];
- if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
- if (is_metaconsole()) {
- $node = metaconsole_get_connection_by_id($row['server_id']);
- if (metaconsole_load_external_db($node) !== NOERR) {
- // Restore the default connection.
- metaconsole_restore_db();
- $errors++;
- break;
- }
- }
+ $data = [];
- $policyInfo = policies_info_module_policy($row['id_agente_modulo']);
-
- if ($policyInfo === false) {
- $data[0] = '';
- } else {
- $linked = policies_is_module_linked($row['id_agente_modulo']);
-
- $adopt = false;
- if (policies_is_module_adopt($row['id_agente_modulo'])) {
- $adopt = true;
- }
-
- if ($linked) {
- if ($adopt) {
- $img = 'images/policies_brick.png';
- $title = __('(Adopt) ').$policyInfo['name_policy'];
- } else {
- $img = 'images/policies.png';
- $title = $policyInfo['name_policy'];
+ if (in_array('policy', $show_fields) || is_metaconsole()) {
+ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
+ if (is_metaconsole()) {
+ $node = metaconsole_get_connection_by_id($row['server_id']);
+ if (metaconsole_load_external_db($node) !== NOERR) {
+ // Restore the default connection.
+ metaconsole_restore_db();
+ $errors++;
+ break;
}
+ }
+
+ $policyInfo = policies_info_module_policy($row['id_agente_modulo']);
+
+ if ($policyInfo === false) {
+ $data[0] = '';
} else {
- if ($adopt) {
- $img = 'images/policies_not_brick.png';
- $title = __('(Unlinked) (Adopt) ').$policyInfo['name_policy'];
+ $linked = policies_is_module_linked($row['id_agente_modulo']);
+
+ $adopt = false;
+ if (policies_is_module_adopt($row['id_agente_modulo'])) {
+ $adopt = true;
+ }
+
+ if ($linked) {
+ if ($adopt) {
+ $img = 'images/policies_brick.png';
+ $title = __('(Adopt) ').$policyInfo['name_policy'];
+ } else {
+ $img = 'images/policies.png';
+ $title = $policyInfo['name_policy'];
+ }
} else {
- $img = 'images/unlinkpolicy.png';
- $title = __('(Unlinked) ').$policyInfo['name_policy'];
+ if ($adopt) {
+ $img = 'images/policies_not_brick.png';
+ $title = __('(Unlinked) (Adopt) ').$policyInfo['name_policy'];
+ } else {
+ $img = 'images/unlinkpolicy.png';
+ $title = __('(Unlinked) ').$policyInfo['name_policy'];
+ }
+ }
+
+ if (is_metaconsole()) {
+ $data[0] = '
'.html_print_image($img, true, ['title' => $title]).' ';
+ } else {
+ $data[0] = '
'.html_print_image($img, true, ['title' => $title]).' ';
}
}
if (is_metaconsole()) {
- $data[0] = '
'.html_print_image($img, true, ['title' => $title]).' ';
- } else {
- $data[0] = '
'.html_print_image($img, true, ['title' => $title]).' ';
+ metaconsole_restore_db();
}
}
-
- if (is_metaconsole()) {
- metaconsole_restore_db();
- }
}
- $agent_alias = !empty($row['agent_alias']) ? $row['agent_alias'] : $row['agent_name'];
+ if (in_array('agent', $show_fields) || is_metaconsole()) {
+ $agent_alias = !empty($row['agent_alias']) ? $row['agent_alias'] : $row['agent_name'];
- // TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
- if (defined('METACONSOLE')) {
- $agent_link = '
';
- $agent_alias = ui_print_truncate_text(
- $agent_alias,
- 'agent_small',
- false,
- true,
- false,
- '[…]',
- 'font-size:7.5pt;'
- );
- if (can_user_access_node()) {
+ // TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
+ if (defined('METACONSOLE')) {
+ $agent_link = ' ';
+ $agent_alias = ui_print_truncate_text(
+ $agent_alias,
+ 'agent_small',
+ false,
+ true,
+ false,
+ '[…]',
+ 'font-size:7.5pt;'
+ );
+ if (can_user_access_node()) {
$data[1] = $agent_link.''.$agent_alias.' ';
+ } else {
+ $data[1] = $agent_alias;
+ }
} else {
- $data[1] = $agent_alias;
- }
- } else {
$data[1] = '
';
$data[1] .= ui_print_truncate_text($agent_alias, 'agent_medium', false, true, false, '[…]', 'font-size:7.5pt;');
$data[1] .= ' ';
+ }
}
+ if (in_array('data_type', $show_fields) || is_metaconsole()) {
+ $data[2] = html_print_image('images/'.modules_show_icon_type($row['module_type']), true);
+ $agent_groups = is_metaconsole() ? $row['groups_in_server'] : agents_get_all_groups_agent($row['id_agent'], $row['id_group']);
+ if (check_acl_one_of_groups($config['id_user'], $agent_groups, 'AW')) {
+ $show_edit_icon = true;
+ if (defined('METACONSOLE')) {
+ if (!can_user_access_node()) {
+ $show_edit_icon = false;
+ }
- $data[2] = html_print_image('images/'.modules_show_icon_type($row['module_type']), true);
- $agent_groups = is_metaconsole() ? $row['groups_in_server'] : agents_get_all_groups_agent($row['id_agent'], $row['id_group']);
- if (check_acl_one_of_groups($config['id_user'], $agent_groups, 'AW')) {
- $show_edit_icon = true;
- if (defined('METACONSOLE')) {
- if (!can_user_access_node()) {
- $show_edit_icon = false;
+ $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1'.'&loginhash=auto&loginhash_data='.$row['hashdata'].'&loginhash_user='.str_rot13($row['user']);
+ } else {
+ $url_edit_module = 'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1';
}
- $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1'.'&loginhash=auto&loginhash_data='.$row['hashdata'].'&loginhash_user='.str_rot13($row['user']);
- } else {
- $url_edit_module = 'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1';
+ if ($show_edit_icon) {
+ $data[2] .= '
'.html_print_image(
+ 'images/config.png',
+ true,
+ [
+ 'alt' => '0',
+ 'border' => '',
+ 'title' => __('Edit'),
+ ]
+ ).' ';
+ }
+ }
+ }
+
+ if (in_array('module_name', $show_fields) || is_metaconsole()) {
+ $data[3] = ui_print_truncate_text($row['module_name'], 'agent_small', false, true, true);
+ if ($row['extended_info'] != '') {
+ $data[3] .= ui_print_help_tip($row['extended_info'], true, '/images/default_list.png');
}
- if ($show_edit_icon) {
- $data[2] .= '
'.html_print_image(
- 'images/config.png',
+ if ($row['tags'] != '') {
+ $data[3] .= html_print_image(
+ '/images/tag_red.png',
true,
[
- 'alt' => '0',
- 'border' => '',
- 'title' => __('Edit'),
+ 'title' => $row['tags'],
+ 'style' => 'width: 20px; margin-left: 3px;',
]
- ).' ';
- }
- }
-
- $data[3] = ui_print_truncate_text($row['module_name'], 'agent_small', false, true, true);
- if ($row['extended_info'] != '') {
- $data[3] .= ui_print_help_tip($row['extended_info'], true, '/images/default_list.png');
- }
-
- if ($row['tags'] != '') {
- $data[3] .= html_print_image(
- '/images/tag_red.png',
- true,
- [
- 'title' => $row['tags'],
- 'style' => 'width: 20px; margin-left: 3px;',
- ]
- );
- }
-
- $data[4] = servers_show_type($row['id_modulo']);
-
- $data[5] = ($row['module_interval'] == 0) ? human_time_description_raw($row['agent_interval']) : human_time_description_raw($row['module_interval']);
-
- if ($row['utimestamp'] == 0 && (($row['module_type'] < 21
- || $row['module_type'] > 23) && $row['module_type'] != 100)
- ) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_NO_DATA,
- __('NOT INIT'),
- true
- );
- } else if ($row['estado'] == 0) {
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_OK,
- __('NORMAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_OK,
- __('NORMAL').': '.$row['datos'],
- true
);
}
- } else if ($row['estado'] == 1) {
- if (is_numeric($row['datos'])) {
+ }
+
+ if (in_array('server_type', $show_fields) || is_metaconsole()) {
+ $data[4] = servers_show_type($row['id_modulo']);
+ }
+
+
+ if (in_array('interval', $show_fields) || is_metaconsole()) {
+ $data[5] = ($row['module_interval'] == 0) ? human_time_description_raw($row['agent_interval']) : human_time_description_raw($row['module_interval']);
+ }
+
+ if (in_array('status', $show_fields) || is_metaconsole()) {
+ if ($row['utimestamp'] == 0 && (($row['module_type'] < 21
+ || $row['module_type'] > 23) && $row['module_type'] != 100)
+ ) {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_NO_DATA,
+ __('NOT INIT'),
+ true
+ );
+ } else if ($row['estado'] == 0) {
+ if (is_numeric($row['datos'])) {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_OK,
+ __('NORMAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
+ true
+ );
+ } else {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_OK,
+ __('NORMAL').': '.$row['datos'],
+ true
+ );
+ }
+ } else if ($row['estado'] == 1) {
+ if (is_numeric($row['datos'])) {
$data[6] = ui_print_status_image(
STATUS_MODULE_CRITICAL,
__('CRITICAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
true
);
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_CRITICAL,
- __('CRITICAL').': '.$row['datos'],
- true
- );
- }
- } else if ($row['estado'] == 2) {
- if (is_numeric($row['datos'])) {
+ } else {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_CRITICAL,
+ __('CRITICAL').': '.$row['datos'],
+ true
+ );
+ }
+ } else if ($row['estado'] == 2) {
+ if (is_numeric($row['datos'])) {
$data[6] = ui_print_status_image(
STATUS_MODULE_WARNING,
__('WARNING').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
true
);
+ } else {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_WARNING,
+ __('WARNING').': '.$row['datos'],
+ true
+ );
+ }
} else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_WARNING,
- __('WARNING').': '.$row['datos'],
- true
- );
- }
- } else {
- $last_status = modules_get_agentmodule_last_status(
- $row['id_agente_modulo']
- );
- switch ($last_status) {
- case 0:
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('NORMAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
+ $last_status = modules_get_agentmodule_last_status(
+ $row['id_agente_modulo']
+ );
+ switch ($last_status) {
+ case 0:
+ if (is_numeric($row['datos'])) {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_UNKNOWN,
+ __('UNKNOWN').' - '.__('Last status').' '.__('NORMAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
+ true
+ );
+ } else {
$data[6] = ui_print_status_image(
STATUS_MODULE_UNKNOWN,
__('UNKNOWN').' - '.__('Last status').' '.__('NORMAL').': '.$row['datos'],
true
);
- }
- break;
+ }
+ break;
- case 1:
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.$row['datos'],
- true
- );
- }
- break;
+ case 1:
+ if (is_numeric($row['datos'])) {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_UNKNOWN,
+ __('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
+ true
+ );
+ } else {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_UNKNOWN,
+ __('UNKNOWN').' - '.__('Last status').' '.__('CRITICAL').': '.$row['datos'],
+ true
+ );
+ }
+ break;
- case 2:
- if (is_numeric($row['datos'])) {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
- true
- );
- } else {
- $data[6] = ui_print_status_image(
- STATUS_MODULE_UNKNOWN,
- __('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.$row['datos'],
- true
- );
- }
- break;
- }
- }
-
- $data[7] = '';
-
- $acl_graphs = false;
-
- // Avoid the check on the metaconsole. Too slow to show/hide an icon depending on the permissions
- if (!is_metaconsole()) {
- $acl_graphs = check_acl($config['id_user'], $row['id_group'], 'RR');
- } else {
- $acl_graphs = true;
- }
-
- if ($row['history_data'] == 1 && $acl_graphs) {
- $graph_type = return_graphtype($row['module_type']);
-
- $url = ui_get_full_url('operation/agentes/stat_win.php', false, false, false);
- $handle = dechex(crc32($row['id_agente_modulo'].$row['module_name']));
- $win_handle = 'day_'.$handle;
-
- $graph_params = [
- 'type' => $graph_type,
- 'period' => SECONDS_1DAY,
- 'id' => $row['id_agente_modulo'],
- 'label' => base64_encode($row['module_name']),
- 'refresh' => SECONDS_10MINUTES,
- ];
-
- if (is_metaconsole() && isset($row['server_id'])) {
- // Set the server id
- $graph_params['server'] = $row['server_id'];
- }
-
- $graph_params_str = http_build_query($graph_params);
-
- $link = 'winopeng(\''.$url.'?'.$graph_params_str.'\',\''.$win_handle.'\')';
-
- $data[7] = get_module_realtime_link_graph($row);
-
- if (!is_snapshot_data($row['datos'])) {
- $data[7] .= '
'.html_print_image('images/chart_curve.png', true, ['border' => '0', 'alt' => '']).' ';
- }
-
- $data[7] .= '
'.html_print_image(
- 'images/binary.png',
- true,
- [
- 'border' => '0',
- 'alt' => '',
- ]
- ).' ';
-
- $data[7] .= '
'.$row['module_name'].' ';
- }
-
- $data[8] = ui_print_module_warn_value(
- $row['max_warning'],
- $row['min_warning'],
- $row['str_warning'],
- $row['max_critical'],
- $row['min_critical'],
- $row['str_critical']
- );
-
- if (is_numeric($row['datos']) && !modules_is_string_type($row['module_type'])) {
- if ($config['render_proc']) {
- switch ($row['module_type']) {
case 2:
- case 6:
- case 9:
- case 18:
- case 21:
- case 31:
- if ($row['datos'] >= 1) {
- $salida = $config['render_proc_ok'];
+ if (is_numeric($row['datos'])) {
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_UNKNOWN,
+ __('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.remove_right_zeros(number_format($row['datos'], $config['graph_precision'])),
+ true
+ );
} else {
- $salida = $config['render_proc_fail'];
- }
- break;
-
- default:
- switch ($row['module_type']) {
- case 15:
- $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $row['id_agente_modulo']);
- if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
- $salida = human_milliseconds_to_string($row['datos']);
- } else {
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- }
- break;
-
- default:
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- break;
+ $data[6] = ui_print_status_image(
+ STATUS_MODULE_UNKNOWN,
+ __('UNKNOWN').' - '.__('Last status').' '.__('WARNING').': '.$row['datos'],
+ true
+ );
}
break;
}
+ }
+ }
+
+ if (in_array('graph', $show_fields) || is_metaconsole()) {
+ $data[7] = '';
+
+ $acl_graphs = false;
+
+ // Avoid the check on the metaconsole. Too slow to show/hide an icon depending on the permissions
+ if (!is_metaconsole()) {
+ $acl_graphs = check_acl($config['id_user'], $row['id_group'], 'RR');
} else {
- switch ($row['module_type']) {
- case 15:
- $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $row['id_agente_modulo']);
- if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
- $salida = human_milliseconds_to_string($row['datos']);
- } else {
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- }
- break;
+ $acl_graphs = true;
+ }
- default:
- $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
- break;
+ if ($row['history_data'] == 1 && $acl_graphs) {
+ $graph_type = return_graphtype($row['module_type']);
+
+ $url = ui_get_full_url('operation/agentes/stat_win.php', false, false, false);
+ $handle = dechex(crc32($row['id_agente_modulo'].$row['module_name']));
+ $win_handle = 'day_'.$handle;
+
+ $graph_params = [
+ 'type' => $graph_type,
+ 'period' => SECONDS_1DAY,
+ 'id' => $row['id_agente_modulo'],
+ 'label' => base64_encode($row['module_name']),
+ 'refresh' => SECONDS_10MINUTES,
+ ];
+
+ if (is_metaconsole() && isset($row['server_id'])) {
+ // Set the server id
+ $graph_params['server'] = $row['server_id'];
}
- }
- // Show units ONLY in numeric data types
- if (isset($row['unit'])) {
- $data_macro = modules_get_unit_macro($row['datos'], $row['unit']);
- if ($data_macro) {
- $salida = $data_macro;
- } else {
- $salida .= ' '.'
'.io_safe_output($row['unit']).' ';
- if (strlen($salida) > $config['agent_size_text_small']) {
- $salida = ui_print_truncate_text($salida, 'agent_small', true, true, false, '[…]', 'font-size:7.5pt;');
- // clean tag
- $text_aux = explode(''.html_print_image('images/chart_curve.png', true, ['border' => '0', 'alt' => '']).'';
}
- }
- } else {
- // Fixed the goliat sends the strings from web
- // without HTML entities
- if ($is_web_content_string) {
- $module_value = $row['datos'];
- } else {
- $module_value = io_safe_output($row['datos']);
- }
- $is_snapshot = is_snapshot_data($module_value);
- $is_large_image = is_text_to_black_string($module_value);
-
- if (($config['command_snapshot']) && ($is_snapshot || $is_large_image)) {
- $link = ui_get_snapshot_link(
+ $data[7] .= ''.html_print_image(
+ 'images/binary.png',
+ true,
[
- 'id_module' => $row['id_agente_modulo'],
- 'interval' => $row['current_interval'],
- 'module_name' => $row['module_name'],
- 'id_node' => $row['server_id'],
+ 'border' => '0',
+ 'alt' => '',
]
- );
- $salida = ui_get_snapshot_image($link, $is_snapshot).' ';
- } else {
- $sub_string = substr(io_safe_output($row['datos']), 0, 12);
- if ($module_value == $sub_string) {
- if ($module_value == 0 && !$sub_string) {
- $salida = 0;
- } else {
- $data_macro = modules_get_unit_macro($row['datos'], $row['unit']);
- if ($data_macro) {
- $salida = $data_macro;
- } else {
- $salida = $row['datos'];
- }
+ ).' ';
+
+ $data[7] .= ''.$row['module_name'].' ';
+ }
+ }
+
+ if (in_array('warn', $show_fields) || is_metaconsole()) {
+ $data[8] = ui_print_module_warn_value(
+ $row['max_warning'],
+ $row['min_warning'],
+ $row['str_warning'],
+ $row['max_critical'],
+ $row['min_critical'],
+ $row['str_critical']
+ );
+
+ if (is_numeric($row['datos']) && !modules_is_string_type($row['module_type'])) {
+ if ($config['render_proc']) {
+ switch ($row['module_type']) {
+ case 2:
+ case 6:
+ case 9:
+ case 18:
+ case 21:
+ case 31:
+ if ($row['datos'] >= 1) {
+ $salida = $config['render_proc_ok'];
+ } else {
+ $salida = $config['render_proc_fail'];
+ }
+ break;
+
+ default:
+ switch ($row['module_type']) {
+ case 15:
+ $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $row['id_agente_modulo']);
+ if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
+ $salida = human_milliseconds_to_string($row['datos']);
+ } else {
+ $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
+ }
+ break;
+
+ default:
+ $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
+ break;
+ }
+ break;
}
} else {
- // Fixed the goliat sends the strings from web
- // without HTML entities
- if ($is_web_content_string) {
- $sub_string = substr($row['datos'], 0, 12);
+ switch ($row['module_type']) {
+ case 15:
+ $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $row['id_agente_modulo']);
+ if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
+ $salida = human_milliseconds_to_string($row['datos']);
+ } else {
+ $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
+ }
+ break;
+
+ default:
+ $salida = remove_right_zeros(number_format($row['datos'], $config['graph_precision']));
+ break;
+ }
+ }
+
+ // Show units ONLY in numeric data types
+ if (isset($row['unit'])) {
+ $data_macro = modules_get_unit_macro($row['datos'], $row['unit']);
+ if ($data_macro) {
+ $salida = $data_macro;
} else {
- // Fixed the data from Selenium Plugin
- if ($module_value != strip_tags($module_value)) {
- $module_value = io_safe_input($module_value);
+ $salida .= ' '.''.io_safe_output($row['unit']).' ';
+ if (strlen($salida) > $config['agent_size_text_small']) {
+ $salida = ui_print_truncate_text($salida, 'agent_small', true, true, false, '[…]', 'font-size:7.5pt;');
+ // clean tag
+ $text_aux = explode(' $row['id_agente_modulo'],
+ 'interval' => $row['current_interval'],
+ 'module_name' => $row['module_name'],
+ 'id_node' => $row['server_id'],
+ ]
+ );
+ $salida = ui_get_snapshot_image($link, $is_snapshot).' ';
+ } else {
+ $sub_string = substr(io_safe_output($row['datos']), 0, 12);
+ if ($module_value == $sub_string) {
+ if ($module_value == 0 && !$sub_string) {
+ $salida = 0;
+ } else {
+ $data_macro = modules_get_unit_macro($row['datos'], $row['unit']);
+ if ($data_macro) {
+ $salida = $data_macro;
+ } else {
+ $salida = $row['datos'];
+ }
+ }
+ } else {
+ // Fixed the goliat sends the strings from web
+ // without HTML entities
+ if ($is_web_content_string) {
$sub_string = substr($row['datos'], 0, 12);
} else {
- $sub_string = substr(io_safe_output($row['datos']), 0, 12);
+ // Fixed the data from Selenium Plugin
+ if ($module_value != strip_tags($module_value)) {
+ $module_value = io_safe_input($module_value);
+ $sub_string = substr($row['datos'], 0, 12);
+ } else {
+ $sub_string = substr(io_safe_output($row['datos']), 0, 12);
+ }
}
- }
- if ($module_value == $sub_string) {
- $salida = $module_value;
- } else {
- $salida = '".$module_value.' '.'".''.$sub_string.' '."".html_print_image('images/rosette.png', true).' ';
+ if ($module_value == $sub_string) {
+ $salida = $module_value;
+ } else {
+ $salida = '".$module_value.' '.'".''.$sub_string.' '."".html_print_image('images/rosette.png', true).' ';
+ }
}
}
}
}
+ if (in_array('data', $show_fields) || is_metaconsole()) {
$data[9] = $salida;
-
- if ($row['module_interval'] > 0) {
- $interval = $row['module_interval'];
- } else {
- $interval = $row['agent_interval'];
}
- if ($row['estado'] == 3) {
- $option = [
- 'html_attr' => 'class="redb"',
- 'style' => 'font-size:7pt;',
- ];
- } else {
- $option = ['style' => 'font-size:7pt;'];
+ if (in_array('timestamp', $show_fields) || is_metaconsole()) {
+ if ($row['module_interval'] > 0) {
+ $interval = $row['module_interval'];
+ } else {
+ $interval = $row['agent_interval'];
+ }
+
+ if ($row['estado'] == 3) {
+ $option = [
+ 'html_attr' => 'class="redb"',
+ 'style' => 'font-size:7pt;',
+ ];
+ } else {
+ $option = ['style' => 'font-size:7pt;'];
+ }
+
+ $data[10] = ui_print_timestamp($row['utimestamp'], true, $option);
}
- $data[10] = ui_print_timestamp($row['utimestamp'], true, $option);
+ if (in_array('to_critical', $show_fields)) {
+ $change_status_timestamp = db_get_sql('SELECT utimestamp FROM tevento WHERE id_agentmodule='.$row['id_agente_modulo'].' ORDER BY utimestamp DESC');
+ $data[11] = ui_print_timestamp($change_status_timestamp, true, $option);
+ }
array_push($table->data, $data);
}
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index e3171f61f4..5578b9182f 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1,17 +1,32 @@
$v) {
@@ -139,7 +164,7 @@ if (is_ajax()) {
$id_agents = get_parameter('id_agents');
$selection = get_parameter('selection');
- // No filter by module group
+ // No filter by module group.
$modules = select_modules_for_agent_group(0, $id_agents, $selection, false, true);
echo json_encode($modules);
return;
@@ -177,11 +202,14 @@ if (is_ajax()) {
$nameModules = get_parameter('module_name');
$selection_mode = get_parameter('selection_mode', 'common') == 'all';
$status_modulo = (int) get_parameter('status_module', -1);
-
+ $tags_selected = (array) get_parameter('tags', []);
$names = select_agents_for_module_group(
$nameModules,
$selection_mode,
- ['status' => $status_modulo],
+ [
+ 'status' => $status_modulo,
+ 'tags' => $tags_selected,
+ ],
'AW'
);
@@ -311,28 +339,28 @@ if (is_ajax()) {
}
if (!empty($module_name)) {
- $filter .= " AND t1.nombre COLLATE utf8_general_ci LIKE '%$module_name%'";
+ $filter .= " AND t1.nombre COLLATE utf8_general_ci LIKE '%".$module_name."%'";
}
- // Status selector
+ // Status selector.
if ($status_modulo == AGENT_MODULE_STATUS_NORMAL) {
- // Normal
+ // Normal.
$sql_conditions .= ' estado = 0 AND utimestamp > 0 )
OR (t1.id_tipo_modulo IN(21,22,23,100)) ';
} else if ($status_modulo == AGENT_MODULE_STATUS_CRITICAL_BAD) {
- // Critical
+ // Critical.
$sql_conditions .= ' estado = 1 AND utimestamp > 0 )';
} else if ($status_modulo == AGENT_MODULE_STATUS_WARNING) {
- // Warning
+ // Warning.
$sql_conditions .= ' estado = 2 AND utimestamp > 0 )';
} else if ($status_modulo == AGENT_MODULE_STATUS_NOT_NORMAL) {
- // Not normal
+ // Not normal.
$sql_conditions .= ' estado <> 0)';
} else if ($status_modulo == AGENT_MODULE_STATUS_UNKNOWN) {
- // Unknown
+ // Unknown.
$sql_conditions .= ' estado = 3 AND utimestamp <> 0 )';
} else if ($status_modulo == AGENT_MODULE_STATUS_NOT_INIT) {
- // Not init
+ // Not init.
$sql_conditions .= ' utimestamp = 0 )
AND t1.id_tipo_modulo NOT IN (21,22,23,100)';
}
@@ -412,7 +440,7 @@ if (is_ajax()) {
foreach ($array_reduced as $server_name => $id_agents) {
// Metaconsole db connection
- // $server_name can be the server id (ugly hack, I know)
+ // $server_name can be the server id (ugly hack, I know).
if (is_numeric($server_name)) {
$connection = metaconsole_get_connection_by_id($server_name);
} else {
@@ -423,7 +451,7 @@ if (is_ajax()) {
continue;
}
- // Get agent's modules
+ // Get agent's modules.
$sql = sprintf(
'SELECT t1.id_agente, t1.id_agente_modulo, t1.nombre
FROM tagente_modulo t1 %s
@@ -451,7 +479,7 @@ if (is_ajax()) {
$modules_aux = [];
foreach ($modules as $key => $module) {
- // Don't change this order, is used in the serialization
+ // Don't change this order, is used in the serialization.
$module_data = [
'id_module' => $module['id_agente_modulo'],
'id_agent' => $module['id_agente'],
@@ -466,7 +494,7 @@ if (is_ajax()) {
$modules = $modules_aux;
- // Build the next array using the common values
+ // Build the next array using the common values.
if (!empty($last_modules_set)) {
$modules = array_intersect_key($modules, $last_modules_set);
@@ -480,7 +508,7 @@ if (is_ajax()) {
$last_modules_set = $modules;
- // Restore db connection
+ // Restore db connection.
metaconsole_restore_db();
}
@@ -490,7 +518,6 @@ if (is_ajax()) {
$module_data_processed = array_map(
function ($item) {
- // data: -> id_module | id_agent | server_name;
return implode('|', $item);
},
$module_data
@@ -600,16 +627,16 @@ if (is_ajax()) {
if ($get_agent_modules_json) {
$id_agent = (int) get_parameter('id_agent');
- // Use -1 as not received
+ // Use -1 as not received.
$disabled = (int) get_parameter('disabled', -1);
$delete_pending = (int) get_parameter('delete_pending', -1);
- // Use 0 as not received
+ // Use 0 as not received.
$id_tipo_modulo = (int) get_parameter('id_tipo_modulo', 0);
$status_modulo = (int) get_parameter('status_module', -1);
$tags = (array) get_parameter('tags', []);
- // Filter
+ // Filter.
$filter = [];
if ($disabled !== -1) {
$filter['disabled'] = $disabled;
@@ -627,30 +654,34 @@ if (is_ajax()) {
$filter = false;
}
- $get_only_string_modules = get_parameter('get_only_string_modules', false);
+ $get_only_string_modules = get_parameter(
+ 'get_only_string_modules',
+ false
+ );
+
if ($get_only_string_modules) {
$filter['tagente_modulo.id_tipo_modulo IN'] = '(17,23,3,10,33)';
}
- // Status selector
+ // Status selector.
if ($status_modulo == AGENT_MODULE_STATUS_NORMAL) {
- // Normal
- $sql_conditions .= ' estado = 0 AND utimestamp > 0 )
+ // Normal.
+ $sql_conditions .= ' estado = 0 AND utimestamp > 0 )
OR (tagente_modulo.id_tipo_modulo IN(21,22,23,100)) ';
} else if ($status_modulo == AGENT_MODULE_STATUS_CRITICAL_BAD) {
- // Critical
+ // Critical.
$sql_conditions .= ' estado = 1 AND utimestamp > 0 )';
} else if ($status_modulo == AGENT_MODULE_STATUS_WARNING) {
- // Warning
+ // Warning.
$sql_conditions .= ' estado = 2 AND utimestamp > 0 )';
} else if ($status_modulo == AGENT_MODULE_STATUS_NOT_NORMAL) {
- // Not normal
+ // Not normal.
$sql_conditions .= ' estado <> 0 )';
} else if ($status_modulo == AGENT_MODULE_STATUS_UNKNOWN) {
- // Unknown
+ // Unknown.
$sql_conditions .= ' estado = 3 AND utimestamp <> 0 )';
} else if ($status_modulo == AGENT_MODULE_STATUS_NOT_INIT) {
- // Not init
+ // Not init.
$sql_conditions .= ' utimestamp = 0 )
AND tagente_modulo.id_tipo_modulo NOT IN (21,22,23,100)';
}
@@ -663,7 +694,7 @@ if (is_ajax()) {
$get_id_and_name = (bool) get_parameter('get_id_and_name');
$get_distinct_name = (bool) get_parameter('get_distinct_name');
- // Fields
+ // Fields.
$fields = '*';
if ($get_id_and_name) {
$fields = [
@@ -680,7 +711,8 @@ if (is_ajax()) {
$agentName = (string) get_parameter('agent_name', null);
$server_name = (string) get_parameter('server_name', null);
$server_id = (int) get_parameter('server_id', 0);
- // This will force to get local modules although metaconsole is active, by default get all modules from all nodes
+ // This will force to get local modules although metaconsole is active,
+ // by default get all modules from all nodes.
$force_local_modules = (int) get_parameter('force_local_modules', 0);
if ($agentName != null) {
@@ -703,7 +735,7 @@ if (is_ajax()) {
}
if (metaconsole_load_external_db($connection) == NOERR) {
- // Get all agents if no agent was given
+ // Get all agents if no agent was given.
if ($id_agent == 0) {
$id_agent = array_keys(
agents_get_group_agents(
@@ -717,11 +749,11 @@ if (is_ajax()) {
$agent_modules = agents_get_modules($id_agent, $fields, $filter, $indexed, true, $force_tags);
}
- // Restore db connection
+ // Restore db connection.
metaconsole_restore_db();
}
} else {
- // Get all agents if no agent was given
+ // Get all agents if no agent was given.
if ($id_agent == 0) {
$id_agent = array_keys(
agents_get_group_agents(
@@ -765,7 +797,7 @@ if (is_ajax()) {
$id_agent = (int) get_parameter('id_agent');
$metaconsole = (bool) get_parameter('metaconsole', false);
$id_server = (int) get_parameter('id_server', 0);
- // Metaconsole
+ // Metaconsole.
$server = null;
if ($metaconsole) {
$filter = [];
@@ -802,7 +834,7 @@ if (is_ajax()) {
echo ''.__('Last remote contact').': '.human_time_comparation($agent['ultimo_contacto_remoto']).''.__('Monitors down').': '.$size_bad_modules.' / '.$total_modules;
echo '';
@@ -855,7 +887,7 @@ if (is_ajax()) {
echo ' ';
}
- // Alerts (if present)
+ // Alerts (if present).
$sql = sprintf(
'SELECT COUNT(talert_template_modules.id)
FROM talert_template_modules, tagente_modulo, tagente
@@ -937,8 +969,8 @@ if (is_ajax()) {
if ($module['id_tipo_modulo'] == 18) {
echo ''.__('Address').': ';
- // Get the IP/IPs from the module description
- // Always the IP is the last part of the description (after the last space)
+ // Get the IP/IPs from the module description Always the IP
+ // is the last part of the description (after the last space).
$ips = explode(' ', $module['descripcion']);
$ips = $ips[(count($ips) - 1)];
@@ -948,7 +980,7 @@ if (is_ajax()) {
} else {
echo '';
foreach ($ips as $ip) {
- echo "$ip ";
+ echo ''.$ip.' ';
}
echo ' ';
@@ -1033,7 +1065,7 @@ $agent_a = check_acl($config['id_user'], 0, 'AR');
$agent_w = check_acl($config['id_user'], 0, 'AW');
$access = ($agent_a == true) ? 'AR' : (($agent_w == true) ? 'AW' : 'AR');
$agent = db_get_row('tagente', 'id_agente', $id_agente);
-// get group for this id_agente
+// Get group for this id_agente.
$id_grupo = $agent['id_grupo'];
$is_extra = enterprise_hook('policies_is_agent_extra_policy', [$id_agente]);
@@ -1053,7 +1085,7 @@ if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR') && ! check_
return;
}
-// Check for Network FLAG change request
+// Check for Network FLAG change request.
$flag = get_parameter('flag', '');
if ($flag !== '') {
if ($flag == 1 && check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
@@ -1067,7 +1099,7 @@ if ($flag !== '') {
}
}
-// Check for Network FLAG change request
+// Check for Network FLAG change request.
$flag_agent = get_parameter('flag_agent', '');
if ($flag_agent !== '') {
if ($flag_agent == 1 && check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
@@ -1082,10 +1114,10 @@ if ($agent['icon_path']) {
}
-// -------------Code for the tabs in the header of agent page-----------
+// Code for the tabs in the header of agent page.
$tab = get_parameter('tab', 'main');
-// Manage tab
+// Manage tab.
$managetab = [];
if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') || $is_extra) {
@@ -1101,7 +1133,7 @@ if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') || $is_extra)
}
-// Main tab
+// Main tab.
$maintab['text'] = ''.html_print_image('images/agent_mc.png', true, ['title' => __('Main')]).' ';
if ($tab == 'main') {
@@ -1112,7 +1144,7 @@ if ($tab == 'main') {
-// Alert tab
+// Alert tab.
$alerttab['text'] = ''.html_print_image('images/op_alerts.png', true, ['title' => __('Alerts')]).' ';
if ($tab == 'alert') {
@@ -1121,27 +1153,27 @@ if ($tab == 'alert') {
$alerttab['active'] = false;
}
-// Inventory
+// Inventory.
$inventorytab = enterprise_hook('inventory_tab');
if ($inventorytab == -1) {
$inventorytab = '';
}
-// Collection
+// Collection.
$collectiontab = enterprise_hook('collection_tab');
if ($collectiontab == -1) {
$collectiontab = '';
}
-// Policy
+// Policy.
$policyTab = enterprise_hook('policy_tab');
if ($policyTab == -1) {
$policyTab = '';
}
-// WUX Console
+// WUX Console.
$modules_wux = enterprise_hook('get_wux_modules', [$id_agente]);
if ($modules_wux) {
$wux_console_tab = enterprise_hook('wux_console_tab');
@@ -1158,7 +1190,7 @@ if ($url_route_analyzer) {
}
}
-// GIS tab
+// GIS tab.
$gistab = [];
if ($config['activate_gis']) {
$gistab['text'] = ''.html_print_image('images/op_gis.png', true, [ 'title' => __('GIS data')]).' ';
@@ -1171,7 +1203,7 @@ if ($config['activate_gis']) {
}
-// Incident tab
+// Incident tab.
$total_incidents = agents_get_count_incidents($id_agente);
if ($total_incidents > 0) {
$incidenttab['text'] = ''.html_print_image('images/book_edit.png', true, ['title' => __('Incidents')]).' ';
@@ -1184,7 +1216,7 @@ if ($total_incidents > 0) {
}
-// Url address tab
+// Url address tab.
if ($agent['url_address'] != '') {
$urladdresstab['text'] = ''.html_print_image('images/link.png', true, ['title' => __('Url address')]).' ';
}
@@ -1196,7 +1228,7 @@ if ($tab == 'url_address') {
}
-// Custom fields tab
+// Custom fields tab.
$custom_fields['text'] = ''.html_print_image('images/custom_field.png', true, ['title' => __('Custom fields')]).' ';
if ($tab == 'custom_fields') {
$custom_fields['active'] = true;
@@ -1205,7 +1237,7 @@ if ($tab == 'custom_fields') {
}
-// Graphs tab
+// Graphs tab.
$graphs['text'] = ''.html_print_image('images/chart.png', true, ['title' => __('Graphs')]).' ';
if ($tab == 'graphs') {
$graphs['active'] = true;
@@ -1214,7 +1246,7 @@ if ($tab == 'graphs') {
}
-// Log viewer tab
+// Log viewer tab.
if (enterprise_installed() && $config['log_collector']) {
$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
$agent_has_logs = (bool) db_get_value('id_agent', 'tagent_module_log', 'id_agent', $id_agente);
@@ -1226,7 +1258,7 @@ if (enterprise_installed() && $config['log_collector']) {
}
}
-// eHorus tab
+// EHorus tab.
if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
&& (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') || is_user_admin($config['id_user']))
) {
@@ -1235,7 +1267,7 @@ if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
$tab_url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=ehorus&id_agente='.$id_agente;
$ehorus_tab['text'] = ''.html_print_image('images/ehorus/ehorus.png', true, [ 'title' => __('eHorus')]).' ';
- // Hidden subtab layer
+ // Hidden subtab layer.
$ehorus_tab['sub_menu'] = ' '.html_print_image('images/email_inbox.png', true, ['title' => __('Received messages')]).' ',
+ 'text' => ''.html_print_image(
+ 'images/email_inbox.png',
+ true,
+ ['title' => __('Received messages')]
+ ).' ',
];
$buttons['sent_messages'] = [
'active' => false,
- 'text' => ''.html_print_image('images/email_outbox.png', true, ['title' => __('Sent messages')]).' ',
+ 'text' => ''.html_print_image(
+ 'images/email_outbox.png',
+ true,
+ ['title' => __('Sent messages')]
+ ).' ',
];
$buttons['create_message'] = [
'active' => true,
- 'text' => ''.html_print_image('images/new_message.png', true, ['title' => __('Create message')]).' ',
+ 'text' => ''.html_print_image(
+ 'images/new_message.png',
+ true,
+ ['title' => __('Create message')]
+ ).' ',
];
-// Header
-ui_print_page_header(__('Messages'), 'images/email_mc.png', false, '', false, $buttons);
+// Header.
+ui_print_page_header(
+ __('Messages'),
+ 'images/email_mc.png',
+ false,
+ '',
+ false,
+ $buttons
+);
-// read a message
+// Read a message.
if ($read_message) {
$message_id = (int) get_parameter('id_message');
if ($show_sent) {
@@ -56,10 +90,10 @@ if ($read_message) {
messages_process_read($message_id);
}
- if ($message == false) {
+ if ($message === false) {
echo ''.__('This message does not exist in the system').'
';
return;
- // Move out of this page and go processing other pages
+ // Move out of this page and go processing other pages.
}
$user_name = get_user_fullname($message['id_usuario_origen']);
@@ -72,19 +106,70 @@ if ($read_message) {
$dst_name = $message['id_usuario_destino'];
}
- $table = new stdClass();
- $table->width = '100%';
- $table->class = 'databox filters';
- $table->data = [];
+ if (isset($user_name) !== true || empty($user_name) === true) {
+ echo 'Notification ';
+ } else {
+ echo 'Conversation with '.$user_name.' ';
+ }
- $table->data[0][0] = __('Sender');
- $table->data[0][1] = $user_name.' '.__('at').' '.ui_print_timestamp($message['timestamp'], true, ['prominent' => 'timestamp']);
+ echo 'Subject: '.$message['subject'].' ';
- $table->data[1][0] = __('Destination');
- $table->data[1][1] = $dst_name;
+ $conversation = [];
+ $target_str = $message['mensaje'];
+
+ while (preg_match_all(
+ '/(.*)On(.*)wrote:(.*)/',
+ $target_str,
+ $decoded,
+ PREG_PATTERN_ORDER
+ ) !== false && empty($target_str) !== true) {
+ if (empty($decoded[2]) !== true) {
+ array_push(
+ $conversation,
+ [
+ 'message' => array_pop($decoded)[0],
+ 'date' => array_pop($decoded)[0],
+ ]
+ );
+ } else {
+ array_push(
+ $conversation,
+ ['message' => $target_str]
+ );
+ }
+
+ $target_str = $decoded[1][0];
+ }
+
+ ui_require_css_file('message_edit');
+ foreach ($conversation as $row) {
+ $date = $row['date'];
+
+ if ($date === null) {
+ $date = date(
+ $config['date_format'],
+ $message['timestamp']
+ ).' '.$user_name;
+ }
+
+ $order = [
+ "\r\n",
+ "\n",
+ "\r",
+ ];
+ $replace = '';
+ echo '
'.$parsed_message.'
';
+ echo '
'.$date.' ';
+ echo '
";
- html_print_submit_button(__('Delete'), 'delete_btn', false, 'form="delete_message" class="sub delete"');
+ html_print_submit_button(
+ __('Delete conversation'),
+ 'delete_btn',
+ false,
+ 'form="delete_message" class="sub delete"'
+ );
echo ' ';
- html_print_submit_button(__('Reply'), 'reply', false, 'form="reply_message" class="sub next"');
+ html_print_submit_button(
+ __('Reply'),
+ 'reply',
+ false,
+ 'form="reply_message" class="sub next"'
+ );
echo '
';
return;
}
-// Create message (destination user)
+// Create message (destination user).
if (($new_msg) && (!empty($dst_user)) && (!$reply)) {
- $return = messages_create_message($config['id_user'], $dst_user, $subject, $message);
+ $return = messages_create_message(
+ $config['id_user'],
+ [$dst_user],
+ [],
+ $subject,
+ $message
+ );
$user_name = get_user_fullname($dst_user);
if (!$user_name) {
@@ -143,9 +244,15 @@ if (($new_msg) && (!empty($dst_user)) && (!$reply)) {
);
}
-// Create message (destination group)
+// Create message (destination group).
if (($new_msg) && ($dst_group != '') && (!$reply)) {
- $return = messages_create_group($config['id_user'], $dst_group, $subject, $message);
+ $return = messages_create_message(
+ $config['id_user'],
+ [],
+ [$dst_group],
+ $subject,
+ $message
+ );
ui_print_result_message(
$return,
@@ -154,8 +261,8 @@ if (($new_msg) && ($dst_group != '') && (!$reply)) {
);
}
-// message creation form
-// user info
+// Message creation form.
+// User info.
$own_info = get_user_info($config['id_user']);
$table = new stdClass();
@@ -174,12 +281,28 @@ if (!empty($own_info['fullname'])) {
$table->data[1][0] = __('Destination');
-$is_admin = (bool) db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
+$is_admin = (bool) db_get_value(
+ 'is_admin',
+ 'tusuario',
+ 'id_user',
+ $config['id_user']
+);
if ($is_admin) {
- $users_full = db_get_all_rows_filter('tusuario', [], ['id_user', 'fullname']);
+ $users_full = db_get_all_rows_filter(
+ 'tusuario',
+ [],
+ [
+ 'id_user',
+ 'fullname',
+ ]
+ );
} else {
- $users_full = groups_get_users(array_keys(users_get_groups()), false, false);
+ $users_full = groups_get_users(
+ array_keys(users_get_groups()),
+ false,
+ false
+ );
}
$users = [];
@@ -187,17 +310,16 @@ foreach ($users_full as $user_id => $user_info) {
$users[$user_info['id_user']] = $user_info['fullname'];
}
-// Check if the user to reply is in the list, if not add reply user
+// Check if the user to reply is in the list, if not add reply user.
if ($reply) {
if (!array_key_exists($dst_user, $users)) {
- // Add the user to reply
+ // Add the user to reply.
$user_reply = db_get_row('tusuario', 'id_user', $dst_user);
$users[$user_reply['id_user']] = $user_reply['fullname'];
}
}
-
if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
$return_all_groups = true;
} else {
@@ -205,21 +327,61 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
}
$groups = users_get_groups($config['id_user'], 'AR');
-// Get a list of all groups
-$table->data[1][1] = html_print_select($users, 'dst_user', $dst_user, '', __('Select user'), false, true, false, '', false);
+// Get a list of all groups.
+$table->data[1][1] = html_print_select(
+ $users,
+ 'dst_user',
+ $dst_user,
+ '',
+ __('Select user'),
+ false,
+ true,
+ false,
+ '',
+ false
+);
$table->data[1][1] .= ' '.__('OR').' ';
-$table->data[1][1] .= html_print_select_groups($config['id_user'], 'AR', $return_all_groups, 'dst_group', $dst_group, '', __('Select group'), '', true);
+$table->data[1][1] .= html_print_select_groups(
+ $config['id_user'],
+ 'AR',
+ $return_all_groups,
+ 'dst_group',
+ $dst_group,
+ '',
+ __('Select group'),
+ '',
+ true
+);
$table->data[2][0] = __('Subject');
-$table->data[2][1] = html_print_input_text('subject', $subject, '', 50, 70, true);
+$table->data[2][1] = html_print_input_text(
+ 'subject',
+ $subject,
+ '',
+ 50,
+ 70,
+ true
+);
$table->data[3][0] = __('Message');
-$table->data[3][1] = html_print_textarea('message', 15, 255, $message, '', true);
+$table->data[3][1] = html_print_textarea(
+ 'message',
+ 15,
+ 255,
+ $message,
+ '',
+ true
+);
echo '';
+ echo '';
diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php
index a9108d9fc0..9427159432 100644
--- a/pandora_console/operation/messages/message_list.php
+++ b/pandora_console/operation/messages/message_list.php
@@ -1,16 +1,32 @@
false,
- 'text' => ''.html_print_image('images/new_message.png', true, ['title' => __('Create message')]).' ',
+ 'text' => ''.html_print_image(
+ 'images/new_message.png',
+ true,
+ ['title' => __('Create message')]
+ ).' ',
];
if (!is_ajax()) {
- ui_print_page_header(__('Messages'), 'images/email_mc.png', false, '', false, $buttons);
+ ui_print_page_header(
+ __('Messages'),
+ 'images/email_mc.png',
+ false,
+ '',
+ false,
+ $buttons
+ );
}
if ($mark_unread) {
@@ -52,7 +79,7 @@ if ($mark_unread) {
if ($delete_msg) {
$id = (int) get_parameter('id');
$result = messages_delete_message($id);
- // Delete message function will actually check the credentials
+ // Delete message function will actually check the credentials.
ui_print_result_message(
$result,
__('Successfully deleted'),
@@ -61,13 +88,10 @@ if ($delete_msg) {
}
if ($multiple_delete) {
- $ids = (array) get_parameter('delete_multiple', []);
+ $ids = (array) get_parameter('delete_multiple_messages', []);
foreach ($ids as $id) {
- $result = db_process_sql_delete(
- 'tmensajes',
- ['id_mensaje' => $id]
- );
+ $result = messages_delete_message($id);
if ($result === false) {
break;
@@ -82,21 +106,23 @@ if ($multiple_delete) {
}
if ($show_sent) {
- // sent view
+ // Sent view.
$num_messages = messages_get_count_sent($config['id_user']);
if ($num_messages > 0 && !is_ajax()) {
- echo ''.__('You have').' '.$num_messages.' '.' '.__('sent message(s)').'.
';
+ echo ''.__('You have').' '.$num_messages.' '.__('sent message(s)').'.
';
}
$messages = messages_get_overview_sent('', 'DESC');
} else {
- // messages received
- $num_messages = messages_get_count($config['id_user']);
+ // Messages received.
+ $num_messages = messages_get_count($config['id_user'], true, true);
if ($num_messages > 0 && !is_ajax()) {
- echo ''.__('You have').' '.$num_messages.' '.' '.__('unread message(s)').'.
';
+ $unread_messages = messages_get_count($config['id_user'], false, true);
+ echo ''.__('You have').' '.$unread_messages.' '.__('unread message(s)').'.
';
+ $messages = messages_get_overview();
+ } else {
+ $messages = messages_get_overview('status', 'ASC');
}
-
- $messages = messages_get_overview();
}
if (empty($messages)) {
@@ -139,10 +165,12 @@ if (empty($messages)) {
$table->head[3] = __('Timestamp');
$table->head[4] = __('Delete').html_print_checkbox('all_delete_messages', 0, false, true, false);
- foreach ($messages as $message_id => $message) {
+
+ foreach ($messages as $message) {
+ $message_id = $message['id_mensaje'];
$data = [];
$data[0] = '';
- if ($message['status'] == 1) {
+ if ($message['read'] == 1) {
if ($show_sent) {
$data[0] .= '';
$data[0] .= html_print_image('images/email_open.png', true, ['border' => 0, 'title' => __('Click to read')]);
@@ -202,10 +230,10 @@ if (empty($messages)) {
if ($show_sent) {
$data[4] = ' '.html_print_image('images/cross.png', true, ['title' => __('Delete')]).' '.html_print_checkbox_extended('delete_multiple_messages[]', $message_id, false, false, '', 'class="check_delete_messages"', true);
+ onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).''.html_print_checkbox_extended('delete_multiple_messages[]', $message_id, false, false, '', 'class="check_delete_messages"', true);
} else {
$data[4] = ''.html_print_image('images/cross.png', true, ['title' => __('Delete')]).' '.html_print_checkbox_extended('delete_multiple_messages[]', $message_id, false, false, '', 'class="check_delete_messages"', true);
+ onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).''.html_print_checkbox_extended('delete_multiple_messages[]', $message_id, false, false, '', 'class="check_delete_messages"', true);
}
array_push($table->data, $data);
diff --git a/pandora_console/operation/servers/recon_view.php b/pandora_console/operation/servers/recon_view.php
index d91b838e8b..84a057d69c 100644
--- a/pandora_console/operation/servers/recon_view.php
+++ b/pandora_console/operation/servers/recon_view.php
@@ -30,7 +30,7 @@ $servers = db_get_all_rows_sql('SELECT * FROM tserver WHERE server_type = 3');
if ($servers === false) {
$servers = [];
ui_print_page_header(__('Recon View'), 'images/op_recon.png', false, '', false);
- ui_print_error_message(__('Recon Server is disabled'));
+ ui_print_error_message(__('Discovery Server is disabled'));
return;
} else {
$recon_task = db_get_all_rows_sql('SELECT * FROM trecon_task');
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index fde9586325..b2344c13ad 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -294,6 +294,8 @@ enterprise_hook('close_meta_frame');
$(".loading_tree").show();
+
+
var parameters = {};
parameters['page'] = "include/ajax/tree.ajax";
parameters['getChildren'] = 1;
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 1552f2f57c..3e3338ff96 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -1,64 +1,36 @@
'.__('User ID').' ';
$data[0] .= $jump.''.$id.' ';
$data[1] = ''.__('Full (display) name').' '.html_print_input_text_extended('fullname', $user_info['fullname'], 'fullname', '', 20, 100, $view_mode, '', 'class="input"', true).' ';
+$data[1] .= $jump.'';
+$data[1] .= html_print_input_text_extended(
+ 'fullname',
+ $user_info['fullname'],
+ 'fullname',
+ '',
+ 20,
+ 100,
+ $view_mode,
+ '',
+ 'class="input"',
+ true
+).' ';
+
// Show "Picture" (in future versions, why not, allow users to upload it's own avatar here.
if (is_user_admin($id)) {
$data[2] = html_print_image('images/people_1.png', true);
@@ -368,7 +360,7 @@ if (!$meta) {
- // User only can change skins if has more than one group
+ // User only can change skins if has more than one group.
$data[1] = '';
if (function_exists('skins_print_select')) {
if (count($usr_groups) > 1) {
@@ -388,18 +380,21 @@ $table->rowclass[] = '';
$table->rowstyle[] = 'font-weight: bold;';
$table->data[] = $data;
-// Double auth
+// Double auth.
$double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
$data = [];
-$data[0] = ''.__('Double authentication').' ';
-$data[0] .= $jump;
-$data[0] .= ''.html_print_checkbox('double_auth', 1, $double_auth_enabled, true).' ';
+if ($config['double_auth_enabled']) {
+ $data[0] = ''.__('Double authentication').' ';
+ $data[0] .= $jump;
+ $data[0] .= ''.html_print_checkbox('double_auth', 1, $double_auth_enabled, true).' ';
+}
+
if ($double_auth_enabled) {
$data[0] .= $jump;
$data[0] .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
}
-// Dialog
+// Dialog.
$data[0] .= '';
if (check_acl($config['id_user'], 0, 'ER')) {
@@ -407,14 +402,13 @@ if (check_acl($config['id_user'], 0, 'ER')) {
$data[1] .= $jump.''.html_print_select_from_sql(
'SELECT id_filter, id_name FROM tevent_filter',
'event_filter',
- $user_info['id_filter'],
+ $user_info['default_event_filter'],
'',
__('None'),
null,
true
).' ';
-}//end if
-else if (license_free()) {
+} else if (license_free()) {
$data[1] = __('Newsletter Subscribed').':';
if ($user_info['middlename']) {
$data[1] .= $jump.''.__('Already subscribed to %s newsletter', get_product_name()).' ';
@@ -465,7 +459,8 @@ if (!isset($autorefresh_list)) {
$autorefresh_list[0] = __('None');
} else {
$aux = [];
- for ($i = 0; $i < count($autorefresh_list); $i++) {
+ $count_autorefresh_list = count($autorefresh_list);
+ for ($i = 0; $i < $count_autorefresh_list; $i++) {
$aux[$autorefresh_list[$i]] = $autorefresh_list_out[$autorefresh_list[$i]];
unset($autorefresh_list_out[$autorefresh_list[$i]]);
$autorefresh_list[$i] = $aux;
@@ -478,7 +473,8 @@ if (!isset($autorefresh_list)) {
$autorefresh_list[0] = __('None');
} else {
$aux = [];
- for ($i = 0; $i < count($autorefresh_list); $i++) {
+ $count_autorefresh_list = count($autorefresh_list);
+ for ($i = 0; $i < $count_autorefresh_list; $i++) {
$aux[$autorefresh_list[$i]] = $autorefresh_list_out[$autorefresh_list[$i]];
unset($autorefresh_list_out[$autorefresh_list[$i]]);
$autorefresh_list[$i] = $aux;
@@ -488,10 +484,39 @@ if (!isset($autorefresh_list)) {
}
}
-$data[0] = _('Autorefresh').ui_print_help_tip(__('This will activate autorefresh in selected pages'), true);
-$select_out = html_print_select($autorefresh_list_out, 'autorefresh_list_out[]', '', '', '', '', true, true, true, '', false, 'width:200px');
+$data[0] = _('Autorefresh').ui_print_help_tip(
+ __('This will activate autorefresh in selected pages'),
+ true
+);
+$select_out = html_print_select(
+ $autorefresh_list_out,
+ 'autorefresh_list_out[]',
+ '',
+ '',
+ '',
+ '',
+ true,
+ true,
+ true,
+ '',
+ false,
+ 'width:200px'
+);
$arrows = ' ';
-$select_in = html_print_select($autorefresh_list, 'autorefresh_list[]', '', '', '', '', true, true, true, '', false, 'width:200px');
+$select_in = html_print_select(
+ $autorefresh_list,
+ 'autorefresh_list[]',
+ '',
+ '',
+ '',
+ '',
+ true,
+ true,
+ true,
+ '',
+ false,
+ 'width:200px'
+);
$table_ichanges = '
@@ -502,19 +527,50 @@ $table_ichanges = '
'.$select_out.'
- '.html_print_image('images/darrowright.png', true, ['id' => 'right_autorefreshlist', 'alt' => __('Push selected pages into autorefresh list'), 'title' => __('Push selected pages into autorefresh list')]).'
+ '.html_print_image(
+ 'images/darrowright.png',
+ true,
+ [
+ 'id' => 'right_autorefreshlist',
+ 'alt' => __('Push selected pages into autorefresh list'),
+ 'title' => __('Push selected pages into autorefresh list'),
+ ]
+).'
'.html_print_image('images/darrowleft.png', true, ['id' => 'left_autorefreshlist', 'alt' => __('Pop selected pages out of autorefresh list'), 'title' => __('Pop selected pages out of autorefresh list')]).'
+ '.html_print_image(
+ 'images/darrowleft.png',
+ true,
+ [
+ 'id' => 'left_autorefreshlist',
+ 'alt' => __('Pop selected pages out of autorefresh list'),
+ 'title' => __('Pop selected pages out of autorefresh list'),
+ ]
+).'
'.$select_in.'
';
$data[0] .= $table_ichanges;
-// time autorefresh
+// Time autorefresh.
$times = get_refresh_time_array();
-$data[1] = ''.__('Time autorefresh').ui_print_help_tip(__('Interval of autorefresh of the elements, by default they are 30 seconds, needing to enable the autorefresh first'), true).' ';
-$data[1] .= $jump.''.html_print_select($times, 'time_autorefresh', $user_info['time_autorefresh'], '', '', '', true, false, false).' ';
+$data[1] = ''.__('Time autorefresh');
+$data[1] .= ui_print_help_tip(
+ __('Interval of autorefresh of the elements, by default they are 30 seconds, needing to enable the autorefresh first'),
+ true
+).' ';
+$data[1] .= $jump.'';
+$data[1] .= html_print_select(
+ $times,
+ 'time_autorefresh',
+ $user_info['time_autorefresh'],
+ '',
+ '',
+ '',
+ true,
+ false,
+ false
+).' ';
$table->rowclass[] = '';
$table->rowstyle[] = 'font-weight: bold;vertical-align: top';
@@ -528,14 +584,23 @@ $table->rowstyle[] = 'font-weight: bold;';
$table->data[] = $data;
$data = [];
-$data[0] = ''.html_print_textarea('comments', 2, 60, $user_info['comments'], ($view_mode ? 'readonly="readonly"' : ''), true).'
';
+$data[0] = '';
+$data[0] .= html_print_textarea(
+ 'comments',
+ 2,
+ 60,
+ $user_info['comments'],
+ (($view_mode) ? 'readonly="readonly"' : ''),
+ true
+);
+$data[0] .= '
';
$data[0] .= html_print_input_hidden('quick_language_change', 1, true);
$table->colspan[count($table->data)][0] = 3;
$table->rowclass[] = '';
$table->rowstyle[] = '';
$table->data[] = $data;
-echo '