Merge remote-tracking branch 'mfischer/ntfs-3g' into next

[ipfire-2.x.git] / html / cgi-bin / ids.cgi

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 5884e241712c898e1a443b0cef6afa8ec96994f5..5ada91128446de7e15896197730d20a701f05653 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -263,11 +263,11 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-       $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2953.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'community') {
-       $url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz";
+       $url=" https://www.snort.org/rules/community";
 } else {
        $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
 }
@@ -472,7 +472,7 @@ if ($return) {
                                $Lang::tr{'snort working'}
                <tr><td colspan='2' align='center'>
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
+                               <input type='image' alt='$Lang::tr{'reload'}' title='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
                        </form>
                <tr><td colspan='2' align='left'><pre>
 END
@@ -528,7 +528,7 @@ print <<END
 </tr>
 <tr>
        <td><br />
-               $Lang::tr{'ids rules license'} <a href='https://www.snort.org/signup' target='_blank'>www.snort.org</a>$Lang::tr{'ids rules license1'}<br /><br />
+               $Lang::tr{'ids rules license'} <a href='https://www.snort.org/subscribe' target='_blank'>www.snort.org</a>$Lang::tr{'ids rules license1'}<br /><br />
                $Lang::tr{'ids rules license2'} <a href='https://www.snort.org/account/oinkcode' target='_blank'>Get an Oinkcode</a>, $Lang::tr{'ids rules license3'}
        </td>
 </tr>
@@ -594,7 +594,7 @@ END
 if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable_green" || -e "${General::swroot}/snort/enable_blue" || -e "${General::swroot}/snort/enable_orange" ) {
        &Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
                # Output display table for rule files
-               print "<table width='100%'><tr><td valign='TOP'><table>";
+               print "<table width='100%'><tr><td valign='top'><table>";
 
                print "<form method='post'>";
 
@@ -615,7 +615,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 
                        # Check if reached half-way through rule file rules to start new column
                if ($ruledisplaycnt > $rulecnt) {
-                               print "</table></td><td valign='TOP'><table>";
+                               print "</table></td><td valign='top'><table>";
                                $ruledisplaycnt = 0;
                        }
 
@@ -666,8 +666,8 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
                        }
 
                        # Output rule file name and checkbox
-                       print "<tr><td class='base' valign='TOP'><input type='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <a href='$rulefilelink'>$rulefile</a></td></tr>";
-                       print "<tr><td class='base' valign='TOP'>";
+                       print "<tr><td class='base' valign='top'><input type='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <a href='$rulefilelink'>$rulefile</a></td></tr>";
+                       print "<tr><td class='base' valign='top'>";
 
                        # Check for empty 'Description'
                        if ($snortrules{$rulefile}{'Description'} eq '') {
@@ -680,7 +680,7 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
                        # Check for display flag
                        if ($displayrulefilerules) {
                                # Rule file definition rule display
-                               print "<tr><td class='base' valign='TOP'><table border='0'><tr>";
+                               print "<tr><td class='base' valign='top'><table border='0'><tr>";
 
                                # Local vars
                                my $ruledefdisplaycnt = 0;