Merge pull request #1011 from doktornotor/patch-8

8 files changed, 588 insertions, 637 deletions

diff --git a/config/asterisk/asterisk.inc b/config/asterisk/asterisk.inc
index 9a89d885..22a7b96c 100644
--- a/config/asterisk/asterisk.inc
+++ b/config/asterisk/asterisk.inc
@@ -1,118 +1,109 @@
 <?php
-/* ========================================================================== */
 /*
 	asterisk.inc
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2012-2013 Marcello Coutinho
-    Copyright (C) 2012-2013 robi <robreg@zsurob.hu>
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2012-2013 Marcello Coutinho
+	Copyright (C) 2012-2013 robi <robreg@zsurob.hu>
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
 
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
 
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
 define('ASTERISK_CONF_DIR', '/conf/asterisk');
-//Check pfsense version
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version == "2.1" || $pf_version == "2.2")
+$pf_version=substr(trim(file_get_contents("/etc/version")), 0, 3);
+if ($pf_version == "2.1" || $pf_version == "2.2") {
 	define('ASTERISK_LOCALBASE', '/usr/pbi/asterisk-' . php_uname("m"));
-else
+} else {
 	define('ASTERISK_LOCALBASE','/usr/local');
+}
 
 function asterisk_install() {
+	// Remove rc script from previous package versions
+	unlink_if_exists("/usr/local/etc/rc.d/asterisk");
 	sync_package_asterisk();
 }
 
 function asterisk_deinstall() {
-	$script='/usr/local/etc/rc.d/asterisk';
-	if (file_exists($script)){
-		mwexec("$script stop");
-		chmod ($script,0444);
-		}
+	stop_service("asterisk");
+	unlink_if_exists("/usr/local/etc/rc.d/asterisk.sh");
 }
 
 function sync_package_asterisk() {
-	global $config, $g;
-
-	#mount filesystem writeable
 	conf_mount_rw();
-	
-  	//for NanoBSD compatibility, move the /etc/asterisk configuration directory to /conf, and symlink it back
-  	$dist_dir=ASTERISK_CONF_DIR ."/dist";
-  	if (!is_dir($dist_dir))
-  		mkdir($dist_dir,0755,TRUE);
 
-  	if(file_exists (ASTERISK_LOCALBASE."/etc/asterisk") && !is_link(ASTERISK_LOCALBASE."/etc/asterisk")){
-  		$dist_files= scandir(ASTERISK_LOCALBASE."/etc/asterisk");
-  		foreach ($dist_files as $dist){
-  			if (preg_match("/-dist/",$dist))
-  				rename (ASTERISK_LOCALBASE."/etc/asterisk"."/$dist", "$dist_dir/$dist");
-  			elseif (preg_match("/\w+/",$dist))
-  				rename (ASTERISK_LOCALBASE."/etc/asterisk"."/$dist", ASTERISK_CONF_DIR."/$dist");
-  			}
-  		rmdir(ASTERISK_LOCALBASE. "/etc/asterisk");
-  		symlink (ASTERISK_CONF_DIR , ASTERISK_LOCALBASE. "/etc/asterisk");
-  		}
-	
-	//fix asterisk options for nanobsd: logging, db and calls log in /tmp
-	//	if ($g['platform'] == "nanobsd"){
-		$script='/conf/asterisk/logger.conf';
-		if (file_exists($script)){
-			$script_file=file_get_contents($script);
-			$pattern[0]='@;rotatestrategy@';
-			$replace[0]='rotatestrategy = rotate ;by pfSense ;';
-			$script_file=preg_replace($pattern,$replace,$script_file);
-			file_put_contents($script, $script_file, LOCK_EX);
-		}
-		
-		$script='/conf/asterisk/asterisk.conf';
-		if (file_exists($script)){
-		//point to the /var subdirs in the writable area in RAM
-			$script_file=file_get_contents($script);
-			$pattern[0]='/(\Wdirectories\W)\S+/';
-			$replace[0]='$1';
-			$pattern[1]='/astetcdir => \S+/';
-			$replace[1]='astetcdir => /conf/asterisk';
-			$pattern[2]='/astdbdir => \S+/';
-			$replace[2]='astdbdir => /var/db/asterisk';
-			$pattern[3]='/astspooldir => \S+/';
-			$replace[3]='astspooldir => /var/spool/asterisk';
-			$pattern[4]='/astrundir => \S+/';
-			$replace[4]='astrundir => /var/run/asterisk';
-			$pattern[5]='/astlogdir => \S+/';
-			$replace[5]='astlogdir => /var/log/asterisk';
-			$script_file=preg_replace($pattern,$replace,$script_file);
-			file_put_contents($script, $script_file, LOCK_EX);
+	// For NanoBSD compatibility, move the /etc/asterisk configuration directory to /conf, and symlink it back
+	$dist_dir = ASTERISK_CONF_DIR . "/dist";
+	safe_mkdir($dist_dir, 0755);
+
+	if (file_exists (ASTERISK_LOCALBASE . "/etc/asterisk") && !is_link(ASTERISK_LOCALBASE . "/etc/asterisk")) {
+		$dist_files = scandir(ASTERISK_LOCALBASE . "/etc/asterisk");
+		foreach ($dist_files as $dist) {
+			if (preg_match("/-dist/", $dist)) {
+				rename (ASTERISK_LOCALBASE . "/etc/asterisk" . "/$dist", "$dist_dir/$dist");
+			} elseif (preg_match("/\w+/", $dist)) {
+				rename (ASTERISK_LOCALBASE . "/etc/asterisk" . "/$dist", ASTERISK_CONF_DIR . "/$dist");
+			}
 		}
-//	}
+		rmdir(ASTERISK_LOCALBASE . "/etc/asterisk");
+		symlink(ASTERISK_CONF_DIR, ASTERISK_LOCALBASE . "/etc/asterisk");
+	}
 
-	//add modules settings, for disabling those not required on pfSense	
-        $script='/conf/asterisk/modules.conf';
-		if (file_exists($script)){
-			$script_file=file_get_contents($script);
-			if (strpos($script_file,'pfSense') === false) {  //first check if already added...
-				$add_modules_settings=<<<EOF
+	// Fix asterisk options for NanoBSD: logging, db and calls log in /tmp
+	$script = '/conf/asterisk/logger.conf';
+	if (file_exists($script)) {
+		$script_file = file_get_contents($script);
+		$pattern[0] = '@;rotatestrategy@';
+		$replace[0] = 'rotatestrategy = rotate ;by pfSense ;';
+		$script_file = preg_replace($pattern, $replace, $script_file);
+		file_put_contents($script, $script_file, LOCK_EX);
+	}
+
+	$script = '/conf/asterisk/asterisk.conf';
+	if (file_exists($script)) {
+		// Point to the /var subdirs in the writable area in ramfs
+		$script_file = file_get_contents($script);
+		$pattern[0] = '/(\Wdirectories\W)\S+/';
+		$replace[0] = '$1';
+		$pattern[1] = '/astetcdir => \S+/';
+		$replace[1] = 'astetcdir => /conf/asterisk';
+		$pattern[2] = '/astdbdir => \S+/';
+		$replace[2] = 'astdbdir => /var/db/asterisk';
+		$pattern[3] = '/astspooldir => \S+/';
+		$replace[3] = 'astspooldir => /var/spool/asterisk';
+		$pattern[4] = '/astrundir => \S+/';
+		$replace[4] = 'astrundir => /var/run/asterisk';
+		$pattern[5] = '/astlogdir => \S+/';
+		$replace[5] = 'astlogdir => /var/log/asterisk';
+		$script_file = preg_replace($pattern, $replace, $script_file);
+		file_put_contents($script, $script_file, LOCK_EX);
+	}
+
+	// Add modules settings, for disabling those not required on pfSense
+	$script = '/conf/asterisk/modules.conf';
+	if (file_exists($script)) {
+		$script_file = file_get_contents($script);
+		// First check if already added...
+		if (strpos($script_file, 'pfSense') === false) {
+			$add_modules_settings = <<<EOF
 ;The following modules settings work out of the box on pfSense (note: do not remove this comment line).
 ;Should you need any disabled module, check for its functionality individually in your environment.
 ;For more information check asterisk's online documentation.
@@ -327,32 +318,34 @@ noload => chan_h323.so
 noload => res_config_odbc.so
 
 EOF;
-				$script_file .= $add_modules_settings;
-				file_put_contents($script, $script_file, LOCK_EX);
-			}
+			$script_file .= $add_modules_settings;
+			file_put_contents($script, $script_file, LOCK_EX);
 		}
+	}
+
+	// Replace general SIP settings as a newbie hint to start configuration
+	$script = '/conf/asterisk/sip.conf';
+	if (file_exists($script)) {
+		$script_file = file_get_contents($script);
+		// Strenghten a couple of security settings, and predefine codecs in the default SIP configuration
+		// First check if already added...
+		if (strpos($script_file, 'pfSense') === false) {
+			$pattern[0] = '/;allowguest\S+/';
+			$replace[0] = 'allowguest=no ;by pfSense ;';
+			$pattern[1] = '/;alwaysauthreject/';
+			$replace[1] = 'alwaysauthreject=yes ;by pfSense ;';
+			$pattern[2] = '/; jbenable/';
+			$replace[2] = 'jbenable=yes ;by pfSense ;';
+			$pattern[3] = '/(First disallow all codecs)/';
+			$replace[3] = "$1\n;The following general settings usually work on pfSense boxes (note: please do not remove this comment line).\ndisallow=all ;by pfSense\nallow=g729\nallow=gsm\nallow=ulaw\nallow=alaw\n\n";
+			$script_file = preg_replace($pattern, $replace, $script_file);
+			file_put_contents($script, $script_file, LOCK_EX);
+		}
+
+		// First check if already added...
+		if (strpos($script_file, 'demo extension for pfSense') === false) {
+			$add_demo_extension = <<<EOF
 
-	//replace general SIP settings as a newbie hint to start configuration
-		$script='/conf/asterisk/sip.conf';
-		if (file_exists($script)){
-			$script_file=file_get_contents($script);
-			//strenghten a couple of security settings, and predefine codecs in the default SIP configuration
-			if (strpos($script_file,'pfSense') === false) {  //first check if already added...
-				$pattern[0]='/;allowguest\S+/';
-				$replace[0]='allowguest=no ;by pfSense ;';
-				$pattern[1]='/;alwaysauthreject/';
-				$replace[1]='alwaysauthreject=yes ;by pfSense ;';
-				$pattern[2]='/; jbenable/';
-				$replace[2]='jbenable=yes ;by pfSense ;';
-				$pattern[3]='/(First disallow all codecs)/';
-				$replace[3]="$1\n;The following general settings usually work on pfSense boxes (note: please do not remove this comment line).\ndisallow=all ;by pfSense\nallow=g729\nallow=gsm\nallow=ulaw\nallow=alaw\n\n";
-				$script_file=preg_replace($pattern,$replace,$script_file);
-				file_put_contents($script, $script_file, LOCK_EX);
-			}
-	
-			if (strpos($script_file,'demo extension for pfSense') === false) {  //first check if already added...
-				$add_demo_extension = <<<EOF
-				
 [301]
 ;demo extension for pfSense
 type=friend
@@ -376,51 +369,50 @@ context=default
 EOF;
 				$script_file .= $add_demo_extension;
 				file_put_contents($script, $script_file, LOCK_EX);
-			}
 		}
+	}
 
-	$script='/usr/local/etc/rc.d/asterisk';
-	if (file_exists($script)){
-		$script_file=file_get_contents($script);
-		if (preg_match('/NO/',$script_file)){
-			$script_file=preg_replace("/NO/","YES",$script_file);
-			$script_file=preg_replace("/core stop now'/","core stop now'\n  killall \$name",$script_file);
-			
-			//create the /var subdirs for the writable area in RAM
-			if (strpos($script_file,'pfSense') === false) {  //first check if already added...
-				$writable_area = <<< EOF
-# Create paths in pfSense's volatile area if they don't exist (note: please do not remove this comment line)
+	// Write /usr/local/etc/rc.d/asterisk.sh rc script
+	$asterisk_user = "asterisk";
+	$command = "/usr/local/sbin/asterisk";
+	$command_args = "-n -F -U {$asterisk_user}";
+	$start = <<<EOF
+
+# Create the /var subdirs for the writable area in ramfs
 for a in db spool run log 
 do
 if [ ! -d /var/\$a/asterisk ]; then
-  mkdir -p /var/\$a/asterisk
-  chown -R asterisk:asterisk /var/\$a/asterisk
-  chmod -R g+w /var/\$a/asterisk
+	mkdir -p /var/\$a/asterisk
+	chown -R asterisk:asterisk /var/\$a/asterisk
+	chmod -R g+w /var/\$a/asterisk
 fi
 done
 
 if [ ! -d /var/log/asterisk/cdr-csv ]; then
-  mkdir -p /var/log/asterisk/cdr-csv
-  chown -R asterisk:asterisk /var/log/asterisk/cdr-csv
-  chmod -R g+w /var/log/asterisk/cdr-csv
+	mkdir -p /var/log/asterisk/cdr-csv
+	chown -R asterisk:asterisk /var/log/asterisk/cdr-csv
+	chmod -R g+w /var/log/asterisk/cdr-csv
 fi
 
+{$command} {$command_args}
+
 EOF;
-				$script_file .= $writable_area;
-			}
-			file_put_contents($script, $script_file, LOCK_EX);
-		}
-		chmod ($script,0755);
-		mwexec("$script stop");			
-		mwexec_bg("$script start");
-	}
-	
-	//prepare backup for factory defaults restoring feature
+
+	$stop = "{$command} -nqrx 'core stop now'\n\t";
+	$stop .= "/usr/bin/killall asterisk";
+
+	write_rcfile(array(
+		'file' => 'asterisk.sh',
+		'start' => $start,
+		'stop' => $stop	));
+
+	restart_service("asterisk");
+
+	// Prepare backup for factory defaults restoring feature
 	if (!file_exists("/conf.default/asterisk_factory_defaults_config.tgz")) {
-		system("cd /conf/asterisk/ && tar czf /conf.default/asterisk_factory_defaults_config.tgz *");
+		system("cd /conf/asterisk/ && /usr/bin/tar czf /conf.default/asterisk_factory_defaults_config.tgz *");
 	}
-	
-	//mount filesystem readonly
+
 	conf_mount_ro();
 }
 
diff --git a/config/asterisk/asterisk.xml b/config/asterisk/asterisk.xml
index d5fb3161..2eef359f 100644
--- a/config/asterisk/asterisk.xml
+++ b/config/asterisk/asterisk.xml
@@ -2,76 +2,71 @@
 <!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
-/* ========================================================================== */
+	<copyright>
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
-    asterisk.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2012 Marcello Coutinho
-    All rights reserved.                                                      
+	asterisk.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2012 Marcello Coutinho
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
 */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
 
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Asterisk status pacakge</description>
-    <requirements>Asterisk 1.8.x</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
+	]]>
+	</copyright>
 	<name>asterisk</name>
