From 9ed46e3b524bd5a3bec31554f7e5d2cb621bed60 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 27 Feb 2023 09:41:39 +0100
Subject: [PATCH] SNMP fix view

---
 .../godmode/snmpconsole/snmp_filters.php      | 51 +++++++++++++------
 .../snmpconsole/snmp_trap_generator.php       | 12 ++++-
 .../include/class/SnmpConsole.class.php       |  5 +-
 .../include/functions_filemanager.php         |  6 +--
 pandora_console/include/styles/pandora.css    |  5 --
 5 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php
index 713881b42c..2dee984233 100644
--- a/pandora_console/godmode/snmpconsole/snmp_filters.php
+++ b/pandora_console/godmode/snmpconsole/snmp_filters.php
@@ -200,6 +200,16 @@ if ($edit_filter > -2) {
     $table->class = 'databox filters';
     $table->data[0][0] = __('Description');
     $table->data[0][1] = html_print_input_text('description', $description, '', 60, 100, true);
+    $table->data[0][1] .= html_print_image(
+        'images/add.png',
+        true,
+        [
+            'id'    => 'add_filter',
+            'alt'   => __('Click to add new filter'),
+            'title' => __('Click to add new filter'),
+            'style' => 'height:20px',
+        ]
+    );
     $table->data[1][0] = __('Filter');
     if ($edit_filter > -1) {
         $unified_filter = db_get_value_sql('SELECT unified_filters_id FROM tsnmp_filter WHERE id_snmp_filter != 0 AND id_snmp_filter = '.$edit_filter);
@@ -245,25 +255,36 @@ if ($edit_filter > -2) {
     }
 
     html_print_table($table);
-    echo '<div class="action-buttons" style="width: '.$table->width.'">';
-    html_print_image(
-        'images/add.png',
-        false,
-        [
-            'id'    => 'add_filter',
-            'alt'   => __('Click to add new filter'),
-            'title' => __('Click to add new filter'),
-            'style' => 'float:left;',
-            'class' => 'invert_filter',
-        ]
-    );
+
     if ($edit_filter > -1) {
-        html_print_submit_button(__('Update'), 'submit_button', false, 'class="sub upd"');
+        $buttons[] = html_print_submit_button(
+            __('Update'),
+            'submit_button',
+            false,
+            [
+                'class' => 'sub ok',
+                'icon'  => 'next',
+            ],
+            true
+        );
     } else {
-        html_print_submit_button(__('Create'), 'submit_button', false, 'class="sub upd"');
+        $buttons[] = html_print_submit_button(
+            __('Create'),
+            'submit_button',
+            false,
+            [
+                'class' => 'sub ok',
+                'icon'  => 'next',
+            ],
+            true
+        );
     }
 
-    echo '</div>';
+    html_print_action_buttons(
+        implode('', $buttons),
+        ['type' => 'form_action']
+    );
+
     echo '</form>';
     // Overview
 } else {
diff --git a/pandora_console/godmode/snmpconsole/snmp_trap_generator.php b/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
index 0d7e12cfd3..746d52a12d 100755
--- a/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
+++ b/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
@@ -174,7 +174,17 @@ $table->data[2][2] = html_print_label_input_block(
 );
 
 $traps_generator .= html_print_table($table, true);
-$traps_generator .= '<div class="action-buttons">'.html_print_submit_button(__('Generate trap'), 'btn_generate_trap', false, 'class="submitButton"', true).'</div>';
+$buttons[] = html_print_submit_button(
+    __('Generate trap'),
+    'btn_generate_trap',
+    false,
+    [
+        'class' => 'sub ok submitButton',
+        'icon'  => 'next',
+    ],
+    true
+);
+$traps_generator .= '<div class="action-buttons">'.html_print_action_buttons(implode('', $buttons), ['type' => 'form_action'], true).'</div>';
 $traps_generator .= html_print_input_hidden('generate_trap', 1, true);
 
 unset($table);
diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index 6264b1879a..b7d235398e 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -564,10 +564,13 @@ class SnmpConsole extends HTML
         echo '</div></td>';
         echo '<td><div class="snmp_view_div">';
         echo '<h3>'.__('Action').'</h3>';
-        echo '<div>';
+        echo '<div style=" display : flex;align-items : center;">';
         echo html_print_image('images/validate.svg', true, ['class' => 'main_menu_icon']).' - '.__('Validate');
+        echo '</div>';
         echo '<br />';
+        echo '<div style=" display : flex;align-items : center;">';
         echo html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).' - '.__('Delete');
+        echo '</div>';
         echo '</div></div></td>';
 
         // Load own javascript file.
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 3d44c08fc0..52d01ae76d 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -857,7 +857,7 @@ function filemanager_file_explorer(
             $createFolderElements = $tabs_dialog;
             $createFolderElements .= sprintf('<form method="POST" action="%s">', $url);
             $createFolderElements .= html_print_input_text('dirname', '', '', 30, 255, true);
-            $createFolderElements .= html_print_submit_button(__('Create'), 'crt', false, 'class="submitButton"', true);
+            $createFolderElements .= html_print_submit_button(__('Create'), 'crt', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true);
             $createFolderElements .= html_print_input_hidden('directory', $relative_directory, true);
             $createFolderElements .= html_print_input_hidden('create_dir', 1, true);
             $createFolderElements .= html_print_input_hidden('hash', md5($relative_directory.$config['server_unique_identifier']), true);
@@ -897,7 +897,7 @@ function filemanager_file_explorer(
                 $uploadFileElements .= html_print_input_hidden('upload_file', 1, true);
             }
 
-            $uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, 'class="mrgn_lft_10px submitButton" style="display: inline;"', true);
+            $uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true);
             $uploadFileElements .= html_print_input_hidden('real_directory', $real_directory, true);
             $uploadFileElements .= html_print_input_hidden('directory', $relative_directory, true);
             $uploadFileElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);
@@ -918,7 +918,7 @@ function filemanager_file_explorer(
                 $createTextElements = $tabs_dialog;
                 $createTextElements .= '<form method="post" action="'.$url.'">';
                 $createTextElements .= html_print_input_text('name_file', '', '', 30, 50, true);
-                $createTextElements .= html_print_submit_button(__('Create'), 'create', false, 'class="submitButton"', true);
+                $createTextElements .= html_print_submit_button(__('Create'), 'create', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true);
                 $createTextElements .= html_print_input_hidden('real_directory', $real_directory, true);
                 $createTextElements .= html_print_input_hidden('directory', $relative_directory, true);
                 $createTextElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index d5fa17ed9c..96532559d7 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -11327,11 +11327,6 @@ div[role="dialog"] {
   z-index: 1115;
 }
 
-button[name="go"] {
-  margin-left: 10px;
-  display: inline !important;
-}
-
 .module_background_state {
   mask: url(../../images/modules@svg.svg) no-repeat center / contain;
   -webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;