Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop'

fixed errors sound events

See merge request artica/pandorafms!3916

pandora_console/include/ajax/events.php

@@ -1865,11 +1865,12 @@ if ($get_table_response_command) {
 }
 
 if ($get_events_fired) {
+    global $config;
     $id = get_parameter('id_row');
     $idGroup = get_parameter('id_group');
     $agents = get_parameter('agents', null);
 
-    $query = ' AND id_evento > '.$id;
+    $query = ' AND id_evento >= '.$id;
 
     $type = [];
     $alert = get_parameter('alert_fired');
@@ -1889,7 +1890,10 @@ if ($get_events_fired) {
     if ($critical == 'true') {
         $resultCritical = alerts_get_event_status_group(
             $idGroup,
-            'going_up_critical',
+            [
+                'going_up_critical',
+                'going_down_critical',
+            ],
             $query,
             $agents
         );
@@ -1899,7 +1903,10 @@ if ($get_events_fired) {
     if ($warning == 'true') {
         $resultWarning = alerts_get_event_status_group(
             $idGroup,
-            'going_up_warning',
+            [
+                'going_up_warning',
+                'going_down_warning',
+            ],
             $query,
             $agents
         );

pandora_console/include/functions_alerts.php

@@ -173,13 +173,22 @@ function alerts_get_event_status_group($idGroup, $type='alert_fired', $query='AN
         $idAgents = array_values($agents);
     }
 
-    $result = db_get_all_rows_sql(
+    $sql = sprintf(
         'SELECT id_evento
-		FROM tevento
+        FROM tevento
-		WHERE estado = 0 AND id_agente IN (0,'.implode(',', $idAgents).') '.$typeWhere.$query.'
+        WHERE estado = 0
-		ORDER BY id_evento DESC LIMIT 1'
+            AND id_agente IN (0, %s)
+            %s
+            %s
+        ORDER BY id_evento DESC
+        LIMIT 1',
+        implode(',', $idAgents),
+        $typeWhere,
+        $query
     );
 
+    $result = db_get_all_rows_sql($sql);
+
     if ($result === false) {
         return false;
     }

pandora_console/include/functions_api.php

@@ -12315,6 +12315,7 @@ function api_set_create_tag($id, $trash1, $other, $returnType)
 
 
 // http://127.0.0.1/pandora_console/include/api.php?op=set&op2=create_event&id=name_event&other=2|system|3|admin|2|1|10|0|comments||Pandora||critical_inst|warning_inst|unknown_inst|other||&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
+// http://127.0.0.1/pandora_console/include/api.php?op=set&op2=create_event&id=name_event&other=textodelevento|10|2|0|admin|going_down_critical|4|&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
 function api_set_create_event($id, $trash1, $other, $returnType)
 {
     global $config;

pandora_console/operation/events/sound_events.php

@@ -1,18 +1,31 @@
 <?php
+/**
+ * Events sounds.
+ *
+ * @category   Sounds
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 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.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 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.
-// Don't start a session before this import.
-// The session is configured and started inside the config process.
 require_once '../../include/config.php';
 require_once '../../include/functions.php';
 require_once '../../include/functions_db.php';
@@ -20,7 +33,7 @@ require_once '../../include/auth/mysql.php';
 
 global $config;
 
-// Check user
+// Check user.
 check_login();
 $config['id_user'] = $_SESSION['id_usuario'];
 
@@ -29,7 +42,10 @@ $event_w = check_acl($config['id_user'], 0, 'EW');
 $event_m = check_acl($config['id_user'], 0, 'EM');
 $access = ($event_a == true) ? 'ER' : (($event_w == true) ? 'EW' : (($event_m == true) ? 'EM' : 'ER'));
 
-if (! check_acl($config['id_user'], 0, 'ER') && ! check_acl($config['id_user'], 0, 'EW') && ! check_acl($config['id_user'], 0, 'EM')) {
+if (check_acl($config['id_user'], 0, 'ER') === false
+    && check_acl($config['id_user'], 0, 'EW') === false
+    && check_acl($config['id_user'], 0, 'EM') === false
+) {
     db_pandora_audit('ACL Violation', 'Trying to access event viewer');
     include 'general/noaccess.php';
 
@@ -72,7 +88,12 @@ $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_require_javascript_file('connection_check');
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+ui_print_message_dialog(
+    $conn_title,
+    $conn_text,
+    'connection',
+    '/images/error_1.png'
+);
 
 $table = new StdClass;
 $table->width = '100%';
@@ -83,16 +104,91 @@ $table->rowclass[1] = 'bold_top';
 $table->rowclass[2] = 'bold_top';
 
 $table->data[0][0] = __('Group');
-$table->data[0][1] = html_print_select_groups(false, $access, true, 'group', '', 'changeGroup();', '', 0, true, false, true, '', false, 'max-width:200px;').'<br />'.'<br />';
+$table->data[0][1] = html_print_select_groups(
+    false,
+    $access,
+    true,
+    'group',
+    '',
+    'changeGroup();',
+    '',
+    0,
+    true,
+    false,
+    true,
+    '',
+    false,
+    'max-width:200px;'
+).'<br /><br />';
 
 $table->data[0][2] = __('Type');
-$table->data[0][3] = html_print_checkbox('alert_fired', 'alert_fired', true, true, false, 'changeType();').__('Alert fired').'<br />'.html_print_checkbox('critical', 'critical', true, true, false, 'changeType();').__('Monitor critical').'<br />'.html_print_checkbox('unknown', 'unknown', true, true, false, 'changeType();').__('Monitor unknown').'<br />'.html_print_checkbox('warning', 'warning', true, true, false, 'changeType();').__('Monitor warning').'<br />';
+$table->data[0][3] = html_print_checkbox(
+    'alert_fired',
+    'alert_fired',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Alert fired').'<br />';
+$table->data[0][3] .= html_print_checkbox(
+    'critical',
+    'critical',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Monitor critical').'<br />';
+$table->data[0][3] .= html_print_checkbox(
+    'unknown',
+    'unknown',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Monitor unknown').'<br />';
+$table->data[0][3] .= html_print_checkbox(
+    'warning',
+    'warning',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Monitor warning').'<br />';
 
 $table->data[1][0] = __('Agent');
-$table->data[1][1] = html_print_select($agents, 'id_agents[]', true, false, '', '', true, true, '', '', '', 'max-width:200px; height:100px', '', false, '', '', true);
+$table->data[1][1] = html_print_select(
+    $agents,
+    'id_agents[]',
+    true,
+    false,
+    '',
+    '',
+    true,
+    true,
+    '',
+    '',
+    '',
+    'max-width:200px; height:100px',
+    '',
+    false,
+    '',
+    '',
+    true
+);
 
 $table->data[1][2] = __('Event');
-$table->data[1][3] = html_print_textarea('events_fired', 200, 20, '', 'readonly="readonly" style="max-height:100px; resize:none;"', true);
+$table->data[1][3] = html_print_textarea(
+    'events_fired',
+    200,
+    20,
+    '',
+    'readonly="readonly" style="max-height:100px; resize:none;"',
+    true
+);
 
 html_print_table($table);
 
@@ -100,13 +196,41 @@ $table = new StdClass;
 $table->width = '100%';
 $table->class = 'w16px sound_div_background text_center';
 
-$table->data[0][0] = '<a href="javascript: toggleButton();">'.html_print_image('images/play.button.png', true, ['id' => 'button']).'</a>';
+$table->data[0][0] = '<a href="javascript: toggleButton();">';
+$table->data[0][0] .= html_print_image(
+    'images/play.button.png',
+    true,
+    ['id' => 'button']
+);
+$table->data[0][0] .= '</a>';
 
-$table->data[0][1] .= '<a href="javascript: ok();">'.html_print_image('images/ok.button.png', true, ['style' => 'margin-left: 15px;']).'</a>';
+$table->data[0][1] = '<a href="javascript: ok();">';
+$table->data[0][1] .= html_print_image(
+    'images/ok.button.png',
+    true,
+    ['style' => 'margin-left: 15px;']
+);
+$table->data[0][1] .= '</a>';
 
-$table->data[0][2] .= '<a href="javascript: test_sound_button();">'.html_print_image('images/icono_test.png', true, ['id' => 'button_try', 'style' => 'margin-left: 15px;']).'</a>';
+$table->data[0][2] = '<a href="javascript: test_sound_button();">';
+$table->data[0][2] .= html_print_image(
+    'images/icono_test.png',
+    true,
+    [
+        'id'    => 'button_try',
+        'style' => 'margin-left: 15px;',
+    ]
+);
+$table->data[0][2] .= '</a>';
 
-$table->data[0][3] .= html_print_image('images/tick_sound_events.png', true, ['id' => 'button_status', 'style' => 'margin-left: 15px;']);
+$table->data[0][3] = html_print_image(
+    'images/tick_sound_events.png',
+    true,
+    [
+        'id'    => 'button_status',
+        'style' => 'margin-left: 15px;',
+    ]
+);
 
 html_print_table($table);
 ?>
@@ -149,10 +273,12 @@ function changeGroup() {
         },
         function (data) {
             $("#id_agents").empty();
-            
             jQuery.each (data, function (id, value) {
                 if (value != "") {
-                    $("#id_agents").append('<option value="' + id + '">' + value + '</option>');
+                    $("#id_agents")
+                        .append(
+                            '<option value="' + id + '">' + value + '</option>'
+                        );
                 }
             });
         },
@@ -207,9 +333,7 @@ function ok() {
 
 function stopSound() {
     $('audio').remove();
-    
     $('body').css('background', '#494949');
-    
     running = false;
 }
 
@@ -263,13 +387,21 @@ function check_event() {
                     var actual_text = $('#textarea_events_fired').val();
                     if (actual_text == "") {
                         $('#textarea_events_fired').val(data['message'] + "\n");
+                    } else {
+                        $('#textarea_events_fired')
+                            .val(actual_text + "\n" + data['message'] + "\n");
                     }
-                    else {
+                    $('#button_status')
-                        $('#textarea_events_fired').val(actual_text + "\n" + data['message'] + "\n");
+                        .attr(
-                    }
+                            'src','../../images/sound_events_console_alert.gif'
-                    $('#button_status').attr('src','../../images/sound_events_console_alert.gif');
+                        );
                     $('audio').remove();
-                    $('body').append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
+                    if(data['sound'] == '') {
+                        data['sound'] = 'include/sounds/Star_Trek_emergency_simulation.wav';
+                    }
+
+                    $('body')
+                        .append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
                 }
             },
             "json"
@@ -278,7 +410,8 @@ function check_event() {
 }
 
 $(document).ready (function () {
-    setInterval("check_event()", (10 * 1000)); //10 seconds between ajax request
+    //10 seconds between ajax request
+    setInterval("check_event()", (10 * 1000));
 });
 
 </script>