diff --git a/3.0/lib/net.pm b/3.0/lib/net.pm
index d5abeea..b1357c7 100644
--- a/3.0/lib/net.pm
+++ b/3.0/lib/net.pm
@@ -20,7 +20,7 @@
 
 package net;
 
-#use strict;
+use strict;
 use warnings;
 use Monitorix;
 use RRDs;
@@ -157,13 +157,12 @@ sub net_update {
 		$net_error_in[$n] = 0;
 		$net_error_out[$n] = 0;
 		if($n < scalar(my @nl = split(',', $net->{list}))) {
+			$nl[$n] = trim($nl[$n]);
 			if($config->{os} eq "Linux") {
 				open(IN, "/proc/net/dev");
-				my $dev;
 				while(<IN>) {
-					($dev, $data) = split(':', $_);
-					$_ = $dev;
-					if(/$nl[$n]/) {
+					my ($dev, $data) = split(':', $_);
+					if($dev =~ /$nl[$n]/) {
 						($net_bytes_in[$n], $net_packs_in[$n], $net_error_in[$n], undef, undef, undef, undef, undef, $net_bytes_out[$n], $net_packs_out[$n], $net_error_out[$n]) = split(' ', $data);
 						last;
 					}
@@ -213,4 +212,438 @@ sub net_update {
 	logger("ERROR: while updating $rrd: $err") if $err;
 }
 
+sub net_cgi {
+	my ($package, $config, $cgi) = @_;
+
+	my $net = $config->{net};
+	my @rigid = split(',', $net->{rigid});
+	my @limit = split(',', $net->{limit});
+	my $tf = $cgi->{tf};
+	my $colors = $cgi->{colors};
+	my $graph = $cgi->{graph};
+	my $silent = $cgi->{silent};
+
+	my $u = "";
+	my $width;
+	my $height;
+	my @riglim;
+	my $netname;
+	my @tmp;
+	my @tmpz;
+	my @CDEF;
+	my $T = "B";
+	my $vlabel = "bytes/s";
+	my $n;
+	my $str;
+	my $err;
+
+	my $rrd = $config->{base_lib} . $package . ".rrd";
+	my $title = $config->{graph_title}->{$package};
+	my $PNG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir};
+
+	$title = !$silent ? $title : "";
+
+	if(lc($config->{netstats_in_bps}) eq "y") {
+		$T = "b";
+		$vlabel = "bits/s";
+	}
+
+
+	# text mode
+	#
+	if(lc($config->{iface_mode}) eq "text") {
+		if($title) {
+			main::graph_header($title, 2);
+			print("    <tr>\n");
+			print("    <td bgcolor='$colors->{title_bg_color}'>\n");
+		}
+		my (undef, undef, undef, $data) = RRDs::fetch("$rrd",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"AVERAGE",
+			"-r $tf->{res}");
+		$err = RRDs::error;
+		print("ERROR: while fetching $rrd: $err\n") if $err;
+		print("    <pre style='font-size: 12px; color: $colors->{fg_color}';>\n");
+		print("       ");
+		for($n = 0; $n < scalar(my @nl = split(',', $net->{list})); $n++) {
+			$nl[$n] = trim($nl[$n]);
+			my $nd = trim((split(',', $net->{desc}->{$nl[$n]}))[0]);
+			print(trim($nl[$n]) . " ($nd)                          ");
+		}
+		print("\nTime");
+		for($n = 0; $n < scalar(my @nl = split(',', $net->{list})); $n++) {
+			print("   K$T/s_I  K$T/s_O  Pk/s_I  Pk/s_O  Er/s_I  Er/s_O");
+		}
+		print(" \n----");
+		for($n = 0; $n < scalar(my @nl = split(',', $net->{list})); $n++) {
+			print("-------------------------------------------------");
+		}
+		print " \n";
+		my $line;
+		my @row;
+		my $time;
+		my $n2;
+		my $from;
+		my $to;
+		for($n = 0, $time = $tf->{tb}; $n < ($tf->{tb} * $tf->{ts}); $n++) {
+			$line = @$data[$n];
+			$time = $time - (1 / $tf->{ts});
+			printf(" %2d$tf->{tc}", $time);
+			for($n2 = 0; $n2 < scalar(my @nl = split(',', $net->{list})); $n2++) {
+				$from = $n2 * 6;
+				$to = $from + 6;
+				my ($ki, $ko, $pi, $po, $ei, $eo) = @$line[$from..$to];
+				$ki /= 1024;
+				$ko /= 1024;
+				$pi /= 1024;
+				$po /= 1024;
+				$ei /= 1024;
+				$eo /= 1024;
+				if(lc($config->{netstats_in_bps}) eq "y") {
+					$ki *= 8;
+					$ko *= 8;
+				}
+				@row = ($ki, $ko, $pi, $po, $ei, $eo);
+				printf("   %6d  %6d  %6d  %6d  %6d  %6d", @row);
+			}
+			print(" \n");
+		}
+		print("    </pre>\n");
+		if($title) {
+			print("    </td>\n");
+			print("    </tr>\n");
+			main::graph_footer();
+		}
+		print("  <br>\n");
+		return;
+	}
+
+
+	# graph mode
+	#
+	if($silent eq "yes" || $silent eq "imagetag") {
+		$colors->{fg_color} = "#000000";  # visible color for text mode
+		$u = "_";
+	}
+	if($silent eq "imagetagbig") {
+		$colors->{fg_color} = "#000000";  # visible color for text mode
+		$u = "";
+	}
+
+	my $PNG1;
+	my $PNG2;
+	my $PNG3;
+	my $PNG1z;
+	my $PNG2z;
+	my $PNG3z;
+	for($n = 0; $n < scalar(my @nl = split(',', $net->{list})); $n++) {
+		$PNG1 = $u . $package . $n . "1." . $tf->{when} . ".png";
+		$PNG2 = $u . $package . $n . "2." . $tf->{when} . ".png";
+		$PNG3 = $u . $package . $n . "3." . $tf->{when} . ".png";
+		unlink("$PNG_DIR" . $PNG1);
+		unlink("$PNG_DIR" . $PNG2);
+		unlink("$PNG_DIR" . $PNG3);
+		if(lc($config->{enable_zoom}) eq "y") {
+			$PNG1z = $u . $package . $n . "1z." . $tf->{when} . ".png";
+			$PNG2z = $u . $package . $n . "2z." . $tf->{when} . ".png";
+			$PNG3z = $u . $package . $n . "3z." . $tf->{when} . ".png";
+			unlink("$PNG_DIR" . $PNG1z);
+			unlink("$PNG_DIR" . $PNG2z);
+			unlink("$PNG_DIR" . $PNG3z);
+		}
+
+		$nl[$n] = trim($nl[$n]);
+		my $nd = trim((split(',', $net->{desc}->{$nl[$n]}))[0]);
+
+		if($title) {
+			if($n) {
+				print("    <br>\n");
+			}
+			main::graph_header($nl[$n] . " " . $title, 2);
+			print("    <tr>\n");
+			print("    <td bgcolor='$colors->{title_bg_color}'>\n");
+		}
+
+		undef(@riglim);
+		if(trim($rigid[0]) eq 1) {
+			push(@riglim, "--upper-limit=" . trim($limit[0]));
+		} else {
+			if(trim($rigid[0]) eq 2) {
+				push(@riglim, "--upper-limit=" . trim($limit[0]));
+				push(@riglim, "--rigid");
+			}
+		}
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "AREA:B_in#44EE44:K$T/s Input");
+		push(@tmp, "GPRINT:K_in:LAST:     Current\\: %5.0lf");
+		push(@tmp, "GPRINT:K_in:AVERAGE: Average\\: %5.0lf");
+		push(@tmp, "GPRINT:K_in:MIN:    Min\\: %5.0lf");
+		push(@tmp, "GPRINT:K_in:MAX:    Max\\: %5.0lf\\n");
+		push(@tmp, "AREA:B_out#4444EE:K$T/s Output");
+		push(@tmp, "GPRINT:K_out:LAST:    Current\\: %5.0lf");
+		push(@tmp, "GPRINT:K_out:AVERAGE: Average\\: %5.0lf");
+		push(@tmp, "GPRINT:K_out:MIN:    Min\\: %5.0lf");
+		push(@tmp, "GPRINT:K_out:MAX:    Max\\: %5.0lf\\n");
+		push(@tmp, "AREA:B_out#4444EE:");
+		push(@tmp, "AREA:B_in#44EE44:");
+		push(@tmp, "LINE1:B_out#0000EE");
+		push(@tmp, "LINE1:B_in#00EE00");
+		push(@tmpz, "AREA:B_in#44EE44:Input");
+		push(@tmpz, "AREA:B_out#4444EE:Output");
+		push(@tmpz, "AREA:B_out#4444EE:");
+		push(@tmpz, "AREA:B_in#44EE44:");
+		push(@tmpz, "LINE1:B_out#0000EE");
+		push(@tmpz, "LINE1:B_in#00EE00");
+		if(lc($config->{netstats_in_bps}) eq "y") {
+			push(@CDEF, "CDEF:B_in=in,8,*");
+			push(@CDEF, "CDEF:B_out=out,8,*");
+		} else {
+			push(@CDEF, "CDEF:B_in=in");
+			push(@CDEF, "CDEF:B_out=out");
+		}
+		($width, $height) = split('x', $config->{graph_size}->{main});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+		}
+		RRDs::graph("$PNG_DIR" . "$PNG1",
+			"--title=$nl[$n] $nd  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=PNG",
+			"--vertical-label=$vlabel",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			"--lower-limit=0",
+			@{$cgi->{version12}},
+			@{$colors->{graph_colors}},
+			"DEF:in=$rrd:net" . $n . "_bytes_in:AVERAGE",
+			"DEF:out=$rrd:net" . $n . "_bytes_out:AVERAGE",
+			@CDEF,
+			"CDEF:K_in=B_in,1024,/",
+			"CDEF:K_out=B_out,1024,/",
+			"COMMENT: \\n",
+			@tmp,
+			"COMMENT: \\n",
+			"COMMENT: \\n",
+			);
+		$err = RRDs::error;
+		print("ERROR: while graphing $PNG_DIR" . "$PNG1: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			RRDs::graph("$PNG_DIR" . "$PNG1z",
+				"--title=$nl[$n] $nd  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=PNG",
+				"--vertical-label=$vlabel",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				"--lower-limit=0",
+				@{$cgi->{version12}},
+				@{$colors->{graph_colors}},
+				"DEF:in=$rrd:net" . $n . "_bytes_in:AVERAGE",
+				"DEF:out=$rrd:net" . $n . "_bytes_out:AVERAGE",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $PNG_DIR" . "$PNG1z: $err\n") if $err;
+		}
+		$netname="net" . $n . "1";
+		if($title || ($silent =~ /imagetag/ && $graph =~ /$netname/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . $config->{imgs_dir} . $PNG1z . "\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG1 . "' border='0'></a>\n");
+				}
+				else {
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . $config->{imgs_dir} . $PNG1z . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG1 . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . $config->{imgs_dir} . $PNG1 . "'>\n");
+			}
+		}
+		if($title) {
+			print("    </td>\n");
+			print("    <td valign='top' bgcolor='" . $colors->{title_bg_color} . "'>\n");
+		}
+
+		undef(@riglim);
+		if(trim($rigid[1]) eq 1) {
+			push(@riglim, "--upper-limit=" . trim($limit[1]));
+		} else {
+			if(trim($rigid[1]) eq 2) {
+				push(@riglim, "--upper-limit=" . trim($limit[1]));
+				push(@riglim, "--rigid");
+			}
+		}
+		undef(@tmp);
+		undef(@tmpz);
+		push(@tmp, "AREA:p_in#44EE44:Input");
+		push(@tmp, "AREA:p_out#4444EE:Output");
+		push(@tmp, "AREA:p_out#4444EE:");
+		push(@tmp, "AREA:p_in#44EE44:");
+		push(@tmp, "LINE1:p_out#0000EE");
+		push(@tmp, "LINE1:p_in#00EE00");
+		push(@tmpz, "AREA:p_in#44EE44:Input");
+		push(@tmpz, "AREA:p_out#4444EE:Output");
+		push(@tmpz, "AREA:p_out#4444EE:");
+		push(@tmpz, "AREA:p_in#44EE44:");
+		push(@tmpz, "LINE1:p_out#0000EE");
+		push(@tmpz, "LINE1:p_in#00EE00");
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		RRDs::graph("$PNG_DIR" . "$PNG2",
+			"--title=$nl[$n] $config->{graphs}->{_net2}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=PNG",
+			"--vertical-label=Packets/s",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			"--lower-limit=0",
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:p_in=$rrd:net" . $n . "_packs_in:AVERAGE",
+			"DEF:p_out=$rrd:net" . $n . "_packs_out:AVERAGE",
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $PNG_DIR" . "$PNG2: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			RRDs::graph("$PNG_DIR" . "$PNG2z",
+				"--title=$nl[$n] $config->{graphs}->{_net2}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=PNG",
+				"--vertical-label=Packets/s",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				"--lower-limit=0",
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:p_in=$rrd:net" . $n . "_packs_in:AVERAGE",
+				"DEF:p_out=$rrd:net" . $n . "_packs_out:AVERAGE",
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $PNG_DIR" . "$PNG2z: $err\n") if $err;
+		}
+		$netname="net" . $n . "2";
+		if($title || ($silent =~ /imagetag/ && $graph =~ /$netname/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . $config->{imgs_dir} . $PNG2z . "\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG2 . "' border='0'></a>\n");
+				}
+				else {
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . $config->{imgs_dir} . $PNG2z . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG2 . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . $config->{imgs_dir} . $PNG2 . "'>\n");
+			}
+		}
+
+		undef(@riglim);
+		if(trim($rigid[2]) eq 1) {
+			push(@riglim, "--upper-limit=" . trim($limit[2]));
+		} else {
+			if(trim($rigid[2]) eq 2) {
+				push(@riglim, "--upper-limit=" . trim($limit[2]));
+				push(@riglim, "--rigid");
+			}
+		}
+		undef(@tmp);
+		undef(@tmpz);
+		push(@tmp, "AREA:e_in#44EE44:Input");
+		push(@tmp, "AREA:e_out#4444EE:Output");
+		push(@tmp, "AREA:e_out#4444EE:");
+		push(@tmp, "AREA:e_in#44EE44:");
+		push(@tmp, "LINE1:e_out#0000EE");
+		push(@tmp, "LINE1:e_in#00EE00");
+		push(@tmpz, "AREA:e_in#44EE44:Input");
+		push(@tmpz, "AREA:e_out#4444EE:Output");
+		push(@tmpz, "AREA:e_out#4444EE:");
+		push(@tmpz, "AREA:e_in#44EE44:");
+		push(@tmpz, "LINE1:e_out#0000EE");
+		push(@tmpz, "LINE1:e_in#00EE00");
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		RRDs::graph("$PNG_DIR" . "$PNG3",
+			"--title=$nl[$n] $config->{graphs}->{_net3}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=PNG",
+			"--vertical-label=Errors/s",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			"--lower-limit=0",
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:e_in=$rrd:net" . $n . "_error_in:AVERAGE",
+			"DEF:e_out=$rrd:net" . $n . "_error_out:AVERAGE",
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $PNG_DIR" . "$PNG3: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			RRDs::graph("$PNG_DIR" . "$PNG3z",
+				"--title=$nl[$n] $config->{graphs}->{_net3}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=PNG",
+				"--vertical-label=Errors/s",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				"--lower-limit=0",
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:e_in=$rrd:net" . $n . "_error_in:AVERAGE",
+				"DEF:e_out=$rrd:net" . $n . "_error_out:AVERAGE",
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $PNG_DIR" . "$PNG3z: $err\n") if $err;
+		}
+		$netname="net" . $n . "3";
+		if($title || ($silent =~ /imagetag/ && $graph =~ /$netname/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . $config->{imgs_dir} . $PNG3z . "\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG3 . "' border='0'></a>\n");
+				}
+				else {
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . $config->{imgs_dir} . $PNG3z . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG3 . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . $config->{imgs_dir} . $PNG3 . "'>\n");
+			}
+		}
+
+		if($title) {
+			print("    </td>\n");
+			print("    </tr>\n");
+			main::graph_footer();
+		}
+	}
+	print("  <br>\n");
+	return;
+}
 1;