From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 ed2c97b799fab266b2a1daa9596e0f0077a07dc9
Date: Wed, 24 Jul 2024 16:40:58 +0000
Message-ID: <4WTfsQ2Vm1z2y9M@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8908308380894829993=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============8908308380894829993==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  ed2c97b799fab266b2a1daa9596e0f0077a07dc9 (commit)
       via  e8d2096c0bbd4a5a938b83c0a0b3e7937e819c8f (commit)
       via  10210334fe1429ebd15741390cf02ced2a216719 (commit)
       via  98b755225e09f02ceef8bff634b7efc446e931b4 (commit)
       via  3cd821c122e01ad9903aec6629d65b73158f7dd1 (commit)
       via  2dd6bc72255d40b7d261662ef282a3c1dcd4087a (commit)
       via  fbfde0088c58c506cab80d23fc240e3cab863302 (commit)
       via  a9279a413ffb1aeeb66b8ccbe545fff13a260817 (commit)
       via  f5bddd4fe77153107ea03f64f70eacb7100b0a47 (commit)
       via  d716ad52a71d69ba4c574b7c80aaf879ce99e0f2 (commit)
       via  72e6d617191dd893fe25609ccca3c692b7911ad5 (commit)
       via  66db90757a750afd3843d432b095943d342b8ce7 (commit)
       via  cc5613b3b58d813ee7ea3df8a4b43fadd989464a (commit)
       via  789251ae6533e6e33f014f1aeaaf5726fa5cfb90 (commit)
       via  07257e1f832dac138e73c30a6ab8c95424bea488 (commit)
       via  0e750575a933d73731d630e80c41b5fe65908066 (commit)
       via  9b044bc8eb94c832e7b2cb6e4569baa8e22c5721 (commit)
       via  0e93c1eaf396fb7b40aee8745fcdebb377d74b84 (commit)
       via  62a84fdb4ab924a2d4c5ae4a58c05a115724bdb0 (commit)
       via  9c9f637e16b11e2f2e12d1e5d254be24f468b97c (commit)
       via  11e75894ce2b22cfa696b8996fc5cd6244b23f86 (commit)
       via  498feaa55026899f6f8c0163e1b0a360b0f39d3b (commit)
       via  b8d1ae216fe06e17d961e5fe47d99ae4f9df63fa (commit)
       via  d110e751f3765948cceaef3868d163b15af28c3b (commit)
       via  db09ea9e5c39d2449e6897f1c2aca5c1f2b9ba74 (commit)
       via  3f863ee70d9fb9cd74b43da729fa7c061f47db7d (commit)
       via  5900a9505968700c8634e2dd6d597c31c24e70d0 (commit)
       via  6e47a143c9068b3bdad4b2cdb82ed080f65b9961 (commit)
       via  e340d393d3fbe017bdd62236f7fc1b3c6bd72827 (commit)
       via  737e9e1037143989ac7ac6259de9ecb5d7cdd0e0 (commit)
       via  85e004c2da5a3812e191ead457a5f775740b9e3e (commit)
       via  65fff7fc34e93f891c21142768c545bdf3a6a39b (commit)
       via  0e55d277370a0196caf0b374144ef40b43fe6819 (commit)
       via  8eb016da793e623ab5b5b7b05556f9c5dfa8faa2 (commit)
       via  17c29ce7fefe36be09d05e42a8b50d10e7ca5d17 (commit)
       via  d9de11aff847b505e186e2e56ece5905e3d2b7d0 (commit)
       via  82fec28abe35877513fa553747b697c158db2b95 (commit)
      from  6460dbbfc5be1774daec47c47451b4d5a746577e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ed2c97b799fab266b2a1daa9596e0f0077a07dc9
Merge: e8d2096c0b 6460dbbfc5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jul 24 16:40:47 2024 +0000

    Merge remote-tracking branch 'origin/next' into next

commit e8d2096c0bbd4a5a938b83c0a0b3e7937e819c8f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jul 24 16:40:15 2024 +0000

    core188: Ship changed files
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 10210334fe1429ebd15741390cf02ced2a216719
Merge: e347899c16 98b755225e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jul 24 16:32:28 2024 +0000

    Merge remote-tracking branch 'ms/cleanup' into next

commit 98b755225e09f02ceef8bff634b7efc446e931b4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 16 15:02:33 2024 +0200

    general-function.pl: Add a function to easily set defaults
   =20
    This function can be used to set values in a hash if they have not been
    set, yet.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 3cd821c122e01ad9903aec6629d65b73158f7dd1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 20:56:58 2024 +0100

    web: Refactor graphs
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 2dd6bc72255d40b7d261662ef282a3c1dcd4087a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 20:09:16 2024 +0100

    web: Introduce sections
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit fbfde0088c58c506cab80d23fc240e3cab863302
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 19:57:49 2024 +0100

    vulnerabilities.cgi: Use CSS to colour the table
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a9279a413ffb1aeeb66b8ccbe545fff13a260817
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 19:42:24 2024 +0100

    vulnerabilities.cgi: Remove manual alternation of colours
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f5bddd4fe77153107ea03f64f70eacb7100b0a47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 19:39:40 2024 +0100

    header.pl: Simplify boxes
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d716ad52a71d69ba4c574b7c80aaf879ce99e0f2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 19:21:56 2024 +0100

    header.pl: Remove unused openpagewithoutmenu function
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 72e6d617191dd893fe25609ccca3c692b7911ad5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 19:00:49 2024 +0100

    CSS: Automatically stripe all tables
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 66db90757a750afd3843d432b095943d342b8ce7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 16:55:41 2024 +0100

    Remove RECONNECTION=3Ddialondemand
   =20
    We don't support this at all and so we don't need to check any more.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit cc5613b3b58d813ee7ea3df8a4b43fadd989464a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 16:51:27 2024 +0100

    network-functions.pl: Read PPP settings globally
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 789251ae6533e6e33f014f1aeaaf5726fa5cfb90
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 16:42:16 2024 +0100

    web: Read ethernet settings file only once in headers
   =20
    The web UI is rather slow and one of the reasons for that is that we are
    reading the same files over and over again...
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 07257e1f832dac138e73c30a6ab8c95424bea488
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 16:31:38 2024 +0100

    general-functions.pl: Don't use line buffering
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0e750575a933d73731d630e80c41b5fe65908066
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 16:28:38 2024 +0100

    web-user-interface: Move theme functions back into header.pl
   =20
    Since we no longer support other themes, the web UI should load quicker
    if not importing too many other files.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9b044bc8eb94c832e7b2cb6e4569baa8e22c5721
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 16:21:34 2024 +0100

    header.pl: Remove unused function "is_modem"
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0e93c1eaf396fb7b40aee8745fcdebb377d74b84
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 15:59:59 2024 +0100

    header.pl: Fix whitespace errors
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 62a84fdb4ab924a2d4c5ae4a58c05a115724bdb0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 15:54:02 2024 +0100

    general-functions.pl: Remove unused NextIP* functions
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9c9f637e16b11e2f2e12d1e5d254be24f468b97c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 15:52:17 2024 +0100

    general-functions.pl: Remove unused srtarray function
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 11e75894ce2b22cfa696b8996fc5cd6244b23f86
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 15:49:54 2024 +0100

    general-functions.pl: Remove getlastip/getnextip
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 498feaa55026899f6f8c0163e1b0a360b0f39d3b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 15:38:48 2024 +0100

    general-functions.pl: Drop unused getccdbc function
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b8d1ae216fe06e17d961e5fe47d99ae4f9df63fa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 15:36:12 2024 +0100

    general-functions.pl: Drop unused "writehashpart" function
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d110e751f3765948cceaef3868d163b15af28c3b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 15:35:48 2024 +0100

    general-functions.pl: Fix various whitespace issues
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit db09ea9e5c39d2449e6897f1c2aca5c1f2b9ba74
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 14:35:39 2024 +0100

    initscripts: Don't overwrite the PID file
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 3f863ee70d9fb9cd74b43da729fa7c061f47db7d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 14:32:30 2024 +0100

    initscripts: Add some basic functions for IP address maths
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5900a9505968700c8634e2dd6d597c31c24e70d0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 14:31:49 2024 +0100

    initscripts: Fix reading PIDs
   =20
    An incorrect variable has been used.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 6e47a143c9068b3bdad4b2cdb82ed080f65b9961
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 23 14:30:33 2024 +0100

    initscripts: Handle command arguments as array
   =20
    For some reason, the function is refusing to launch a command that has
    extra arguments.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e340d393d3fbe017bdd62236f7fc1b3c6bd72827
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Mar 22 17:40:15 2024 +0100

    network: Don't include initscript headers twice
   =20
    Everywhere we import the functions, we have already imported the
    standard includes.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 737e9e1037143989ac7ac6259de9ecb5d7cdd0e0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Mar 20 17:19:50 2024 +0100

    network-functions.pl: Add function to get netmask in dotted format
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 85e004c2da5a3812e191ead457a5f775740b9e3e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Mar 20 12:10:50 2024 +0100

    network-functions.pl: Fix return code check
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 65fff7fc34e93f891c21142768c545bdf3a6a39b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Mar 20 12:10:37 2024 +0100

    network-functions.pl: Fix whitespace issues
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0e55d277370a0196caf0b374144ef40b43fe6819
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Mar 20 12:09:58 2024 +0100

    network-functions.pl: Add function to extract prefix
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8eb016da793e623ab5b5b7b05556f9c5dfa8faa2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 9 18:25:11 2024 +0200

    CSS: Make text/number inputs 100% wide, too
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 17c29ce7fefe36be09d05e42a8b50d10e7ca5d17
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Mar 19 18:02:17 2024 +0100

    CSS: Make all <select> and <textarea> use all available space
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d9de11aff847b505e186e2e56ece5905e3d2b7d0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 9 19:23:18 2024 +0200

    CSS: Don't make headings so skinny
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 82fec28abe35877513fa553747b697c158db2b95
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 10 17:34:28 2024 +0200

    header.pl: Allow passing more HTTP headers to showhttpheaders()
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/general-functions.pl                | 265 ++++------------
 config/cfgroot/graphs.pl                           |  43 +--
 config/cfgroot/header.pl                           | 332 ++++++++++++++++++-=
--
 config/cfgroot/network-functions.pl                |  65 +++-
 config/rootfiles/common/web-user-interface         |   1 -
 config/rootfiles/core/188/filelists/files          |  11 +
 .../112 =3D> core/188}/filelists/web-user-interface  |   0
 config/rootfiles/core/188/update.sh                |   4 +-
 html/cgi-bin/services.cgi                          |   2 +-
 html/cgi-bin/system.cgi                            |  22 +-
 html/cgi-bin/vulnerabilities.cgi                   |  63 ++--
 html/html/themes/ipfire/include/css/style.css      | 137 ++++++++-
 html/html/themes/ipfire/include/functions.pl       | 267 -----------------
 src/initscripts/networking/functions.network       | 147 ++++++++-
 src/initscripts/networking/red                     |  17 +-
 src/initscripts/system/connectd                    |   4 -
 src/initscripts/system/functions                   |   7 +-
 17 files changed, 736 insertions(+), 651 deletions(-)
 copy config/rootfiles/{oldcore/112 =3D> core/188}/filelists/web-user-interfa=
