From 8ece67c74df50b4ebd00121eccea788718e83d43 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Wed, 8 Oct 2008 08:34:51 +0000
Subject: freeswitch_status.php get connection from config.xml

---
 packages/freeswitch/freeswitch.inc        |  2 +-
 packages/freeswitch/freeswitch_status.tmp | 22 ++++++++++------------
 pkg_config.7.xml                          |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index 14cdc759..21bd75b5 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -593,7 +593,7 @@ function freeswitch_php_install_command()
   pclose($handle);
 
 	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_version'] = "1.0.1 revision 9759.";
-	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.1";       
+	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.1.1";       
   conf_mount_ro();
 	config_unlock();
   
diff --git a/packages/freeswitch/freeswitch_status.tmp b/packages/freeswitch/freeswitch_status.tmp
index dcdeede3..67b73767 100644
--- a/packages/freeswitch/freeswitch_status.tmp
+++ b/packages/freeswitch/freeswitch_status.tmp
@@ -1,11 +1,13 @@
 <?php
 /* $Id$ */
 /*
-	tinydns_view_logs.php
-	part of pfSense (http://www.pfsense.com/)
-
-	Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
+	freeswitch_status.php
+	Copyright (C) 2008 Mark J Crane
 	All rights reserved.
+  
+	FreeSWITCH (TM)
+	http://www.freeswitch.org/
+
 
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
@@ -31,10 +33,6 @@
 
 require("guiconfig.inc");
 
-/* Defaults to this page but if no settings are present, redirect to setup page */
-//if(!$config['installedpackages']['tinydns']['config'][0]) {
-//	Header("Location: /pkg_edit.php?xml=tinydns.xml&id=0");
-//}
 
 function event_socket_create($host, $port, $password) {
    $fp = fsockopen($host, $port, $errno, $errdesc) 
@@ -107,9 +105,9 @@ function event_socket_request($fp, $cmd) {
 $pgtitle = "FreeSWITCH: Status";
 include("head.inc");
 
-$password = "ClueCon";
-$port = "8021";
-$host = "192.168.1.1";
+$password = $config['installedpackages']['freeswitchsettings']['config'][0]['event_socket_password'];
+$port = $config['installedpackages']['freeswitchsettings']['config'][0]['event_socket_port'];
+$host = $config['interfaces']['lan']['ipaddr'];
 
 
 ?>
@@ -127,7 +125,7 @@ $host = "192.168.1.1";
 	$tab_array[] = array(gettext("Dialplan"), false, "/pkg_edit.php?xml=freeswitch_dialplan.xml&amp;id=0");
 	$tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml");
 	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
-  $tab_array[] = array(gettext("Gateways"), false, "/pkg.php?xml=freeswitch_gateways.xml");
+	$tab_array[] = array(gettext("Gateways"), false, "/pkg.php?xml=freeswitch_gateways.xml");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
 	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/pkg_edit.php?xml=freeswitch_public.xml&amp;id=0");
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 3dfd26f7..19e85831 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -20,7 +20,7 @@
       <category>Services</category>
       <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.1</version>
+      <version>0.1.1</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-- 
cgit v1.2.3