aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authormcrane <mctch@yahoo.com>2009-08-07 20:01:41 -0600
committermcrane <mctch@yahoo.com>2009-08-07 20:01:41 -0600
commite9653939b432451e4523e5381ed351f99a601fe0 (patch)
tree6451e42ab1e78044ec51c808dd35e0e78f2ce1de /config
parent15374edff36f1309e6615660357630bffba8ae0c (diff)
downloadpfsense-packages-e9653939b432451e4523e5381ed351f99a601fe0.tar.gz
pfsense-packages-e9653939b432451e4523e5381ed351f99a601fe0.tar.bz2
pfsense-packages-e9653939b432451e4523e5381ed351f99a601fe0.zip
FreeSWITCH dev package fix syntax errors.
Diffstat (limited to 'config')
-rw-r--r--config/freeswitch_dev/v_config.inc29
-rw-r--r--config/freeswitch_dev/v_dialplan.tmp2
-rw-r--r--config/freeswitch_dev/v_fax_edit.tmp6
-rw-r--r--config/freeswitch_dev/v_modules.tmp2
-rw-r--r--config/freeswitch_dev/v_vars.tmp2
5 files changed, 22 insertions, 19 deletions
diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc
index e3ea77c7..37a6867d 100644
--- a/config/freeswitch_dev/v_config.inc
+++ b/config/freeswitch_dev/v_config.inc
@@ -35,7 +35,7 @@
//global variables
$php_dir = '/usr/local/bin/php';
$tmp_dir = '/tmp/';
- $v_package_version = "0.9.7.6";
+ $v_package_version = "0.9.7.7";
$v_build_version = "1.0.4";
$v_build_revision = "";
$v_label = 'FreeSWITCH'; //FreeSWITCH (TM) http://www.freeswitch.org/
@@ -285,6 +285,7 @@ function byte_convert( $bytes ) {
$convention=1000; //[1000->10^x|1024->2^x]
$s=array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
$e=floor(log($bytes,$convention));
+ $e=floor(log($bytes,$convention));
return round($bytes/pow($convention,$e),2).' '.$s[$e];
}
@@ -3071,8 +3072,8 @@ function pkg_add($pkg_download_path, $pkg_name)
function v_php_install_command()
{
- conf_mount_rw();
- config_lock();
+ //conf_mount_rw();
+ //config_lock();
global $config;
global $v_package_version;
@@ -3097,7 +3098,7 @@ function v_php_install_command()
//hide errors
ini_set('display_errors', '0');
- clearstatcache();
+ clearstatcache(); //clear file status cache
if (!is_dir('/usr/local/www/packages/')) {
exec("mkdir /usr/local/www/packages/");
}
@@ -3118,14 +3119,14 @@ function v_php_install_command()
//exec("cd /tmp/;fetch ".$download_path."freeswitch.tgz"); //handled by freeswitch.xml
//exec("tar zxvf /tmp/freeswitch.tgz -C /usr/local/");
//unlink_if_exists("/tmp/freeswitch.tgz");
+
+ if (!is_dir($v_storage_dir)) {
+ exec("mkdir ".$v_storage_dir);
+ }
if (!is_dir($v_storage_dir.'/fax/')) {
exec("mkdir ".$v_storage_dir."/fax/");
}
-
- if (!is_dir($v_storage_dir.'/fax/receive/')) {
- exec("mkdir ".$v_storage_dir."/fax/receive/");
- }
$static_output = 'Downloading Files';
update_output_window($static_output);
@@ -3888,8 +3889,8 @@ function v_php_install_command()
$config['installedpackages']['freeswitchsettings']['config'][0]['v_version'] = $v_build_version." revision ".$v_build_revision.".";
$config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = $v_package_version;
- conf_mount_ro();
- config_unlock();
+ //conf_mount_ro();
+ //config_unlock();
}
@@ -3897,8 +3898,8 @@ function v_php_install_command()
function v_deinstall_command()
{
- conf_mount_rw();
- config_lock();
+ //conf_mount_rw();
+ //config_lock();
global $config;
global $php_dir;
@@ -3950,8 +3951,8 @@ function v_deinstall_command()
//unlink_if_exists($tmp_dir."/".$v_name.".tar.gz");
unlink_if_exists($tmp_dir."/pkg_mgr_".$v_label.".log");
- conf_mount_ro();
- config_unlock();
+ //conf_mount_ro();
+ //config_unlock();
}
diff --git a/config/freeswitch_dev/v_dialplan.tmp b/config/freeswitch_dev/v_dialplan.tmp
index e86f768e..5777b932 100644
--- a/config/freeswitch_dev/v_dialplan.tmp
+++ b/config/freeswitch_dev/v_dialplan.tmp
@@ -32,11 +32,9 @@ require("/usr/local/pkg/v_config.inc");
//$a_extensions = &$config['installedpackages']['freeswitchprofiles']['config'];
-<?php
if ($v_path_show) {
echo $v_conf_dir."/sip_profiles/external/\n";
}
-?>
if ($_GET['a'] == "default") {
conf_mount_rw();
diff --git a/config/freeswitch_dev/v_fax_edit.tmp b/config/freeswitch_dev/v_fax_edit.tmp
index 54729360..76a0449d 100644
--- a/config/freeswitch_dev/v_fax_edit.tmp
+++ b/config/freeswitch_dev/v_fax_edit.tmp
@@ -48,7 +48,7 @@ if (isset($id) && $a_fax[$id]) {
$pconfig['faxdescription'] = $a_fax[$id]['faxdescription'];
}
-
+clearstatcache(); //clear file status cache
$dir_fax_inbox = $v_storage_dir.'/fax/'.$pconfig['faxextension'].'/inbox/';
$dir_fax_sent = $v_storage_dir.'/fax/'.$pconfig['faxextension'].'/sent/';
$dir_fax_temp = $v_storage_dir.'/fax/'.$pconfig['faxextension'].'/temp/';
@@ -298,6 +298,10 @@ if ($_POST) {
$a_fax[] = $ent;
}
+ if (!is_dir($v_storage_dir)) {
+ exec("mkdir ".$v_storage_dir);
+ }
+
if (!is_dir($v_storage_dir.'/fax/')) {
exec("mkdir ".$v_storage_dir."/fax/");
}
diff --git a/config/freeswitch_dev/v_modules.tmp b/config/freeswitch_dev/v_modules.tmp
index f10830bc..281d4d8b 100644
--- a/config/freeswitch_dev/v_modules.tmp
+++ b/config/freeswitch_dev/v_modules.tmp
@@ -310,7 +310,7 @@ function show_advanced_config() {
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php
include("fbegin.inc");
-echo "<p class=\"pgtitle\">$v_project_label: Modules</p>\n";
+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_vars.tmp b/config/freeswitch_dev/v_vars.tmp
index feab8e19..afa7afa3 100644
--- a/config/freeswitch_dev/v_vars.tmp
+++ b/config/freeswitch_dev/v_vars.tmp
@@ -51,7 +51,7 @@ if ($_POST['a'] == "save") {
$fd = fopen($v_conf_dir."/vars.xml", "r");
-$content = fread($fd, filesize($v_conf_dir."/conf/vars.xml"));
+$content = fread($fd, filesize($v_conf_dir."/vars.xml"));
fclose($fd);
include("head.inc");