aboutsummaryrefslogtreecommitdiffstats
path: root/packages/freeswitch
diff options
context:
space:
mode:
authorMark Crane <mcrane@pfsense.org>2008-12-13 07:30:38 +0000
committerMark Crane <mcrane@pfsense.org>2008-12-13 07:30:38 +0000
commit44e9abeea51989f4421a551463feaa9aa5b41b71 (patch)
tree934b28da0ff463bb3e2a18514a611de10b001c83 /packages/freeswitch
parent5374e5972afc5e16f90a8434e3d136843cd6fd33 (diff)
downloadpfsense-packages-44e9abeea51989f4421a551463feaa9aa5b41b71.tar.gz
pfsense-packages-44e9abeea51989f4421a551463feaa9aa5b41b71.tar.bz2
pfsense-packages-44e9abeea51989f4421a551463feaa9aa5b41b71.zip
FreeSWITCH package improvements for pfSense 2.0.
Diffstat (limited to 'packages/freeswitch')
-rw-r--r--packages/freeswitch/freeswitch.inc2
-rw-r--r--packages/freeswitch/freeswitch.xml2
-rw-r--r--packages/freeswitch/freeswitch_cmd.tmp70
-rw-r--r--packages/freeswitch/freeswitch_dialplan_includes.tmp3
-rw-r--r--packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_dialplan_includes_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_gateways.tmp4
-rw-r--r--packages/freeswitch/freeswitch_gateways_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_ivr.tmp6
-rw-r--r--packages/freeswitch/freeswitch_ivr_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_ivr_options_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_public_includes.tmp6
-rw-r--r--packages/freeswitch/freeswitch_public_includes_details_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_public_includes_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_recordings.tmp5
-rw-r--r--packages/freeswitch/freeswitch_recordings_edit.tmp3
-rw-r--r--packages/freeswitch/freeswitch_status.tmp2
-rw-r--r--packages/freeswitch/freeswitch_time_conditions.tmp7
18 files changed, 20 insertions, 111 deletions
diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index 569c6790..76621e7b 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -1967,7 +1967,7 @@ function freeswitch_php_install_command()
}
$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_version'] = "1.0.1 revision 10638.";
- $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.4.5";
+ $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.4.6";
conf_mount_ro();
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index f3520c0a..56c4d584 100644
--- a/packages/freeswitch/freeswitch.xml
+++ b/packages/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.4.5</version>
+ <version>0.4.6</version>
<title>FreeSWITCH: Settings</title>
<include_file>/usr/local/pkg/freeswitch.inc</include_file>
<menu>
diff --git a/packages/freeswitch/freeswitch_cmd.tmp b/packages/freeswitch/freeswitch_cmd.tmp
index 340936d9..05ae77cf 100644
--- a/packages/freeswitch/freeswitch_cmd.tmp
+++ b/packages/freeswitch/freeswitch_cmd.tmp
@@ -32,79 +32,13 @@
*/
require("guiconfig.inc");
+require("/usr/local/pkg/freeswitch.inc");
$cmd = $_GET['cmd'];
-function event_socket_create($host, $port, $password) {
- $fp = fsockopen($host, $port, $errno, $errdesc)
- or die("Connection to $host failed");
- socket_set_blocking($fp,false);
-
- if ($fp) {
- while (!feof($fp)) {
- $buffer = fgets($fp, 1024);
- usleep(100); //allow time for reponse
- if (trim($buffer) == "Content-Type: auth/request") {
- fputs($fp, "auth $password\n\n");
- break;
- }
- }
- return $fp;
- }
- else {
- return false;
- }
-}
-
-
-function event_socket_request($fp, $cmd) {
-
- if ($fp) {
- fputs($fp, $cmd."\n\n");
- usleep(100); //allow time for reponse
-
- $response = "";
- $i = 0;
- $contentlength = 0;
- while (!feof($fp)) {
- $buffer = fgets($fp, 4096);
- if ($contentlength > 0) {
- $response .= $buffer;
- }
-
- if ($contentlength == 0) { //if contentlenght is already don't process again
- if (strlen(trim($buffer)) > 0) { //run only if buffer has content
- $temparray = split(":", trim($buffer));
- if ($temparray[0] == "Content-Length") {
- $contentlength = trim($temparray[1]);
- }
- }
- }
-
- usleep(100); //allow time for reponse
-
- //optional because of script timeout //don't let while loop become endless
- if ($i > 10000) { break; }
-
- if ($contentlength > 0) { //is contentlength set
- //stop reading if all content has been read.
- if (strlen($response) >= $contentlength) {
- break;
- }
- }
- $i++;
- }
-
- return $response;
- }
- else {
- echo "no handle";
- }
-}
-
$password = $config['installedpackages']['freeswitchsettings']['config'][0]['event_socket_password'];
$port = $config['installedpackages']['freeswitchsettings']['config'][0]['event_socket_port'];
-$host = $config['interfaces']['lan']['ipaddr'];
+$host = '';
$fp = event_socket_create($host, $port, $password);
$response = event_socket_request($fp, $cmd);
diff --git a/packages/freeswitch/freeswitch_dialplan_includes.tmp b/packages/freeswitch/freeswitch_dialplan_includes.tmp
index c1f582f2..2731b6e2 100644
--- a/packages/freeswitch/freeswitch_dialplan_includes.tmp
+++ b/packages/freeswitch/freeswitch_dialplan_includes.tmp
@@ -97,14 +97,13 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = "FreeSWITCH: Dialplan";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Dialplan</p>
<div id="mainlevel">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp b/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp
index fa6935fb..73ac7259 100644
--- a/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp
+++ b/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp
@@ -115,14 +115,13 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: Dialplan: Details: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Dialplan: Details: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp b/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp
index 749c808e..7b5c8235 100644
--- a/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp
+++ b/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp
@@ -166,14 +166,13 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: Dialplan: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Dialplan: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/packages/freeswitch/freeswitch_gateways.tmp b/packages/freeswitch/freeswitch_gateways.tmp
index 9956ae60..a9202242 100644
--- a/packages/freeswitch/freeswitch_gateways.tmp
+++ b/packages/freeswitch/freeswitch_gateways.tmp
@@ -47,16 +47,14 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = "FreeSWITCH: Gateways";
include("head.inc");
?>
-
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Gateways</p>
<div id="mainlevel">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/packages/freeswitch/freeswitch_gateways_edit.tmp b/packages/freeswitch/freeswitch_gateways_edit.tmp
index 9ddbe8de..611d9441 100644
--- a/packages/freeswitch/freeswitch_gateways_edit.tmp
+++ b/packages/freeswitch/freeswitch_gateways_edit.tmp
@@ -214,7 +214,6 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: Gateways: Edit";
include("head.inc");
?>
@@ -240,7 +239,7 @@ function show_advanced_config() {
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Gateways: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/packages/freeswitch/freeswitch_ivr.tmp b/packages/freeswitch/freeswitch_ivr.tmp
index e76275cc..d953a576 100644
--- a/packages/freeswitch/freeswitch_ivr.tmp
+++ b/packages/freeswitch/freeswitch_ivr.tmp
@@ -49,17 +49,13 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = "FreeSWITCH: IVR";
include("head.inc");
?>
-
-
-
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: IVR</p>
<div id="mainlevel">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/packages/freeswitch/freeswitch_ivr_edit.tmp b/packages/freeswitch/freeswitch_ivr_edit.tmp
index 71efac2c..56dd029b 100644
--- a/packages/freeswitch/freeswitch_ivr_edit.tmp
+++ b/packages/freeswitch/freeswitch_ivr_edit.tmp
@@ -193,14 +193,13 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: IVR: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: IVR: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/packages/freeswitch/freeswitch_ivr_options_edit.tmp b/packages/freeswitch/freeswitch_ivr_options_edit.tmp
index a7bb3e8d..3811b923 100644
--- a/packages/freeswitch/freeswitch_ivr_options_edit.tmp
+++ b/packages/freeswitch/freeswitch_ivr_options_edit.tmp
@@ -102,14 +102,13 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: IVR: Options: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: IVR: Options: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="mainlevel">
diff --git a/packages/freeswitch/freeswitch_public_includes.tmp b/packages/freeswitch/freeswitch_public_includes.tmp
index 8b2586fc..50cbcc6a 100644
--- a/packages/freeswitch/freeswitch_public_includes.tmp
+++ b/packages/freeswitch/freeswitch_public_includes.tmp
@@ -99,17 +99,13 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = "FreeSWITCH: Public";
include("head.inc");
?>
-
-
-
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Public</p>
<div id="mainlevel">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/packages/freeswitch/freeswitch_public_includes_details_edit.tmp b/packages/freeswitch/freeswitch_public_includes_details_edit.tmp
index 8a6d8c2d..254ff38f 100644
--- a/packages/freeswitch/freeswitch_public_includes_details_edit.tmp
+++ b/packages/freeswitch/freeswitch_public_includes_details_edit.tmp
@@ -116,14 +116,13 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: Public: Details: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Public: Details: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/packages/freeswitch/freeswitch_public_includes_edit.tmp b/packages/freeswitch/freeswitch_public_includes_edit.tmp
index 7c5b2158..21a16c7f 100644
--- a/packages/freeswitch/freeswitch_public_includes_edit.tmp
+++ b/packages/freeswitch/freeswitch_public_includes_edit.tmp
@@ -169,14 +169,13 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: Public: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Public: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/packages/freeswitch/freeswitch_recordings.tmp b/packages/freeswitch/freeswitch_recordings.tmp
index 4b336632..702e0c47 100644
--- a/packages/freeswitch/freeswitch_recordings.tmp
+++ b/packages/freeswitch/freeswitch_recordings.tmp
@@ -74,7 +74,6 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = "FreeSWITCH: Recordings";
include("head.inc");
?>
@@ -86,11 +85,9 @@ function EvalSound(soundobj) {
}
</script>
-
-
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Recordings</p>
<div id="mainlevel">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/packages/freeswitch/freeswitch_recordings_edit.tmp b/packages/freeswitch/freeswitch_recordings_edit.tmp
index f41c5abc..18c5705a 100644
--- a/packages/freeswitch/freeswitch_recordings_edit.tmp
+++ b/packages/freeswitch/freeswitch_recordings_edit.tmp
@@ -93,14 +93,13 @@ if ($_POST) {
}
}
-$pgtitle = "FreeSWITCH: Recordings: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: Recordings: Edit</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/packages/freeswitch/freeswitch_status.tmp b/packages/freeswitch/freeswitch_status.tmp
index d5dd7a80..66d21104 100644
--- a/packages/freeswitch/freeswitch_status.tmp
+++ b/packages/freeswitch/freeswitch_status.tmp
@@ -100,7 +100,9 @@ $savemsg = $_GET["savemsg"];
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
+
<p class="pgtitle">FreeSWITCH: Status</font></p>
+
<?php
if ($savemsg) {
print_info_box($savemsg);
diff --git a/packages/freeswitch/freeswitch_time_conditions.tmp b/packages/freeswitch/freeswitch_time_conditions.tmp
index f876be95..daf6cf48 100644
--- a/packages/freeswitch/freeswitch_time_conditions.tmp
+++ b/packages/freeswitch/freeswitch_time_conditions.tmp
@@ -50,18 +50,13 @@ if ($_GET['act'] == "del") {
}
-$pgtitle = "FreeSWITCH: IVR: Options";
include("head.inc");
?>
-
-
-
-
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
+<p class="pgtitle">FreeSWITCH: IVR: Options</p>
<div id="mainlevel">
<table width="100%" border="0" cellpadding="0" cellspacing="0">