nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the the conference center lua script pin management.

Browse Source
This commit is contained in:
Mark Crane
2013-04-16 06:57:42 +00:00
parent a354961b3e
commit 5ccbc4830e
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/install/scripts/app/conference_center/index.lua
View File

@@ -35,11 +35,6 @@
--prepare the api object --prepare the api object
api = freeswitch.API(); api = freeswitch.API();
--define the trim function
function trim(s)
return s:gsub("^%s+", ""):gsub("%s+$", "")
end
--general functions --general functions
dofile(scripts_dir.."/resources/functions/base64.lua"); dofile(scripts_dir.."/resources/functions/base64.lua");
dofile(scripts_dir.."/resources/functions/trim.lua"); dofile(scripts_dir.."/resources/functions/trim.lua");
@@ -77,9 +72,8 @@
end end
--get the moderator_pin --get the moderator_pin
sql = [[SELECT member_pin as moderator_pin FROM v_meeting_pins sql = [[SELECT moderator_pin FROM v_meetings
WHERE meeting_uuid = ']] .. meeting_uuid ..[[' WHERE meeting_uuid = ']] .. meeting_uuid ..[[']];
AND member_type = 'moderator']];
freeswitch.consoleLog("notice", "[voicemail] sql: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[voicemail] sql: " .. sql .. "\n");
status = dbh:query(sql, function(row) status = dbh:query(sql, function(row)
moderator_pin = string.lower(row["moderator_pin"]); moderator_pin = string.lower(row["moderator_pin"]);
@@ -370,11 +364,11 @@
pin_number = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/conference/conf-pin.wav", "", "\\d+"); pin_number = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/conference/conf-pin.wav", "", "\\d+");
end end
if (pin_number ~= "") then if (pin_number ~= "") then
sql = [[SELECT * FROM v_conference_rooms as s, v_meeting_pins as p sql = [[SELECT * FROM v_conference_rooms as s, v_meetings as p
WHERE s.domain_uuid = ']] .. domain_uuid ..[[' WHERE s.domain_uuid = ']] .. domain_uuid ..[['
AND s.meeting_uuid = p.meeting_uuid AND s.meeting_uuid = p.meeting_uuid
AND p.domain_uuid = ']] .. domain_uuid ..[[' AND p.domain_uuid = ']] .. domain_uuid ..[['
AND p.member_pin = ']] .. pin_number ..[[' AND (p.moderator_pin = ']] .. pin_number ..[[' or p.participant_pin = ']] .. pin_number ..[[')
AND enabled = 'true' ]]; AND enabled = 'true' ]];
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[conference] SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[conference] SQL: " .. sql .. "\n");
@@ -408,11 +402,11 @@
pin_number = get_pin_number(domain_uuid); pin_number = get_pin_number(domain_uuid);
end end
if (pin_number ~= nil) then if (pin_number ~= nil) then
sql = [[SELECT * FROM v_conference_rooms as s, v_meeting_pins as p sql = [[SELECT * FROM v_conference_rooms as s, v_meetings as p
WHERE s.domain_uuid = ']] .. domain_uuid ..[[' WHERE s.domain_uuid = ']] .. domain_uuid ..[['
AND s.meeting_uuid = p.meeting_uuid AND s.meeting_uuid = p.meeting_uuid
AND p.domain_uuid = ']] .. domain_uuid ..[[' AND p.domain_uuid = ']] .. domain_uuid ..[['
AND p.member_pin = ']] .. pin_number ..[[' AND (p.moderator_pin = ']] .. pin_number ..[[' or p.participant_pin = ']] .. pin_number ..[[')
AND enabled = 'true' ]]; AND enabled = 'true' ]];
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[conference] SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[conference] SQL: " .. sql .. "\n");