From 9dec1709c4c9e686521af501084b2b33ec54c106 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 14 Nov 2019 19:10:31 +0100
Subject: [PATCH] Fixed help content well printed

---
 pandora_console/extensions/quick_shell.php           | 7 ++++++-
 pandora_console/include/class/HelpFeedBack.class.php | 5 +++--
 pandora_console/include/functions.php                | 7 +++++++
 pandora_console/include/functions_ui.php             | 7 ++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index a286ce4b95..6d135260d2 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -381,7 +381,12 @@ function quickShellSettings()
     }
 
     // Interface.
-    ui_print_page_header(__('QuickShell settings'));
+    ui_print_page_header(
+        __('QuickShell settings'),
+        '',
+        false,
+        'quickshell_settings'
+    );
 
     if ($changes > 0) {
         $msg = __('%d Updated', $changes);
diff --git a/pandora_console/include/class/HelpFeedBack.class.php b/pandora_console/include/class/HelpFeedBack.class.php
index 825d3c923f..1132550cff 100644
--- a/pandora_console/include/class/HelpFeedBack.class.php
+++ b/pandora_console/include/class/HelpFeedBack.class.php
@@ -93,12 +93,13 @@ class HelpFeedBack extends Wizard
         ui_require_css_File('discovery');
         ui_require_css_file('help_feedback');
 
-        $help_url = get_parameter('url', null);
+        $help_url = get_parameter('b', null);
+        $help_url = base64_decode($help_url);
         if ($help_url === null) {
             echo __('Page not found');
         } else {
             ?>
-        <iframe width="100%" height="100%" frameBorder="0" 
+        <iframe width="100%" height="100%" frameBorder="0" id="h_Viewer"
             src="<?php echo $help_url; ?>">
             <?php echo __('Browser not compatible.'); ?>
         </iframe>
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index a7d94d43bc..fbc41ce961 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -5431,6 +5431,13 @@ function get_help_info($section_name)
                 $result .= 'GIS&printable=yes#Operation';
             }
         break;
+
+        case 'quickshell_settings':
+            if ($es) {
+                $result .= 'Configuracion_Consola&printable=yes#Websocket_Engine';
+            } else {
+                $result .= 'Console_Setup&printable=yes#Websocket_engine';
+            }
     }
 
     return $result;
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 0e1c9e09c0..9179f60aaf 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1404,14 +1404,19 @@ function ui_print_help_icon(
     }
 
     $url = get_help_info($help_id);
+    $b = base64_encode($url);
 
+    $help_handler = 'index.php?sec=view&sec2=general/help_feedback';
+    // Needs to use url encoded to avoid anchor lost.
+    $help_handler .= '&b='.$b;
+    $help_handler .= '&pure=1&url='.$url;
     $output = html_print_image(
         $image,
         true,
         [
             'class'   => 'img_help',
             'title'   => __('Help'),
-            'onclick' => "open_help ('".ui_get_full_url('index.php?sec=view&sec2=general/help_feedback&pure=1&url='.$url)."')",
+            'onclick' => "open_help ('".ui_get_full_url($help_handler)."')",
             'id'      => $id,
         ],
         false,