From 1d403ec2f8daad76a67bb437449aab283c6b48b8 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 24 May 2019 13:42:49 +0200
Subject: [PATCH 1/2] SNMP Browser fix

---
 .../include/functions_snmp_browser.php        | 117 +++++++++++++++---
 .../operation/snmpconsole/snmp_browser.php    |  22 +++-
 2 files changed, 118 insertions(+), 21 deletions(-)

diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 496a7b747f..d20daecb46 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -41,13 +41,24 @@ $nfdump_date_format = 'Y/m/d.H:i:s';
 
 
 /**
- * Selects all netflow filters (array (id_name => id_name)) or filters filtered
+ * Generates a Tree with given $tree information.
  *
- * @param tree string SNMP tree returned by snmp_broser_get_tree.
- * @param id string Level ID. Do not set, used for recursion.
- * @param depth string Branch depth. Do not set, used for recursion.
+ * Selects all netflow filters (array (id_name => id_name)) or filters filtered
+ * Used also in Cloud Wizard.
+ *
+ * @param string  $tree            SNMP tree returned by snmp_broser_get_tree.
+ * @param string  $id              Level ID. Do not set, used for recursion.
+ * @param string  $depth           Branch depth. Do not set, used for recursion.
+ * @param integer $last            Last.
+ * @param array   $last_array      Last_array.
+ * @param string  $sufix           Sufix.
+ * @param array   $checked         Checked.
+ * @param boolean $descriptive_ids Descriptive_ids.
+ * @param string  $previous_id     Previous_id.
+ *
+ * @return string HTML code with complete tree.
  */
