From ccc2e830f4231ae4219266d36df1c4282476e836 Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Thu, 3 Nov 2022 15:12:50 +0100
Subject: [PATCH] add sound events to metaconsole pandora_enterprise#8854

---
 pandora_console/include/ajax/events.php            |  2 +-
 .../include/javascript/pandora_events.js           | 14 +++++++-------
 pandora_console/include/styles/sound_events.css    |  3 +++
 pandora_console/operation/menu.php                 |  5 +----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 5cb86d027e..b9a863cfcd 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -2270,7 +2270,7 @@ if ($drawConsoleSound === true) {
                         ],
                     ],
                     [
-                        'label'     => __('Time Sound'),
+                        'label'     => __('Sound duration'),
                         'arguments' => [
                             'type'     => 'select',
                             'fields'   => $times_sound,
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index df84985a37..84be4f824c 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -920,7 +920,7 @@ function openSoundEventModal(settings) {
                 sound = true;
               }
 
-              test_sound_button(sound);
+              test_sound_button(sound, settings.urlSound);
             });
 
             // Play Stop.
@@ -977,9 +977,9 @@ function openSoundEventModal(settings) {
     .show();
 }
 
-function test_sound_button(test_sound) {
+function test_sound_button(test_sound, urlSound) {
   if (test_sound === true) {
-    add_audio();
+    add_audio(urlSound);
   } else {
     remove_audio();
   }
@@ -1035,8 +1035,8 @@ function action_events_sound(mode, settings) {
   }
 }
 
-function add_audio() {
-  var sound = "./include/sounds/" + $("#tabs-sound-modal #sound_id").val();
+function add_audio(urlSound) {
+  var sound = urlSound + $("#tabs-sound-modal #sound_id").val();
   $(".actions-sound-modal").append(
     "<audio id='id_sound_event' src='" +
       sound +
@@ -1062,7 +1062,7 @@ function listen_event_sound(settings) {
 
 function check_event_sound(settings) {
   jQuery.post(
-    "./ajax.php",
+    settings.url,
     {
       page: "include/ajax/events",
       get_events_fired: 1,
@@ -1091,7 +1091,7 @@ function check_event_sound(settings) {
         remove_audio();
 
         // Apend audio.
-        add_audio();
+        add_audio(settings.urlSound);
 
         // Add elements.
         data.forEach(function(element) {
diff --git a/pandora_console/include/styles/sound_events.css b/pandora_console/include/styles/sound_events.css
index 7b25e55a63..c4dc332255 100644
--- a/pandora_console/include/styles/sound_events.css
+++ b/pandora_console/include/styles/sound_events.css
@@ -59,6 +59,7 @@
   justify-content: space-between;
   align-items: center;
   margin-top: 18px;
+  position: relative;
 }
 
 #tabs-sound-modal ul.wizard li.interval-sounds label,
@@ -225,6 +226,7 @@ input.upd {
   background-position: 70px 17px;
   color: #ffffff;
   padding-left: 20px;
+  border: 0;
 }
 
 .actions-sound-modal .buttons-sound-modal button.stop,
@@ -234,6 +236,7 @@ input.upd {
   background-position: 70px 17px;
   color: #ffffff;
   padding-left: 20px;
+  border: 0;
 }
 
 .actions-sound-modal .buttons-sound-modal button.alerts,
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 326eecf73f..d8c47f43d7 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -426,10 +426,6 @@ if ($access_console_node === true) {
         }
 
         // Sound Events.
-        // $javascript = 'javascript: openSoundEventWindow();';
-        // $sub[$javascript]['text'] = __('Sound Events');
-        // $sub[$javascript]['id'] = 'Sound Events';
-        // $sub[$javascript]['type'] = 'direct';
         $data_sound = base64_encode(
             json_encode(
                 [
@@ -440,6 +436,7 @@ if ($access_console_node === true) {
                     'silenceAlarm' => __('Silence alarm'),
                     'url'          => ui_get_full_url('ajax.php'),
                     'page'         => 'include/ajax/events',
+                    'urlSound'     => 'include/sounds/',
                 ]
             )
         );