Merge branch 'ent-9662-second-round' into 'develop'

Ent 9662 second round

See merge request artica/pandorafms!5670

pandora_console/extensions/realtime_graphs.php

@@ -224,7 +224,7 @@ function pandora_realtime_graphs()
         false,
         '',
         'white-box-content',
-        'box-flat white_table_graph fixed_filter_bar'
+        'box-flat white_table_graph'
     );
 
     $chart[time()]['graph'] = '0';

pandora_console/include/class/AuditLog.class.php

@@ -134,7 +134,7 @@ class AuditLog extends HTML
 
             ui_print_standard_header(
                 __('%s audit', get_product_name()).' » '.__('Review Logs'),
-                'images/gm_log.png',
+                'images/gm_log@svg.svg',
                 false,
                 '',
                 false,

pandora_console/include/class/SnmpConsole.class.php

@@ -1443,7 +1443,7 @@ class SnmpConsole extends HTML
                                 binding_vars.forEach(function(oid) {
                                     string += oid+'<br/>';
                                 });
-                                variableBindings = `<td align="left" colspan="8">${string}</td>`;
+                                variableBindings = `<td align="left" colspan="8" class="break-word w200px">${string}</td>`;
                             }
 
                             tr.after(`<tr id="show_" role="row">${labelBindings}${variableBindings}</tr>`);

pandora_console/include/lib/ClusterViewer/ClusterWizard.php

@@ -764,6 +764,7 @@ class ClusterWizard extends \HTML
             'action' => $target_url,
             'method' => 'POST',
             'extra'  => 'autocomplete="false"',
+            'id'     => 'cluster-edit-'.($this->page + 1),
         ];
 
         if ($load_success === false && $this->page !== 0) {
@@ -1245,17 +1246,16 @@ class ClusterWizard extends \HTML
         }
 
         // Submit button.
-        $form['inputs'][] = [
-            'arguments' => [
-                'name'       => 'next',
-                'label'      => $str,
-                'type'       => 'submit',
-                'attributes' => [
-                    'icon' => 'wand',
-                    'mode' => 'primary',
-                ],
-                'return'     => true,
+        $form['submit-external-input'] = [
+            'name'       => 'next',
+            'label'      => $str,
+            'type'       => 'submit',
+            'attributes' => [
+                'icon' => 'wand',
+                'mode' => 'primary',
+                'form' => 'cluster-edit-'.($this->page + 1),
             ],
+            'return'     => true,
         ];
 
         return $form;

pandora_console/include/styles/pandora.css

@@ -11895,3 +11895,7 @@ td[id^="table_info_box"] a {
 .info_table.events > tbody > tr > td {
   border-bottom: 1px solid #dedede !important;
 }
+
+.break-word {
+  word-wrap: break-word;
+}

pandora_console/operation/agentes/ver_agente.php

@@ -1477,15 +1477,13 @@ if ($policyTab === ENTERPRISE_NOT_HOOK) {
     $policyTab = '';
 }
 
-
 // Omnishell.
-if (function_exists('count_tasks_agent')) {
-    $tasks = count_tasks_agent($id_agente);
-    if ($tasks === true) {
-        $omnishellTab = enterprise_hook('omnishell_tab');
-        if ($omnishellTab == -1) {
-            $omnishellTab = '';
-        }
+$tasks = enterprise_hook('count_tasks_agent', [$id_agente]);
+
+if ($tasks === true) {
+    $omnishellTab = enterprise_hook('omnishell_tab');
+    if ($omnishellTab == -1) {
+        $omnishellTab = '';
     }
 }
 

pandora_console/views/cluster/edit.php

@@ -120,42 +120,17 @@ if (empty($wizard->errMessages) === false) {
     }
 }
 
+$buttons_input = '';
 if (empty($form) === false) {
     // Print form (prepared in ClusterWizard).
+    $submit = $form['submit-external-input'];
+    unset($form['submit-external-input']);
+
     HTML::printForm($form, false, ($wizard->page < 6));
+    $buttons_input .= HTML::printInput($submit);
 }
 
 // Print always go back button.
-HTML::printForm($wizard->getGoBackForm(), false);
+$buttons_input .= HTML::printForm($wizard->getGoBackForm(), true);
 
-html_print_action_buttons(
-    '',
-    []
-);
-
-?>
-
-<script type="text/javascript">
-    $(document).ready(function() {
-        var buttonnext = $('#button-next').parent().html();
-        $('#button-next').hide();
-        var buttonnext = buttonnext.replace('button-next','button-next_copy');
-        var buttonback = $('#button-submit').parent().html();
-        $('#button-submit').hide();
-        var buttonback = buttonback.replace('button-submit','button-submit_copy');
-        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;');
-
-        // Button next/finish on action buttons.
-        $('#button-next_copy').click(function(){
-            $('#button-next').trigger('click');
-        });
-        // Button back on action buttons.
-        $('#button-submit_copy').click(function(){
-            $('#button-submit').trigger('click');
-        });
-    });
-</script>
+html_print_action_buttons($buttons_input);