aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2012-03-16 19:12:32 -0300
committermarcelloc <marcellocoutinho@gmail.com>2012-03-16 19:12:32 -0300
commit5e1c10abcc307efd9188959f867f509eb27b1107 (patch)
treee5eeb7f0359f95e606eaa13248a3efb739136879
parent87cf02e78727c314201705431fbd70895ecfdf76 (diff)
downloadpfsense-packages-5e1c10abcc307efd9188959f867f509eb27b1107.tar.gz
pfsense-packages-5e1c10abcc307efd9188959f867f509eb27b1107.tar.bz2
pfsense-packages-5e1c10abcc307efd9188959f867f509eb27b1107.zip
asterisk - fix menu call and regex patterns
-rw-r--r--config/asterisk/asterisk.inc4
-rw-r--r--config/asterisk/asterisk.xml6
2 files changed, 5 insertions, 5 deletions
diff --git a/config/asterisk/asterisk.inc b/config/asterisk/asterisk.inc
index c4630114..4cd4bb6b 100644
--- a/config/asterisk/asterisk.inc
+++ b/config/asterisk/asterisk.inc
@@ -64,9 +64,9 @@ function sync_package_asterisk() {
$script='/usr/local/etc/asterisk/asterisk.conf';
if (file_exists($script)){
$script_file=file_get_contents($script);
- $pattern[0]='@astdbdir => [a-z,A-Z,/]@';
+ $pattern[0]='@astdbdir => [a-z,A-Z,/]+@';
$replace[0]='astdbdir => /tmp';
- $pattern[1]='@astspooldir => [a-z,A-Z,/]@';
+ $pattern[1]='@astspooldir => [a-z,A-Z,/]+@';
$replace[1]='astspooldir => /tmp';
$script_file=preg_replace($pattern,$replace,$script_file);
file_put_contents($script, $script_file, LOCK_EX);
diff --git a/config/asterisk/asterisk.xml b/config/asterisk/asterisk.xml
index 94bc96d4..a0ce4833 100644
--- a/config/asterisk/asterisk.xml
+++ b/config/asterisk/asterisk.xml
@@ -70,10 +70,10 @@
<item>http://www.pfsense.com/packages/config/asterisk/asterisk_cmd.php</item>
</additional_files_needed>
<menu>
- <name>asterisk</name>
+ <name>Asterisk</name>
<tooltiptext>Asterisk</tooltiptext>
- <section>status</section>
- <configfile>asterisk_cmd.php</configfile>
+ <section>Status</section>
+ <url>/asterisk_cmd.php</url>
</menu>
<service>
<name>asterisk</name>