From 563e9e15c4ee58480ddc6333f345930fc59c9794 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 21 Mar 2023 10:30:35 +0100
Subject: [PATCH] #9624 fixed conflics

---
 pandora_console/godmode/setup/setup.php       |  2 +-
 .../godmode/setup/setup_netflow.php           |  7 +-
 pandora_console/godmode/setup/setup_sflow.php | 88 ++++++++++++-------
 3 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index f9c238e725..7b157648cf 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -293,7 +293,7 @@ switch ($section) {
 
     case 'sflow':
         $buttons['sflow']['active'] = true;
-        $subpage = ' &raquo '.__('Sflow');
+        $subpage = __('Sflow');
         $help_header = 'setup_flow_tab';
     break;
 
diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php
index 3711280fad..b9cd79492d 100644
--- a/pandora_console/godmode/setup/setup_netflow.php
+++ b/pandora_console/godmode/setup/setup_netflow.php
@@ -45,7 +45,6 @@ $table->data[0][] = html_print_label_input_block(
     __('Data storage path'),
     html_print_input_text('netflow_name_dir', $config['netflow_name_dir'], false, 50, 200, true)
 );
-$table->data[0][] = '<script>$("input[name=netflow_name_dir]").on("input", function() {$(this).val($(this).val().replace(/[^a-z0-9]/gi, ""));});</script>';
 
 $table->data[0][] = html_print_label_input_block(
     __('Daemon interval'),
@@ -101,3 +100,9 @@ html_print_action_buttons(
     )
 );
 echo '</form>';
+?>
+<script>
+$("input[name=netflow_name_dir]").on("input", function() {
+    $(this).val($(this).val().replace(/[^a-z0-9]/gi, ""));
+});
+</script>
\ No newline at end of file
diff --git a/pandora_console/godmode/setup/setup_sflow.php b/pandora_console/godmode/setup/setup_sflow.php
index 2610bc3361..454be16034 100644
--- a/pandora_console/godmode/setup/setup_sflow.php
+++ b/pandora_console/godmode/setup/setup_sflow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Setup view for Netflow
+ * Setup view for sflow
  *
  * @category   Setup
  * @package    Pandora FMS
@@ -37,48 +37,72 @@ $update = (bool) get_parameter('update');
 
 $table = new stdClass();
 $table->width = '100%';
-$table->border = 0;
-$table->cellspacing = 3;
-$table->cellpadding = 5;
-$table->class = 'databox filters';
+$table->class = 'databox filter-table-adv';
 
 $table->data = [];
 
-$table->data[0][0] = '<b>'.__('Data storage path').'</b>';
-$table->data[0][1] = html_print_input_text('sflow_name_dir', $config['sflow_name_dir'], false, 50, 200, true);
-$table->data[0][1] .= '<script>$("input[name=sflow_name_dir]").on("input", function() {$(this).val($(this).val().replace(/[^a-z0-9]/gi, ""));});</script>';
+$table->data[0][] = html_print_label_input_block(
+    __('Data storage path'),
+    html_print_input_text('sflow_name_dir', $config['sflow_name_dir'], false, 50, 200, true)
+);
 
+$table->data[0][] = html_print_label_input_block(
+    __('Daemon interval'),
+    html_print_input_text('sflow_interval', $config['sflow_interval'], false, 50, 200, true)
+);
 
-$table->data[1][0] = '<b>'.__('Daemon interval').'</b>';
-$table->data[1][1] = html_print_input_text('sflow_interval', $config['sflow_interval'], false, 50, 200, true);
+$table->data[1][] = html_print_label_input_block(
+    __('Daemon binary path'),
+    html_print_input_text('sflow_daemon', $config['sflow_daemon'], false, 50, 200, true)
+);
 
-$table->data[2][0] = '<b>'.__('Daemon binary path').'</b>';
-$table->data[2][1] = html_print_input_text('sflow_daemon', $config['sflow_daemon'], false, 50, 200, true);
+$table->data[1][] = html_print_label_input_block(
+    __('Nfdump binary path'),
+    html_print_input_text('sflow_nfdump', $config['sflow_nfdump'], false, 50, 200, true)
+);
 
-$table->data[3][0] = '<b>'.__('Nfdump binary path').'</b>';
-$table->data[3][1] = html_print_input_text('sflow_nfdump', $config['sflow_nfdump'], false, 50, 200, true);
+$table->data[2][] = html_print_label_input_block(
+    __('Nfexpire binary path'),
+    html_print_input_text('sflow_nfexpire', $config['sflow_nfexpire'], false, 50, 200, true)
+);
 
-$table->data[4][0] = '<b>'.__('Nfexpire binary path').'</b>';
-$table->data[4][1] = html_print_input_text('sflow_nfexpire', $config['sflow_nfexpire'], false, 50, 200, true);
+$table->data[2][] = html_print_label_input_block(
+    __('Maximum chart resolution'),
+    html_print_input_text('sflow_max_resolution', $config['sflow_max_resolution'], false, 50, 200, true)
+);
 
-$table->data[5][0] = '<b>'.__('Maximum chart resolution').'</b>';
-$table->data[5][1] = html_print_input_text('sflow_max_resolution', $config['sflow_max_resolution'], false, 50, 200, true);
+$table->data[3][] = html_print_label_input_block(
+    __('Disable custom live view filters'),
+    html_print_checkbox_switch('sflow_disable_custom_lvfilters', 1, $config['sflow_disable_custom_lvfilters'], true)
+);
 
-$table->data[6][0] = '<b>'.__('Disable custom live view filters').'</b>';
-$table->data[6][1] = html_print_checkbox_switch('sflow_disable_custom_lvfilters', 1, $config['sflow_disable_custom_lvfilters'], true);
-$table->data[7][0] = '<b>'.__('Max. sflow lifetime').'</b>';
-$table->data[7][1] = html_print_input_text('sflow_max_lifetime', $config['sflow_max_lifetime'], false, 50, 200, true);
+$table->data[3][] = html_print_label_input_block(
+    __('Sflow max lifetime'),
+    html_print_input_text('sflow_max_lifetime', $config['sflow_max_lifetime'], false, 50, 200, true)
+);
 
-$table->data[8][0] = '<b>'.__('Name resolution for IP address').'</b>';
 $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;";
-$table->data[8][1] = html_print_checkbox_switch_extended('sflow_get_ip_hostname', 1, $config['sflow_get_ip_hostname'], false, $onclick, '', true);
-
-echo '<form id="netflow_setup" method="post">';
+$table->data[4][] = html_print_label_input_block(
+    __('Name resolution for IP address'),
+    html_print_checkbox_switch_extended('sflow_get_ip_hostname', 1, $config['sflow_get_ip_hostname'], false, $onclick, '', true)
+);
 
+echo '<form class="max_floating_element_size" id="sflow_setup" method="post">';
 html_print_table($table);
-
-// Update button.
-echo '<div class="action-buttons w100p">';
-    html_print_input_hidden('update_config', 1);
-    html_print_submit_button(__('Update'), 'upd_button', false, 'class="sub upd"');
-echo '</div></form>';
+html_print_input_hidden('update_config', 1);
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        'upd_button',
+        false,
+        ['icon' => 'update'],
+        true
+    )
+);
+echo '</form>';
+?>
+<script>
+    $("input[name=sflow_name_dir]").on("input", function() {
+        $(this).val($(this).val().replace(/[^a-z0-9]/gi, ""));
+    });
+</script>
\ No newline at end of file