Merge pull request #434 from bmeeks8/master

Snort Package 2.5.7 -- Two minor bug fixes (no need to bump version)

4 files changed, 9 insertions, 9 deletions

diff --git a/config/snort/snort_check_for_rule_updates.php b/config/snort/snort_check_for_rule_updates.php
index 858267d1..f69c3b98 100755
--- a/config/snort/snort_check_for_rule_updates.php
+++ b/config/snort/snort_check_for_rule_updates.php
@@ -390,13 +390,13 @@ if ($snortdownload == 'on') {
 
 		/* extract so rules */
 		update_status(gettext("Extracting Snort VRT Shared Objects rules..."));
-		exec('/bin/mkdir -p {$snortlibdir}/dynamicrules/');
+		exec("/bin/mkdir -p {$snortlibdir}/dynamicrules/");
 		error_log(gettext("\tUsing Snort VRT precompiled SO rules for {$freebsd_version_so} ...\n"), 3, $snort_rules_upd_log);
 		$snort_arch = php_uname("m");
 		$nosorules = false;
 		if ($snort_arch  == 'i386'){
 			exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir}/tmp so_rules/precompiled/{$freebsd_version_so}/i386/{$snort_version}/");
-			exec("/bin/cp {$snortdir}/tmp/so_rules/precompiled/$freebsd_version_so/i386/{$snort_version}/* {$snortlibdir}/dynamicrules/");
+			exec("/bin/cp {$snortdir}/tmp/so_rules/precompiled/{$freebsd_version_so}/i386/{$snort_version}/* {$snortlibdir}/dynamicrules/");
 		} elseif ($snort_arch == 'amd64') {
 			exec("/usr/bin/tar xzf {$tmpfname}/{$snort_filename} -C {$snortdir}/tmp so_rules/precompiled/{$freebsd_version_so}/x86-64/{$snort_version}/");
 			exec("/bin/cp {$snortdir}/tmp/so_rules/precompiled/{$freebsd_version_so}/x86-64/{$snort_version}/* {$snortlibdir}/dynamicrules/");
diff --git a/config/snort/snort_interfaces.php b/config/snort/snort_interfaces.php
index 5419e7c0..e96be262 100755
--- a/config/snort/snort_interfaces.php
+++ b/config/snort/snort_interfaces.php
@@ -103,11 +103,11 @@ if ($_GET['act'] == 'bartoggle' && is_numeric($id)) {
 	$if_friendly = snort_get_friendly_interface($snortcfg['interface']);
 
 	if (snort_is_running($snortcfg['uuid'], $if_real, 'barnyard2') == 'no') {
-		log_error("Toggle (barnyard starting) for {$if_friendly}({$if_real})...");
+		log_error("Toggle (barnyard starting) for {$if_friendly}({$snortcfg['descr']})...");
 		sync_snort_package_config();
 		snort_barnyard_start($snortcfg, $if_real);
 	} else {
-		log_error("Toggle (barnyard stopping) for {$if_friendly}({$if_real})...");
+		log_error("Toggle (barnyard stopping) for {$if_friendly}({$snortcfg['descr']})...");
 		snort_barnyard_stop($snortcfg, $if_real);
 	}
 
@@ -123,7 +123,7 @@ if ($_GET['act'] == 'toggle' && is_numeric($id)) {
 	$if_friendly = snort_get_friendly_interface($snortcfg['interface']);
 
 	if (snort_is_running($snortcfg['uuid'], $if_real) == 'yes') {
-		log_error("Toggle (snort stopping) for {$if_friendly}({$if_real})...");
+		log_error("Toggle (snort stopping) for {$if_friendly}({$snortcfg['descr']})...");
 		snort_stop($snortcfg, $if_real);
 
 		header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' );
@@ -132,7 +132,7 @@ if ($_GET['act'] == 'toggle' && is_numeric($id)) {
 		header( 'Cache-Control: post-check=0, pre-check=0', false );
 		header( 'Pragma: no-cache' );
 	} else {
-		log_error("Toggle (snort starting) for {$if_friendly}({$if_real})...");
+		log_error("Toggle (snort starting) for {$if_friendly}({$snortcfg['descr']})...");
 
 		/* set flag to rebuild interface rules before starting Snort */
 		$rebuild_rules = "on";
diff --git a/config/snort/snort_rules.php b/config/snort/snort_rules.php
index 59bf1339..46c3c264 100755
--- a/config/snort/snort_rules.php
+++ b/config/snort/snort_rules.php
@@ -399,7 +399,7 @@ h += 96;
 			<input type='hidden' name='openruleset' value='custom.rules'>
 			<input type='hidden' name='id' value='<?=$id;?>'>
 			
-			<textarea wrap="on" cols="85" rows="40" name="customrules"><?=$pconfig['customrules'];?></textarea>
+			<textarea wrap="soft" cols="85" rows="40" name="customrules"><?=$pconfig['customrules'];?></textarea>
 		</td>
 		<td width="3%" class="list">&nbsp;</td>
 	</tr>
diff --git a/config/snort/snort_rules_edit.php b/config/snort/snort_rules_edit.php
index 7005d1f8..a1f45c07 100755
--- a/config/snort/snort_rules_edit.php
+++ b/config/snort/snort_rules_edit.php
@@ -72,7 +72,7 @@ if (substr($file, 0, 10) == "IPS Policy") {
 	$rules_map = snort_load_vrt_policy($a_rule[$id]['ips_policy']);
 	if (isset($_GET['ids'])) {
 		$contents = $rules_map[$_GET['gid']][trim($_GET['ids'])]['rule'];
-		$wrap_flag = "on";
+		$wrap_flag = "soft";
 	}
 	else {
 		$contents = "# Snort IPS Policy - " . ucfirst($a_rule[$id]['ips_policy']) . "\n\n";
@@ -89,7 +89,7 @@ if (substr($file, 0, 10) == "IPS Policy") {
 elseif (isset($_GET['ids'])) {
 	$rules_map = snort_load_rules_map("{$snortdir}/rules/{$file}");
 	$contents = $rules_map[$_GET['gid']][trim($_GET['ids'])]['rule'];
-	$wrap_flag = "on";
+	$wrap_flag = "soft";
 }
 // Is it our special flowbit rules file?
 elseif ($file == $flowbit_rules_file)