From 9ad4a5850ac7876f346aad0fb79363879fa6e85f Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 22 Apr 2015 22:45:05 +0000
Subject: [PATCH] Fix conference sound file problem and add the missing
 profiles that are in the standard conference.conf.xml file.

---
 .../scripts/configuration/conference.conf.lua | 206 +++++++++++++++---
 1 file changed, 177 insertions(+), 29 deletions(-)

diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
index f8d6ab3696..b18be392a2 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua
@@ -46,7 +46,7 @@
 	table.insert(xml, [[					<control action="hangup" digits=""/>]]);
 	table.insert(xml, [[				</group>]]);
 	table.insert(xml, [[				<group name="moderator">]]);
-	table.insert(xml, [[					<control action="mute" digits="#"/>]]);
+	table.insert(xml, [[					<control action="mute" digits="*"/>]]);
 	table.insert(xml, [[					<control action="deaf mute" digits=""/>]]);
 	table.insert(xml, [[					<control action="energy up" digits="9"/>]]);
 	table.insert(xml, [[					<control action="energy equ" digits="8"/>]]);
@@ -62,34 +62,182 @@
 	table.insert(xml, [[					<control action="execute_application" digits="*" data="lua app/conference_center/resources/scripts/unmute.lua non_moderator"/>]]);	
 	table.insert(xml, [[				</group>]]);
 	table.insert(xml, [[			</caller-controls>]]);
