From 5e1c10abcc307efd9188959f867f509eb27b1107 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Fri, 16 Mar 2012 19:12:32 -0300
Subject: asterisk - fix menu call and regex patterns

---
 config/asterisk/asterisk.inc | 4 ++--
 config/asterisk/asterisk.xml | 6 +++---
 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>
-- 
cgit v1.2.3