From 13352163b554be692844c90e0bc6abbb4c77c93d Mon Sep 17 00:00:00 2001
From: mcrane <mctch@yahoo.com>
Date: Sat, 4 Jul 2009 04:45:27 -0600
Subject: FreeSWITCH package add caller id info to outbound dialplan entry for
 new gateways.

---
 config/freeswitch/freeswitch.inc               |  2 +-
 config/freeswitch/freeswitch.xml               |  2 +-
 config/freeswitch/freeswitch_gateways_edit.tmp | 43 +++++++++++++++++++++++++-
 pkg_config.7.xml                               |  2 +-
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/config/freeswitch/freeswitch.inc b/config/freeswitch/freeswitch.inc
index 9e4f0627..3e39d417 100644
--- a/config/freeswitch/freeswitch.inc
+++ b/config/freeswitch/freeswitch.inc
@@ -2644,7 +2644,7 @@ function sync_package_freeswitch()
 function freeswitch_php_install_command()
 {
 	global $config;
-	$freeswitch_package_version = "0.9.4";
+	$freeswitch_package_version = "0.9.4.1";
 	$freeswitch_build_version = "1.0.4 pre 8";
 	$freeswitch_build_revision = "13784";
 	
diff --git a/config/freeswitch/freeswitch.xml b/config/freeswitch/freeswitch.xml
index 2d58fd83..d9fb2346 100644
--- a/config/freeswitch/freeswitch.xml
+++ b/config/freeswitch/freeswitch.xml
@@ -44,7 +44,7 @@
 		<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>FreeSWITCH Settings</name>
-	<version>0.9.4</version>
+	<version>0.9.4.1</version>
 	<title>FreeSWITCH: Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
diff --git a/config/freeswitch/freeswitch_gateways_edit.tmp b/config/freeswitch/freeswitch_gateways_edit.tmp
index 73792c1a..c51ad5fe 100644
--- a/config/freeswitch/freeswitch_gateways_edit.tmp
+++ b/config/freeswitch/freeswitch_gateways_edit.tmp
@@ -232,7 +232,48 @@ if ($_POST) {
 					$ent['fieldorder'] = '000';
 					$a_dialplan_include_details[] = $ent;
 					unset($ent);
-	            		
+
+					if (strlen($effective_caller_id_name) > 0) {
+						$ent = array();
+						$ent['dialplanincludeid'] = $dialplanincludeid;
+						$ent['tag'] = 'action'; //condition, action, antiaction
+						$ent['fieldtype'] = 'set';
+						$ent['fielddata'] = 'effective_caller_id_name='.$effective_caller_id_name;
+						$ent['fieldorder'] = '001';
+						$a_dialplan_include_details[] = $ent;
+						unset($ent);
+					}
+					if (strlen($effective_caller_id_number) > 0) {
+						$ent = array();
+						$ent['dialplanincludeid'] = $dialplanincludeid;
+						$ent['tag'] = 'action'; //condition, action, antiaction
+						$ent['fieldtype'] = 'set';
+						$ent['fielddata'] = 'effective_caller_id_number='.$effective_caller_id_number;
+						$ent['fieldorder'] = '001';
+						$a_dialplan_include_details[] = $ent;
+						unset($ent);
+					}
+					if (strlen($outbound_caller_id_name) > 0) {
+						$ent = array();
+						$ent['dialplanincludeid'] = $dialplanincludeid;
+						$ent['tag'] = 'action'; //condition, action, antiaction
+						$ent['fieldtype'] = 'set';
+						$ent['fielddata'] = 'outbound_caller_id_name='.$outbound_caller_id_name;
+						$ent['fieldorder'] = '001';
+						$a_dialplan_include_details[] = $ent;
+						unset($ent);
+					}
+					if (strlen($outbound_caller_id_number) > 0) {
+						$ent = array();
+						$ent['dialplanincludeid'] = $dialplanincludeid;
+						$ent['tag'] = 'action'; //condition, action, antiaction
+						$ent['fieldtype'] = 'set';
+						$ent['fielddata'] = 'outbound_caller_id_number='.$outbound_caller_id_number;
+						$ent['fieldorder'] = '001';
+						$a_dialplan_include_details[] = $ent;
+						unset($ent);
+					}
+					
 	                $ent = array();
 	                $ent['dialplanincludeid'] = $dialplanincludeid;
 	                $ent['tag'] = 'action'; //condition, action, antiaction
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index bd396aa8..e1623eca 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -111,7 +111,7 @@
       <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.9.4</version>
+      <version>0.9.4.1</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-- 
cgit v1.2.3