-	<version>0.3.1</version>
+	<version>0.3.2</version>
 	<title>asterisk</title>
 	<include_file>/usr/local/pkg/asterisk.inc</include_file>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/asterisk/asterisk.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/asterisk/asterisk_calls.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/asterisk/asterisk_edit_file.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/asterisk/asterisk_log.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/asterisk/asterisk_cmd.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/shortcuts/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/asterisk/pkg_asterisk.inc</item>
 	</additional_files_needed>
 	<menu>
@@ -82,26 +77,16 @@
 	</menu>
 	<service>
 		<name>asterisk</name>
-		<rcfile>asterisk</rcfile>
+		<rcfile>asterisk.sh</rcfile>
 		<executable>asterisk</executable>
-		<description><![CDATA[Asterisk VoIP telephony]]></description>
+		<description>Asterisk VoIP Telephony</description>
 	</service>
-	<tabs>
-	</tabs>
-	<fields>
-	</fields>
 	<custom_php_install_command>
 		asterisk_install();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		asterisk_deinstall();
 	</custom_php_deinstall_command>
-	<custom_php_command_before_form>
-	</custom_php_command_before_form>
-	<custom_php_validation_command>
-	</custom_php_validation_command>
-	<custom_delete_php_command>
-	</custom_delete_php_command>	
 	<custom_php_resync_config_command>
 		sync_package_asterisk();
 	</custom_php_resync_config_command>
