From dd1d78c69c8ea320bdb13453daae225a4605a4cc Mon Sep 17 00:00:00 2001 From: bios01 <> Date: Sun, 10 Jul 2016 18:38:04 +0000 Subject: [PATCH] bugfix: 70_Jabber: log OTR empty message if debug-mode == 1 only git-svn-id: https://svn.fhem.de/fhem/trunk@11779 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/70_Jabber.pm | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 32466ae14..481c87e0d 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 70_Jabber: log OTR empty message if debug-mode == 1 only - changed: 70_BRAVIA: re-worked state handling - feature: PRESENCE: new attribute presenceThreshold to define a number of checks that have to result in "present" before the state of diff --git a/fhem/FHEM/70_Jabber.pm b/fhem/FHEM/70_Jabber.pm index 3fdda7a49..2c4e1cc51 100644 --- a/fhem/FHEM/70_Jabber.pm +++ b/fhem/FHEM/70_Jabber.pm @@ -1,4 +1,5 @@ ############################################################################## +# $Id$ # # 70_Jabber.pm # An FHEM Perl module for connecting to an Jabber XMPP Server and @@ -22,9 +23,10 @@ # You should have received a copy of the GNU General Public License # along with fhem. If not, see . # -# Version: 1.5 - 2015-09-17 +# Version: 1.6 - 2015-09-17 # # Changelog: +# v1.6 2016-07-10 Fix log message if otr message is empty (thx spikeh1) # v1.5 2015-09-17 Added OTR (Off the Record) end to end encryption # Added MUC (Multi-User-Channel) joining and handling # v1.4 2015-08-27 Fixed broken callback registration in Net::XMPP >= 1.04 @@ -671,7 +673,7 @@ sub Jabber_INC_Message { #When we have got no message after the OTR decrypt, we can leave this function. if (!defined($message) || $message eq "") { - Log 0, "$hash->{NAME} Message is empty after OTR decrypt."; + Log 0, "$hash->{NAME} Message is empty after OTR decrypt." if $debug; return undef; }