ce (100%)
 delete mode 100644 html/html/themes/ipfire/include/functions.pl

Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun=
ctions.pl
index d871025eb6..a87e5c070a 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -19,7 +19,6 @@ use Socket;
 use IO::Socket;
 use Net::SSLeay;
 use Net::IPv4Addr qw(:all);
-$|=3D1; # line buffering
=20
 $General::version =3D 'VERSION';
 $General::swroot =3D 'CONFIG_ROOT';
@@ -116,15 +115,13 @@ sub log
 }
 sub setup_default_networks
 {
-	my %netsettings=3D();
+	my %netsettings =3D %Network::ethernet;
 	my $defaultNetworks =3D shift;
-=09
-	&readhash("/var/ipfire/ethernet/settings", \%netsettings);
-=09
+
 	# Get current defined networks (Red, Green, Blue, Orange)
 	$defaultNetworks->{$Lang::tr{'fwhost any'}}{'IPT'} =3D "0.0.0.0/0.0.0.0";
 	$defaultNetworks->{$Lang::tr{'fwhost any'}}{'NAME'} =3D "ALL";
-	=09
+
 	$defaultNetworks->{$Lang::tr{'green'}}{'IPT'} =3D "$netsettings{'GREEN_NETA=
DDRESS'}/$netsettings{'GREEN_NETMASK'}";
 	$defaultNetworks->{$Lang::tr{'green'}}{'NET'} =3D "$netsettings{'GREEN_ADDR=
ESS'}";
 	$defaultNetworks->{$Lang::tr{'green'}}{'NAME'} =3D "GREEN";
@@ -145,7 +142,7 @@ sub setup_default_networks
 		$defaultNetworks->{$Lang::tr{'blue'}}{'NET'} =3D "$netsettings{'BLUE_ADDRE=
SS'}";
 		$defaultNetworks->{$Lang::tr{'blue'}}{'NAME'} =3D "BLUE";
 	}
-=09
+
 	#IPFire himself
 	$defaultNetworks->{'IPFire'}{'NAME'} =3D "IPFire";
=20
@@ -172,18 +169,18 @@ sub setup_default_networks
 		&readhash("${General::swroot}/vpn/settings", \%ipsecsettings);
 		if($ipsecsettings{'RW_NET'} ne '')
 		{
-			my ($ip,$sub) =3D split(/\//,$ipsecsettings{'RW_NET'});
-			$sub=3D&General::iporsubtocidr($sub);
-			my @tempipsecsubnet =3D split("\/", $ipsecsettings{'RW_NET'});
-			$defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'ADR'} =3D $tempipsecs=
ubnet[0];
-			$defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'NAME'} =3D "IPsec RW";
-			$defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'NET'} =3D &getnextip(=
$ip);
+			my $netaddress =3D &Network::get_netaddress($ipsecsettings{'RW_NET'});
+			my $prefix     =3D &Network::get_prefix($ipsecsettings{'RW_NET'});
+
+			$defaultNetworks->{"IPsec RW (${netaddress}/${prefix})"}{'ADR'}  =3D $net=
address;
+			$defaultNetworks->{"IPsec RW (${netaddress}/${prefix})"}{'NAME'} =3D "IPs=
ec RW";
+			$defaultNetworks->{"IPsec RW (${netaddress}/${prefix})"}{'NET'}  =3D $net=
address;
 		}
 	}
 }
 sub get_aliases
 {
-=09
+
 	my $defaultNetworks =3D shift;
 	open(FILE, "${General::swroot}/ethernet/aliases") or die 'Unable to open al=
iases file.';
 	my @current =3D <FILE>;
@@ -199,25 +196,36 @@ sub get_aliases
 			}
 			$defaultNetworks->{$temp[2]}{'IPT'} =3D "$temp[0]";
 			$defaultNetworks->{$temp[2]}{'NET'} =3D "$temp[0]";
-		=09
+
 			$ctr++;
 		}
 	}
 }
=20
+sub set_defaults($$) {
+	my $hash =3D shift;
+	my $defaults =3D shift;
+
+	foreach my $key (keys %$defaults) {
+		unless (defined($hash->{$key})) {
+			$hash->{$key} =3D $defaults->{$key};
+		}
+	}
+}
+
 sub readhash
 {
 	my $filename =3D $_[0];
 	my $hash =3D $_[1];
 	my ($var, $val);
-=09
-=09
+
+
 	# Some ipcop code expects that readhash 'complete' the hash if new entries
 	# are presents. Not clear it !!!
 	#%$hash =3D ();
=20
 	open(FILE, $filename) or die "Unable to read file $filename";
-=09
+
 	while (<FILE>)
 	{
 		chop;
@@ -251,50 +259,14 @@ sub writehash
 	my $filename =3D $_[0];
 	my $hash =3D $_[1];
 	my ($var, $val);
-=09
-	# write cgi vars to the file.
-	open(FILE, ">${filename}") or die "Unable to write file $filename";
-	flock FILE, 2;
-	foreach $var (keys %$hash)=20
-	{
-		if ( $var eq "__CGI__"){next;}
-		$val =3D $hash->{$var};
-		# Darren Critchley Jan 17, 2003 added the following because when submittin=
g with a graphic, the x and y
-		# location of the mouse are submitted as well, this was being written to t=
he settings file causing
-		# some serious grief! This skips the variable.x and variable.y
-		if (!($var =3D~ /(.x|.y)$/)) {
-			if ($val =3D~ / /) {
-				$val =3D "\'$val\'"; }
-			if (!($var =3D~ /^ACTION/)) {
-				print FILE "${var}=3D${val}\n"; }
-		}
-	}
-	close FILE;
-}
-
-sub writehashpart
-{
-	# This function replaces the given hash in the original hash by keeping the=
 old
-	# content and just replacing the new content
-
-	my $filename =3D $_[0];
-	my $newhash =3D $_[1];
-	my %oldhash;
-	my ($var, $val);
-
-	readhash("${filename}", \%oldhash);
-
-	foreach $var (keys %$newhash){
-		$oldhash{$var}=3D$newhash->{$var};
-	}
=20
 	# write cgi vars to the file.
 	open(FILE, ">${filename}") or die "Unable to write file $filename";
 	flock FILE, 2;
-	foreach $var (keys %oldhash)=20
+	foreach $var (keys %$hash)
 	{
 		if ( $var eq "__CGI__"){next;}
-		$val =3D $oldhash{$var};
+		$val =3D $hash->{$var};
 		# Darren Critchley Jan 17, 2003 added the following because when submittin=
g with a graphic, the x and y
 		# location of the mouse are submitted as well, this was being written to t=
he settings file causing
 		# some serious grief! This skips the variable.x and variable.y
@@ -352,7 +324,7 @@ sub validip
=20
 	if (!($ip =3D~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/)) {
 		return 0; }
-	else=20
+	else
 	{
 		my @octets =3D ($1, $2, $3, $4);
 		foreach $_ (@octets)
@@ -397,7 +369,7 @@ sub subtocidr {
 sub cidrtosub {
 	return &Network::convert_prefix2netmask(shift);
 }
- =20
+
 sub iporsubtodec
 {
 	#Gets: Ip address or subnetmask in decimal oder CIDR
@@ -421,7 +393,7 @@ sub iporsubtodec
 							 return $net."/".$mask;
 				}
 			}
-		}=09
+		}
 	}
 	#Subnet in binary format?
 	if ($mask=3D~/^(\d{1,2})$/ && (($1<=3D32 && $1>=3D0))){
@@ -433,8 +405,8 @@ sub iporsubtodec
 	}
 	return 3;
 }
- =20
- =20
+
+
 sub iporsubtocidr
 {
 	#gets: Ip Address  or subnetmask in decimal oder CIDR
@@ -457,7 +429,7 @@ sub iporsubtocidr
 							 return $net."/".&General::subtocidr($mask);
 				}
 			}
-		}=09
+		}
 	}
 	#Subnet already in binary format?
 	if ($mask=3D~/^(\d{1,2})$/ && (($1<=3D32 && $1>=3D0))){
@@ -476,18 +448,6 @@ sub getnetworkip {
 	return &Network::get_netaddress($arg);
 }
=20
-sub getccdbc
-{
-	#Gets: IP in Form ("192.168.0.0/24")
-	#Gives: Broadcastaddress of network
-	my $ccdnet=3D$_;
-	my ($ccdip,$ccdsubnet) =3D split "/",$ccdnet;
-	my $ip_address_binary =3D inet_aton( $ccdip );
-	my $netmask_binary    =3D ~pack("N", (2**(32-$ccdsubnet))-1);
-	my $broadcast_address  =3D inet_ntoa( $ip_address_binary | ~$netmask_binary=
 );
-	return $broadcast_address;
-}
-
 sub ip2dec  {
 	return &Network::ip2bin(shift);
 }
@@ -496,21 +456,13 @@ sub dec2ip  {
 	return &Network::bin2ip(shift);
 }
=20
-sub getnextip {
-	return &Network::find_next_ip_address(shift, 4);
-}
-
-sub getlastip {
-	return &Network::find_next_ip_address(shift, -1);
-}
-
 sub validipandmask
 {
 	#Gets: Ip address in 192.168.0.0/24 or 192.168.0.0/255.255.255.0 and checks=
 if subnet valid
-	#Gives: True bzw 0 if success or false=20
+	#Gives: True bzw 0 if success or false
 	my $ccdnet=3D$_[0];
 	my $subcidr;
-=09
+
 	if (!($ccdnet =3D~ /^(.*?)\/(.*?)$/)) {
 		return 0;
 	}
@@ -530,7 +482,7 @@ sub validipandmask
 		}else{
 			return 0;
 		}
-	=09
+
 	}
 	return 0;
 }
@@ -581,13 +533,13 @@ sub checksubnets
 	&readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash);
 	foreach my $key (keys %ccdconfhash) {
 		@ccdconf=3Dsplit(/\//,$ccdconfhash{$key}[1]);
-		if ($ccdname eq $ccdconfhash{$key}[0])=20
+		if ($ccdname eq $ccdconfhash{$key}[0])
 		{
 			$errormessage=3D$errormessage.$Lang::tr{'ccd err nameexist'}."<br>";
 			return $errormessage;
 		}
 		my ($newip,$newsub) =3D split(/\//,$ccdnet);
-		if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1])))=20
+		if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1])))
 		{
 			$errormessage=3D$errormessage.$Lang::tr{'ccd err issubnet'}." $ccdconfhas=
h{$key}[0]<br>";
 			return $errormessage;
@@ -623,7 +575,7 @@ sub checksubnets
 			return $errormessage;
 		}
 	}
