Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.759-220125
+Version: 7.0NG.759-220126
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.759-220125"
+pandora_version="7.0NG.759-220126"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.759';
-use constant AGENT_BUILD => '220125';
+use constant AGENT_BUILD => '220126';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.759
-%define release     220125
+%define release     220126
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.759
-%define release     220125
+%define release     220126
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.759"
-PI_BUILD="220125"
+PI_BUILD="220126"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{220125}
+{220126}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.759 Build 220125")
+#define PANDORA_VERSION ("7.0NG.759 Build 220126")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.759(Build 220125))"
+      VALUE "ProductVersion", "(7.0NG.759(Build 220126))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.759-220125
+Version: 7.0NG.759-220126
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.759-220125"
+pandora_version="7.0NG.759-220126"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/module_groups.php

@@ -302,7 +302,7 @@ function mainModuleGroups()
         $table->style[0] = 'color: #ffffff; background-color: #373737; font-weight: bolder; min-width: 230px;';
         $table->width = '100%';
 
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $background_color = '#333';
         } else {
             $background_color = '#fff';

pandora_console/extensions/realtime_graphs.php

@@ -42,7 +42,7 @@ function pandora_realtime_graphs()
     global $config;
     check_login();
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         ui_require_css_file('pandora_black', 'include/styles/', true);
     }
 

pandora_console/godmode/agentes/module_manager_editor_common.php

@@ -98,7 +98,7 @@ function add_component_selection($id_network_component_type)
     global $table_simple;
     global $config;
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $background_row = 'background-color: #444';
     } else {
         $background_row = 'background-color: #cfcfcf';

pandora_console/godmode/gis_maps/configure_gis_map.php

@@ -463,21 +463,12 @@ foreach ($listConnectionTemp as $connectionTemp) {
 }
 
 $table->data[1][0] = __('Add Map connection').$iconError;
-$table->data[1][1] = "<table  class='no-class' border='0' id='map_connection'>
+$table->data[1][1] = ".html_print_select($listConnection, 'map_connection_list', '', '', '', '0', true)."
-	<tr>
+        < / td > < td > < a href = 'javascript: addConnectionMap();' > ".html_print_image(
-		<td >
-			".html_print_select($listConnection, 'map_connection_list', '', '', '', '0', true)."
-		</td>
-		<td >
-			<a href='javascript: addConnectionMap();'>".html_print_image(
     'images/add.png',
     true,
     ['class' => 'invert_filter']
-)."</a>
+)." < / a > < input type = 'hidden' name = 'map_connection_list' value = '' id = 'map_connection_list' / > < input type = 'hidden' name = 'layer_list' value = '' id = 'layer_list' / > < / td > < / tr > (".gis_add_conection_maps_in_form($map_connection_list).'
-			<input type='hidden' name='map_connection_list' value='' id='map_connection_list' />
-			<input type='hidden' name='layer_list' value='' id='layer_list' />
-		</td>
-	</tr> ".gis_add_conection_maps_in_form($map_connection_list).'
 </table>';
 $own_info = get_user_info($config['id_user']);
 
@@ -553,9 +544,9 @@ $table->data = [];
 $table->data[0][0] = '<h4>'.__('List of layers').'</h4>';
 $table->data[0][1] = '<div class="right">'.html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add "', true).'</div>';
 
-$table->data[1][0] = '<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_layers"></table>';
+$table->data[1][0] = '<table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_layers"></table>';
-$table->data[1][1] = '<div id="form_layer" class="invisible">
+$table->data[1][1] = '<div id="form_layer' class='invisible'>
-		<table id="form_layer_table" class="" border="0" cellpadding="4" cellspacing="4">
+		<table id='form_layer_table' class="" border='0' cellpadding='4' cellspacing='4">
 			<tr>
 				<td>'.__('Layer name').':</td>
 				<td>'.html_print_input_text('layer_name_form', '', '', 20, 40, true).'</td>
@@ -598,7 +589,7 @@ $table->data[1][1] .= '</td>
 			<tr>
 				<td colspan="4">
 					<h4>'.__('List of Agents to be shown in the layer').'</h4>
-					<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_agents">
+					<table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_agents">
 					</table>
 				</td>
 			</tr>';
@@ -632,18 +623,18 @@ $table->data[1][1] .= '<tr><td colspan="4"><hr /></td></tr>
 				<td colspan="3">'.$agent_for_group_input.'</td>
 			</tr>
 			<tr>
-				<td colspan="4" align="right">'.$add_group_btn.'</td>
+				<td colspan="4' align='right">'.$add_group_btn.'</td>
 			</tr>
 			<tr>
 				<td colspan="4">
 					<h4>'.__('List of groups to be shown in the layer').'</h4>
-					<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_groups">
+					<table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_groups">
 					</table>
 				</td>
 			</tr>';
 
 $table->data[1][1] .= '<tr>
-				<td align="right" colspan="4">'.html_print_button(__('Save Layer'), 'save_layer', false, 'javascript:saveNewLayer();', 'class="sub wand"', true).'
+				<td align="right' colspan='4">'.html_print_button(__('Save Layer'), 'save_layer', false, 'javascript:saveNewLayer();', 'class="sub wand"', true).'
 					'.html_print_input_hidden('current_edit_layer_id', '', true).'
 				</td>
 			</tr>
