From 6ce81a29e0918b3494a08fa47190b2cea59d1a84 Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 10 Jan 2013 13:37:42 +0100 Subject: nil vs. empty_string --- misc/freeswitch/scripts/common/conference.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'misc/freeswitch/scripts/common/conference.lua') diff --git a/misc/freeswitch/scripts/common/conference.lua b/misc/freeswitch/scripts/common/conference.lua index d2bf829..a7b21c3 100644 --- a/misc/freeswitch/scripts/common/conference.lua +++ b/misc/freeswitch/scripts/common/conference.lua @@ -103,8 +103,9 @@ function Conference.enter(self, caller, domain) end; end + require 'common.str' -- Check if conference is within time frame - if self.record.start and self.record['end'] then + if not common.str.blank(self.record.start) and not common.str.blank(self.record['end']) then local d = {} _,_,d.year,d.month,d.day,d.hour,d.min,d.sec=string.find(self.record.start, "(%d+)-(%d+)-(%d+) (%d+):(%d+):(%d+)"); @@ -122,7 +123,6 @@ function Conference.enter(self, caller, domain) end end - require 'common.str' -- Owner ist always moderator if (tonumber(self.record.conferenceable_id) == caller.account_owner_id) and (self.record.conferenceable_type == caller.account_owner_type) then table.insert(flags, 'moderator'); -- cgit v1.2.3 From 8744de13516c3fc2fbf2843e85aff08707f50de1 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Fri, 18 Jan 2013 12:54:45 +0100 Subject: adjust copyright date for 2013 --- misc/freeswitch/scripts/common/conference.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc/freeswitch/scripts/common/conference.lua') diff --git a/misc/freeswitch/scripts/common/conference.lua b/misc/freeswitch/scripts/common/conference.lua index a7b21c3..ca5fa62 100644 --- a/misc/freeswitch/scripts/common/conference.lua +++ b/misc/freeswitch/scripts/common/conference.lua @@ -1,5 +1,5 @@ -- Gemeinschaft 5 module: conference class --- (c) AMOOMA GmbH 2012 +-- (c) AMOOMA GmbH 2012-2013 -- module(...,package.seeall) -- cgit v1.2.3