-function snmp_browser_print_tree(
+function snmp_browser_get_html_tree(
     $tree,
     $id=0,
     $depth=0,
@@ -55,7 +66,6 @@ function snmp_browser_print_tree(
     $last_array=[],
     $sufix=false,
     $checked=[],
-    $return=false,
     $descriptive_ids=false,
     $previous_id=''
 ) {
@@ -70,17 +80,17 @@ function snmp_browser_print_tree(
 
     // Leaf.
     if (empty($tree['__LEAVES__'])) {
-        return;
+        return '';
     }
 
     $count = 0;
-    $total = (sizeof(array_keys($tree['__LEAVES__'])) - 1);
+    $total = (count(array_keys($tree['__LEAVES__'])) - 1);
     $last_array[$depth] = $last;
 
     if ($depth > 0) {
-        $output .= "<ul id='ul_$id' style='margin: 0; padding: 0; display: none'>\n";
+        $output .= '<ul id="ul_'.$id.'" style="margin: 0; padding: 0; display: none;">';
     } else {
-        $output .= "<ul id='ul_$id' style='margin: 0; padding: 0;'>\n";
+        $output .= '<ul id="ul_'.$id.'" style="margin: 0; padding: 0;">';
     }
 
     foreach ($tree['__LEAVES__'] as $level => $sub_level) {
@@ -88,7 +98,7 @@ function snmp_browser_print_tree(
         $sub_id = time().rand(0, getrandmax());
 
         // Display the branch.
-        $output .= "<li id='li_$sub_id' style='margin: 0; padding: 0;'>";
+        $output .= '<li id="li_'.$sub_id.'" style="margin: 0; padding: 0;">';
 
         // Indent sub branches.
         for ($i = 1; $i <= $depth; $i++) {
@@ -156,11 +166,11 @@ function snmp_browser_print_tree(
         $output .= '</li>';
 
         // Recursively print sub levels.
-        $output .= snmp_browser_print_tree(
+        $output .= snmp_browser_get_html_tree(
             $sub_level,
             $sub_id,
             ($depth + 1),
-            ($count == $total ? 1 : 0),
+            (($count == $total) ? 1 : 0),
             $last_array,
             $sufix,
             $checked,
@@ -174,11 +184,57 @@ function snmp_browser_print_tree(
 
     $output .= '</ul>';
 
-    if ($return == false) {
-        echo $output;
+    return $output;
+}
+
+
+/**
+ * Selects all netflow filters (array (id_name => id_name)) or filters filtered
+ * This function is also being used while painting instances in AWS Cloud wiz.
+ *
+ * @param string  $tree            SNMP tree returned by snmp_broser_get_tree.
+ * @param string  $id              Level ID. Do not set, used for recursion.
+ * @param string  $depth           Branch depth. Do not set, used for recursion.
+ * @param integer $last            Last.
+ * @param array   $last_array      Last_array.
+ * @param string  $sufix           Sufix.
+ * @param array   $checked         Checked.
+ * @param boolean $return          Return.
+ * @param boolean $descriptive_ids Descriptive_ids.
+ * @param string  $previous_id     Previous_id.
+ *
+ * @return string HTML code with complete tree.
+ */
+function snmp_browser_print_tree(
+    $tree,
+    $id=0,
+    $depth=0,
+    $last=0,
+    $last_array=[],
+    $sufix=false,
+    $checked=[],
+    $return=false,
+    $descriptive_ids=false,
+    $previous_id=''
+) {
+    $str = snmp_browser_get_html_tree(
+        $tree,
+        $id,
+        $depth,
+        $last,
+        $last_array,
+        $sufix,
+        $checked,
+        $return,
+        $descriptive_ids,
+        $previous_id
+    );
+
+    if ($return === false) {
+        echo $str;
     }
 
-    return $output;
+    return $str;
 }
 
 
@@ -695,11 +751,32 @@ function snmp_browser_print_container($return=false, $width='100%', $height='500
     $table->data = [];
 
     $table->data[0][0] = '<strong>'.__('Target IP').'</strong> &nbsp;&nbsp;';
-    $table->data[0][0] .= html_print_input_text('target_ip', '', '', 25, 0, true);
+    $table->data[0][0] .= html_print_input_text(
+        'target_ip',
+        get_parameter('target_ip', ''),
+        '',
+        25,
+        0,
+        true
+    );
     $table->data[0][1] = '<strong>'.__('Community').'</strong> &nbsp;&nbsp;';
-    $table->data[0][1] .= html_print_input_text('community', '', '', 25, 0, true);
+    $table->data[0][1] .= html_print_input_text(
+        'community',
+        get_parameter('community', ''),
+        '',
+        25,
+        0,
+        true
+    );
     $table->data[0][2] = '<strong>'.__('Starting OID').'</strong> &nbsp;&nbsp;';
-    $table->data[0][2] .= html_print_input_text('starting_oid', '.1.3.6.1.2', '', 25, 0, true);
+    $table->data[0][2] .= html_print_input_text(
+        'starting_oid',
+        get_parameter('starting_oid', '.1.3.6.1.2'),
+        '',
+        25,
+        0,
+        true
+    );
 
     $table->data[1][0] = '<strong>'.__('Version').'</strong> &nbsp;&nbsp;';
     $table->data[1][0] .= html_print_select(
@@ -710,7 +787,7 @@ function snmp_browser_print_container($return=false, $width='100%', $height='500
             '3'  => 'v. 3',
         ],
         'snmp_browser_version',
-        '',
+        get_parameter('snmp_browser_version', '2c'),
         'checkSNMPVersion();',
         '',
         '',
diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php
index d15e624162..b68f2d4da5 100644
--- a/pandora_console/operation/snmpconsole/snmp_browser.php
+++ b/pandora_console/operation/snmpconsole/snmp_browser.php
@@ -68,7 +68,27 @@ if (is_ajax()) {
         if (! is_array($snmp_tree)) {
             echo $snmp_tree;
         } else {
-            snmp_browser_print_tree($snmp_tree);
+            snmp_browser_print_tree(
+                $snmp_tree,
+                // Id.
+                0,
+                // Depth.
+                0,
+                // Last.
+                0,
+                // Last_array.
+                [],
+                // Sufix.
+                false,
+                // Checked.
+                [],
+                // Return.
+                false,
+                // Descriptive_ids.
+                false,
+                // Previous_id.
+                ''
+            );
             echo html_print_submit_button(
                 __('Create network components'),
                 'create_network_component',

From 1f3656c0d3e925b0024a493cc85b06c3bf8f02bb Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Wed, 29 May 2019 12:09:44 +0200
Subject: [PATCH 2/2] Changed query and comment for tnews message

---
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 470f6f615d..f58dbb3d66 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -2126,11 +2126,11 @@ ALTER TABLE `tnetflow_filter` DROP COLUMN `output`;
 -- ----------------------------------------------------------------------
 UPDATE tuser_task set parameters = 'a:5:{i:0;a:6:{s:11:\"description\";s:28:\"Report pending to be created\";s:5:\"table\";s:7:\"treport\";s:8:\"field_id\";s:9:\"id_report\";s:10:\"field_name\";s:4:\"name\";s:4:\"type\";s:3:\"int\";s:9:\"acl_group\";s:8:\"id_group\";}i:1;a:2:{s:11:\"description\";s:46:\"Send to email addresses (separated by a comma)\";s:4:\"type\";s:4:\"text\";}i:2;a:2:{s:11:\"description\";s:7:\"Subject\";s:8:\"optional\";i:1;}i:3;a:3:{s:11:\"description\";s:7:\"Message\";s:4:\"type\";s:4:\"text\";s:8:\"optional\";i:1;}i:4;a:2:{s:11:\"description\";s:11:\"Report Type\";s:4:\"type\";s:11:\"report_type\";}}' where function_name = "cron_task_generate_report";
 
-------------------------------------------------------------------------
------- ADD message in table 'tnews'
-------------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- ADD message in table 'tnews'
+-- ----------------------------------------------------------------------
 
-INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome&#x20;to&#x20;Pandora&#x20;FMS&#x20;Console', '&amp;lt;p&#x20;style=&quot;text-align:&#x20;center;&#x20;font-size:&#x20;13px;&quot;&amp;gt;Hello,&#x20;congratulations,&#x20;if&#x20;you&apos;ve&#x20;arrived&#x20;here&#x20;you&#x20;already&#x20;have&#x20;an&#x20;operational&#x20;monitoring&#x20;console.&#x20;Remember&#x20;that&#x20;our&#x20;forums&#x20;and&#x20;online&#x20;documentation&#x20;are&#x20;available&#x20;24x7&#x20;to&#x20;get&#x20;you&#x20;out&#x20;of&#x20;any&#x20;trouble.&#x20;You&#x20;can&#x20;replace&#x20;this&#x20;message&#x20;with&#x20;a&#x20;personalized&#x20;one&#x20;at&#x20;Admin&#x20;tools&#x20;-&amp;amp;gt;&#x20;Site&#x20;news.&amp;lt;/p&amp;gt;&#x20;',NOW());
+INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (NULL,'admin','Welcome&#x20;to&#x20;Pandora&#x20;FMS&#x20;Console', '&amp;lt;p&#x20;style=&quot;text-align:&#x20;center;&#x20;font-size:&#x20;13px;&quot;&amp;gt;Hello,&#x20;congratulations,&#x20;if&#x20;you&apos;ve&#x20;arrived&#x20;here&#x20;you&#x20;already&#x20;have&#x20;an&#x20;operational&#x20;monitoring&#x20;console.&#x20;Remember&#x20;that&#x20;our&#x20;forums&#x20;and&#x20;online&#x20;documentation&#x20;are&#x20;available&#x20;24x7&#x20;to&#x20;get&#x20;you&#x20;out&#x20;of&#x20;any&#x20;trouble.&#x20;You&#x20;can&#x20;replace&#x20;this&#x20;message&#x20;with&#x20;a&#x20;personalized&#x20;one&#x20;at&#x20;Admin&#x20;tools&#x20;-&amp;amp;gt;&#x20;Site&#x20;news.&amp;lt;/p&amp;gt;&#x20;',NOW());
 
 -- ----------------------------------------------------------------------
 -- Alter table `talert_templates`