@@ -653,7 +644,7 @@ $table->data[1][1] .= '<tr>
 html_print_table($table);
 
 
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
+echo '<div class="action - buttons' style=')width: '.$table->width.'">';
 switch ($action) {
     case 'save_new':
     case 'edit_map':
@@ -678,12 +669,12 @@ echo '</form>';
 // -------------------------INI CHUNKS---------------------------------------
 ?>
 
-<table style="visibility: hidden;">
+<table style="visibility: hidden;('>
-    <tbody id="chunk_map_connection">
+    <tbody id='chunk_map_connection'>
-        <tr class="row_0">
+        <tr class='row_0">
             <td><?php html_print_input_text('map_connection_name', $map_name, '', 20, 40, false, true); ?></td>
             <td><?php html_print_radio_button_extended('map_connection_default', '', '', true, false, 'changeDefaultConection(this.value)', ''); ?></td>
-            <td><a id="delete_row" href="none">
+            <td><a id="delete_row' href='none">
             <?php
             html_print_image(
                 'images/cross.png',
@@ -706,36 +697,43 @@ ui_require_jquery_file('cluetip');
 ui_require_jquery_file('pandora.controls');
 ui_require_jquery_file('json');
 ?>
-<script type="text/javascript">
+<script type="text / javascript'>
 
 function active_button_add_agent() {
-    $("#button-add_agent").prop("disabled", false);
+    $(')
+// button-add_agent").prop("disabled", false);
 }
 
-function addAgentClick (event) {
+
-    var $layerFormAgentIdInput = $("#hidden-agent_id");
+function addAgentClick(event)
-    var $layerFormAgentAliasInput = $("#text-agent_alias");
+{
+    var $layerFormAgentIdInput = $('#hidden-agent_id');
+    var $layerFormAgentAliasInput = $('#text-agent_alias');
 
     var agentId = Number.parseInt($layerFormAgentIdInput.val());
     var agentAlias = $layerFormAgentAliasInput.val();
-    var layerId = $("input#hidden-current_edit_layer_id").val();
+    var layerId = $('input#hidden-current_edit_layer_id').val();
 
-    if (Number.isNaN(agentId) || agentId === 0 || agentAlias.length === 0) return;
+    if (Number.isNaN(agentId) || agentId === 0 || agentAlias.length === 0) {
+        return;
+    }
 
     addAgentRow(layerId, agentId, agentAlias);
 
     // Clear agent inputs
-    $layerFormAgentIdInput.val("");
+    $layerFormAgentIdInput.val('');
-    $layerFormAgentAliasInput.val("");
+    $layerFormAgentAliasInput.val('');
 
-    $("#button-add_agent").prop("disabled", true);
+    $('#button-add_agent').prop('disabled', true);
 }
 
-function toggleAddGroupBtn () {
+
-    var groupId = Number.parseInt($("select#layer_group_id").val());
+function toggleAddGroupBtn()
+{
+    var groupId = Number.parseInt($('select#layer_group_id').val());
     var existGroupId = $("table#list_groups tr.groups_list_item[data-group-id='" + groupId + "']").length > 0;
-    var agentId = Number.parseInt($("input#hidden-agent_id_for_data").val());
+    var agentId = Number.parseInt($('input#hidden-agent_id_for_data').val());
-    var agentAlias = $("input#text-agent_alias_for_data").val();
+    var agentAlias = $('input#text-agent_alias_for_data').val();
 
     var enabled = (
         !existGroupId
@@ -746,17 +744,19 @@ function toggleAddGroupBtn () {
         && agentAlias.length > 0
     );
 
-    $("#button-add_group").prop("disabled", !enabled);
+    $('#button-add_group').prop('disabled', !enabled);
 }
 
-function addGroupClick (event) {
-    var $layerFormGroupIdInput = $("select#layer_group_id");
-    var $layerFormAgentIdInput = $("input#hidden-agent_id_for_data");
-    var $layerFormAgentAliasInput = $("input#text-agent_alias_for_data");
 
-    var layerId = $("input#hidden-current_edit_layer_id").val();
+function addGroupClick(event)
+{
+    var $layerFormGroupIdInput = $('select#layer_group_id');
+    var $layerFormAgentIdInput = $('input#hidden-agent_id_for_data');
+    var $layerFormAgentAliasInput = $('input#text-agent_alias_for_data');
+
+    var layerId = $('input#hidden-current_edit_layer_id').val();
     var groupId = Number.parseInt($layerFormGroupIdInput.val());
-    var groupName = $layerFormGroupIdInput.find(":selected").text();
+    var groupName = $layerFormGroupIdInput.find(':selected').text();
     var agentId = Number.parseInt($layerFormAgentIdInput.val());
     var agentAlias = $layerFormAgentAliasInput.val();
 
@@ -769,46 +769,61 @@ function addGroupClick (event) {
         && agentAlias.length > 0
     );
 
-    if (!valid) return;
+    if (!valid) {
+        return;
+    }
 
     addGroupRow(layerId, groupId, groupName, agentId, agentAlias);
 
     // Clear inputs
     // $layerFormGroupIdInput.val(0);
-    $layerFormAgentIdInput.val("");
+    $layerFormAgentIdInput.val('');
-    $layerFormAgentAliasInput.val("");
+    $layerFormAgentAliasInput.val('');
 
-    $("#button-add_group").prop("disabled", true);
+    $('#button-add_group').prop('disabled', true);
 }
 
-function moveLayerRowUpOnClick (event) {
+
+function moveLayerRowUpOnClick(event)
+{
     var $row = $(event.currentTarget).parent().parent();
     $row.insertBefore($row.prev());
 }
 
-function moveLayerRowDownOnClick (event) {
+
+function moveLayerRowDownOnClick(event)
+{
     var $row = $(event.currentTarget).parent().parent();
     $row.insertAfter($row.next());
 }
 
-function removeLayerRowOnClick (event) {
+
+function removeLayerRowOnClick(event)
+{
     var $layerRow = $(event.currentTarget).parent().parent();
-    var layerRowId = $layerRow.find("input.layer_id").val();
+    var layerRowId = $layerRow.find('input.layer_id').val();
-    var layerEditorId = $("input#hidden-current_edit_layer_id").val();
+    var layerEditorId = $('input#hidden-current_edit_layer_id').val();
-    if (layerRowId == layerEditorId) hideLayerEditor();
+    if (layerRowId == layerEditorId) {
+        hideLayerEditor();
+    }
+
     // Remove row
     $(event.currentTarget).parent().parent().remove();
 }
 
-function hideLayerEditor () {
+
+function hideLayerEditor()
+{
     // Clean editor
     cleanLayerEditor();
     // Hide editor
-    $("div#form_layer").hide();
+    $('div#form_layer').hide();
 }
 
-function showLayerEditor (layerId) {
+
-    var $layerSaveBtn = $("input#button-save_layer");
+function showLayerEditor(layerId)
+{
+    var $layerSaveBtn = $('input#button-save_layer');
 
     // Clean editor
     cleanLayerEditor();
@@ -832,33 +847,39 @@ function showLayerEditor (layerId) {
     }
 
     // Show editor (if hidden)
-    $("div#form_layer").show();
+    $('div#form_layer').show();
 }
 
-function getLayerData (layerId) {
+
-    var $layerRow = $("tr#layer_row_" + layerId);
+function getLayerData(layerId)
-    var layerName = $layerRow.find("input.layer_name").val();
+{
-    var layerVisible = $layerRow.find("input.layer_visible").val() == 1;
+    var $layerRow = $('tr#layer_row_' + layerId);
-    var layerAgentsFromGroup = $layerRow.find("input.layer_agents_from_group").val();
+    var layerName = $layerRow.find('input.layer_name').val();
-    var layerAgents = $layerRow.find("input.layer_agent_alias").map(function () {
+    var layerVisible = $layerRow.find('input.layer_visible').val() == 1;
+    var layerAgentsFromGroup = $layerRow.find('input.layer_agents_from_group').val();
+    var layerAgents = $layerRow.find('input.layer_agent_alias').map(
+        function () {
             return {
-            "id": $(this).data("agent-id"),
+            'id': $(this).data('agent-id'),
-            "alias": $(this).val()
+            'alias': $(this).val()
             };
-    }).get();
+        }
-    var layerGroups = $layerRow.find("input.layer_group_id").map(function () {
+    ).get();
+    var layerGroups = $layerRow.find('input.layer_group_id').map(
+        function () {
             var groupId = $(this).val();
-        var groupName = $(this).siblings("input.layer_group_name[data-group-id='" + groupId + "']").val();
+            var groupName = $(this).siblings(("input.layer_group_name[data-group-id='" + groupId + "']")).val();
-        var agentId = $(this).siblings("input.layer_agent_id_for_data[data-group-id='" + groupId + "']").val();
+            var agentId = $(this).siblings(("input.layer_agent_id_for_data[data-group-id='" + groupId + "']")).val();
-        var agentAlias = $(this).siblings("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']").val();
+            var agentAlias = $(this).siblings(("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']")).val();
 
             return {
-            "id": groupId,
+            'id': groupId,
-            "name": groupName,
+            'name': groupName,
-            "agentId": agentId,
+            'agentId': agentId,
-            "agentAlias": agentAlias
+            'agentAlias': agentAlias
             };
-    }).get();
+        }
+    ).get();
 
     return {
         id: layerId,
@@ -870,142 +891,185 @@ function getLayerData (layerId) {
     }
 }
 
-function setLayerEditorData (data) {
+
-    if (data == null) data = {};
+function setLayerEditorData(data)
+{
+    if (data == null) {
+        data = {};
+    }
+
     // Set defaults
     data = {
         id: data.id || 0,
-        name: data.name || "",
+        name: data.name || '',
         visible: data.visible != null ? !!data.visible : true,
         agentsFromGroup: data.agentsFromGroup || -1,
         agents: data.agents || [],
         groups: data.groups || []
     }
 
-    var $layerFormIdInput = $("input#hidden-current_edit_layer_id");
+    var $layerFormIdInput = $('input#hidden-current_edit_layer_id');
-    var $layerFormNameInput = $("input#text-layer_name_form");
+    var $layerFormNameInput = $('input#text-layer_name_form');
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
+    var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
-    var $layerFormAgentsFromGroupSelect = $("#layer_group_form");
+    var $layerFormAgentsFromGroupSelect = $('#layer_group_form');
-    var $layerFormAgentInput = $("input#text-agent_alias");
+    var $layerFormAgentInput = $('input#text-agent_alias');
-    var $layerFormAgentButton = $("input#button-add_agent");
+    var $layerFormAgentButton = $('input#button-add_agent');
-    var $layerFormAgentsListItems = $("tr.agents_list_item");
+    var $layerFormAgentsListItems = $('tr.agents_list_item');
-    var $layerFormGroupsListItems = $("tr.groups_list_item");
+    var $layerFormGroupsListItems = $('tr.groups_list_item');
 
     $layerFormIdInput.val(data.id);
     $layerFormNameInput.val(data.name);
-    $layerFormVisibleCheckbox.prop("checked", data.visible);
+    $layerFormVisibleCheckbox.prop('checked', data.visible);
-    $(`#layer_group_form option[value=${data.agentsFromGroup}]`).attr('selected', 'selected');
+    $(`#layer_group_form option[value=${data.agentsFromGroup
+}]`).attr('selected', 'selected');
+
+
     $(`#layer_group_form`).trigger('change');
-    $layerFormAgentInput.val("");
+    $layerFormAgentInput.val('');
-    $layerFormAgentButton.prop("disabled", true);
+    $layerFormAgentButton.prop('disabled', true);
     $layerFormAgentsListItems.remove();
     $layerFormGroupsListItems.remove();
 
-    var $tableAgents = $("table#list_agents");
+    var $tableAgents = $('table#list_agents');
-    data.agents.forEach(function (agent) {
+    data.agents.foreach (function (agent) {
         addAgentRow(data.id, agent.id, agent.alias);
-    });
+    }) {
-
-    var $tableGroups = $("table#list_groups");
-    data.groups.forEach(function (group) {
-        addGroupRow(data.id, group.id, group.name, group.agentId, group.agentAlias);
-    });
     }
 
-function newLayer () {
+    var $tableGroups = $('table#list_groups');
+    data.groups.foreach (function (group) {
+        addGroupRow(data.id, group.id, group.name, group.agentId, group.agentAlias);
+    }) {
+    }
+
+    }
+
+
+    function newLayer()
+    {
         showLayerEditor(null);
     }
 
-function saveNewLayer () {
-    var $layerFormNameInput = $("input#text-layer_name_form");
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
-    var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
-    var $layerFormAgentsListItems = $("tr.agents_list_item > td > span.agent_alias");
-    var $layerFormGroupsListItems = $("tr.groups_list_item");
-    var newLayerId = "new_" + ($("tr.layer_row").length + 1);
 
-    addLayerRow(newLayerId, {
+    function saveNewLayer()
+    {
+        var $layerFormNameInput = $('input#text-layer_name_form');
+        var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
+        var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
+        var $layerFormAgentsListItems = $('tr.agents_list_item > td > span.agent_alias');
+        var $layerFormGroupsListItems = $('tr.groups_list_item');
+        var newLayerId = ('new_' + ($('tr.layer_row').length + 1));
+
+        addLayerRow(
+            newLayerId,
+            {
             id: newLayerId,
             name: $layerFormNameInput.val(),
-        visible: $layerFormVisibleCheckbox.prop("checked"),
+            visible: $layerFormVisibleCheckbox.prop('checked'),
             agentsFromGroup: $layerFormAgentsFromGroupSelect.val(),
-        agents: $layerFormAgentsListItems.map(function () {
+            agents: $layerFormAgentsListItems.map(
+                function () {
                     return {
-                "id": $(this).data("agent-id"),
+                    'id': $(this).data('agent-id'),
-                "alias": $(this).text()
+                    'alias': $(this).text()
                     };
-        }).get(),
+                }
-        groups: $layerFormGroupsListItems.map(function () {
+            ).get(),
+            groups: $layerFormGroupsListItems.map(
+                function () {
                     return {
-                "id": $(this).data("group-id"),
+                    'id': $(this).data('group-id'),
-                "name": $(this).data("group-name"),
+                    'name': $(this).data('group-name'),
-                "agentId": $(this).data("agent-id"),
+                    'agentId': $(this).data('agent-id'),
-                "agentAlias": $(this).data("agent-alias")
+                    'agentAlias': $(this).data('agent-alias')
                     };
-        }).get()
+                }
-    });
+            ).get()
+            }
+        );
     }
 
-function cleanLayerEditor () {
+
+    function cleanLayerEditor()
+    {
         // Clear editor events
         unbindLayerEditorEvents();
         // Add default data to the editor
         setLayerEditorData();
     }
 
-function bindLayerEditorEvents (layerId) {
-    var $layerFormNameInput = $("input#text-layer_name_form");
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
-    var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
 
-    var $layerRow = $("tr#layer_row_" + layerId);
+    function bindLayerEditorEvents(layerId)
+    {
+        var $layerFormNameInput = $('input#text-layer_name_form');
+        var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
+        var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
 
-    if ($layerRow.length === 0) return;
+        var $layerRow = $('tr#layer_row_' + layerId);
 
-    $layerFormNameInput.bind("change", function (event) {
+        if ($layerRow.length === 0) {
-        var name = event.currentTarget.value;
+            return;
-        $layerRow.find("span.layer_name").html(name);
-        $layerRow.find("input.layer_name").val(name);
-    });
-    $layerFormVisibleCheckbox.bind("click", function (event) {
-        var visible = $(event.currentTarget).prop("checked");
-        $layerRow.find("input.layer_visible").val(visible ? 1 : 0);
-    });
-    $layerFormAgentsFromGroupSelect.bind("change", function (event) {
-        var group = event.currentTarget.value;
-        $layerRow.find("input.layer_agents_from_group").val(group);
-    });
         }
 
-function unbindLayerEditorEvents () {
+        $layerFormNameInput.bind(
-    var $layerFormNameInput = $("input#text-layer_name_form");
+            'change',
-    var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
+            function (event) {
-    var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
+                var name = event.currentTarget.value;
+                $layerRow.find('span.layer_name').html(name);
+                $layerRow.find('input.layer_name').val(name);
+            }
+        );
+        $layerFormVisibleCheckbox.bind(
+            'click',
+            function (event) {
+                var visible = $(event.currentTarget).prop('checked');
+                $layerRow.find('input.layer_visible').val(visible ? 1 : 0);
+            }
+        );
+        $layerFormAgentsFromGroupSelect.bind(
+            'change',
+            function (event) {
+                var group = event.currentTarget.value;
+                $layerRow.find('input.layer_agents_from_group').val(group);
+            }
+        );
+    }
 
-    $layerFormNameInput.unbind("change");
+
-    $layerFormVisibleCheckbox.unbind("click");
+    function unbindLayerEditorEvents()
+    {
+        var $layerFormNameInput = $('input#text-layer_name_form');
+        var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
+        var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
+
+        $layerFormNameInput.unbind('change');
+        $layerFormVisibleCheckbox.unbind('click');
         $layerFormAgentsFromGroupSelect.val('-1');
     }
 
-function getAgentRow (layerId, agentId, agentAlias) {
-    var $row = $("<tr class=\"agents_list_item\" />");
-    var $nameCol = $("<td />");
-    var $deleteCol = $("<td />");
 
-    var $agentAlias = $("<span class=\"agent_alias\" data-agent-id=\"" + agentId + "\">" + agentAlias + "</span>");
+    function getAgentRow(layerId, agentId, agentAlias)
+    {
+        var $row = $('<tr class="agents_list_item" />');
+        var $nameCol = $('<td />');
+        var $deleteCol = $('<td />');
+
+        var $agentAlias = $('<span class="agent_alias" data-agent-id="' + agentId + '">' + agentAlias + '</span>');
         var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images / cross.png', false, ['class' => 'invert_filter']); ?> </a>');
 
-    $removeBtn.click(function (event) {
+        $removeBtn.click(
-        var $layerRow = $("tr#layer_row_" + layerId);
+            function (event) {
+                var $layerRow = $('tr#layer_row_' + layerId);
 
                 if ($layerRow.length > 0) {
-            $layerRow.find("input.layer_agent_id[data-agent-id='" + agentId + "']").remove();
+                    $layerRow.find(("input.layer_agent_id[data-agent-id='" + agentId + "']")).remove();
-            $layerRow.find("input.layer_agent_alias[data-agent-id='" + agentId + "']").remove();
+                    $layerRow.find(("input.layer_agent_alias[data-agent-id='" + agentId + "']")).remove();
                 }
 
                 var $agentListItemRow = $(event.currentTarget).parent().parent();
                 $agentListItemRow.remove();
-    });
+            }
+        );
 
         $nameCol.append($agentAlias);
         $deleteCol.append($removeBtn);
@@ -1015,55 +1079,64 @@ function getAgentRow (layerId, agentId, agentAlias) {
         return $row;
     }
 
-function addAgentRow (layerId, agentId, agentAlias) {
-    if (agentId == null || agentId == 0 || agentAlias.length === 0) return;
 
-    var $layerRow = $("tr#layer_row_" + layerId);
+    function addAgentRow(layerId, agentId, agentAlias)
-    if ($layerRow && $layerRow.find("input.layer_agent_id[value='" + agentId + "']").length === 0) {
+    {
-        $layerRow
+        if (agentId == null || agentId == 0 || agentAlias.length === 0) {
-            .find("td:first-child")
+            return;
-                .append(getLayerAgentIdInput(layerId, agentId))
-                .append(getLayerAgentAliasInput(layerId, agentId, agentAlias));
         }
 
-    $("table#list_agents").append(getAgentRow(layerId, agentId, agentAlias));
+        var $layerRow = $('tr#layer_row_' + layerId);
+        if ($layerRow && $layerRow.find(("input.layer_agent_id[value='" + agentId + "']")).length === 0) {
+            $layerRow.find('td:first-child').append(getLayerAgentIdInput(layerId, agentId)).append(getLayerAgentAliasInput(layerId, agentId, agentAlias));
         }
 
-function getLayerAgentIdInput (layerId, agentId) {
+        $('table#list_agents').append(getAgentRow(layerId, agentId, agentAlias));
-    return $("<input class=\"layer_agent_id\" type=\"hidden\" data-agent-id=\"" + agentId + "\" name=\"layers[" + layerId + "][agents][" + agentId + "][id]\" value=\"" + agentId + "\">");
     }
 
-function getLayerAgentAliasInput (layerId, agentId, agentAlias) {
+
-    return $("<input class=\"layer_agent_alias\" type=\"hidden\" data-agent-id=\"" + agentId + "\" name=\"layers[" + layerId + "][agents][" + agentId + "][alias]\" value=\"" + agentAlias + "\">");
+    function getLayerAgentIdInput(layerId, agentId)
+    {
+        return $('<input class="layer_agent_id" type="hidden" data-agent-id="' + agentId + '" name="layers[' + layerId + '][agents][' + agentId + '][id]" value="' + agentId + '">');
     }
 
-function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
-    var $row = $("<tr class=\"groups_list_item\" data-group-id=\"" + groupId + "\" data-group-name=\"" + groupName + "\" data-agent-id=\"" + agentId + "\" data-agent-alias=\"" + agentAlias + "\" />");
-    var $nameCol = $("<td />");
-    var $deleteCol = $("<td />");
 
-    var $groupName = $("<span class=\"group_desc\">"
+    function getLayerAgentAliasInput(layerId, agentId, agentAlias)
+    {
+        return $('<input class="layer_agent_alias" type="hidden" data-agent-id="' + agentId + '" name="layers[' + layerId + '][agents][' + agentId + '][alias]" value="' + agentAlias + '">');
+    }
+
+
+    function getGroupRow(layerId, groupId, groupName, agentId, agentAlias)
+    {
+        var $row = $('<tr class="groups_list_item" data-group-id="' + groupId + '" data-group-name="' + groupName + '" data-agent-id="' + agentId + '" data-agent-alias="' + agentAlias + '" />');
+        var $nameCol = $('<td />');
+        var $deleteCol = $('<td />');
+
+        var $groupName = $('<span class="group_desc">'
         + groupName
-        + " ("
+        + ' ('
         + "<?php echo __('Using data from'); ?> "
-        + "<i>" + agentAlias + "</i>"
+        + '<i>' + agentAlias + '</i>'
-        + ")"
+        + ')'
-        + "</span>");
+        + '</span>');
         var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images / cross.png', true, ['class' => 'invert_filter']); ?></a>');
 
-    $removeBtn.click(function (event) {
+        $removeBtn.click(
-        var $layerRow = $("tr#layer_row_" + layerId);
+            function (event) {
+                var $layerRow = $('tr#layer_row_' + layerId);
 
                 if ($layerRow.length > 0) {
-            $layerRow.find("input.layer_group_id[data-group-id='" + groupId + "']").remove();
+                    $layerRow.find(("input.layer_group_id[data-group-id='" + groupId + "']")).remove();
-            $layerRow.find("input.layer_group_name[data-group-id='" + groupId + "']").remove();
+                    $layerRow.find(("input.layer_group_name[data-group-id='" + groupId + "']")).remove();
-            $layerRow.find("input.layer_agent_id_for_data[data-group-id='" + groupId + "']").remove();
+                    $layerRow.find(("input.layer_agent_id_for_data[data-group-id='" + groupId + "']")).remove();
-            $layerRow.find("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']").remove();
+                    $layerRow.find(("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']")).remove();
                 }
 
                 var $groupListItemRow = $(event.currentTarget).parent().parent();
                 $groupListItemRow.remove();
-    });
+            }
+        );
 
         $nameCol.append($groupName);
         $deleteCol.append($removeBtn);
@@ -1073,132 +1146,144 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
         return $row;
     }
 
-function addGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
-    if (
-        groupId == null ||
-        groupId == 0 ||
-        groupName.length === 0 ||
-        agentId == null ||
-        agentId == 0 ||
-        agentAlias.length === 0
-    ) return;
 
-    var $layerRow = $("tr#layer_row_" + layerId);
+    function addGroupRow(layerId, groupId, groupName, agentId, agentAlias)
-    if ($layerRow && $layerRow.find("input.layer_group_id[value='" + groupId + "']").length === 0) {
+    {
-        $layerRow
+        if (groupId == null
-            .find("td:first-child")
+            || groupId == 0
-                .append(getLayerGroupIdInput(layerId, groupId))
+            || groupName.length === 0
-                .append(getLayerGroupNameInput(layerId, groupId, groupName))
+            || agentId == null
-                .append(getLayerAgentIdForDataInput(layerId, groupId, agentId))
+            || agentId == 0
-                .append(getLayerAgentAliasForDataInput(layerId, groupId, agentAlias));
+            || agentAlias.length === 0
+        ) {
+            return;
         }
 
-    $("table#list_groups").append(getGroupRow(layerId, groupId, groupName, agentId, agentAlias));
+        var $layerRow = $('tr#layer_row_' + layerId);
+        if ($layerRow && $layerRow.find(("input.layer_group_id[value='" + groupId + "']")).length === 0) {
+            $layerRow.find('td:first-child').append(getLayerGroupIdInput(layerId, groupId)).append(getLayerGroupNameInput(layerId, groupId, groupName)).append(getLayerAgentIdForDataInput(layerId, groupId, agentId)).append(getLayerAgentAliasForDataInput(layerId, groupId, agentAlias));
         }
 
-function getLayerGroupIdInput (layerId, groupId) {
+        $('table#list_groups').append(getGroupRow(layerId, groupId, groupName, agentId, agentAlias));
-    return $("<input class=\"layer_group_id\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][id]\" value=\"" + groupId + "\">");
     }
 
-function getLayerGroupNameInput (layerId, groupId, groupName) {
+
-    return $("<input class=\"layer_group_name\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][name]\" value=\"" + groupName + "\">");
+    function getLayerGroupIdInput(layerId, groupId)
+    {
+        return $('<input class="layer_group_id" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][id]" value="' + groupId + '">');
     }
 
-function getLayerAgentIdForDataInput (layerId, groupId, agentId) {
+
-    return $("<input class=\"layer_agent_id_for_data\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][agent_id]\" value=\"" + agentId + "\">");
+    function getLayerGroupNameInput(layerId, groupId, groupName)
+    {
+        return $('<input class="layer_group_name" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][name]" value="' + groupName + '">');
     }
 
-function getLayerAgentAliasForDataInput (layerId, groupId, agentAlias) {
+
-    return $("<input class=\"layer_agent_alias_for_data\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][agent_alias]\" value=\"" + agentAlias + "\">");
+    function getLayerAgentIdForDataInput(layerId, groupId, agentId)
+    {
+        return $('<input class="layer_agent_id_for_data" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][agent_id]" value="' + agentId + '">');
     }
 
-function getLayerRow (layerId, layerData) {
-    var $row = $("<tr id=\"layer_row_" + layerId + "\" class=\"layer_row\" />");
-    var $nameCol = $("<td />");
-    var $sortCol = $("<td />");
-    var $editCol = $("<td />");
-    var $deleteCol = $("<td />");
 
-    var $layerIdInput = $("<input class=\"layer_id\" type=\"hidden\" name=\"layer_ids[]\" value=\"" + layerId + "\">");
+    function getLayerAgentAliasForDataInput(layerId, groupId, agentAlias)
-    var $layerNameInput = $("<input class=\"layer_name\" type=\"hidden\" name=\"layers[" + layerId + "][name]\" value=\"" + layerData.name + "\">");
+    {
-    var $layerVisibleInput = $("<input class=\"layer_visible\" type=\"hidden\" name=\"layers[" + layerId + "][visible]\" value=\"" + (layerData.visible ? 1 : 0) + "\">");
+        return $('<input class="layer_agent_alias_for_data" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][agent_alias]" value="' + agentAlias + '">');
-    var $layerAgentsFromGroupInput = $("<input class=\"layer_agents_from_group\" type=\"hidden\" name=\"layers[" + layerId + "][agents_from_group]\" value=\"" + layerData.agentsFromGroup + "\">");
+    }
 
-    var $layerName = $("<span class=\"layer_name\">" + layerData.name + "</span>");
+
-    var $sortUpBtn = $("<a class=\"up_arrow\" href=\"javascript:;\" />");
+    function getLayerRow(layerId, layerData)
-    var $sortDownBtn = $("<a class=\"down_arrow\" href=\"javascript:;\" />");
+    {
+        var $row = $('<tr id="layer_row_' + layerId + '" class="layer_row" />');
+        var $nameCol = $('<td />');
+        var $sortCol = $('<td />');
+        var $editCol = $('<td />');
+        var $deleteCol = $('<td />');
+
+        var $layerIdInput = $('<input class="layer_id" type="hidden" name="layer_ids[]" value="' + layerId + '">');
+        var $layerNameInput = $('<input class="layer_name" type="hidden" name="layers[' + layerId + '][name]" value="' + layerData.name + '">');
+        var $layerVisibleInput = $('<input class="layer_visible" type="hidden" name="layers[' + layerId + '][visible]" value="' + (layerData.visible ? 1 : 0) + '">');
+        var $layerAgentsFromGroupInput = $('<input class="layer_agents_from_group" type="hidden" name="layers[' + layerId + '][agents_from_group]" value="' + layerData.agentsFromGroup + '">');
+
+        var $layerName = $('<span class="layer_name">' + layerData.name + '</span>');
+        var $sortUpBtn = $('<a class="up_arrow" href="javascript:;" />');
+        var $sortDownBtn = $('<a class="down_arrow" href="javascript:;" />');
         var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images / config.png', true, ['class' => 'invert_filter']); ?></a>');
         var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images / cross.png', true, ['class' => 'invert_filter']); ?></a>');
 
         $sortUpBtn.click(moveLayerRowUpOnClick);
         $sortDownBtn.click(moveLayerRowDownOnClick);
-    $editBtn.click(function () { showLayerEditor(layerId); });
+        $editBtn.click(
+            function () {
+                showLayerEditor(layerId);
+            }
+        );
         $removeBtn.click(removeLayerRowOnClick);
 
-    $nameCol
+        $nameCol.append($layerName).append($layerIdInput).append($layerNameInput).append($layerVisibleInput).append($layerAgentsFromGroupInput);
-        .append($layerName)
-        .append($layerIdInput)
-        .append($layerNameInput)
-        .append($layerVisibleInput)
-        .append($layerAgentsFromGroupInput);
 
         if (layerData.agents && layerData.agents.length > 0) {
-        layerData.agents.forEach(function (agent) {
+            layerData.agents.foreach (function (agent) {
                 $nameCol.append(getLayerAgentIdInput(layerId, agent.id));
                 $nameCol.append(getLayerAgentAliasInput(layerId, agent.id, agent.alias));
-        });
+            }) {
+            }
         }
 
         if (layerData.groups && layerData.groups.length > 0) {
-        layerData.groups.forEach(function (group) {
+            layerData.groups.foreach (function (group) {
                 $nameCol.append(getLayerGroupIdInput(layerId, group.id));
                 $nameCol.append(getLayerGroupNameInput(layerId, group.id, group.name));
                 $nameCol.append(getLayerAgentIdForDataInput(layerId, group.id, group.agentId));
                 $nameCol.append(getLayerAgentAliasForDataInput(layerId, group.id, group.agentAlias));
-        });
+            }) {
+            }
         }
 
-    $sortCol
+        $sortCol.append($sortUpBtn).append($sortDownBtn);
-        .append($sortUpBtn)
+        $editCol.append($editBtn);
-        .append($sortDownBtn);
+        $deleteCol.append($removeBtn);
-    $editCol
-        .append($editBtn);
-    $deleteCol
-        .append($removeBtn);
 
-    $row
+        $row.append($nameCol).append($sortCol).append($editCol).append($deleteCol);
-        .append($nameCol)
-        .append($sortCol)
-        .append($editCol)
-        .append($deleteCol);
 
         return $row;
     }
 
-function addLayerRow (layerId, layerData) {
+
-    $("table#list_layers").append(getLayerRow(layerId, layerData));
+    function addLayerRow(layerId, layerData)
+    {
+        $('table#list_layers').append(getLayerRow(layerId, layerData));
         showLayerEditor(layerId);
     }
 
-function hightlightRow (layerId) {
+
-    var highlightColor = "#E9F3D2";
+    function hightlightRow(layerId)
-    $("tr.layer_row").css("background", "");
+    {
-    $("tr#layer_row_" + layerId).css("background", highlightColor);
+        var highlightColor = '#E9F3D2';
+        $('tr.layer_row').css('background', '');
+        $('tr#layer_row_' + layerId).css('background', highlightColor);
     }
 
-function existInvalidLayerNames () {
+
+    function existInvalidLayerNames()
+    {
         var exist = false;
-    $("table#list_layers input.layer_name").each(function () {
+        $('table#list_layers input.layer_name').each(
+            function () {
                 if ($(this).val().trim().length === 0) {
                     exist = true;
-            return false; // Break jQuery object each
+                    return false;
+                    // Break jQuery object each
                 }
-    });
+            }
+        );
 
         return exist;
     }
 
-function onFormSubmit (event) {
+
+    function onFormSubmit(event)
+    {
         // Validate layer names
         if (existInvalidLayerNames()) {
             event.preventDefault();
@@ -1206,25 +1291,31 @@ function onFormSubmit (event) {
             alert("<?php echo __('Empty layer names are not supported'); ?>");
             return false;
         }
+
         // Save connection list
         $('#map_connection_list').val(connectionMaps.toString());
     }
 
-function onLayerGroupIdChange (event) {
+
+    function onLayerGroupIdChange(event)
+    {
         // Clear agent inputs
-    $("input#hidden-agent_id_for_data").val(0);
+        $('input#hidden-agent_id_for_data').val(0);
-    $("input#text-agent_alias_for_data").val("");
+        $('input#text-agent_alias_for_data').val('');
         toggleAddGroupBtn();
     }
 
+
     // Bind events
-$("form#form_setup").submit(onFormSubmit);
+    $('form#form_setup').submit(onFormSubmit);
-$("input#button-add_agent").click(addAgentClick);
+    $('input#button-add_agent').click(addAgentClick);
-$("select#layer_group_id").change(onLayerGroupIdChange);
+    $('select#layer_group_id').change(onLayerGroupIdChange);
-$("input#button-add_group").click(addGroupClick);
+    $('input#button-add_group').click(addGroupClick);
 
     // Populate layer list
-var layers = <?php echo json_encode($layer_list); ?>;
+    var layers = < ? php echo json_encode($layer_list);
+    ?>
+    ;
 layers.forEach(function (layer) {
     $("table#list_layers").append(
         getLayerRow(layer["id"], {

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -3914,7 +3914,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                 <input id="hidden-id_server" name="id_server" value="" type="hidden">
                                 <?php
                                 // Set autocomplete image.
-                                $autocompleteImage = html_print_image(($config['style'] === 'pandora_black') ? 'images/agent_mc.menu.png' : 'images/search_agent.png', true, false, true);
+                                $autocompleteImage = html_print_image(($config['style'] === 'pandora_black' && !is_metaconsole()) ? 'images/agent_mc.menu.png' : 'images/search_agent.png', true, false, true);
                                 // Params for agent autocomplete input.
                                 $params = [];
                                 $params['show_helptip'] = true;

pandora_console/godmode/setup/setup_ehorus.php

@@ -116,7 +116,7 @@ $table_remote->data['ehorus_test'] = $row;
 // Print.
 echo '<div class="center pdd_b_20px">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     html_print_image('include/ehorus/images/ehorus-logo.png');
 } else {
     html_print_image('include/ehorus/images/ehorus-logo-grey.png');

pandora_console/include/ajax/module.php

@@ -1189,14 +1189,25 @@ if (check_login()) {
 
             $data[8] = ' ';
             if ($module['history_data'] == 1) {
+                $tresholds = true;
+                if (empty((float) $module['min_warning']) === true
+                    && empty((float) $module['max_warning']) === true
+                    && empty($module['warning_inverse']) === true
+                    && empty((float) $module['min_critical']) === true
+                    && empty((float) $module['max_critical']) === true
+                    && empty($module['critical_inverse']) === true
+                ) {
+                    $tresholds = false;
+                }
+
                 $nombre_tipo_modulo = modules_get_moduletype_name($module['id_tipo_modulo']);
                 $handle = 'stat'.$nombre_tipo_modulo.'_'.$module['id_agente_modulo'];
                 $url = 'include/procesos.php?agente='.$module['id_agente_modulo'];
                 $win_handle = dechex(crc32($module['id_agente_modulo'].$module['nombre']));
 
-                // Try to display the SNMP module realtime graph
+                // Try to display the SNMP module realtime graph.
                 $rt_button = get_module_realtime_link_graph($module);
-                if (!empty($rt_button)) {
+                if (empty($rt_button) === false) {
                     $data[8] = $rt_button.'  ';
                 }
 
@@ -1207,6 +1218,19 @@ if (check_login()) {
                     $draw_events = 0;
                 }
 
+                if ($tresholds === true || $graph_type === 'boolean') {
+                    $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&id='.$module['id_agente_modulo'].'&refresh='.SECONDS_10MINUTES.'&'."histogram=1', 'day_".$win_handle."', 800, 480)";
+                    $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image(
+                        'images/histograma.png',
+                        true,
+                        [
+                            'border' => '0',
+                            'alt'    => '',
+                            'class'  => 'invert_filter',
+                        ]
+                    ).'</a> &nbsp;&nbsp;';
+                }
+
                 $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&amp;".'period='.SECONDS_1DAY.'&amp;id='.$module['id_agente_modulo'].'&amp;refresh='.SECONDS_10MINUTES.'&amp;'."draw_events=$draw_events', 'day_".$win_handle."', 800, 480)";
                 if (!is_snapshot_data($module['datos'])) {
                     $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image(
@@ -1349,13 +1373,34 @@ if (check_login()) {
             metaconsole_connect($server);
         }
 
+        if ($params['histogram'] === true) {
+            $params['id_agent_module'] = $params['agent_module_id'];
+            $params['dinamic_proc'] = 1;
+
+            $output .= '<div class="stat_win_histogram">';
+            if ($params['compare'] === 'separated') {
+                $graph = \reporting_module_histogram_graph(
+                    ['datetime' => ($params['begin_date'] - $params['period'])],
+                    $params
+                );
+                $output .= $graph['chart'];
+            }
+
+            $graph = \reporting_module_histogram_graph(
+                ['datetime' => $params['begin_date']],
+                $params
+            );
+            $output .= $graph['chart'];
+            $output .= '</div>';
+        } else {
             $output .= grafico_modulo_sparse($params);
-        echo $output;
+        }
 
         if (is_metaconsole() === true && empty($server_id) === false) {
             metaconsole_restore_db();
         }
 
+        echo $output;
         return;
     }
 

pandora_console/include/class/HTML.class.php

@@ -473,7 +473,7 @@ class HTML
         bool $direct=false
     ) {
         global $config;
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $text_color = 'style="color: white"';
         }
 

pandora_console/include/class/Tree.class.php

@@ -669,15 +669,20 @@ class Tree
         // HTML of the server type image
         $module['serverTypeHTML'] = servers_show_type($module['server_type']);
 
-        // Link to the Module graph
+        // Link to the Module graph.
-        // ACL
+        // ACL.
         $acl_graphs = false;
         $module['showGraphs'] = 0;
 
-        // Avoid the check on the metaconsole. Too slow to show/hide an icon depending on the permissions
+        // Avoid the check on the metaconsole.
-        if (!empty($group_id) && !is_metaconsole()) {
+        // Too slow to show/hide an icon depending on the permissions.
-            $acl_graphs = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR');
+        if (empty($group_id) === false && is_metaconsole() === false) {
-        } else if (!empty($all_groups)) {
+            $acl_graphs = check_acl_one_of_groups(
+                $config['id_user'],
+                $all_groups,
+                'RR'
+            );
+        } else if (empty($all_groups) === false) {
             $acl_graphs = true;
         }
 
@@ -686,8 +691,24 @@ class Tree
         }
 
         if ($module['showGraphs']) {
+            $tresholds = true;
+            if (empty((float) $module['min_warning']) === true
+                && empty((float) $module['max_warning']) === true
+                && empty($module['warning_inverse']) === true
+                && empty((float) $module['min_critical']) === true
+                && empty((float) $module['max_critical']) === true
+                && empty($module['critical_inverse']) === true
+            ) {
+                $tresholds = false;
+            }
+
             $graphType = return_graphtype($module['id_module_type']);
-            $url = ui_get_full_url('operation/agentes/stat_win.php', false, false, false);
+            $url = ui_get_full_url(
+                'operation/agentes/stat_win.php',
+                false,
+                false,
+                false
+            );
             $winHandle = dechex(crc32($module['id'].$module['name']));
 
             $graph_params = [
@@ -697,20 +718,20 @@ class Tree
                 'refresh' => SECONDS_10MINUTES,
             ];
 
-            if (is_metaconsole()) {
+            if (is_metaconsole() === true) {
-                // Set the server id
+                // Set the server id.
                 $graph_params['server'] = $module['serverID'];
             }
 
             $graph_params_str = http_build_query($graph_params);
-            $moduleGraphURL = "$url?$graph_params_str";
+            $moduleGraphURL = $url.'?'.$graph_params_str;
 
             $module['moduleGraph'] = [
                 'url'    => $moduleGraphURL,
                 'handle' => $winHandle,
             ];
 
-            // Info to be able to open the snapshot image new page
+            // Info to be able to open the snapshot image new page.
             $module['snapshot'] = ui_get_snapshot_link(
                 [
                     'id_module'   => $module['id'],
@@ -720,6 +741,16 @@ class Tree
                 ],
                 true
             );
+
+            if ($tresholds === true || $graphType === 'boolean') {
+                $graph_params['histogram'] = 1;
+                $graph_params_str_th = http_build_query($graph_params);
+                $moduleGraphURLTh = $url.'?'.$graph_params_str_th;
+                $module['histogramGraph'] = [
+                    'url'    => $moduleGraphURLTh,
+                    'handle' => $winHandle,
+                ];
+            }
         }
 
         $module_alerts = alerts_get_alerts_agent_module($module['id']);

pandora_console/include/class/TreeService.class.php

@@ -430,6 +430,7 @@ class TreeService extends Tree
                         $tmp['searchChildren'] = 1;
                     } else {
                         $tmp['searchChildren'] = 0;
+                        $tmp['noAcl'] = 1;
                     }
 
                     $tmp['showEventsBtn'] = 1;

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC220125';
+$build_version = 'PC220126';
 $pandora_version = 'v7.0NG.759';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions.php

@@ -4185,6 +4185,9 @@ function generator_chart_to_pdf(
     ) {
         $width_img = 650;
         $height_img = ($params['height'] + 50);
+    } else if ($type_graph_pdf === 'hbar') {
+        $width_img  = ($params['width'] ?? 550);
+        $height_img = $params['height'];
     } else {
         $width_img  = 550;
         $height_img = $params['height'];

pandora_console/include/functions_agents.php

@@ -910,7 +910,11 @@ function agents_process_manage_config($source_id_agent, $destiny_id_agents, $cop
                 [
                     'nombre'   => $module['nombre'],
                     'disabled' => false,
-                ]
+                ],
+                true,
+                true,
+                false,
+                false
             );
 
             // Keep all modules repeated
@@ -1455,7 +1459,8 @@ function agents_get_modules(
     $filter=false,
     $indexed=true,
     $get_not_init_modules=true,
-    $force_tags=false
+    $force_tags=false,
+    $filter_include_sql=true
 ) {
     global $config;
 
@@ -1554,18 +1559,18 @@ function agents_get_modules(
                     }
                 }
 
-                if ($value[0] == '%') {
+                if ($value[0] == '%' && $filter_include_sql === true) {
                     array_push(
                         $fields,
                         $field.' LIKE "'.$value.'"'
                     );
-                } else if ($operatorDistin) {
+                } else if ($operatorDistin && $filter_include_sql === true) {
                     array_push($fields, $field.' <> '.substr($value, 2));
-                } else if (substr($value, -1) == '%') {
+                } else if (substr($value, -1) == '%' && $filter_include_sql === true) {
                     array_push($fields, $field.' LIKE "'.$value.'"');
                 } else if (strncmp($value, '666=666', 7) == 0) {
                     array_push($fields, ' '.$value);
-                } else if (preg_match('/\bin\b/i', $field)) {
+                } else if (preg_match('/\bin\b/i', $field) && $filter_include_sql === true) {
                     array_push($fields, $field.' '.$value);
                 } else {
                     array_push($fields, 'tagente_modulo.'.$field.' = "'.$value.'"');
@@ -3888,7 +3893,7 @@ function agents_get_status_animation($up=true)
     $red = 'images/heartbeat_green.gif';
     $green = 'images/heartbeat_green.gif';
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $red = 'images/heartbeat_green_black.gif';
         $green = 'images/heartbeat_green_black.gif';
     }

pandora_console/include/functions_alerts.php

@@ -2183,6 +2183,7 @@ function get_group_alerts(
     // WHEN SELECT ALL TAGS TO FILTER ALERTS
     if ($action_filter) {
         $filter .= ' AND (talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions where id_alert_action = '.$action_filter.'))';
+        $filter .= ' OR talert_template_modules.id_alert_template IN (SELECT talert_templates.id FROM talert_templates where talert_templates.id_alert_action = '.$action_filter.')';
     }
 
     if (is_array($options)) {

pandora_console/include/functions_api.php

@@ -16590,7 +16590,11 @@ function api_get_user_info($thrash1, $thrash2, $other, $returnType)
 
     $other = json_decode(base64_decode($other['data']), true);
 
-    $sql = 'select * from tusuario where id_user = "'.$other[0]['id_user'].'" and password = "'.$other[0]['password'].'"';
+    $sql = sprintf(
+        'SELECT * FROM tusuario WHERE id_user = "%s" and password = "%s"',
+        mysql_escape_string_sql($other[0]['id_user']),
+        mysql_escape_string_sql($other[0]['password'])
+    );
 
     $user_info = db_get_all_rows_sql($sql);
 

pandora_console/include/functions_graph.php

@@ -1555,7 +1555,7 @@ function graphic_combined_module(
 
     $long_index = '';
 
-    if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null )
+    if (($config['style'] === 'pandora_black' && !is_metaconsole()) && ($params['pdf'] === false || $params['pdf'] === null )
     ) {
         $background_color = '#222';
         $params['legend_color'] = '#fff';

pandora_console/include/functions_html.php

@@ -471,7 +471,7 @@ function html_print_select_groups(
     global $config;
     $select2_css = 'select2.min';
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $select2_css = 'select2_dark.min';
     }
 
@@ -777,11 +777,11 @@ function html_print_select(
 
     if ($style === false) {
         $styleText = ' ';
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $styleText = 'style="color: white"';
         }
     } else {
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $style .= ' color: white';
         }
 
@@ -922,7 +922,7 @@ function html_print_select(
     }
 
     $select2 = 'select2.min';
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $select2 = 'select2_dark.min';
     }
 
@@ -2810,7 +2810,7 @@ function html_print_input_number(array $settings):string
     global $config;
     $text_color = '';
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $text_color = 'style="color: white"';
     }
 
@@ -4287,7 +4287,7 @@ function html_print_autocomplete_modules(
 
     $text_color = '';
     $module_icon = 'images/search_module.png';
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $text_color = 'color: white';
         $module_icon = 'images/brick.menu.png';
     }
@@ -4589,7 +4589,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
 
     enterprise_include_once('include/functions_metaconsole.php');
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $style = 'style="color: white"';
     }
 
@@ -5250,7 +5250,7 @@ function html_print_autocomplete_users_from_integria(
     global $config;
 
     $user_icon = 'images/user_green.png';
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $user_icon = 'images/header_user.png';
     }
 
@@ -5357,7 +5357,7 @@ function html_print_tabs(array $tabs)
 
     $bg_color = '';
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $bg_color = 'style="background-color: #222"';
     }
 
@@ -5459,7 +5459,7 @@ function html_print_select_search(
 
     $select2_css = 'select2.min';
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $select2_css = 'select2_dark.min';
     }
 

pandora_console/include/functions_modules.php

@@ -189,7 +189,11 @@ function modules_copy_agent_module_to_agent($id_agent_module, $id_destiny_agent,
         [
             'nombre'   => $module['nombre'],
             'disabled' => false,
-        ]
+        ],
+        true,
+        true,
+        false,
+        false
     );
 
     // The module already exist in the target
@@ -203,7 +207,11 @@ function modules_copy_agent_module_to_agent($id_agent_module, $id_destiny_agent,
         [
             'nombre'   => $module['nombre'],
             'disabled' => true,
-        ]
+        ],
+        true,
+        true,
+        false,
+        false
     );
 
     // If the module exist but disabled, we enable it

pandora_console/include/functions_reporting.php

@@ -14165,7 +14165,7 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
     if (modules_is_disable_agent($content['id_agent_module'])
         || modules_is_not_init($content['id_agent_module'])
     ) {
-        if ($metaconsole_on) {
+        if ($metaconsole_on && $server_name != '') {
             // Restore db connection.
             metaconsole_restore_db();
         }
@@ -14189,6 +14189,9 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
     if ($modules_is_string === false) {
         if ($agentmodule_info['max_critical'] == 0) {
             $max_value_critical = null;
+            if ((bool) $content['dinamic_proc'] === true) {
+                $max_value_critical = 0.01;
+            }
         } else {
             $max_value_critical = $agentmodule_info['max_critical'];
         }
@@ -14396,6 +14399,7 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
 
     $width_graph  = 100;
     $height_graph = 80;
+    if (empty($array_result) === false) {
         $return['chart'] = flot_slicesbar_graph(
             $array_result,
             $time_total,
@@ -14414,10 +14418,18 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
             true,
             $ttl,
             $content['sizeForTicks'],
-        true
+            true,
+            $report['datetime']
         );
+    } else {
+        $return['chart'] = graph_nodata_image(
+            $width_graph,
+            $height_graph,
+            'area'
+        );
+    }
 
-    if ($metaconsole_on) {
+    if ($metaconsole_on && $server_name != '') {
         // Restore db connection.
         metaconsole_restore_db();
     }

pandora_console/include/functions_reporting_html.php

@@ -122,7 +122,7 @@ function html_do_report_info($report)
 {
     global $config;
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $background_color = '#222';
     } else {
         $background_color = '#f5f5f5';

pandora_console/include/functions_ui.php

@@ -1203,7 +1203,7 @@ function ui_format_alert_row(
 
     $actions = alerts_get_alert_agent_module_actions($alert['id'], false, $alert['server_data']['id']);
 
-    if (empty($actions) === false) {
+    if (empty($actions) === false || $actionDefault != '') {
         $actionText = '<div><ul class="action_list">';
         foreach ($actions as $action) {
             $actionText .= '<div class="mrgn_btn_5px" ><span class="action_name"><li>'.$action['name'];
@@ -1215,9 +1215,9 @@ function ui_format_alert_row(
         }
 
         $actionText .= '</ul></div>';
-    } else {
+
         if ($actionDefault != '') {
-            $actionText = db_get_sql(
+            $actionText .= db_get_sql(
                 sprintf(
                     'SELECT name FROM talert_actions WHERE id = %d',
                     $actionDefault
@@ -4964,7 +4964,7 @@ function ui_print_agent_autocomplete_input($parameters)
     // Default value.
     $icon_agent = 'images/search_agent.png';
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $text_color = 'style="color: white"';
         $icon_agent = 'images/agent_mc.menu.png';
     }
@@ -5820,7 +5820,7 @@ function ui_print_agent_autocomplete_input($parameters)
     $html = '';
 
     $text_color = '';
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $text_color = 'color: white';
     }
 

pandora_console/include/graphs/fgraph.php

@@ -220,7 +220,7 @@ function vbar_graph(
         $options['x']['font']['color'] = '#545454';
         if ($options['pdf'] === true) {
             $options['x']['font']['color'] = '#000';
-        } else if ($config['style'] === 'pandora_black') {
+        } else if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $options['x']['font']['color'] = '#fff';
         }
     }
@@ -238,7 +238,7 @@ function vbar_graph(
     // Grid color axes x.
     if (isset($options['x']['color']) === false) {
         $options['x']['color'] = '#ffffff';
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $options['x']['color'] = '#222';
         }
     }
@@ -305,7 +305,7 @@ function vbar_graph(
         $options['y']['font']['color'] = '#545454';
         if ($options['pdf'] === true) {
             $options['y']['font']['color'] = '#000';
-        } else if ($config['style'] === 'pandora_black') {
+        } else if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $options['y']['font']['color'] = '#fff';
         }
     }
@@ -323,7 +323,7 @@ function vbar_graph(
     // Grid color axes y.
     if (isset($options['y']['color']) === false) {
         $options['y']['color'] = '#ffffff';
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $options['y']['color'] = '#222';
         }
     }
@@ -361,7 +361,7 @@ function vbar_graph(
 
     if (isset($options['grid']['color']) === false) {
         $options['grid']['color'] = '#ffffff';
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $options['grid']['color'] = '#111';
         }
     }
@@ -373,7 +373,7 @@ function vbar_graph(
                 '#ffffff',
             ],
         ];
-        if ($config['style'] === 'pandora_black' && $ttl === 1) {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole() && $ttl === 1) {
             $options['grid']['backgroundColor'] = [
                 'colors' => [
                     '#222',
@@ -746,11 +746,11 @@ function hbar_graph(
         return generator_chart_to_pdf('hbar', $params);
     }
 
-    if ($config['style'] === 'pandora_black' && $ttl === 1) {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole() && $ttl === 1) {
         $backgroundColor = '#222';
     }
 
-    if ($config['style'] === 'pandora_black' && $ttl === 1) {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole() && $ttl === 1) {
         $tick_color = '#fff';
     }
 

pandora_console/include/graphs/functions_d3.php

@@ -202,7 +202,7 @@ function d3_bullet_chart(
     $font = array_shift(explode('.', array_pop(explode('/', $font))));
 
     $invert_color = '';
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $invert_color = 'filter: invert(100%);';
     }
 

pandora_console/include/graphs/functions_flot.php

@@ -146,7 +146,7 @@ function flot_area_graph(
         break;
     }
 
-    if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null) && (isset($is_mobile) === false || $is_mobile === false)
+    if (($config['style'] === 'pandora_black' && !is_metaconsole()) && ($params['pdf'] === false || $params['pdf'] === null) && (isset($is_mobile) === false || $is_mobile === false)
     ) {
         $background_style = '#222';
         $params['grid_color'] = '#fff';
@@ -553,11 +553,6 @@ function flot_hcolumn_chart($graph_data, $width, $height, $water_mark, $font='',
 {
     global $config;
 
-    if ($pdf === true) {
-        $background_color = 'white';
-        $tick_color = '#000';
-    }
-
     // Include_javascript_dependencies_flot_graph().
     $return = '';
 

pandora_console/include/javascript/tree/TreeController.js

@@ -990,6 +990,35 @@ var TreeController = {
                 typeof element.showGraphs != "undefined" &&
                 element.showGraphs != 0
               ) {
+                // Graph histogram pop-up
+                if (typeof element.histogramGraph != "undefined") {
+                  var graphImageHistogram = $(
+                    '<img src="' +
+                      (controller.baseURL.length > 0
+                        ? controller.baseURL
+                        : "") +
+                      'images/histograma.png" /> '
+                  );
+
+                  graphImageHistogram
+                    .addClass("module-graph")
+                    .click(function(e) {
+                      e.stopPropagation();
+                      try {
+                        winopeng_var(
+                          element.histogramGraph.url,
+                          element.histogramGraph.handle,
+                          800,
+                          480
+                        );
+                      } catch (error) {
+                        // console.log(error);
+                      }
+                    });
+
+                  $content.append(graphImageHistogram);
+                }
+
                 // Graph pop-up
                 if (typeof element.moduleGraph != "undefined") {
                   if (element.statusImageHTML.indexOf("data:image") != -1) {
@@ -1183,6 +1212,7 @@ var TreeController = {
             disabled == false
           ) {
             if (element.type == "agent" || element.type == "module") {
+              if (typeof element.noAcl === "undefined") {
                 $content
                   .click(function(e) {
                     _getTreeDetailData(
@@ -1203,6 +1233,7 @@ var TreeController = {
                   .css("cursor", "pointer");
               }
             }
+          }
 
           $node
             .addClass("tree-node")

pandora_console/include/lib/Dashboard/Widget.php

@@ -512,7 +512,7 @@ class Widget
         if (empty($values['background']) === true) {
             $values['background'] = '#ffffff';
 
-            if ($config['style'] === 'pandora_black') {
+            if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
                 $values['background'] = '#222222';
             }
         }

pandora_console/include/lib/Dashboard/Widgets/events_list.php

@@ -750,7 +750,7 @@ class EventsListWidget extends Widget
                 $table->data[$i] = $data;
 
                 $bg_color = 'background: #E8E8E8;';
-                if ($config['style'] === 'pandora_black') {
+                if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
                     $bg_color = 'background: #222;';
                 }
 

pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php

@@ -378,6 +378,8 @@ class GraphModuleHistogramWidget extends Widget
 
         $size = parent::getSize();
 
+        $output = '';
+
         // Desactive scroll bars only this item.
         $id_agent = $this->values['agentId'];
         $id_module = $this->values['moduleId'];

pandora_console/include/lib/Dashboard/Widgets/service_view.php

@@ -318,7 +318,7 @@ class ServiceViewWidget extends Widget
 
             // Css Files.
             \ui_require_css_file('tree', 'include/styles/', true);
-            if ($config['style'] == 'pandora_black') {
+            if ($config['style'] == 'pandora_black' && !is_metaconsole()) {
                 \ui_require_css_file('pandora_black', 'include/styles/', true);
             }
 

pandora_console/include/lib/Dashboard/Widgets/tree_view.php

@@ -542,7 +542,7 @@ class TreeViewWidget extends Widget
 
         // Css Files.
         \ui_require_css_file('tree', 'include/styles/', true);
-        if ($config['style'] == 'pandora_black') {
+        if ($config['style'] == 'pandora_black' && !is_metaconsole()) {
             \ui_require_css_file('pandora_black', 'include/styles/', true);
         }
 

pandora_console/include/styles/pandora.css

@@ -776,6 +776,10 @@ select:-internal-list-box {
 .padding-bottom-4 {
   padding-bottom: 4em;
 }
+
+.padding-bottom-5px {
+  padding-bottom: 5px;
+}
 .padding-right-2 {
   padding-right: 2em;
 }
@@ -8435,6 +8439,16 @@ div.stat-win-spinner img {
   font-size: 12px;
 }
 
+.stat_win_histogram {
+  width: 95%;
+  margin: 0 auto;
+  margin-top: 18%;
+}
+
+#stat-win-module-graph .stat_win_histogram div.nodata_container {
+  width: 100%;
+}
+
 /* For backups dt, can be useful for others */
 #backups_list > thead > tr > th:last-child,
 #backups_list > tbody > tr > td:last-child {

pandora_console/install.php

@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.759';
-            $build = '220125';
+            $build = '220126';
             $banner = "v$version Build $build";
 
             error_reporting(0);

pandora_console/operation/agentes/alerts_status.php

@@ -420,17 +420,17 @@ if ($filter_standby == 'standby_on') {
 if (is_metaconsole() === true) {
     include_once $config['homedir'].'/enterprise/meta/include/functions_alerts_meta.php';
     if ($idAgent != 0) {
-        $alerts['alerts_simple'] = alerts_meta_get_alerts($agents, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user);
+        $alerts['alerts_simple'] = alerts_meta_get_alerts($agents, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter, $action_filter);
 
-        $countAlertsSimple = alerts_meta_get_alerts($agents, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user);
+        $countAlertsSimple = alerts_meta_get_alerts($agents, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter, $action_filter);
     } else {
         $id_groups = array_keys(
             users_get_groups($config['id_user'], 'AR', false)
         );
 
-        $alerts['alerts_simple'] = alerts_meta_get_group_alerts($id_groups, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter);
+        $alerts['alerts_simple'] = alerts_meta_get_group_alerts($id_groups, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter, $action_filter);
 
-        $countAlertsSimple = alerts_meta_get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter);
+        $countAlertsSimple = alerts_meta_get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter, $action_filter);
     }
 } else {
     if ($idAgent != 0) {

pandora_console/operation/agentes/interface_traffic_graph_win.php

@@ -68,7 +68,7 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {
 }
 
 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     ui_require_css_file('pandora_black', 'include/styles/', true);
 }
 

pandora_console/operation/agentes/realtime_win.php

@@ -64,7 +64,7 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {
     $l10n->load_tables();
 }
 
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     ui_require_css_file('pandora_black', 'include/styles/', true);
 }
 
@@ -97,7 +97,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
         ?>
     </head>
     <?php
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     }
     ?>
     <body bgcolor="#ffffff" class='bg_white'>

pandora_console/operation/agentes/snapshot_view.php

@@ -79,7 +79,7 @@ if (!check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')) {
         if ($refresh > 0) {
             $query = ui_get_url_refresh(false);
             echo '<meta http-equiv="refresh" content="'.$refresh.'; URL='.$query.'" />';
-            if ($config['style'] === 'pandora_black') {
+            if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
                 echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css"/>';
             }
         }

pandora_console/operation/agentes/stat_win.php

@@ -67,7 +67,7 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {
 global $config;
 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
 
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css"/>';
 }
 
@@ -194,7 +194,28 @@ ui_print_message_dialog(
         $time_compare_separated = get_parameter('time_compare_separated', 0);
         $time_compare_overlapped = get_parameter('time_compare_overlapped', 0);
         $unknown_graph = get_parameter_checkbox('unknown_graph', 1);
+        $histogram = (bool) get_parameter('histogram', 0);
 
+        // 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->style[2] = 'text-align:left;font-weight: bold;';
+        $table->style[3] = 'text-align:left;';
+        $table->class = 'table_modal_alternate';
+        $table->data = [];
+
+        $time_compare = false;
+
+        if ($time_compare_separated) {
+            $time_compare = 'separated';
+        } else if ($time_compare_overlapped) {
+            $time_compare = 'overlapped';
+        }
+
+        if ($histogram === false) {
             $fullscale_sent = get_parameter('fullscale_sent', 0);
             if (!$fullscale_sent) {
                 if (isset($config['full_scale_option']) === false
@@ -219,14 +240,6 @@ ui_print_message_dialog(
                 ($fullscale === 1) ? 0 : $config['type_mode_graph']
             );
 
-        $time_compare = false;
-
-        if ($time_compare_separated) {
-            $time_compare = 'separated';
-        } else if ($time_compare_overlapped) {
-            $time_compare = 'overlapped';
-        }
-
             if ($zoom > 1) {
                 $height = ($height * ($zoom / 2.1));
                 $width = ($width * ($zoom / 1.4));
@@ -249,17 +262,6 @@ ui_print_message_dialog(
                 $id
             );
 
-        // 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->style[2] = 'text-align:left;font-weight: bold;';
-        $table->style[3] = 'text-align:left;';
-        $table->class = 'table_modal_alternate';
-
-        $table->data = [];
             $table->data[0][0] = __('Refresh time');
             $table->data[0][1] = html_print_extended_select_for_time(
                 'refresh',
@@ -413,6 +415,46 @@ ui_print_message_dialog(
                 true,
                 false
             );
+        } else {
+            $table->data[0][0] = __('Begin date');
+            $table->data[0][1] = html_print_input_text(
+                'start_date',
+                $start_date,
+                '',
+                10,
+                20,
+                true
+            );
+
+            $table->data[0][2] = __('Begin time');
+            $table->data[0][3] = html_print_input_text(
+                'start_time',
+                $start_time,
+                '',
+                10,
+                10,
+                true
+            );
+
+            $table->data[1][0] = __('Time range');
+            $table->data[1][1] = html_print_extended_select_for_time(
+                'period',
+                $period,
+                '',
+                '',
+                0,
+                7,
+                true
+            );
+
+            $table->data[1][2] = __('Time compare (Separated)');
+            $table->data[1][3] = html_print_checkbox_switch(
+                'time_compare_separated',
+                1,
+                (bool) $time_compare_separated,
+                true
+            );
+        }
 
         $form_table = html_print_table($table, true);
         $form_table .= '<div class="w100p right mrgn_top_15px right_align">';
@@ -434,6 +476,8 @@ ui_print_message_dialog(
             $menu_form .= html_print_input_hidden('server', $server_id, true);
         }
 
+        $menu_form .= html_print_input_hidden('histogram', $histogram, true);
+
         if (isset($_GET['type']) === true) {
             $type = get_parameter_get('type');
             $menu_form .= html_print_input_hidden('type', $type, true);
@@ -460,7 +504,13 @@ ui_print_message_dialog(
         );
         $menu_form .= '</span>';
         $menu_form .= '</div>';
-        $menu_form .= '<div class="module_graph_menu_content module_graph_menu_content_closed invisible">';
+
+        $class = 'module_graph_menu_content';
+        if ($histogram === false) {
+            $class .= ' module_graph_menu_content_closed invisible';
+        }
+
+        $menu_form .= '<div class="'.$class.'">';
         $menu_form .= $form_table;
         $menu_form .= '</div>';
         $menu_form .= '</div>';
@@ -497,6 +547,8 @@ ui_print_message_dialog(
             'zoom'            => $zoom,
             'height'          => 300,
             'type_mode_graph' => $type_mode_graph,
+            'histogram'       => $histogram,
+            'begin_date'      => strtotime($start_date.' '.$start_time),
         ];
 
         // Graph.

pandora_console/operation/agentes/status_monitor.php

@@ -1725,6 +1725,17 @@ $table->data[4][0] .= __('Not condition').' '.ui_print_help_tip(__('If you
                     }
 
                     if ($row['history_data'] == 1 && $acl_graphs) {
+                        $tresholds = true;
+                        if (empty((float) $module['min_warning']) === true
+                            && empty((float) $module['max_warning']) === true
+                            && empty($module['warning_inverse']) === true
+                            && empty((float) $module['min_critical']) === true
+                            && empty((float) $module['max_critical']) === true
+                            && empty($module['critical_inverse']) === true
+                        ) {
+                            $tresholds = false;
+                        }
+
                         $graph_type = return_graphtype($row['module_type']);
 
                         $url = ui_get_full_url('operation/agentes/stat_win.php', false, false, false);
@@ -1738,6 +1749,10 @@ $table->data[4][0] .= __('Not condition').' '.ui_print_help_tip(__('If you
                             'refresh' => SECONDS_10MINUTES,
                         ];
 
+                        if ($tresholds === true || $graph_type === 'boolean') {
+                            $graph_params['histogram'] = 1;
+                        }
+
                         if (is_metaconsole() && isset($row['server_id'])) {
                             // Set the server id.
                             $graph_params['server'] = $row['server_id'];
@@ -1749,6 +1764,18 @@ $table->data[4][0] .= __('Not condition').' '.ui_print_help_tip(__('If you
 
                         $data[8] = get_module_realtime_link_graph($row);
 
+                        if ($tresholds === true || $graph_type === 'boolean') {
+                            $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image(
+                                'images/histograma.png',
+                                true,
+                                [
+                                    'border' => '0',
+                                    'alt'    => '',
+                                    'class'  => 'invert_filter',
+                                ]
+                            ).'</a>';
+                        }
+
                         if (!is_snapshot_data($row['datos'])) {
                             $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image('images/chart.png', true, ['border' => '0', 'alt' => '', 'class' => 'invert_filter']).'</a>';
                         }

pandora_console/operation/agentes/tactical.php

@@ -147,7 +147,7 @@ echo '<td class="tactical_left_column" id="leftcolumn">';
 // The status horizontal bars (Global health, Monitor sanity...
 // ---------------------------------------------------------------------
 $bg_color = 'background-color: #222';
-if ($config['style'] !== 'pandora_black') {
+if ($config['style'] !== 'pandora_black' && !is_metaconsole()) {
     $bg_color = 'background-color: #fff';
 }
 

pandora_console/operation/events/sound_events.php

@@ -72,7 +72,7 @@ echo '<title>'.__('Sound Events').'</title>';
 </style>
 <?php
 echo '<link rel="icon" href="../../'.ui_get_favicon().'" type="image/ico" />';
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     echo '<link rel="stylesheet" href="../../include/styles/pandora_black.css" type="text/css" />';
 } else {
     echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />';

pandora_console/operation/incidents/configure_integriaims_incident.php

@@ -225,7 +225,7 @@ $table->data[0][0] .= '<div class="label_select_parent">'.html_print_input_text(
 ).'</div>';
 
 $integria_logo = 'images/integria_logo_gray.png';
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     $integria_logo = 'images/integria_logo.svg';
 }
 

pandora_console/operation/reporting/reporting_viewer.php

@@ -65,6 +65,42 @@ if ($enable_init_date) {
     $period = ($datetime - $datetime_init);
 }
 
+// Shchedule report email.
+$schedule_report = get_parameter('schbutton', '');
+
+if (empty($schedule_report) === false) {
+    $id_user_task = 1;
+    $scheduled = 'no';
+    $date = date(DATE_FORMAT);
+    $time = date(TIME_FORMAT);
+    $parameters[0] = get_parameter('id_schedule_report');
+    $parameters[1] = get_parameter('schedule_email_address');
+    $parameters[2] = get_parameter('schedule_subject', '');
+    $parameters[3] = get_parameter('schedule_email', '');
+    $parameters[4] = get_parameter('report_type', '');
+    $parameters['first_execution'] = strtotime($date.' '.$time);
+
+
+    $values = [
+        'id_usuario'   => $config['id_user'],
+        'id_user_task' => $id_user_task,
+        'args'         => serialize($parameters),
+        'scheduled'    => $scheduled,
+        'flag_delete'  => 1,
+    ];
+
+    $result = db_process_sql_insert('tuser_task_scheduled', $values);
+
+    $report_type = $parameters[4];
+
+    ui_print_result_message(
+        $result,
+        __('Your report has been planned, and the system will email you a '.$report_type.' file with the report as soon as its finished'),
+        __('An error has ocurred')
+    );
+    echo '<br>';
+}
+
 
 // ------------------- INIT HEADER --------------------------------------
 $url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time&pure=$pure";
@@ -249,16 +285,18 @@ if (reporting_get_description($id_report)) {
     $table->data[0][1] = '<div class="float-left">'.reporting_get_name($id_report).'</div>';
 }
 
-$table->data[0][1] .= '<div class="right w100p mrgn_right_50px right_align">'.__('Set initial date').html_print_checkbox('enable_init_date', 1, $enable_init_date, true);
+$table->data[0][1] .= '<div class="flex-content-right">'.__('Set initial date').html_print_checkbox('enable_init_date', 1, $enable_init_date, true).'</br>';
-$html_enterprise = enterprise_hook(
+
-    'reporting_print_button_PDF',
+$html_menu_export = enterprise_hook('reporting_print_button_export');
-    [$id_report]
+if ($html_menu_export === ENTERPRISE_NOT_HOOK) {
-);
+    $html_menu_export = '';
-if ($html_enterprise !== ENTERPRISE_NOT_HOOK) {
-    $table->data[0][1] .= $html_enterprise;
 }
 
+
 $table->data[0][1] .= '</div>';
+$table->data[0][1] .= $html_menu_export;
+
+
 
 $table->data[1][1] = '<div>'.__('From').': </div>';
 $table->data[1][1] .= html_print_input_text('date_init', $date_init, '', 12, 10, true).' ';

pandora_console/operation/search_agents.php

@@ -37,6 +37,7 @@ if (!$agents || !$searchAgents) {
     $table->class = 'databox';
 
     $table->head = [];
+
     if ($only_count) {
         $table->head[0] = __('Agent');
         $table->head[1] = __('Description');
@@ -57,6 +58,18 @@ if (!$agents || !$searchAgents) {
     $table->head[8] = __('Last contact').' '.'<a href="index.php?search_category=agents&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=last_contact&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectLastContactUp]).'</a>'.'<a href="index.php?search_category=agents&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=last_contact&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectLastContactDown]).'</a>';
     $table->head[9] = '';
 
+    $table->headstyle = [];
+    $table->headstyle[0] = 'text-align: left';
+    $table->headstyle[1] = 'text-align: left';
+    $table->headstyle[2] = 'text-align: left';
+    $table->headstyle[3] = 'text-align: left';
+    $table->headstyle[4] = 'text-align: left';
+    $table->headstyle[5] = 'text-align: left';
+    $table->headstyle[6] = 'text-align: left';
+    $table->headstyle[7] = 'text-align: left';
+    $table->headstyle[8] = 'text-align: left';
+    $table->headstyle[9] = 'text-align: center';
+
     $table->align = [];
     $table->align[0] = 'left';
     $table->align[1] = 'left';

pandora_console/operation/search_alerts.php

@@ -42,6 +42,13 @@ if ($alerts === false || $totalAlerts == 0 || !$searchAlerts) {
     $table->align[3] = 'left';
     $table->align[4] = 'left';
 
+    $table->headstyle = [];
+    $table->headstyle[0] = 'text-align: center';
+    $table->headstyle[1] = 'text-align: left';
+    $table->headstyle[2] = 'text-align: left';
+    $table->headstyle[3] = 'text-align: left';
+    $table->headstyle[4] = 'text-align: left';
+
     $table->valign = [];
     $table->valign[0] = 'top';
     $table->valign[1] = 'top';

pandora_console/operation/search_graphs.php

@@ -29,6 +29,10 @@ if ($graphs === false || !$searchGraphs) {
     $table->head[0] = __('Graph name');
     $table->head[1] = __('Description');
 
+    $table->headstyle = [];
+    $table->headstyle[0] = 'text-align: left';
+    $table->headstyle[1] = 'text-align: left';
+
     $table->data = [];
     foreach ($graphs as $graph) {
         array_push(

pandora_console/operation/search_main.php

@@ -32,21 +32,21 @@ $table->id = 'summary';
 $table->width = '98%';
 
 $table->style = [];
-$table->style[0] = 'font-weight: bold; text-align: center;';
+$table->style[0] = 'font-weight: bold; text-align: left;';
-$table->style[1] = 'font-weight: bold; text-align: center;';
+$table->style[1] = 'font-weight: bold; text-align: left;';
-$table->style[2] = 'font-weight: bold; text-align: center;';
+$table->style[2] = 'font-weight: bold; text-align: left;';
-$table->style[3] = 'font-weight: bold; text-align: center;';
+$table->style[3] = 'font-weight: bold; text-align: left;';
-$table->style[4] = 'font-weight: bold; text-align: center;';
+$table->style[4] = 'font-weight: bold; text-align: left;';
-$table->style[5] = 'font-weight: bold; text-align: center;';
+$table->style[5] = 'font-weight: bold; text-align: left;';
-$table->style[6] = 'font-weight: bold; text-align: center;';
+$table->style[6] = 'font-weight: bold; text-align: left;';
-$table->style[7] = 'font-weight: bold; text-align: center;';
+$table->style[7] = 'font-weight: bold; text-align: left;';
-$table->style[8] = 'font-weight: bold; text-align: center;';
+$table->style[8] = 'font-weight: bold; text-align: left;';
-$table->style[9] = 'font-weight: bold; text-align: center;';
+$table->style[9] = 'font-weight: bold; text-align: left;';
-$table->style[10] = 'font-weight: bold; text-align: center;';
+$table->style[10] = 'font-weight: bold; text-align: left;';
-$table->style[11] = 'font-weight: bold; text-align: center;';
+$table->style[11] = 'font-weight: bold; text-align: left;';
-$table->style[13] = 'font-weight: bold; text-align: center;';
+$table->style[13] = 'font-weight: bold; text-align: left;';
-$table->style[14] = 'font-weight: bold; text-align: center;';
+$table->style[14] = 'font-weight: bold; text-align: left;';
-$table->style[15] = 'font-weight: bold; text-align: center;';
+$table->style[15] = 'font-weight: bold; text-align: left;';
 
 
 

pandora_console/operation/search_maps.php

@@ -32,6 +32,13 @@ if ($maps === false || !$searchMaps) {
     $table->align[1] = 'center';
     $table->align[2] = 'center';
 
+    $table->headstyle = [];
+    $table->headstyle[0] = 'text-align: left';
+    $table->headstyle[1] = 'text-align: center';
+    $table->headstyle[1] = 'text-align: center';
+
+
+
     $table->data = [];
     foreach ($maps as $map) {
         array_push(

pandora_console/operation/search_modules.php

@@ -51,6 +51,17 @@ if (!$modules || !$searchModules) {
     $table->align[7] = 'left';
     $table->align[8] = 'left';
 
+    $table->headstyle = [];
+    $table->headstyle[0] = 'text-align: left';
+    $table->headstyle[1] = 'text-align: left';
+    $table->headstyle[2] = 'text-align: left';
+    $table->headstyle[3] = 'text-align: left';
+    $table->headstyle[4] = 'text-align: left';
+    $table->headstyle[5] = 'text-align: left';
+    $table->headstyle[6] = 'text-align: left';
+    $table->headstyle[7] = 'text-align: left';
+    $table->headstyle[8] = 'text-align: left';
+
     $table->data = [];
 
     $id_type_web_content_string = db_get_value(

pandora_console/operation/search_reports.php

@@ -44,6 +44,8 @@ if ($reports === false || !$searchReports) {
     $table->head[3] = __('XML');
     $table->size[0] = '50%';
     $table->size[1] = '20%';
+    $table->headstyle[0] = 'text-align: left';
+    $table->headstyle[1] = 'text-align: left';
     $table->size[2] = '2%';
     $table->headstyle[2] = 'min-width: 35px;text-align: left;';
     $table->size[3] = '2%';

pandora_console/operation/search_users.php

@@ -30,6 +30,14 @@ if (!$users || !$searchUsers) {
     $table->align = [];
     $table->align[4] = 'center';
 
+    $table->headstyle = [];
+    $table->headstyle[0] = 'text-align: left';
+    $table->headstyle[1] = 'text-align: left';
+    $table->headstyle[2] = 'text-align: left';
+    $table->headstyle[3] = 'text-align: left';
+    $table->headstyle[4] = 'text-align: center';
+    $table->headstyle[5] = 'text-align: left';
+
     $table->head = [];
     $table->head[0] = __('User ID').' '.'<a href="index.php?search_category=users&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=id_user&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectUserIDUp]).'</a>'.'<a href="index.php?search_category=users&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=id_user&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectUserIDDown]).'</a>';
     $table->head[1] = __('Name').' '.'<a href="index.php?search_category=users&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=name&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp]).'</a>'.'<a href="index.php?search_category=users&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=name&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown]).'</a>';
@@ -38,6 +46,8 @@ if (!$users || !$searchUsers) {
     $table->head[4] = __('Profile').' '.'<a href="index.php?search_category=users&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=profile&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectProfileUp]).'</a>'.'<a href="index.php?search_category=users&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=profile&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectProfileDown]).'</a>';
     $table->head[5] = __('Description');
 
+
+
     $table->data = [];
 
     foreach ($users as $user) {

pandora_console/operation/users/user_edit.php

@@ -33,7 +33,6 @@ $headerTitle = __('User detail editor');
 require $config['homedir'].'/operation/users/user_edit_header.php';
 
 if (is_metaconsole() === false) {
-    date_default_timezone_set('UTC');
     include 'include/javascript/timezonepicker/includes/parser.inc';
 
     // Read in options for map builder.
@@ -349,7 +348,7 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
 $usr_groups = (users_get_groups($config['id_user'], 'AR', $display_all_group));
 $id_usr = $config['id_user'];
 
-
+$skin = '';
 if (!$meta) {
     $home_screen = '<div class="label_select"><p class="edit_user_labels">'.__('Home screen').ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 to show agent detail view'), true).'</p>';
     $values = [
@@ -395,10 +394,7 @@ if (!$meta) {
     $home_screen .= '</div>';
     $home_screen .= html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true, false);
 
-
-
     // User only can change skins if has more than one group.
-    $skin = '';
     if (function_exists('skins_print_select')) {
         if (count($usr_groups) > 1) {
             $skin = '<div class="label_select"><p class="edit_user_labels">'.__('Skin').': </p>';
@@ -407,7 +403,16 @@ if (!$meta) {
     }
 } else {
     $home_screen = '';
-    $skin = '';
+    // User only can change skins if has more than one group.
+    if (function_exists('skins_print_select')) {
+        if (count($usr_groups) > 1) {
+            $skin = '<div class="label_select"><p class="edit_user_labels">'.__('Skin').ui_print_help_tip(
+                __('This change will only apply to nodes'),
+                true
+            ).'</p>';
+            $skin .= skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'</div>';
+        }
+    }
 }
 
 $timezone = '<div class="label_select"><p class="edit_user_labels">'.__('Timezone').ui_print_help_tip(__('The timezone must be that of the associated server.'), true).'</p>';

pandora_console/operation/visual_console/public_view.php

@@ -97,7 +97,7 @@ $visualConsoleData = $visualConsole->toArray();
 $visualConsoleName = $visualConsoleData['name'];
 
 $bg_color = '';
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     $bg_color = 'style="background-color: #222"';
 }
 

pandora_console/operation/visual_console/view.php

@@ -269,7 +269,7 @@ if ($pure === false) {
         $class_basic_chart = 'basic_chart_min link-create-item';
         $class_delete = 'delete_item delete_min';
         $class_copy = 'copy_item';
-        if ($config['style'] === 'pandora_black') {
+        if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
             $class_camera = 'camera_min_white link-create-item';
             $class_percentile = 'percentile_item_min_white link-create-item';
             $class_module_graph = 'graph_min_white link-create-item';
@@ -417,7 +417,7 @@ if ($pure === false) {
 }
 
 $bg_color = '';
-if ($config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     $bg_color = 'style="background-color: #222"';
 }
 

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.759
-%define release     220125
+%define release     220126
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.759
-%define release     220125
+%define release     220126
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.759
-%define release     220125
+%define release     220126
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/views/dashboard/cell.php

@@ -78,11 +78,12 @@ if (empty($options['background']) === true) {
         $options['background'] = '#ffffff';
     }
 
-    if ($config['style'] === 'pandora_black') {
+    if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
         $options['background'] = '#222222';
     }
 } else if ($options['background'] === '#ffffff'
     && $config['style'] === 'pandora_black'
+    && !is_metaconsole()
 ) {
     $options['background'] = '#222222';
 } else if ($options['background'] === '#222222'

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.759-220125
+Version: 7.0NG.759-220126
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.759-220125"
+pandora_version="7.0NG.759-220126"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.759";
-my $pandora_build = "220125";
+my $pandora_build = "220126";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/Core.pm

@@ -982,14 +982,17 @@ sub pandora_execute_alert ($$$$$$$$$;$$) {
 		$threshold = $action->{'action_threshold'} if (defined ($action->{'action_threshold'}) && $action->{'action_threshold'} > 0);
 		$threshold = $action->{'module_action_threshold'} if (defined ($action->{'module_action_threshold'}) && $action->{'module_action_threshold'} > 0);
 		if (time () >= ($action->{'last_execution'} + $threshold)) {
+			my $monitoring_event_custom_data = '';
+
+			push(@{$custom_data->{'actions'}}, safe_output($action->{'action_name'}));
 
 			# Does the action generate an event?
 			if (safe_output($action->{'name'}) eq "Monitoring Event") {
 				$event_generated = 1;
+				$monitoring_event_custom_data = $custom_data;
 			}
 
-			pandora_execute_action ($pa_config, $data, $agent, $alert, $alert_mode, $action, $module, $dbh, $timestamp, $extra_macros);
+			pandora_execute_action ($pa_config, $data, $agent, $alert, $alert_mode, $action, $module, $dbh, $timestamp, $extra_macros, $monitoring_event_custom_data);
-			push(@{$custom_data->{'actions'}}, safe_output($action->{'action_name'}));
 		} else {
 			if (defined ($module)) {
 				logger ($pa_config, "Skipping action " . safe_output($action->{'name'}) . " for alert '" . safe_output($alert->{'name'}) . "' module '" . safe_output($module->{'nombre'}) . "'.", 10);
@@ -1082,9 +1085,9 @@ Execute the given action.
 
 =cut
 ##########################################################################
-sub pandora_execute_action ($$$$$$$$$;$) {
+sub pandora_execute_action ($$$$$$$$$;$$) {
 	my ($pa_config, $data, $agent, $alert,
-		$alert_mode, $action, $module, $dbh, $timestamp, $extra_macros) = @_;
+		$alert_mode, $action, $module, $dbh, $timestamp, $extra_macros, $custom_data) = @_;
 
 	logger($pa_config, "Executing action '" . safe_output($action->{'name'}) . "' for alert '". safe_output($alert->{'name'}) . "' agent '" . (defined ($agent) ? safe_output($agent->{'nombre'}) : 'N/A') . "'.", 10);
 
@@ -1660,7 +1663,12 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				'',
 				$comment,
 				$id_extra,
-			$tags);
+				$tags,
+				'',
+				'',
+				'',
+				p_encode_json($pa_config, $custom_data)
+			);
 			# Validate event (field1: agent name; field2: module name)
 		}
 	} elsif ($clean_name eq "Validate Event") {

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.759";
-my $pandora_build = "220125";
+my $pandora_build = "220126";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.759
-%define release     220125
+%define release     220126
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.759
-%define release     220125
+%define release     220126
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.759"
-PI_BUILD="220125"
+PI_BUILD="220126"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.759 Build 220125";
+my $version = "7.0NG.759 Build 220126";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.759 Build 220125";
+my $version = "7.0NG.759 Build 220126";
 
 # save program name for logging
 my $progname = basename($0);