From b13d5dc8d4be49d07e9ea102782f420cd485350b Mon Sep 17 00:00:00 2001 From: marcos Date: Tue, 23 Feb 2021 14:35:57 +0100 Subject: [PATCH] fixed error not show messages --- pandora_console/include/functions_messages.php | 6 +----- .../operation/messages/message_edit.php | 17 ----------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/pandora_console/include/functions_messages.php b/pandora_console/include/functions_messages.php index 9ebe703f94..f929eb9ed1 100644 --- a/pandora_console/include/functions_messages.php +++ b/pandora_console/include/functions_messages.php @@ -497,11 +497,7 @@ function messages_get_overview( if ($incl_source_info) { $source_fields = ', tns.*'; $source_join = 'INNER JOIN tnotification_source tns - ON tns.id=tm.id_source - INNER JOIN tnotification_source_user nsu - ON nsu.id_source=tns.id - AND nsu.enabled = 1 - OR tns.enabled = 1'; + ON tns.id=tm.id_source'; } // Using distinct because could be double assignment due group/user. diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php index 6135c4b10b..9d72c262cb 100644 --- a/pandora_console/operation/messages/message_edit.php +++ b/pandora_console/operation/messages/message_edit.php @@ -209,23 +209,6 @@ if (($new_msg) && (!empty($dst_user)) && (!$reply)) { ); } -// Create message (destination group). -if (($new_msg) && ($dst_group != '') && (!$reply)) { - $return = messages_create_message( - $config['id_user'], - [], - [$dst_group], - $subject, - $message - ); - - ui_print_result_message( - $return, - __('Message successfully sent'), - __('Error sending message to group %s', groups_get_name($dst_group)) - ); -} - // Message creation form. // User info. $own_info = get_user_info($config['id_user']);