-	table.insert(xml, "");
-	table.insert(xml, [[			<profile name="default">]]);
-	table.insert(xml, [[				<param name="cdr-log-dir" value="auto"/>]]);
-	table.insert(xml, [[				<param name="conference-flags" value="wait-mod" />]]);
-	table.insert(xml, [[				<param name="domain" value="$${domain}"/>]]);
-	table.insert(xml, [[				<param name="rate" value="16000"/>]]);
-	table.insert(xml, [[				<param name="interval" value="20"/>]]);
-	table.insert(xml, [[				<param name="energy-level" value="15"/>]]);
-	table.insert(xml, [[				<param name="auto-gain-level" value="0"/>]]);
-	table.insert(xml, [[				<param name="caller-controls" value="default"/>]]);
-	table.insert(xml, [[				<param name="moderator-controls" value="default"/>]]);
-	table.insert(xml, [[				<param name="muted-sound" value="conference/conf-muted.wav"/>]]);
-	table.insert(xml, [[				<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>]]);
-	table.insert(xml, [[				<param name="alone-sound" value="conference/conf-alone.wav"/>]]);
-	table.insert(xml, [[				<param name="moh-sound" value="$${hold_music}"/>]]);
-	table.insert(xml, [[				<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>]]);
-	table.insert(xml, [[				<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>]]);
-	table.insert(xml, [[				<param name="kicked-sound" value="conference/conf-kicked.wav"/>]]);
-	table.insert(xml, [[				<param name="locked-sound" value="conference/conf-locked.wav"/>]]);
-	table.insert(xml, [[				<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>]]);
-	table.insert(xml, [[				<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>]]);
-	table.insert(xml, [[				<param name="pin-sound" value="conference/conf-pin.wav"/>]]);
-	table.insert(xml, [[				<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>]]);
-	table.insert(xml, [[				<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
-	table.insert(xml, [[				<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
-	table.insert(xml, [[				<param name="comfort-noise" value="true"/>]]);
-	table.insert(xml, [[				<param name="auto-record" value="/tmp/test.wav"/>]]);
-	table.insert(xml, [[			</profile>]]);
+	table.insert(xml, [[			<profiles>]]);
+
+	table.insert(xml, [[				<profile name="default">]]);
+	table.insert(xml, [[					<param name="cdr-log-dir" value="auto"/>]]);
+	table.insert(xml, [[					<param name="conference-flags" value="" />]]);
+	table.insert(xml, [[					<param name="domain" value="$${domain}"/>]]);
+	table.insert(xml, [[					<param name="rate" value="8000"/>]]);
+	table.insert(xml, [[					<param name="interval" value="20"/>]]);
+	table.insert(xml, [[					<param name="energy-level" value="15"/>]]);
+	table.insert(xml, [[					<param name="auto-gain-level" value="0"/>]]);
+	table.insert(xml, [[					<param name="caller-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="muted-sound" value="conference/conf-muted.wav"/>]]);
+	table.insert(xml, [[					<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>]]);
+	table.insert(xml, [[					<param name="alone-sound" value="conference/conf-alone.wav"/>]]);
+	table.insert(xml, [[					<param name="moh-sound" value="$${hold_music}"/>]]);
+	table.insert(xml, [[					<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>]]);
+	table.insert(xml, [[					<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>]]);
+	table.insert(xml, [[					<param name="kicked-sound" value="conference/conf-kicked.wav"/>]]);
+	table.insert(xml, [[					<param name="locked-sound" value="conference/conf-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>]]);
+	table.insert(xml, [[					<param name="pin-sound" value="conference/conf-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
+	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
+	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="/tmp/test.wav"/>]]);
+	table.insert(xml, [[				</profile>]]);
+
+	table.insert(xml, [[				<profile name="wideband">]]);
+	table.insert(xml, [[					<param name="cdr-log-dir" value="auto"/>]]);
+	table.insert(xml, [[					<param name="conference-flags" value="" />]]);
+	table.insert(xml, [[					<param name="domain" value="$${domain}"/>]]);
+	table.insert(xml, [[					<param name="rate" value="16000"/>]]);
+	table.insert(xml, [[					<param name="interval" value="20"/>]]);
+	table.insert(xml, [[					<param name="energy-level" value="15"/>]]);
+	table.insert(xml, [[					<param name="auto-gain-level" value="0"/>]]);
+	table.insert(xml, [[					<param name="caller-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="muted-sound" value="conference/conf-muted.wav"/>]]);
+	table.insert(xml, [[					<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>]]);
+	table.insert(xml, [[					<param name="alone-sound" value="conference/conf-alone.wav"/>]]);
+	table.insert(xml, [[					<param name="moh-sound" value="$${hold_music}"/>]]);
+	table.insert(xml, [[					<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>]]);
+	table.insert(xml, [[					<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>]]);
+	table.insert(xml, [[					<param name="kicked-sound" value="conference/conf-kicked.wav"/>]]);
+	table.insert(xml, [[					<param name="locked-sound" value="conference/conf-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>]]);
+	table.insert(xml, [[					<param name="pin-sound" value="conference/conf-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
+	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
+	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="/tmp/test.wav"/>]]);
+	table.insert(xml, [[				</profile>]]);
+
+	table.insert(xml, [[				<profile name="ultrawideband">]]);
+	table.insert(xml, [[					<param name="cdr-log-dir" value="auto"/>]]);
+	table.insert(xml, [[					<param name="conference-flags" value="" />]]);
+	table.insert(xml, [[					<param name="domain" value="$${domain}"/>]]);
+	table.insert(xml, [[					<param name="rate" value="32000"/>]]);
+	table.insert(xml, [[					<param name="interval" value="20"/>]]);
+	table.insert(xml, [[					<param name="energy-level" value="15"/>]]);
+	table.insert(xml, [[					<param name="auto-gain-level" value="0"/>]]);
+	table.insert(xml, [[					<param name="caller-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="muted-sound" value="conference/conf-muted.wav"/>]]);
+	table.insert(xml, [[					<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>]]);
+	table.insert(xml, [[					<param name="alone-sound" value="conference/conf-alone.wav"/>]]);
+	table.insert(xml, [[					<param name="moh-sound" value="$${hold_music}"/>]]);
+	table.insert(xml, [[					<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>]]);
+	table.insert(xml, [[					<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>]]);
+	table.insert(xml, [[					<param name="kicked-sound" value="conference/conf-kicked.wav"/>]]);
+	table.insert(xml, [[					<param name="locked-sound" value="conference/conf-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>]]);
+	table.insert(xml, [[					<param name="pin-sound" value="conference/conf-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
+	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
+	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="/tmp/test.wav"/>]]);
+	table.insert(xml, [[				</profile>]]);
+
+	table.insert(xml, [[				<profile name="cdquality">]]);
+	table.insert(xml, [[					<param name="cdr-log-dir" value="auto"/>]]);
+	table.insert(xml, [[					<param name="conference-flags" value="" />]]);
+	table.insert(xml, [[					<param name="domain" value="$${domain}"/>]]);
+	table.insert(xml, [[					<param name="rate" value="48000"/>]]);
+	table.insert(xml, [[					<param name="interval" value="20"/>]]);
+	table.insert(xml, [[					<param name="energy-level" value="15"/>]]);
+	table.insert(xml, [[					<param name="auto-gain-level" value="0"/>]]);
+	table.insert(xml, [[					<param name="caller-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="muted-sound" value="conference/conf-muted.wav"/>]]);
+	table.insert(xml, [[					<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>]]);
+	table.insert(xml, [[					<param name="alone-sound" value="conference/conf-alone.wav"/>]]);
+	table.insert(xml, [[					<param name="moh-sound" value="$${hold_music}"/>]]);
+	table.insert(xml, [[					<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>]]);
+	table.insert(xml, [[					<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>]]);
+	table.insert(xml, [[					<param name="kicked-sound" value="conference/conf-kicked.wav"/>]]);
+	table.insert(xml, [[					<param name="locked-sound" value="conference/conf-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>]]);
+	table.insert(xml, [[					<param name="pin-sound" value="conference/conf-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
+	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
+	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
+	table.insert(xml, [[					<param name="auto-record" value="/tmp/test.wav"/>]]);
+	table.insert(xml, [[				</profile>]]);
+
+	table.insert(xml, [[				<profile name="sla">]]);
+	--table.insert(xml, [[					<param name="domain" value="$${domain}"/>]]);
+	table.insert(xml, [[					<param name="rate" value="16000"/>]]);
+	table.insert(xml, [[					<param name="interval" value="20"/>]]);
+	table.insert(xml, [[					<param name="energy-level" value="300"/>]]);
+	table.insert(xml, [[					<param name="auto-gain-level" value="0"/>]]);
+	table.insert(xml, [[					<param name="caller-controls" value="none"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="none"/>]]);
+	table.insert(xml, [[					<param name="moh-sound" value="silence"/>]]);
+	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
+	table.insert(xml, [[				</profile>]]);
+
+	table.insert(xml, [[				<profile name="page">]]);
+	--table.insert(xml, [[					<param name="domain" value="$${domain}"/>]]);
+	table.insert(xml, [[					<param name="rate" value="8000"/>]]);
+	table.insert(xml, [[					<param name="interval" value="20"/>]]);
+	table.insert(xml, [[					<param name="energy-level" value="300"/>]]);
+	table.insert(xml, [[					<param name="auto-gain-level" value="0"/>]]);
+	table.insert(xml, [[					<param name="caller-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="muted-sound" value="conference/conf-muted.wav"/>]]);
+	table.insert(xml, [[					<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>]]);
+	table.insert(xml, [[					<param name="moh-sound" value="$${hold_music}"/>]]);
+	table.insert(xml, [[					<param name="kicked-sound" value="conference/conf-kicked.wav"/>]]);
+	table.insert(xml, [[					<param name="locked-sound" value="conference/conf-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>]]);
+	table.insert(xml, [[					<param name="pin-sound" value="conference/conf-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
+	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
+	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
+	table.insert(xml, [[				</profile>]]);
+
+	table.insert(xml, [[				<profile name="wait-mod">]]);
+	--table.insert(xml, [[					<param name="domain" value="$${domain}"/>]]);
+	table.insert(xml, [[					<param name="cdr-log-dir" value="auto"/>]]);
+	table.insert(xml, [[					<param name="conference-flags" value="wait-mod" />]]);
+	table.insert(xml, [[					<param name="rate" value="8000"/>]]);
+	table.insert(xml, [[					<param name="interval" value="20"/>]]);
+	table.insert(xml, [[					<param name="energy-level" value="15"/>]]);
+	table.insert(xml, [[					<param name="auto-gain-level" value="0"/>]]);
+	table.insert(xml, [[					<param name="caller-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="default"/>]]);
+	table.insert(xml, [[					<param name="muted-sound" value="conference/conf-muted.wav"/>]]);
+	table.insert(xml, [[					<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>]]);
+	table.insert(xml, [[					<param name="alone-sound" value="conference/conf-alone.wav"/>]]);
+	table.insert(xml, [[					<param name="moh-sound" value="$${hold_music}"/>]]);
+	table.insert(xml, [[					<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>]]);
+	table.insert(xml, [[					<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>]]);
+	table.insert(xml, [[					<param name="kicked-sound" value="conference/conf-kicked.wav"/>]]);
+	table.insert(xml, [[					<param name="locked-sound" value="conference/conf-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>]]);
+	table.insert(xml, [[					<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>]]);
+	table.insert(xml, [[					<param name="pin-sound" value="conference/conf-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>]]);
+	table.insert(xml, [[					<param name="caller-id-name" value="$${outbound_caller_name}"/>]]);
+	table.insert(xml, [[					<param name="caller-id-number" value="$${outbound_caller_id}"/>]]);
+	table.insert(xml, [[					<param name="comfort-noise" value="true"/>]]);
+	table.insert(xml, [[				</profile>]]);
+
+	table.insert(xml, [[			</profiles>]]);
 
 --set the xml array and then concatenate the array to a string
 	table.insert(xml, [[		</configuration>]]);