From ecce1160e1a9fbb6e001813e6e12250bd8458d36 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Thu, 9 May 2019 19:23:18 +0200
Subject: [PATCH 01/13] Added button to select ehorus conf type and box into
 user conf

---
 .../godmode/setup/setup_ehorus.php            |  17 ++-
 pandora_console/include/functions_config.php  |   6 +-
 pandora_console/operation/users/user_edit.php | 140 +++++++++++++++++-
 3 files changed, 154 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index fc2ebd3d3a..1300e1dccd 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -52,8 +52,9 @@ $table_enable->style['name'] = 'font-weight: bold';
 
 // Enable eHorus.
 $row = [];
-$row['name'] = __('Enable eHorus');
+$row['name'] = ('Enable eHorus');
 $row['control'] = html_print_checkbox_switch('ehorus_enabled', 1, $config['ehorus_enabled'], true);
+$row['button'] = html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"', true);
 $table_enable->data['ehorus_enabled'] = $row;
 
 // Remote config table.
@@ -66,6 +67,12 @@ $table_remote->class = 'databox filters';
 $table_remote->size['name'] = '30%';
 $table_remote->style['name'] = 'font-weight: bold';
 
+
+// Enable eHorus user configuration.
+$row = [];
+$row['name'] = ('Enable eHorus user configuration');
+$row['control'] = html_print_checkbox_switch('ehorus-user-login', 1, $config['ehorus-user-login'], true);
+$table_remote->data['ehorus-user-login'] = $row;
 // User.
 $row = [];
 $row['name'] = __('User');
@@ -108,7 +115,6 @@ $row['control'] .= '<span id="test-ehorus-success" style="display:none;">&nbsp;'
 $row['control'] .= '<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
 $row['control'] .= '&nbsp;<span id="test-ehorus-message" style="display:none;"></span>';
 $table_remote->data['ehorus_test'] = $row;
-
 // Print.
 echo '<div style="text-align: center; padding-bottom: 20px;">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
