Merge remote-tracking branch 'stevee/proxy-squidclamav' into next

Conflicts:
	config/cfgroot/general-functions.pl

diff --combined config/cfgroot/general-functions.pl
index 3cdb36fbd4709229edd93b2f39893a145a17425f,fbca601e4a62e2e31febfe24f66128b16d4335e4..41643d8d7451c25aebda2475600b0f9c170845a4
--- 1/config/cfgroot/general-functions.pl
--- 2/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@@ -1008,26 -1008,27 +1008,49 @@@ sub MakeUserAgent() 
        return $user_agent;
  }
  
 -      return $all;    
 +sub RedIsWireless() {
 +      # This function checks if a network device is a wireless device.
 +
 +      my %settings = ();
 +      &readhash("${General::swroot}/ethernet/settings", \%settings);
 +
 +      # Find the name of the network device.
 +      my $device = $settings{'RED_DEV'};
 +
 +      # Exit, if no device is configured.
 +      return 0 if ($device eq "");
 +
 +      # Return 1 if the device is a wireless one.
 +      my $path = "/sys/class/net/$device/wireless";
 +      if (-d $path) {
 +              return 1;
 +      }
 +
 +      # Otherwise return zero.
 +      return 0;
 +}
 +
+ # Function to read a file with UTF-8 charset.
+ sub read_file_utf8 ($) {
+       my ($file) = @_;
+ 
+       open my $in, '<:encoding(UTF-8)', $file or die "Could not open '$file' for reading $!";
+       local $/ = undef;
+       my $all = <$in>;
+       close $in;
+ 
++      return $all;
+ }
+ 
+ # Function to write a file with UTF-8 charset.
+ sub write_file_utf8 ($) {
+       my ($file, $content) = @_;
+ 
+       open my $out, '>:encoding(UTF-8)', $file or die "Could not open '$file' for writing $!";;           
+       print $out $content;
+       close $out;
+ 
+       return; 
+ }
+ 
  1;