diff --git a/config/asterisk/asterisk_calls.php b/config/asterisk/asterisk_calls.php
index 75f24b2f..791b6d85 100644
--- a/config/asterisk/asterisk_calls.php
+++ b/config/asterisk/asterisk_calls.php
@@ -1,14 +1,10 @@
 <?php
-/* $Id$ */
 /*
-	status_asterisk_calls.php
-	part of pfSense
-	Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>.
+	asterisk_calls.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>
 	Copyright (C) 2013 robi <robreg@zsurob.hu>
-	All rights reserved.
-
-	originally part of m0n0wall (http://m0n0.ch/wall)
-	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -32,7 +28,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-/*	
+/*
 	pfSense_MODULE:	asterisk
 */
 
@@ -53,127 +49,122 @@ include("head.inc");
 $callog = "/var/log/asterisk/cdr-csv/Master.csv";
 
 /* Data input processing */
-$cmd =  $_GET['cmd'];
+$cmd = $_GET['cmd'];
 
 $file = $_SERVER["SCRIPT_NAME"];
-$break = Explode('/', $file);
-$pfile = $break[count($break) - 1]; 
+$break = explode('/', $file);
+$pfile = $break[count($break) - 1];
 
-if (file_exists($callog))
-	switch ($cmd){
+if (file_exists($callog)) {
+	switch ($cmd) {
 		case "trim":
-		$trimres=shell_exec("tail -50 '$callog' > /tmp/trimmed_asterisk.csv && rm '$callog' && mv /tmp/trimmed_asterisk.csv '$callog' && chown asterisk:asterisk '$callog' && chmod g+w '$callog'");
-		header( 'Location: asterisk_calls.php?savemsg=Calls+log+trimmed.') ;
-		break;
+			$trimres = shell_exec("/usr/bin/tail -n 50 '$callog' > /tmp/trimmed_asterisk.csv && /bin/rm '$callog' && /bin/mv /tmp/trimmed_asterisk.csv '$callog' && /usr/sbin/chown asterisk:asterisk '$callog' && /bin/chmod g+w '$callog'");
+			header('Location: asterisk_calls.php?savemsg=Calls+log+trimmed.');
+			break;
 
 		case "clear":
-		$trimres=shell_exec("rm '$callog' && touch '$callog' && chown asterisk:asterisk '$callog' && chmod g+w '$callog'");
-		header( 'Location: asterisk_calls.php?savemsg=Calls+log+cleared.') ;
-		break;
+			$trimres=shell_exec("/bin/rm '$callog' && /usr/bin/touch '$callog' && /usr/sbin/chown asterisk:asterisk '$callog' && /bin/chmod g+w '$callog'");
+			header('Location: asterisk_calls.php?savemsg=Calls+log+cleared.');
+			break;
 
 		case "download":
-		// session_cache_limiter('none'); //*Use before session_start()
-		// session_start();
-
 			header('Content-Description: File Transfer');
 			header('Content-Type: application/octet-stream');
-			header('Content-Disposition: attachment; filename='.basename($callog));
+			header('Content-Disposition: attachment; filename=' . basename($callog));
 			header('Content-Transfer-Encoding: binary');
-			header('Expires: 0');
-			header('Cache-Control: must-revalidate');
-			header('Pragma: public');
+			header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
+			header('Cache-Control: no-cache, must-revalidate');
+			header('Pragma: no-cache');
 			header('Content-Length: ' . filesize($callog));
 			ob_clean();
 			flush();
 			readfile($callog);
 			exit;
-		break;
+			break;
 	}
+}
 ?>
 
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-	<?php include("fbegin.inc"); ?>
-	<?php
+<?php include("fbegin.inc"); ?>
+<?php
 	$savemsg = $_GET["savemsg"];
 	if ($savemsg) {
-	  print_info_box($savemsg);
+		print_info_box($savemsg);
 	}
+?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td>
+	<?php
+		$tab_array = array();
+		$tab_array[0] = array(gettext("Commands"), false, "asterisk_cmd.php");
+		$tab_array[1] = array(gettext("Calls"), true, "asterisk_calls.php");
+		$tab_array[2] = array(gettext("Log"), false, "asterisk_log.php");
+		$tab_array[3] = array(gettext("Edit configuration"), false, "asterisk_edit_file.php");
+		display_top_tabs($tab_array);
 	?>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td>
-				<?php
-					$tab_array = array();
-					$tab_array[0] = array(gettext("Commands"), false, "asterisk_cmd.php");
-					$tab_array[1] = array(gettext("Calls"), true, "asterisk_calls.php");
-					$tab_array[2] = array(gettext("Log"), false, "asterisk_log.php");
-					$tab_array[3] = array(gettext("Edit configuration"), false, "asterisk_edit_file.php");
-					display_top_tabs($tab_array);
-				?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div id="mainarea">
-				<?php
-					if (file_exists($callog))
-						$file_handle = fopen($callog, "r");
-				?>
-					<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
-						<tr>
-							<td colspan="6" class="listtopic">Last 50 Asterisk calls</td>
-						</tr>
-						<tr>
-							<td nowrap class="listhdrr"><?=gettext("From");?></td>
-							<td nowrap class="listhdrr"><?=gettext("To");?></a></td>
-							<td nowrap class="listhdrr"><?=gettext("Start");?></td>
-							<td nowrap class="listhdrr"><?=gettext("End");?></a></td>
-							<td nowrap class="listhdrr"><?=gettext("Duration");?></a></td>
-							<td nowrap class="listhdrr"><?=gettext("Status");?></td>
-						</tr>
-				<?php
-					$out = '';
-					if (file_exists($callog)){
-						while (!feof($file_handle) ) {
-							$lin = fgetcsv($file_handle, 102400);
-							if ($lin[12] != "") {
-								$out = "<tr>" . $out;
-								$out = "<td class='listlr'>" . utf8_decode(str_replace('"', '', $lin[4])) . "</td><td class='listlr'>" . $lin[2] . "</td><td class='listlr'>" . $lin[9] . "</td><td class='listlr'>" . $lin[11] . "</td><td class='listlr'>" . gmdate("G:i:s", $lin[12]) . "</td><td class='listlr'>" . $lin[14] . "</td>" . $out;
-								$out = "</tr>" . $out;
-							}
-						}
-						fclose($file_handle);
-					}
-					echo $out;
-					echo "<tr><td colspan='6'><a href='$pfile?cmd=download'><input type='button' name='command' value='Download' class='formbtn'></a>";
-					echo "<a href='$pfile?cmd=trim'><input type='button' name='command' value='Trim log' class='formbtn'></a>";
-					echo "<a href='$pfile?cmd=clear'><input type='button' name='command' value='Clear log' class='formbtn'></a></td></tr>";
-				?>
-				</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-
-<p/>
+</td></tr>
+
+<tr><td>
+	<div id="mainarea">
+		<?php
+		if (file_exists($callog)) {
+			$file_handle = fopen($callog, "r");
+		}
+		?>
+		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+			<tr>
+				<td colspan="6" class="listtopic">Last 50 Asterisk calls</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" class="listhdrr"><?=gettext("From");?></td>
+				<td nowrap="nowrap" class="listhdrr"><?=gettext("To");?></td>
+				<td nowrap="nowrap" class="listhdrr"><?=gettext("Start");?></td>
+				<td nowrap="nowrap" class="listhdrr"><?=gettext("End");?></td>
+				<td nowrap="nowrap" class="listhdrr"><?=gettext("Duration");?></td>
+				<td nowrap="nowrap" class="listhdrr"><?=gettext("Status");?></td>
+			</tr>
+		<?php
+		$out = '';
+		if (file_exists($callog)) {
+			while (!feof($file_handle)) {
+				$lin = fgetcsv($file_handle, 102400);
+				if ($lin[12] != "") {
+					$out = "<tr>" . $out;
+					$out = "<td class='listlr'>" . utf8_decode(str_replace('"', '', $lin[4])) . "</td><td class='listlr'>" . $lin[2] . "</td><td class='listlr'>" . $lin[9] . "</td><td class='listlr'>" . $lin[11] . "</td><td class='listlr'>" . gmdate("G:i:s", $lin[12]) . "</td><td class='listlr'>" . $lin[14] . "</td>" . $out;
+					$out = "</tr>" . $out;
+				}
+			}
+			fclose($file_handle);
+		}
+		echo $out;
+		echo "<tr><td colspan='6'><a href='$pfile?cmd=download'><input type='button' name='command' value='Download' class='formbtn' /></a>";
+		echo "<a href='$pfile?cmd=trim'><input type='button' name='command' value='Trim log' class='formbtn' /></a>";
+		echo "<a href='$pfile?cmd=clear'><input type='button' name='command' value='Clear log' class='formbtn' /></a></td></tr>";
+		?>
+		</table>
+	</div>
+</td></tr>
+</table>
+
+<br />
 
 <span class="vexpl">
 	<span class="red">
 		<strong><?=gettext("Notes:");?><br /></strong>
 	</span>
-	<?=gettext("Listed in reverse order (latest on top).");?> <br>
-	<?=gettext("Duration includes ringing time.");?> <br>
+	<?=gettext("Listed in reverse order (latest on top).");?> <br />
+	<?=gettext("Duration includes ringing time.");?> <br />
 	<?=gettext("Trim keeps the last 50 entries.");?>
 
 <?
-if ($g['platform'] == "nanobsd")
-        echo "<br>This log may be lost when rebooting the system.";
+if ($g['platform'] == "nanobsd") {
+	echo "<br />This log may be lost when rebooting the system.";
+}
 ?>
-
-
 </span>
 
-
 <?php include("fend.inc"); ?>
 </body>
+</html>
diff --git a/config/asterisk/asterisk_cmd.php b/config/asterisk/asterisk_cmd.php
index da684cde..5ba1b460 100644
--- a/config/asterisk/asterisk_cmd.php
+++ b/config/asterisk/asterisk_cmd.php
@@ -1,14 +1,10 @@
 <?php
-/* $Id$ */
 /*
-	status_asterisk.php
-	part of pfSense
-	Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>.
+	asterisk_cmd.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>
 	Copyright (C) 2013 robi <robreg@zsurob.hu>
-	All rights reserved.
-
-	originally part of m0n0wall (http://m0n0.ch/wall)
-	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -32,7 +28,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-/*	
+/*
 	pfSense_MODULE:	asterisk
 */
 
@@ -56,73 +52,75 @@ include("head.inc");
 
 <?php
 /* Data input processing */
-$cmd =  $_GET['cmd'];
-$cmd  = str_replace("+", " ", $cmd);
+$cmd = $_GET['cmd'];
+$cmd = str_replace("+", " ", $cmd);
 
 if ($cmd == "") {
 	$cmd = "core show settings";
 }
 
 $file = $_SERVER["SCRIPT_NAME"];
-$break = Explode('/', $file);
-$pfile = $break[count($break) - 1]; 
-
+$break = explode('/', $file);
+$pfile = $break[count($break) - 1];
 ?>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td>
+	<?php
+		$tab_array = array();
+		$tab_array[0] = array(gettext("Commands"), true, "asterisk_cmd.php");
+		$tab_array[1] = array(gettext("Calls"), false, "asterisk_calls.php");
+		$tab_array[2] = array(gettext("Log"), false, "asterisk_log.php");
+		$tab_array[3] = array(gettext("Edit configuration"), false, "asterisk_edit_file.php");
+		display_top_tabs($tab_array);
+	?>
+</td></tr>
+
+<tr><td>
+	<div id="mainarea">
+		<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
+		<tr><td class="listtopic">
+			<table>
+				<tr>
+					<?php
+					/* Print command buttons */
+					echo "<td align='center'><a href='$pfile?cmd=sip+show+registry'><input type='button' name='command' value='SIP Registry' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=sip+show+peers'><input type='button' name='command' value='SIP Peers' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=sip+show+channels'><input type='button' name='command' value='SIP Channels' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=core+show+channels'><input type='button' name='command' value='Channels' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=core+show+codecs+audio'><input type='button' name='command' value='Codecs' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=core+show+translation+recalc+10'><input type='button' name='command' value='Translation' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=sip+show+settings'><input type='button' name='command' value='SIP Settings' class='formbtns' style='width: 100px' /></a></td>";
+					?>
+				</tr>
+				<tr>
+					<?php
+					echo "<td align='center'><a href='$pfile?cmd=sip+reload'><input type='button' name='command' value='Reload SIP' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=dialplan+reload'><input type='button' name='command' value='Reload Extensions' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=core+reload'><input type='button' name='command' value='Reload Core' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=core+show+uptime'><input type='button' name='command' value='Uptime' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='center'><a href='$pfile?cmd=core+restart+now'><input type='button' name='command' value='Restart Asterisk' class='formbtns' style='width: 100px' /></a></td>";
+					echo "<td align='right' colspan='2'><form name='input' action='$pfile' method='get'><input type='text' name='cmd' style='width: 145px' /><input type='submit' value='SEND' class='formbtns' style='width: 50px' /></form></td>";
+					?>
+				</tr>
+			</table>
+		</td></tr>
+		<tr valign="top">
+			<td class="listlr" nowrap="nowrap">
 				<?php
-					$tab_array = array();
-					$tab_array[0] = array(gettext("Commands"), true, "asterisk_cmd.php");
-					$tab_array[1] = array(gettext("Calls"), false, "asterisk_calls.php");
-					$tab_array[2] = array(gettext("Log"), false, "asterisk_log.php");
-					$tab_array[3] = array(gettext("Edit configuration"), false, "asterisk_edit_file.php");
-					display_top_tabs($tab_array);
+				/* Run commands and print results */
+				$asterisk_command = shell_exec("/usr/local/sbin/asterisk -rx '$cmd'");
+				echo "<pre style='font-size: 11px; background: white'>";
+				echo $asterisk_command;
+				echo "</pre>";
 				?>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<div id="mainarea">
-				<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
-					<tr>
-						<td class="listtopic">
-						<table><tr>
-						<?php
-						/* Print command buttons */
-						echo "<td align='center'><a href='$pfile?cmd=sip+show+registry'><input type='button' name='command' value='SIP Registry' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=sip+show+peers'><input type='button' name='command' value='SIP Peers' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=sip+show+channels'><input type='button' name='command' value='SIP Channels' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=core+show+channels'><input type='button' name='command' value='Channels' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=core+show+codecs+audio'><input type='button' name='command' value='Codecs' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=core+show+translation+recalc+10'><input type='button' name='command' value='Translation' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=sip+show+settings'><input type='button' name='command' value='SIP Settings' class='formbtns' style='width: 100px'></a></td>";
-						echo "</tr><tr>";
-						//echo "<td></td>";
-						echo "<td align='center'><a href='$pfile?cmd=sip+reload'><input type='button' name='command' value='Reload SIP' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=dialplan+reload'><input type='button' name='command' value='Reload Extensions' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=core+reload'><input type='button' name='command' value='Reload Core' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=core+show+uptime'><input type='button' name='command' value='Uptime' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='center'><a href='$pfile?cmd=core+restart+now'><input type='button' name='command' value='Restart Asterisk' class='formbtns' style='width: 100px'></a></td>";
-						echo "<td align='right' colspan='2'><form name='input' action='$pfile' method='get'><input type='text' name='cmd' style='width: 145px'><input type='submit' value='SEND' class='formbtns' style='width: 50px'></form> </td>";
-						?>
-						</tr></table>
-						</td>
-					</tr>
-					<tr valign="top">
-						<td class="listlr" nowrap>
-						<?php
-						/* Run commands and print results */
-						$asterisk_command=shell_exec("asterisk -rx '$cmd'");
-						echo "<pre style='font-size:11px; background:white'>";
-						echo $asterisk_command;
-						echo "</pre>";
-						?>
-						</td>
-					</tr>
-				</table>
-				</div>
-			</td>
-		</tr>
-	</table>
+		</table>
+	</div>
+</td></tr>
+</table>
+
 <?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/asterisk/asterisk_edit_file.php b/config/asterisk/asterisk_edit_file.php
index 1c992d26..353ecd07 100644
--- a/config/asterisk/asterisk_edit_file.php
+++ b/config/asterisk/asterisk_edit_file.php
@@ -1,8 +1,10 @@
 <?php
 /*
-	edit.php
-	Copyright (C) 2004, 2005 Scott Ullrich
+	asterisk_edit_file.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>
 	Copyright (C) 2013 robi <robreg@zsurob.hu>
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -27,7 +29,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	shell
+	pfSense_MODULE:	asterisk
 */
 
 ##|+PRIV
@@ -37,21 +39,19 @@
 ##|*MATCH=asterisk_edit_file.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Status"),gettext("Asterisk configuration files"));
 require("guiconfig.inc");
 
-
 $backup_dir = "/conf";
 $backup_filename = "asterisk_config.bak.tgz";
 $backup_path = "{$backup_dir}/{$backup_filename}";
 $files_dir = "/conf/asterisk";
 $host = "{$config['system']['hostname']}.{$config['system']['domain']}";
-$downname = "asterisk-config-{$host}-".date("YmdHis").".bak.tgz";  //put the date in the filename
+// Put the date in the filename
+$downname = "asterisk-config-{$host}-" . date("YmdHis") . ".bak.tgz";
 
 if (($_GET['a'] == "download") && $_GET['t'] == "backup") {
 	conf_mount_rw();
-//	system("cd {$files_dir} && tar czf {$backup_path} *");
-	system("cd {$files_dir} && tar czf {$backup_path} --exclude 'dist/*' --exclude dist *");
+	system("cd {$files_dir} && /usr/bin/tar czf {$backup_path} --exclude 'dist/*' --exclude dist *");
 	conf_mount_ro();
 }
 
@@ -63,8 +63,8 @@ if (($_GET['a'] == "download") && file_exists("{$backup_path}")) {
 	header("Content-Type: application/download");
 	header("Content-Description: File Transfer");
 	header("Content-Disposition: attachment; filename=\"{$downname}\"");
-	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("Cache-Control: no-cache, must-revalidate");
+	header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
 	header("Content-Length: " . filesize("{$backup_path}"));
 	fpassthru($fd);
 	exit;
@@ -72,40 +72,38 @@ if (($_GET['a'] == "download") && file_exists("{$backup_path}")) {
 
 if ($_GET['a'] == "other") {
 	if ($_GET['t'] == "restore") {
-		//extract files to $files_dir (/conf/asterisk)
+		// Extract files to $files_dir (/conf/asterisk)
 		if (file_exists($backup_path)) {
-			//echo "The file $filename exists";
 			conf_mount_rw();
-			exec("tar -xzC {$files_dir} -f {$backup_path} 2>&1", $sysretval);
+			exec("/usr/bin/tar -xzC {$files_dir} -f {$backup_path} 2>&1", $sysretval);
 			$savemsg = "Backup has been restored, please restart Asterisk now " . $sysretval[1];
-			system("chmod -R 644 {$files_dir}/*");
-			header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ;
+			system("/bin/chmod -R 644 {$files_dir}/*");
+			header('Location: asterisk_edit_file.php?savemsg=' . $savemsg);
 			conf_mount_ro();
 		} else {
-			header( 'Location: asterisk_edit_file.php?savemsg=Restore+failed.+Backup+file+not+found.' ) ;
+			header('Location: asterisk_edit_file.php?savemsg=Restore+failed.+Backup+file+not+found.');
 		}
 		exit;
 	}
 	if ($_GET['t'] == "factrest") {
-		//extract files to $files_dir (/conf/asterisk)
+		// Extract files to $files_dir (/conf/asterisk)
 		if (file_exists('/conf.default/asterisk_factory_defaults_config.tgz')) {
-			//echo "The file $filename exists";
 			conf_mount_rw();
-			exec("tar -xzC {$files_dir} -f /conf.default/asterisk_factory_defaults_config.tgz 2>&1", $sysretval);
+			exec("/usr/bin/tar -xzC {$files_dir} -f /conf.default/asterisk_factory_defaults_config.tgz 2>&1", $sysretval);
 			$savemsg = "Factory configuration restored, please restart Asterisk now " . $sysretval[1];
-			system("chmod -R 644 {$files_dir}/*");
-			header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ;
+			system("/bin/chmod -R 644 {$files_dir}/*");
+			header('Location: asterisk_edit_file.php?savemsg=' . $savemsg);
 			conf_mount_ro();
 		}
 		exit;
 	}
 	if ($_GET['t'] == "deldist") {
-		//delete dist directory from $files_dir/dist (/conf/asterisk/dist)
+		// Delete dist directory from $files_dir/dist (/conf/asterisk/dist)
 		if (file_exists($files_dir . "/dist")) {
 			conf_mount_rw();
-			exec("rm -r {$files_dir}/dist 2>&1", $sysretval);
+			exec("/bin/rm -r {$files_dir}/dist 2>&1", $sysretval);
 			$savemsg = "Deleted dist files " . $sysretval[1];
-			header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ;
+			header('Location: asterisk_edit_file.php?savemsg=' . $savemsg);
 			conf_mount_ro();
 		}
 		exit;
@@ -114,53 +112,55 @@ if ($_GET['a'] == "other") {
 
 if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
 	$upfilnam = $_FILES['ulfile']['name'];
-	$upfiltim = strtotime(str_replace(".bak.tgz","",end(explode("-",$upfilnam))));
+	$upfiltim = strtotime(str_replace(".bak.tgz", "", end(explode("-", $upfilnam))));
 	conf_mount_rw();
 	move_uploaded_file($_FILES['ulfile']['tmp_name'], "{$backup_path}");
-	$savemsg = "Uploaded ". htmlentities($_FILES['ulfile']['name']) . " file as " . $backup_path . "." ;
-	system('chmod -R 644 {$backup_path}');
-	if ($upfiltim) {		//take the date from the filename and update modified time accordingly
+	$savemsg = "Uploaded " . htmlentities($_FILES['ulfile']['name']) . " file as " . $backup_path . ".";
+	system("/bin/chmod -R 644 {$backup_path}");
+	// Take the date from the filename and update modified time accordingly
+	if ($upfiltim) {
 		touch($backup_path, $upfiltim);
 	}
 	unset($_POST['txtCommand']);
 	conf_mount_ro();
-	header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ;
+	header('Location: asterisk_edit_file.php?savemsg=' . $savemsg);
 }
 
-if($_REQUEST['action']) {
+if ($_REQUEST['action']) {
 	switch($_REQUEST['action']) {
 		case 'load':
-			if(strlen($_REQUEST['file']) < 1) {
+			if (strlen($_REQUEST['file']) < 1) {
 				echo "|5|" . gettext("No file name specified") . ".|";
-			} elseif(is_dir($_REQUEST['file'])) {
+			} elseif (is_dir($_REQUEST['file'])) {
 				echo "|4|" . gettext("Loading a directory is not supported") . ".|";
-			} elseif(! is_file($_REQUEST['file'])) {
+			} elseif (! is_file($_REQUEST['file'])) {
 				echo "|3|" . gettext("File does not exist or is not a regular file") . ".|";
 			} else {
 				$data = file_get_contents(urldecode($_REQUEST['file']));
-				if($data === false) {
+				if ($data === false) {
 					echo "|1|" . gettext("Failed to read file") . ".|";
 				} else {
-					echo "|0|{$_REQUEST['file']}|{$data}|";	
+					echo "|0|{$_REQUEST['file']}|{$data}|";
 				}
 			}
 			exit;
 		case 'save':
-			if(strlen($_REQUEST['file']) < 1) {
+			if (strlen($_REQUEST['file']) < 1) {
 				echo "|" . gettext("No file name specified") . ".|";
 			} else {
 				conf_mount_rw();
 				$_REQUEST['data'] = str_replace("\r", "", base64_decode($_REQUEST['data']));
 				$ret = file_put_contents($_REQUEST['file'], $_REQUEST['data']);
 				conf_mount_ro();
-				if($_REQUEST['file'] == "/conf/config.xml" || $_REQUEST['file'] == "/cf/conf/config.xml") {
-					if(file_exists("/tmp/config.cache"))
+				if ($_REQUEST['file'] == "/conf/config.xml" || $_REQUEST['file'] == "/cf/conf/config.xml") {
+					if (file_exists("/tmp/config.cache")) {
 						unlink("/tmp/config.cache");
+					}
 					disable_security_checks();
 				}
-				if($ret === false) {
+				if ($ret === false) {
 					echo "|" . gettext("Failed to write file") . ".|";
-				} elseif($ret <> strlen($_REQUEST['data'])) {
+				} elseif ($ret <> strlen($_REQUEST['data'])) {
 					echo "|" . gettext("Error while writing file") . ".|";
 				} else {
 					echo "|" . gettext("File successfully saved") . ".|";
@@ -170,10 +170,10 @@ if($_REQUEST['action']) {
 	}
 	exit;
 }
+
 $shortcut_section = "asterisk";
+$pgtitle = array(gettext("Status"), gettext("Asterisk configuration files"));
 require("head.inc");
-outputJavaScriptFileInline("filebrowser/browser.js");
-outputJavaScriptFileInline("javascript/base64.js");
 
 ?>
 
@@ -181,21 +181,34 @@ outputJavaScriptFileInline("javascript/base64.js");
 <?php include("fbegin.inc"); ?>
 
 <?php
-$savemsg = $_GET["savemsg"];
-if ($savemsg) {
-  print_info_box($savemsg);
-}
+	$savemsg = $_GET["savemsg"];
+	if ($savemsg) {
+		print_info_box($savemsg);
+	}
 ?>
 
-<script type="text/javascript">	
+<script type="text/javascript">
+//<![CDATA[
+<?php include("filebrowser/browser.js"); ?>
+//]]>
+</script>
+
+<script type="text/javascript">
+//<![CDATA[
+<?php include("javascript/base64.js"); ?>
+//]]>
+</script>
+
+<script type="text/javascript">
+//<![CDATA[
 	function loadFile() {
 		$("fileStatus").innerHTML = "<?=gettext("Loading file"); ?> ...";
 		Effect.Appear("fileStatusBox", { duration: 0.5 });
 
 		new Ajax.Request(
 			"<?=$_SERVER['SCRIPT_NAME'];?>", {
-				method:     "post",
-				postBody:   "action=load&file=" + $("fbTarget").value,
+				method: "post",
+				postBody: "action=load&file=" + $("fbTarget").value,
 				onComplete: loadComplete
 			}
 		);
@@ -209,10 +222,10 @@ if ($savemsg) {
 		if(values.shift() == "0") {
 			var file = values.shift();
 			$("fileStatus").innerHTML = "<?=gettext("File successfully loaded"); ?>.";
-			$("fileContent").value    = values.join("|");
+			$("fileContent").value = values.join("|");
 
 			var lang = "none";
-				 if(file.indexOf(".php") > 0) lang = "php";
+			if(file.indexOf(".php") > 0) lang = "php";
 			else if(file.indexOf(".inc") > 0) lang = "php";
 			else if(file.indexOf(".xml") > 0) lang = "xml";
 			else if(file.indexOf(".js" ) > 0) lang = "js";
@@ -229,14 +242,14 @@ if ($savemsg) {
 	function saveFile(file) {
 		$("fileStatus").innerHTML = "<?=gettext("Saving file"); ?> ...";
 		Effect.Appear("fileStatusBox", { duration: 0.5 });
-		
+
 		var fileContent = Base64.encode($("fileContent").value);
 		fileContent = fileContent.replace(/\+/g,"%2B");
-		
+
 		new Ajax.Request(
 			"<?=$_SERVER['SCRIPT_NAME'];?>", {
-				method:     "post",
-				postBody:   "action=save&file=" + $("fbTarget").value +
+				method: "post",
+				postBody: "action=save&file=" + $("fbTarget").value +
 							"&data=" + fileContent,
 				onComplete: function(req) {
 					var values = req.responseText.split("|");
@@ -246,7 +259,7 @@ if ($savemsg) {
 		);
 	}
 
-	
+
 
 	function ckrest() {
 		if(document.getElementById('ckrest').checked==true) {
@@ -263,188 +276,174 @@ if ($savemsg) {
 			document.getElementById('deldistdire').disabled=true;
 		}
 	}
- 	
-	
+
+//]]>
 </script>
 
-	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td>
-				<?php
-					$tab_array = array();
-					$tab_array[0] = array(gettext("Commands"), false, "asterisk_cmd.php");
-					$tab_array[1] = array(gettext("Calls"), false, "asterisk_calls.php");
-					$tab_array[2] = array(gettext("Log"), false, "asterisk_log.php");
-					$tab_array[3] = array(gettext("Edit configuration"), true, "asterisk_edit_file.php");
-					display_top_tabs($tab_array);
-				?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div id="mainarea">
-
-					<!-- backup options -->
-					<div style="background:#eeeeee;">
-						<div class="vexpl" style="padding-left:15px;">
-						<br />
-						<table width='98%' cellpadding='0' cellspacing='0' border='0'>
-						<tr>
-						<td width='80%'>
-						<b>Backup / Restore</b>
-						The 'Backup' button will tar gzip asterisk configuration files to <? echo $backup_path; ?> it then offers it to download.<br>
-						The 'Restore' button will be visible only if the <? echo $backup_path; ?> backup file exists.<br>
-						You can upload a backup file to the system, if one already exists at <? echo $backup_path; ?>, it will be overwritten.
-						<br />
-						</td>
-						<td width='20%' valign='middle' align='right'>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td>
+	<?php
+		$tab_array = array();
+		$tab_array[0] = array(gettext("Commands"), false, "asterisk_cmd.php");
+		$tab_array[1] = array(gettext("Calls"), false, "asterisk_calls.php");
+		$tab_array[2] = array(gettext("Log"), false, "asterisk_log.php");
+		$tab_array[3] = array(gettext("Edit configuration"), true, "asterisk_edit_file.php");
+		display_top_tabs($tab_array);
+	?>
+</td></tr>
+
+<tr><td>
+	<div id="mainarea">
+		<!-- backup options -->
+		<div style="background:#eeeeee;">
+			<div class="vexpl" style="padding-left:15px;"><br />
+				<table width='98%' cellpadding='0' cellspacing='0' border='0'>
+				<tr>
+					<td width='80%'>
+						<strong>Backup / Restore</strong>
+						The 'Backup' button will tar gzip asterisk configuration files to <? echo $backup_path; ?> it then offers it to download.<br />
+						The 'Restore' button will be visible only if the <? echo $backup_path; ?> backup file exists.<br />
+						You can upload a backup file to the system, if one already exists at <? echo $backup_path; ?>, it will be overwritten.<br />
+					</td>
+					<td width='20%' valign='middle' align='right'>
 						<?php
-						echo "  <input type='button' value='Backup' onclick=\"document.location.href='asterisk_edit_file.php?a=download&t=backup';\" />\n";
-						if (file_exists($backup_path)) {
-							echo "  <input type='button' value='Restore' onclick=\"document.location.href='asterisk_edit_file.php?a=other&t=restore';\" />\n";
-						}
+							echo "<input type='button' value='Backup' onclick=\"document.location.href='asterisk_edit_file.php?a=download&amp;t=backup';\" />\n";
+							if (file_exists($backup_path)) {
+								echo "<input type='button' value='Restore' onclick=\"document.location.href='asterisk_edit_file.php?a=other&amp;t=restore';\" />\n";
+							}
 						?>
-						</td>
-						</tr></table><br>
-						<table width='98%' cellpadding='0' cellspacing='0' border='0'>
-						<tr>
-						<td width='20%' valign='middle' align='left'>
+					</td>
+				</tr>
+				</table>
+				<br />
+				<table width='98%' cellpadding='0' cellspacing='0' border='0'>
+				<tr>
+					<td width='20%' valign='middle' align='left'>
 						<?php
 						if (file_exists($backup_path)) {
-							echo $backup_filename . " date:<br>" . date ("Y F d H:i:s.", filemtime($backup_path));
+							echo $backup_filename . " date:<br />" . date ("Y F d H:i:s.", filemtime($backup_path));
 						}
 						?>
-						</td>
-						<td width='80%' valign='middle' align='right'>
-						<form action="asterisk_edit_file.php" method="POST" enctype="multipart/form-data" name="frmUpload" onSubmit="">
+					</td>
+					<td width='80%' valign='middle' align='right'>
+						<form action="asterisk_edit_file.php" method="post" enctype="multipart/form-data" name="frmUpload" onsubmit="">
 						Upload backup file:
-						<input name="ulfile" type="file" class="button" id="ulfile">
-						<input name="submit" type="submit"  class="button" id="upload" value="Upload">
+						<input name="ulfile" type="file" class="button" id="ulfile" />
+						<input name="submit" type="submit" class="button" id="upload" value="Upload" />
 						</form>
-						</td>
-						</tr>
-						</table><br />					
-						</div>
-					</div>
-
-
-									
-					<table width="100%" border="0" cellpadding="0" cellspacing="0">
-						<tr>
-							<td class="tabcont" align="center">
-
-					<!-- controls -->
-					<table width="100%" cellpadding="9" cellspacing="9">
-						<tr>
-							<td align="center" class="list">
-								<?=gettext("Configuration files stored in"); ?>:
-								<input type="text"   class="formfld file" id="fbTarget"         value="<?=gettext($files_dir);?>" size="45" />
-								<input type="button" class="formbtn"      id="fbOpen"           value="<?=gettext('Browse');?>" />
-					<!--			<input type="button" class="formbtn"      onclick="loadFile();" value="<?=gettext('Load');?>" /> -->
-								<input type="button" class="formbtn"      onclick="saveFile();" value="<?=gettext('Save');?>" />
-								<br />
-							</td>
-						</tr>
-					</table>
-
-					
-					
-					<!-- file status box -->
-					<div style="display:none; background:#eeeeee;" id="fileStatusBox">
-						<div class="vexpl" style="padding-left:15px;">
-							<strong id="fileStatus"></strong>
-						</div>
-					</div>
-					
-					
-					<!-- filebrowser -->
-					<div id="fbBrowser" style="display:none; border:1px dashed gray; width:98%;"></div>
-
-					<!-- file viewer/editor -->
-					<table width="100%">
-						<tr>
-							<td valign="top" class="label">
-								<div style="background:#eeeeee;" id="fileOutput">
-									<textarea id="fileContent" name="fileContent" style="width:100%;" rows="30" wrap="off"></textarea>
-								</div>
-							</td>
-						</tr>
-					</table>
-
-							</td>
-						</tr>
-					</table>
-
-					<script type="text/javascript">
-						Event.observe(
-							window, "load",
-							function() {
-								$("fbTarget").focus();
-
-								NiftyCheck();
-								Rounded("div#fileStatusBox", "all", "#ffffff", "#eeeeee", "smooth");
-							}
-						);
-
-						<?php if($_GET['action'] == "load"): ?>
-							Event.observe(
-								window, "load",
-								function() {
-									$("fbTarget").value = "<?=$_GET['path'];?>";
-									loadFile();
-								}
-							);
-						<?php endif; ?>
-					</script>
-
-					
-					<div style="background:#eeeeee;">
-						<div class="vexpl" style="padding-left:15px;">
-						<table width='98%' cellpadding='0' cellspacing='0' border='0'>
-						<tr>
-						<td width='80%' valign='middle' align='right'><br />
-						<?php
-							if (file_exists($files_dir . "/dist")) {
-								echo "<input name='ckdist' id='ckdist' type='checkbox' onclick='return ckdist();' style='vertical-align:-3px;'>enable <input type='button' value='Delete dist files' name='deldistdire' id='deldistdire' disabled='disabled' onclick=\"document.location.href='asterisk_edit_file.php?a=other&t=deldist';\" />&nbsp;&nbsp;\n";
-							}
-							if (file_exists("/conf.default/asterisk_factory_defaults_config.tgz")) {
-								echo "<input name='ckrest' id='ckrest' type='checkbox' onclick='return ckrest();' style='vertical-align:-3px;'>enable <input type='button' value='Restore to factory defaults' name='restfactdef' id='restfactdef' disabled='disabled' onclick=\"document.location.href='asterisk_edit_file.php?a=other&t=factrest';\" />\n";
-							}
-						?>
-						<br /></td>
-						</tr>
-						</table><br />			
-						</div>
-					</div>
-					
-					
+					</td>
+				</tr>
+				</table>
+				<br />
+			</div>
+		</div>
+
+		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<tr><td class="tabcont" align="center">
+			<!-- controls -->
+			<table width="100%" cellpadding="9" cellspacing="9">
+				<tr>
+					<td align="center" class="list">
+						<?=gettext("Configuration files stored in"); ?>:
+						<input type="text" class="formfld file" id="fbTarget" value="<?=gettext($files_dir);?>" size="45" />
+						<input type="button" class="formbtn" id="fbOpen" value="<?=gettext('Browse');?>" />
+						<input type="button" class="formbtn" onclick="saveFile();" value="<?=gettext('Save');?>" />
+					<br />
+					</td>
+				</tr>
+			</table>
+
+			<!-- file status box -->
+			<div style="display:none; background:#eeeeee;" id="fileStatusBox">
+				<div class="vexpl" style="padding-left:15px;">
+					<strong id="fileStatus"></strong>
 				</div>
-			</td>
-		</tr>
-	</table>
+			</div>
 
-<p/>
+			<!-- filebrowser -->
+			<div id="fbBrowser" style="display:none; border:1px dashed gray; width:98%;"></div>
+
+			<!-- file viewer/editor -->
+			<table width="100%">
+				<tr>
+					<td valign="top" class="label">
+						<div style="background:#eeeeee;" id="fileOutput">
+							<textarea id="fileContent" name="fileContent" style="width:100%;" rows="30" cols="65" wrap="off"></textarea>
+						</div>
+					</td>
+				</tr>
+			</table>
+		</td></tr>
+		</table>
+
+<script type="text/javascript">
+//<![CDATA[
+	Event.observe(
+		window, "load",
+		function() {
+			$("fbTarget").focus();
+			NiftyCheck();
+			Rounded("div#fileStatusBox", "all", "#ffffff", "#eeeeee", "smooth");
+		}
+	);
+
+	<?php if ($_GET['action'] == "load"): ?>
+	Event.observe(
+		window, "load",
+		function() {
+			$("fbTarget").value = "<?=$_GET['path'];?>";
+			loadFile();
+		}
+	);
+	<?php endif; ?>
+//]]>
+</script>
+
+		<div style="background: #eeeeee;">
+			<div class="vexpl" style="padding-left:15px;">
+				<table width='98%' cellpadding='0' cellspacing='0' border='0'>
+				<tr>
+					<td width='80%' valign='middle' align='right'><br />
+					<?php
+						if (file_exists($files_dir . "/dist")) {
+							echo "<input name='ckdist' id='ckdist' type='checkbox' onclick='return ckdist();' style='vertical-align:-3px;'>enable <input type='button' value='Delete dist files' name='deldistdire' id='deldistdire' disabled='disabled' onclick=\"document.location.href='asterisk_edit_file.php?a=other&amp;t=deldist';\" />&nbsp;&nbsp;\n";
+						}
+						if (file_exists("/conf.default/asterisk_factory_defaults_config.tgz")) {
+							echo "<input name='ckrest' id='ckrest' type='checkbox' onclick='return ckrest();' style='vertical-align:-3px;'>enable <input type='button' value='Restore to factory defaults' name='restfactdef' id='restfactdef' disabled='disabled' onclick=\"document.location.href='asterisk_edit_file.php?a=other&amp;t=factrest';\" />\n";
+						}
+					?>
+					<br />
+					</td>
+				</tr>
+				</table>
+				<br />
+			</div>
+		</div>
+	</div>
+</td></tr>
+</table>
+
+<br />
 
 <span class="vexpl">
 	<span class="red">
 		<strong><?=gettext("Note:");?><br /></strong>
 	</span>
-	<?=gettext("Please back up your Asterisk configuration regularly.");?><br>
+	<?=gettext("Please back up your Asterisk configuration regularly.");?><br />
 	<?=gettext("It's worth to preserve the automatically generated filename of the downloaded backup file. It contains the backup creation date, which is used when uploading it back to the system.");?>
 	<?php
-	$sipconf=$files_dir . "/sip.conf";
-	if (file_exists($sipconf)){
-		$sipconf_file=file_get_contents($sipconf);
-		if (strpos($sipconf_file,"demo extension for pfSense") !== false) {
+	$sipconf = $files_dir . "/sip.conf";
+	if (file_exists($sipconf)) {
+		$sipconf_file = file_get_contents($sipconf);
+		if (strpos($sipconf_file, "demo extension for pfSense") !== false) {
 			?><br />
 			<?=gettext("This Asterisk configuration on pfSense contains two demo SIP accounts, 301 and 302 with password 1234, for you to test functionality. Check sip.conf for more details. These accounts can be safely removed at any time.");?>
 			<?php
 		}
-	}	
+	}
 	?>
-	
 </span>
-	
+
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/config/asterisk/asterisk_log.php b/config/asterisk/asterisk_log.php
index f4a752d2..44ba8acf 100644
--- a/config/asterisk/asterisk_log.php
+++ b/config/asterisk/asterisk_log.php
@@ -1,15 +1,11 @@
 <?php
-/* $Id$ */
 /*
-	status_asterisk_log.php
-	part of pfSense
-	Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>.
-        Copyright (C) 2012 robi <robreg@zsurob.hu>
+	asterisk_log.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>
+	Copyright (C) 2012 robi <robreg@zsurob.hu>
 	Copyright (C) 2012 Marcello Coutinho
-	All rights reserved.
-
-	originally part of m0n0wall (http://m0n0.ch/wall)
-	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -33,7 +29,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-/*	
+/*
 	pfSense_MODULE:	asterisk
 */
 
@@ -51,94 +47,84 @@ $shortcut_section = "asterisk";
 include("head.inc");
 
 /* Path to Asterisk log file */
-//if ($g['platform'] == "nanobsd")
-//	$log = "/tmp/asterisk.log";
-//else
 $log = "/var/log/asterisk/messages";
 
 ?>
 
 <?php
 /* Data input processing */
-$cmd =  $_GET['cmd'];
-//$cmd  = str_replace("+", " ", $cmd);
+$cmd = $_GET['cmd'];
+//$cmd = str_replace("+", " ", $cmd);
 
 $file = $_SERVER["SCRIPT_NAME"];
-$break = Explode('/', $file);
-$pfile = $break[count($break) - 1]; 
+$break = explode('/', $file);
+$pfile = $break[count($break) - 1];
 
 
 if (file_exists($log)) {
 	if ($cmd == "trim") {
-		$trimres=shell_exec("tail -50 '$log' > /tmp/trimmed_asterisk.log && rm '$log' && mv /tmp/trimmed_asterisk.log '$log' && chown asterisk:asterisk '$log' && chmod g+w '$log'");
-		header( 'Location: asterisk_log.php?savemsg=Log+trimmed.') ;
+		$trimres = shell_exec("/usr/bin/tail -n 50 '$log' > /tmp/trimmed_asterisk.log && /bin/rm '$log' && /bin/mv /tmp/trimmed_asterisk.log '$log' && /usr/sbin/chown asterisk:asterisk '$log' && /bin/chmod g+w '$log'");
+		header('Location: asterisk_log.php?savemsg=Log+trimmed.');
 	}
 	if ($cmd == "clear") {
-		$trimres=shell_exec("rm '$log' && touch '$log' && chown asterisk:asterisk '$log' && chmod g+w '$log'");
-		header( 'Location: asterisk_log.php?savemsg=Log+cleared.') ;
+		$trimres = shell_exec("/bin/rm '$log' && /usr/bin/touch '$log' && /usr/sbin/chown asterisk:asterisk '$log' && /bin/chmod g+w '$log'");
+		header('Location: asterisk_log.php?savemsg=Log+cleared.');
 	}
 }
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-	<?php include("fbegin.inc"); ?>
-	<?php
+<?php include("fbegin.inc"); ?>
+<?php
 	$savemsg = $_GET["savemsg"];
 	if ($savemsg) {
-	  print_info_box($savemsg);
+		print_info_box($savemsg);
 	}
+?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td>
+	<?php
+		$tab_array = array();
+		$tab_array[0] = array(gettext("Commands"), false, "asterisk_cmd.php");
+		$tab_array[1] = array(gettext("Calls"), false, "asterisk_calls.php");
+		$tab_array[2] = array(gettext("Log"), true, "asterisk_log.php");
+		$tab_array[3] = array(gettext("Edit configuration"), false, "asterisk_edit_file.php");
+		display_top_tabs($tab_array);
 	?>
-	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td>
-				<?php
-					$tab_array = array();
-					$tab_array[0] = array(gettext("Commands"), false, "asterisk_cmd.php");
-					$tab_array[1] = array(gettext("Calls"), false, "asterisk_calls.php");
-					$tab_array[2] = array(gettext("Log"), true, "asterisk_log.php");
-					$tab_array[3] = array(gettext("Edit configuration"), false, "asterisk_edit_file.php");
-					display_top_tabs($tab_array);
-				?>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div id="mainarea">
-				<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
-				<tr>
-					<td colspan="2" class="listtopic">Last 50 Asterisk log entries</td>
-				</tr>
-
-				<tr valign="top"><td class="listlr" nowrap>
-
+</td></tr>
+<tr><td>
+	<div id="mainarea">
+		<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
+			<tr>
+				<td colspan="2" class="listtopic">Last 50 Asterisk log entries</td>
+			</tr>
+			<tr valign="top"><td class="listlr" nowrap="nowrap">
 				<?php
 					$showlog_command=shell_exec("tail -50 '$log'");
 					echo nl2br($showlog_command);
 				?>
-				</td></tr>
+			</td></tr>
 				<?php
-					echo "<tr><td colspan='6'><a href='$pfile?cmd=trim'><input type='button' name='command' value='Trim log' class='formbtn'></a>";
-					echo "<a href='$pfile?cmd=clear'><input type='button' name='command' value='Clear log' class='formbtn'></a></td></tr>";
+					echo "<tr><td colspan='6'><a href='$pfile?cmd=trim'><input type='button' name='command' value='Trim log' class='formbtn' /></a>";
+					echo "<a href='$pfile?cmd=clear'><input type='button' name='command' value='Clear log' class='formbtn' /></a></td></tr>";
 				?>
-				</table>
-				</div>
-			</td>
-		</tr>
-	</table>
+		</table>
+	</div>
+</td></tr>
+</table>
 
-<p/>
+<br />
 
 <span class="vexpl">
 	<span class="red">
 		<strong><?=gettext("Note:");?><br /></strong>
 	</span>
 	<?=gettext("Trim keeps the last 50 lines of the log.");?>
-<?
-if ($g['platform'] == "nanobsd")
-        echo "<br>This log may be lost when rebooting the system.";
-?>
-
-
+	<?php
+		if ($g['platform'] == "nanobsd") {
+			echo "<br />This log may be lost when rebooting the system.";
+		}
+	?>
 </span>
 
 <?php include("fend.inc"); ?>
diff --git a/config/asterisk/pkg_asterisk.inc b/config/asterisk/pkg_asterisk.inc
index 129313c4..ad26ee80 100644
--- a/config/asterisk/pkg_asterisk.inc
+++ b/config/asterisk/pkg_asterisk.inc
@@ -8,4 +8,4 @@ $shortcuts['asterisk']['log'] = "asterisk_log.php";
 $shortcuts['asterisk']['status'] = "asterisk_cmd.php";
 $shortcuts['asterisk']['service'] = "asterisk";
 
-?>
\ No newline at end of file
+?>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 2f6a7b71..07774f59 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -39,7 +39,7 @@
 		</descr>
 		<website>http://www.asterisk.org/</website>
 		<category>Services</category>
-		<version>0.3.1</version>
+		<version>0.3.2</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/asterisk/asterisk.xml</config_file>