@@ -162,8 +168,6 @@ if ($config['ehorus_enabled']) {
 ?>
 
 <script type="text/javascript">
- $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
- $('form#form_remote').hide();
  $('form#form_enable').css('margin-bottom','20px');
     var showFields = function () {
         $('form#form_remote').show();
@@ -175,13 +179,14 @@ if ($config['ehorus_enabled']) {
         var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
         if (event.target.value == '1' && is_checked) {
             showFields();
-            $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
+            $('input:checkbox[name="ehorus_enabled"]').attr('checked', true);
         }
         else {
             hideFields();
-            $('input:checkbox[name="ehorus_enabled"]').attr('checked', true);
+            $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
         };
     }
+    
     $('input:checkbox[name="ehorus_enabled"]').change(handleEnable);
     
     var handleTest = function (event) {
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 0d258b2bff..ff092031e6 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1349,10 +1349,14 @@ function config_update_config()
                 break;
 
                 case 'ehorus':
-                    if (!config_update_value('ehorus_enabled', (int) get_parameter('ehorus_enabled', $config['ehorus_enabled']))) {
+                    if (!config_update_value('ehorus_enabled', (int) get_parameter('ehorus_enabled', 0))) {
                         $error_update[] = __('Enable eHorus');
                     }
 
+                    if (!config_update_value('ehorus-user-login', (int) get_parameter('ehorus-user-login', 0))) {
+                        $error_update[] = __('eHorus user login');
+                    }
+
                     if (!config_update_value('ehorus_user', (string) get_parameter('ehorus_user', $config['ehorus_user']))) {
                         $error_update[] = __('eHorus user');
                     }
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index b517a181b7..1299f60583 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -91,6 +91,7 @@ if (isset($_GET['modified']) && !$view_mode) {
     $dashboard = get_parameter('dashboard', '');
     $visual_console = get_parameter('visual_console', '');
 
+
     // Save autorefresh list.
     $autorefresh_list = get_parameter_post('autorefresh_list');
     if (($autorefresh_list[0] === '') || ($autorefresh_list[0] === '0')) {
@@ -597,6 +598,8 @@ echo '<form name="user_mod" method="post" action="'.ui_get_full_url().'&amp;modi
                 <div class="edit_user_options">'.$language.$size_pagination.$skin.$home_screen.$event_filter.$newsletter.$newsletter_reminder.$double_authentication.'</div>
                 <div class="edit_user_timezone">'.$timezone;
 
+
+
 if (!is_metaconsole()) {
     echo '<div id="timezone-picker">
                         <img id="timezone-image" src="'.$local_file.'" width="'.$map_width.'" height="'.$map_height.'" usemap="#timezone-map" />
@@ -611,6 +614,11 @@ if (!is_metaconsole()) {
                 <div class="edit_user_comments">'.$comments.'</div>
             </div>    
         </div>';
+if ($config['ehorus_enabled'] && $config['ehorus-user-login']) {
+    ehorus_user_login_conf();
+}
+
+
 
     echo '<div class="edit_user_button">';
 if (!$config['user_can_update_info']) {
@@ -622,8 +630,6 @@ if (!$config['user_can_update_info']) {
 
     echo '</div>';
 
-echo '</form>';
-
 echo '<div id="edit_user_profiles" class="white_box">';
 if (!defined('METACONSOLE')) {
     echo '<p class="edit_user_labels">'.__('Profiles/Groups assigned to this user').'</p>';
@@ -727,7 +733,56 @@ if (!defined('METACONSOLE')) {
     echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/timezonepicker/lib/jquery.timezone-picker.min.js').'"></script>'."\n\t";
     echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/timezonepicker/lib/jquery.maphilight.min.js').'"></script>'."\n\t";
     // Closes no meta condition.
+}function ehorus_user_login_conf()
+{
+    // eHorus user login
+    $table_remote = new StdClass();
+    $table_remote->data = [];
+    $table_remote->width = '100%';
+    $table_remote->styleTable = 'margin-bottom: 10px;';
+    $table_remote->id = 'ehorus-user-login';
+    $table_remote->class = 'ehorus-user-login white_box';
+    $table_remote->size['name'] = '30%';
+    $table_remote->style['name'] = 'font-weight: bold';
+
+    // User.
+    $row = [];
+    $row['name'] = __('User');
+    $row['control'] = html_print_input_text('ehorus_user', $config['ehorus_user'], '', 30, 100, true);
+    $table_remote->data['ehorus_user'] = $row;
+
+    // Pass.
+    $row = [];
+    $row['name'] = __('Password');
+    $row['control'] = html_print_input_password('ehorus_pass', io_output_password($config['ehorus_pass']), '', 30, 100, true);
+    $table_remote->data['ehorus_pass'] = $row;
+
+    // Test.
+    $ehorus_port = db_get_value('value', 'tconfig', 'token', 'ehorus_port');
+    $ehorus_host = db_get_value('value', 'tconfig', 'token', 'ehorus_hostname');
+
+    $row = [];
+    $row['name'] = __('Test');
+    $row['control'] = html_print_button(__('Start'), 'test-ehorus', false, 'ehorus_connection_test('.$ehorus_host.','.$ehorus_port.')', 'class="sub next"', true);
+    $row['control'] .= '<span id="test-ehorus-spinner" style="display:none;">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
+    $row['control'] .= '<span id="test-ehorus-success" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
+    $row['control'] .= '<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
+    $row['control'] .= '&nbsp;<span id="test-ehorus-message" style="display:none;"></span>';
+    $table_remote->data['ehorus_test'] = $row;
+
+    echo '                <div class="ehorus-userlogin white_box">
+
+<p class="edit_user_labels">'._('eHorus login').ui_print_help_tip(
+        __('This will activate autorefresh in selected pages'),
+        true
+    ).'</p>';
+    html_print_input_hidden('update_config', 1);
+    html_print_table($table_remote);
+    echo '</div>';
+
 }
+
+
 ?>
 
 <script language="javascript" type="text/javascript">
@@ -1052,4 +1107,85 @@ function show_double_auth_deactivation () {
         })
         .show();
 }
+
+function ehorus_connection_test (host, port) {
+        var user = $('input#text-ehorus_user').val();
+        var pass = $('input#password-ehorus_pass').val();
+    
+    
+        var badRequestMessage = '<?php echo __('Empty user or password'); ?>';
+        var notFoundMessage = '<?php echo __('User not found'); ?>';
+        var invalidPassMessage = '<?php echo __('Invalid password'); ?>';
+        
+        var hideLoadingImage = function () {
+            $('span#test-ehorus-spinner').hide();
+        }
+        var showLoadingImage = function () {
+            $('span#test-ehorus-spinner').show();
+        }
+        var hideSuccessImage = function () {
+            $('span#test-ehorus-success').hide();
+        }
+        var showSuccessImage = function () {
+            $('span#test-ehorus-success').show();
+        }
+        var hideFailureImage = function () {
+            $('span#test-ehorus-failure').hide();
+        }
+        var showFailureImage = function () {
+            $('span#test-ehorus-failure').show();
+        }
+        var hideMessage = function () {
+            $('span#test-ehorus-message').hide();
+        }
+        var showMessage = function () {
+            $('span#test-ehorus-message').show();
+        }
+        var changeTestMessage = function (message) {
+            $('span#test-ehorus-message').text(message);
+        }
+        
+        hideSuccessImage();
+        hideFailureImage();
+        hideMessage();
+        showLoadingImage();
+
+        $.ajax({
+            url: 'https://' + host + ':' + port + '/login',
+            type: 'POST',
+            dataType: 'json',
+            timeout: timeout ? timeout * 1000 : 0,
+            data: {
+                user: user,
+                pass: pass
+            }
+        })
+        .done(function(data, textStatus, xhr) {
+            showSuccessImage();
+        })
+        .fail(function(xhr, textStatus, errorThrown) {
+            showFailureImage();
+            
+            if (xhr.status === 400) {
+                changeTestMessage(badRequestMessage);
+            }
+            else if (xhr.status === 401 || xhr.status === 403) {
+                changeTestMessage(invalidPassMessage);
+            }
+            else if (xhr.status === 404) {
+                changeTestMessage(notFoundMessage);
+            }
+            else if (errorThrown === 'timeout') {
+                changeTestMessage(timeoutMessage);
+            }
+            else {
+                changeTestMessage(errorThrown);
+            }
+            showMessage();
+        })
+        .always(function(xhr, textStatus) {
+            hideLoadingImage();
+        });
+    }
+    $('input#button-test-ehorus').click(handleTest);
 </script>

From c527435a0e4aad2aabc02161ac8eaf3e5138f364 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Fri, 10 May 2019 15:32:25 +0200
Subject: [PATCH 02/13] eHorus user-login  settings

Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
---
 .../godmode/setup/setup_ehorus.php            |  37 ++++--
 .../godmode/users/configure_user.php          |   2 +
 pandora_console/include/functions_config.php  |   2 +-
 pandora_console/operation/users/user_edit.php | 124 +++++++++---------
 4 files changed, 89 insertions(+), 76 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index 1300e1dccd..b272cc2c56 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -54,7 +54,6 @@ $table_enable->style['name'] = 'font-weight: bold';
 $row = [];
 $row['name'] = ('Enable eHorus');
 $row['control'] = html_print_checkbox_switch('ehorus_enabled', 1, $config['ehorus_enabled'], true);
-$row['button'] = html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"', true);
 $table_enable->data['ehorus_enabled'] = $row;
 
 // Remote config table.
@@ -71,8 +70,8 @@ $table_remote->style['name'] = 'font-weight: bold';
 // Enable eHorus user configuration.
 $row = [];
 $row['name'] = ('Enable eHorus user configuration');
-$row['control'] = html_print_checkbox_switch('ehorus-user-login', 1, $config['ehorus-user-login'], true);
-$table_remote->data['ehorus-user-login'] = $row;
+$row['control'] = html_print_checkbox_switch('ehorus_user_login', 1, $config['ehorus_user_login'], true);
+$table_remote->data['ehorus_user_login'] = $row;
 // User.
 $row = [];
 $row['name'] = __('User');
@@ -145,35 +144,40 @@ if ($config['ehorus_enabled'] && !$custom_field_exists) {
     ui_print_error_message($error_message);
 }
 
+
+hd($_POST);
+echo '<form id="conf_ehorus" method="post">';
+
 // Form enable.
-echo '<form id="form_enable" method="post">';
+echo '<div id="conf_enable">';
 html_print_input_hidden('update_config', 1);
 html_print_table($table_enable);
-echo '</form>';
+echo '</div>';
 
 // Form remote.
-if ($config['ehorus_enabled']) {
-    echo '<form id="form_remote" method="post">';
+    echo '<div id="conf_remote">';
     echo '<fieldset>';
     echo '<legend>'.__('eHorus API').'</legend>';
     html_print_input_hidden('update_config', 1);
     html_print_table($table_remote);
+    echo '</div>';
+    echo '</fieldset>';
     echo '<div class="action-buttons" style="width: '.$table_remote->width.'">';
     html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
     echo '</div>';
-    echo '</fieldset>';
+
+
     echo '</form>';
-}
 
 ?>
 
 <script type="text/javascript">
- $('form#form_enable').css('margin-bottom','20px');
+ $('#conf_enable').css('margin-bottom','20px');
     var showFields = function () {
-        $('form#form_remote').show();
+        $('#conf_remote').show();
     }
     var hideFields = function () {
-        $('form#form_remote').hide();
+        $('#conf_remote').hide();
     }
     var handleEnable = function (event) {
         var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
@@ -186,6 +190,15 @@ if ($config['ehorus_enabled']) {
             $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
         };
     }
+
+    if($('input:checkbox[name="ehorus_enabled"]').is(':checked'))
+    {
+        showFields();
+    }else
+    {
+        hideFields();
+    }
+    
     
     $('input:checkbox[name="ehorus_enabled"]').change(handleEnable);
     
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index a06bd57f1c..40a1a0e06f 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -291,6 +291,8 @@ if ($update_user) {
     $values['timezone'] = (string) get_parameter('timezone');
     $values['default_event_filter'] = (int) get_parameter('default_event_filter');
     $values['default_custom_view'] = (int) get_parameter('default_custom_view');
+    $values['ehorus_user_login_user'] = get_parameter('ehorus_user_login_user', $user_info['ehorus_user_login_user']);
+    $values['ehorus_user_login_pass'] = get_parameter('ehorus_user_login_pass', $user_info['ehorus_user_login_pass']);
     $dashboard = get_parameter('dashboard', '');
     $visual_console = get_parameter('visual_console', '');
 
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index ff092031e6..a1c6953d34 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1353,7 +1353,7 @@ function config_update_config()
                         $error_update[] = __('Enable eHorus');
                     }
 
-                    if (!config_update_value('ehorus-user-login', (int) get_parameter('ehorus-user-login', 0))) {
+                    if (!config_update_value('ehorus_user_login', (int) get_parameter('ehorus_user_login', 0))) {
                         $error_update[] = __('eHorus user login');
                     }
 
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 1299f60583..cfaaadecb4 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -32,6 +32,7 @@ global $config;
 // Load the header.
 require $config['homedir'].'/operation/users/user_edit_header.php';
 
+hd($_POST);
 if (!is_metaconsole()) {
     date_default_timezone_set('UTC');
     include 'include/javascript/timezonepicker/includes/parser.inc';
@@ -101,6 +102,9 @@ if (isset($_GET['modified']) && !$view_mode) {
     }
 
     $upd_info['time_autorefresh'] = (int) get_parameter('time_autorefresh', 0);
+    $upd_info['ehorus_user_login_user'] = get_parameter('ehorus_user_login_user', $user_info['ehorus_user_login_user']);
+    $upd_info['ehorus_user_login_pass'] = get_parameter('ehorus_user_login_pass', $user_info['ehorus_user_login_pass']);
+
 
     $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $id);
 
@@ -614,8 +618,46 @@ if (!is_metaconsole()) {
                 <div class="edit_user_comments">'.$comments.'</div>
             </div>    
         </div>';
-if ($config['ehorus_enabled'] && $config['ehorus-user-login']) {
-    ehorus_user_login_conf();
+if ($config['ehorus_enabled'] && $config['ehorus_user_login']) {
+    // eHorus user login
+    $table_remote = new StdClass();
+    $table_remote->data = [];
+    $table_remote->width = '100%';
+    $table_remote->styleTable = 'margin-bottom: 10px;';
+    $table_remote->id = 'ehorus_user_login';
+    $table_remote->class = 'ehorus_user_login white_box';
+    $table_remote->size['name'] = '30%';
+    $table_remote->style['name'] = 'font-weight: bold';
+
+    // User.
+    $row = [];
+    $row['name'] = __('User');
+    $row['control'] = html_print_input_text('ehorus_user_login_user', $user_info['ehorus_user_login_user'], '', 30, 100, true);
+    $table_remote->data['ehorus_user_login_user'] = $row;
+
+    // Pass.
+    $row = [];
+    $row['name'] = __('Password');
+    $row['control'] = html_print_input_password('ehorus_user_login_pass', io_output_password($user_info['ehorus_user_login_pass']), '', 30, 100, true);
+    $table_remote->data['ehorus_user_login_pass'] = $row;
+
+    // Test.
+    $ehorus_port = db_get_value('value', 'tconfig', 'token', 'ehorus_port');
+    $ehorus_host = db_get_value('value', 'tconfig', 'token', 'ehorus_hostname');
+
+    $row = [];
+    $row['name'] = __('Test');
+    $row['control'] = html_print_button(__('Start'), 'test-ehorus', false, 'ehorus_connection_test(&quot;'.$ehorus_host.'&quot;,'.$ehorus_port.')', 'class="sub next"', true);
+    $row['control'] .= '<span id="test-ehorus-spinner" style="display:none;">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
+    $row['control'] .= '<span id="test-ehorus-success" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
+    $row['control'] .= '<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
+    $row['control'] .= '<span id="test-ehorus-message" style="display:none;"></span>';
+    $table_remote->data['ehorus_test'] = $row;
+
+    echo '<div class="ehorus_user_acces white_box">';
+    html_print_input_hidden('update_config', 1);
+    html_print_table($table_remote);
+    echo '</div>';
 }
 
 
@@ -727,58 +769,16 @@ if (!defined('METACONSOLE')) {
             });
         });
     </script>
-
     <?php
     // Include OpenLayers and timezone user map library.
     echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/timezonepicker/lib/jquery.timezone-picker.min.js').'"></script>'."\n\t";
     echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/timezonepicker/lib/jquery.maphilight.min.js').'"></script>'."\n\t";
     // Closes no meta condition.
-}function ehorus_user_login_conf()
+}
+
+
+function ehorus_user_login_conf()
 {
-    // eHorus user login
-    $table_remote = new StdClass();
-    $table_remote->data = [];
-    $table_remote->width = '100%';
-    $table_remote->styleTable = 'margin-bottom: 10px;';
-    $table_remote->id = 'ehorus-user-login';
-    $table_remote->class = 'ehorus-user-login white_box';
-    $table_remote->size['name'] = '30%';
-    $table_remote->style['name'] = 'font-weight: bold';
-
-    // User.
-    $row = [];
-    $row['name'] = __('User');
-    $row['control'] = html_print_input_text('ehorus_user', $config['ehorus_user'], '', 30, 100, true);
-    $table_remote->data['ehorus_user'] = $row;
-
-    // Pass.
-    $row = [];
-    $row['name'] = __('Password');
-    $row['control'] = html_print_input_password('ehorus_pass', io_output_password($config['ehorus_pass']), '', 30, 100, true);
-    $table_remote->data['ehorus_pass'] = $row;
-
-    // Test.
-    $ehorus_port = db_get_value('value', 'tconfig', 'token', 'ehorus_port');
-    $ehorus_host = db_get_value('value', 'tconfig', 'token', 'ehorus_hostname');
-
-    $row = [];
-    $row['name'] = __('Test');
-    $row['control'] = html_print_button(__('Start'), 'test-ehorus', false, 'ehorus_connection_test('.$ehorus_host.','.$ehorus_port.')', 'class="sub next"', true);
-    $row['control'] .= '<span id="test-ehorus-spinner" style="display:none;">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
-    $row['control'] .= '<span id="test-ehorus-success" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
-    $row['control'] .= '<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
-    $row['control'] .= '&nbsp;<span id="test-ehorus-message" style="display:none;"></span>';
-    $table_remote->data['ehorus_test'] = $row;
-
-    echo '                <div class="ehorus-userlogin white_box">
-
-<p class="edit_user_labels">'._('eHorus login').ui_print_help_tip(
-        __('This will activate autorefresh in selected pages'),
-        true
-    ).'</p>';
-    html_print_input_hidden('update_config', 1);
-    html_print_table($table_remote);
-    echo '</div>';
 
 }
 
@@ -1108,41 +1108,41 @@ function show_double_auth_deactivation () {
         .show();
 }
 
-function ehorus_connection_test (host, port) {
-        var user = $('input#text-ehorus_user').val();
-        var pass = $('input#password-ehorus_pass').val();
-    
+function ehorus_connection_test(host, port) {
+        var user = $('input#text-ehorus_user_login_user').val();
+        var pass = $('input#password-ehorus_user_login_pass').val();
     
+        debugger;
         var badRequestMessage = '<?php echo __('Empty user or password'); ?>';
         var notFoundMessage = '<?php echo __('User not found'); ?>';
         var invalidPassMessage = '<?php echo __('Invalid password'); ?>';
         
         var hideLoadingImage = function () {
-            $('span#test-ehorus-spinner').hide();
+            $('#test-ehorus-spinner').hide();
         }
         var showLoadingImage = function () {
-            $('span#test-ehorus-spinner').show();
+            $('#test-ehorus-spinner').show();
         }
         var hideSuccessImage = function () {
-            $('span#test-ehorus-success').hide();
+            $('#test-ehorus-success').hide();
         }
         var showSuccessImage = function () {
-            $('span#test-ehorus-success').show();
+            $('#test-ehorus-success').show();
         }
         var hideFailureImage = function () {
-            $('span#test-ehorus-failure').hide();
+            $('#test-ehorus-failure').hide();
         }
         var showFailureImage = function () {
-            $('span#test-ehorus-failure').show();
+            $('#test-ehorus-failure').show();
         }
         var hideMessage = function () {
-            $('span#test-ehorus-message').hide();
+            $('#test-ehorus-message').hide();
         }
         var showMessage = function () {
-            $('span#test-ehorus-message').show();
+            $('#test-ehorus-message').show();
         }
         var changeTestMessage = function (message) {
-            $('span#test-ehorus-message').text(message);
+            $('#test-ehorus-message').text(message);
         }
         
         hideSuccessImage();
@@ -1154,7 +1154,6 @@ function ehorus_connection_test (host, port) {
             url: 'https://' + host + ':' + port + '/login',
             type: 'POST',
             dataType: 'json',
-            timeout: timeout ? timeout * 1000 : 0,
             data: {
                 user: user,
                 pass: pass
@@ -1187,5 +1186,4 @@ function ehorus_connection_test (host, port) {
             hideLoadingImage();
         });
     }
-    $('input#button-test-ehorus').click(handleTest);
 </script>

From 27096276ec24bf91a0c54856b5b4d4d38289c32d Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Mon, 13 May 2019 15:00:29 +0200
Subject: [PATCH 03/13] agent view user acces ehorus

Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
---
 pandora_console/extras/mr/28.sql              |  4 ++
 .../godmode/setup/setup_ehorus.php            | 49 ++++---------
 pandora_console/operation/agentes/ehorus.php  |  6 ++
 .../operation/agentes/ver_agente.php          | 69 +++++++++++--------
 4 files changed, 65 insertions(+), 63 deletions(-)

diff --git a/pandora_console/extras/mr/28.sql b/pandora_console/extras/mr/28.sql
index e4dfe8fe9b..70e342821c 100644
--- a/pandora_console/extras/mr/28.sql
+++ b/pandora_console/extras/mr/28.sql
@@ -2,4 +2,8 @@ START TRANSACTION;
 
 DELETE FROM `tevent_response` WHERE `name` LIKE 'Create&#x20;Integria&#x20;IMS&#x20;incident&#x20;from&#x20;event';
 
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_pass` VARCHAR(45);
+
+
 COMMIT;
diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index b272cc2c56..e0cf119c44 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -52,7 +52,7 @@ $table_enable->style['name'] = 'font-weight: bold';
 
 // Enable eHorus.
 $row = [];
-$row['name'] = ('Enable eHorus');
+$row['name'] = __('Enable eHorus');
 $row['control'] = html_print_checkbox_switch('ehorus_enabled', 1, $config['ehorus_enabled'], true);
 $table_enable->data['ehorus_enabled'] = $row;
 
@@ -66,12 +66,6 @@ $table_remote->class = 'databox filters';
 $table_remote->size['name'] = '30%';
 $table_remote->style['name'] = 'font-weight: bold';
 
-
-// Enable eHorus user configuration.
-$row = [];
-$row['name'] = ('Enable eHorus user configuration');
-$row['control'] = html_print_checkbox_switch('ehorus_user_login', 1, $config['ehorus_user_login'], true);
-$table_remote->data['ehorus_user_login'] = $row;
 // User.
 $row = [];
 $row['name'] = __('User');
@@ -114,6 +108,7 @@ $row['control'] .= '<span id="test-ehorus-success" style="display:none;">&nbsp;'
 $row['control'] .= '<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
 $row['control'] .= '&nbsp;<span id="test-ehorus-message" style="display:none;"></span>';
 $table_remote->data['ehorus_test'] = $row;
+
 // Print.
 echo '<div style="text-align: center; padding-bottom: 20px;">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
@@ -144,62 +139,49 @@ if ($config['ehorus_enabled'] && !$custom_field_exists) {
     ui_print_error_message($error_message);
 }
 
-
-hd($_POST);
-echo '<form id="conf_ehorus" method="post">';
-
 // Form enable.
-echo '<div id="conf_enable">';
+echo '<form id="form_enable" method="post">';
 html_print_input_hidden('update_config', 1);
 html_print_table($table_enable);
-echo '</div>';
+echo '</form>';
 
 // Form remote.
-    echo '<div id="conf_remote">';
+if ($config['ehorus_enabled']) {
+    echo '<form id="form_remote" method="post">';
     echo '<fieldset>';
     echo '<legend>'.__('eHorus API').'</legend>';
     html_print_input_hidden('update_config', 1);
     html_print_table($table_remote);
-    echo '</div>';
-    echo '</fieldset>';
     echo '<div class="action-buttons" style="width: '.$table_remote->width.'">';
     html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
     echo '</div>';
-
-
+    echo '</fieldset>';
     echo '</form>';
+}
 
 ?>
 
 <script type="text/javascript">
- $('#conf_enable').css('margin-bottom','20px');
+ $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
+ $('form#form_remote').hide();
+ $('form#form_enable').css('margin-bottom','20px');
     var showFields = function () {
-        $('#conf_remote').show();
+        $('form#form_remote').show();
     }
     var hideFields = function () {
-        $('#conf_remote').hide();
+        $('form#form_remote').hide();
     }
     var handleEnable = function (event) {
         var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
         if (event.target.value == '1' && is_checked) {
             showFields();
-            $('input:checkbox[name="ehorus_enabled"]').attr('checked', true);
+            $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
         }
         else {
             hideFields();
-            $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
+            $('input:checkbox[name="ehorus_enabled"]').attr('checked', true);
         };
     }
-
-    if($('input:checkbox[name="ehorus_enabled"]').is(':checked'))
-    {
-        showFields();
-    }else
-    {
-        hideFields();
-    }
-    
-    
     $('input:checkbox[name="ehorus_enabled"]').change(handleEnable);
     
     var handleTest = function (event) {
@@ -246,7 +228,6 @@ echo '</div>';
         hideFailureImage();
         hideMessage();
         showLoadingImage();
-
         $.ajax({
             url: 'https://' + host + ':' + port + '/login',
             type: 'POST',
diff --git a/pandora_console/operation/agentes/ehorus.php b/pandora_console/operation/agentes/ehorus.php
index 51fca3a801..aebf1ab0ef 100644
--- a/pandora_console/operation/agentes/ehorus.php
+++ b/pandora_console/operation/agentes/ehorus.php
@@ -58,6 +58,12 @@ $curl_timeout = $config['ehorus_req_timeout'];
 
 $base_url = 'https://'.$hostname.':'.$port;
 
+// If user login is enabled, fetch user and pass from user info
+if ($config['ehorus_user_login']) {
+    $user = $user_info['ehorus_user_login_user'];
+    $password = io_safe_output(io_output_password($user_info['ehorus_user_login_pass']));
+}
+
 // Get the login auth token
 $login_path = '/api/login';
 $body = [
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 5578b9182f..b7e0662947 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1260,38 +1260,49 @@ if (enterprise_installed() && $config['log_collector']) {
 
 // EHorus tab.
 if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
-    && (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') || is_user_admin($config['id_user']))
+    && (check_acl_one_of_groups(
+        $config['id_user'],
+        $all_groups,
+        '
+    '
+    ) || is_user_admin($config['id_user']))
 ) {
-    $ehorus_agent_id = agents_get_agent_custom_field($id_agente, $config['ehorus_custom_field']);
-    if (!empty($ehorus_agent_id)) {
-        $tab_url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=ehorus&id_agente='.$id_agente;
-        $ehorus_tab['text'] = '<a href="'.$tab_url.'" class="ehorus_tab">'.html_print_image('images/ehorus/ehorus.png', true, [ 'title' => __('eHorus')]).'</a>';
+    $user_info;
+    $user_info = users_get_user_by_id($config['id_user']);
+    if ($config['ehorus_user_login'] && !$user_info['ehorus_user_login_user'] && !$user_info['ehorus_user_login_pass']) {
+        // If ehorus user configuration is enabled, and no password provided, do nothing.
+    } else {
+        $ehorus_agent_id = agents_get_agent_custom_field($id_agente, $config['ehorus_custom_field']);
+        if (!empty($ehorus_agent_id)) {
+            $tab_url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=ehorus&id_agente='.$id_agente;
+            $ehorus_tab['text'] = '<a href="'.$tab_url.'" class="ehorus_tab">'.html_print_image('images/ehorus/ehorus.png', true, [ 'title' => __('eHorus')]).'</a>';
 
-        // Hidden subtab layer.
-        $ehorus_tab['sub_menu'] = '<ul class="mn subsubmenu" style="float:none;">';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_terminal" href="'.$tab_url.'&client_tab=terminal">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/terminal.png', true, [ 'title' => __('Terminal')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_display" href="'.$tab_url.'&client_tab=display">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/vnc.png', true, [ 'title' => __('Display')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_processes" href="'.$tab_url.'&client_tab=processes">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/processes.png', true, [ 'title' => __('Processes')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_services" href="'.$tab_url.'&client_tab=services">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/services.png', true, [ 'title' => __('Services')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '<a class="tab_files" href="'.$tab_url.'&client_tab=files">';
-        $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/files.png', true, [ 'title' => __('Files')]);
-        $ehorus_tab['sub_menu'] .= '</li>';
-        $ehorus_tab['sub_menu'] .= '</a>';
-        $ehorus_tab['sub_menu'] .= '</ul>';
+            // Hidden subtab layer.
+            $ehorus_tab['sub_menu'] = '<ul class="mn subsubmenu" style="float:none;">';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_terminal" href="'.$tab_url.'&client_tab=terminal">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/terminal.png', true, [ 'title' => __('Terminal')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_display" href="'.$tab_url.'&client_tab=display">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/vnc.png', true, [ 'title' => __('Display')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_processes" href="'.$tab_url.'&client_tab=processes">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/processes.png', true, [ 'title' => __('Processes')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_services" href="'.$tab_url.'&client_tab=services">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/services.png', true, [ 'title' => __('Services')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '<a class="tab_files" href="'.$tab_url.'&client_tab=files">';
+            $ehorus_tab['sub_menu'] .= '<li class="nomn tab_godmode" style="text-align: center;">'.html_print_image('images/ehorus/files.png', true, [ 'title' => __('Files')]);
+            $ehorus_tab['sub_menu'] .= '</li>';
+            $ehorus_tab['sub_menu'] .= '</a>';
+            $ehorus_tab['sub_menu'] .= '</ul>';
 
-        $ehorus_tab['active'] = $tab == 'ehorus';
+            $ehorus_tab['active'] = $tab == 'ehorus';
+        }
     }
 }
 

From 14717a6c6de45a3af61df5ef40fca383485b0b58 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Mon, 13 May 2019 15:15:14 +0200
Subject: [PATCH 04/13] Fixed merge conflict

Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
---
 pandora_console/godmode/setup/setup_ehorus.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index a3f109e463..4ade28a97f 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -67,6 +67,12 @@ $table_remote->class = 'databox filters';
 $table_remote->size['name'] = '30%';
 $table_remote->style['name'] = 'font-weight: bold';
 
+// Enable eHorus user configuration.
+$row = [];
+$row['name'] = ('Enable eHorus user configuration');
+$row['control'] = html_print_checkbox_switch('ehorus_user_login', 1, $config['ehorus_user_login'], true);
+$table_remote->data['ehorus_user_login'] = $row;
+
 // User.
 $row = [];
 $row['name'] = __('User');

From ce34adb9d861c38898a6394172efa868ca100dd0 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Mon, 13 May 2019 17:28:23 +0200
Subject: [PATCH 05/13] Fixed errors and corrected style

Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
---
 .../godmode/users/configure_user.php          |  2 +-
 pandora_console/include/styles/pandora.css    |  3 ++-
 .../operation/agentes/ver_agente.php          |  4 +---
 pandora_console/operation/users/user_edit.php | 24 +++++++++----------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 40a1a0e06f..8df7f9d6f9 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -292,7 +292,7 @@ if ($update_user) {
     $values['default_event_filter'] = (int) get_parameter('default_event_filter');
     $values['default_custom_view'] = (int) get_parameter('default_custom_view');
     $values['ehorus_user_login_user'] = get_parameter('ehorus_user_login_user', $user_info['ehorus_user_login_user']);
-    $values['ehorus_user_login_pass'] = get_parameter('ehorus_user_login_pass', $user_info['ehorus_user_login_pass']);
+    $values['ehorus_user_login_pass'] = get_parameter(io_input_password((string) get_parameter('ehorus_user_login_pass', $user_info['ehorus_user_login_pass'])));
     $dashboard = get_parameter('dashboard', '');
     $visual_console = get_parameter('visual_console', '');
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index ba026abbda..9e7bbbb53e 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4862,7 +4862,8 @@ input:checked + .p-slider:before {
 }
 
 .user_edit_first_row,
-.user_edit_second_row {
+.user_edit_second_row,
+.user_edit_third_row {
   margin-bottom: 20px;
 }
 
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index b7e0662947..7c322e1846 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1263,11 +1263,9 @@ if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
     && (check_acl_one_of_groups(
         $config['id_user'],
         $all_groups,
-        '
-    '
+        'AW'
     ) || is_user_admin($config['id_user']))
 ) {
-    $user_info;
     $user_info = users_get_user_by_id($config['id_user']);
     if ($config['ehorus_user_login'] && !$user_info['ehorus_user_login_user'] && !$user_info['ehorus_user_login_pass']) {
         // If ehorus user configuration is enabled, and no password provided, do nothing.
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index cfaaadecb4..f82bea9a40 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -32,7 +32,6 @@ global $config;
 // Load the header.
 require $config['homedir'].'/operation/users/user_edit_header.php';
 
-hd($_POST);
 if (!is_metaconsole()) {
     date_default_timezone_set('UTC');
     include 'include/javascript/timezonepicker/includes/parser.inc';
@@ -618,17 +617,18 @@ if (!is_metaconsole()) {
                 <div class="edit_user_comments">'.$comments.'</div>
             </div>    
         </div>';
+
 if ($config['ehorus_enabled'] && $config['ehorus_user_login']) {
-    // eHorus user login
+    // eHorus user remote login
     $table_remote = new StdClass();
     $table_remote->data = [];
     $table_remote->width = '100%';
-    $table_remote->styleTable = 'margin-bottom: 10px;';
-    $table_remote->id = 'ehorus_user_login';
-    $table_remote->class = 'ehorus_user_login white_box';
+    $table_remote->id = 'ehorus-remote-setup';
+    $table_remote->class = 'white_box';
     $table_remote->size['name'] = '30%';
     $table_remote->style['name'] = 'font-weight: bold';
 
+
     // User.
     $row = [];
     $row['name'] = __('User');
@@ -648,21 +648,18 @@ if ($config['ehorus_enabled'] && $config['ehorus_user_login']) {
     $row = [];
     $row['name'] = __('Test');
     $row['control'] = html_print_button(__('Start'), 'test-ehorus', false, 'ehorus_connection_test(&quot;'.$ehorus_host.'&quot;,'.$ehorus_port.')', 'class="sub next"', true);
-    $row['control'] .= '<span id="test-ehorus-spinner" style="display:none;">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
-    $row['control'] .= '<span id="test-ehorus-success" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
-    $row['control'] .= '<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
+    $row['control'] .= '&nbsp;<span id="test-ehorus-spinner" style="display:none;">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
+    $row['control'] .= '&nbsp;<span id="test-ehorus-success" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
+    $row['control'] .= '&nbsp;<span id="test-ehorus-failure" style="display:none;">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
     $row['control'] .= '<span id="test-ehorus-message" style="display:none;"></span>';
     $table_remote->data['ehorus_test'] = $row;
 
-    echo '<div class="ehorus_user_acces white_box">';
-    html_print_input_hidden('update_config', 1);
+
     html_print_table($table_remote);
-    echo '</div>';
 }
 
 
-
-    echo '<div class="edit_user_button">';
+echo '<div class="edit_user_button">';
 if (!$config['user_can_update_info']) {
     echo '<i>'.__('You can not change your user info under the current authentication scheme').'</i>';
 } else {
@@ -671,6 +668,7 @@ if (!$config['user_can_update_info']) {
 }
 
     echo '</div>';
+    echo '</form>';
 
 echo '<div id="edit_user_profiles" class="white_box">';
 if (!defined('METACONSOLE')) {

From 860a4cdbf206310535107e755aefee727d2c92b4 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Mon, 13 May 2019 17:57:21 +0200
Subject: [PATCH 06/13] Updated pandoradb and migrate

Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
---
 pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 3 +++
 pandora_console/pandoradb.sql                                 | 2 ++
 2 files changed, 5 insertions(+)

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 e706124436..7f06f84420 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
@@ -1269,6 +1269,9 @@ alter table tusuario add autorefresh_white_list text not null default '';
 ALTER TABLE tusuario ADD COLUMN `time_autorefresh` int(5) unsigned NOT NULL default '30';
 ALTER TABLE `tusuario` DROP COLUMN `flash_chart`;
 ALTER TABLE `tusuario` ADD COLUMN `default_custom_view` int(10) unsigned NULL default '0';
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_pass` VARCHAR(45);
+
 
 -- ---------------------------------------------------------------------
 -- Table `tagente_modulo`
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 8a76bf4f0c..6f8dbf22be 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1145,6 +1145,8 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
 	`autorefresh_white_list` text not null default '',
 	`time_autorefresh` int(5) unsigned NOT NULL default '30',
 	`default_custom_view` int(10) unsigned NULL default '0',
+	`ehorus_user_login_user` VARCHAR(60),
+	`ehorus_user_login_pass` VARCHAR(45),
 	CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
 	UNIQUE KEY `id_user` (`id_user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From a0faffe16186c1c21d808313eb926429c8afa383 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Thu, 16 May 2019 18:59:17 +0200
Subject: [PATCH 07/13] Form eHorus user login with title

Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
---
 pandora_console/operation/users/user_edit.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index f82bea9a40..2cf575777d 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -629,6 +629,11 @@ if ($config['ehorus_enabled'] && $config['ehorus_user_login']) {
     $table_remote->style['name'] = 'font-weight: bold';
 
 
+    // Title
+    $row = [];
+    $row['control'] = '<p class="edit_user_labels">'.__('eHorus user configuration').': </p>';
+    $table_remote->data['ehorus_user_login'] = $row;
+
     // User.
     $row = [];
     $row['name'] = __('User');
@@ -654,8 +659,10 @@ if ($config['ehorus_enabled'] && $config['ehorus_user_login']) {
     $row['control'] .= '<span id="test-ehorus-message" style="display:none;"></span>';
     $table_remote->data['ehorus_test'] = $row;
 
+    echo '<div class="ehorus_user_conf">';
 
     html_print_table($table_remote);
+     echo '</div>';
 }
 
 

From 3736d84589a118256723f095c813529c3bc1cd51 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Mon, 27 May 2019 18:49:47 +0200
Subject: [PATCH 08/13] Edit ehorus user

---
 pandora_console/extras/mr/28.sql              |    6 +-
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |    6 +-
 .../godmode/users/configure_user.php          |   44 +
 pandora_console/install.php                   | 1105 -----------------
 pandora_console/pandoradb.sql                 |    5 +-
 5 files changed, 55 insertions(+), 1111 deletions(-)
 delete mode 100644 pandora_console/install.php

diff --git a/pandora_console/extras/mr/28.sql b/pandora_console/extras/mr/28.sql
index 71bc92479f..329d01e30e 100644
--- a/pandora_console/extras/mr/28.sql
+++ b/pandora_console/extras/mr/28.sql
@@ -16,8 +16,10 @@ INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `als
 UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System&#x20;status' OR `description` = 'Official&#x20;communication';
 UPDATE `tnotification_source` SET `icon`="icono_logo_pandora.png" WHERE `description` = 'Official&#x20;communication';
 
-ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_user` VARCHAR(60);
-ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_pass` VARCHAR(45);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_pass` VARCHAR(45);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_acces` TINYINT(1) DEFAULT '1';
+
 
 
 COMMIT;
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 cdaa54c414..0cf24c3552 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
@@ -1288,8 +1288,10 @@ alter table tusuario add autorefresh_white_list text not null default '';
 ALTER TABLE tusuario ADD COLUMN `time_autorefresh` int(5) unsigned NOT NULL default '30';
 ALTER TABLE `tusuario` DROP COLUMN `flash_chart`;
 ALTER TABLE `tusuario` ADD COLUMN `default_custom_view` int(10) unsigned NULL default '0';
-ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_user` VARCHAR(60);
-ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_login_pass` VARCHAR(45);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_pass` VARCHAR(45);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_acces` TINYINT(1);
+
 
 
 -- ---------------------------------------------------------------------
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 9118b5b9e4..2ae6a83396 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -151,6 +151,11 @@ if ($new_user && $config['admin_can_add_user']) {
         $user_info['metaconsole_assigned_server'] = '';
         $user_info['metaconsole_access_node'] = 0;
     }
+
+    if ($config['ehorus_user_level_conf']) {
+        $user_info['ehorus_user_level_user'] = '';
+        $user_info['ehorus_user_level_pass'] = '';
+    }
 }
 
 if ($create_user) {
@@ -215,6 +220,13 @@ if ($create_user) {
     $values['strict_acl'] = (bool) get_parameter('strict_acl', false);
     $values['session_time'] = (int) get_parameter('session_time', 0);
 
+    // eHorus user level conf
+    if ($config['ehorus_user_level_conf']) {
+        $values['ehorus_user_acces'] = (bool) get_parameter('ehorus_user_acces', true);
+        $values['ehorus_user_level_user'] = (string) get_parameter('ehorus_user_level_user', '');
+        $values['ehorus_user_level_pass'] = (string) get_parameter('ehorus_user_level_pass', '');
+    }
+
     if ($id == '') {
         ui_print_error_message(__('User ID cannot be empty'));
         $user_info = $values;
@@ -762,6 +774,7 @@ if (enterprise_installed() && !is_metaconsole()) {
     $values['Dashboard'] = __('Dashboard');
 }
 
+
 $table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info['section']), 'show_data_section();', '', -1, true, false, false);
 
 if (enterprise_installed()) {
@@ -844,6 +857,16 @@ foreach ($event_filter_data as $filter) {
 $table->data[16][0] = __('Default event filter');
 $table->data[16][1] = html_print_select($event_filter, 'default_event_filter', $user_info['default_event_filter'], '', '', __('None'), true, false, false);
 
+if ($config['ehorus_user_level_conf']) {
+    $table->data[17][0] = __('Ehorus configuration at user level');
+    $table->data[17][1] = html_print_checkbox('ehorus_user_acces', 1, $config['ehorus_user_level_conf'], true);
+    $table->data[18][0] = __('eHorus user');
+    $table->data[19][0] = __('eHorys password');
+    $table->data[18][1] = html_print_input_text('ehorus_user_level_user', $user_info['ehorus_user_level_user'], '', 15, 45, true);
+    $table->data[19][1] = html_print_input_password('ehorus_user_level_pass', io_output_password($user_info['ehorus_user_level_pass']), '', 15, 45, true);
+}
+
+
 if ($meta) {
     enterprise_include_once('include/functions_metaconsole.php');
 
@@ -935,6 +958,11 @@ $(document).ready (function () {
     $('#checkbox-metaconsole_agents_manager').trigger('change');
     
     show_data_section();
+    $('#checkbox-ehorus_user_acces').change(function () {
+        switch_ehorus_conf();
+    });
+    $('#checkbox-ehorus_user_acces').trigger('change');
+
 });
 
 function show_data_section () {
@@ -989,5 +1017,21 @@ function show_data_section () {
     }
 }
 
+function switch_ehorus_conf()
+{
+    if(!$('#checkbox-ehorus_user_acces').prop('checked')) 
+    {
+        $("#user_configuration_table-18").hide();
+        $("#user_configuration_table-19").hide();
+
+    }else
+    {
+        $("#user_configuration_table-18").show();
+        $("#user_configuration_table-19").show()   
+    }
+
+
+}
+
 /* ]]> */
 </script>
diff --git a/pandora_console/install.php b/pandora_console/install.php
deleted file mode 100644
index 43c941b797..0000000000
--- a/pandora_console/install.php
+++ /dev/null
@@ -1,1105 +0,0 @@
-<?php
-/**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
- *
- * @category   Extensions
- * @package    Pandora FMS
- * @subpackage Community
- * @version    1.0.0
- * @license    See below
- *
- *    ______                 ___                    _______ _______ ________
- *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
- *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
- * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
- *
- * ============================================================================
- * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
- * Please see http://pandorafms.org for full contribution list
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation for version 2.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * ============================================================================
- */
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>Pandora FMS - Installation Wizard</title>
-        <meta http-equiv="expires" content="0">
-        <meta http-equiv="content-type" content="text/html; charset=utf-8">
-        <meta name="resource-type" content="document">
-        <meta name="distribution" content="global">
-        <meta name="author" content="Pandora FMS Development Team">
-        <meta name="copyright" content="This is GPL software. Created by Sancho Lerena and many others">
-        <meta name="keywords" content="pandora, fms, monitoring, network, system, GPL, software">
-        <meta name="robots" content="index, follow">
-        <link rel="icon" href="images/pandora.ico" type="image/ico">
-        <link rel="stylesheet" href="include/styles/install.css" type="text/css">
-    </head>
-    <script type="text/javascript">
-        options_text = new Array('An existing Database','A new Database');
-        options_values = new Array('db_exist','db_new');
-
-        var userHasConfirmed = false;
-
-        function ChangeDBDrop(causer) {
-            if (causer.value != 'db_exist') {
-                window.document.step2_form.drop.checked = 0;
-                window.document.step2_form.drop.disabled = 1;
-            }
-            else {
-                window.document.step2_form.drop.disabled = 0;
-            }
-        }
-        function ChangeDBAction(causer) {
-            var i = 0;
-            if (causer.value == 'oracle') {
-                window.document.step2_form.db_action.length = 1;
-            }
-            else {
-                window.document.step2_form.db_action.length = 2;
-            }
-            while (i < window.document.step2_form.db_action.length) {
-                window.document.step2_form.db_action.options[i].value = options_values[i];
-                window.document.step2_form.db_action.options[i].text = options_text[i];
-                i++;
-            }
-            window.document.step2_form.db_action.options[window.document.step2_form.db_action.length-1].selected=1;
-            ChangeDBDrop(window.document.step2_form.db_action);
-        }
-        function CheckDBhost(value){
-            if (( value != "localhost") && ( value != "127.0.0.1")) {
-                document.getElementById('tr_dbgrant').style["display"] = "block";
-            }
-            else {
-                document.getElementById('tr_dbgrant').style["display"] = "none";
-            }
-        }
-        function popupShow(){
-            document.getElementsByTagName('body')[0].style["margin"] = "0";
-            document.getElementById('install_container').style["padding-top"] = "45px";
-            document.getElementById('install_container').style["margin-top"] = "0";
-            document.getElementById('add-lightbox').style["visibility"] = "visible";
-            document.getElementById('open_popup').style["display"] = "block";
-            document.getElementById('open_popup').style["visibility"] = "visible";
-        }
-        function popupClose(){
-            document.getElementById('add-lightbox').style["visibility"] = "hidden";
-            document.getElementById('open_popup').style["display"] = "none";
-            document.getElementById('open_popup').style["visibility"] = "hidden";
-        }
-        function handleConfirmClick (event) {
-            userHasConfirmed = true;
-            var step3_form = document.getElementsByName('step2_form')[0];
-            step3_form.submit();
-        }
-        function handleStep3FormSubmit (event) {
-            var dbOverride = document.getElementById("drop").checked;
-            if (dbOverride && !userHasConfirmed) {
-                event.preventDefault();
-                popupShow();
-                return false;
-            }
-        }
-    </script>
-    <body>
-        <div id='add-lightbox' onclick='popupClose();' class='popup-lightbox'></div>
-        <div id='open_popup' class='popup' style='visibility:hidden;display: block;'>
-            <div class='popup-title'>
-                <span id='title_popup'>Warning</span>
-                <a href='#' onclick='popupClose();'><img src='./images/icono_cerrar.png' alt='close' title='Close' style='float:right;'/></a>
-            </div>
-            <div class='popup-inner' style='padding: 20px 40px;'>
-            <?php
-            echo '<p><strong>Attention</strong>, you are going to <strong>overwrite the data</strong> of your current installation.</p><p>This means that if you do not have a backup <strong>you will irremissibly LOSE ALL THE STORED DATA</strong>, the configuration and everything relevant to your installation.</p><p><strong>Are you sure of what you are going to do?</strong></p>';
-                echo "<div style='text-align:right;';>";
-                echo "<button type='button' class='btn_install_next' onclick='javascript:handleConfirmClick();'><span class='btn_install_next_text'>Yes, I'm sure I want to delete everything</span></button>";
-                echo "<button type='button' class='btn_install_next popup-button-green' onclick='javascript:popupClose();'><span class='btn_install_next_text'>Cancel</span></button>";
-                echo '</div>';
-            ?>
-            </div>
-        </div>
-        <div style='height: 10px'>
-            <?php
-            $version = '7.0NG.735';
-            $build = '190527';
-            $banner = "v$version Build $build";
-
-            error_reporting(0);
-
-            // ---------------
-            // Main page code
-            // ---------------
-            if (! isset($_GET['step'])) {
-                install_step1();
-            } else {
-                $step = $_GET['step'];
-                switch ($step) {
-                    case 11: install_step1_licence();
-                    break;
-
-                    case 2: install_step2();
-                    break;
-
-                    case 3: install_step3();
-                    break;
-
-                    case 4: install_step4();
-                    break;
-
-                    case 5: install_step5();
-                    break;
-                }
-            }
-            ?>
-        </div>
-    </body>
-</html>
-
-<?php
-function check_extension($ext, $label)
-{
-    echo '<tr><td>';
-    echo "<span class='arr'> $label </span>";
-    echo '</td><td>';
-    if (!extension_loaded($ext)) {
-        echo "<img src='images/dot_red.png'>";
-        return 1;
-    } else {
-        echo "<img src='images/dot_green.png'>";
-        return 0;
-    }
-
-    echo '</td></tr>';
-}
-
-function check_include($ext, $label)
-{
-    echo '<tr><td>';
-    echo "<span class='arr'> $label </span>";
-    echo '</td><td>';
-    if (!include $ext) {
-        echo "<img src='images/dot_red.png'>";
-        return 1;
-    } else {
-        echo "<img src='images/dot_green.png'>";
-        return 0;
-    }
-
-    echo '</td></tr>';
-}
-
-
-function check_exists($file, $label)
-{
-    echo '<tr><td>';
-    echo "<span class='arr'> $label </span>";
-    echo '</td><td>';
-    if (!file_exists($file)) {
-        echo " <img src='images/dot_red.png'>";
-        return 1;
-    } else {
-        echo " <img src='images/dot_green.png'>";
-        return 0;
-    }
-
-    echo '</td></tr>';
-}
-
-
-function check_generic($ok, $label)
-{
-    echo "<tr><td style='width:10%'>";
-    if ($ok == 0) {
-        echo " <img src='images/dot_red.png'>";
-        echo '<td>';
-        echo "<span class='arr'> $label </span>";
-        echo '</td>';
-        echo '</td></tr>';
-        return 1;
-    } else {
-        echo " <img src='images/dot_green.png'>";
-        echo '<td>';
-        echo "<span class='arr'> $label </span>";
-        echo '</td>';
-        echo '</td></tr>';
-        return 0;
-    }
-}
-
-
-function check_writable($fullpath, $label)
-{
-    echo "<tr><td style='width:10%;'>";
-    if (file_exists($fullpath)) {
-        if (is_writable($fullpath)) {
-            echo " <img style='margin-left:50px;' src='images/dot_green.png'>";
-            echo '<td>';
-            echo "<span class='arr'> $label </span>";
-            echo '</td>';
-            echo '</td></tr>';
-            return 0;
-        } else {
-            echo " <img style='margin-left:50px;' src='images/dot_red.png'>";
-            echo '<td>';
-            echo "<span class='arr'> $label </span>";
-            echo '</td>';
-            echo '</td></tr>';
-            return 1;
-        }
-    } else {
-        echo " <img style='margin-left:50px;' src='images/dot_red.png'>";
-        echo '<td>';
-        echo "<span class='arr'> $label </span>";
-        echo '</td>';
-        echo '</td></tr>';
-        return 1;
-    }
-}
-
-
-function check_variable($var, $value, $label, $mode)
-{
-    echo '<tr><td>';
-    echo "<span class='arr'> $label </span>";
-    echo '</td><td>';
-    if ($mode == 1) {
-        if ($var >= $value) {
-            echo " <img src='images/dot_green.png'>";
-            return 0;
-        } else {
-            echo " <img src='images/dot_red.png'>";
-            return 1;
-        }
-    } else if ($var == $value) {
-        echo " <img src='images/dot_green.png'>";
-        return 0;
-    } else {
-        echo " <img src='images/dot_red.png'>";
-        return 1;
-    }
-
-    echo '</td></tr>';
-}
-
-
-function parse_mysql_dump($url)
-{
-    if (file_exists($url)) {
-        $file_content = file($url);
-        $query = '';
-        foreach ($file_content as $sql_line) {
-            if (trim($sql_line) != '' && strpos($sql_line, '-- ') === false) {
-                $query .= $sql_line;
-                if (preg_match("/;[\040]*\$/", $sql_line)) {
-                    if (!$result = mysql_query($query)) {
-                        echo mysql_error();
-                        // Uncomment for debug
-                        echo "<i><br>$query<br></i>";
-                        return 0;
-                    }
-
-                    $query = '';
-                }
-            }
-        }
-
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-
-function parse_mysqli_dump($connection, $url)
-{
-    if (file_exists($url)) {
-        $file_content = file($url);
-        $query = '';
-        foreach ($file_content as $sql_line) {
-            if (trim($sql_line) != '' && strpos($sql_line, '-- ') === false) {
-                $query .= $sql_line;
-                if (preg_match("/;[\040]*\$/", $sql_line)) {
-                    if (!$result = mysqli_query($connection, $query)) {
-                        echo mysqli_error();
-                        // Uncomment for debug
-                        echo "<i><br>$query<br></i>";
-                        return 0;
-                    }
-
-                    $query = '';
-                }
-            }
-        }
-
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-
-function random_name($size)
-{
-    $temp = '';
-    for ($a = 0; $a < $size; $a++) {
-        $temp = $temp.chr(rand(122, 97));
-    }
-
-    return $temp;
-}
-
-
-function print_logo_status($step, $step_total)
-{
-    global $banner;
-
-    $header = "
-		<div id='logo_img' style='width: 100%;'>
-			<div style='width:100%; background-color:#333333;'>
-				<img src='images/logo_opensource.png' border='0'><br>
-				<span style='font-size: 9px;'>$banner</span>
-			</div>
-		</div>";
-    $header .= "
-		<div class='installation_step'>
-			<b>Install step $step of $step_total</b>
-		</div>";
-
-    return $header;
-}
-
-
-//
-// This function adjusts path settings in pandora db for FreeBSD.
-//
-// All packages and configuration files except operating system's base files
-// are installed under /usr/local in FreeBSD. So, path settings in pandora db
-// for some programs should be changed from the Linux default.
-//
-function adjust_paths_for_freebsd($engine, $connection=false)
-{
-    $adjust_sql = [
-        "update trecon_script set script = REPLACE(script,'/usr/share','/usr/local/share');",
-        "update tconfig set value = REPLACE(value,'/usr/bin','/usr/local/bin') where token='netflow_daemon' OR token='netflow_nfdump' OR token='netflow_nfexpire';",
-        "update talert_commands set command = REPLACE(command,'/usr/bin','/usr/local/bin');",
-        "update talert_commands set command = REPLACE(command,'/usr/share', '/usr/local/share');",
-        "update tplugin set execute = REPLACE(execute,'/usr/share','/usr/local/share');",
-        "update tevent_response set target = REPLACE(target,'/usr/share','/usr/local/share');",
-        "insert into tconfig (token, value) VALUES ('graphviz_bin_dir', '/usr/local/bin');",
-    ];
-
-    for ($i = 0; $i < count($adjust_sql); $i++) {
-        switch ($engine) {
-            case 'mysql':
-                $result = mysql_query($adjust_sql[$i]);
-            break;
-
-            case 'mysqli':
-                $result = mysqli_query($connection, $adjust_sql[$i]);
-            break;
-
-            case 'oracle':
-                // Delete the last semicolon from current query
-                $query = substr($adjust_sql[$i], 0, (strlen($adjust_sql[$i]) - 1));
-                $sql = oci_parse($connection, $query);
-                $result = oci_execute($sql);
-            break;
-
-            case 'pgsql':
-                pg_send_query($connection, $adjust_sql[$i]);
-                $result = pg_get_result($connection);
-            break;
-        }
-
-        if (!$result) {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-
-function install_step1()
-{
-    global $banner;
-
-    echo "
-	<div id='install_container'>
-	<div id='wizard'>
-	".print_logo_status(1, 6)."
-		<div id='install_box'>
-			<h2>Welcome to Pandora FMS installation Wizard</h2>
-			<p>This wizard helps you to quick install Pandora FMS console and main database in your system.</p>
-			<p>In four steps, this installer will check all dependencies and will create your configuration, ready to use.</p>
-			<p>For more information, please refer to documentation.<br>
-			<i>Pandora FMS Development Team</i></p>
-		";
-    if (file_exists('include/config.php')) {
-        echo "<div class='warn'><b>Warning:</b> You already have a config.php file. 
-			Configuration and database would be overwritten if you continued.</div>";
-    }
-
-        echo '<br>';
-        echo '<table width=100%>';
-        $writable = check_writable('include', 'Checking if ./include is writable');
-    if (file_exists('include/config.php')) {
-        $writable += check_writable('include/config.php', 'Checking if include/config.php is writable');
-    }
-
-        echo '</table>';
-
-        echo "<div class='warn'><b>Warning:</b> This installer will <b>overwrite and destroy</b> 
-		your existing Pandora FMS configuration and <b>Database</b>. Before continue, 
-		please <b>be sure that you have no valuable Pandora FMS data in your Database</b>.<br>
-		</div>";
-
-        echo "<div class='info'><b>Upgrade</b>: 
-		If you want to upgrade from Pandora FMS 4.x to 5.0 version, please use the migration tool inside /extras directory in this setup.
-		</div>";
-
-        echo '<br>';
-
-    if ($writable == 0) {
-        echo "<div style='text-align:right; width:100%;'>";
-        echo "<a id='step11' href='install.php?step=11'><button type='submit' class='btn_install_next'><span class='btn_install_next_text'>Next</span></button></a>";
-        echo '</div>';
-    } else {
-        echo "<div class='err'><b>ERROR:</b>You need to setup permissions to be able to write in ./include directory</div>";
-    }
-
-        echo '</div>';
-
-        echo "<div style='clear:both;'></div>";
-        echo "
-	</div>
-	<div id='foot_install'>
-		<i>Pandora FMS is an OpenSource Software project registered at 
-		<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
-	</div>
-	</div>";
-}
-
-
-function install_step1_licence()
-{
-    echo "
-	<div id='install_container'>
-	<div id='wizard'>
-	".print_logo_status(2, 6)."
-		<div id='install_box'>
-			<h2>GPL2 Licence terms agreement</h2>
-			<p>Pandora FMS is an OpenSource software project licensed under the GPL2 licence. Pandora FMS includes, as well, another software also licensed under LGPL and BSD licenses. Before continue, <i>you must accept the licence terms.</i>.
-			<p>For more information, please refer to our website at http://pandorafms.org and contact us if you have any kind of question about the usage of Pandora FMS</p>
-<p>If you dont accept the licence terms, please, close your browser and delete Pandora FMS files.</p>
-		";
-
-    if (!file_exists('COPYING')) {
-        echo "<div class='warn'><b>Licence file 'COPYING' is not present in your distribution. This means you have some 'partial' Pandora FMS distribution. We cannot continue without accepting the licence file.</b>";
-        echo '</div>';
-    } else {
-        echo "<form method=post action='install.php?step=2'>";
-        echo "<textarea name='gpl2' cols=52 rows=15 style='width: 100%;'>";
-        echo file_get_contents('COPYING');
-        echo '</textarea>';
-        echo '<p>';
-        echo "<div style='text-align: right;'><button id='btn_accept' class='btn_install_next' type='submit'><span class='btn_install_next_text'>Yes, I accept licence terms</span></button></div>";
-    }
-
-    echo '</div>';
-
-    echo "</div>
-	<div style='clear: both;height: 1px;'><!-- --></div>
-	<div id='foot_install'>
-		<i>Pandora FMS is an OpenSource Software project registered at 
-		<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
-	</div>
-	</div>";
-}
-
-
-function install_step2()
-{
-    echo "
-	<div id='install_container'>
-	<div id='wizard'>
-	".print_logo_status(3, 6)."
-		<div id='install_box'>";
-        echo '<h2>Checking software dependencies</h2>';
-            echo '<table border=0 width=230>';
-            $res = 0;
-            $res += check_variable(phpversion(), '7.0', 'PHP version >= 7.0', 1);
-            $res += check_extension('gd', 'PHP GD extension');
-            $res += check_extension('ldap', 'PHP LDAP extension');
-            $res += check_extension('snmp', 'PHP SNMP extension');
-            $res += check_extension('session', 'PHP session extension');
-            $res += check_extension('gettext', 'PHP gettext extension');
-            $res += check_extension('mbstring', 'PHP Multibyte String');
-            $res += check_extension('zip', 'PHP Zip');
-            $res += check_extension('zlib', 'PHP Zlib extension');
-            $res += check_extension('json', 'PHP json extension');
-            $res += check_extension('curl', 'CURL (Client URL Library)');
-            $res += check_extension('filter', 'PHP filter extension');
-            $res += check_extension('calendar', 'PHP calendar extension');
-    if (PHP_OS == 'FreeBSD') {
-        $res += check_exists('/usr/local/bin/twopi', 'Graphviz Binary');
-    } else if (PHP_OS == 'NetBSD') {
-        $res += check_exists('/usr/pkg/bin/twopi', 'Graphviz Binary');
-    } else if (substr(PHP_OS, 0, 3) == 'WIN') {
-        $res += check_exists("..\\..\\..\\Graphviz\\bin\\twopi.exe", 'Graphviz Binary');
-    } else {
-        $res += check_exists('/usr/bin/twopi', 'Graphviz Binary');
-    }
-
-            echo '<tr><td>';
-            echo "<span style='display: block; font-family: verdana,arial,sans;
-				font-size: 8.5pt;margin-top: 2px; font-weight: bolder;'>DB Engines</span>";
-            echo '</td><td>';
-            echo '</td></tr>';
-            check_extension('mysqli', 'PHP MySQL(mysqli) extension');
-            echo '</table>';
-
-    if ($res > 0) {
-        echo "
-				<div class='err'>You have some incomplete 
-				dependencies. Please correct them or this installer 
-				will not be able to finish your installation.
-				</div>
-				<div class='err'>
-					Remember, if you install any PHP module to comply
-					with these dependences, you <b>need to restart</b>
-					your HTTP/Apache server after it to use the new
-					modules.
-				</div>
-				<div style='text-align:right; width:100%;'>
-				Ignore it. <a id='step3' href='install.php?step=3' style='font-weight: bolder;'><button class='btn_install_next' type='submit'><span class='btn_install_next_text'>Force install Step #3</span></button></a>
-				</div>";
-    } else {
-        echo "<div style='text-align:right; width:100%;'>";
-        echo "<a id='step3' href='install.php?step=3'>
-				<button class='btn_install_next' type='submit'><span class='btn_install_next_text'>Next</span></button></a>";
-        echo '</div>';
-    }
-
-            echo '</div>';
-            echo "<div style='clear: both;'><!-- --></div>";
-            echo "
-		</div>
-		<div style='clear: both;'><!-- --></div>
-	</div>
-	<div id='foot_install'>
-		<i>Pandora FMS is an OpenSource Software project registered at 
-		<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
-	</div>
-	</div>";
-}
-
-
-function install_step3()
-{
-    $options = '';
-    if (extension_loaded('mysql')) {
-        $options .= "<option value='mysql'>MySQL</option>";
-    }
-
-    if (extension_loaded('mysqli')) {
-        $options .= "<option value='mysqli'>MySQL(mysqli)</option>";
-    }
-
-    $error = false;
-    if (empty($options)) {
-        $error = true;
-    }
-
-    echo "
-	<div id='install_container'>
-	<div id='wizard'>
-	".print_logo_status(4, 6)."
-		<div id='install_box'>
-			<h2>Environment and database setup</h2>
-			<p>
-			This wizard will create your Pandora FMS database, 
-			and populate it with all the data needed to run for the first time.
-			</p>
-			<p>
-			You need a privileged user to create database schema, this is usually <b>root</b> user.
-			Information about <b>root</b> user will not be used or stored anymore.	
-			</p>
-			<p>
-			You can also deploy the scheme into an existing Database. 
-			In this case you need a privileged Database user and password of that instance. 
-			</p>
-			<p>
-			Now, please, complete all details to configure your database and environment setup.
-			</p>
-			<div class='warn'>
-			<b>Warning:</b> This installer will <b>overwrite and destroy</b> your existing 
-			Pandora FMS configuration and <b>Database</b>. Before continue, 
-			please <b>be sure that you have no valuable Pandora FMS data in your Database.</b>
-			<br><br>
-			</div>";
-
-    if (extension_loaded('oci8')) {
-        echo " <div class='warn'>For Oracle installation an existing Database with a privileged user is needed.</div>";
-    }
-
-    if (!$error) {
-        echo "<form method='post' name='step2_form' action='install.php?step=4'>";
-    }
-
-    echo "<table cellpadding=6 width=100% border=0 style='text-align: left;'>";
-    echo '<tr><td>';
-    echo 'DB Engine<br>';
-
-    if ($error) {
-        echo "
-			<div class='warn'>
-			<b>Warning:</b> You haven't a any DB engine with PHP. Please check the previous step to DB engine dependencies.
-			</div>";
-    } else {
-        echo "<select name='engine' onChange=\"ChangeDBAction(this)\">";
-        echo $options;
-        echo '</select>';
-
-        echo '<td>';
-        echo ' Installation in <br>';
-        echo "<select name='db_action' onChange=\"ChangeDBDrop(this)\">";
-        echo "<option value='db_new'>A new Database</option>";
-        echo "<option value='db_exist'>An existing Database</option>";
-        echo '</select>';
-    }
-
-    echo "		<tr><td>DB User with privileges<br>
-				<input class='login' type='text' name='user' value='root' size=20>
-				
-				<td>DB Password for this user<br>
-				<input class='login' type='password' name='pass' value='' size=20>
-				
-				<tr><td>DB Hostname<br>
-				<input class='login' type='text' name='host' value='localhost' onkeyup='CheckDBhost(this.value);'size=20>
-				
-				<td>DB Name (pandora by default)<br>
-				<input class='login' type='text' name='dbname' value='pandora' size=20>
-				
-				<tr>";
-
-    // the field dbgrant is only shown when the DB host is different from 127.0.0.1 or localhost
-    echo "<tr id='tr_dbgrant' style='display:none;'>
-                            <td colspan=\"2\">DB Host Access <img style='cursor:help;' src='/pandora_console/images/tip.png' title='Ignored if DB Hostname is localhost or 127.0.0.1'/><br>
-                            <input class='login' type='text' name='dbgrant' value='".$_SERVER['SERVER_ADDR']."' size=20>
-                        </td>
-                    </tr>";
-
-    echo "   <td valign=top>Drop Database if exists<br>
-			        <input class='login' type='checkbox' name='drop' id='drop' value=1>
-			    </td>";
-
-    echo "<td>Full path to HTTP publication directory<br>
-					<span style='font-size: 9px'>For example /var/www/pandora_console/</span>
-				<br>
-				<input class='login' type='text' name='path' style='width: 240px;' 
-				value='".dirname(__FILE__)."'>
-				
-				<tr>";
-    echo '<td>';
-    echo "<td>URL path to Pandora FMS Console<br>
-				<span style='font-size: 9px'>For example '/pandora_console'</span>
-				</br>
-				<input class='login' type='text' name='url' style='width: 250px;' 
-				value='".dirname($_SERVER['SCRIPT_NAME'])."'>
-			</table>
-			";
-
-    if (!$error) {
-        echo "<div style='text-align:right; width:100%;'>";
-        echo "<a id='step4' href='install.php?step=4'>
-					<button class='btn_install_next' type='submit' id='step4button'><span class='btn_install_next_text'>Next</span></button></a>";
-        echo '</div>';
-        ?>
-        <script type="text/javascript">
-            var step3_form = document.getElementsByName('step2_form')[0];
-            step3_form.addEventListener("submit", handleStep3FormSubmit);
-        </script>
-        <?php
-    }
-
-    echo '</div>';
-
-    echo '</form>';
-
-    echo "<div style='clear:both;'></div>";
-    echo "</div>
-		<div id='foot_install'>
-			<i>Pandora FMS is an OpenSource Software project registered at 
-			<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
-		</div>
-	</div>";
-}
-
-
-function install_step4()
-{
-    $pandora_config = 'include/config.php';
-
-    if ((! isset($_POST['user'])) || (! isset($_POST['dbname'])) || (! isset($_POST['host']))
-        || (! isset($_POST['pass'])) || (!isset($_POST['engine'])) || (! isset($_POST['db_action']))
-    ) {
-        $dbpassword = '';
-        $dbuser = '';
-        $dbhost = '';
-        $dbname = '';
-        $engine = '';
-        $dbaction = '';
-        $dbgrant = '';
-    } else {
-        $engine = $_POST['engine'];
-        $dbpassword = $_POST['pass'];
-        $dbuser = $_POST['user'];
-        $dbhost = $_POST['host'];
-        $dbaction = $_POST['db_action'];
-        if (isset($_POST['dbgrant']) && $_POST['dbgrant'] != '') {
-            $dbgrant = $_POST['dbgrant'];
-        } else {
-            $dbgrant = $_SERVER['SERVER_ADDR'];
-        }
-
-        if (isset($_POST['drop'])) {
-            $dbdrop = $_POST['drop'];
-        } else {
-            $dbdrop = 0;
-        }
-
-        $dbname = $_POST['dbname'];
-        if (isset($_POST['url'])) {
-            $url = $_POST['url'];
-        } else {
-            $url = 'http://localhost';
-        }
-
-        if (isset($_POST['path'])) {
-            $path = $_POST['path'];
-            $path = str_replace('\\', '/', $path);
-            // Windows compatibility
-        } else {
-            $path = '/var/www';
-        }
-    }
-
-    $everything_ok = 0;
-    $step1 = 0;
-    $step2 = 0;
-    $step3 = 0;
-    $step4 = 0;
-    $step5 = 0;
-    $step6 = 0;
-    $step7 = 0;
-
-    echo "
-	<div id='install_container'>
-	<div id='wizard'>
-	".print_logo_status(5, 6)."
-		<div id='install_box'>
-			<h2>Creating database and default configuration file</h2>
-			<table width='100%'>";
-    switch ($engine) {
-        case 'mysql':
-            if (! mysql_connect($dbhost, $dbuser, $dbpassword)) {
-                check_generic(0, 'Connection with Database');
-            } else {
-                check_generic(1, 'Connection with Database');
-
-                // Drop database if needed and don't want to install over an existing DB
-                if ($dbdrop == 1) {
-                    mysql_query("DROP DATABASE IF EXISTS `$dbname`");
-                }
-
-                // Create schema
-                if ($dbaction == 'db_new' || $dbdrop == 1) {
-                    $step1 = mysql_query("CREATE DATABASE `$dbname`");
-                    check_generic($step1, "Creating database '$dbname'");
-                } else {
-                    $step1 = 1;
-                }
-
-                if ($step1 == 1) {
-                    $step2 = mysql_select_db($dbname);
-                    check_generic($step2, "Opening database '$dbname'");
-
-                    $step3 = parse_mysql_dump('pandoradb.sql');
-                    check_generic($step3, 'Creating schema');
-
-                    $step4 = parse_mysql_dump('pandoradb_data.sql');
-                    check_generic($step4, 'Populating database');
-                    if (PHP_OS == 'FreeBSD') {
-                        $step_freebsd = adjust_paths_for_freebsd($engine);
-                        check_generic($step_freebsd, 'Adjusting paths in database for FreeBSD');
-                    }
-
-                    $random_password = random_name(8);
-                    $host = $dbhost;
-                    // set default granted origin to the origin of the queries
-                    if (($dbhost != 'localhost') && ($dbhost != '127.0.0.1')) {
-                        $host = $dbgrant;
-                        // if the granted origin is different from local machine, set the valid origin
-                    }
-
-                    $step5 = mysql_query(
-                        "GRANT ALL PRIVILEGES ON `$dbname`.* to pandora@$host 
-								IDENTIFIED BY '".$random_password."'"
-                    );
-                    mysql_query('FLUSH PRIVILEGES');
-                    check_generic($step5, "Established privileges for user pandora. A new random password has been generated: <b>$random_password</b><div class='warn'>Please write it down, you will need to setup your Pandora FMS server, editing the </i>/etc/pandora/pandora_server.conf</i> file</div>");
-
-                    $step6 = is_writable('include');
-                    check_generic($step6, "Write permissions to save config file in './include'");
-
-                    $cfgin = fopen('include/config.inc.php', 'r');
-                    $cfgout = fopen($pandora_config, 'w');
-                    $config_contents = fread($cfgin, filesize('include/config.inc.php'));
-                    $dbtype = 'mysql';
-                    $config_new = '<?php
-							// Begin of automatic config file
-							$config["dbtype"] = "'.$dbtype.'"; //DB type (mysql, postgresql...in future others)
-							$config["dbname"]="'.$dbname.'";			// MySQL DataBase name
-							$config["dbuser"]="pandora";			// DB User
-							$config["dbpass"]="'.$random_password.'";	// DB Password
-							$config["dbhost"]="'.$dbhost.'";			// DB Host
-							$config["homedir"]="'.$path.'";		// Config homedir
-							/*
-							----------Attention--------------------
-							Please note that in certain installations:
-								- reverse proxy.
-								- web server in other ports.
-								- https
-							
-							This variable might be dynamically altered.
-							
-							But it is save as backup in the
-							$config["homeurl_static"]
-							for expecial needs.
-							----------Attention--------------------
-							*/
-							$config["homeurl"]="'.$url.'";			// Base URL
-							$config["homeurl_static"]="'.$url.'";			// Don\'t  delete
-							// End of automatic config file
-							?>';
-                    $step7 = fputs($cfgout, $config_new);
-                    $step7 = ($step7 + fputs($cfgout, $config_contents));
-                    if ($step7 > 0) {
-                        $step7 = 1;
-                    }
-
-                    fclose($cfgin);
-                    fclose($cfgout);
-                    chmod($pandora_config, 0600);
-                    check_generic($step7, "Created new config file at '".$pandora_config."'");
-                }
-            }
-
-            if (($step7 + $step6 + $step5 + $step4 + $step3 + $step2 + $step1) == 7) {
-                $everything_ok = 1;
-            }
-        break;
-
-        case 'mysqli':
-            $connection = mysqli_connect($dbhost, $dbuser, $dbpassword);
-            if (mysqli_connect_error() > 0) {
-                check_generic(0, 'Connection with Database');
-            } else {
-                check_generic(1, 'Connection with Database');
-
-                // Drop database if needed and don't want to install over an existing DB
-                if ($dbdrop == 1) {
-                    mysqli_query($connection, "DROP DATABASE IF EXISTS `$dbname`");
-                }
-
-                // Create schema
-                if ($dbaction == 'db_new' || $dbdrop == 1) {
-                    $step1 = mysqli_query($connection, "CREATE DATABASE `$dbname`");
-                    check_generic($step1, "Creating database '$dbname'");
-                } else {
-                    $step1 = 1;
-                }
-
-                if ($step1 == 1) {
-                    $step2 = mysqli_select_db($connection, $dbname);
-                    check_generic($step2, "Opening database '$dbname'");
-
-                    $step3 = parse_mysqli_dump($connection, 'pandoradb.sql');
-                    check_generic($step3, 'Creating schema');
-
-                    $step4 = parse_mysqli_dump($connection, 'pandoradb_data.sql');
-                    check_generic($step4, 'Populating database');
-                    if (PHP_OS == 'FreeBSD') {
-                        $step_freebsd = adjust_paths_for_freebsd($engine, $connection);
-                        check_generic($step_freebsd, 'Adjusting paths in database for FreeBSD');
-                    }
-
-                    $random_password = random_name(8);
-                    $host = $dbhost;
-                    // set default granted origin to the origin of the queries
-                    if (($dbhost != 'localhost') && ($dbhost != '127.0.0.1')) {
-                        $host = $dbgrant;
-                        // if the granted origin is different from local machine, set the valid origin
-                    }
-
-                    $step5 = mysqli_query(
-                        $connection,
-                        "GRANT ALL PRIVILEGES ON `$dbname`.* to pandora@$host 
-								IDENTIFIED BY '".$random_password."'"
-                    );
-                    mysqli_query($connection, 'FLUSH PRIVILEGES');
-                    check_generic($step5, "Established privileges for user pandora. A new random password has been generated: <b>$random_password</b><div class='warn'>Please write it down, you will need to setup your Pandora FMS server, editing the </i>/etc/pandora/pandora_server.conf</i> file</div>");
-
-                    $step6 = is_writable('include');
-                    check_generic($step6, "Write permissions to save config file in './include'");
-
-                    $cfgin = fopen('include/config.inc.php', 'r');
-                    $cfgout = fopen($pandora_config, 'w');
-                    $config_contents = fread($cfgin, filesize('include/config.inc.php'));
-                    $dbtype = 'mysql';
-                    $config_new = '<?php
-							// Begin of automatic config file
-							$config["dbtype"] = "'.$dbtype.'"; //DB type (mysql, postgresql...in future others)
-							$config["mysqli"] = true;
-							$config["dbname"]="'.$dbname.'";			// MySQL DataBase name
-							$config["dbuser"]="pandora";			// DB User
-							$config["dbpass"]="'.$random_password.'";	// DB Password
-							$config["dbhost"]="'.$dbhost.'";			// DB Host
-							$config["homedir"]="'.$path.'";		// Config homedir
-							/*
-							----------Attention--------------------
-							Please note that in certain installations:
-								- reverse proxy.
-								- web server in other ports.
-								- https
-							
-							This variable might be dynamically altered.
-							
-							But it is save as backup in the
-							$config["homeurl_static"]
-							for expecial needs.
-							----------Attention--------------------
-							*/
-							$config["homeurl"]="'.$url.'";			// Base URL
-							$config["homeurl_static"]="'.$url.'";			// Don\'t  delete
-							// End of automatic config file
-							?>';
-                    $step7 = fputs($cfgout, $config_new);
-                    $step7 = ($step7 + fputs($cfgout, $config_contents));
-                    if ($step7 > 0) {
-                        $step7 = 1;
-                    }
-
-                    fclose($cfgin);
-                    fclose($cfgout);
-                    chmod($pandora_config, 0600);
-                    check_generic($step7, "Created new config file at '".$pandora_config."'");
-                }
-            }
-
-            if (($step7 + $step6 + $step5 + $step4 + $step3 + $step2 + $step1) == 7) {
-                $everything_ok = 1;
-            }
-        break;
-    }
-
-        echo '</table>';
-
-    if ($everything_ok == 1) {
-        echo "<div style='text-align:right; width:100%;'>";
-        echo "<a id='step5' href='install.php?step=5'>
-				<button class='btn_install_next' type='submit'><span class='btn_install_next_text'>Next</span></button></a>";
-        echo '</div>';
-    } else {
-        $info = "<div class='err'><b>There were some problems.
-				Installation was not completed.</b> 
-				<p>Please correct failures before trying again.
-				All database ";
-        if ($engine == 'oracle') {
-            $info .= 'objects ';
-        } else {
-            $info .= 'schemes ';
-        }
-
-        $info .= 'created in this step have been dropped. </p>
-				</div>';
-        echo $info;
-
-        switch ($engine) {
-            case 'mysql':
-                if (mysql_error() != '') {
-                    echo "<div class='err'> <b>ERROR:</b> ".mysql_error().'.</div>';
-                }
-
-                if ($step1 == 1) {
-                    mysql_query("DROP DATABASE $dbname");
-                }
-            break;
-
-            case 'mysqli':
-                if (mysqli_error($connection) != '') {
-                    echo "<div class='err'> <b>ERROR:</b> ".mysqli_error($connection).'.</div>';
-                }
-
-                if ($step1 == 1) {
-                    mysqli_query($connection, "DROP DATABASE $dbname");
-                }
-            break;
-        }
-
-        echo '</div>';
-    }
-
-        echo '</div>';
-        echo "<div style='clear: both;'></div>";
-        echo "
-		</div>
-		<div id='foot_install'>
-			<i>Pandora FMS is an Open Source Software project registered at 
-			<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
-		</div>
-	</div>";
-}
-
-
-function install_step5()
-{
-    echo "
-	<div id='install_container'>
-	<div id='wizard'>
-	".print_logo_status(6, 6)."
-		<div id='install_box'>
-			<h2>Installation complete</h2>
-			<p>For security, you now must manually delete this installer 
-			('<i>install.php</i>') file before trying to access to your Pandora FMS console.
-			<p>You should also install Pandora FMS Servers before trying to monitor anything;
-			please read documentation on how to install it.</p>
-			<p>Default user is <b>'admin'</b> with password <b>'pandora'</b>, 
-			please change it both as soon as possible.</p>
-			<p>Don't forget to check <a href='http://pandorafms.com'>http://pandorafms.com</a> 
-			for updates.
-			<p>Select if you want to rename '<i>install.php</i>'.</p>
-			<form method='post' action='index.php'>
-				<button class='btn_install_next' type='submit' name='rn_file'><span class='btn_install_next_text'>Yes, rename the file</span></button>
-				<input type='hidden' name='rename_file' value='1'>
-			</form>
-			<p><br><b><a id='access_pandora' href='index.php'><button class='btn_install_next' type='submit'><span class='btn_install_next_text'>Click here to access to your Pandora FMS console</span></button></a>.</b>
-			</p>
-		</div>";
-
-    echo "</div>
-	<div id='foot_install'>
-		<i>Pandora FMS is an OpenSource Software project registered at 
-		<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
-	</div>
-</div>";
-}
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index d5b1ca499c..4b3826020a 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1146,8 +1146,9 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
 	`autorefresh_white_list` text not null default '',
 	`time_autorefresh` int(5) unsigned NOT NULL default '30',
 	`default_custom_view` int(10) unsigned NULL default '0',
-	`ehorus_user_login_user` VARCHAR(60),
-	`ehorus_user_login_pass` VARCHAR(45),
+	`ehorus_user_level_user` VARCHAR(60),
+	`ehorus_user_level_pass` VARCHAR(45),
+	`ehorus_user_acces` TINYINT(1),
 	CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
 	UNIQUE KEY `id_user` (`id_user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From 5966367f8f41b2f33fadafee78ad5ed58f506b66 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Tue, 28 May 2019 13:14:42 +0200
Subject: [PATCH 09/13] eHorus user level login conf added in user editor

---
 pandora_console/extras/mr/28.sql              |  2 +-
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |  2 +-
 .../godmode/setup/setup_ehorus.php            |  4 +-
 .../godmode/users/configure_user.php          | 37 ++++++++++++++-----
 pandora_console/include/functions_config.php  |  2 +-
 pandora_console/operation/agentes/ehorus.php  |  6 +--
 .../operation/agentes/ver_agente.php          |  2 +-
 pandora_console/operation/users/user_edit.php | 27 +++++---------
 pandora_console/pandoradb.sql                 |  2 +-
 9 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/pandora_console/extras/mr/28.sql b/pandora_console/extras/mr/28.sql
index 329d01e30e..f54bea80b6 100644
--- a/pandora_console/extras/mr/28.sql
+++ b/pandora_console/extras/mr/28.sql
@@ -18,7 +18,7 @@ UPDATE `tnotification_source` SET `icon`="icono_logo_pandora.png" WHERE `descrip
 
 ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_user` VARCHAR(60);
 ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_pass` VARCHAR(45);
-ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_acces` TINYINT(1) DEFAULT '1';
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_enabled` TINYINT(1) DEFAULT '1';
 
 
 
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 0cf24c3552..e6df538c48 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
@@ -1290,7 +1290,7 @@ ALTER TABLE `tusuario` DROP COLUMN `flash_chart`;
 ALTER TABLE `tusuario` ADD COLUMN `default_custom_view` int(10) unsigned NULL default '0';
 ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_user` VARCHAR(60);
 ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_pass` VARCHAR(45);
-ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_acces` TINYINT(1);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_enabled` TINYINT(1);
 
 
 
diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index 1685ff0ffa..fef199a767 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -69,8 +69,8 @@ $table_remote->style['name'] = 'font-weight: bold';
 // Enable eHorus user configuration.
 $row = [];
 $row['name'] = ('Enable eHorus user configuration');
-$row['control'] = html_print_checkbox_switch('ehorus_user_login', 1, $config['ehorus_user_login'], true);
-$table_remote->data['ehorus_user_login'] = $row;
+$row['control'] = html_print_checkbox_switch('ehorus_user_level_conf', 1, $config['ehorus_user_level_conf'], true);
+$table_remote->data['ehorus_user_level_conf'] = $row;
 
 // User.
 $row = [];
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 2ae6a83396..028f8deb7a 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -155,6 +155,7 @@ if ($new_user && $config['admin_can_add_user']) {
     if ($config['ehorus_user_level_conf']) {
         $user_info['ehorus_user_level_user'] = '';
         $user_info['ehorus_user_level_pass'] = '';
+        $user_info['ehorus_user_level_enabled'] = true;
     }
 }
 
@@ -222,11 +223,17 @@ if ($create_user) {
 
     // eHorus user level conf
     if ($config['ehorus_user_level_conf']) {
-        $values['ehorus_user_acces'] = (bool) get_parameter('ehorus_user_acces', true);
-        $values['ehorus_user_level_user'] = (string) get_parameter('ehorus_user_level_user', '');
-        $values['ehorus_user_level_pass'] = (string) get_parameter('ehorus_user_level_pass', '');
+        $values['ehorus_user_level_enabled'] = (bool) get_parameter('ehorus_user_level_enabled', false);
+        if ($values['ehorus_user_level_enabled'] === true) {
+            $values['ehorus_user_level_user'] = (string) get_parameter('ehorus_user_level_user');
+            $values['ehorus_user_level_pass'] = (string) get_parameter('ehorus_user_level_pass');
+        } else {
+            $values['ehorus_user_level_user'] = null;
+            $values['ehorus_user_level_pass'] = null;
+        }
     }
 
+
     if ($id == '') {
         ui_print_error_message(__('User ID cannot be empty'));
         $user_info = $values;
@@ -310,8 +317,18 @@ if ($update_user) {
     $values['timezone'] = (string) get_parameter('timezone');
     $values['default_event_filter'] = (int) get_parameter('default_event_filter');
     $values['default_custom_view'] = (int) get_parameter('default_custom_view');
-    $values['ehorus_user_login_user'] = get_parameter('ehorus_user_login_user', $user_info['ehorus_user_login_user']);
-    $values['ehorus_user_login_pass'] = get_parameter(io_input_password((string) get_parameter('ehorus_user_login_pass', $user_info['ehorus_user_login_pass'])));
+    // eHorus user level conf
+    if ($config['ehorus_user_level_conf']) {
+        $values['ehorus_user_level_enabled'] = (bool) get_parameter('ehorus_user_level_enabled', false);
+        if ($values['ehorus_user_level_enabled'] === true) {
+            $values['ehorus_user_level_user'] = (string) get_parameter('ehorus_user_level_user');
+            $values['ehorus_user_level_pass'] = (string) get_parameter('ehorus_user_level_pass');
+        } else {
+            $values['ehorus_user_level_user'] = null;
+            $values['ehorus_user_level_pass'] = null;
+        }
+    }
+
     $dashboard = get_parameter('dashboard', '');
     $visual_console = get_parameter('visual_console', '');
 
@@ -859,9 +876,9 @@ $table->data[16][1] = html_print_select($event_filter, 'default_event_filter', $
 
 if ($config['ehorus_user_level_conf']) {
     $table->data[17][0] = __('Ehorus configuration at user level');
-    $table->data[17][1] = html_print_checkbox('ehorus_user_acces', 1, $config['ehorus_user_level_conf'], true);
+    $table->data[17][1] = html_print_checkbox('ehorus_user_level_enabled', 1, $user_info['ehorus_user_level_enabled'], true);
     $table->data[18][0] = __('eHorus user');
-    $table->data[19][0] = __('eHorys password');
+    $table->data[19][0] = __('eHorus password');
     $table->data[18][1] = html_print_input_text('ehorus_user_level_user', $user_info['ehorus_user_level_user'], '', 15, 45, true);
     $table->data[19][1] = html_print_input_password('ehorus_user_level_pass', io_output_password($user_info['ehorus_user_level_pass']), '', 15, 45, true);
 }
@@ -958,10 +975,10 @@ $(document).ready (function () {
     $('#checkbox-metaconsole_agents_manager').trigger('change');
     
     show_data_section();
-    $('#checkbox-ehorus_user_acces').change(function () {
+    $('#checkbox-ehorus_user_level_enabled').change(function () {
         switch_ehorus_conf();
     });
-    $('#checkbox-ehorus_user_acces').trigger('change');
+    $('#checkbox-ehorus_user_level_enabled').trigger('change');
 
 });
 
@@ -1019,7 +1036,7 @@ function show_data_section () {
 
 function switch_ehorus_conf()
 {
-    if(!$('#checkbox-ehorus_user_acces').prop('checked')) 
+    if(!$('#checkbox-ehorus_user_level_enabled').prop('checked')) 
     {
         $("#user_configuration_table-18").hide();
         $("#user_configuration_table-19").hide();
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 1036593727..50703e9d62 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1353,7 +1353,7 @@ function config_update_config()
                         $error_update[] = __('Enable eHorus');
                     }
 
-                    if (!config_update_value('ehorus_user_login', (int) get_parameter('ehorus_user_login', 0))) {
+                    if (!config_update_value('ehorus_user_level_conf', (int) get_parameter('ehorus_user_level_conf', 0))) {
                         $error_update[] = __('eHorus user login');
                     }
 
diff --git a/pandora_console/operation/agentes/ehorus.php b/pandora_console/operation/agentes/ehorus.php
index aebf1ab0ef..2091aa5d60 100644
--- a/pandora_console/operation/agentes/ehorus.php
+++ b/pandora_console/operation/agentes/ehorus.php
@@ -59,9 +59,9 @@ $curl_timeout = $config['ehorus_req_timeout'];
 $base_url = 'https://'.$hostname.':'.$port;
 
 // If user login is enabled, fetch user and pass from user info
-if ($config['ehorus_user_login']) {
-    $user = $user_info['ehorus_user_login_user'];
-    $password = io_safe_output(io_output_password($user_info['ehorus_user_login_pass']));
+if ($config['ehorus_user_level_conf']) {
+    $user = $user_info['ehorus_user_level_user'];
+    $password = io_safe_output(io_output_password($user_info['ehorus_user_level_pass']));
 }
 
 // Get the login auth token
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index ea575aac97..df2194b524 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1267,7 +1267,7 @@ if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
     ) || is_user_admin($config['id_user']))
 ) {
     $user_info = users_get_user_by_id($config['id_user']);
-    if ($config['ehorus_user_login'] && !$user_info['ehorus_user_login_user'] && !$user_info['ehorus_user_login_pass']) {
+    if ($config['ehorus_user_level_conf'] && !$user_info['ehorus_user_level_user'] && !$user_info['ehorus_user_level_pass']) {
         // If ehorus user configuration is enabled, and no password provided, do nothing.
     } else {
         $ehorus_agent_id = agents_get_agent_custom_field($id_agente, $config['ehorus_custom_field']);
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index ceb1ae2b42..d883860d60 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -123,8 +123,8 @@ if (isset($_GET['modified']) && !$view_mode) {
     }
 
     $upd_info['time_autorefresh'] = (int) get_parameter('time_autorefresh', 0);
-    $upd_info['ehorus_user_login_user'] = get_parameter('ehorus_user_login_user', $user_info['ehorus_user_login_user']);
-    $upd_info['ehorus_user_login_pass'] = get_parameter('ehorus_user_login_pass', $user_info['ehorus_user_login_pass']);
+    $upd_info['ehorus_user_level_user'] = get_parameter('ehorus_user_level_user');
+    $upd_info['ehorus_user_level_pass'] = get_parameter('ehorus_user_level_pass');
 
 
     $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $id);
@@ -645,7 +645,7 @@ if (!is_metaconsole()) {
             </div>    
         </div>';
 
-if ($config['ehorus_enabled'] && $config['ehorus_user_login']) {
+if ($config['ehorus_enabled'] && $config['ehorus_user_level_conf']) {
     // eHorus user remote login
     $table_remote = new StdClass();
     $table_remote->data = [];
@@ -659,19 +659,19 @@ if ($config['ehorus_enabled'] && $config['ehorus_user_login']) {
     // Title
     $row = [];
     $row['control'] = '<p class="edit_user_labels">'.__('eHorus user configuration').': </p>';
-    $table_remote->data['ehorus_user_login'] = $row;
+    $table_remote->data['ehorus_user_level_conf'] = $row;
 
     // User.
     $row = [];
     $row['name'] = __('User');
-    $row['control'] = html_print_input_text('ehorus_user_login_user', $user_info['ehorus_user_login_user'], '', 30, 100, true);
-    $table_remote->data['ehorus_user_login_user'] = $row;
+    $row['control'] = html_print_input_text('ehorus_user_level_user', $user_info['ehorus_user_level_user'], '', 30, 100, true);
+    $table_remote->data['ehorus_user_level_user'] = $row;
 
     // Pass.
     $row = [];
     $row['name'] = __('Password');
-    $row['control'] = html_print_input_password('ehorus_user_login_pass', io_output_password($user_info['ehorus_user_login_pass']), '', 30, 100, true);
-    $table_remote->data['ehorus_user_login_pass'] = $row;
+    $row['control'] = html_print_input_password('ehorus_user_level_pass', io_output_password($user_info['ehorus_user_level_pass']), '', 30, 100, true);
+    $table_remote->data['ehorus_user_level_pass'] = $row;
 
     // Test.
     $ehorus_port = db_get_value('value', 'tconfig', 'token', 'ehorus_port');
@@ -808,13 +808,6 @@ if (!defined('METACONSOLE')) {
     // Closes no meta condition.
 }
 
-
-function ehorus_user_login_conf()
-{
-
-}
-
-
 ?>
 
 <script language="javascript" type="text/javascript">
@@ -1141,8 +1134,8 @@ function show_double_auth_deactivation () {
 }
 
 function ehorus_connection_test(host, port) {
-        var user = $('input#text-ehorus_user_login_user').val();
-        var pass = $('input#password-ehorus_user_login_pass').val();
+        var user = $('input#text-ehorus_user_level_user').val();
+        var pass = $('input#password-ehorus_user_level_pass').val();
     
         debugger;
         var badRequestMessage = '<?php echo __('Empty user or password'); ?>';
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 4b3826020a..58ec3ff077 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1148,7 +1148,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
 	`default_custom_view` int(10) unsigned NULL default '0',
 	`ehorus_user_level_user` VARCHAR(60),
 	`ehorus_user_level_pass` VARCHAR(45),
-	`ehorus_user_acces` TINYINT(1),
+	`ehorus_user_level_enabled` TINYINT(1),
 	CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
 	UNIQUE KEY `id_user` (`id_user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From 6fdd88ab65a8b948d54057f6fa7b73f5fc3b2334 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Tue, 28 May 2019 17:19:13 +0200
Subject: [PATCH 10/13] Fixed errors on eHorus user level conf

---
 .../godmode/setup/setup_ehorus.php            | 62 ++++++++++++++++---
 .../godmode/users/configure_user.php          | 17 ++---
 .../operation/agentes/ver_agente.php          |  4 +-
 pandora_console/operation/users/user_edit.php |  8 +++
 4 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index fef199a767..89d4ff35e8 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -68,7 +68,7 @@ $table_remote->style['name'] = 'font-weight: bold';
 
 // Enable eHorus user configuration.
 $row = [];
-$row['name'] = ('Enable eHorus user configuration');
+$row['name'] = ('eHorus configuration at user level');
 $row['control'] = html_print_checkbox_switch('ehorus_user_level_conf', 1, $config['ehorus_user_level_conf'], true);
 $table_remote->data['ehorus_user_level_conf'] = $row;
 
@@ -169,9 +169,19 @@ echo '</div>';
 ?>
 
 <script type="text/javascript">
-if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
- $('#form_remote').hide();
+
+if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked'))
+{
+    $('#form_remote').hide();
 }
+
+if($('input:checkbox[name="ehorus_user_level_conf"]').is(':checked'))
+{
+    $('#ehorus-remote-setup-ehorus_user').hide();
+    $('#ehorus-remote-setup-ehorus_pass').hide()
+}
+
+
  $('#form_enable').css('margin-bottom','20px');
     var showFields = function () {
         $('#form_remote').show();
@@ -179,6 +189,17 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
     var hideFields = function () {
         $('#form_remote').hide();
     }
+
+    var hideUserPass = function () {
+        $('#ehorus-remote-setup-ehorus_user').hide();
+        $('#ehorus-remote-setup-ehorus_pass').hide();
+    }
+
+    var showUserPass = function () {
+        $('#ehorus-remote-setup-ehorus_user').show();
+        $('#ehorus-remote-setup-ehorus_pass').show();
+    }
+
     var handleEnable = function (event) {
         var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
         if (event.target.value == '1' && is_checked) {
@@ -190,15 +211,32 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
             $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
         };
     }
+
+    var handleUserLevel = function(event) {
+        var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
+        var is_checked_userlevel = $('input:checkbox[name="ehorus_user_level_conf"]').is(':checked');
+        
+        if (event.target.value == '1' && is_checked && !is_checked_userlevel) {
+            showUserPass();
+            $('input:checkbox[name="ehorus_user_level_conf"]').attr('checked', true);
+        }
+        else {
+            hideUserPass();
+            $('input:checkbox[name="ehorus_user_level_conf"]').attr('checked', false);
+        };
+    }
+
     $('input:checkbox[name="ehorus_enabled"]').change(handleEnable);
-    
+    $('input:checkbox[name="ehorus_user_level_conf"]').change(handleUserLevel);
+
     var handleTest = function (event) {
         var user = $('input#text-ehorus_user').val();
         var pass = $('input#password-ehorus_pass').val();
         var host = $('input#text-ehorus_hostname').val();
         var port = $('input#text-ehorus_port').val();
         var timeout = Number.parseInt($('input#text-ehorus_req_timeout').val(), 10);
-        
+        var is_checked_user_level = $('input:checkbox[name="ehorus_user_level_conf"]').is(':checked');
+    
         var timeoutMessage = '<?php echo __('Connection timeout'); ?>';
         var badRequestMessage = '<?php echo __('Empty user or password'); ?>';
         var notFoundMessage = '<?php echo __('User not found'); ?>';
@@ -236,6 +274,7 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
         hideFailureImage();
         hideMessage();
         showLoadingImage();
+       
         $.ajax({
             url: 'https://' + host + ':' + port + '/login',
             type: 'POST',
@@ -250,9 +289,11 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
             showSuccessImage();
         })
         .fail(function(xhr, textStatus, errorThrown) {
-            showFailureImage();
-            
-            if (xhr.status === 400) {
+            if((xhr.status === 400 || xhr.status === 403) && is_checked_user_level)
+            {
+                showSuccessImage();
+                return;
+            }else if (xhr.status === 400) {
                 changeTestMessage(badRequestMessage);
             }
             else if (xhr.status === 401 || xhr.status === 403) {
@@ -267,6 +308,8 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
             else {
                 changeTestMessage(errorThrown);
             }
+                        
+            showFailureImage();
             showMessage();
         })
         .always(function(xhr, textStatus) {
@@ -274,4 +317,7 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
         });
     }
     $('input#button-test-ehorus').click(handleTest);
+    
+
+
 </script>
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 028f8deb7a..47788284fe 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -318,16 +318,11 @@ if ($update_user) {
     $values['default_event_filter'] = (int) get_parameter('default_event_filter');
     $values['default_custom_view'] = (int) get_parameter('default_custom_view');
     // eHorus user level conf
-    if ($config['ehorus_user_level_conf']) {
-        $values['ehorus_user_level_enabled'] = (bool) get_parameter('ehorus_user_level_enabled', false);
-        if ($values['ehorus_user_level_enabled'] === true) {
-            $values['ehorus_user_level_user'] = (string) get_parameter('ehorus_user_level_user');
-            $values['ehorus_user_level_pass'] = (string) get_parameter('ehorus_user_level_pass');
-        } else {
-            $values['ehorus_user_level_user'] = null;
-            $values['ehorus_user_level_pass'] = null;
-        }
-    }
+    $values['ehorus_user_level_enabled'] = (bool) get_parameter('ehorus_user_level_enabled', false);
+    $values['ehorus_user_level_user'] = (string) get_parameter('ehorus_user_level_user');
+    $values['ehorus_user_level_pass'] = (string) get_parameter('ehorus_user_level_pass');
+
+
 
     $dashboard = get_parameter('dashboard', '');
     $visual_console = get_parameter('visual_console', '');
@@ -875,7 +870,7 @@ $table->data[16][0] = __('Default event filter');
 $table->data[16][1] = html_print_select($event_filter, 'default_event_filter', $user_info['default_event_filter'], '', '', __('None'), true, false, false);
 
 if ($config['ehorus_user_level_conf']) {
-    $table->data[17][0] = __('Ehorus configuration at user level');
+    $table->data[17][0] = __('eHorus user acces enabled');
     $table->data[17][1] = html_print_checkbox('ehorus_user_level_enabled', 1, $user_info['ehorus_user_level_enabled'], true);
     $table->data[18][0] = __('eHorus user');
     $table->data[19][0] = __('eHorus password');
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index df2194b524..fbe71f9e84 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1267,8 +1267,8 @@ if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
     ) || is_user_admin($config['id_user']))
 ) {
     $user_info = users_get_user_by_id($config['id_user']);
-    if ($config['ehorus_user_level_conf'] && !$user_info['ehorus_user_level_user'] && !$user_info['ehorus_user_level_pass']) {
-        // If ehorus user configuration is enabled, and no password provided, do nothing.
+    if ($config['ehorus_user_level_conf'] && !$user_info['ehorus_user_level_enabled'] && !is_user_admin($config['id_user'])) {
+        // If ehorus user configuration is enabled, and userr acces level is disabled do not show eHorus tab.
     } else {
         $ehorus_agent_id = agents_get_agent_custom_field($id_agente, $config['ehorus_custom_field']);
         if (!empty($ehorus_agent_id)) {
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index d883860d60..8ad1ac765b 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -125,6 +125,8 @@ if (isset($_GET['modified']) && !$view_mode) {
     $upd_info['time_autorefresh'] = (int) get_parameter('time_autorefresh', 0);
     $upd_info['ehorus_user_level_user'] = get_parameter('ehorus_user_level_user');
     $upd_info['ehorus_user_level_pass'] = get_parameter('ehorus_user_level_pass');
+    $upd_info['ehorus_user_level_enabled'] = get_parameter('ehorus_user_level_enabled', 0);
+
 
 
     $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $id);
@@ -661,6 +663,12 @@ if ($config['ehorus_enabled'] && $config['ehorus_user_level_conf']) {
     $row['control'] = '<p class="edit_user_labels">'.__('eHorus user configuration').': </p>';
     $table_remote->data['ehorus_user_level_conf'] = $row;
 
+    // Enable/disable eHorus for this user
+    $row = [];
+    $row['name'] = __('eHorus user acces enabled');
+    $row['control'] = html_print_checkbox_switch('ehorus_user_level_enabled', 1, $user_info['ehorus_user_level_enabled'], true)cd;
+    $table_remote->data['ehorus_user_level_enabled'] = $row;
+
     // User.
     $row = [];
     $row['name'] = __('User');

From c8297165e88c387f06aa85f379326fbcc8937a55 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Tue, 28 May 2019 17:41:39 +0200
Subject: [PATCH 11/13] Undo undesired changes

---
 pandora_console/include/functions_reporting.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 95a974eea3..be97019bab 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2844,7 +2844,6 @@ function reporting_event_report_agent(
     if ($label != '') {
         $label = reporting_label_macro($content, $label);
     }
-
     $return['label'] = $label;
 
     if ($event_graph_by_user_validator) {

From 77dbb53db4a0e8932e4aa6a6b43b08dbfe37b2bb Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Tue, 28 May 2019 18:03:40 +0200
Subject: [PATCH 12/13] Fixed minor bug

---
 pandora_console/operation/users/user_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 8ad1ac765b..205c2206a1 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -666,7 +666,7 @@ if ($config['ehorus_enabled'] && $config['ehorus_user_level_conf']) {
     // Enable/disable eHorus for this user
     $row = [];
     $row['name'] = __('eHorus user acces enabled');
-    $row['control'] = html_print_checkbox_switch('ehorus_user_level_enabled', 1, $user_info['ehorus_user_level_enabled'], true)cd;
+    $row['control'] = html_print_checkbox_switch('ehorus_user_level_enabled', 1, $user_info['ehorus_user_level_enabled'], true);
     $table_remote->data['ehorus_user_level_enabled'] = $row;
 
     // User.

From 27963c4370b153ceae7797c6e5cdc5a8f22252bd Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Wed, 29 May 2019 09:51:26 +0200
Subject: [PATCH 13/13] Fixed minor bug

---
 pandora_console/operation/agentes/ver_agente.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index fbe71f9e84..82bb87edcf 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1267,7 +1267,7 @@ if ($config['ehorus_enabled'] && !empty($config['ehorus_custom_field'])
     ) || is_user_admin($config['id_user']))
 ) {
     $user_info = users_get_user_by_id($config['id_user']);
-    if ($config['ehorus_user_level_conf'] && !$user_info['ehorus_user_level_enabled'] && !is_user_admin($config['id_user'])) {
+    if ($config['ehorus_user_level_conf'] && !$user_info['ehorus_user_level_enabled']) {
         // If ehorus user configuration is enabled, and userr acces level is disabled do not show eHorus tab.
     } else {
         $ehorus_agent_id = agents_get_agent_custom_field($id_agente, $config['ehorus_custom_field']);