\n";
echo " \n";
+ echo include_javascript_dependencies_flot_graph(false, false);
echo "
";
if (!empty($this->dialogs)) {
if (!empty($this->dialogs['onStart'])) {
diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php
index 6337b75e93..80896ac988 100644
--- a/pandora_console/mobile/operation/agent.php
+++ b/pandora_console/mobile/operation/agent.php
@@ -108,30 +108,6 @@ class Agent
}
- public function ajax($parameter2=false)
- {
- $system = System::getInstance();
-
- if (!$this->correct_acl) {
- return;
- } else {
- switch ($parameter2) {
- case 'render_events_bar':
- $agent_id = $system->getRequest('agent_id', '0');
- $width = $system->getRequest('width', '400');
- graph_graphic_agentevents(
- $agent_id,
- $width,
- 30,
- SECONDS_1DAY,
- ui_get_full_url(false)
- );
- exit;
- }
- }
- }
-
-
private function show_agent()
{
$ui = Ui::getInstance();
@@ -194,24 +170,14 @@ class Agent
}
$address = $this->agent['direccion'];
- // ~ foreach ($addresses as $k => $add) {
- // ~ if ($add == $address) {
- // ~ unset($addresses[$k]);
- // ~ }
- // ~ }
- // ~ $ip = html_print_image('images/world.png',
- // ~ true, array('title' => __('IP address'))) .
- // ~ ' ';
- $ip .= empty($address) ? '
'.__('N/A').'' : $address;
+ $ip .= (empty($address) === true) ? '
'.__('N/A').'' : $address;
+ $last_contact = '
'.__('Last contact').': ';
+ $last_contact .= ui_print_timestamp(
+ $this->agent['ultimo_contacto'],
+ true
+ );
- // ~ if (!empty($addresses)) {
- // ~ $ip .= ui_print_help_tip(__('Other IP addresses') .
- // ~ ': ' . implode(', ',$addresses), true);
- // ~ }
- $last_contact = '
'.__('Last contact').': '.ui_print_timestamp($this->agent['ultimo_contacto'], true);
-
- // ~ $description = '
' . __('Description') . ': ';
- if (empty($agent['comentarios'])) {
+ if (empty($agent['comentarios']) === true) {
$description .= '
'.__('N/A').'';
} else {
$description .= $this->agent['comentarios'];
@@ -241,6 +207,32 @@ class Agent
$html .= $description;
$html .= '
';
+ $html .= '
'.__('Modules by status').'';
+ $html .= '
';
+ $html .= graph_agent_status(
+ $this->id,
+ $graph_width,
+ 160,
+ true,
+ false,
+ false,
+ true
+ );
+ $html .= '
';
+ $graph_js = ob_get_clean();
+ $html = $graph_js.$html;
+
+ unset($this->agent['fired_count']);
+
if ($system->getConfig('metaconsole')) {
metaconsole_connect(
null,
@@ -248,24 +240,6 @@ class Agent
);
}
- $ui->contentGridAddCell($html, 'agent_details');
-
- ob_start();
-
- // Fixed width non interactive charts
- $status_chart_width = 160;
- $graph_width = 160;
-
- $html = '
';
- $html .= '
'.__('Modules by status').'';
- $html .= '
';
- $html .= graph_agent_status($this->id, $graph_width, 160, true);
- $html .= '
';
- $graph_js = ob_get_clean();
- $html = $graph_js.$html;
-
- unset($this->agent['fired_count']);
-
if ($this->agent['total_count'] > 0) {
$html .= '
'.reporting_tiny_stats($this->agent, true, 'agent', ' ').'
';
}
@@ -273,7 +247,20 @@ class Agent
$html .= '
';
$html .= '
';
$html .= '
'.__('Events (24h)').'';
- $html .= '
';
+ $html .= '
';
+ $html .= graph_graphic_agentevents(
+ $this->id,
+ 95,
+ 45,
+ SECONDS_1DAY,
+ '',
+ true,
+ false,
+ true,
+ 1,
+ ''
+ );
+ $html .= '
';
$html .= '
';
$ui->contentGridAddCell($html, 'agent_graphs');
@@ -306,7 +293,10 @@ class Agent
$ui->contentEndCollapsible();
if ($system->getConfig('metaconsole')) {
- metaconsole_connect(null, $this->agent['id_tmetaconsole_setup']);
+ metaconsole_connect(
+ null,
+ $this->agent['id_tmetaconsole_setup']
+ );
}
$alerts = new Alerts();
@@ -371,46 +361,19 @@ class Agent
$('.agent_details').height(max_height);
}
}
-
+
if ($('.ui-block-a').css('float') != 'none') {
set_same_heigth();
}
-
+
$('.ui-collapsible').bind('expand', function () {
refresh_link_listener_last_agent_events();
refresh_link_listener_list_agent_Modules();
});
-
- function ajax_load_events_bar() {
- $('#events_bar').html('
".__('Loading...')."
![](\"images/ajax-loader.gif\")
');
-
- var bar_width = $('.agent_graphs').width() * 0.9;
- postvars = {};
- postvars[\"action\"] = \"ajax\";
- postvars[\"parameter1\"] = \"agent\";
- postvars[\"parameter2\"] = \"render_events_bar\";
- postvars[\"agent_id\"] = \"".$this->id."\";
- postvars[\"width\"] = bar_width;
- $.post(\"index.php\",
- postvars,
- function (data) {
- $('#events_bar').html(data);
- if ($('.ui-block-a').css('float') != 'none') {
- set_same_heigth();
- }
- },
- \"html\");
- }
-
- ajax_load_events_bar();
-
// Detect orientation change to refresh dinamic content
$(window).on({
orientationchange: function(e) {
- // Refresh events bar
- ajax_load_events_bar();
-
// Keep same height on boxes
if ($('.ui-block-a').css('float') == 'none') {
$('.agent_graphs').height('auto');
@@ -419,14 +382,13 @@ class Agent
else {
set_same_heigth();
}
-
}
});
-
+
if ($('.ui-block-a').css('float') != 'none') {
set_same_heigth();
}
- });
+ });
"
);
diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php
index 2dbea7c94a..2793a07b88 100644
--- a/pandora_console/mobile/operation/module_graph.php
+++ b/pandora_console/mobile/operation/module_graph.php
@@ -270,9 +270,6 @@ class ModuleGraph
global $config;
- echo include_javascript_dependencies_flot_graph(true);
- ui_require_javascript_file('pandora', 'include/javascript/', true);
-
?>
-
-
-
-
-
-
-
+
+
<?php echo __('%s Interface Graph', get_product_name()).' ('.agents_get_alias($agent_id).' - '.$interface_name; ?>)
+
+
+
+
+
+
+
+
+
+ $now) {
$date = $now;
}
- $urlImage = ui_get_full_url(false);
+$urlImage = ui_get_full_url(false);
- // Graph.
- echo '
';
+// FORM TABLE.
+$table = html_get_predefined_table('transparent', 2);
+$table->width = '100%';
+$table->id = 'stat_win_form_div';
+$table->style[0] = 'text-align:left;';
+$table->style[1] = 'text-align:left;';
+$table->styleTable = 'margin-bottom: 20px;';
+$table->class = 'table_modal_alternate';
- $height = 400;
- $width = '90%';
+$data = [];
+$data[0] = __('Refresh time');
+$data[1] = html_print_extended_select_for_time(
+ 'refresh',
+ $refresh,
+ '',
+ '',
+ 0,
+ 7,
+ true
+);
+$table->data[] = $data;
+$table->rowclass[] = '';
- $params = [
- 'period' => $period,
- 'width' => $width,
- 'height' => $height,
- 'unit_name' => array_fill(0, count($interface_traffic_modules), $config['interface_unit']),
- 'date' => $date,
- 'homeurl' => $config['homeurl'],
- 'percentil' => (($show_percentil) ? $config['percentil'] : null),
- 'fullscale' => $fullscale,
- 'zoom' => $zoom,
- ];
+$data = [];
+$data[0] = __('Begin date');
+$data[1] = html_print_input_text(
+ 'start_date',
+ substr($start_date, 0, 10),
+ '',
+ 15,
+ 255,
+ true
+);
+$data[1] .= html_print_image(
+ '/images/calendar_view_day.png',
+ true,
+ [
+ 'onclick' => "scwShow(scwID('text-start_date'),this);",
+ 'style' => 'vertical-align: bottom;',
+ ],
+ false,
+ false,
+ false,
+ true
+);
+$table->data[] = $data;
+$table->rowclass[] = '';
- if (is_metaconsole()) {
- $params['id_server'] = $server_id;
- }
+$data = [];
+$data[0] = __('Begin time');
+$data[1] = html_print_input_text('start_time', $start_time, '', 10, 10, true);
+$table->data[] = $data;
+$table->rowclass[] = '';
- if ($config['type_interface_charts'] == 'line') {
- $stacked = CUSTOM_GRAPH_LINE;
- } else {
- $stacked = CUSTOM_GRAPH_AREA;
- }
+$data = [];
+$data[0] = __('Time range');
+$data[1] = html_print_extended_select_for_time(
+ 'period',
+ $period,
+ '',
+ '',
+ 0,
+ 7,
+ true
+);
+$table->data[] = $data;
+$table->rowclass[] = '';
- $params_combined = [
- 'weight_list' => [],
- 'projection' => false,
- 'labels' => array_keys($interface_traffic_modules),
- 'from_interface' => true,
- 'modules_series' => array_values($interface_traffic_modules),
- 'return' => 0,
- 'stacked' => $stacked,
- ];
+$data = [];
+$data[0] = __('Show percentil');
+$data[1] = html_print_checkbox_switch(
+ 'show_percentil',
+ 1,
+ (bool) $show_percentil,
+ true
+);
+$table->data[] = $data;
+$table->rowclass[] = '';
- graphic_combined_module(
- array_values($interface_traffic_modules),
- $params,
- $params_combined
- );
+$data = [];
+$data[0] = __('Show full scale graph (TIP)').ui_print_help_tip(
+ __('This option may cause performance issues'),
+ true,
+ 'images/tip.png',
+ true
+);
+$data[1] = html_print_checkbox_switch('fullscale', 1, (bool) $fullscale, true);
+$table->data[] = $data;
+$table->rowclass[] = '';
- echo '
';
+$data = [];
+$data[0] = __('Zoom factor');
+$options = [];
+$options[$zoom] = 'x'.$zoom;
+$options[1] = 'x1';
+$options[2] = 'x2';
+$options[3] = 'x3';
+$options[4] = 'x4';
+$options[5] = __('Full');
+$data[1] = html_print_select(
+ $options,
+ 'zoom',
+ $zoom,
+ '',
+ '',
+ 0,
+ true,
+ false,
+ false
+);
+$table->data[] = $data;
+$table->rowclass[] = '';
- // FORM TABLE
- $table = html_get_predefined_table('transparent', 2);
- $table->width = '100%';
- $table->id = 'stat_win_form_div';
- $table->style[0] = 'text-align:left;';
- $table->style[1] = 'text-align:left;';
- $table->styleTable = 'margin-bottom: 20px;';
- $table->class = 'table_modal_alternate';
-
- $data = [];
- $data[0] = __('Refresh time');
- $data[1] = html_print_extended_select_for_time('refresh', $refresh, '', '', 0, 7, true);
- $table->data[] = $data;
- $table->rowclass[] = '';
-
- $data = [];
- $data[0] = __('Begin date');
- $data[1] = html_print_input_text('start_date', substr($start_date, 0, 10), '', 15, 255, true);
- $data[1] .= html_print_image('/images/calendar_view_day.png', true, ['onclick' => "scwShow(scwID('text-start_date'),this);", 'style' => 'vertical-align: bottom;'], false, false, false, true);
- $table->data[] = $data;
- $table->rowclass[] = '';
-
- $data = [];
- $data[0] = __('Begin time');
- $data[1] = html_print_input_text('start_time', $start_time, '', 10, 10, true);
- $table->data[] = $data;
- $table->rowclass[] = '';
-
- $data = [];
- $data[0] = __('Time range');
- $data[1] = html_print_extended_select_for_time('period', $period, '', '', 0, 7, true);
- $table->data[] = $data;
- $table->rowclass[] = '';
-
- $data = [];
- $data[0] = __('Show percentil');
- $data[1] = html_print_checkbox_switch('show_percentil', 1, (bool) $show_percentil, true);
- $table->data[] = $data;
- $table->rowclass[] = '';
-
- $data = [];
- $data[0] = __('Show full scale graph (TIP)').ui_print_help_tip(
- __('This option may cause performance issues'),
- true,
- 'images/tip.png',
- true
- );
- $data[1] = html_print_checkbox_switch('fullscale', 1, (bool) $fullscale, true);
- $table->data[] = $data;
- $table->rowclass[] = '';
-
- $data = [];
- $data[0] = __('Zoom factor');
- $options = [];
- $options[$zoom] = 'x'.$zoom;
- $options[1] = 'x1';
- $options[2] = 'x2';
- $options[3] = 'x3';
- $options[4] = 'x4';
- $options[5] = __('Full');
- $data[1] = html_print_select($options, 'zoom', $zoom, '', '', 0, true, false, false);
- $table->data[] = $data;
- $table->rowclass[] = '';
-
- $form_table = html_print_table($table, true);
- $form_table .= '
'.html_print_submit_button(
- __('Reload'),
- 'submit',
- false,
- 'class="sub upd"',
- true
- ).'
';
+$form_table = html_print_table($table, true);
+$form_table .= '
'.html_print_submit_button(
+ __('Reload'),
+ 'submit',
+ false,
+ 'class="sub upd"',
+ true
+).'
';
- // Menu.
- $menu_form = "
';
+echo $menu_form;
+echo '';
+echo '';
- // Hidden div to forced title
- html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true]);
- ?>
+// Hidden div to forced title.
+html_print_div(
+ [
+ 'id' => 'forced_title_layer',
+ 'class' => 'forced_title_layer',
+ 'hidden' => true,
+ ]
+);
+
+// Graph.
+echo '
';
+
+$height = 280;
+$width = '90%';
+
+$params = [
+ 'period' => $period,
+ 'width' => $width,
+ 'height' => $height,
+ 'unit_name' => array_fill(0, count($interface_traffic_modules), $config['interface_unit']),
+ 'date' => $date,
+ 'homeurl' => $config['homeurl'],
+ 'percentil' => (($show_percentil) ? $config['percentil'] : null),
+ 'fullscale' => $fullscale,
+ 'zoom' => $zoom,
+];
+
+if (is_metaconsole()) {
+ $params['id_server'] = $server_id;
+}
+
+if ($config['type_interface_charts'] == 'line') {
+ $stacked = CUSTOM_GRAPH_LINE;
+} else {
+ $stacked = CUSTOM_GRAPH_AREA;
+}
+
+$params_combined = [
+ 'weight_list' => [],
+ 'projection' => false,
+ 'labels' => array_keys($interface_traffic_modules),
+ 'from_interface' => true,
+ 'modules_series' => array_values($interface_traffic_modules),
+ 'return' => 0,
+ 'stacked' => $stacked,
+];
+
+graphic_combined_module(
+ array_values($interface_traffic_modules),
+ $params,
+ $params_combined
+);
+
+echo '
';
+?>