-=09
+
 	#call check_net_internal
 	if ($checktype eq "exact")
 	{
@@ -636,11 +588,10 @@ sub checksubnets
 sub check_net_internal_range{
 	my $network=3Dshift;
 	my ($ip,$cidr)=3Dsplit(/\//,$network);
-	my %ownnet=3D();
+	my %ownnet =3D %Network::ethernet;
 	my $errormessage;
 	$cidr=3D&iporsubtocidr($cidr);
 	#check if we use one of ipfire's networks (green,orange,blue)
-	&readhash("${General::swroot}/ethernet/settings", \%ownnet);
 	if (($ownnet{'GREEN_NETADDRESS'}  	ne '' && $ownnet{'GREEN_NETADDRESS'} 	ne=
 '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($own=
net{'GREEN_NETMASK'}))){ $errormessage=3D$Lang::tr{'ccd err green'};return $e=
rrormessage;}
 	if (($ownnet{'ORANGE_NETADDRESS'}	ne '' && $ownnet{'ORANGE_NETADDRESS'} 	ne=
 '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ow=
nnet{'ORANGE_NETMASK'}))){ $errormessage=3D$Lang::tr{'ccd err orange'};return=
 $errormessage;}
 	if (($ownnet{'BLUE_NETADDRESS'} 	ne '' && $ownnet{'BLUE_NETADDRESS'} 	ne '0=
.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{=
'BLUE_NETMASK'}))){ $errormessage=3D$Lang::tr{'ccd err blue'};return $errorme=
ssage;}
@@ -650,11 +601,10 @@ sub check_net_internal_range{
 sub check_net_internal_exact{
 	my $network=3Dshift;
 	my ($ip,$cidr)=3Dsplit(/\//,$network);
-	my %ownnet=3D();
+	my %ownnet =3D %Network::ethernet;
 	my $errormessage;
 	$cidr=3D&iporsubtocidr($cidr);
 	#check if we use one of ipfire's networks (green,orange,blue)
-	&readhash("${General::swroot}/ethernet/settings", \%ownnet);
 	if (($ownnet{'GREEN_NETADDRESS'}  	ne '' && $ownnet{'GREEN_NETADDRESS'} 	ne=
 '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'=
GREEN_NETMASK'}", $network)){ $errormessage=3D$Lang::tr{'ccd err green'};retu=
rn $errormessage;}
 	if (($ownnet{'ORANGE_NETADDRESS'}	ne '' && $ownnet{'ORANGE_NETADDRESS'} 	ne=
 '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{=
'ORANGE_NETMASK'}", $network)){ $errormessage=3D$Lang::tr{'ccd err orange'};r=
eturn $errormessage;}
 	if (($ownnet{'BLUE_NETADDRESS'} 	ne '' && $ownnet{'BLUE_NETADDRESS'} 	ne '0=
.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE=
_NETMASK'}", $network)){ $errormessage=3D$Lang::tr{'ccd err blue'};return $er=
rormessage;}
@@ -781,7 +731,7 @@ sub validfqdn
 		# but no more than 63 characters
 		if (length ($parts[$index]) < 1 || length ($parts[$index]) > 63) {
 			return 0;}
-		if ($index eq 0) {	=09
+		if ($index eq 0) {
 			# This is the hostname part
 			# Only valid characters are a-z, A-Z, 0-9 and -
 			if ($parts[$index] !~ /^[a-zA-Z0-9-]*$/) {
@@ -792,7 +742,7 @@ sub validfqdn
 			# Last character can only be a letter or a digit
 			if (substr ($parts[$index], -1, 1) !~ /^[a-zA-Z0-9]*$/) {
 				return 0;}
-		} else{			=09
+		} else{
 			# This is the domain part
 			# Only valid characters are a-z, A-Z, 0-9, _ and -
 			if ($parts[$index] !~ /^[a-zA-Z0-9_-]*$/) {
@@ -802,23 +752,23 @@ sub validfqdn
 	return 1;
 }
=20
-sub validportrange # used to check a port range=20
+sub validportrange # used to check a port range
 {
 	my $port =3D $_[0]; # port values
 	$port =3D~ tr/-/:/; # replace all - with colons just in case someone used -
 	my $srcdst =3D $_[1]; # is it a source or destination port
=20
 	if (!($port =3D~ /^(\d+)\:(\d+)$/)) {
-=09
-		if (!(&validport($port))) {	=20
+
+		if (!(&validport($port))) {
 			if ($srcdst eq 'src'){
 				return $Lang::tr{'source port numbers'};
 			} else 	{
 				return $Lang::tr{'destination port numbers'};
-			}=20
+			}
 		}
 	}
-	else=20
+	else
 	{
 		my @ports =3D ($1, $2);
 		if ($1 >=3D $2){
@@ -826,16 +776,16 @@ sub validportrange # used to check a port range
 				return $Lang::tr{'bad source range'};
 			} else 	{
 				return $Lang::tr{'bad destination range'};
-			}=20
+			}
 		}
 		foreach $_ (@ports)
 		{
 			if (!(&validport($_))) {
 				if ($srcdst eq 'src'){
-					return $Lang::tr{'source port numbers'};=20
+					return $Lang::tr{'source port numbers'};
 				} else 	{
 					return $Lang::tr{'destination port numbers'};
-				}=20
+				}
 			}
 		}
 		return;
@@ -850,19 +800,6 @@ sub IpInSubnet {
 	return &Network::ip_address_in_network($addr, "$network/$netmask");
 }
=20
-#
-# Return the following IP (IP+1) in dotted notation.
-# Call: NextIP ('1.1.1.1');
-# Return: '1.1.1.2'
-#
-sub NextIP {
-	return &Network::find_next_ip_address(shift, 1);
-}
-
-sub NextIP2 {
-	return &Network::find_next_ip_address(shift, 4);
-}
-
 sub ipcidr {
 	my ($ip,$cidr) =3D &Net::IPv4Addr::ipv4_parse(shift);
 	return "$ip\/$cidr";
@@ -948,87 +885,6 @@ sub findhasharraykey {
     }
 }
=20
-sub srtarray=20
-# Darren Critchley - darrenc(a)telus.net - (c) 2003
-# &srtarray(SortOrder, AlphaNumeric, SortDirection, ArrayToBeSorted)
-# This subroutine will take the following parameters:
-#   ColumnNumber =3D the column which you want to sort on, starts at 1
-#   AlphaNumberic =3D a or n (lowercase) defines whether the sort should be =
alpha or numberic
-#   SortDirection =3D asc or dsc (lowercase) Ascending or Descending sort
-#   ArrayToBeSorted =3D the array that wants sorting
-#
-#   Returns an array that is sorted to your specs
-#
-#   If SortOrder is greater than the elements in array, then it defaults to =
the first element
-#=20
-{
-	my ($colno, $alpnum, $srtdir, @tobesorted) =3D @_;
-	my @tmparray;
-	my @srtedarray;
-	my $line;
-	my $newline;
-	my $ctr;
-	my $ttlitems =3D scalar @tobesorted; # want to know the number of rows in t=
he passed array
-	if ($ttlitems < 1){ # if no items, don't waste our time lets leave
-		return (@tobesorted);
-	}
-	my @tmp =3D split(/\,/,$tobesorted[0]);
-	$ttlitems =3D scalar @tmp; # this should be the number of elements in each =
row of the passed in array
-
-	# Darren Critchley - validate parameters
-	if ($colno > $ttlitems){$colno =3D '1';}
-	$colno--; # remove one from colno to deal with arrays starting at 0
-	if($colno < 0){$colno =3D '0';}
-	if ($alpnum ne '') { $alpnum =3D lc($alpnum); } else { $alpnum =3D 'a'; }
-	if ($srtdir ne '') { $srtdir =3D lc($srtdir); } else { $srtdir =3D 'src'; }
-
-	foreach $line (@tobesorted)
-	{
-		chomp($line);
-		if ($line ne '') {
-			my @temp =3D split(/\,/,$line);
-			# Darren Critchley - juggle the fields so that the one we want to sort on=
 is first
-			my $tmpholder =3D $temp[0];
-			$temp[0] =3D $temp[$colno];
-			$temp[$colno] =3D $tmpholder;
-			$newline =3D "";
-			for ($ctr=3D0; $ctr < $ttlitems ; $ctr++) {
-				$newline=3D$newline . $temp[$ctr] . ",";
-			}
-			chop($newline);
-			push(@tmparray,$newline);
-		}
-	}
-	if ($alpnum eq 'n') {
-		@tmparray =3D sort {$a <=3D> $b} @tmparray;
-	} else {
-		@tmparray =3D (sort @tmparray);
-	}
-	foreach $line (@tmparray)
-	{
-		chomp($line);
-		if ($line ne '') {
-			my @temp =3D split(/\,/,$line);
-			my $tmpholder =3D $temp[0];
-			$temp[0] =3D $temp[$colno];
-			$temp[$colno] =3D $tmpholder;
-			$newline =3D "";
-			for ($ctr=3D0; $ctr < $ttlitems ; $ctr++){
-				$newline=3D$newline . $temp[$ctr] . ",";
-			}
-			chop($newline);
-			push(@srtedarray,$newline);
-		}
-	}
-
-	if ($srtdir eq 'dsc') {
-		@tmparray =3D reverse(@srtedarray);
-		return (@tmparray);
-	} else {
-		return (@srtedarray);
-	}
-}
-
 sub FetchPublicIp {
     my %proxysettings;
     &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
@@ -1056,12 +912,12 @@ sub FetchPublicIp {
 #	IP
 #	hostname
 #	domain
-# Output=20
+# Output
 #	1 IP matches host.domain
 #	0 not in sync
 #
 sub DyndnsServiceSync ($;$;$) {
-=20
+
     my ($ip,$hostName,$domain) =3D @_;
     my @addresses;
=20
@@ -1078,7 +934,7 @@ sub DyndnsServiceSync ($;$;$) {
     }
=20
     if ($addresses[0] ne '') { 		   	# got something ?
-	#&General::log("name:$addresses[0], alias:$addresses[1]");			   =20
+	#&General::log("name:$addresses[0], alias:$addresses[1]");
 	# Build clear text list of IP
 	@addresses =3D map ( &Socket::inet_ntoa($_), @addresses[4..$#addresses]);
 	if (grep (/$ip/, @addresses)) {
@@ -1190,11 +1046,8 @@ sub MakeUserAgent() {
 sub RedIsWireless() {
 	# This function checks if a network device is a wireless device.
=20
-	my %settings =3D ();
-	&readhash("${General::swroot}/ethernet/settings", \%settings);
-
 	# Find the name of the network device.
-	my $device =3D $settings{'RED_DEV'};
+	my $device =3D $Network::ethernet{'RED_DEV'};
=20
 	# Exit, if no device is configured.
 	return 0 if ($device eq "");
@@ -1225,11 +1078,11 @@ sub read_file_utf8 ($) {
 sub write_file_utf8 ($) {
 	my ($file, $content) =3D @_;
=20
-	open my $out, '>:encoding(UTF-8)', $file or die "Could not open '$file' for=
 writing $!";;          =20
+	open my $out, '>:encoding(UTF-8)', $file or die "Could not open '$file' for=
 writing $!";;
 	print $out $content;
 	close $out;
=20
-	return;=20
+	return;
 }
=20
 my $FIREWALL_RELOAD_INDICATOR =3D "${General::swroot}/firewall/reread";
@@ -1357,7 +1210,7 @@ sub get_nameservers () {
 }
=20
 # Function to format a string containing the amount of bytes to
-# something human-readable.=20
+# something human-readable.
 sub formatBytes {
 	# Private array which contains the units.
 	my @units =3D qw(B KB MB GB TB PB);
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 96c6c26ead..4bf1a57794 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -31,10 +31,10 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
=20
 # Approximate size of the final graph image including canvas and labeling (i=
n pixels, mainly used for placeholders)
-our %image_size =3D ('width' =3D> 900, 'height' =3D> 300);
+our %image_size =3D ('width' =3D> 900, 'height' =3D> 400);
=20
 # Size of the actual data area within the image, without labeling (in pixels)
-our %canvas_size =3D ('width' =3D> 800, 'height' =3D> 190);
+our %canvas_size =3D ('width' =3D> 800, 'height' =3D> 290);
=20
 # List of all available time ranges
 our @time_ranges =3D ("hour", "day", "week", "month", "year");
@@ -111,21 +111,26 @@ sub makegraphbox {
 	$default_range =3D "day" unless ($default_range ~~ @time_ranges);
=20
 	print <<END;
-<div class=3D"rrdimage" id=3D"rrdimg-$name" data-origin=3D"$origin" data-gra=
ph=3D"$name" data-default-range=3D"$default_range">
-	<ul>
+		<div class=3D"graph" id=3D"rrdimg-$name" data-origin=3D"$origin" data-grap=
h=3D"$name" data-default-range=3D"$default_range">
+			<img src=3D"/cgi-bin/getrrdimage.cgi?origin=3D${origin}&graph=3D${name}&r=
ange=3D${default_range}" alt=3D"$Lang::tr{'graph'} ($name)">
+
+			<ul>
 END
=20
 	# Print range select buttons
 	foreach my $range (@time_ranges) {
 		print <<END;
-		<li><button data-range=3D"$range" onclick=3D"rrdimage_selectRange(this)">$=
Lang::tr{$range}</button></li>
+				<li>
+					<button data-range=3D"$range" onclick=3D"rrdimage_selectRange(this)">
+						$Lang::tr{$range}
+					</button>
+				</li>
 END
 	}
=20
 	print <<END;
-	</ul>
-	<img src=3D"/cgi-bin/getrrdimage.cgi?origin=3D${origin}&graph=3D${name}&ran=
ge=3D${default_range}" alt=3D"$Lang::tr{'graph'} ($name)">
-</div>
+			</ul>
+		</div>
 END
 }
=20
@@ -143,7 +148,6 @@ sub updatecpugraph {
 		"-l 0",
 		"-u 100",
 		"-r",
-		"-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'percentage'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -270,7 +274,6 @@ sub updateloadgraph {
 		"-1".$period,
 		"-l 0",
 		"-r",
-		"-t ".$Lang::tr{'uptime load average'}." ".$Lang::tr{'graph per'}." ".$Lan=
g::tr{$period."-graph"},
 		"-v ".$Lang::tr{'processes'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -303,7 +306,6 @@ sub updatememorygraph {
 		"-l 0",
 		"-u 100",
 		"-r",
-		"-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'percentage'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -359,7 +361,6 @@ sub updateswapgraph {
 		"-l 0",
 		"-u 100",
 		"-r",
-		"-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'percentage'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -410,7 +411,6 @@ sub updateprocessescpugraph {
 		"-1".$period,
 		"-l 0",
 		"-r",
-		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$per=
iod."-graph"},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"}
@@ -457,7 +457,6 @@ sub updateprocessesmemorygraph {
 		"-1".$period,
 		"-l 0",
 		"-r",
-		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph =
per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -500,7 +499,6 @@ sub updatediskgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$disk." ".$Lang::tr{'disk access'}." ".$Lang::tr{'graph per'}." ".$L=
ang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -544,7 +542,6 @@ sub updateifgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." =
".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -581,7 +578,6 @@ sub updatevpngraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." =
".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -618,7 +614,6 @@ sub updatevpnn2ngraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." =
".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -683,7 +678,6 @@ sub updatefwhitsgraph {
 			"--start",
 			"-1".$period,
 			"-r",
-			"-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
 			"-v ".$Lang::tr{'bytes per second'},
 			"--color=3DSHADEA".$color{"color19"},
 			"--color=3DSHADEB".$color{"color19"},
@@ -762,7 +756,6 @@ sub updatefwhitsgraph {
 			"--start",
 			"-1".$period,
 			"-r",
-			"-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
 			"-v ".$Lang::tr{'bytes per second'},
 			"--color=3DSHADEA".$color{"color19"},
 			"--color=3DSHADEB".$color{"color19"},
@@ -849,7 +842,6 @@ sub updatepinggraph {
 		"-1".$period,
 		"-l 0",
 		"-r",
-		"-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::t=
r{$period."-graph"},
 		"-v ms",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -887,7 +879,6 @@ sub updatewirelessgraph {
 		"-",
 		"--start",
 		"-1".$period,
-		"-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period=
."-graph"},
 		"-v dBm",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -925,7 +916,6 @@ sub updatehddgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per=
'}." ".$Lang::tr{$period."-graph"},
 		"-v Celsius",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -959,7 +949,6 @@ sub updatehwtempgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$pe=
riod."-graph"},
 		"-v Celsius",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -1007,7 +996,6 @@ sub updatehwfangraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$per=
iod."-graph"},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"},
@@ -1054,7 +1042,6 @@ sub updatehwvoltgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$pe=
riod."-graph"},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
 		"--color=3DBACK".$color{"color21"},
@@ -1121,7 +1108,6 @@ sub updateqosgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{=
'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -1183,7 +1169,6 @@ sub updatecpufreqgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"},
 		"-v MHz",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -1223,7 +1208,6 @@ sub updatethermaltempgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$peri=
od."-graph"},
 		"-v Celsius",
 		"--color=3DSHADEA".$color{"color19"},
 		"--color=3DSHADEB".$color{"color19"},
@@ -1277,7 +1261,6 @@ sub updateconntrackgraph {
 		"-1" . $period,
 		"-r",
 		"--lower-limit","0",
-		"-t $Lang::tr{'connection tracking'}",
 		"-v $Lang::tr{'open connections'}",
 		"DEF:conntrack=3D$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conn=
track.rrd:entropy:AVERAGE",
 		"LINE3:conntrack#ff0000:" . sprintf("%-15s", $Lang::tr{'open connections'}=
),
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 66b49e4117..af524af53e 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -18,6 +18,8 @@ use Socket;
 use Time::Local;
 use Encode;
=20
+require "${General::swroot}/graphs.pl";
+
 our %color =3D ();
 &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", =
\%color);
=20
@@ -54,10 +56,10 @@ $Header::extraHead =3D <<END
 	}
 	.orange {
 		background-color: orange;
-	}=09
+	}
 	.red {
 		background-color: red;
-	}		=09
+	}
 	.table1colour {
 		background-color: $Header::table1colour;
 	}
@@ -89,8 +91,6 @@ END
 my %menuhash =3D ();
 my $menu =3D \%menuhash;
 %settings =3D ();
-%ethsettings =3D ();
-%pppsettings =3D ();
 my @URI =3D split('\?', $ENV{'REQUEST_URI'});
=20
 ### Make sure this is an SSL request
@@ -102,8 +102,6 @@ if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') {
=20
 ### Initialize environment
 &General::readhash("${swroot}/main/settings", \%settings);
-&General::readhash("${swroot}/ethernet/settings", \%ethsettings);
-&General::readhash("${swroot}/ppp/settings", \%pppsettings);
 $hostname =3D $settings{'HOSTNAME'};
 $hostnameintitle =3D 0;
=20
@@ -143,10 +141,261 @@ my %manualpages =3D ();
 ### Load selected language and theme functions
 require "${swroot}/langs/en.pl";
 require "${swroot}/langs/${language}.pl";
-eval `/bin/cat /srv/web/ipfire/html/themes/ipfire/include/functions.pl`;
+
+############################################################################=
###
+#
+# print menu html elements for submenu entries
+# @param submenu entries
+sub showsubmenu() {
+	my $submenus =3D shift;
+
+	print "<ul>";
+	foreach my $item (sort keys %$submenus) {
+		$link =3D getlink($submenus->{$item});
+		next if (!is_menu_visible($link) or $link eq '');
+
+		my $subsubmenus =3D $submenus->{$item}->{'subMenu'};
+
+		if ($subsubmenus) {
+			print '<li class=3D"has-sub ">';
+		} else {
+			print '<li>';
+		}
+		print '<a href=3D"'.$link.'">'.$submenus->{$item}->{'caption'}.'</a>';
+
+		&showsubmenu($subsubmenus) if ($subsubmenus);
+		print '</li>';
+	}
+	print "</ul>"
+}
+
+############################################################################=
###
+#
+# print menu html elements
+sub showmenu() {
+	print '<div id=3D"cssmenu" class=3D"bigbox fixed">';
+
+	if ($settings{'SPEED'} ne 'off') {
+		print <<EOF;
+			<div id=3D'traffic'>
+				<strong>$Lang::tr{'traffic stat title'}:</strong>
+				$Lang::tr{'traffic stat in'} <span id=3D'rx_kbs'>--.-- bit/s</span> &nbs=
p;
+				$Lang::tr{'traffic stat out'} <span id=3D'tx_kbs'>--.-- bit/s</span>
+			</div>
+EOF
+	}
+
+	print "<ul>";
+	foreach my $k1 ( sort keys %$menu ) {
+		$link =3D getlink($menu->{$k1});
+		next if (!is_menu_visible($link) or $link eq '');
+		print '<li class=3D"has-sub "><a href=3D"#"><span>'.$menu->{$k1}->{'captio=
n'}.'</span></a>';
+		my $submenus =3D $menu->{$k1}->{'subMenu'};
+		&showsubmenu($submenus) if ($submenus);
+		print "</li>";
+	}
+
+	print "</ul></div>";
+}
+
+############################################################################=
###
+#
+# print page opening html layout
+# @param page title
+# @param boh
+# @param extra html code for html head section
+# @param suppress menu option, can be numeric 1 or nothing.
+#		 menu will be suppressed if param is 1
+sub openpage {
+	my $title =3D shift;
+	my $boh =3D shift;
+	my $extrahead =3D shift;
+	my $suppressMenu =3D shift // 0;
+
+	my $headline =3D "IPFire";
+	if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOST=
NAME'} eq '')) {
+		$headline =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
+	}
+
+print <<END;
+<!DOCTYPE html>
+<html lang=3D"$language">
+	<head>
+	<title>$headline - $title</title>
+	<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-8"/>
+	<link rel=3D"shortcut icon" href=3D"/favicon.ico" />
+	<script type=3D"text/javascript" src=3D"/include/jquery.js"></script>
+	<script src=3D"/include/rrdimage.js"></script>
+
+	$extrahead
+	<script type=3D"text/javascript">
+		function swapVisibility(id) {
+			\$('#' + id).toggle();
+		}
+	</script>
+END
+
+
+print "<link href=3D\"/themes/ipfire/include/css/style.css?v=3D20240125\" re=
l=3D\"stylesheet\" type=3D\"text/css\" />\n";
+
+
+if ($settings{'SPEED'} ne 'off') {
+print <<END
+	<script type=3D"text/javascript" src=3D"/themes/ipfire/include/js/refreshIn=
etInfo.js"></script>
+END
+;
+}
+
+print <<END
+	</head>
+	<body>
+		<div id=3D"header" class=3D"fixed">
+			<div id=3D"logo">
+				<h1>
+					<a href=3D"https://www.ipfire.org">
+						IPFire_
+					</a>
+END
+;
+	if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
+		print "&dash; $settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
+	}
+
+print <<END
+				</h1>
+			</div>
+		</div>
+END
+;
+
+unless($suppressMenu) {
+	&genmenu();
+	&showmenu();
+}
+
+print <<END
+	<div class=3D"bigbox fixed">
+		<div id=3D"main_inner" class=3D"fixed">
+			<div id=3D"main_header">
+				<h1>$title</h1>
+END
+;
+
+# Print user manual link
+my $manual_url =3D &get_manualpage_url();
+if($manual_url) {
+	print <<END
+				<span><a href=3D"$manual_url" title=3D"$Lang::tr{'online help en'}" targ=
et=3D"_blank"><img src=3D"/images/help-browser.png" alt=3D"$Lang::tr{'online =
help en'}"></a></span>
+END
+;
+}
+
+print <<END
+			</div>
+END
+;
+}
+
+############################################################################=
###
+#
+# print page closing html layout
+
+sub closepage () {
+	open(FILE, "</etc/system-release");
+	my $system_release =3D <FILE>;
+	$system_release =3D~ s/core/$Lang::tr{'core update'} /;
+	close(FILE);
+
+print <<END;
+		</div>
+	</div>
+
+	<div id=3D"footer" class=3D'bigbox fixed'>
+		<span class=3D"pull-right">
+			<a href=3D"https://www.ipfire.org/" target=3D"_blank"><strong>IPFire.org<=
/strong></a> &bull;
+			<a href=3D"https://www.ipfire.org/donate" target=3D"_blank">$Lang::tr{'su=
pport donation'}</a>
+		</span>
+
+		<strong>$system_release</strong>
+	</div>
+</body>
+</html>
+END
+;
+}
+
+############################################################################=
###
+#
+# print big box opening html layout
+sub openbigbox {
+}
+
+############################################################################=
###
+#
+# print big box closing html layout
+sub closebigbox {
+}
+
+# Sections
+
+sub opensection($) {
+	my $title =3D shift;
+
+	# Open the section
+	print "<section class=3D\"section\">";
+
+	# Show the title if set
+	if ($title) {
+		print "	<h2 class=3D\"title\">${title}</h2>\n";
+	}
+}
+
+sub closesection() {
+	print "</section>";
+}
+
+############################################################################=
###
+#
+# print box opening html layout
+# @param page width
+# @param page align
+# @param page caption
+sub openbox {
+	# The width parameter is ignored and should always be '100%'
+	my $width =3D shift;
+	my $align =3D shift;
+
+	my $title =3D shift;
+
+	print "<section class=3D\"section is-box\">\n";
+
+	# Show the title
+	if ($title) {
+		print "	<h2 class=3D\"title\">${title}</h2>\n";
+	}
+}
+
+############################################################################=
###
+#
+# print box closing html layout
+sub closebox {
+	print "</section>";
+}
+
+sub graph($) {
+	my $title =3D shift;
+
+	# Open a new section with a title
+	&opensection($title);
+
+	&Graphs::makegraphbox(@_);
+
+	# Close the section
+	&closesection();
+}
=20
 sub green_used() {
-    if ($ethsettings{'GREEN_DEV'} && $ethsettings{'GREEN_DEV'} ne "") {
+    if ($Network::ethernet{'GREEN_DEV'} && $Network::ethernet{'GREEN_DEV'} n=
e "") {
         return 1;
     }
=20
@@ -154,21 +403,14 @@ sub green_used() {
 }
=20
 sub orange_used () {
-    if ($ethsettings{'CONFIG_TYPE'} =3D~ /^[24]$/) {
+    if ($Network::ethernet{'CONFIG_TYPE'} =3D~ /^[24]$/) {
 	return 1;
     }
     return 0;
 }
=20
 sub blue_used () {
-    if ($ethsettings{'CONFIG_TYPE'} =3D~ /^[34]$/) {
-	return 1;
-    }
-    return 0;
-}
-
-sub is_modem {
-    if ($ethsettings{'CONFIG_TYPE'} =3D~ /^[0]$/) {
+    if ($Network::ethernet{'CONFIG_TYPE'} =3D~ /^[34]$/) {
 	return 1;
     }
     return 0;
@@ -206,7 +448,7 @@ sub genmenu {
     if (! blue_used()) {
 	$menu->{'05.firewall'}{'subMenu'}->{'60.wireless'}{'enabled'} =3D 0;
     }
-    if ( $ethsettings{'CONFIG_TYPE'} =3D~ /^(1|2|3|4)$/ && $ethsettings{'RED=
_TYPE'} eq 'STATIC' ) {
+    if ( $Network::ethernet{'CONFIG_TYPE'} =3D~ /^(1|2|3|4)$/ && $Network::e=
thernet{'RED_TYPE'} eq 'STATIC' ) {
 	$menu->{'03.network'}{'subMenu'}->{'70.aliases'}{'enabled'} =3D 1;
     }
=20
@@ -214,7 +456,7 @@ sub genmenu {
         $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} =3D 1;
     }
=20
-    if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "=
" ) {
+    if ( $Network::ethernet{'RED_TYPE'} eq "PPPOE" && $Network::ppp{'MONPORT=
'} ne "" ) {
         $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} =3D =
1;
     }
=20
@@ -233,10 +475,24 @@ sub genmenu {
   }
 }
=20
-sub showhttpheaders
-{
-	print "Cache-control: private\n";
-	print "Content-type: text/html; charset=3DUTF-8\n\n";
+sub showhttpheaders($) {
+	my $overwrites =3D shift;
+
+	my %headers =3D (
+		"Content-Type"  =3D> "text/html; charset=3DUTF-8",
+		"Cache-Control" =3D> "private",
+
+		# Overwrite anything passed
+		%$overwrites,
+	);
+
+	# Print all headers
+	foreach my $header (keys %headers) {
+		print "$header: $headers{$header}\n";
+	}
+
+	# End headers
+	print "\n";
 }
=20
 sub is_menu_visible($) {
@@ -377,17 +633,11 @@ sub cleanhtml {
=20
 sub connectionstatus
 {
-    my %pppsettings =3D ();
-    my %netsettings =3D ();
     my $iface=3D'';
=20
-    $pppsettings{'PROFILENAME'} =3D 'None';
-    &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);
-    &General::readhash("${General::swroot}/ethernet/settings", \%netsettings=
);
-
     my $profileused=3D'';
-    unless ( $netsettings{'RED_TYPE'} =3D~ /^(DHCP|STATIC)$/ ) {
-    	$profileused=3D"- $pppsettings{'PROFILENAME'}";
+    unless ($Network::ethernet{'RED_TYPE'} =3D~ /^(DHCP|STATIC)$/) {
+		$profileused=3D"- $Network::ppp{'PROFILENAME'}";
     }
=20
     my ($timestr, $connstate);
@@ -398,15 +648,13 @@ sub connectionstatus
 			$timestr =3D &General::age("${General::swroot}/red/active");
 			$connstate =3D "<span>$Lang::tr{'connected'} - (<span>$timestr</span>) $p=
rofileused</span>";
 		} else {
-		  if ((open(KEEPCONNECTED, "</var/ipfire/red/keepconnected") =3D=3D false)=
 && ($pppsettings{'RECONNECTION'} eq "persistent")) {
+		  if (open(KEEPCONNECTED, "</var/ipfire/red/keepconnected") =3D=3D false) {
 				$connstate =3D "<span>$Lang::tr{'connection closed'} $profileused</span>=
";
-      } elsif (($pppsettings{'RECONNECTION'} eq "dialondemand") && ( -e "${G=
eneral::swroot}/red/dial-on-demand")) {
-				$connstate =3D "<span>$Lang::tr{'dod waiting'} $profileused</span>";
 			} else {
 				$connstate =3D "<span>$Lang::tr{'connecting'} $profileused</span>" if (s=
ystem("ps -ef | grep -q '[p]ppd'"));
 			}
 		}
-	=09
+
     return $connstate;
 }
=20
@@ -500,7 +748,7 @@ END
 		if($hostname_print eq "") { #print blank space if no hostname is found
 			$hostname_print =3D "&nbsp;&nbsp;&nbsp;";
 		}
-	=09
+
 		# separate active and expired leases with a horizontal line
 		if(($entries{$key}->{expired}) && ($divider_printed =3D=3D 0)) {
 			$divider_printed =3D 1;
@@ -511,14 +759,14 @@ END
 			}
 			$id++;
 		}
-	=09
+
 		print "<form method=3D'post' action=3D'/cgi-bin/dhcp.cgi'><tr>\n";
 		if ($id % 2) {
 			$col=3D"bgcolor=3D'$table1colour'";
 		} else {
 			$col=3D"bgcolor=3D'$table2colour'";
 		}
-	=09
+
 		if($entries{$key}->{expired}) {
 			print <<END
 <td align=3D'center' $col><input type=3D'hidden' name=3D'FIX_ADDR' value=3D'=
$entries{$key}->{IPADDR}' /><strike><i>$entries{$key}->{IPADDR}</i></strike><=
/td>
@@ -599,13 +847,13 @@ sub colorize {
 		return "<font color=3D'".${Header::colourovpn}."'>".$string."</font>";
 	} elsif ( $string =3D~ "lo" or $string =3D~ "127.0.0.0" ){
 		return "<font color=3D'".${Header::colourfw}."'>".$string."</font>";
-	} elsif ( $string =3D~ $ethsettings{'GREEN_DEV'} or &General::IpInSubnet($s=
tring2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){
+	} elsif ( $string =3D~ $Network::ethernet{'GREEN_DEV'} or &General::IpInSub=
net($string2,$Network::ethernet{'GREEN_NETADDRESS'},$Network::ethernet{'GREEN=
_NETMASK'}) ){
 		return "<font color=3D'".${Header::colourgreen}."'>".$string."</font>";
-	} elsif (  $string =3D~ "ppp0" or $string =3D~ $ethsettings{'RED_DEV'} or $=
string =3D~ "0.0.0.0" or $string =3D~ $ethsettings{'RED_ADDRESS'} ){
+	} elsif (  $string =3D~ "ppp0" or $string =3D~ $Network::ethernet{'RED_DEV'=
} or $string =3D~ "0.0.0.0" or $string =3D~ $Network::ethernet{'RED_ADDRESS'}=
 ){
 		return "<font color=3D'".${Header::colourred}."'>".$string."</font>";
-	} elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =3D~ $ethsettings{'BL=
UE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$et=
hsettings{'BLUE_NETMASK'}) )){
+	} elsif ( $Network::ethernet{'CONFIG_TYPE'}>1 and ( $string =3D~ $Network::=
ethernet{'BLUE_DEV'} or &General::IpInSubnet($string2,$Network::ethernet{'BLU=
E_NETADDRESS'},$Network::ethernet{'BLUE_NETMASK'}) )){
 		return "<font color=3D'".${Header::colourblue}."'>".$string."</font>";
-	} elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =3D~ $ethsettings{'OR=
ANGE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'}=
,$ethsettings{'ORANGE_NETMASK'}) )){
+	} elsif ( $Network::ethernet{'CONFIG_TYPE'}>2 and ( $string =3D~ $Network::=
ethernet{'ORANGE_DEV'} or &General::IpInSubnet($string2,$Network::ethernet{'O=
RANGE_NETADDRESS'},$Network::ethernet{'ORANGE_NETMASK'}) )){
 		return "<font color=3D'".${Header::colourorange}."'>".$string."</font>";
 	} else {
 		return $string;
diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-fun=
ctions.pl
index 7b38cfac7f..5b35114aa0 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -28,9 +28,12 @@ require "/var/ipfire/general-functions.pl";
 use experimental 'smartmatch';
 use Socket;
=20
-# System ethernet configuration
-our %ethernet_settings =3D ();
-&General::readhash("${General::swroot}/ethernet/settings", \%ethernet_settin=
gs);
+our %ethernet =3D ();
+our %ppp =3D ();
+
+# Read configuration files
+&General::readhash("${General::swroot}/ethernet/settings", \%ethernet);
+&General::readhash("${General::swroot}/ppp/settings", \%ppp);
=20
 # List of all possible network zones that can be configured
 our @known_network_zones =3D ("red", "green", "orange", "blue");
@@ -291,6 +294,43 @@ sub get_broadcast($) {
 	return &bin2ip($network_bin ^ ~$netmask_bin);
 }
=20
+sub get_prefix($) {
+	my $network =3D shift;
+
+	# Convert to binary
+	my ($network_bin, $netmask_bin) =3D &network2bin($network);
+
+	if (defined $netmask_bin) {
+		my $prefix =3D 0;
+
+		while (1) {
+			# End the loop if we have consumed all ones
+			last if ($netmask_bin =3D=3D 0);
+
+			# Increment prefix
+			$prefix++;
+
+			# Remove the most-significant one
+			$netmask_bin <<=3D 1;
+			$netmask_bin &=3D 0xffffffff;
+		}
+
+		return $prefix;
+	}
+
+	return undef;
+}
+
+sub get_netmask($) {
+	my $network =3D shift;
+
+	# Fetch the prefix
+	my $prefix =3D &get_prefix($network);
+
+	# Convert to netmask
+	return &convert_prefix2netmask($prefix);
+}
+
 # Returns True if $address is in $network.
 sub ip_address_in_network($$) {
 	my $address =3D shift;
@@ -556,7 +596,7 @@ sub get_intf_by_address($) {
 #
 sub get_available_network_zones () {
 	# Obtain the configuration type from the netsettings hash.
-	my $config_type =3D $ethernet_settings{'CONFIG_TYPE'};
+	my $config_type =3D $ethernet{'CONFIG_TYPE'};
=20
 	# Hash which contains the conversation from the config mode
 	# to the existing network interface names. They are stored like
@@ -588,10 +628,10 @@ sub get_available_network_zones () {
 #
 sub is_zone_available() {
 	my $zone =3D lc shift;
-=09
+
 	# Make sure the zone is valid
 	die("Unknown network zone '$zone'") unless ($zone ~~ @known_network_zones);
-=09
+
 	# Get available zones and return result
 	my @available_zones =3D get_available_network_zones();
 	return ($zone ~~ @available_zones);
@@ -602,8 +642,8 @@ sub is_zone_available() {
 #
 sub is_red_mode_ip() {
 	# Obtain the settings from the netsettings hash
-	my $config_type =3D $ethernet_settings{'CONFIG_TYPE'};
-	my $red_type =3D $ethernet_settings{'RED_TYPE'};
+	my $config_type =3D $ethernet{'CONFIG_TYPE'};
+	my $red_type =3D $ethernet{'RED_TYPE'};
=20
 	# RED must be a network device (configuration 1-4) with dynamic or static IP
 	return (($config_type ~~ [1..4]) && ($red_type ~~ ["DHCP", "STATIC"]));
@@ -664,7 +704,7 @@ sub testsuite() {
 	assert('find_next_ip_address("1.2.3.4", 2)', $result eq "1.2.3.6");
=20
 	$result =3D &network_equal("192.168.0.0/24", "192.168.0.0/255.255.255.0");
-	assert('network_equal("192.168.0.0/24", "192.168.0.0/255.255.255.0")', $res=
ult);
+	assert('network_equal("192.168.0.0/24", "192.168.0.0/255.255.255.0")', !$re=
sult);
=20
 	$result =3D &network_equal("192.168.0.0/24", "192.168.0.0/25");
 	assert('network_equal("192.168.0.0/24", "192.168.0.0/25")', !$result);
@@ -690,6 +730,13 @@ sub testsuite() {
 	$result =3D &ip_address_in_range("192.168.30.21", "192.168.30.10", "192.168=
.30.20");
 	assert('ip_address_in_range("192.168.30.21", "192.168.30.10", "192.168.30.2=
0")', !$result);
=20
+	# Check &get_prefix()
+	$result =3D &get_prefix("192.168.0.0/24");
+	assert('get_prefix("192.168.0.0/24")', $result !=3D 24);
+
+	$result =3D &get_prefix("192.168.0.0/255.255.0.0");
+	assert('get_prefix("192.168.0.0/255.255.0.0")', $result !=3D 16);
+
 	print "Testsuite completed successfully!\n";
=20
 	return 0;
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/co=
mmon/web-user-interface
index d2ef6ab103..7ec076d2d8 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -355,7 +355,6 @@ srv/web/ipfire/html/themes/ipfire/include/css/style.css
 srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Bold.ttf
 srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Medium.ttf
 srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Regular.ttf
-srv/web/ipfire/html/themes/ipfire/include/functions.pl
 srv/web/ipfire/html/themes/ipfire/include/js
 srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
 var/updatecache
diff --git a/config/rootfiles/core/188/filelists/files b/config/rootfiles/cor=
e/188/filelists/files
index e69de29bb2..f28980d47b 100644
--- a/config/rootfiles/core/188/filelists/files
+++ b/config/rootfiles/core/188/filelists/files
@@ -0,0 +1,11 @@
+etc/rc.d/init.d/connectd
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/networking/functions.network
+etc/rc.d/init.d/networking/red
+srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/system.cgi
+srv/web/ipfire/cgi-bin/vulnerabilities.cgi
+var/ipfire/general-functions.pl
+var/ipfire/graphs.pl
+var/ipfire/header.pl
+var/ipfire/network-functions.pl
diff --git a/config/rootfiles/core/188/filelists/web-user-interface b/config/=
rootfiles/core/188/filelists/web-user-interface
new file mode 120000
index 0000000000..70c74b4382
--- /dev/null
+++ b/config/rootfiles/core/188/filelists/web-user-interface
@@ -0,0 +1 @@
+../../../common/web-user-interface
\ No newline at end of file
diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/=
update.sh
index 1a65d6201b..d904a400bb 100644
--- a/config/rootfiles/core/188/update.sh
+++ b/config/rootfiles/core/188/update.sh
@@ -37,7 +37,8 @@ done
 extract_files
=20
 # Remove files
-/etc/init.d/apache restart
+rm -vrf \
+	/srv/web/ipfire/html/themes/ipfire/include/functions.pl
=20
 # update linker config
 ldconfig
@@ -49,6 +50,7 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
=20
 # Start services
+/etc/init.d/apache restart
=20
 # This update needs a reboot...
 #touch /var/run/need_reboot
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 0d06ab5fec..e1e901c4ee 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -214,7 +214,7 @@ END
 	print "</table></div>\n";
 	&Header::closebox();
=20
-	&Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'graph=
'}");
+	&Header::opensection('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'g=
raph'}");
 	&Graphs::makegraphbox("services.cgi","processescpu","day");
 	&Header::closebox();
=20
diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index c1da5f5362..a6f60409d6 100644
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -26,32 +26,24 @@ use strict;
 #use CGI::Carp 'fatalsToBrowser';
=20
 require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-require "${General::swroot}/graphs.pl";
=20
-my %color =3D ();
 my %mainsettings =3D ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", =
\%color);
=20
 &Header::showhttpheaders();
+
 &Header::openpage($Lang::tr{'status information'}, 1, '');
-&Header::openbigbox('100%', 'left');
=20
-&Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
-&Graphs::makegraphbox("system.cgi","cpu","day");
-&Header::closebox();
+# Processor Graph
+&Header::graph("$Lang::tr{'processors'}", "system.cgi", "cpu", "day");
=20
+# CPU Frequency
 if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
-	&Header::openbox('100%', 'center', "$Lang::tr{'cpu frequency'} $Lang::tr{'g=
raph'}");
-	&Graphs::makegraphbox("system.cgi","cpufreq","day");
-	&Header::closebox();
+	&Header::graph("$Lang::tr{'cpu frequency'}", "system.cgi", "cpufreq", "day"=
);
 }
=20
-&Header::openbox('100%', 'center', "$Lang::tr{'uptime load average'} $Lang::=
tr{'graph'}");
-&Graphs::makegraphbox("system.cgi","load","day");
-&Header::closebox();
+# Load Average
+&Header::graph("$Lang::tr{'load average'}", "system.cgi", "load", "day");
=20
-&Header::closebigbox();
 &Header::closepage();
diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.=
cgi
index 217952578a..030c824aa5 100644
--- a/html/cgi-bin/vulnerabilities.cgi
+++ b/html/cgi-bin/vulnerabilities.cgi
@@ -98,73 +98,56 @@ if ($notice) {
 &Header::openbox('100%', 'center', $Lang::tr{'processor vulnerability mitiga=
tions'});
=20
 print <<END;
-	<table class=3D"tbl" width=3D'100%'>
+	<table class=3D"tbl">
 		<thead>
 			<tr>
-				<th align=3D"center">
-					<strong>$Lang::tr{'vulnerability'}</strong>
+				<th class=3D"text-center">
+					$Lang::tr{'vulnerability'}
 				</th>
-				<th align=3D"center">
-					<strong>$Lang::tr{'status'}</strong>
+
+				<th class=3D"text-center">
+					$Lang::tr{'status'}
 				</th>
 			</tr>
 		</thead>
+
 		<tbody>
 END
=20
-my $id =3D 0;
 for my $vuln (sort keys %VULNERABILITIES) {
 	my ($status, $message) =3D &check_status($vuln);
 	next if (!$status);
=20
-	my $colour =3D "";
-	my $bgcolour =3D "";
-	my $status_message =3D "";
+	my $status_message =3D $status;
=20
 	# Not affected
-	if ($status eq "Not affected") {
+	if ($status eq "not-affected") {
 		$status_message =3D $Lang::tr{'not affected'};
-		$colour =3D "white";
-		$bgcolour =3D ${Header::colourgreen};
=20
 	# Vulnerable
-	} elsif ($status eq "Vulnerable") {
+	} elsif ($status eq "vulnerable") {
 		$status_message =3D $Lang::tr{'vulnerable'};
-		$colour =3D "white";
-		$bgcolour =3D ${Header::colourred};
=20
 	# Mitigated
-	} elsif ($status eq "Mitigation") {
+	} elsif ($status eq "mitigation") {
 		$status_message =3D $Lang::tr{'mitigated'};
-		$colour =3D "white";
-		$bgcolour =3D ${Header::colourblue};
-
-	# Unknown report from kernel
-	} else {
-		$status_message =3D $status;
-		$colour =3D "black";
-		$bgcolour =3D ${Header::colouryellow};
 	}
=20
-	my $table_colour =3D ($id++ % 2) ? $color{'color22'} : $color{'color20'};
-
 	print <<END;
-		<tr bgcolor=3D"$table_colour">
-			<td align=3D"left">
-				<strong>$VULNERABILITIES{$vuln}</strong>
-			</td>
+		<tr>
+			<th scope=3D"row">
+				$VULNERABILITIES{$vuln}
+			</th>
=20
-			<td bgcolor=3D"$bgcolour" align=3D"center">
-				<font color=3D"$colour">
+			<td class=3D"status is-$status">
 END
 	if ($message) {
-		print "<strong>$status_message</strong> - $message";
+		print "$status_message - $message";
 	} else {
-		print "<strong>$status_message</strong>";
+		print "$status_message";
 	}
=20
 	print <<END;
-				</font>
 			</td>
 		</tr>
 END
@@ -239,11 +222,13 @@ sub check_status($) {
=20
 	# Fix status when something has been mitigated, but not fully, yet
 	if ($status =3D~ /^(Mitigation): (.*vulnerable.*)$/) {
-		return ("Vulnerable", $status);
-	}
+		return ("vulnerable", $status);
+
+	} elsif ($status eq "Not affected") {
+		return "not-affected";
=20
-	if ($status =3D~ /^(Vulnerable|Mitigation): (.*)$/) {
-		return ($1, $2);
+	} elsif ($status =3D~ /^(Vulnerable|Mitigation): (.*)$/) {
+		return (lc $1, $2);
 	}
=20
 	return $status;
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes=
/ipfire/include/css/style.css
index 7cf85d68df..8fb3432639 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -1,3 +1,17 @@
+:root {
+	--color-green          : #339933;
+	--color-green-invert   : #ffffff;
+	--color-red            : #993333;
+	--color-red-invert     : #ffffff;
+	--color-blue           : #333399;
+	--color-blue-invert    : #ffffff;
+	--color-grey           : #d6d6d6;
+	--color-light-grey     : #f0f0f0;
+
+	--color-primary        : #ff2e52;
+	--color-primary-invert : #ffffff;
+	--color-text           : #363636;
+}
=20
 /* This controls the width of the fixed width layouts */
=20
@@ -80,9 +94,10 @@ body {
=20
 h1, h2, h3, h4, h5, h6 {
 	font-size: 20px;
-	font-weight: normal;
-	letter-spacing: -1px;
-	text-align: left;
+}
+
+select, textarea, input[type=3Dtext], input[type=3Dnumber] {
+	width: 100%;
 }
=20
 br.clear {
@@ -154,6 +169,20 @@ iframe {
 	border-radius: 3px 3px 3px 3px;
 }
=20
+section {
+	margin-bottom: 2rem;
+}
+
+section.is-box {
+	padding: 0.75rem 1rem;
+	border: 1px solid var(--color-grey);
+}
+
+section .title {
+	margin-bottom: 1rem;
+	border-bottom: 1px solid var(--color-grey);
+}
+
 #main_inner {
 	padding-bottom: 1.5em;
 }
@@ -172,19 +201,6 @@ iframe {
 	margin-bottom: 1em;
 }
=20
-#main_inner .post {
-	border: 1px solid silver;
-	padding: 1em 2em 1em 2em;
-	margin-bottom: 1em;
-	clear: both;
-}
-
-#main_inner .post h2 {
-	border-bottom: dotted 1px #e1e1e1;
-	font-size: 1.6em;
-	margin-bottom: 1em;
-}
-
 #main_header > * {
 	display: inline-block;
 	vertical-align: baseline;
@@ -289,6 +305,18 @@ table {
 	padding-right: 0.5em;
 }
=20
+.tbl th[scope=3Drow] {
+	text-align: left;
+}
+
+.tbl tr:nth-child(odd) td {
+	background-color: var(--color-grey);
+}
+
+.tbl tr:nth-child(even) td {
+	background-color: var(--color-light-grey);
+}
+
 .tbl th:first-child {
 	border-left: 1px solid #363636;
 	border-top: 1px solid #363636;
@@ -337,10 +365,87 @@ table {
 	border-bottom: 1px solid #363636;
 }
=20
+.tbl .status {
+	text-align: center;
+	font-weight: bold;
+}
+
+.tbl .status.is-running {
+	background-color: var(--color-green);
+	color: var(--color-green-invert);
+}
+
+.tbl .status.is-stopped {
+	background-color: var(--color-red);
+	color: var(--color-red-invert);
+
+	width: 33%;
+}
+
+.tbl .status.is-vulnerable {
+	background-color: var(--color-red);
+	color: var(--color-red-invert);
+}
+
+.tbl .status.is-mitigation {
+	background-color: var(--color-blue);
+	color: var(--color-blue-invert);
+}
+
+.tbl .status.is-not-affected {
+	background-color: var(--color-green);
+	color: var(--color-green-invert);
+}
+
 table.fw-nat tbody tr td {
 	height: 2.25em;
 }
=20
+/*
+	Graphs
+*/
+
+.graph {
+	padding: 0.125rem;
+}
+
+.graph img {
+	width: 100%;
+	min-height: 360px;
+
+	margin-bottom: 0.5rem;
+	padding: 0;
+
+	border: 1px solid var(--color-grey);
+}
+
+.graph ul {
+	list-style-type: none;
+
+	display: flex;
+	justify-content: center;
+}
+
+.graph ul li {
+	margin: 0 0.125rem;
+}
+
+.graph ul li button {
+	background: none;
+	border: none;
+	cursor: pointer;
+
+	background-color: var(--color-grey);
+	color: var(--color-text);
+
+	padding: 0.5rem 1rem;
+}
+
+.graph ul li button.selected {
+	background-color: var(--color-primary);
+	color: var(--color-primary-invert);
+}
+
 /* RRD graph images */
=20
 div.rrdimage > ul {
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/=
ipfire/include/functions.pl
deleted file mode 100644
index 5ea3f9fa77..0000000000
--- a/html/html/themes/ipfire/include/functions.pl
+++ /dev/null
@@ -1,267 +0,0 @@
-#!/usr/bin/perl
-############################################################################=
###
-#                                                                           =
  #
-# IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                    =
  #
-#                                                                           =
  #
-# This program is free software: you can redistribute it and/or modify      =
  #
-# it under the terms of the GNU General Public License as published by      =
  #
-# the Free Software Foundation, either version 3 of the License, or         =
  #
-# (at your option) any later version.                                       =
  #
-#                                                                           =
  #
-# This program is distributed in the hope that it will be useful,           =
  #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of            =
  #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             =
  #
-# GNU General Public License for more details.                              =
  #
-#                                                                           =
  #
-# You should have received a copy of the GNU General Public License         =
  #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.     =
  #
-#                                                                           =
  #
-############################################################################=
###
-#                                                                           =
  #
-# Theme file for IPfire (based on ipfire theme)                             =
  #
-# Author kay-michael k=C3=B6hler kmk <michael(a)koehler.tk>                 =
         #
-#                                                                           =
  #
-# Version 1.0	March, 6th 2013                                               #
-############################################################################=
###
-#                                                                           =
  #
-# Modyfied theme by a.marx(a)ipfire.org January 2014                        =
    #
-#                                                                           =
  #
-# Cleanup code, deleted unused code and rewrote the rest to get a new workin=
g #
-# IPFire default theme.                                                     =
  #
-############################################################################=
###
-
-############################################################################=
###
-#
-# print menu html elements for submenu entries
-# @param submenu entries
-sub showsubmenu() {
-	my $submenus =3D shift;
-
-	print "<ul>";
-	foreach my $item (sort keys %$submenus) {
-		$link =3D getlink($submenus->{$item});
-		next if (!is_menu_visible($link) or $link eq '');
-
-		my $subsubmenus =3D $submenus->{$item}->{'subMenu'};
-
-		if ($subsubmenus) {
-			print '<li class=3D"has-sub ">';
-		} else {
-			print '<li>';
-		}
-		print '<a href=3D"'.$link.'">'.$submenus->{$item}->{'caption'}.'</a>';
-
-		&showsubmenu($subsubmenus) if ($subsubmenus);
-		print '</li>';
-	}
-	print "</ul>"
-}
-
-############################################################################=
###
-#
-# print menu html elements
-sub showmenu() {
-	print '<div id=3D"cssmenu" class=3D"bigbox fixed">';
-
-	if ($settings{'SPEED'} ne 'off') {
-		print <<EOF;
-			<div id=3D'traffic'>
-				<strong>$Lang::tr{'traffic stat title'}:</strong>
-				$Lang::tr{'traffic stat in'} <span id=3D'rx_kbs'>--.-- bit/s</span> &nbs=
p;
-				$Lang::tr{'traffic stat out'} <span id=3D'tx_kbs'>--.-- bit/s</span>
-			</div>
-EOF
-	}
-
-	print "<ul>";
-	foreach my $k1 ( sort keys %$menu ) {
-		$link =3D getlink($menu->{$k1});
-		next if (!is_menu_visible($link) or $link eq '');
-		print '<li class=3D"has-sub "><a href=3D"#"><span>'.$menu->{$k1}->{'captio=
n'}.'</span></a>';
-		my $submenus =3D $menu->{$k1}->{'subMenu'};
-		&showsubmenu($submenus) if ($submenus);
-		print "</li>";
-	}
-
-	print "</ul></div>";
-}
-
-############################################################################=
###
-#
-# print page opening html layout
-# @param page title
-# @param boh
-# @param extra html code for html head section
-# @param suppress menu option, can be numeric 1 or nothing.
-#		 menu will be suppressed if param is 1
-sub openpage {
-	my $title =3D shift;
-	my $boh =3D shift;
-	my $extrahead =3D shift;
-	my $suppressMenu =3D shift // 0;
-
-	my $headline =3D "IPFire";
-	if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOST=
NAME'} eq '')) {
-		$headline =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
-	}
-
-print <<END;
-<!DOCTYPE html>
-<html lang=3D"$language">
-	<head>
-	<title>$headline - $title</title>
-	<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-8"/>
-	<link rel=3D"shortcut icon" href=3D"/favicon.ico" />
-	<script type=3D"text/javascript" src=3D"/include/jquery.js"></script>
-	<script src=3D"/include/rrdimage.js"></script>
-
-	$extrahead
-	<script type=3D"text/javascript">
-		function swapVisibility(id) {
-			\$('#' + id).toggle();
-		}
-	</script>
-END
-
-
-print "<link href=3D\"/themes/ipfire/include/css/style.css?v=3D20240125\" re=
l=3D\"stylesheet\" type=3D\"text/css\" />\n";
-
-
-if ($settings{'SPEED'} ne 'off') {
-print <<END
-	<script type=3D"text/javascript" src=3D"/themes/ipfire/include/js/refreshIn=
etInfo.js"></script>
-END
-;
-}
-
-print <<END
-	</head>
-	<body>
-		<div id=3D"header" class=3D"fixed">
-			<div id=3D"logo">
-				<h1>
-					<a href=3D"https://www.ipfire.org">
-						IPFire_
-					</a>
-END
-;
-	if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
-		print "&dash; $settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
-	}
-
-print <<END
-				</h1>
-			</div>
-		</div>
-END
-;
-
-unless($suppressMenu) {
-	&genmenu();
-	&showmenu();
-}
-
-print <<END
-	<div class=3D"bigbox fixed">
-		<div id=3D"main_inner" class=3D"fixed">
-			<div id=3D"main_header">
-				<h1>$title</h1>
-END
-;
-
-# Print user manual link
-my $manual_url =3D &Header::get_manualpage_url();
-if($manual_url) {
-	print <<END
-				<span><a href=3D"$manual_url" title=3D"$Lang::tr{'online help en'}" targ=
et=3D"_blank"><img src=3D"/images/help-browser.png" alt=3D"$Lang::tr{'online =
help en'}"></a></span>
-END
-;
-}
-
-print <<END
-			</div>
-END
-;
-}
-
-############################################################################=
###
-#
-# print page opening html layout without menu
-# @param page title
-# @param boh
-# @param extra html code for html head section
-sub openpagewithoutmenu {
-	openpage(shift,shift,shift,1);
-	return;
-}
-
-############################################################################=
###
-#
-# print page closing html layout
-
-sub closepage () {
-	open(FILE, "</etc/system-release");
-	my $system_release =3D <FILE>;
-	$system_release =3D~ s/core/$Lang::tr{'core update'} /;
-	close(FILE);
-
-print <<END;
-		</div>
-	</div>
-
-	<div id=3D"footer" class=3D'bigbox fixed'>
-		<span class=3D"pull-right">
-			<a href=3D"https://www.ipfire.org/" target=3D"_blank"><strong>IPFire.org<=
/strong></a> &bull;
-			<a href=3D"https://www.ipfire.org/donate" target=3D"_blank">$Lang::tr{'su=
pport donation'}</a>
-		</span>
-
-		<strong>$system_release</strong>
-	</div>
-</body>
-</html>
-END
-;
-}
-
-############################################################################=
###
-#
-# print big box opening html layout
-sub openbigbox {
-}
-
-############################################################################=
###
-#
-# print big box closing html layout
-sub closebigbox {
-}
-
-############################################################################=
###
-#
-# print box opening html layout
-# @param page width
-# @param page align
-# @param page caption
-sub openbox {
-	$width =3D $_[0];
-	$align =3D $_[1];
-	$caption =3D $_[2];
-
-	if($align eq 'center') {
-		print "<div class=3D'post' align=3D'center'>\n"
-	}
-	else {
-		print "<div class=3D'post'>\n";
-	}
-
-	if ($caption) {
-		print "<h2>$caption</h2>\n";
-	}
-}
-
-############################################################################=
###
-#
-# print box closing html layout
-sub closebox {
-	print "</div>";
-}
diff --git a/src/initscripts/networking/functions.network b/src/initscripts/n=
etworking/functions.network
index 4c7ad51d47..e134d0cce4 100644
--- a/src/initscripts/networking/functions.network
+++ b/src/initscripts/networking/functions.network
@@ -19,12 +19,153 @@
 #                                                                           =
  #
 ############################################################################=
###
=20
-. /etc/sysconfig/rc
-. $rc_functions
-
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
=20
+ip2bin() {
+	local address=3D"${1}"
+
+	local IFS=3D'.'
+	local octet
+
+	local n=3D0
+
+	for octet in ${address}; do
+		# Shift n
+		(( n <<=3D 8 ))
+
+		# Apply the octet
+		(( n |=3D octet ))
+	done
+
+	echo "${n}"
+}
+
+bin2ip() {
+	local n=3D"${1}"
+
+	local IFS=3D'.'
+	local address=3D()
+
+	for i in {3..0}; do
+		address+=3D( $(( n >> (8 * i) & 0xff )) )
+	done
+
+	echo "${address[*]}"
+}
+
+network_get_address() {
+	local network=3D"${1}"
+
+	# Return everything before the slash
+	echo "${network%%/*}"
+}
+
+network_get_prefix() {
+	local network=3D"${1}"
+
+	# Consider everything after the / the prefix
+	local prefix=3D"${network##*/}"
+
+	# If the prefix is valid, return it
+	if network_prefix_is_valid "${prefix}"; then
+		echo "${prefix}"
+
+	# Otherwise it might be a subnet mask
+	else
+		network_netmask_to_prefix "${prefix}"
+	fi
+}
+
+network_get_netmask() {
+	local network=3D"${1}"
+
+	# Consider everything after the / the netmask
+	local netmask=3D"${network##*/}"
+
+	# If we have a prefix, we need to convert
+	if network_prefix_is_valid "${netmask}"; then
+		network_prefix_to_netmask "${netmask}"
+
+	# Otherwise return what we got
+	else
+		echo "${netmask}"
+	fi
+}
+
+network_prefix_is_valid() {
+	local prefix=3D"${1}"
+
+	# The prefix must be numbers only
+	if ! [[ "${prefix}" =3D~ ^[0-9]+$ ]]; then
+		return 1
+	fi
+
+	# Must be a number between 0 and 32 (inclusive)
+	[ "${prefix}" -ge 0 -a "${prefix}" -le 32 ]
+}
+
+network_prefix_to_netmask() {
+	local prefix=3D"${1}"
+
+	# Set n with all bits set
+	local n=3D0xffffffff
+
+	# Shift
+	(( n <<=3D (32 - prefix) ))
+
+	# Convert back
+	bin2ip "${n}"
+}
+
+network_netmask_to_prefix() {
+	local netmask=3D"${1}"
+
+	local prefix=3D0
+
+	# Convert to binary
+	local n=3D"$(ip2bin "${netmask}")"
+
+	while [ "${n}" -gt 0 ]; do
+		# If the highest bit is not set, we are done
+		[ "$(( n & (1 << 31) ))" -eq 0 ] && break
+
+		# Increment prefix & shift n
+		(( prefix++ ))
+		(( n <<=3D 1 ))
+	done
+
+	echo "${prefix}"
+}
+
+network_address_in_network() {
+	local address=3D"${1}"
+	local network=3D"${2}"
+
+	# Split the network into its address & mask
+	local netaddr=3D"$(network_get_address "${network}")"
+	local netmask=3D"$(network_get_netmask "${network}")"
+
+	# Abort if we could not parse the network
+	if [ -z "${netaddr}" -o -z "${netmask}" ]; then
+		return 1
+	fi
+
+	# Convert everything to binary
+	address=3D"$(ip2bin "${address}")"
+	netaddr=3D"$(ip2bin "${netaddr}")"
+	netmask=3D"$(ip2bin "${netmask}")"
+
+	# Ensure the network address is the first address
+	(( netaddr &=3D netmask ))
+
+	# Compute broadcast
+	local broadcast=3D$(( netaddr | (~netmask & 0xffffffff) ))
+
+	# Return true if address is in the network
+	[ "${address}" -ge "${netaddr}" -a "${address}" -le "${broadcast}" ]
+}
+
 dhcpcd_get_pid() {
 		# This function returns the pid of a dhcpcd by a given
 		# network device, if a pidfile exists.
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index beb665e5f4..34ee8cc581 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -402,19 +402,10 @@ case "${1}" in
 				AUTH=3D""
 			fi
=20
-			### Dial On Demand
-			#
-			if [ "${RECONNECTION}" !=3D "persistent" ]; then
-				if [ "${TIMEOUT}" !=3D "0" ] && [ "${TIMEOUT}" !=3D "" ]; then
-					SECONDS=3D$[${TIMEOUT} * 60]
-				else
-					SECONDS=3D300
-				fi
-				if [ "${RECONNECTION}" =3D=3D "dialondemand" ]; then
-					touch /var/ipfire/red/dial-on-demand
-					DEMAND=3D"demand persist idle ${SECONDS} 10.112.112.112:10.112.112.113"
-					DEMAND+=3D" ipcp-accept-remote ipcp-accept-local noipdefault ktune"
-				fi
+			if [ "${TIMEOUT}" !=3D "0" ] && [ "${TIMEOUT}" !=3D "" ]; then
+				SECONDS=3D$[${TIMEOUT} * 60]
+			else
+				SECONDS=3D300
 			fi
=20
 			if [ "$TYPE" =3D=3D "pppoe" ]; then
diff --git a/src/initscripts/system/connectd b/src/initscripts/system/connectd
index 5ab1861089..d956c2847a 100644
--- a/src/initscripts/system/connectd
+++ b/src/initscripts/system/connectd
@@ -36,10 +36,6 @@ if [ ! $HOLDOFF ]; then
 	HOLDOFF=3D30
 fi
=20
-if [ "$RECONNECTION" =3D "dialondemand" ]; then
-	exit 0
-fi
-
 msg_log () {
 	logger -t $(basename $0)[$$] $*
 }
diff --git a/src/initscripts/system/functions b/src/initscripts/system/functi=
ons
index b610143ab1..1fa256e80b 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -512,7 +512,7 @@ loadproc()
 		esac
 	fi
=20
-	local cmd=3D"${@}"
+	local cmd=3D( "${@}" )
=20
 	if [ -n "${nicelevel}" ]; then
 		cmd=3D"nice -n "${nicelevel}" ${cmd}"
@@ -520,13 +520,12 @@ loadproc()
=20
 	if [ -n "${background}" ]; then
 		(
-			${cmd} &>/dev/null
+			${cmd[@]} &>/dev/null
 		) &
 		pid=3D"$!"
 		evaluate_retval
 	else
-		${cmd}
-		pid=3D"$!"
+		${cmd[@]}
 		evaluate_retval # This is "Probably" not LSB compliant, but required to be=
 compatible with older bootscripts
 	fi
=20


hooks/post-receive
--
IPFire 2.x development tree

--===============8908308380894829993==--