kernel: reset asix88179 twice like in older kernels

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

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index cdfc77ac08b62e729025215b619d32d031504453..8ace30b02a91dff6ccc489e2eb6de7f53ccad649 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -433,7 +433,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        unless ($errormessage) {
                # Lock the webpage and print notice about downloading
                # a new ruleset.
-               &working_notice("$Lang::tr{'ids download new ruleset'}");
+               &_open_working_notice("$Lang::tr{'ids download new ruleset'}");
 
                # Call subfunction to download the ruleset.
                my $return = &IDS::downloadruleset($provider);
@@ -450,11 +450,17 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        # Call function to store the errormessage.
                        &IDS::_store_error_message($errormessage);
 
+                       # Close the working notice.
+                       &_close_working_notice();
+
                        # Preform a reload of the page.
                        &reload();
                } else {
                        # Call subfunction to launch oinkmaster.
-                       &oinkmaster_web();
+                       &oinkmaster_web("nolock");
+
+                       # Close the working notice.
+                       &_close_working_notice();
 
                        # Check if the IDS is running.
                        if(&IDS::ids_is_running()) {
@@ -900,6 +906,9 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        # Drop the stored ruleset file.
        &IDS::drop_dl_rulesfile($provider);
 
+       # Remove may stored etag data.
+       &IDS::remove_from_etags($provider);
+
        # Get the name of the provider rulessets include file.
        my $provider_used_rulefile = &IDS::get_provider_used_rulesfiles_file($provider);
 
@@ -1153,6 +1162,7 @@ END
                                my $subscription_code = $used_providers{$id}[1];
                                my $autoupdate_status = $used_providers{$id}[2];
                                my $status  = $used_providers{$id}[3];
+                               my $unsupported;
 
                                # Check if the item number is even or not.
                                if ($line % 2) {
@@ -1161,6 +1171,12 @@ END
                                        $col="bgcolor='$color{'color20'}'";
                                }
 
+                               # Handle providers which are not longer supported.
+                               unless ($IDS::Ruleset::Providers{$provider}{'dl_url'}) {
+                                       $col = "bgcolor='$Header::colouryellow'";
+                                       $unsupported = $Lang::tr{'ids provider eol'};
+                               }
+
                                # Choose icons for the checkboxes.
                                my $status_gif;
                                my $status_gdesc;
@@ -1187,7 +1203,7 @@ END
 
 print <<END;
                                <tr>
-                                       <td width='33%' class='base' $col>$provider_name</td>
+                                       <td width='33%' class='base' $col>$provider_name $unsupported</td>
                                        <td width='30%' class='base' $col>$rulesetdate</td>
 
                                        <td align='center' $col>
@@ -1238,27 +1254,24 @@ END
        print "</table>\n";
 
        # Section to add new elements or edit existing ones.
-print <<END;
+       print <<END;
        <br>
        <hr>
        <br>
 
-       <div align='right'>
-               <table width='100%'>
-                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <tr>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <div align='right'>
 END
 
-                                       # Only show this button if a ruleset provider is configured.
-                                       if (%used_providers) {
-                                               print "<input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>\n";
-                                       }
+       # Only show this button if a ruleset provider is configured.
+       if (%used_providers) {
+               print "<input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>\n";
+       }
+
 print <<END;
-                                       <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'>
-                               </tr>
-                       </form>
-               </table>
-       </div>
+                       <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'>
+               </div>
+       </form>
 END
 
        &Header::closebox();
@@ -1690,6 +1703,12 @@ END
                                                        # Grab the provider handle.
                                                        my $provider = $tmphash{$provider_name};
 
+                                                       # Check if we are not in edit mode.
+                                                       if ($cgiparams{'PROVIDERS'} ne "$Lang::tr{'edit'}") {
+                                                               # Skip unsupported ruleset provider.
+                                                               next unless(exists($IDS::Ruleset::Providers{$provider}{"dl_url"}));
+                                                       }
+
                                                        # Pre-select the provider if one is given.
                                                        if (($used_providers{$cgiparams{'ID'}}[0] eq "$provider") || ($cgiparams{'PROVIDER'} eq "$provider")) {
                                                                $selected{$provider} = "selected='selected'";
@@ -1770,7 +1789,8 @@ END
 ## Function to show the area where additional provider actions can be done.
 #
 sub show_additional_provider_actions() {
-       my $disabled;
+       my $disabled_reset;
+       my $disabled_update;
        my %used_providers = ();
 
        # Read-in providers settings file.
@@ -1785,7 +1805,12 @@ sub show_additional_provider_actions() {
 
        # Disable the reset provider button if no provider modified sids file exists.
        unless (-f $modifications_file) {
-               $disabled = "disabled";
+               $disabled_reset = "disabled";
+       }
+
+       # Disable the manual update button if the provider is not longer supported.
+       unless ($IDS::Ruleset::Providers{$provider}{"dl_url"}) {
+               $disabled_update = "disabled";
        }
 
        &Header::openbox('100%', 'center', "");
@@ -1795,8 +1820,8 @@ sub show_additional_provider_actions() {
                                <tr>
                                        <td align='center'>
                                                <input type='hidden' name='PROVIDER' value='$provider'>
-                                               <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids reset provider'}' $disabled>
-                                               <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids force ruleset update'}'>
+                                               <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids reset provider'}' $disabled_reset>
+                                               <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids force ruleset update'}' $disabled_update>
                                        </td>
                                </tr>
                        </table>
@@ -1851,10 +1876,14 @@ sub _close_working_notice () {
 ## oinkmaster function, but provides a lot of HTML formated status output.
 #
 sub oinkmaster_web () {
+       my ($nolock) = @_;
+
        my @enabled_providers = &IDS::get_enabled_providers();
 
        # Lock the webpage and print message.
-        &_open_working_notice("$Lang::tr{'ids apply ruleset changes'}");
+       unless ($nolock) {
+               &_open_working_notice("$Lang::tr{'ids apply ruleset changes'}");
+       }
 
         # Check if the files in rulesdir have the correct permissions.
         &IDS::_check_rulesdir_permissions();
@@ -1892,7 +1921,9 @@ sub oinkmaster_web () {
         &_add_to_notice("$Lang::tr{'ids finished'}");
 
        # Close the working notice.
-       &_close_working_notice();
+       unless ($nolock) {
+               &_close_working_notice();
+       }
 }
 
 #
@@ -2031,6 +2062,9 @@ sub get_provider_name($) {
        my ($handle) = @_;
        my $provider_name;
 
+       # Early exit if the given provider does not longer exist.
+       return unless ($IDS::Ruleset::Providers{$handle});
+
        # Get the required translation string for the given provider handle.
        my $tr_string = $IDS::Ruleset::Providers{$handle}{'tr_string'};