From 7897e95bcd90c8926d65e19e58fe73e2326c4d05 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Fri, 21 Dec 2012 19:03:35 +0000
Subject: [PATCH] Fix use-rtp-timer so that the value can be set to true and
 false as expected.

---
 app/xmpp/app_config.php        | 3 ++-
 app/xmpp/profile_edit.php      | 4 ++--
 app/xmpp/xmpp_profile_edit.php | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/xmpp/app_config.php b/app/xmpp/app_config.php
index 7a61687c2b..94a1a803a8 100644
--- a/app/xmpp/app_config.php
+++ b/app/xmpp/app_config.php
@@ -126,7 +126,8 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; 
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'usr_rtp_timer';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'use_rtp_timer';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'usr_rtp_timer';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; 
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 		$z++;
diff --git a/app/xmpp/profile_edit.php b/app/xmpp/profile_edit.php
index e95efa9417..c70aff61e5 100644
--- a/app/xmpp/profile_edit.php
+++ b/app/xmpp/profile_edit.php
@@ -202,8 +202,8 @@ function hide_advanced_config() {
 					</td> 
 					<td class='vtable' align='left'> 
 						<select class='formfld' name='use_rtp_timer'> 
-						<option value='true' <?php if($profile['tls_enable'] == "true") echo "selected='selected'"; ?>>true</option> 
-						<option value='false' <?php if($profile['tls_enable'] == "false") echo "selected='selected'"; ?>>false</option> 
+						<option value='true' <?php if($profile['use_rtp_timer'] == "true") echo "selected='selected'"; ?>>true</option> 
+						<option value='false' <?php if($profile['use_rtp_timer'] == "false") echo "selected='selected'"; ?>>false</option> 
 						</select> 
 						<br /> 
 						Disable to trade async for more calls
diff --git a/app/xmpp/xmpp_profile_edit.php b/app/xmpp/xmpp_profile_edit.php
index fd635825f9..f844257472 100644
--- a/app/xmpp/xmpp_profile_edit.php
+++ b/app/xmpp/xmpp_profile_edit.php
@@ -77,7 +77,7 @@ if ($action == "update") {
  	$profile['auto_login'] = "true";
  	$profile['sasl_type'] = "md5";
  	$profile['tls_enable'] = "true";
- 	$profile['usr_rtp_timer'] = "true";
+ 	$profile['use_rtp_timer'] = "true";
  	$profile['vad'] = "none";
 	$profile['candidate_acl'] = "wan.auto";
  	$profile['local_network_acl'] = "localnet.auto";
@@ -126,7 +126,7 @@ if ($action == "add" && permission_exists('xmpp_add')) {
  	$sql .= "sasl_type, ";
  	$sql .= "xmpp_server, ";
  	$sql .= "tls_enable, ";
- 	$sql .= "usr_rtp_timer, ";
+ 	$sql .= "use_rtp_timer, ";
  	$sql .= "default_exten, ";
  	$sql .= "vad, ";
  	$sql .= "avatar, ";
@@ -153,7 +153,7 @@ if ($action == "add" && permission_exists('xmpp_add')) {
  	$sql .= "'" . $request['sasl_type'] . "', ";
  	$sql .= "'" . $request['xmpp_server'] . "', ";
  	$sql .= "'" . $request['tls_enable'] . "', ";
- 	$sql .= "'" . $request['usr_rtp_timer'] . "', ";
+ 	$sql .= "'" . $request['use_rtp_timer'] . "', ";
  	$sql .= "'" . $request['default_exten'] . "', ";
  	$sql .= "'" . $request['vad'] . "', ";
  	$sql .= "'" . $request['avatar'] . "', ";
@@ -184,7 +184,7 @@ elseif ($action == "update" && permission_exists('xmpp_edit')) {
 	$sql .= "sasl_type = '" . $request['sasl_type'] . "', ";
 	$sql .= "xmpp_server = '" . $request['xmpp_server'] . "', ";
 	$sql .= "tls_enable = '" . $request['tls_enable'] . "', ";
-	$sql .= "usr_rtp_timer = '" . $request['usr_rtp_timer'] . "', ";
+	$sql .= "use_rtp_timer = '" . $request['use_rtp_timer'] . "', ";
 	$sql .= "default_exten = '" . $request['default_exten'] . "', ";
 	$sql .= "vad = '" . $request['vad'] . "', ";
 	$sql .= "avatar = '" . $request['avatar'] . "', ";