\n";
echo "
\n";
- //echo "
\n";
echo " \n";
echo " \n";
- //echo " \n";
+ echo " \n";
echo " \n";
echo " \n";
diff --git a/pandora_console/mobile/operation/modules.php b/pandora_console/mobile/operation/modules.php
index 5dd89b9aec..8971334eea 100644
--- a/pandora_console/mobile/operation/modules.php
+++ b/pandora_console/mobile/operation/modules.php
@@ -270,6 +270,7 @@ class Modules {
}
private function getListModules($page = 0, $ajax = false) {
+ global $config;
$system = System::getInstance();
$user = User::getInstance();
@@ -590,34 +591,17 @@ class Modules {
$output = $sub_string;
}
}
-
-
- $is_snapshot = is_snapshot_data($module["datos"]);
-
- $handle = "snapshot" . "_" . $module["id_agente_modulo"];
- $url = 'include/procesos.php?agente=' . $module["id_agente_modulo"];
-
- $link = "window.open('../operation/agentes/snapshot_view.php?" .
- "id=" . $module["id_agente_modulo"] .
- "&refr=" . $module["module_interval"]."','".$handle."','width=700, height=480')";
-
- if ($is_snapshot) {
- if (is_image_data($module["datos"])) {
- $row[7] = $row[__('Data')] = '
' .
- html_print_image("images/photo.png", true,
- array("border" => '0',
- "alt" => "",
- "title" => __("Snapshot view"))) . ' ';
- }
- else {
- $row[7] = $row[__('Data')] = '
' .
- html_print_image("images/default_list.png", true,
- array("border" => '0',
- "alt" => "",
- "title" => __("Snapshot view"))) . ' ';
- }
- }
- else {
+
+ $is_snapshot = is_snapshot_data ($module["datos"]);
+ $is_large_image = is_text_to_black_string ($module["datos"]);
+ if (($config['command_snapshot']) && ($is_snapshot || $is_large_image)) {
+ $link = ui_get_snapshot_link( array(
+ 'id_module' => $module['id_agente_modulo'],
+ 'module_name' => $module['module_name']
+ ));
+
+ $row[7] = ui_get_snapshot_image($link, $is_snapshot) . ' ';
+ } else {
$row[7] = $row[__('Data')] = '
' .
'' .
$row[__('Status')] . ' ' .
@@ -626,18 +610,7 @@ class Modules {
$module['id_agente_modulo'] . '&id_agent=' .
$this->id_agent . '">' . $output . '' . '';
}
-
-
- /*
-
- '
' .
- '' .
- $row[__('Status')] . ' ' .
- '' . $output . '' . '';*/
-
+
if (!$ajax) {
unset($row[0]);
if ($this->columns['agent']) {
@@ -814,23 +787,9 @@ class Modules {
$filters_to_serialize[] = sprintf(__("Tag: %s"),
$tag_name);
}
-
+
$string = '(' . implode(' - ', $filters_to_serialize) . ')';
-
-
-
- //~ $status = $this->list_status[$this->status];
- //~
- //~ $group = groups_get_name($this->group, true);
- //~
- //~ $module_group = db_get_value('name',
- //~ 'tmodule_group', 'id_mg', $this->module_group);
- //~ $module_group = io_safe_output($module_group);
- //~
- //~ $string = sprintf(
- //~ __("(Status: %s - Group: %s - Module group: %s - Free Search: %s)"),
- //~ $status, $group, $module_group, $this->free_search);
-
+
return $string;
}
}
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 93b31abf14..12c7fd5d8d 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -449,11 +449,9 @@ $table->align = array ();
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
if ($print_agent) {
- if (!is_metaconsole()) {
- $table->head[0] = "
" .
- __('P.') . "";
- }
-
+
+ $table->head[0] = "
" . __('P.') . "";
+
$table->head[1] = "
" .
__('S.') . "";
@@ -496,10 +494,8 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
}
}
else {
- if (!is_metaconsole()) {
- $table->head[0] = "
" . __('P.') . "";
- }
-
+ $table->head[0] = "
" . __('P.') . "";
+
$table->head[1] = "
" . __('S.') . "";
if (!is_metaconsole()) {
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 1632242dec..d37cc9396c 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -108,21 +108,18 @@ if (is_ajax ()) {
$value = $module_value;
}
else{
- // If carriage returns present... then is a "Snapshot" data (full command output)
- $is_snapshot = is_snapshot_data ( $module_value );
-
$module = modules_get_agentmodule($id_module);
-
- if (($config['command_snapshot']) && ($is_snapshot)){
- $handle = "snapshot"."_".$module["id_agente_modulo"];
- $url = 'include/procesos.php?agente='.$module["id_agente_modulo"];
- $win_handle = dechex(crc32($handle));
-
- $link ="winopeng_var('operation/agentes/snapshot_view.php?id=".$module["id_agente_modulo"]."&refr=".$module["current_interval"]."&label=".$module["nombre"]."','".$win_handle."', 700,480)";
-
- $value = '
' . html_print_image("images/default_list.png", true, array("border" => '0', "alt" => "", "title" => __("Snapshot view"))) . ' ';
- }
- else {
+
+ $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( array(
+ 'id_module' => $module["id_agente_modulo"],
+ 'interval' => $module["current_interval"],
+ 'module_name' => $module["nombre"]
+ ));
+ $value = ui_get_snapshot_image($link, $is_snapshot) . ' ';
+ } else {
$value = ui_print_module_string_value(
$module_value, $module["id_agente_modulo"],
$module["current_interval"], $module["module_name"]);
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index 7bd9499ff9..94251a380a 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -30,6 +30,7 @@ require_once ($config['homedir'] . '/include/functions_custom_graphs.php');
require_once ($config['homedir'] . '/include/functions_modules.php');
require_once ($config['homedir'] . '/include/functions_agents.php');
require_once ($config['homedir'] . '/include/functions_tags.php');
+enterprise_include_once('include/functions_agents.php');
check_login();
@@ -108,28 +109,8 @@ $interface_traffic_modules = array(
0) {
+ $connection = metaconsole_get_connection_by_id($id_node);
+ if (metaconsole_load_external_db($connection) != NOERR) {
+ ui_print_error_message(__('Cannot connect with node to display the module data.'));
+ exit;
+ }
+}
+$row_module = modules_get_agentmodule($id);
+$row_state = db_get_row('tagente_estado', 'id_agente_modulo', $id);
+
+if ($id_node > 0) {
+ metaconsole_restore_db();
}
-// TODO - Put ACL here
+// Build the info
+$label = get_parameter ("label", io_safe_output($row_module['module_name']));
+$last_timestamp = get_parameter("timestamp", $row_state['timestamp']);
+$last_data = io_safe_output($row_state["datos"]);
+$refresh = (int) get_parameter ("refr", $row_state['current_interval']);
+
+// ACL check
+$all_groups = agents_get_all_groups_agent ($row_state['id_agente']);
+if (!check_acl_one_of_groups($config['id_user'], $all_groups, "AR")) {
+ require ($config['homedir'] . "/general/noaccess.php");
+ exit;
+}
?>
0) {
$query = ui_get_url_refresh (false);
echo '
';
@@ -68,30 +84,24 @@ if (empty($last_data)) {
";
- echo __("Current data at");
- echo " ";
- echo $last_timestamp;
+ echo __("Current data at %s", $last_timestamp);
echo "";
if (is_image_data($last_data)) {
echo '
';
}
else {
- $datos = preg_replace ('//', '>', $datos);
- $datos = preg_replace ('/\n/i','
',$datos);
- $datos = preg_replace ('/\s/i',' ',$datos);
- echo "
";
+ $last_data = preg_replace ('//', '>', $last_data);
+ $last_data = preg_replace ('/\n/i','
',$last_data);
+ $last_data = preg_replace ('/\s/i',' ',$last_data);
+ echo "
";
echo $last_data;
echo "
";
?>