From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sun, 9 Jan 2011 12:08:50 +0000 (+0100)
Subject: Fixed snort display bugs, 0000745, 0000751.
X-Git-Tag: v2.9-final~9^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=42d9192e0cc8f7544016af09c2277853fc3d884c

Fixed snort display bugs, 0000745, 0000751.
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index a4faf8d892..8c219ae6eb 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -278,7 +278,8 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} e
 {
 	$errormessage = $Lang::tr{'invalid input for oink code'} unless (
 	    ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/)  ||
-	    ($snortsettings{'RULESTYPE'} eq 'nothing' )       );
+	    ($snortsettings{'RULESTYPE'} eq 'nothing' ) ||
+	    ($snortsettings{'RULESTYPE'} eq 'community' ));
 
 	&General::writehash("${General::swroot}/snort/settings", \%snortsettings);
 	if ($snortsettings{'ENABLE_SNORT'} eq 'on')
@@ -537,10 +538,8 @@ print <<END
 	<td width='30%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' />
 END
 ;
-
-if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ) {
-	$snortsettings{'INSTALLDATE'} = `/bin/date +'%Y-%m-%d'`;
-	&General::writehash("${General::swroot}/snort/settings", \%snortsettings);
+if ( -e "/var/tmp/snortrules.tar.gz"){
+	$snortsettings{'INSTALLDATE'} = `ls -la /var/tmp/snortrules.tar.gz  | cut -d" " -f6-8`;
 }
 print "&nbsp;$Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>";