Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.769-230324
+Version: 7.0NG.769-230327
 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.769-230324"
+pandora_version="7.0NG.769-230327"
 
 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

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

pandora_agents/unix/pandora_agent.redhat.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230324
+%define release     230327
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230324
+%define release     230327
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230324"
+PI_BUILD="230327"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230324}
+{230327}
 
 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.769 Build 230324")
+#define PANDORA_VERSION ("7.0NG.769 Build 230327")
 
 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.769(Build 230324))"
+      VALUE "ProductVersion", "(7.0NG.769(Build 230327))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.769-230324
+Version: 7.0NG.769-230327
 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.769-230324"
+pandora_version="7.0NG.769-230327"
 
 package_pear=0
 package_pandora=1

pandora_console/godmode/agentes/agent_manager.php

@@ -966,9 +966,9 @@ foreach ($fields as $field) {
             $link_url = '';
         }
 
-        $data_field[1] = '<span style="line-height: 3.5;">'.__('Link text:').'</span>';
+        $customContent = '<span style="line-height: 3.5;">'.__('Link text:').'</span>';
-        $data_field[1] .= '<br>';
+        $customContent .= '<br>';
-        $data_field[1] .= html_print_textarea(
+        $customContent .= html_print_textarea(
             'customvalue_'.$field['id_field'].'[]',
             2,
             1000,
@@ -976,10 +976,10 @@ foreach ($fields as $field) {
             'class="min-height-30px w100p"',
             true
         );
-        $data_field[1] .= '<br>';
+        $customContent .= '<br>';
-        $data_field[1] .= '<span style="line-height: 3.5;">'.__('Link URL:').'</span>';
+        $customContent .= '<span style="line-height: 3.5;">'.__('Link URL:').'</span>';
-        $data_field[1] .= '<br>';
+        $customContent .= '<br>';
-        $data_field[1] .= html_print_textarea(
+        $customContent .= html_print_textarea(
             'customvalue_'.$field['id_field'].'[]',
             2,
             1000,

pandora_console/godmode/agentes/configure_field.php

@@ -229,7 +229,6 @@ echo '</form>';
 <script>
 $(document).ready (function () {
     if($('input[type=hidden][name=update_field]').val() == 1 && $('#textarea_combo_values').val() != ''){
-        console.log('entra2');
         $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
         $('#configure_field-3').show();
 
@@ -250,7 +249,6 @@ $(document).ready (function () {
             }
         });
     } else {
-        console.log('entra');
         $('#configure_field-3').hide();
     }
    
@@ -261,17 +259,19 @@ $(document).ready (function () {
     }
 
     $('input[type=checkbox][name=is_link_enabled]').change(function () {
-        if( $(this).is(":checked") ){
+        if( $('input[type=checkbox][name=is_link_enabled]').prop('checked') ){
             $('#configure_field-2').hide();
             $('#configure_field-3').hide();
         } else{
             $('#configure_field-2').show();
-            $('#configure_field-3').show();
+            if($('input[type=checkbox][name=is_combo_enable]').prop('checked') === true) {
+                $('#configure_field-3').show();
+            }
         }
     });
     
     $('input[type=checkbox][name=is_combo_enable]').change(function () {
-        if( $(this).is(":checked") ){
+        if( $('input[type=checkbox][name=is_combo_enable]').prop('checked') ){
           $('#configure_field-3').show();
           dialog_message("#message_no_set_password");
           $('#configure_field-1').hide();
@@ -282,12 +282,14 @@ $(document).ready (function () {
         }
     });
     $('input[type=checkbox][name=is_password_type]').change(function () {
-        if( $(this).is(":checked")){
+        if( $('input[type=checkbox][name=is_password_type]').prop('checked')){
             dialog_message("#message_no_set_combo");
             $('#configure_field-3').hide();
         }
         else{
-            $('#configure_field-3').show();
+            if($('input[type=checkbox][name=is_combo_enable]').prop('checked') === true) {
+                $('#configure_field-3').show();
+            }
         }
     });
 });

pandora_console/godmode/alerts/alert_list.builder.php

@@ -187,7 +187,7 @@ $table->data[2][0] = html_print_label_input_block(
 );
 
 if (isset($step) === false) {
-    echo '<form class="add_alert_form max_floating_element_size" method="post">';
+    echo '<form id="form_alerts" class="add_alert_form max_floating_element_size" method="post">';
     html_print_table($table);
 }
 
@@ -216,6 +216,26 @@ if (isset($step) === false) {
         true
     );
 
+    if ($_GET['sec2'] === 'operation/cluster/cluster') {
+        html_print_div(
+            [
+                'content' => html_print_submit_button(
+                    __('Add alert'),
+                    'add',
+                    false,
+                    [
+                        'icon' => 'wand',
+                        'form' => 'form_alerts',
+                        'mode' => 'secondary',
+                    ],
+                    true
+                ),
+                'style'   => 'display:none',
+                'id'      => 'add_alert_div',
+            ]
+        );
+    }
+
     html_print_action_buttons($actionButtons, ['right_content' => $pagination]);
 
     html_print_input_hidden('create_alert', 1);

pandora_console/godmode/alerts/alert_list.php

@@ -497,45 +497,47 @@ if (is_metaconsole() === false) {
         $buttons = '';
     }
 
-    if ($tab !== 'alert') {
+    if ($_GET['sec2'] !== 'operation/cluster/cluster') {
-        if ($tab === 'list') {
+        if ($tab !== 'alert') {
-            ui_print_standard_header(
+            if ($tab === 'list') {
-                __('Alerts'),
+                ui_print_standard_header(
-                'images/gm_alerts.png',
+                    __('Alerts'),
-                false,
+                    'images/gm_alerts.png',
-                '',
+                    false,
-                true,
+                    '',
-                $buttons,
+                    true,
-                [
+                    $buttons,
                     [
-                        'link'  => '',
+                        [
-                        'label' => __('Manage alerts'),
+                            'link'  => '',
-                    ],
+                            'label' => __('Manage alerts'),
+                        ],
+                        [
+                            'link'  => '',
+                            'label' => __('List'),
+                        ],
+                    ]
+                );
+            } else {
+                ui_print_standard_header(
+                    __('Alerts'),
+                    'images/gm_alerts.png',
+                    false,
+                    '',
+                    true,
+                    $buttons,
                     [
-                        'link'  => '',
+                        [
-                        'label' => __('List'),
+                            'link'  => '',
-                    ],
+                            'label' => __('Manage alerts'),
-                ]
+                        ],
-            );
+                        [
-        } else {
+                            'link'  => '',
-            ui_print_standard_header(
+                            'label' => __('Create'),
-                __('Alerts'),
+                        ],
-                'images/gm_alerts.png',
+                    ]
-                false,
+                );
-                '',
+            }
-                true,
-                $buttons,
-                [
-                    [
-                        'link'  => '',
-                        'label' => __('Manage alerts'),
-                    ],
-                    [
-                        'link'  => '',
-                        'label' => __('Create'),
-                    ],
-                ]
-            );
         }
     }
 } else {

pandora_console/godmode/gis_maps/configure_gis_map.php

@@ -84,7 +84,7 @@ $buttons['gis_maps_list'] = [
         true,
         [
             'title' => __('GIS Maps list'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>',
 ];
@@ -96,19 +96,30 @@ if ($idMap) {
             true,
             [
                 'title' => __('View GIS'),
-                'class' => 'invert_filter',
+                'class' => 'invert_filter main_menu_icon',
             ]
         ).'</a>',
     ];
 }
 
-ui_print_page_header(
+// Header.
+ui_print_standard_header(
     __('GIS Maps builder'),
     'images/gm_gis.png',
     false,
     'configure_gis_map_edit',
-    true,
+    false,
-    $buttons
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Topology maps'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('GIS Maps'),
+        ],
+    ]
 );
 
 switch ($action) {
@@ -480,7 +491,7 @@ $table->data[1][1] = "<table  class='no-class' border='0' id='map_connection'>
 			<a href='javascript: addConnectionMap();'>".html_print_image(
             'images/add.png',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'invert_filter main_menu_icon']
 )."</a>
 			<input type='hidden' name='map_connection_list' value='' id='map_connection_list' />
 			<input type='hidden' name='layer_list' value='' id='layer_list' />
@@ -583,7 +594,7 @@ $table->data[1][1] = '<div id="form_layer" class="invisible">
 
 
 
-$table->data[1][1] .= html_print_button(__('Add agent'), 'add_agent', true, '', 'class="sub add"', true);
+$table->data[1][1] .= html_print_button(__('Add agent'), 'add_agent', true, '', ['mode' => 'secondary', 'icon' => 'next'], true);
 
 $params = [];
 $params['return'] = true;
@@ -628,7 +639,7 @@ $params['javascript_is_function_select'] = true;
 // Filter by group.
 $params['disabled_javascript_on_blur_function'] = false;
 $agent_for_group_input = ui_print_agent_autocomplete_input($params);
-$add_group_btn = html_print_button(__('Add'), 'add_group', true, '', 'class="sub add"', true);
+$add_group_btn = html_print_button(__('Add'), 'add_group', true, '', ['mode' => 'secondary', 'icon' => 'next'], true);
 
 $table->data[1][1] .= '<tr><td colspan="4"><hr /></td></tr>
 			<tr>
@@ -660,21 +671,19 @@ $table->data[1][1] .= '<tr>
 
 html_print_table($table);
 
-
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
 switch ($action) {
     case 'save_new':
     case 'edit_map':
     case 'update_saved':
         if (empty($invalidFields) === true) {
-            html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
+            $action_button = html_print_submit_button(_('Save map'), 'save_button', false, ['mode' => 'primary', 'icon' => 'next'], true);
         } else {
-            html_print_submit_button(_('Update map'), 'update_button', false, 'class="sub upd"');
+            $action_button = html_print_submit_button(_('Update map'), 'update_button', false, ['mode' => 'primary', 'icon' => 'next'], true);
         }
     break;
 
     case 'new_map':
-        html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
+        $action_button = html_print_submit_button(_('Save map'), 'save_button', false, ['mode' => 'primary', 'icon' => 'next'], true);
     break;
 
     default:
@@ -682,7 +691,10 @@ switch ($action) {
     break;
 }
 
-echo '</div>';
+html_print_action_buttons(
+    $action_button,
+    ['type' => 'form_action']
+);
 
 echo '</form>';
 
@@ -702,7 +714,7 @@ echo '</form>';
                 false,
                 [
                     'alt'   => '',
-                    'class' => 'invert_filter',
+                    'class' => 'invert_filter main_menu_icon',
                 ]
             );
             ?>
@@ -899,7 +911,7 @@ function setLayerEditorData (data) {
     var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
     var $layerFormAgentsFromGroupSelect = $("#layer_group_form");
     var $layerFormAgentInput = $("input#text-agent_alias");
-    var $layerFormAgentButton = $("input#button-add_agent");
+    var $layerFormAgentButton = $("button#button-add_agent");
     var $layerFormAgentsListItems = $("tr.agents_list_item");
     var $layerFormGroupsListItems = $("tr.groups_list_item");
 
@@ -1005,7 +1017,7 @@ function getAgentRow (layerId, agentId, agentAlias) {
     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/delete.svg', false, ['class' => 'invert_filter']); ?> </a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/delete.svg', false, ['class' => 'invert_filter main_menu_icon']); ?> </a>');
 
     $removeBtn.click(function (event) {
         var $layerRow = $("tr#layer_row_" + layerId);
@@ -1061,7 +1073,7 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
         + "<i>" + agentAlias + "</i>"
         + ")"
         + "</span>");
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']); ?></a>');
 
     $removeBtn.click(function (event) {
         var $layerRow = $("tr#layer_row_" + layerId);
@@ -1139,8 +1151,8 @@ function getLayerRow (layerId, layerData) {
     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/edit.svg', true, ['class' => 'invert_filter']); ?></a>');
+    var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/edit.svg', true, ['class' => 'invert_filter main_menu_icon']); ?></a>');
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']); ?></a>');
 
     $sortUpBtn.click(moveLayerRowUpOnClick);
     $sortDownBtn.click(moveLayerRowDownOnClick);
@@ -1231,9 +1243,9 @@ function onLayerGroupIdChange (event) {
 
 // Bind events
 $("form#form_setup").submit(onFormSubmit);
-$("input#button-add_agent").click(addAgentClick);
+$("button#button-add_agent").click(addAgentClick);
 $("select#layer_group_id").change(onLayerGroupIdChange);
-$("input#button-add_group").click(addGroupClick);
+$("button#button-add_group").click(addGroupClick);
 
 // Populate layer list
 var layers = <?php echo json_encode($layer_list); ?>;

pandora_console/godmode/groups/configure_group.php

@@ -118,7 +118,7 @@ if (is_metaconsole() === true) {
 
 
 // Data before table.
-$files = list_files('images/', '@groups.svg', 1, 0);
+$files = list_files(((is_metaconsole() === true) ? '../../' : '').'images/', '@groups.svg', 1, 0);
 
 $table = new stdClass();
 $table->width = '100%';

pandora_console/godmode/massive/massive_add_action_alerts.php

@@ -270,7 +270,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json);
 
 echo "<input type='hidden' id='hidden-agents_with_templates' value='$agents_with_templates_json'>";
 
-attachActionButton('add', 'create', $table->width);
+attachActionButton('add', 'create', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_add_alerts.php

@@ -293,7 +293,7 @@ $table->data[2][3] = '';
 echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=add_alerts">';
 html_print_table($table);
 
-attachActionButton('add', 'add', $table->width);
+attachActionButton('add', 'add', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_add_profiles.php

@@ -295,7 +295,7 @@ array_push($table->data, $data);
 
 html_print_table($table);
 
-attachActionButton('create_profiles', 'update', $table->width);
+attachActionButton('create_profiles', 'update', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_copy_modules.php

@@ -310,7 +310,7 @@ echo '<legend><span>'.__('To agent(s)').'</span></legend>';
 html_print_table($table);
 echo '</fieldset>';
 
-attachActionButton('do_operation', 'copy', $table->width);
+attachActionButton('do_operation', 'copy', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_delete_action_alerts.php

@@ -298,7 +298,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json);
 
 echo "<input type='hidden' id='hidden-agents_with_templates' value='".$agents_with_templates_json."'>";
 
-attachActionButton('delete', 'delete', $table->width);
+attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_delete_agents.php

@@ -188,7 +188,7 @@ $params = [
 echo get_table_inputs_masive_agents($params);
 
 if (is_metaconsole() === true || is_management_allowed() === true) {
-    attachActionButton('delete', 'delete', '100%');
+    attachActionButton('delete', 'delete', '100%', false, $SelectAction);
 }
 
 echo '</form>';

pandora_console/godmode/massive/massive_delete_alerts.php

@@ -358,7 +358,7 @@ $table->data[2][3] = html_print_select([], 'module[]', '', false, '', '', true,
 echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_alerts" >';
 html_print_table($table);
 
-attachActionButton('delete', 'delete', $table->width);
+attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_delete_modules.php

@@ -583,7 +583,7 @@ $table->data['form_agents_3'][3] = html_print_select(
 echo '<form method="post" id="form_modules" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_modules" >';
 html_print_table($table);
 
-attachActionButton('delete', 'delete', $table->width);
+attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_delete_profiles.php

@@ -246,7 +246,7 @@ array_push($table->data, $data);
 
 html_print_table($table);
 
-attachActionButton('delete_profiles', 'delete', $table->width);
+attachActionButton('delete_profiles', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_edit_agents.php

@@ -1257,7 +1257,7 @@ echo '<h3 class="error invisible" id="message"> </h3>';
 
 html_print_input_hidden('id_agente', $id_agente);
 
-attachActionButton('update_agents', 'update', $table->width);
+attachActionButton('update_agents', 'update', $table->width, false, $SelectAction);
 
 // Shown and hide div.
 echo '</div></form>';

pandora_console/godmode/massive/massive_edit_modules.php

@@ -1265,7 +1265,7 @@ $table->data['edit1'][1] = '<table width="100%">';
             echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_modules" id="form_edit">';
             html_print_table($table);
 
-            attachActionButton('update', 'update', $table->width);
+            attachActionButton('update', 'update', $table->width, false, $SelectAction);
 
             echo '</form>';
 

pandora_console/godmode/massive/massive_edit_plugins.php

@@ -391,7 +391,7 @@ echo '<form method="POST" id="form-massive_plugin_edition"
 
 html_print_table($table);
 
-attachActionButton('update', 'update', $table->width);
+attachActionButton('update', 'update', $table->width, false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_edit_users.php

@@ -556,7 +556,7 @@ echo sprintf(
 );
 echo '</div>';
 
-attachActionButton('edit_users', 'update', '100%');
+attachActionButton('edit_users', 'update', '100%', false, $SelectAction);
 
 echo '</form>';
 

pandora_console/godmode/massive/massive_operations.php

@@ -220,7 +220,7 @@ $alertstab = [
         true,
         [
             'title' => __('Alerts operations'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>',
     'active' => $tab == 'massive_alerts',
@@ -232,7 +232,7 @@ $userstab = [
         true,
         [
             'title' => __('Users operations'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>',
     'active' => $tab == 'massive_users',
@@ -244,7 +244,7 @@ $agentstab = [
         true,
         [
             'title' => __('Agents operations'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>',
     'active' => $tab == 'massive_agents',
@@ -256,7 +256,7 @@ $modulestab = [
         true,
         [
             'title' => __('Modules operations'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>',
     'active' => $tab == 'massive_modules',
@@ -268,7 +268,7 @@ $pluginstab = [
         true,
         [
             'title' => __('Plugins operations'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>',
     'active' => $tab == 'massive_plugins',
@@ -308,34 +308,58 @@ $onheader['services'] = $servicestab;
 
 
 // Header.
-ui_print_standard_header(
+if (is_metaconsole() === false) {
-    __('Bulk operations').' - '.$options[$option],
+    ui_print_standard_header(
-    'images/gm_massive_operations.png',
+        __('Bulk operations').' - '.$options[$option],
-    false,
+        'images/gm_massive_operations.png',
-    $help_header,
+        false,
-    false,
+        $help_header,
-    [
+        false,
-        $agentstab,
-        $modulestab,
-        $pluginstab,
-        $userstab,
-        $alertstab,
-        $policiestab,
-        $snmptab,
-        $satellitetab,
-        $servicestab,
-    ],
-    [
         [
-            'link'  => '',
+            $agentstab,
-            'label' => __('Configuration'),
+            $modulestab,
+            $pluginstab,
+            $userstab,
+            $alertstab,
+            $policiestab,
+            $snmptab,
+            $satellitetab,
+            $servicestab,
         ],
         [
-            'link'  => '',
+            [
-            'label' => __('Bulk operations'),
+                'link'  => '',
+                'label' => __('Configuration'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Bulk operations'),
+            ],
+        ]
+    );
+} else {
+    ui_print_standard_header(
+        __('Bulk operations').' - '.$options[$option],
+        'images/gm_massive_operations.png',
+        false,
+        $help_header,
+        false,
+        [
+            $userstab,
+            $agentstab,
         ],
-    ]
+        [
-);
+            [
+                'link'  => '',
+                'label' => __('Configuration'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Bulk operations'),
+            ],
+        ]
+    );
+}
 
 
 // Checks if the PHP configuration is correctly.
@@ -419,29 +443,26 @@ if (is_management_allowed() === false) {
     );
 }
 
-echo '<br />';
+$tip = '';
-echo '<form method="post" id="form_options" action="'.$url.'">';
+if ($option === 'edit_agents' || $option === 'edit_modules') {
-echo '<table border="0"><tr><td>';
+    $tip = ui_print_help_tip(__('The blank fields will not be updated'), true);
-echo __('Action');
+}
-echo '</td><td>';
+
-html_print_select(
+$SelectAction = '<form method="post" id="form_options" action="'.$url.'">';
+$SelectAction .= '<span class="mrgn_lft_10px mrgn_right_10px">'._('Action').'</span>';
+$SelectAction .= html_print_select(
     $options,
     'option',
     $option,
     'this.form.submit()',
     '',
     0,
-    false,
+    true,
     false,
     false
-);
+).$tip;
-if ($option === 'edit_agents' || $option === 'edit_modules') {
-    ui_print_help_tip(__('The blank fields will not be updated'));
-}
 
-echo '</td></tr></table>';
+$SelectAction .= '</form>';
-echo '</form>';
-echo '<br />';
 
 switch ($option) {
     case 'delete_alerts':

pandora_console/godmode/setup/gis_step_2.php

@@ -50,13 +50,23 @@ echo '<form action="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2" method="
 switch ($action) {
     case 'create_connection_map':
         // Header.
-        ui_print_page_header(
+        ui_print_standard_header(
             __('Create new map connection'),
             '',
             false,
             'map_connection_tab',
             true,
-            $buttons
+            $buttons,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Setup'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Setup').' - '.__('Gis'),
+                ],
+            ]
         );
 
         $mapConnection_name = '';
@@ -77,13 +87,23 @@ switch ($action) {
 
     case 'edit_connection_map':
         // Header.
-        ui_print_page_header(
+        ui_print_standard_header(
             __('Edit map connection'),
             '',
             false,
             'map_connection_tab',
             true,
-            $buttons
+            $buttons,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Setup'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Setup').' - '.__('Gis'),
+                ],
+            ]
         );
 
         $idConnectionMap = get_parameter('id_connection_map');

pandora_console/godmode/setup/news.php

@@ -25,8 +25,25 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
     exit;
 }
 
-// Header
+// Header.
-ui_print_page_header(__('Site news management'), '', false, '', true);
+ui_print_standard_header(
+    __('Site news management'),
+    'images/custom_field.png',
+    false,
+    '',
+    true,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Admin tools'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Site news'),
+        ],
+    ]
+);
 
 
 

pandora_console/include/ajax/module.php

@@ -1279,16 +1279,18 @@ if (check_login()) {
                     if ((int) $module['flag'] === 0) {
                         $additionalLinkAction = '&flag=1';
                         $linkCaption = __('Force checks');
+                        $imgaction = 'images/target.png';
                     } else {
                         $additionalLinkAction = '';
                         $linkCaption = __('Refresh');
+                        $imgaction = 'images/go-back@svg.svg';
                     }
 
                     $moduleActionButtons[] = html_print_anchor(
                         [
-                            'href'    => 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&id_agente_modulo='.$module['id_agente_modulo'].'&refr=60'.$addedLinkParams.'"',
+                            'href'    => 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&id_agente_modulo='.$module['id_agente_modulo'].'&refr=60'.$additionalLinkAction.'"',
                             'content' => html_print_image(
-                                'images/go-back@svg.svg',
+                                $imgaction,
                                 true,
                                 [ 'class' => 'main_menu_icon' ]
                             ),

pandora_console/include/config_process.php

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

pandora_console/include/functions_cron.php

@@ -489,10 +489,8 @@ function cron_list_table()
     }
 
     if ($defined_tasks !== false) {
-        echo '<h2>'.__('Scheduled jobs').'</h2>';
-
         $table = new stdClass();
-        $table->class = 'databox data';
+        $table->class = 'info_table';
         $table->width = '100%';
         $table->data = [];
         $table->head = [];
@@ -912,8 +910,7 @@ function cron_list_table()
 
             if ($function_name == 'cron_task_do_backup' || $function_name == 'cron_task_execute_custom_script') {
                 if ($manage_pandora) {
-                    $data[7]  = '<a href="'.$url;
+                    $data[7]  = '<a href="javascript:form_add_cron_task('.$task['id'].',1);">';
-                    $data[7] .= 'edit_task=1&id='.$task['id'].'">';
                     $data[7] .= html_print_image(
                         'images/edit.svg',
                         true,
@@ -926,8 +923,7 @@ function cron_list_table()
                 }
 
                 if ($manage_pandora) {
-                    $data[7] .= '<a href="'.$url;
+                    $data[7] .= '<a href="javascript:form_add_cron_task('.$task['id'].',1);">';
-                    $data[7] .= 'delete_task=1&id_user_task='.$task['id'].'">';
                     $data[7] .= html_print_image(
                         'images/delete.svg',
                         true,
@@ -940,8 +936,7 @@ function cron_list_table()
                 }
             } else {
                 if ($write_perms || $manage_pandora) {
-                    $data[7] = '<a href="'.$url;
+                    $data[7] = '<a href="javascript:form_add_cron_task('.$task['id'].',1);">';
-                    $data[7] .= 'edit_task=1&id='.$task['id'].'">';
                     $data[7] .= html_print_image(
                         'images/edit.svg',
                         true,
@@ -994,5 +989,7 @@ function cron_list_table()
         }
 
         html_print_table($table);
+    } else {
+        ui_print_info_message(['no_close' => true, 'message' => __('There are no jobs') ]);
     }
 }

pandora_console/include/functions_massive_operations.php

@@ -43,7 +43,8 @@ function attachActionButton(
     string $action,
     string $buttonAction,
     string $tableWidth,
-    bool $return=false
+    bool $return=false,
+    string $SelectAction=''
 ) {
     switch ($buttonAction) {
         case 'add':
@@ -88,7 +89,7 @@ function attachActionButton(
             ['icon' => $class],
             true
         ),
-        [],
+        ['right_content' => $SelectAction],
         $return
     );
 }

pandora_console/include/functions_menu.php

@@ -68,6 +68,19 @@ function menu_print_menu(&$menu)
         $sec2 = 'godmode/alerts/alert_commands';
     } else if ($sec2 === 'enterprise/godmode/setup/edit_skin') {
         $sec2 = 'enterprise/godmode/setup/setup_skins';
+    } else if ($sec2 === 'godmode/gis_maps/configure_gis_map') {
+        $map_id = (string) get_parameter('map_id');
+        if (empty($map_id) === false) {
+            $sec2 = 'operation/gis_maps/render_view&map_id='.$map_id;
+        } else {
+            $sec2 = 'operation/gis_maps/gis_map';
+        }
+    } else if ($sec2 === 'enterprise/godmode/servers/manage_export_form') {
+        $sec2 = 'enterprise/godmode/servers/manage_export';
+    } else if ($sec2 === 'godmode/setup/gis_step_2') {
+        $sec2 = 'godmode/setup/setup&section=gis';
+    } else if ($sec2 === 'enterprise/godmode/agentes/agent_autoconfiguration.definition') {
+        $sec2 = 'enterprise/godmode/agentes/agent_autoconfiguration';
     } else if ($sec2 === 'operation/gis_maps/render_view') {
         $map_id = (int) get_parameter('map_id');
         if (empty($map_id) === false) {

pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php

@@ -545,7 +545,7 @@ final class ModuleGraph extends Item
                         'label'     => __('Module Graph'),
                         'arguments' => [
                             'type'         => 'radio_button',
-                            'attributes'   => 'class="btn" style="flex: 1;"',
+                            'attributes'   => 'class="btn mrgn_right_20px" style="flex: 1;"',
                             'name'         => 'choosetype',
                             'value'        => 'module',
                             'checkedvalue' => $checkedModule,

pandora_console/include/styles/pandora.css

@@ -10225,9 +10225,9 @@ button.submitButton > div {
 button.buttonButton.onlyIcon,
 button.submitButton.onlyIcon {
   padding: 0 !important;
-  min-width: 1.7em !important;
+  min-width: 1.6em !important;
-  width: 1.7em !important;
+  width: 1.6em !important;
-  height: 1.7em !important;
+  height: 1.6em !important;
   border: none;
   box-shadow: none;
 }
@@ -10291,8 +10291,9 @@ button.submitButton.onlyIcon.auto_sla_graph_min {
 
 button.buttonButton.onlyIcon.basic_chart_min,
 button.submitButton.onlyIcon.basic_chart_min {
-  mask: url(../../images/event-history.svg) no-repeat right / contain;
+  mask: url(../../images/web-analisys-data@svg.svg) no-repeat right / contain;
-  -webkit-mask: url(../../images/event-history.svg) no-repeat right / contain;
+  -webkit-mask: url(../../images/web-analisys-data@svg.svg) no-repeat right /
+    contain;
 }
 
 button.buttonButton.onlyIcon.binary_min,

pandora_console/include/styles/visual_maps.css

@@ -14,6 +14,7 @@ div.external-visual-console-container {
   width: 100%;
   overflow-x: auto;
   overflow-y: hidden;
+  position: relative;
   z-index: 0;
 }
 
@@ -47,7 +48,6 @@ div#vc-controls .nomn #vc-refr-form {
 }
 div#vc-controls div.vc-title,
 div#vc-controls div.vc-refr {
-  /*margin-top: 15px;*/
   margin-left: 3px;
   margin-right: 3px;
 }

pandora_console/include/visual-console-client/vc.main.css

@@ -41,11 +41,11 @@
 }
 
 .visual-console-item.is-editing:hover {
-  border-color: #82b92e;
+  border-color: #2b2b2b;
 }
 
 .visual-console-item.is-editing.is-selected {
-  border: 2px dashed #2b2b2b;
+  border: 2px dashed #82b92e;
   cursor: move;
   z-index: 10;
 }

pandora_console/install.php

@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.769';
-            $build = '230324';
+            $build = '230327';
             $banner = "v$version Build $build";
             error_reporting(0);
 

pandora_console/operation/agentes/estado_generalagente.php

@@ -540,11 +540,8 @@ $table_contact->data[] = $data;
 
 $data_opcional = new stdClass();
 $data_opcional->id = 'agent_data_main';
+$data_opcional->width = '100%';
 $data_opcional->class = 'floating_form';
-$data_opcional->cellspacing = 0;
-$data_opcional->cellpadding = 0;
-$data_opcional->style[0] = 'height: 46px; width: 25%; padding-right: 5px;text-align: end;';
-$data_opcional->style[1] = 'height: 46px; width: 75%; padding-left: 5px;';
 // Gis and url address.
 $agentAdditionalContent = '';
 // Position Information.
@@ -624,8 +621,6 @@ foreach ($fields as $field) {
         $data = [];
 
         $data[0] = '<b>'.$field['name'].ui_print_help_tip(__('Custom field'), true).'</b>';
-        $custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
-
         if ($custom_value[0]['is_password_type']) {
                 $data[1] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
         } else if ($field['is_link_enabled'] === '1') {
@@ -642,6 +637,7 @@ foreach ($fields as $field) {
 
             $data[1] = '<a href="'.$link_url.'">'.$link_text.'</a>';
         } else {
+            $custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
             $data[1] = $custom_value[0]['description'];
         }
 
@@ -1056,19 +1052,13 @@ if (isset($data_opcional) === false || isset($data_opcional->data) === false ||
         false,
         false,
         true,
-        'box-flat agent_details_col agent_details_toggle agent_details_first_row w100p',
+        '',
-        'mrgn_right_20px',
+        'white-box-content',
-        'w100p'
+        'box-flat white_table_graph w100p'
     );
 }
 
 $agentIncidents = (isset($table_incident) === false) ? '' : html_print_table($table_incident, true);
-/*
-    echo '<div class="agent_details_first_row">
-    <div class="box-flat agent_details_col mrgn_lft_20px mrgn_right_20px">'.$table_agent.'</div>
-    <div class="box-flat agent_details_col mrgn_right_20px">'.$agent_contact.'</div>
-    </div>'.$agent_info;
-*/
 
 html_print_div(
     [

pandora_console/operation/gis_maps/gis_map.php

@@ -33,8 +33,9 @@ $buttons['gis_maps_list'] = [
     ).'</a>',
 ];
 
+// Header.
 ui_print_standard_header(
-    __('GIS Maps'),
+    __('List of GIS maps'),
     'images/op_gis.png',
     false,
     '',
@@ -199,7 +200,7 @@ if ($maps !== false) {
             }
 
             $table->cellclass[]['op'] = 'table_action_buttons';
-            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter main_menu_icon']).'</a>';
         }
 
         array_push($table->data, $data);
@@ -213,12 +214,20 @@ if (!empty($table->data)) {
 }
 
 if ($edit_gis_maps) {
-    echo '<div class="action-buttons" style="width: '.$table->width.'">';
     echo '<form action="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map" method="post">';
     html_print_input_hidden('action', 'new_map');
-    html_print_submit_button(__('Create'), '', false, 'class="sub next"');
+    $ActionButton = html_print_submit_button(
+        __('Create'),
+        'create',
+        false,
+        [
+            'class' => 'sub ok submitButton',
+            'icon'  => 'next',
+        ],
+        true
+    );
+    echo '<div class="action-buttons">'.html_print_action_buttons($ActionButton, ['type' => 'form_action'], true).'</div>';
     echo '</form>';
-    echo '</div>';
 }
 
 unset($table);

pandora_console/operation/gis_maps/render_view.php

@@ -175,9 +175,10 @@ if ($has_management_acl) {
     $buttons['setup']['godmode'] = 1;
 }
 
+// Header.
 ui_print_standard_header(
-    __('Map').' » '.__('Map').' '.$map['map_name'],
+    __('Map').': '.$map['map_name'],
-    'images/op_gis.png',
+    'images/op_snmp.png',
     false,
     '',
     false,
@@ -331,5 +332,8 @@ if ($layers != false) {
     $(document).ready(function() {
         var $map = $("#map");
         $map.css("height", "calc(100vh - " + $map.offset().top + "px - 20px)");
+
+        $('#select2-show_status-container').parent().parent().parent().removeClass('select2');
+        $('#select2-refresh_time-container').parent().parent().parent().removeClass('select2');
     });
 </script>

pandora_console/operation/visual_console/view.php

@@ -287,7 +287,7 @@ if ($pure === false) {
         $class_nlink = 'network_link_min link-create-item';
         $class_odometer = 'odometer_min link-create-item';
         $class_basic_chart = 'basic_chart_min link-create-item';
-        $class_delete = 'delete_item delete_min';
+        $class_delete = 'delete_item';
         $class_copy = 'copy_item';
         if ($config['style'] === 'pandora_black' && is_metaconsole() === false) {
             $class_camera .= ' invert_filter';

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230324
+%define release     230327
 
 # 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.769
-%define release     230324
+%define release     230327
 
 # 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.769
-%define release     230324
+%define release     230327
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/views/cluster/edit.php

@@ -143,7 +143,9 @@ html_print_action_buttons(
         var buttonback = $('#button-submit').parent().html();
         $('#button-submit').hide();
         var buttonback = buttonback.replace('button-submit','button-submit_copy');
-        $('.action_buttons_right_content').parent().html(buttonnext+buttonback);
+        var buttonalert = $('#button-add').parent().html();
+        var buttonalert = buttonalert.replace('button-add','button-add_copy');
+        $('.action_buttons_right_content').parent().html(buttonnext+buttonback+buttonalert);
         var style = $('#principal_action_buttons').attr('style');
         $('#principal_action_buttons').attr('style',style+' justify-content: unset;');
 

pandora_console/views/cluster/list.php

@@ -27,12 +27,23 @@
  */
 
 // Header.
-\ui_print_page_header(
+ui_print_standard_header(
-    __('Monitoring').' » '.__('Clusters'),
+    __('Cluster view'),
     'images/chart.png',
     false,
     '',
-    false
+    true,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Clusters'),
+        ],
+    ]
 );
 
 if (empty($message) === false) {

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.769-230324
+Version: 7.0NG.769-230327
 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.769-230324"
+pandora_version="7.0NG.769-230327"
 
 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.769";
-my $pandora_build = "230324";
+my $pandora_build = "230327";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

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.769";
-my $pandora_build = "230324";
+my $pandora_build = "230327";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230324
+%define release     230327
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230324
+%define release     230327
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230324"
+PI_BUILD="230327"
 
 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.769 Build 230324";
+my $version = "7.0NG.769 Build 230327";
 
 # 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.769 Build 230324";
+my $version = "7.0NG.769 Build 230327";
 
 # save program name for logging
 my $progname = basename($0);

visual_console_client/src/main.css

@@ -41,11 +41,11 @@
 }
 
 .visual-console-item.is-editing:hover {
-  border-color: #82b92e;
+  border-color: #2b2b2b;
 }
 
 .visual-console-item.is-editing.is-selected {
-  border: 2px dashed #2b2b2b;
+  border: 2px dashed #82b92e;
   cursor: move;
   z-index: 10;
 }