aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormcrane <mctch@yahoo.com>2009-08-10 17:52:51 -0600
committermcrane <mctch@yahoo.com>2009-08-10 17:54:40 -0600
commitab5412cec92a1644d1cc9aba540d3f1987971341 (patch)
tree6a8c795732a5a6dd78e27ec327b34764c888b9a2
parent3222bdb2a7984c1991174c44f9b94c651c9ee9f1 (diff)
downloadpfsense-packages-ab5412cec92a1644d1cc9aba540d3f1987971341.tar.gz
pfsense-packages-ab5412cec92a1644d1cc9aba540d3f1987971341.tar.bz2
pfsense-packages-ab5412cec92a1644d1cc9aba540d3f1987971341.zip
FreeSWITCH dev add -p option to mkdir for storage/fax, recordings adjust so file they can be deleted.
Diffstat
-rw-r--r--config/freeswitch_dev/freeswitch.xml2
-rw-r--r--config/freeswitch_dev/v_config.inc12
-rw-r--r--config/freeswitch_dev/v_modules.tmp4
-rw-r--r--config/freeswitch_dev/v_recordings.tmp42
-rw-r--r--config/freeswitch_dev/v_vars.tmp4
-rwxr-xr-xpkg_config.7.xml2
6 files changed, 35 insertions, 31 deletions
diff --git a/config/freeswitch_dev/freeswitch.xml b/config/freeswitch_dev/freeswitch.xml
index 89be61aa..52869b93 100644
--- a/config/freeswitch_dev/freeswitch.xml
+++ b/config/freeswitch_dev/freeswitch.xml
@@ -44,7 +44,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>Settings</name>
- <version>0.9.7.18</version>
+ <version>0.9.7.19</version>
<title>Settings</title>
<include_file>/usr/local/pkg/v_config.inc</include_file>
<menu>
diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc
index ff82257a..b255e72c 100644
--- a/config/freeswitch_dev/v_config.inc
+++ b/config/freeswitch_dev/v_config.inc
@@ -52,7 +52,7 @@ function v_settings()
$config['installedpackages']['freeswitchsettings']['config'][0]['tmp_dir'] = '/tmp';
$config['installedpackages']['freeswitchsettings']['config'][0]['bin_dir'] = '/usr/local/bin';
$config['installedpackages']['freeswitchsettings']['config'][0]['v_startup_script_dir'] = '/usr/local/etc/rc.d';
- $config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.18";
+ $config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.19";
$config['installedpackages']['freeswitchsettings']['config'][0]['v_build_version'] = "1.0.4";
$config['installedpackages']['freeswitchsettings']['config'][0]['v_build_revision'] = "Release";
$config['installedpackages']['freeswitchsettings']['config'][0]['v_label'] = 'FreeSWITCH'; //FreeSWITCH (TM) http://www.freeswitch.org/
@@ -3135,13 +3135,9 @@ function v_install_phase_2() {
if (!is_dir($v_dir.'/sounds/custom/8000/')) {
exec("mkdir ".$v_dir."/sounds/custom/8000/");
}
-
- if (!is_dir($v_storage_dir)) {
- exec("mkdir ".$v_storage_dir);
- }
if (!is_dir($v_storage_dir.'/fax/')) {
- exec("mkdir ".$v_storage_dir."/fax/");
+ exec("mkdir -p ".$v_storage_dir."/fax/");
}
//download the dialplan default.xml
@@ -3886,6 +3882,10 @@ function v_install_phase_1()
//system('tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/htdocs/');
unset($filename);
+
+ if (!is_dir($v_storage_dir.'/fax/')) {
+ exec("mkdir -p ".$v_storage_dir."/fax/");
+ }
}
diff --git a/config/freeswitch_dev/v_modules.tmp b/config/freeswitch_dev/v_modules.tmp
index 57ff51fc..b640a2cc 100644
--- a/config/freeswitch_dev/v_modules.tmp
+++ b/config/freeswitch_dev/v_modules.tmp
@@ -310,7 +310,9 @@ function show_advanced_config() {
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php
include("fbegin.inc");
-echo "<p class=\"pgtitle\">$v_label: Modules</p>\n";
+if ($v_label_show) {
+ echo "<p class=\"pgtitle\">$v_label: Modules</p>\n";
+}
?>
<?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/config/freeswitch_dev/v_recordings.tmp b/config/freeswitch_dev/v_recordings.tmp
index 23075d79..1d0d485e 100644
--- a/config/freeswitch_dev/v_recordings.tmp
+++ b/config/freeswitch_dev/v_recordings.tmp
@@ -30,8 +30,7 @@
require("guiconfig.inc");
require("/usr/local/pkg/v_config.inc");
-$a_recordings = $config['installedpackages']['freeswitchrecordings']['config'];
-$dir_recordings = $v_recordings_dir.'/';
+$a_recordings = &$config['installedpackages']['freeswitchrecordings']['config'];
$dir_music_on_hold_8000 = $v_dir.'/sounds/music/8000/';
if ($_GET['a'] == "download") {
@@ -39,8 +38,8 @@ if ($_GET['a'] == "download") {
session_cache_limiter('public');
if ($_GET['type'] = "rec") {
- if (file_exists($dir_recordings.$_GET['filename'])) {
- $fd = fopen($dir_recordings.$_GET['filename'], "rb");
+ if (file_exists($v_recordings_dir.'/'.$_GET['filename'])) {
+ $fd = fopen($v_recordings_dir.'/'.$_GET['filename'], "rb");
if ($_GET['t'] == "bin") {
header("Content-Type: application/force-download");
header("Content-Type: application/octet-stream");
@@ -59,7 +58,7 @@ if ($_GET['a'] == "download") {
}
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
- header("Content-Length: " . filesize($dir_recordings.$_GET['filename']));
+ header("Content-Length: " . filesize($v_recordings_dir.'/'.$_GET['filename']));
fpassthru($fd);
}
}
@@ -93,7 +92,7 @@ if ($_GET['a'] == "download") {
exit;
}
else {
- //echo $dir_recordings.$_GET['filename'];
+ //echo $v_recordings_dir.'/'.$_GET['filename'];
}
if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
@@ -105,9 +104,9 @@ if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_na
unset($_POST['txtCommand']);
}
if ($_POST['type'] == 'rec') {
- move_uploaded_file($_FILES['ulfile']['tmp_name'], $dir_recordings . $_FILES['ulfile']['name']);
- $savemsg = "Uploaded file to $dir_recordings" . htmlentities($_FILES['ulfile']['name']);
- //system('chmod -R 744 $dir_recordings*');
+ move_uploaded_file($_FILES['ulfile']['tmp_name'], $v_recordings_dir.'/' . $_FILES['ulfile']['name']);
+ $savemsg = "Uploaded file to ".$v_recordings_dir."/". htmlentities($_FILES['ulfile']['name']);
+ //system('chmod -R 744 $v_recordings_dir*');
unset($_POST['txtCommand']);
}
}
@@ -117,13 +116,14 @@ if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_na
if ($_GET['act'] == "del") {
if ($_GET['type'] == 'rec') {
- if ($a_recordings[$_GET['id']]) {
- unlink_if_exists($v_recordings_dir.$a_recordings[$_GET['id']]['filename']);
+ //if ($_GET['id']) {
+ echo "id: ".$_GET['id'];
+ unlink_if_exists($v_recordings_dir."/".$_GET['filename']);
unset($a_recordings[$_GET['id']]);
write_config();
header("Location: v_recordings.php");
exit;
- }
+ //}
}
if ($_GET['type'] == 'moh') {
@@ -186,15 +186,15 @@ if (count($a_recordings) > 0) {
$config_change = 0;
-if (is_dir($dir_recordings)) {
- if ($dh = opendir($dir_recordings)) {
+if (is_dir($v_recordings_dir.'/')) {
+ if ($dh = opendir($v_recordings_dir.'/')) {
while (($file = readdir($dh)) !== false) {
- if (filetype($dir_recordings . $file) == "file") {
+ if (filetype($v_recordings_dir.'/' . $file) == "file") {
if (strpos($config_recording_list, $file) === false) {
- //$handle = fopen($dir_recordings.$file,'rb');
- //$file_content = fread($handle,filesize($dir_recordings.$file));
+ //$handle = fopen($v_recordings_dir.'/'.$file,'rb');
+ //$file_content = fread($handle,filesize($v_recordings_dir.'/'.$file));
//fclose($handle);
$a_file = split("\.", $file);
@@ -230,12 +230,12 @@ if (is_dir($dir_recordings)) {
//if (count($a_recordings) > 0) {
// foreach ($a_recordings as $recordingent) {
-// if (!is_file($dir_recordings.$recordingent['filename'])) {
+// if (!is_file($v_recordings_dir.'/'.$recordingent['filename'])) {
//echo "not found: ".$recordingent['filename']."<br />";
//recording not found restore the file from the config.xml
//$file_content = $recordingent['filecontent'];
- //$handle = fopen($dir_recordings.$recordingent['filename'],'w');
+ //$handle = fopen($v_recordings_dir.'/'.$recordingent['filename'],'w');
//fwrite ($handle, base64_decode($file_content));
//unset($file_content);
//fclose($handle);
@@ -290,7 +290,7 @@ if ($config_change == 1) {
<?php
if ($v_path_show) {
echo "<b>location:</b>";
- echo $dir_recordings;
+ echo $v_recordings_dir.'/';
}
?>
</td>
@@ -348,7 +348,7 @@ if ($config_change == 1) {
<table border="0" cellspacing="0" cellpadding="1">
<tr>
<td valign="middle"><a href="v_recordings_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
- <td><a href="v_recordings.php?type=rec&act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+ <td><a href="v_recordings.php?type=rec&act=del&id=<?=$i;?>&filename=<?=$recordingent['filename'];?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
</tr>
</table>
</td>
diff --git a/config/freeswitch_dev/v_vars.tmp b/config/freeswitch_dev/v_vars.tmp
index 1608252d..d713d9e3 100644
--- a/config/freeswitch_dev/v_vars.tmp
+++ b/config/freeswitch_dev/v_vars.tmp
@@ -81,7 +81,9 @@ function sf() { document.forms[0].savetopath.focus(); }
<?php
include("fbegin.inc");
-echo "<p class=\"pgtitle\">$v_label: Variables</p>\n";
+if ($v_label_show) {
+ echo "<p class=\"pgtitle\">$v_label: Variables</p>\n";
+}
?>
<div id="mainlevel">
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 81d44e39..5008f21e 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -126,7 +126,7 @@
<pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
<config_file>http://www.pfsense.com/packages/config/freeswitch_dev/freeswitch.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
- <version>0.9.7.18</version>
+ <version>0.9.7.19</version>
<status>Beta</status>
<required_version>1.2.3</required_version>
<maintainer>markjcrane@gmail.com</maintainer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 22:53:40 +0000