From c800fc3b67d7462e9a93ba7dec96db615fb5c9c7 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Thu, 14 May 2015 01:56:11 +0000
Subject: [PATCH] Page conference settings need page caller controls. For non
 modertor 0 mute and press again to unmute.

---
 .../scripts/configuration/conference.conf.lua | 20 ++++++++++++++++---
 .../conf/autoload_configs/conference.conf.xml | 20 ++++++++++++++++---
 2 files changed, 34 insertions(+), 6 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 b18be392a2..ad6d398c3b 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"/>]]);
@@ -61,6 +61,20 @@
 	table.insert(xml, [[					<control action="execute_application" digits="0" data="lua app/conference_center/resources/scripts/mute.lua non_moderator"/>]]);
 	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, [[				<group name="page">]]);
+	table.insert(xml, [[					<control action="mute" digits="0"/>]]);
+	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"/>]]);
+	table.insert(xml, [[					<control action="energy dn" digits="7"/>]]);
+	table.insert(xml, [[					<control action="vol talk up" digits="3"/>]]);
+	table.insert(xml, [[					<control action="vol talk zero" digits="2"/>]]);
+	table.insert(xml, [[					<control action="vol talk dn" digits="1"/>]]);
+	table.insert(xml, [[					<control action="vol listen up" digits="6"/>]]);
+	table.insert(xml, [[					<control action="vol listen zero" digits="5"/>]]);
+	table.insert(xml, [[					<control action="vol listen dn" digits="4"/>]]);
+	table.insert(xml, [[					<control action="hangup" digits=""/>]]);
+	table.insert(xml, [[				</group>]]);
 	table.insert(xml, [[			</caller-controls>]]);
 	table.insert(xml, [[			<profiles>]]);
 
@@ -194,8 +208,8 @@
 	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="caller-controls" value="page"/>]]);
+	table.insert(xml, [[					<param name="moderator-controls" value="moderator"/>]]);
 	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}"/>]]);
diff --git a/resources/templates/conf/autoload_configs/conference.conf.xml b/resources/templates/conf/autoload_configs/conference.conf.xml
index 641aa741ae..c6ece9de22 100644
--- a/resources/templates/conf/autoload_configs/conference.conf.xml
+++ b/resources/templates/conf/autoload_configs/conference.conf.xml
@@ -24,7 +24,7 @@
 			<control action="hangup" digits=""/>
 		</group>
 		<group name="moderator">
-			<control action="mute" digits="#"/>
+			<control action="mute" digits=""/>
 			<control action="deaf mute" digits="*"/>
 			<control action="energy up" digits="9"/>
 			<control action="energy equ" digits="8"/>
@@ -39,6 +39,20 @@
 			<control action="execute_application" digits="0" data="lua app/conference_center/resources/scripts/mute.lua non_moderator"/>
 			<control action="execute_application" digits="*" data="lua app/conference_center/resources/scripts/unmute.lua non_moderator"/>
 		</group>
+		<group name="page">
+			<control action="mute" digits="0"/>
+			<control action="deaf mute" digits=""/>
+			<control action="energy up" digits="9"/>
+			<control action="energy equ" digits="8"/>
+			<control action="energy dn" digits="7"/>
+			<control action="vol talk up" digits="3"/>
+			<control action="vol talk zero" digits="2"/>
+			<control action="vol talk dn" digits="1"/>
+			<control action="vol listen up" digits="6"/>
+			<control action="vol listen zero" digits="5"/>
+			<control action="vol listen dn" digits="4"/>
+			<control action="hangup" digits=""/>
+		</group>
 	</caller-controls>
 
 	<!-- Profiles are collections of settings you can reference by name. -->
@@ -263,8 +277,8 @@
 			<param name="rate" value="8000"/>
 			<param name="interval" value="20"/>
 			<param name="energy-level" value="300"/>
-			<param name="caller-controls" value="default"/>
-			<param name="moderator-controls" value="default"/>
+			<param name="caller-controls" value="page"/>
+			<param name="moderator-controls" value="moderator"/>
 			<!--<param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>-->
 			<param name="muted-sound" value="conference/conf-muted.wav"/>
 			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>