dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make presence for conferences work out of the box (#2514)

Browse Source 
Use '@' instead of '-' for separating conference name and domain, which
is what FreeSWITCH mod_conference uses.
This commit is contained in:
Stefan Siegel
2017-04-17 09:01:04 -06:00
committed by FusionPBX
parent 0f705cdcc6
commit 1ee633cd10
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/conference_centers/conference_room_edit.php
+1 -1
View File
@@ -113,7 +113,7 @@ else {
$default_language = 'en';
$default_dialect = 'us';
$default_voice = 'callie';
$switch_cmd = "conference ".$meeting_uuid."-".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
$switch_cmd = "conference ".$meeting_uuid."@".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
if ($fp) {
app/conference_centers/conference_rooms.php
+2 -2
View File
@@ -75,7 +75,7 @@ else {
$default_language = 'en';
$default_dialect = 'us';
$default_voice = 'callie';
$switch_cmd = "conference ".$meeting_uuid."-".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
$switch_cmd = "conference ".$meeting_uuid."@".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
if ($fp) {
@@ -135,7 +135,7 @@ else {
//show the conferences that have a matching domain
$tmp_domain = substr($conference_name, -strlen($_SESSION['domain_name']));
if ($tmp_domain == $_SESSION['domain_name']) {
$meeting_uuid = substr($conference_name, 0, strlen($conference_name) - strlen('-'.$_SESSION['domain_name']));
$meeting_uuid = substr($conference_name, 0, strlen($conference_name) - strlen('@'.$_SESSION['domain_name']));
$conference[$meeting_uuid]["conference_name"] = $conference_name;
$conference[$meeting_uuid]["session_uuid"] = $session_uuid;
$conference[$meeting_uuid]["member_count"] = $member_count;
app/conferences/conference_edit.php
+2 -2
View File
@@ -211,7 +211,7 @@
$dialplan_detail_type = 'conference';
$pin_number = ''; if (strlen($conference_pin_number) > 0) { $pin_number = "+".$conference_pin_number; }
$flags = ''; if (strlen($conference_flags) > 0) { $flags = "+flags{".$conference_flags."}"; }
$dialplan_detail_data = $conference_name.'-'.$_SESSION['domain_name']."@".$conference_profile.$pin_number.$flags;
$dialplan_detail_data = $conference_name.'@'.$_SESSION['domain_name']."@".$conference_profile.$pin_number.$flags;
$dialplan_detail_order = '020';
$dialplan_detail_group = '2';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
@@ -263,7 +263,7 @@
//update dialplan detail action
$pin_number = ''; if (strlen($conference_pin_number) > 0) { $pin_number = "+".$conference_pin_number; }
$flags = ''; if (strlen($conference_flags) > 0) { $flags = "+flags{".$conference_flags."}"; }
$dialplan_detail_data = $conference_name.'-'.$_SESSION['domain_name']."@".$conference_profile.$pin_number.$flags;
$dialplan_detail_data = $conference_name.'@'.$_SESSION['domain_name']."@".$conference_profile.$pin_number.$flags;
$sql = "update v_dialplan_details set ";
$sql .= "dialplan_detail_data = '".$dialplan_detail_data."' ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
app/conferences_active/conference_interactive_inc.php
+1 -1
View File
@@ -43,7 +43,7 @@ else {
$conference_uuid = check_str($_REQUEST["c"]);
//replace the space with underscore
$conference_name = $conference_uuid.'-'.$_SESSION['domain_name'];
$conference_name = $conference_uuid.'@'.$_SESSION['domain_name'];
//create the conference list command
$switch_cmd = "conference '".$conference_name."' xml_list";
app/conferences_active/conferences_active_inc.php
+1 -1
View File
@@ -83,7 +83,7 @@ else {
//show the conferences that have a matching domain
$tmp_domain = substr($name, -strlen($_SESSION['domain_name']));
if ($tmp_domain == $_SESSION['domain_name']) {
$conference_name = substr($name, 0, strlen($name) - strlen('-'.$_SESSION['domain_name']));
$conference_name = substr($name, 0, strlen($name) - strlen('@'.$_SESSION['domain_name']));
if (is_uuid($conference_name)) {
$meeting_uuid = $conference_name;
$sql = "select ";