diff --git a/html/includes/graphs/bill/auth.inc.php b/html/includes/graphs/bill/auth.inc.php
index fd44cf32c..948594745 100644
--- a/html/includes/graphs/bill/auth.inc.php
+++ b/html/includes/graphs/bill/auth.inc.php
@@ -2,7 +2,7 @@
 
 ### Authorises bill viewing and sets $ports as reference to mysql query containing ports for this bill
 
-if(is_numeric($_GET['id']) && ($config['allow_unauth_graphs'] || bill_permitted($_GET['id'])))
+if (is_numeric($_GET['id']) && ($config['allow_unauth_graphs'] || bill_permitted($_GET['id'])))
 {
 
   $ports = mysql_query("SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D
@@ -10,7 +10,6 @@ if(is_numeric($_GET['id']) && ($config['allow_unauth_graphs'] || bill_permitted(
                         AND D.device_id = P.device_id");
 
   $auth = TRUE;
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/bill/bits.inc.php b/html/includes/graphs/bill/bits.inc.php
index 200adde33..add5a4313 100644
--- a/html/includes/graphs/bill/bits.inc.php
+++ b/html/includes/graphs/bill/bits.inc.php
@@ -2,25 +2,28 @@
 
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
 
-$i=0;
-while($port = mysql_fetch_array($ports)) {
-  if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"))) {
+$i = 0;
+
+while ($port = mysql_fetch_array($ports))
+{
+  if (is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd")))
+  {
     $rrd_list[$i]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
     $rrd_list[$i]['descr'] = $port['ifDescr'];
     $i++;
   }
 }
 
-$units='bps'; 
-$total_units='B'; 
-$colours_in='greens'; 
-$multiplier = "8"; 
+$units='bps';
+$total_units='B';
+$colours_in='greens';
+$multiplier = "8";
 $colours_out = 'blues';
 
 $nototal = 1;
 $rra_in  = "INOCTETS";
 $rra_out = "OUTOCTETS";
 
-include ("includes/graphs/generic_multi_bits_separated.inc.php");
+include("includes/graphs/generic_multi_bits_separated.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/customer/auth.inc.php b/html/includes/graphs/customer/auth.inc.php
index 9485aab9c..ad7705237 100755
--- a/html/includes/graphs/customer/auth.inc.php
+++ b/html/includes/graphs/customer/auth.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-if ($_SESSION['userlevel'] >= "5" || $config['allow_unauth_graphs']) 
+if ($_SESSION['userlevel'] >= "5" || $config['allow_unauth_graphs'])
 {
   $id = mres($_GET['id']);
   $title = generate_device_link($device);
   $auth = TRUE;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/customer/bits.inc.php b/html/includes/graphs/customer/bits.inc.php
index 51521d63a..ed3b3a51a 100644
--- a/html/includes/graphs/customer/bits.inc.php
+++ b/html/includes/graphs/customer/bits.inc.php
@@ -3,20 +3,22 @@
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
 
 $query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = '".mres($_GET['id'])."' AND D.device_id = I.device_id");
-while($int = mysql_fetch_array($query)) {
-  if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd"))) {
+while ($int = mysql_fetch_array($query))
+{
+  if (is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd")))
+  {
     $rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
   }
 }
 
 $rra_in  = "INOCTETS";
-$rra_out = "OUTOCTETS"; 
+$rra_out = "OUTOCTETS";
 
 $colour_line_in = "006600";
 $colour_line_out = "000099";
 $colour_area_in = "CDEB8B";
 $colour_area_out = "C3D9FF";
 
-include ("includes/graphs/generic_multi_bits.inc.php");
+include("includes/graphs/generic_multi_bits.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/auth.inc.php b/html/includes/graphs/device/auth.inc.php
index f176c97bf..461a774f3 100644
--- a/html/includes/graphs/device/auth.inc.php
+++ b/html/includes/graphs/device/auth.inc.php
@@ -7,4 +7,4 @@ if (is_numeric($id) && ($config['allow_unauth_graphs'] || device_permitted($id))
   $auth = TRUE;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/bits.inc.php b/html/includes/graphs/device/bits.inc.php
index 0363233a9..2e62145bb 100644
--- a/html/includes/graphs/device/bits.inc.php
+++ b/html/includes/graphs/device/bits.inc.php
@@ -45,6 +45,6 @@ $colour_line_out = "000099";
 $colour_area_in = "CDEB8B";
 $colour_area_out = "C3D9FF";
 
-include ("includes/graphs/generic_multi_bits.inc.php");
+include("includes/graphs/generic_multi_bits.inc.php");
 
 ?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/cipsec_flow_bits.inc.php b/html/includes/graphs/device/cipsec_flow_bits.inc.php
index af1fb91bd..ee37c5f1c 100644
--- a/html/includes/graphs/device/cipsec_flow_bits.inc.php
+++ b/html/includes/graphs/device/cipsec_flow_bits.inc.php
@@ -7,4 +7,4 @@ $rra_out = "OutOctets";
 
 include("includes/graphs/generic_bits.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/cipsec_flow_pkts.inc.php b/html/includes/graphs/device/cipsec_flow_pkts.inc.php
index 624a9653c..56bfc018f 100644
--- a/html/includes/graphs/device/cipsec_flow_pkts.inc.php
+++ b/html/includes/graphs/device/cipsec_flow_pkts.inc.php
@@ -18,4 +18,4 @@ $unit_text = "Pkts   ";
 
 include("includes/graphs/generic_duplex.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/cipsec_flow_stats.inc.php b/html/includes/graphs/device/cipsec_flow_stats.inc.php
index 0005c5d84..f064c850d 100755
--- a/html/includes/graphs/device/cipsec_flow_stats.inc.php
+++ b/html/includes/graphs/device/cipsec_flow_stats.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-
 include("includes/graphs/common.inc.php");
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cipsec_flow.rrd";
@@ -39,8 +38,6 @@ $rrd_list[$i]['descr'] = "OutDrops";
 $rrd_list[$i]['rra'] = "OutDrops";
 $rra_list[$i]['invert'] = "1";
 
-
-
 $i++;
 $rrd_list[$i]['filename'] = $rrd_filename;
 $rrd_list[$i]['descr'] = "InAuthFail";
@@ -74,7 +71,6 @@ $rrd_list[$i]['filename'] = $rrd_filename;
 $rrd_list[$i]['descr'] = "SysCapFails";
 $rrd_list[$i]['rra'] = "SysCapFails";
 
-
 #$units='%';
 #$total_units='%';
 $colours='mixed';
@@ -84,7 +80,6 @@ $scale_min = "0";
 
 $nototal = 1;
 
-include ("includes/graphs/generic_multi_line.inc.php");
+include("includes/graphs/generic_multi_line.inc.php");
 
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/cipsec_flow_tunnels.inc.php b/html/includes/graphs/device/cipsec_flow_tunnels.inc.php
index 0b51d5e0d..932993e12 100644
--- a/html/includes/graphs/device/cipsec_flow_tunnels.inc.php
+++ b/html/includes/graphs/device/cipsec_flow_tunnels.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-
 include("includes/graphs/common.inc.php");
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cipsec_flow.rrd";
@@ -18,6 +17,4 @@ $unit_text = "Active Tunnels";
 
 include("includes/graphs/generic_simplex.inc.php");
 
-
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/cras_sessions.inc.php b/html/includes/graphs/device/cras_sessions.inc.php
index a31fcacf7..b7332d5cd 100644
--- a/html/includes/graphs/device/cras_sessions.inc.php
+++ b/html/includes/graphs/device/cras_sessions.inc.php
@@ -2,49 +2,49 @@
 
 $scale_min = "0";
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cras_sessions.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cras_sessions.rrd";
 
-  $rrd_options .= " DEF:email=$rrd_filename:email:AVERAGE";
-  $rrd_options .= " DEF:ipsec=$rrd_filename:ipsec:AVERAGE";
-  $rrd_options .= " DEF:l2l=$rrd_filename:l2l:AVERAGE";
-  $rrd_options .= " DEF:lb=$rrd_filename:lb:AVERAGE";
-  $rrd_options .= " DEF:svc=$rrd_filename:svc:AVERAGE";
-  $rrd_options .= " DEF:webvpn=$rrd_filename:webvpn:AVERAGE";
-  $rrd_options .= " CDEF:webvpn_only=webvpn,svc,-";
+$rrd_options .= " DEF:email=$rrd_filename:email:AVERAGE";
+$rrd_options .= " DEF:ipsec=$rrd_filename:ipsec:AVERAGE";
+$rrd_options .= " DEF:l2l=$rrd_filename:l2l:AVERAGE";
+$rrd_options .= " DEF:lb=$rrd_filename:lb:AVERAGE";
+$rrd_options .= " DEF:svc=$rrd_filename:svc:AVERAGE";
+$rrd_options .= " DEF:webvpn=$rrd_filename:webvpn:AVERAGE";
+$rrd_options .= " CDEF:webvpn_only=webvpn,svc,-";
 
-  $rrd_options .= " COMMENT:'Sessions         Current    Average   Maximum\\n'";
+$rrd_options .= " COMMENT:'Sessions         Current    Average   Maximum\\n'";
 
-  $rrd_options .= " AREA:svc#aa0000:'SSLVPN Tunnels':STACK";
-  $rrd_options .= " GPRINT:svc:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:svc:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:svc:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " AREA:svc#aa0000:'SSLVPN Tunnels':STACK";
+$rrd_options .= " GPRINT:svc:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:svc:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:svc:MAX:\ %6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:webvpn_only#999999:'Clientless VPN':STACK";
-  $rrd_options .= " GPRINT:webvpn_only:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:webvpn_only:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:webvpn_only:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " AREA:webvpn_only#999999:'Clientless VPN':STACK";
+$rrd_options .= " GPRINT:webvpn_only:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:webvpn_only:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:webvpn_only:MAX:\ %6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:ipsec#00aa00:'IPSEC         ':STACK";
-  $rrd_options .= " GPRINT:ipsec:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipsec:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipsec:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " AREA:ipsec#00aa00:'IPSEC         ':STACK";
+$rrd_options .= " GPRINT:ipsec:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipsec:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipsec:MAX:\ %6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:l2l#aaaa00:'Lan-to-Lan    ':STACK";
-  $rrd_options .= " GPRINT:l2l:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:l2l:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:l2l:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " AREA:l2l#aaaa00:'Lan-to-Lan    ':STACK";
+$rrd_options .= " GPRINT:l2l:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:l2l:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:l2l:MAX:\ %6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:email#0000aa:'Email         ':STACK";
-  $rrd_options .= " GPRINT:email:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:email:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:email:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " AREA:email#0000aa:'Email         ':STACK";
+$rrd_options .= " GPRINT:email:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:email:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:email:MAX:\ %6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:lb#aa00aa:'Load Balancer ':STACK";
-  $rrd_options .= " GPRINT:lb:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:lb:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:lb:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " AREA:lb#aa00aa:'Load Balancer ':STACK";
+$rrd_options .= " GPRINT:lb:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:lb:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:lb:MAX:\ %6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/diskio.inc.php b/html/includes/graphs/device/diskio.inc.php
index 8c195c124..6fb4fa419 100644
--- a/html/includes/graphs/device/diskio.inc.php
+++ b/html/includes/graphs/device/diskio.inc.php
@@ -2,4 +2,4 @@
 
 include("diskio_ops.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/fdb_count.inc.php b/html/includes/graphs/device/fdb_count.inc.php
index 2339d45bf..ce802b7e6 100755
--- a/html/includes/graphs/device/fdb_count.inc.php
+++ b/html/includes/graphs/device/fdb_count.inc.php
@@ -4,13 +4,13 @@ $scale_min = "0";
 
 include("includes/graphs/common.inc.php");
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/fdb_count.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/fdb_count.rrd";
 
-  $rrd_options .= " DEF:value=$rrd_filename:value:AVERAGE";
-  $rrd_options .= " COMMENT:'MACs      Current  Minimum  Maximum  Average\\n'";
-  $rrd_options .= " AREA:value#EEEEEE:value";
-  $rrd_options .= " LINE1.25:value#36393D:";
-  $rrd_options .= " GPRINT:value:LAST:%6.2lf\  GPRINT:value:AVERAGE:%6.2lf\ ";
-  $rrd_options .= " GPRINT:value:MAX:%6.2lf\  GPRINT:value:AVERAGE:%6.2lf\\\\n";
+$rrd_options .= " DEF:value=$rrd_filename:value:AVERAGE";
+$rrd_options .= " COMMENT:'MACs      Current  Minimum  Maximum  Average\\n'";
+$rrd_options .= " AREA:value#EEEEEE:value";
+$rrd_options .= " LINE1.25:value#36393D:";
+$rrd_options .= " GPRINT:value:LAST:%6.2lf\  GPRINT:value:AVERAGE:%6.2lf\ ";
+$rrd_options .= " GPRINT:value:MAX:%6.2lf\  GPRINT:value:AVERAGE:%6.2lf\\\\n";
 
 ?>
diff --git a/html/includes/graphs/device/hr_processes.inc.php b/html/includes/graphs/device/hr_processes.inc.php
index a6bef2ca5..c37b7e46f 100644
--- a/html/includes/graphs/device/hr_processes.inc.php
+++ b/html/includes/graphs/device/hr_processes.inc.php
@@ -17,4 +17,4 @@ $rrd_options .= " GPRINT:procs:AVERAGE:%6.2lf";
 $rrd_options .= " GPRINT:procs:MIN:%6.2lf";
 $rrd_options .= " GPRINT:procs:MAX:%6.2lf\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/hr_users.inc.php b/html/includes/graphs/device/hr_users.inc.php
index 8f2752715..dabec19e2 100644
--- a/html/includes/graphs/device/hr_users.inc.php
+++ b/html/includes/graphs/device/hr_users.inc.php
@@ -19,4 +19,4 @@ $rrd_options .= " GPRINT:users:AVERAGE:%6.2lf";
 $rrd_options .= " GPRINT:users:MIN:%6.2lf";
 $rrd_options .= " GPRINT:users_max:MAX:%6.2lf\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ipSystemStats.inc.php b/html/includes/graphs/device/ipSystemStats.inc.php
index 3eea55039..738da6bd1 100644
--- a/html/includes/graphs/device/ipSystemStats.inc.php
+++ b/html/includes/graphs/device/ipSystemStats.inc.php
@@ -1,89 +1,89 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  $rrd_filename_4 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
-  $rrd_filename_6 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
+$rrd_filename_4 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
+$rrd_filename_6 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
 
-  $rrd_options .= " DEF:InForwDatagrams_4=$rrd_filename_4:InForwDatagrams:AVERAGE";
-  $rrd_options .= " DEF:InDelivers_4=$rrd_filename_4:InDelivers:AVERAGE";
-  $rrd_options .= " DEF:InReceives_4=$rrd_filename_4:InReceives:AVERAGE";
-  $rrd_options .= " DEF:InDiscards_4=$rrd_filename_4:InDiscards:AVERAGE";
+$rrd_options .= " DEF:InForwDatagrams_4=$rrd_filename_4:InForwDatagrams:AVERAGE";
+$rrd_options .= " DEF:InDelivers_4=$rrd_filename_4:InDelivers:AVERAGE";
+$rrd_options .= " DEF:InReceives_4=$rrd_filename_4:InReceives:AVERAGE";
+$rrd_options .= " DEF:InDiscards_4=$rrd_filename_4:InDiscards:AVERAGE";
 
-  $rrd_options .= " DEF:OutForwDatagrams_4=$rrd_filename_4:OutForwDatagrams:AVERAGE";
-  $rrd_options .= " CDEF:OutForwDatagrams_4_n=OutForwDatagrams_4,-1,*";
-  $rrd_options .= " DEF:OutRequests_4=$rrd_filename_4:OutRequests:AVERAGE";
-  $rrd_options .= " CDEF:OutRequests_4_n=OutRequests_4,-1,*";
-  $rrd_options .= " DEF:OutDiscards_4=$rrd_filename_4:OutDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutDiscards_4_n=OutDiscards_4,-1,*";
-  $rrd_options .= " DEF:OutNoRoutes_4=$rrd_filename_4:InDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutNoRoutes_4_n=OutNoRoutes_4,-1,*";
+$rrd_options .= " DEF:OutForwDatagrams_4=$rrd_filename_4:OutForwDatagrams:AVERAGE";
+$rrd_options .= " CDEF:OutForwDatagrams_4_n=OutForwDatagrams_4,-1,*";
+$rrd_options .= " DEF:OutRequests_4=$rrd_filename_4:OutRequests:AVERAGE";
+$rrd_options .= " CDEF:OutRequests_4_n=OutRequests_4,-1,*";
+$rrd_options .= " DEF:OutDiscards_4=$rrd_filename_4:OutDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutDiscards_4_n=OutDiscards_4,-1,*";
+$rrd_options .= " DEF:OutNoRoutes_4=$rrd_filename_4:InDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutNoRoutes_4_n=OutNoRoutes_4,-1,*";
 
-  $rrd_options .= " DEF:InForwDatagrams_6=$rrd_filename_6:InForwDatagrams:AVERAGE";
-  $rrd_options .= " DEF:InDelivers_6=$rrd_filename_6:InDelivers:AVERAGE";
-  $rrd_options .= " DEF:InReceives_6=$rrd_filename_6:InReceives:AVERAGE";
-  $rrd_options .= " DEF:InDiscards_6=$rrd_filename_6:InDiscards:AVERAGE";
+$rrd_options .= " DEF:InForwDatagrams_6=$rrd_filename_6:InForwDatagrams:AVERAGE";
+$rrd_options .= " DEF:InDelivers_6=$rrd_filename_6:InDelivers:AVERAGE";
+$rrd_options .= " DEF:InReceives_6=$rrd_filename_6:InReceives:AVERAGE";
+$rrd_options .= " DEF:InDiscards_6=$rrd_filename_6:InDiscards:AVERAGE";
 
-  $rrd_options .= " DEF:OutForwDatagrams_6=$rrd_filename_6:OutForwDatagrams:AVERAGE";
-  $rrd_options .= " CDEF:OutForwDatagrams_6_n=OutForwDatagrams_6,-1,*";
-  $rrd_options .= " DEF:OutRequests_6=$rrd_filename_6:OutRequests:AVERAGE";
-  $rrd_options .= " CDEF:OutRequests_6_n=OutRequests_6,-1,*";
-  $rrd_options .= " DEF:OutDiscards_6=$rrd_filename_6:OutDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutDiscards_6_n=OutDiscards_6,-1,*";
-  $rrd_options .= " DEF:OutNoRoutes_6=$rrd_filename_6:InDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutNoRoutes_6_n=OutNoRoutes_6,-1,*";
+$rrd_options .= " DEF:OutForwDatagrams_6=$rrd_filename_6:OutForwDatagrams:AVERAGE";
+$rrd_options .= " CDEF:OutForwDatagrams_6_n=OutForwDatagrams_6,-1,*";
+$rrd_options .= " DEF:OutRequests_6=$rrd_filename_6:OutRequests:AVERAGE";
+$rrd_options .= " CDEF:OutRequests_6_n=OutRequests_6,-1,*";
+$rrd_options .= " DEF:OutDiscards_6=$rrd_filename_6:OutDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutDiscards_6_n=OutDiscards_6,-1,*";
+$rrd_options .= " DEF:OutNoRoutes_6=$rrd_filename_6:InDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutNoRoutes_6_n=OutNoRoutes_6,-1,*";
 
-  $rrd_options .= " COMMENT:'Packets/sec       Current  Average  Maximum\\n'";
+$rrd_options .= " COMMENT:'Packets/sec       Current  Average  Maximum\\n'";
 
-  $rrd_options .= " AREA:InReceives_4#CDEB8B:'InReceives   v4'";
-  $rrd_options .= " GPRINT:InReceives_4:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives_4:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives_4:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InReceives_4#CDEB8B:'InReceives   v4'";
+$rrd_options .= " GPRINT:InReceives_4:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives_4:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives_4:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:InReceives_6#8C9E5E:'             v6':STACK";
-  $rrd_options .= " GPRINT:InReceives_6:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives_6:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives_6:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InReceives_6#8C9E5E:'             v6':STACK";
+$rrd_options .= " GPRINT:InReceives_6:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives_6:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives_6:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutRequests_4_n#C3D9FF:'OutRequests  v4'";
-  $rrd_options .= " GPRINT:OutRequests_4:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests_4:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests_4:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutRequests_4_n#C3D9FF:'OutRequests  v4'";
+$rrd_options .= " GPRINT:OutRequests_4:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests_4:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests_4:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutRequests_6_n#8D9CB7:'             v6':STACK";
-  $rrd_options .= " GPRINT:OutRequests_6:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests_6:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests_6:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutRequests_6_n#8D9CB7:'             v6':STACK";
+$rrd_options .= " GPRINT:OutRequests_6:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests_6:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests_6:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:InForwDatagrams_4#AF63AF:'InForward    v4'";
-  $rrd_options .= " GPRINT:InForwDatagrams_4:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams_4:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams_4:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InForwDatagrams_4#AF63AF:'InForward    v4'";
+$rrd_options .= " GPRINT:InForwDatagrams_4:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams_4:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams_4:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:InForwDatagrams_6#3F003F:'             v6':STACK";
-  $rrd_options .= " GPRINT:InForwDatagrams_6:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams_6:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams_6:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InForwDatagrams_6#3F003F:'             v6':STACK";
+$rrd_options .= " GPRINT:InForwDatagrams_6:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams_6:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams_6:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutForwDatagrams_4#AF63AF:'OutForward   v4'";
-  $rrd_options .= " GPRINT:OutForwDatagrams_4:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams_4:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams_4:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutForwDatagrams_4#AF63AF:'OutForward   v4'";
+$rrd_options .= " GPRINT:OutForwDatagrams_4:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams_4:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams_4:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutForwDatagrams_6#3F003F:'             v6':STACK";
-  $rrd_options .= " GPRINT:OutForwDatagrams_6:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams_6:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams_6:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutForwDatagrams_6#3F003F:'             v6':STACK";
+$rrd_options .= " GPRINT:OutForwDatagrams_6:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams_6:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams_6:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " LINE1.25:InDelivers_4#00cc00:'InDelivers   v4'";
-  $rrd_options .= " GPRINT:InDelivers_4:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers_4:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers_4:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:InDelivers_4#00cc00:'InDelivers   v4'";
+$rrd_options .= " GPRINT:InDelivers_4:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers_4:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers_4:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " LINE1.25:InDelivers_6#3F003F:'             v6'";
-  $rrd_options .= " GPRINT:InDelivers_6:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers_6:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers_6:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:InDelivers_6#3F003F:'             v6'";
+$rrd_options .= " GPRINT:InDelivers_6:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers_6:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers_6:MAX:%6.2lf%s\\\\n";
 
 ?>
diff --git a/html/includes/graphs/device/ipsystemstats_ipv4.inc.php b/html/includes/graphs/device/ipsystemstats_ipv4.inc.php
index 480fd3845..d947b5973 100644
--- a/html/includes/graphs/device/ipsystemstats_ipv4.inc.php
+++ b/html/includes/graphs/device/ipsystemstats_ipv4.inc.php
@@ -1,53 +1,52 @@
 <?php
 
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
+$rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
+$rrd_options .= " DEF:InDelivers=$rrd_filename:InDelivers:AVERAGE";
+$rrd_options .= " DEF:InReceives=$rrd_filename:InReceives:AVERAGE";
+$rrd_options .= " DEF:InDiscards=$rrd_filename:InDiscards:AVERAGE";
 
-  $rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
-  $rrd_options .= " DEF:InDelivers=$rrd_filename:InDelivers:AVERAGE";
-  $rrd_options .= " DEF:InReceives=$rrd_filename:InReceives:AVERAGE";
-  $rrd_options .= " DEF:InDiscards=$rrd_filename:InDiscards:AVERAGE";
+$rrd_options .= " DEF:OutForwDatagrams=$rrd_filename:OutForwDatagrams:AVERAGE";
+$rrd_options .= " CDEF:OutForwDatagrams_n=OutForwDatagrams,-1,*";
+$rrd_options .= " DEF:OutRequests=$rrd_filename:OutRequests:AVERAGE";
+$rrd_options .= " CDEF:OutRequests_n=OutRequests,-1,*";
+$rrd_options .= " DEF:OutDiscards=$rrd_filename:OutDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutDiscards_n=OutDiscards,-1,*";
+$rrd_options .= " DEF:OutNoRoutes=$rrd_filename:InDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutNoRoutes_n=OutNoRoutes,-1,*";
 
-  $rrd_options .= " DEF:OutForwDatagrams=$rrd_filename:OutForwDatagrams:AVERAGE";
-  $rrd_options .= " CDEF:OutForwDatagrams_n=OutForwDatagrams,-1,*";
-  $rrd_options .= " DEF:OutRequests=$rrd_filename:OutRequests:AVERAGE";
-  $rrd_options .= " CDEF:OutRequests_n=OutRequests,-1,*";
-  $rrd_options .= " DEF:OutDiscards=$rrd_filename:OutDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutDiscards_n=OutDiscards,-1,*";
-  $rrd_options .= " DEF:OutNoRoutes=$rrd_filename:InDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutNoRoutes_n=OutNoRoutes,-1,*";
+$rrd_options .= " COMMENT:'Packets/sec       Current  Average  Maximum\\n'";
 
-  $rrd_options .= " COMMENT:'Packets/sec       Current  Average  Maximum\\n'";
+$rrd_options .= " LINE1.25:InReceives#7D9B5B:'InReceives   v4'";
+$rrd_options .= " GPRINT:InReceives:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " LINE1.25:InReceives#7D9B5B:'InReceives   v4'";
-  $rrd_options .= " GPRINT:InReceives:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InForwDatagrams#AF63AF:'InForward    v4'";
+$rrd_options .= " GPRINT:InForwDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:InForwDatagrams#AF63AF:'InForward    v4'";
-  $rrd_options .= " GPRINT:InForwDatagrams:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InDelivers#CDEB8B:'InDelivers   v4':STACK";
+$rrd_options .= " GPRINT:InDelivers:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:InDelivers#CDEB8B:'InDelivers   v4':STACK";
-  $rrd_options .= " GPRINT:InDelivers:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutRequests_n#C3D9FF:'OutRequests  v4'";
+$rrd_options .= " GPRINT:OutRequests:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutRequests_n#C3D9FF:'OutRequests  v4'";
-  $rrd_options .= " GPRINT:OutRequests:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutForwDatagrams#AF63AF:'OutForward   v4'";
+$rrd_options .= " GPRINT:OutForwDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutForwDatagrams#AF63AF:'OutForward   v4'";
-  $rrd_options .= " GPRINT:OutForwDatagrams:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:InReceives#9DaB6B:";
+$rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
 
-  $rrd_options .= " LINE1.25:InReceives#9DaB6B:";
-  $rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ipsystemstats_ipv6.inc.php b/html/includes/graphs/device/ipsystemstats_ipv6.inc.php
index 6e5d2714c..866f3d1da 100644
--- a/html/includes/graphs/device/ipsystemstats_ipv6.inc.php
+++ b/html/includes/graphs/device/ipsystemstats_ipv6.inc.php
@@ -1,53 +1,52 @@
 <?php
 
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
+$rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
+$rrd_options .= " DEF:InDelivers=$rrd_filename:InDelivers:AVERAGE";
+$rrd_options .= " DEF:InReceives=$rrd_filename:InReceives:AVERAGE";
+$rrd_options .= " DEF:InDiscards=$rrd_filename:InDiscards:AVERAGE";
 
-  $rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
-  $rrd_options .= " DEF:InDelivers=$rrd_filename:InDelivers:AVERAGE";
-  $rrd_options .= " DEF:InReceives=$rrd_filename:InReceives:AVERAGE";
-  $rrd_options .= " DEF:InDiscards=$rrd_filename:InDiscards:AVERAGE";
+$rrd_options .= " DEF:OutForwDatagrams=$rrd_filename:OutForwDatagrams:AVERAGE";
+$rrd_options .= " CDEF:OutForwDatagrams_n=OutForwDatagrams,-1,*";
+$rrd_options .= " DEF:OutRequests=$rrd_filename:OutRequests:AVERAGE";
+$rrd_options .= " CDEF:OutRequests_n=OutRequests,-1,*";
+$rrd_options .= " DEF:OutDiscards=$rrd_filename:OutDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutDiscards_n=OutDiscards,-1,*";
+$rrd_options .= " DEF:OutNoRoutes=$rrd_filename:InDiscards:AVERAGE";
+$rrd_options .= " CDEF:OutNoRoutes_n=OutNoRoutes,-1,*";
 
-  $rrd_options .= " DEF:OutForwDatagrams=$rrd_filename:OutForwDatagrams:AVERAGE";
-  $rrd_options .= " CDEF:OutForwDatagrams_n=OutForwDatagrams,-1,*";
-  $rrd_options .= " DEF:OutRequests=$rrd_filename:OutRequests:AVERAGE";
-  $rrd_options .= " CDEF:OutRequests_n=OutRequests,-1,*";
-  $rrd_options .= " DEF:OutDiscards=$rrd_filename:OutDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutDiscards_n=OutDiscards,-1,*";
-  $rrd_options .= " DEF:OutNoRoutes=$rrd_filename:InDiscards:AVERAGE";
-  $rrd_options .= " CDEF:OutNoRoutes_n=OutNoRoutes,-1,*";
+$rrd_options .= " COMMENT:'Packets/sec       Current  Average  Maximum\\n'";
 
-  $rrd_options .= " COMMENT:'Packets/sec       Current  Average  Maximum\\n'";
+$rrd_options .= " LINE1.25:InReceives#7D9B5B:'InReceives   v6'";
+$rrd_options .= " GPRINT:InReceives:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InReceives:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " LINE1.25:InReceives#7D9B5B:'InReceives   v6'";
-  $rrd_options .= " GPRINT:InReceives:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InReceives:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InForwDatagrams#AF63AF:'InForward    v6'";
+$rrd_options .= " GPRINT:InForwDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InForwDatagrams:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:InForwDatagrams#AF63AF:'InForward    v6'";
-  $rrd_options .= " GPRINT:InForwDatagrams:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InForwDatagrams:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:InDelivers#CDEB8B:'InDelivers   v6':STACK";
+$rrd_options .= " GPRINT:InDelivers:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:InDelivers:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:InDelivers#CDEB8B:'InDelivers   v6':STACK";
-  $rrd_options .= " GPRINT:InDelivers:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:InDelivers:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutRequests_n#C3D9FF:'OutRequests  v6'";
+$rrd_options .= " GPRINT:OutRequests:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutRequests:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutRequests_n#C3D9FF:'OutRequests  v6'";
-  $rrd_options .= " GPRINT:OutRequests:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutRequests:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " AREA:OutForwDatagrams#AF63AF:'OutForward   v6'";
+$rrd_options .= " GPRINT:OutForwDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
 
-  $rrd_options .= " AREA:OutForwDatagrams#AF63AF:'OutForward   v6'";
-  $rrd_options .= " GPRINT:OutForwDatagrams:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:InReceives#9DaB6B:";
+$rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
 
-  $rrd_options .= " LINE1.25:InReceives#9DaB6B:";
-  $rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ipsystemstats_ipv6_frag.inc.php b/html/includes/graphs/device/ipsystemstats_ipv6_frag.inc.php
index 700eceaa2..65c15dad9 100644
--- a/html/includes/graphs/device/ipsystemstats_ipv6_frag.inc.php
+++ b/html/includes/graphs/device/ipsystemstats_ipv6_frag.inc.php
@@ -61,4 +61,4 @@ $rrd_options .= " GPRINT:ReasmReqds:LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:ReasmReqds:AVERAGE:%6.2lf%s";
 $rrd_options .= " GPRINT:MReasmReqds:MAX:%6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/netstat_icmp.inc.php b/html/includes/graphs/device/netstat_icmp.inc.php
index 0c45f8e75..d56c9ea2e 100644
--- a/html/includes/graphs/device/netstat_icmp.inc.php
+++ b/html/includes/graphs/device/netstat_icmp.inc.php
@@ -1,51 +1,51 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
+include("includes/graphs/common.inc.php");
 
-  $device = device_by_id_cache($id);
+$device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-icmp.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-icmp.rrd";
 
-  $rrd_options .= " DEF:icmpInMsgs=$rrd_filename:icmpInMsgs:AVERAGE";
-  $rrd_options .= " DEF:icmpOutMsgs=$rrd_filename:icmpOutMsgs:AVERAGE";
-  $rrd_options .= " DEF:icmpInErrors=$rrd_filename:icmpInErrors:AVERAGE";
-  $rrd_options .= " DEF:icmpOutErrors=$rrd_filename:icmpOutErrors:AVERAGE";
-  $rrd_options .= " DEF:icmpInEchos=$rrd_filename:icmpInEchos:AVERAGE";
-  $rrd_options .= " DEF:icmpOutEchos=$rrd_filename:icmpOutEchos:AVERAGE";
-  $rrd_options .= " DEF:icmpInEchoReps=$rrd_filename:icmpInEchoReps:AVERAGE";
-  $rrd_options .= " DEF:icmpOutEchoReps=$rrd_filename:icmpOutEchoReps:AVERAGE";
-  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
-  $rrd_options .= " LINE1.25:icmpInMsgs#00cc00:InMsgs ";
-  $rrd_options .= " GPRINT:icmpInMsgs:LAST:\ \ \ \ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInMsgs:AVERAGE:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInMsgs:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:icmpOutMsgs#006600:OutMsgs    ";
-  $rrd_options .= " GPRINT:icmpOutMsgs:LAST:\ \ \ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutMsgs:AVERAGE:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutMsgs:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:icmpInErrors#cc0000:InErrors   ";
-  $rrd_options .= " GPRINT:icmpInErrors:LAST:\ \ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInErrors:AVERAGE:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInErrors:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:icmpOutErrors#660000:OutErrors  ";
-  $rrd_options .= " GPRINT:icmpOutErrors:LAST:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutErrors:AVERAGE:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutErrors:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:icmpInEchos#0066cc:InEchos    ";
-  $rrd_options .= " GPRINT:icmpInEchos:LAST:\ \ \ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInEchos:AVERAGE:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInEchos:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:icmpOutEchos#003399:OutEchos   ";
-  $rrd_options .= " GPRINT:icmpOutEchos:LAST:\ \ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutEchos:AVERAGE:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutEchos:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:icmpInEchoReps#cc00cc:InEchoReps ";
-  $rrd_options .= " GPRINT:icmpInEchoReps:LAST:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInEchoReps:AVERAGE:\ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpInEchoReps:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:icmpOutEchoReps#990099:OutEchoReps";
-  $rrd_options .= " GPRINT:icmpOutEchoReps:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutEchoReps:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:icmpOutEchoReps:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " DEF:icmpInMsgs=$rrd_filename:icmpInMsgs:AVERAGE";
+$rrd_options .= " DEF:icmpOutMsgs=$rrd_filename:icmpOutMsgs:AVERAGE";
+$rrd_options .= " DEF:icmpInErrors=$rrd_filename:icmpInErrors:AVERAGE";
+$rrd_options .= " DEF:icmpOutErrors=$rrd_filename:icmpOutErrors:AVERAGE";
+$rrd_options .= " DEF:icmpInEchos=$rrd_filename:icmpInEchos:AVERAGE";
+$rrd_options .= " DEF:icmpOutEchos=$rrd_filename:icmpOutEchos:AVERAGE";
+$rrd_options .= " DEF:icmpInEchoReps=$rrd_filename:icmpInEchoReps:AVERAGE";
+$rrd_options .= " DEF:icmpOutEchoReps=$rrd_filename:icmpOutEchoReps:AVERAGE";
+$rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
+$rrd_options .= " LINE1.25:icmpInMsgs#00cc00:InMsgs ";
+$rrd_options .= " GPRINT:icmpInMsgs:LAST:\ \ \ \ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInMsgs:AVERAGE:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInMsgs:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:icmpOutMsgs#006600:OutMsgs    ";
+$rrd_options .= " GPRINT:icmpOutMsgs:LAST:\ \ \ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutMsgs:AVERAGE:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutMsgs:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:icmpInErrors#cc0000:InErrors   ";
+$rrd_options .= " GPRINT:icmpInErrors:LAST:\ \ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInErrors:AVERAGE:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInErrors:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:icmpOutErrors#660000:OutErrors  ";
+$rrd_options .= " GPRINT:icmpOutErrors:LAST:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutErrors:AVERAGE:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutErrors:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:icmpInEchos#0066cc:InEchos    ";
+$rrd_options .= " GPRINT:icmpInEchos:LAST:\ \ \ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInEchos:AVERAGE:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInEchos:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:icmpOutEchos#003399:OutEchos   ";
+$rrd_options .= " GPRINT:icmpOutEchos:LAST:\ \ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutEchos:AVERAGE:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutEchos:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:icmpInEchoReps#cc00cc:InEchoReps ";
+$rrd_options .= " GPRINT:icmpInEchoReps:LAST:\ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInEchoReps:AVERAGE:\ \ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpInEchoReps:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:icmpOutEchoReps#990099:OutEchoReps";
+$rrd_options .= " GPRINT:icmpOutEchoReps:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutEchoReps:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:icmpOutEchoReps:MAX:\ %6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/netstat_icmp_info.inc.php b/html/includes/graphs/device/netstat_icmp_info.inc.php
index 0d5a0b6d3..2daa34a19 100644
--- a/html/includes/graphs/device/netstat_icmp_info.inc.php
+++ b/html/includes/graphs/device/netstat_icmp_info.inc.php
@@ -66,4 +66,4 @@ $rrd_options .= " GPRINT:OutAddrMaskReps:LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:OutAddrMaskReps:AVERAGE:%6.2lf%s";
 $rrd_options .= " GPRINT:OutAddrMaskReps_m:MAX:%6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/netstat_ip.inc.php b/html/includes/graphs/device/netstat_ip.inc.php
index 98ea5fec6..ac45c088e 100644
--- a/html/includes/graphs/device/netstat_ip.inc.php
+++ b/html/includes/graphs/device/netstat_ip.inc.php
@@ -1,45 +1,45 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
 
-  $rrd_options .= " DEF:ipForwDatagrams=$rrd_filename:ipForwDatagrams:AVERAGE";
-  $rrd_options .= " DEF:ipInDelivers=$rrd_filename:ipInDelivers:AVERAGE";
-  $rrd_options .= " DEF:ipInReceives=$rrd_filename:ipInReceives:AVERAGE";
-  $rrd_options .= " DEF:ipOutRequests=$rrd_filename:ipOutRequests:AVERAGE";
-  $rrd_options .= " DEF:ipInDiscards=$rrd_filename:ipInDiscards:AVERAGE";
-  $rrd_options .= " DEF:ipOutDiscards=$rrd_filename:ipOutDiscards:AVERAGE";
-  $rrd_options .= " DEF:ipOutNoRoutes=$rrd_filename:ipInDiscards:AVERAGE";
-  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ Average\ \ \ Maximum\\\\n";
-  $rrd_options .= " LINE1.25:ipForwDatagrams#cc0000:ForwDgrams\ ";
-  $rrd_options .= " GPRINT:ipForwDatagrams:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipForwDatagrams:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipForwDatagrams:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:ipInDelivers#00cc00:InDelivers\ ";
-  $rrd_options .= " GPRINT:ipInDelivers:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipInDelivers:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipInDelivers:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:ipInReceives#006600:InReceives\ ";
-  $rrd_options .= " GPRINT:ipInReceives:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipInReceives:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipInReceives:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:ipOutRequests#0000cc:OutRequests";
-  $rrd_options .= " GPRINT:ipOutRequests:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipOutRequests:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipOutRequests:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:ipInDiscards#cccc00:InDiscards\ ";
-  $rrd_options .= " GPRINT:ipInDiscards:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipInDiscards:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipInDiscards:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:ipOutDiscards#330033:OutDiscards";
-  $rrd_options .= " GPRINT:ipOutDiscards:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipOutDiscards:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipOutDiscards:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:ipOutNoRoutes#660000:OutNoRoutes";
-  $rrd_options .= " GPRINT:ipOutNoRoutes:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:ipOutNoRoutes:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:ipOutNoRoutes:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " DEF:ipForwDatagrams=$rrd_filename:ipForwDatagrams:AVERAGE";
+$rrd_options .= " DEF:ipInDelivers=$rrd_filename:ipInDelivers:AVERAGE";
+$rrd_options .= " DEF:ipInReceives=$rrd_filename:ipInReceives:AVERAGE";
+$rrd_options .= " DEF:ipOutRequests=$rrd_filename:ipOutRequests:AVERAGE";
+$rrd_options .= " DEF:ipInDiscards=$rrd_filename:ipInDiscards:AVERAGE";
+$rrd_options .= " DEF:ipOutDiscards=$rrd_filename:ipOutDiscards:AVERAGE";
+$rrd_options .= " DEF:ipOutNoRoutes=$rrd_filename:ipInDiscards:AVERAGE";
+$rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ Average\ \ \ Maximum\\\\n";
+$rrd_options .= " LINE1.25:ipForwDatagrams#cc0000:ForwDgrams\ ";
+$rrd_options .= " GPRINT:ipForwDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipForwDatagrams:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipForwDatagrams:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:ipInDelivers#00cc00:InDelivers\ ";
+$rrd_options .= " GPRINT:ipInDelivers:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipInDelivers:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipInDelivers:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:ipInReceives#006600:InReceives\ ";
+$rrd_options .= " GPRINT:ipInReceives:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipInReceives:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipInReceives:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:ipOutRequests#0000cc:OutRequests";
+$rrd_options .= " GPRINT:ipOutRequests:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipOutRequests:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipOutRequests:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:ipInDiscards#cccc00:InDiscards\ ";
+$rrd_options .= " GPRINT:ipInDiscards:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipInDiscards:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipInDiscards:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:ipOutDiscards#330033:OutDiscards";
+$rrd_options .= " GPRINT:ipOutDiscards:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipOutDiscards:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipOutDiscards:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:ipOutNoRoutes#660000:OutNoRoutes";
+$rrd_options .= " GPRINT:ipOutNoRoutes:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:ipOutNoRoutes:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:ipOutNoRoutes:MAX:\ %6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/netstat_ip_frag.inc.php b/html/includes/graphs/device/netstat_ip_frag.inc.php
index aded7e452..7a2e629f3 100644
--- a/html/includes/graphs/device/netstat_ip_frag.inc.php
+++ b/html/includes/graphs/device/netstat_ip_frag.inc.php
@@ -63,4 +63,4 @@ $rrd_options .= " GPRINT:ReasmReqds:LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:ReasmReqds:AVERAGE:%6.2lf%s";
 $rrd_options .= " GPRINT:MReasmReqds:MAX:%6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/netstat_snmp.inc.php b/html/includes/graphs/device/netstat_snmp.inc.php
index 01bbf79d9..ea8d4005c 100644
--- a/html/includes/graphs/device/netstat_snmp.inc.php
+++ b/html/includes/graphs/device/netstat_snmp.inc.php
@@ -1,49 +1,49 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
+include("includes/graphs/common.inc.php");
 
-  $device = device_by_id_cache($id);
+$device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
 
-  $rrd_options .= " DEF:snmpInTraps=$rrd_filename:snmpInTraps:AVERAGE";
-  $rrd_options .= " DEF:snmpOutTraps=$rrd_filename:snmpOutTraps:AVERAGE";
-  $rrd_options .= " DEF:snmpInTotalReqVars=$rrd_filename:snmpInTotalReqVars:AVERAGE";
-  $rrd_options .= " DEF:snmpInTotalSetVars=$rrd_filename:snmpInTotalSetVars:AVERAGE";
-  $rrd_options .= " DEF:snmpOutGetResponses=$rrd_filename:snmpOutGetResponses:AVERAGE";
-  $rrd_options .= " DEF:snmpOutSetRequests=$rrd_filename:snmpOutSetRequests:AVERAGE";
+$rrd_options .= " DEF:snmpInTraps=$rrd_filename:snmpInTraps:AVERAGE";
+$rrd_options .= " DEF:snmpOutTraps=$rrd_filename:snmpOutTraps:AVERAGE";
+$rrd_options .= " DEF:snmpInTotalReqVars=$rrd_filename:snmpInTotalReqVars:AVERAGE";
+$rrd_options .= " DEF:snmpInTotalSetVars=$rrd_filename:snmpInTotalSetVars:AVERAGE";
+$rrd_options .= " DEF:snmpOutGetResponses=$rrd_filename:snmpOutGetResponses:AVERAGE";
+$rrd_options .= " DEF:snmpOutSetRequests=$rrd_filename:snmpOutSetRequests:AVERAGE";
 
-  $rrd_options .= " DEF:snmpInTraps_max=$rrd_filename:snmpInTraps:MAX";
-  $rrd_options .= " DEF:snmpOutTraps_max=$rrd_filename:snmpOutTraps:MAX";
-  $rrd_options .= " DEF:snmpInTotalReqVars_max=$rrd_filename:snmpInTotalReqVars:MAX";
-  $rrd_options .= " DEF:snmpInTotalSetVars_max=$rrd_filename:snmpInTotalSetVars:MAX";
-  $rrd_options .= " DEF:snmpOutGetResponses_max=$rrd_filename:snmpOutGetResponses:MAX";
-  $rrd_options .= " DEF:snmpOutSetRequests_max=$rrd_filename:snmpOutSetRequests:MAX";
+$rrd_options .= " DEF:snmpInTraps_max=$rrd_filename:snmpInTraps:MAX";
+$rrd_options .= " DEF:snmpOutTraps_max=$rrd_filename:snmpOutTraps:MAX";
+$rrd_options .= " DEF:snmpInTotalReqVars_max=$rrd_filename:snmpInTotalReqVars:MAX";
+$rrd_options .= " DEF:snmpInTotalSetVars_max=$rrd_filename:snmpInTotalSetVars:MAX";
+$rrd_options .= " DEF:snmpOutGetResponses_max=$rrd_filename:snmpOutGetResponses:MAX";
+$rrd_options .= " DEF:snmpOutSetRequests_max=$rrd_filename:snmpOutSetRequests:MAX";
 
-  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ \ \ \ \ Current\ \ Average\ \ Maximum\\\\n";
-  $rrd_options .= " LINE1.25:snmpInTraps#00cc00:InTraps ";
-  $rrd_options .= " GPRINT:snmpInTraps:LAST:\ \ \ \ \ \ \ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInTraps:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInTraps_max:MAX:%6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:snmpOutTraps#006600:OutTraps    ";
-  $rrd_options .= " GPRINT:snmpOutTraps:LAST:\ \ \ \ \ \ \ %6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutTraps:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutTraps_max:MAX:%6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:snmpInTotalReqVars#cc0000:InTotalReqVars   ";
-  $rrd_options .= " GPRINT:snmpInTotalReqVars:LAST:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInTotalReqVars:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInTotalReqVars_max:MAX:%6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:snmpInTotalSetVars#660000:InTotalSetVars  ";
-  $rrd_options .= " GPRINT:snmpInTotalSetVars:LAST:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInTotalSetVars:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInTotalSetVars_max:MAX:%6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:snmpOutGetResponses#0066cc:OutGetResponses    ";
-  $rrd_options .= " GPRINT:snmpOutGetResponses:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutGetResponses:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutGetResponses_max:MAX:%6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:snmpOutSetRequests#003399:OutSetResponses   ";
-  $rrd_options .= " GPRINT:snmpOutSetRequests:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutSetRequests:AVERAGE:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutSetRequests_max:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " COMMENT:Packets/sec\ \ \ \ \ \ \ \ Current\ \ Average\ \ Maximum\\\\n";
+$rrd_options .= " LINE1.25:snmpInTraps#00cc00:InTraps ";
+$rrd_options .= " GPRINT:snmpInTraps:LAST:\ \ \ \ \ \ \ \ %6.2lf%s";
+$rrd_options .= " GPRINT:snmpInTraps:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpInTraps_max:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:snmpOutTraps#006600:OutTraps    ";
+$rrd_options .= " GPRINT:snmpOutTraps:LAST:\ \ \ \ \ \ \ %6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutTraps:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutTraps_max:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:snmpInTotalReqVars#cc0000:InTotalReqVars   ";
+$rrd_options .= " GPRINT:snmpInTotalReqVars:LAST:\ %6.2lf%s";
+$rrd_options .= " GPRINT:snmpInTotalReqVars:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpInTotalReqVars_max:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:snmpInTotalSetVars#660000:InTotalSetVars  ";
+$rrd_options .= " GPRINT:snmpInTotalSetVars:LAST:\ %6.2lf%s";
+$rrd_options .= " GPRINT:snmpInTotalSetVars:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpInTotalSetVars_max:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:snmpOutGetResponses#0066cc:OutGetResponses    ";
+$rrd_options .= " GPRINT:snmpOutGetResponses:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutGetResponses:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutGetResponses_max:MAX:%6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:snmpOutSetRequests#003399:OutSetResponses   ";
+$rrd_options .= " GPRINT:snmpOutSetRequests:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutSetRequests:AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutSetRequests_max:MAX:%6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/netstat_snmp_pkt.inc.php b/html/includes/graphs/device/netstat_snmp_pkt.inc.php
index 808db2fec..8bd91dc9a 100644
--- a/html/includes/graphs/device/netstat_snmp_pkt.inc.php
+++ b/html/includes/graphs/device/netstat_snmp_pkt.inc.php
@@ -1,25 +1,25 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
 
-  $rrd_options .= " DEF:snmpInPkts=$rrd_filename:snmpInPkts:AVERAGE";
-  $rrd_options .= " DEF:snmpInPkts_max=$rrd_filename:snmpInPkts:MAX";
-  $rrd_options .= " DEF:snmpOutPkts=$rrd_filename:snmpOutPkts:AVERAGE";
-  $rrd_options .= " DEF:snmpOutPkts_max=$rrd_filename:snmpOutPkts:MAX";
-  $rrd_options .= " CDEF:snmpOutPkts_max_neg=snmpOutPkts_max,-1,*";
-  $rrd_options .= " CDEF:snmpOutPkts_neg=snmpOutPkts,-1,*";
-  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
-  $rrd_options .= " LINE1.25:snmpInPkts#009900:snmpInPkts\ \ ";
-  $rrd_options .= " GPRINT:snmpInPkts:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInPkts:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:snmpInPkts_max:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:snmpOutPkts_neg#003399:snmpOutPkts\ ";
-  #$rrd_options .= " AREA:snmpOutPkts_max_neg#4466AA::";
-  $rrd_options .= " GPRINT:snmpOutPkts:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutPkts:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:snmpOutPkts_max:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " DEF:snmpInPkts=$rrd_filename:snmpInPkts:AVERAGE";
+$rrd_options .= " DEF:snmpInPkts_max=$rrd_filename:snmpInPkts:MAX";
+$rrd_options .= " DEF:snmpOutPkts=$rrd_filename:snmpOutPkts:AVERAGE";
+$rrd_options .= " DEF:snmpOutPkts_max=$rrd_filename:snmpOutPkts:MAX";
+$rrd_options .= " CDEF:snmpOutPkts_max_neg=snmpOutPkts_max,-1,*";
+$rrd_options .= " CDEF:snmpOutPkts_neg=snmpOutPkts,-1,*";
+$rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
+$rrd_options .= " LINE1.25:snmpInPkts#009900:snmpInPkts\ \ ";
+$rrd_options .= " GPRINT:snmpInPkts:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpInPkts:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:snmpInPkts_max:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:snmpOutPkts_neg#003399:snmpOutPkts\ ";
+#$rrd_options .= " AREA:snmpOutPkts_max_neg#4466AA::";
+$rrd_options .= " GPRINT:snmpOutPkts:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutPkts:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:snmpOutPkts_max:MAX:\ %6.2lf%s\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/netstat_tcp.inc.php b/html/includes/graphs/device/netstat_tcp.inc.php
index c6e07a7a1..0a617afaf 100644
--- a/html/includes/graphs/device/netstat_tcp.inc.php
+++ b/html/includes/graphs/device/netstat_tcp.inc.php
@@ -1,45 +1,45 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-tcp.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-tcp.rrd";
 
-  $rrd_options .= " DEF:tcpActiveOpens=$rrd_filename:tcpActiveOpens:AVERAGE";
-  $rrd_options .= " DEF:tcpPassiveOpens=$rrd_filename:tcpPassiveOpens:AVERAGE";
-  $rrd_options .= " DEF:tcpAttemptFails=$rrd_filename:tcpAttemptFails:AVERAGE";
-  $rrd_options .= " DEF:tcpEstabResets=$rrd_filename:tcpEstabResets:AVERAGE";
-  $rrd_options .= " DEF:tcpInSegs=$rrd_filename:tcpInSegs:AVERAGE";
-  $rrd_options .= " DEF:tcpOutSegs=$rrd_filename:tcpOutSegs:AVERAGE";
-  $rrd_options .= " DEF:tcpRetransSegs=$rrd_filename:tcpRetransSegs:AVERAGE";
-  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
-  $rrd_options .= " LINE1.25:tcpActiveOpens#00cc00:ActiveOpens\ ";
-  $rrd_options .= " GPRINT:tcpActiveOpens:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:tcpActiveOpens:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:tcpActiveOpens:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:tcpPassiveOpens#006600:PassiveOpens";
-  $rrd_options .= " GPRINT:tcpPassiveOpens:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:tcpPassiveOpens:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:tcpPassiveOpens:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:tcpAttemptFails#cc0000:AttemptFails";
-  $rrd_options .= " GPRINT:tcpAttemptFails:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:tcpAttemptFails:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:tcpAttemptFails:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:tcpEstabResets#660000:EstabResets\ ";
-  $rrd_options .= " GPRINT:tcpEstabResets:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:tcpEstabResets:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:tcpEstabResets:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:tcpInSegs#0066cc:InSegs\ \ \ \ \ \ ";
-  $rrd_options .= " GPRINT:tcpInSegs:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:tcpInSegs:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:tcpInSegs:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:tcpOutSegs#003399:OutSegs\ \ \ \ \ ";
-  $rrd_options .= " GPRINT:tcpOutSegs:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:tcpOutSegs:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:tcpOutSegs:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:tcpRetransSegs#cc00cc:RetransSegs\ ";
-  $rrd_options .= " GPRINT:tcpRetransSegs:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:tcpRetransSegs:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:tcpRetransSegs:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " DEF:tcpActiveOpens=$rrd_filename:tcpActiveOpens:AVERAGE";
+$rrd_options .= " DEF:tcpPassiveOpens=$rrd_filename:tcpPassiveOpens:AVERAGE";
+$rrd_options .= " DEF:tcpAttemptFails=$rrd_filename:tcpAttemptFails:AVERAGE";
+$rrd_options .= " DEF:tcpEstabResets=$rrd_filename:tcpEstabResets:AVERAGE";
+$rrd_options .= " DEF:tcpInSegs=$rrd_filename:tcpInSegs:AVERAGE";
+$rrd_options .= " DEF:tcpOutSegs=$rrd_filename:tcpOutSegs:AVERAGE";
+$rrd_options .= " DEF:tcpRetransSegs=$rrd_filename:tcpRetransSegs:AVERAGE";
+$rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
+$rrd_options .= " LINE1.25:tcpActiveOpens#00cc00:ActiveOpens\ ";
+$rrd_options .= " GPRINT:tcpActiveOpens:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:tcpActiveOpens:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:tcpActiveOpens:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:tcpPassiveOpens#006600:PassiveOpens";
+$rrd_options .= " GPRINT:tcpPassiveOpens:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:tcpPassiveOpens:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:tcpPassiveOpens:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:tcpAttemptFails#cc0000:AttemptFails";
+$rrd_options .= " GPRINT:tcpAttemptFails:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:tcpAttemptFails:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:tcpAttemptFails:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:tcpEstabResets#660000:EstabResets\ ";
+$rrd_options .= " GPRINT:tcpEstabResets:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:tcpEstabResets:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:tcpEstabResets:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:tcpInSegs#0066cc:InSegs\ \ \ \ \ \ ";
+$rrd_options .= " GPRINT:tcpInSegs:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:tcpInSegs:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:tcpInSegs:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:tcpOutSegs#003399:OutSegs\ \ \ \ \ ";
+$rrd_options .= " GPRINT:tcpOutSegs:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:tcpOutSegs:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:tcpOutSegs:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:tcpRetransSegs#cc00cc:RetransSegs\ ";
+$rrd_options .= " GPRINT:tcpRetransSegs:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:tcpRetransSegs:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:tcpRetransSegs:MAX:\ %6.2lf%s\\\\n";
 
 ?>
diff --git a/html/includes/graphs/device/netstat_udp.inc.php b/html/includes/graphs/device/netstat_udp.inc.php
index 7b955aa4c..47eacca45 100644
--- a/html/includes/graphs/device/netstat_udp.inc.php
+++ b/html/includes/graphs/device/netstat_udp.inc.php
@@ -1,31 +1,31 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
-  $device = device_by_id_cache($id);
+include("includes/graphs/common.inc.php");
+$device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-udp.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-udp.rrd";
 
-  $rrd_options .= " DEF:udpInDatagrams=$rrd_filename:udpInDatagrams:AVERAGE";
-  $rrd_options .= " DEF:udpOutDatagrams=$rrd_filename:udpOutDatagrams:AVERAGE";
-  $rrd_options .= " DEF:udpInErrors=$rrd_filename:udpInErrors:AVERAGE";
-  $rrd_options .= " DEF:udpNoPorts=$rrd_filename:udpNoPorts:AVERAGE";
-  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
-  $rrd_options .= " LINE1.25:udpInDatagrams#00cc00:InDatagrams\ ";
-  $rrd_options .= " GPRINT:udpInDatagrams:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:udpInDatagrams:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:udpInDatagrams:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:udpOutDatagrams#006600:OutDatagrams";
-  $rrd_options .= " GPRINT:udpOutDatagrams:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:udpOutDatagrams:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:udpOutDatagrams:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:udpInErrors#cc0000:InErrors\ \ \ \ ";
-  $rrd_options .= " GPRINT:udpInErrors:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:udpInErrors:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:udpInErrors:MAX:\ %6.2lf%s\\\\n";
-  $rrd_options .= " LINE1.25:udpNoPorts#660000:NoPorts\ \ \ \ \ ";
-  $rrd_options .= " GPRINT:udpNoPorts:LAST:%6.2lf%s";
-  $rrd_options .= " GPRINT:udpNoPorts:AVERAGE:\ %6.2lf%s";
-  $rrd_options .= " GPRINT:udpNoPorts:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " DEF:udpInDatagrams=$rrd_filename:udpInDatagrams:AVERAGE";
+$rrd_options .= " DEF:udpOutDatagrams=$rrd_filename:udpOutDatagrams:AVERAGE";
+$rrd_options .= " DEF:udpInErrors=$rrd_filename:udpInErrors:AVERAGE";
+$rrd_options .= " DEF:udpNoPorts=$rrd_filename:udpNoPorts:AVERAGE";
+$rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
+$rrd_options .= " LINE1.25:udpInDatagrams#00cc00:InDatagrams\ ";
+$rrd_options .= " GPRINT:udpInDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:udpInDatagrams:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:udpInDatagrams:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:udpOutDatagrams#006600:OutDatagrams";
+$rrd_options .= " GPRINT:udpOutDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:udpOutDatagrams:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:udpOutDatagrams:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:udpInErrors#cc0000:InErrors\ \ \ \ ";
+$rrd_options .= " GPRINT:udpInErrors:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:udpInErrors:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:udpInErrors:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE1.25:udpNoPorts#660000:NoPorts\ \ \ \ \ ";
+$rrd_options .= " GPRINT:udpNoPorts:LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:udpNoPorts:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " GPRINT:udpNoPorts:MAX:\ %6.2lf%s\\\\n";
 
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/processors.inc.php b/html/includes/graphs/device/processors.inc.php
index 1f0947c2c..e05cdbb7c 100644
--- a/html/includes/graphs/device/processors.inc.php
+++ b/html/includes/graphs/device/processors.inc.php
@@ -22,8 +22,8 @@ while ($proc = mysql_fetch_array($query))
 
 $unit_text = "Load %";
 
-$units ='%';
-$total_units ='%';
+$units = '%';
+$total_units = '%';
 $colours ='mixed';
 
 $scale_min = "0";
@@ -31,6 +31,6 @@ $scale_max = "100";
 
 $nototal = 1;
 
-include ("includes/graphs/generic_multi_line.inc.php");
+include("includes/graphs/generic_multi_line.inc.php");
 
 ?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/screenos_sessions.inc.php b/html/includes/graphs/device/screenos_sessions.inc.php
index bd4d6a4f4..04fe44ac5 100644
--- a/html/includes/graphs/device/screenos_sessions.inc.php
+++ b/html/includes/graphs/device/screenos_sessions.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-
 #$device = device_by_id_cache($id);
 
 include("includes/graphs/common.inc.php");
@@ -19,7 +18,6 @@ $rrd_list[2]['filename'] = $file;
 $rrd_list[2]['descr'] = "Failed";
 $rrd_list[2]['rra'] = "failed";
 
-
 if ($_GET['debug']) { print_r($rrd_list); } 
 
 $colours   = "mixed";
@@ -27,9 +25,6 @@ $nototal   = 1;
 $unit_text = "Sessions";
 $scale_min = "0";
 
+include("includes/graphs/generic_multi_line.inc.php");
 
-include ("includes/graphs/generic_multi_line.inc.php");
-
-
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/storage.inc.php b/html/includes/graphs/device/storage.inc.php
index 95bdcaba1..da66037f0 100644
--- a/html/includes/graphs/device/storage.inc.php
+++ b/html/includes/graphs/device/storage.inc.php
@@ -10,12 +10,13 @@ $device = device_by_id_cache($id);
 $iter = "1";
 $sql = mysql_query("SELECT * FROM storage where device_id = '$id'");
 $rrd_options .= " COMMENT:'                    Size      Used    %age\\l'";
+
 while ($storage = mysql_fetch_array($sql))
 {
   if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
   elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
   elseif ($iter=="7") { $colour="FF0084"; $iter = "0"; }
- 
+
   $descr = substr(str_pad($storage[storage_descr], 12),0,12);
   $descr = str_replace(":","\:",$descr);
   $rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("storage-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
diff --git a/html/includes/graphs/device/temperatures.inc.php b/html/includes/graphs/device/temperatures.inc.php
index 008b8ae5e..53803541a 100644
--- a/html/includes/graphs/device/temperatures.inc.php
+++ b/html/includes/graphs/device/temperatures.inc.php
@@ -48,4 +48,4 @@ while ($temperature = mysql_fetch_array($sql))
   $iter++;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ucd_contexts.inc.php b/html/includes/graphs/device/ucd_contexts.inc.php
index 2930cbade..482a5e379 100755
--- a/html/includes/graphs/device/ucd_contexts.inc.php
+++ b/html/includes/graphs/device/ucd_contexts.inc.php
@@ -17,4 +17,4 @@ $unit_text = "Switches/s";
 
 include("includes/graphs/generic_simplex.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ucd_cpu.inc.php b/html/includes/graphs/device/ucd_cpu.inc.php
index 6a61c3037..d894f090c 100644
--- a/html/includes/graphs/device/ucd_cpu.inc.php
+++ b/html/includes/graphs/device/ucd_cpu.inc.php
@@ -1,32 +1,32 @@
 <?php
 
-  include("includes/graphs/common.inc.php");
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . "ucd_cpu.rrd";
-  $rrd_options .= " DEF:user=$rrd_filename:user:AVERAGE";
-  $rrd_options .= " DEF:nice=$rrd_filename:nice:AVERAGE";
-  $rrd_options .= " DEF:system=$rrd_filename:system:AVERAGE";
-  $rrd_options .= " DEF:idle=$rrd_filename:idle:AVERAGE";
-  $rrd_options .= " CDEF:total=user,nice,system,idle,+,+,+";
-  $rrd_options .= " CDEF:user_perc=user,total,/,100,*";
-  $rrd_options .= " CDEF:nice_perc=nice,total,/,100,*";
-  $rrd_options .= " CDEF:system_perc=system,total,/,100,*";
-  $rrd_options .= " CDEF:idle_perc=idle,total,/,100,*";
-  $rrd_options .= " COMMENT:Usage\ \ \ \ \ \ \ Current\ \ \ \ \ Average\ \ \ \ Maximum\\\\n";
-  $rrd_options .= " AREA:user_perc#c02020:user";
-  $rrd_options .= " GPRINT:user_perc:LAST:\ \ \ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:user_perc:AVERAGE:\ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:user_perc:MAX:\ \ \ %5.2lf%%\\\\n";
-  $rrd_options .= " AREA:nice_perc#008f00:nice:STACK";
-  $rrd_options .= " GPRINT:nice_perc:LAST:\ \ \ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:nice_perc:AVERAGE:\ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:nice_perc:MAX:\ \ \ %5.2lf%%\\\\n";
-  $rrd_options .= " AREA:system_perc#ea8f00:system:STACK";
-  $rrd_options .= " GPRINT:system_perc:LAST:\ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:system_perc:AVERAGE:\ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:system_perc:MAX:\ \ \ %5.2lf%%\\\\n";
-  $rrd_options .= " AREA:idle_perc#f5f5e5:idle:STACK";
-  $rrd_options .= " GPRINT:idle_perc:LAST:\ \ \ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:idle_perc:AVERAGE:\ \ \ %5.2lf%%";
-  $rrd_options .= " GPRINT:idle_perc:MAX:\ \ \ %5.2lf%%\\\\n";
+include("includes/graphs/common.inc.php");
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . "ucd_cpu.rrd";
+$rrd_options .= " DEF:user=$rrd_filename:user:AVERAGE";
+$rrd_options .= " DEF:nice=$rrd_filename:nice:AVERAGE";
+$rrd_options .= " DEF:system=$rrd_filename:system:AVERAGE";
+$rrd_options .= " DEF:idle=$rrd_filename:idle:AVERAGE";
+$rrd_options .= " CDEF:total=user,nice,system,idle,+,+,+";
+$rrd_options .= " CDEF:user_perc=user,total,/,100,*";
+$rrd_options .= " CDEF:nice_perc=nice,total,/,100,*";
+$rrd_options .= " CDEF:system_perc=system,total,/,100,*";
+$rrd_options .= " CDEF:idle_perc=idle,total,/,100,*";
+$rrd_options .= " COMMENT:Usage\ \ \ \ \ \ \ Current\ \ \ \ \ Average\ \ \ \ Maximum\\\\n";
+$rrd_options .= " AREA:user_perc#c02020:user";
+$rrd_options .= " GPRINT:user_perc:LAST:\ \ \ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:user_perc:AVERAGE:\ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:user_perc:MAX:\ \ \ %5.2lf%%\\\\n";
+$rrd_options .= " AREA:nice_perc#008f00:nice:STACK";
+$rrd_options .= " GPRINT:nice_perc:LAST:\ \ \ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:nice_perc:AVERAGE:\ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:nice_perc:MAX:\ \ \ %5.2lf%%\\\\n";
+$rrd_options .= " AREA:system_perc#ea8f00:system:STACK";
+$rrd_options .= " GPRINT:system_perc:LAST:\ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:system_perc:AVERAGE:\ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:system_perc:MAX:\ \ \ %5.2lf%%\\\\n";
+$rrd_options .= " AREA:idle_perc#f5f5e5:idle:STACK";
+$rrd_options .= " GPRINT:idle_perc:LAST:\ \ \ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:idle_perc:AVERAGE:\ \ \ %5.2lf%%";
+$rrd_options .= " GPRINT:idle_perc:MAX:\ \ \ %5.2lf%%\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ucd_interrupts.inc.php b/html/includes/graphs/device/ucd_interrupts.inc.php
index a6b111a7b..8f2f278c4 100755
--- a/html/includes/graphs/device/ucd_interrupts.inc.php
+++ b/html/includes/graphs/device/ucd_interrupts.inc.php
@@ -18,4 +18,4 @@ $unit_text = "Interrupts/s";
 
 include("includes/graphs/generic_simplex.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ucd_io.inc.php b/html/includes/graphs/device/ucd_io.inc.php
index 85aec685f..c657e1e0f 100644
--- a/html/includes/graphs/device/ucd_io.inc.php
+++ b/html/includes/graphs/device/ucd_io.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $rrd_filename_in  = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssIORawReceived.rrd";
 $rrd_filename_out = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssIORawSent.rrd"; 
 $rra_in = "value";
@@ -10,5 +9,4 @@ $multiplier = 512;
 
 include("includes/graphs/generic_bits.inc.php");
 
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ucd_load.inc.php b/html/includes/graphs/device/ucd_load.inc.php
index 8106ad2bb..2238cf4e2 100644
--- a/html/includes/graphs/device/ucd_load.inc.php
+++ b/html/includes/graphs/device/ucd_load.inc.php
@@ -5,29 +5,28 @@ $scale_min = "0";
 include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_load.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_load.rrd";
 
-  $rrd_options .= " DEF:1min=$rrd_filename:1min:AVERAGE";
-  $rrd_options .= " DEF:5min=$rrd_filename:5min:AVERAGE";
-  $rrd_options .= " DEF:15min=$rrd_filename:15min:AVERAGE";
-  $rrd_options .= " CDEF:a=1min,100,/";
-  $rrd_options .= " CDEF:b=5min,100,/";
-  $rrd_options .= " CDEF:c=15min,100,/";
-  $rrd_options .= " CDEF:cdefd=a,b,c,+,+";
-  $rrd_options .= " COMMENT:Load\ Average\ \ Current\ \ \ \ Average\ \ \ \ Maximum\\\\n";
-  $rrd_options .= " AREA:a#ffeeaa:1\ Min:";
-  $rrd_options .= " LINE1:a#c5aa00:";
-  $rrd_options .= " GPRINT:a:LAST:\ \ \ \ %7.2lf";
-  $rrd_options .= " GPRINT:a:AVERAGE:\ \ %7.2lf";
-  $rrd_options .= " GPRINT:a:MAX:\ \ %7.2lf\\\\n";
-  $rrd_options .= " LINE1.25:b#ea8f00:5\ Min:";
-  $rrd_options .= " GPRINT:b:LAST:\ \ \ \ %7.2lf";
-  $rrd_options .= " GPRINT:b:AVERAGE:\ \ %7.2lf";
-  $rrd_options .= " GPRINT:b:MAX:\ \ %7.2lf\\\\n";
-  $rrd_options .= " LINE1.25:c#cc0000:15\ Min";
-  $rrd_options .= " GPRINT:c:LAST:\ \ \ %7.2lf";
-  $rrd_options .= " GPRINT:c:AVERAGE:\ \ %7.2lf";
-  $rrd_options .= " GPRINT:c:MAX:\ \ %7.2lf\\\\n";
+$rrd_options .= " DEF:1min=$rrd_filename:1min:AVERAGE";
+$rrd_options .= " DEF:5min=$rrd_filename:5min:AVERAGE";
+$rrd_options .= " DEF:15min=$rrd_filename:15min:AVERAGE";
+$rrd_options .= " CDEF:a=1min,100,/";
+$rrd_options .= " CDEF:b=5min,100,/";
+$rrd_options .= " CDEF:c=15min,100,/";
+$rrd_options .= " CDEF:cdefd=a,b,c,+,+";
+$rrd_options .= " COMMENT:Load\ Average\ \ Current\ \ \ \ Average\ \ \ \ Maximum\\\\n";
+$rrd_options .= " AREA:a#ffeeaa:1\ Min:";
+$rrd_options .= " LINE1:a#c5aa00:";
+$rrd_options .= " GPRINT:a:LAST:\ \ \ \ %7.2lf";
+$rrd_options .= " GPRINT:a:AVERAGE:\ \ %7.2lf";
+$rrd_options .= " GPRINT:a:MAX:\ \ %7.2lf\\\\n";
+$rrd_options .= " LINE1.25:b#ea8f00:5\ Min:";
+$rrd_options .= " GPRINT:b:LAST:\ \ \ \ %7.2lf";
+$rrd_options .= " GPRINT:b:AVERAGE:\ \ %7.2lf";
+$rrd_options .= " GPRINT:b:MAX:\ \ %7.2lf\\\\n";
+$rrd_options .= " LINE1.25:c#cc0000:15\ Min";
+$rrd_options .= " GPRINT:c:LAST:\ \ \ %7.2lf";
+$rrd_options .= " GPRINT:c:AVERAGE:\ \ %7.2lf";
+$rrd_options .= " GPRINT:c:MAX:\ \ %7.2lf\\\\n";
 
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ucd_memory.inc.php b/html/includes/graphs/device/ucd_memory.inc.php
index a85edc60e..7f5f624f2 100644
--- a/html/includes/graphs/device/ucd_memory.inc.php
+++ b/html/includes/graphs/device/ucd_memory.inc.php
@@ -62,4 +62,4 @@ $rrd_options .= " GPRINT:usedswap:MAX:%7.2lf%sB\\\\n";
 $rrd_options .= " LINE1:totalreal#050505:total";
 $rrd_options .= " GPRINT:totalreal:AVERAGE:\ \ %7.2lf%sB";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/ucd_swap_io.inc.php b/html/includes/graphs/device/ucd_swap_io.inc.php
index 114cc4360..e83d24212 100644
--- a/html/includes/graphs/device/ucd_swap_io.inc.php
+++ b/html/includes/graphs/device/ucd_swap_io.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-
 $rrd_filename_in  = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRawSwapIn.rrd";
 $rrd_filename_out = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRawSwapOut.rrd"; 
 $rra_in = "value";
@@ -10,5 +9,4 @@ $multiplier = 512;
 
 include("includes/graphs/generic_bits.inc.php");
 
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/uptime.inc.php b/html/includes/graphs/device/uptime.inc.php
index d80b1350f..7d892a33b 100644
--- a/html/includes/graphs/device/uptime.inc.php
+++ b/html/includes/graphs/device/uptime.inc.php
@@ -5,14 +5,14 @@ $scale_min = "0";
 include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
 
-  $rrd_options .= " DEF:uptime=$rrd_filename:uptime:AVERAGE";
-  $rrd_options .= " CDEF:cuptime=uptime,86400,/";
-  $rrd_options .= " COMMENT:Days\ \ \ \ \ \ Current\ \ Minimum\ \ Maximum\ \ Average\\\\n";
-  $rrd_options .= " AREA:cuptime#EEEEEE:Uptime";
-  $rrd_options .= " LINE1.25:cuptime#36393D:";
-  $rrd_options .= " GPRINT:cuptime:LAST:%6.2lf\  GPRINT:cuptime:AVERAGE:%6.2lf\ ";
-  $rrd_options .= " GPRINT:cuptime:MAX:%6.2lf\  GPRINT:cuptime:AVERAGE:%6.2lf\\\\n";
+$rrd_options .= " DEF:uptime=$rrd_filename:uptime:AVERAGE";
+$rrd_options .= " CDEF:cuptime=uptime,86400,/";
+$rrd_options .= " COMMENT:Days\ \ \ \ \ \ Current\ \ Minimum\ \ Maximum\ \ Average\\\\n";
+$rrd_options .= " AREA:cuptime#EEEEEE:Uptime";
+$rrd_options .= " LINE1.25:cuptime#36393D:";
+$rrd_options .= " GPRINT:cuptime:LAST:%6.2lf\  GPRINT:cuptime:AVERAGE:%6.2lf\ ";
+$rrd_options .= " GPRINT:cuptime:MAX:%6.2lf\  GPRINT:cuptime:AVERAGE:%6.2lf\\\\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/wifi_clients.inc.php b/html/includes/graphs/device/wifi_clients.inc.php
index d195475c5..08f357592 100644
--- a/html/includes/graphs/device/wifi_clients.inc.php
+++ b/html/includes/graphs/device/wifi_clients.inc.php
@@ -26,4 +26,4 @@ if (file_exists($radio1))
   }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/diskio/auth.inc.php b/html/includes/graphs/diskio/auth.inc.php
index e9ecca25c..3ac97aa43 100644
--- a/html/includes/graphs/diskio/auth.inc.php
+++ b/html/includes/graphs/diskio/auth.inc.php
@@ -1,12 +1,11 @@
 <?php
 
-if(is_numeric($id))
+if (is_numeric($id))
 {
-
   $query = mysql_query("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE U.diskio_id = '".$id."' AND U.device_id = D.device_id");
   $disk = mysql_fetch_array($query);
 
-  if(is_numeric($disk['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($disk['device_id'])))
+  if (is_numeric($disk['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($disk['device_id'])))
   {
     $device = device_by_id_cache($disk['device_id']);
 
@@ -18,7 +17,4 @@ if(is_numeric($id))
   }
 }
 
-
-
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/diskio/bits.inc.php b/html/includes/graphs/diskio/bits.inc.php
index 9ddb1f5b1..09db2740b 100644
--- a/html/includes/graphs/diskio/bits.inc.php
+++ b/html/includes/graphs/diskio/bits.inc.php
@@ -5,4 +5,4 @@ $rra_out = "written";
 
 include("includes/graphs/generic_bytes.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/diskio/ops.inc.php b/html/includes/graphs/diskio/ops.inc.php
index 9c9662049..205da922a 100644
--- a/html/includes/graphs/diskio/ops.inc.php
+++ b/html/includes/graphs/diskio/ops.inc.php
@@ -1,11 +1,13 @@
 <?php
 
-if($_GET['id']) { $id = $_GET['id']; }
+if ($_GET['id']) { $id = $_GET['id']; }
 
 $query = mysql_query("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE U.diskio_id = '".$id."' AND U.device_id = D.device_id");
 
 $disk = mysql_fetch_array($query);
-if(is_file($config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd"))) {
+
+if (is_file($config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd")))
+{
   $rrd_filename = $config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd");
 }
 
@@ -26,4 +28,4 @@ $unit_text = "Ops/sec";
 
 include("includes/graphs/generic_duplex.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/multiport/auth.inc.php b/html/includes/graphs/multiport/auth.inc.php
index 3291c2760..5eabbebb0 100644
--- a/html/includes/graphs/multiport/auth.inc.php
+++ b/html/includes/graphs/multiport/auth.inc.php
@@ -2,12 +2,13 @@
 
 $auth = TRUE;
 
-foreach(explode(",", $id) as $ifid) {
-  if(!$config['allow_unauth_graphs'] && !port_permitted($ifid))
+foreach (explode(",", $id) as $ifid)
+{
+  if (!$config['allow_unauth_graphs'] && !port_permitted($ifid))
   $auth = FALSE;
 }
 
-#if(is_numeric($id)) {
+#if (is_numeric($id)) {
 #  $port = get_port_by_id($id);
 #  $device = device_by_id_cache($port['device_id']);
 #}
@@ -17,5 +18,4 @@ foreach(explode(",", $id) as $ifid) {
 
 $title = "Multi Port :: ";
 
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/multiport/bits.inc.php b/html/includes/graphs/multiport/bits.inc.php
index 7eae122e6..c1c0eb06a 100644
--- a/html/includes/graphs/multiport/bits.inc.php
+++ b/html/includes/graphs/multiport/bits.inc.php
@@ -1,11 +1,13 @@
 <?php
 
-
 $i = 1;
-foreach(explode(",", $id) as $ifid) {
+
+foreach (explode(",", $id) as $ifid)
+{
   $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
   $int = mysql_fetch_row($query);
-  if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . safename($int[0] . ".rrd"))) {
+  if (is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . safename($int[0] . ".rrd")))
+  {
     $rrd_filenames[] = $config['rrd_dir'] . "/" . $int[1] . "/port-" . safename($int[0] . ".rrd");
     $i++;
   }
@@ -19,7 +21,6 @@ $colour_line_out = "000099";
 $colour_area_in = "CDEB8B";
 $colour_area_out = "C3D9FF";
 
-include ("includes/graphs/generic_multi_bits.inc.php");
+include("includes/graphs/generic_multi_bits.inc.php");
 
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/multiport/bits_duo.inc.php b/html/includes/graphs/multiport/bits_duo.inc.php
index b46d2d700..0c6c7ee29 100644
--- a/html/includes/graphs/multiport/bits_duo.inc.php
+++ b/html/includes/graphs/multiport/bits_duo.inc.php
@@ -1,116 +1,124 @@
 <?php
 
-if($_GET['legend']) { $legend = $_GET['legend']; }
+if ($_GET['legend']) { $legend = $_GET['legend']; }
 
-  $rrd_options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height ";
-  $rrd_options .= $config['rrdgraph_def_text'];
-  if($height < "99") { $rrd_options .= " --only-graph"; }
-  $i = 1;
+$rrd_options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height ";
+$rrd_options .= $config['rrdgraph_def_text'];
+if ($height < "99") { $rrd_options .= " --only-graph"; }
+$i = 1;
 
-  foreach(explode(",", $_GET['id']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
-    $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
-      $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:INOCTETS:AVERAGE";
-      $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
-      $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF";
-      $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF";
-      $pluses .= $plus;
-      $seperator = ",";
-      $plus = ",+";
-      $i++;
-    }
+foreach (explode(",", $_GET['id']) as $ifid)
+{
+  $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
+  $int = mysql_fetch_row($query);
+  if (is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd"))
+  {
+    $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:INOCTETS:AVERAGE";
+    $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
+    $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF";
+    $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF";
+    $pluses .= $plus;
+    $seperator = ",";
+    $plus = ",+";
+    $i++;
   }
-  unset($seperator); unset($plus);
-  foreach(explode(",", $_GET['idb']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
-    $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
-      $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:INOCTETS:AVERAGE";
-      $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
-      $in_thingb .= $seperator . "inoctetsb" . $i . ",UN,0," . "inoctetsb" . $i . ",IF";
-      $out_thingb .= $seperator . "outoctetsb" . $i . ",UN,0," . "outoctetsb" . $i . ",IF";
-      $plusesb .= $plus;
-      $seperator = ",";
-      $plus = ",+";
-      $i++;
-    }
+}
+unset($seperator); unset($plus);
+
+foreach (explode(",", $_GET['idb']) as $ifid)
+{
+  $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
+  $int = mysql_fetch_row($query);
+  if (is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd"))
+  {
+    $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:INOCTETS:AVERAGE";
+    $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
+    $in_thingb .= $seperator . "inoctetsb" . $i . ",UN,0," . "inoctetsb" . $i . ",IF";
+    $out_thingb .= $seperator . "outoctetsb" . $i . ",UN,0," . "outoctetsb" . $i . ",IF";
+    $plusesb .= $plus;
+    $seperator = ",";
+    $plus = ",+";
+    $i++;
   }
-  if($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
-  $rrd_options .= " CDEF:".$in."octets=" . $in_thing . $pluses;
-  $rrd_options .= " CDEF:".$out."octets=" . $out_thing . $pluses;
-  $rrd_options .= " CDEF:".$in."octetsb=" . $in_thingb . $plusesb;
-  $rrd_options .= " CDEF:".$out."octetsb=" . $out_thingb . $plusesb;
-  $rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
-  $rrd_options .= " CDEF:inbits=inoctets,8,*";
-  $rrd_options .= " CDEF:outbits=outoctets,8,*";
-  $rrd_options .= " CDEF:doutbits=doutoctets,8,*";
-  $rrd_options .= " CDEF:doutoctetsb=outoctetsb,-1,*";
-  $rrd_options .= " CDEF:inbitsb=inoctetsb,8,*";
-  $rrd_options .= " CDEF:outbitsb=outoctetsb,8,*";
-  $rrd_options .= " CDEF:doutbitsb=doutoctetsb,8,*";
-  $rrd_options .= " CDEF:inbits_tot=inbits,inbitsb,+";
-  $rrd_options .= " CDEF:outbits_tot=outbits,outbitsb,+";
-  $rrd_options .= " CDEF:doutbits_tot=outbits_tot,-1,*";
-  $rrd_options .= " CDEF:nothing=outbits_tot,outbits_tot,-";
-  if($legend == "no") {
-   $rrd_options .= " AREA:inbits_tot#cdeb8b:";
-   $rrd_options .= " AREA:inbits#ffcc99:";
-   $rrd_options .= " AREA:doutbits_tot#C3D9FF:";
-   $rrd_options .= " AREA:doutbits#ffcc99:";
-   $rrd_options .= " LINE1:inbits#aa9966:";
-   $rrd_options .= " LINE1:doutbits#aa9966:";
+}
+
+if ($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
+$rrd_options .= " CDEF:".$in."octets=" . $in_thing . $pluses;
+$rrd_options .= " CDEF:".$out."octets=" . $out_thing . $pluses;
+$rrd_options .= " CDEF:".$in."octetsb=" . $in_thingb . $plusesb;
+$rrd_options .= " CDEF:".$out."octetsb=" . $out_thingb . $plusesb;
+$rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
+$rrd_options .= " CDEF:inbits=inoctets,8,*";
+$rrd_options .= " CDEF:outbits=outoctets,8,*";
+$rrd_options .= " CDEF:doutbits=doutoctets,8,*";
+$rrd_options .= " CDEF:doutoctetsb=outoctetsb,-1,*";
+$rrd_options .= " CDEF:inbitsb=inoctetsb,8,*";
+$rrd_options .= " CDEF:outbitsb=outoctetsb,8,*";
+$rrd_options .= " CDEF:doutbitsb=doutoctetsb,8,*";
+$rrd_options .= " CDEF:inbits_tot=inbits,inbitsb,+";
+$rrd_options .= " CDEF:outbits_tot=outbits,outbitsb,+";
+$rrd_options .= " CDEF:doutbits_tot=outbits_tot,-1,*";
+$rrd_options .= " CDEF:nothing=outbits_tot,outbits_tot,-";
+
+if ($legend == "no")
+{
+  $rrd_options .= " AREA:inbits_tot#cdeb8b:";
+  $rrd_options .= " AREA:inbits#ffcc99:";
+  $rrd_options .= " AREA:doutbits_tot#C3D9FF:";
+  $rrd_options .= " AREA:doutbits#ffcc99:";
+  $rrd_options .= " LINE1:inbits#aa9966:";
+  $rrd_options .= " LINE1:doutbits#aa9966:";
 #   $rrd_options .= " LINE1:inbitsb#006600:";
 #   $rrd_options .= " LINE1:doutbitsb#000066:";
-   $rrd_options .= " LINE1.25:inbits_tot#006600:";
-   $rrd_options .= " LINE1.25:doutbits_tot#000099:";
-   $rrd_options .= " LINE0.5:nothing#555555:";
-  } else {
-   $rrd_options .= " COMMENT:bps\ \ \ \ \ \ \ \ \ \ \ \ Current\ \ \ Average\ \ \ \ \ \ Min\ \ \ \ \ \ Max\\\\n";
-   $rrd_options .= " AREA:inbits_tot#cdeb8b:Peering\ In\ ";
-   $rrd_options .= " GPRINT:inbitsb:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsb:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsb:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsb:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " AREA:doutbits_tot#C3D9FF:";
-   $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Out";
-   $rrd_options .= " GPRINT:outbitsb:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsb:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsb:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsb:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " LINE1.25:inbits_tot#006600:";
+  $rrd_options .= " LINE1.25:doutbits_tot#000099:";
+  $rrd_options .= " LINE0.5:nothing#555555:";
+} else {
+  $rrd_options .= " COMMENT:bps\ \ \ \ \ \ \ \ \ \ \ \ Current\ \ \ Average\ \ \ \ \ \ Min\ \ \ \ \ \ Max\\\\n";
+  $rrd_options .= " AREA:inbits_tot#cdeb8b:Peering\ In\ ";
+  $rrd_options .= " GPRINT:inbitsb:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsb:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsb:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsb:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " AREA:doutbits_tot#C3D9FF:";
+  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Out";
+  $rrd_options .= " GPRINT:outbitsb:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsb:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsb:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsb:MAX:%6.2lf%s\\\\l";
 
-   $rrd_options .= " AREA:inbits#ffcc99:Transit\ In\ ";
-   $rrd_options .= " GPRINT:inbits:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " AREA:doutbits#ffcc99:";
-   $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Out";
-   $rrd_options .= " GPRINT:outbits:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " AREA:inbits#ffcc99:Transit\ In\ ";
+  $rrd_options .= " GPRINT:inbits:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " AREA:doutbits#ffcc99:";
+  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Out";
+  $rrd_options .= " GPRINT:outbits:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits:MAX:%6.2lf%s\\\\l";
 
-   $rrd_options .= " COMMENT:Total\ \ \ \ \ In\ ";
-   $rrd_options .= " GPRINT:inbits_tot:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits_tot:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits_tot:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits_tot:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Out";
-   $rrd_options .= " GPRINT:outbits_tot:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits_tot:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits_tot:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits_tot:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " COMMENT:Total\ \ \ \ \ In\ ";
+  $rrd_options .= " GPRINT:inbits_tot:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits_tot:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits_tot:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits_tot:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Out";
+  $rrd_options .= " GPRINT:outbits_tot:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits_tot:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits_tot:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits_tot:MAX:%6.2lf%s\\\\l";
 
-   $rrd_options .= " LINE1:inbits#aa9966:";
-   $rrd_options .= " LINE1:doutbits#aa9966:";
+  $rrd_options .= " LINE1:inbits#aa9966:";
+  $rrd_options .= " LINE1:doutbits#aa9966:";
 #   $rrd_options .= " LINE1.25:inbitsb#006600:";
 #   $rrd_options .= " LINE1.25:doutbitsb#006600:";
-   $rrd_options .= " LINE1.25:inbits_tot#006600:";
-   $rrd_options .= " LINE1.25:doutbits_tot#000099:";
-   $rrd_options .= " LINE0.5:nothing#555555:";
+  $rrd_options .= " LINE1.25:inbits_tot#006600:";
+  $rrd_options .= " LINE1.25:doutbits_tot#000099:";
+  $rrd_options .= " LINE0.5:nothing#555555:";
+}
 
-  }
-  if($width <= "300") { $rrd_options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal"; }
+if ($width <= "300") { $rrd_options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal"; }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/multiport/bits_separate.inc.php b/html/includes/graphs/multiport/bits_separate.inc.php
index 40e4dd49c..96a07f9ee 100644
--- a/html/includes/graphs/multiport/bits_separate.inc.php
+++ b/html/includes/graphs/multiport/bits_separate.inc.php
@@ -1,10 +1,12 @@
 <?php
 
-$i=0;
-foreach(explode(",", $id) as $ifid) {
+$i = 0;
+
+foreach (explode(",", $id) as $ifid)
+{
   $query = mysql_query("SELECT * FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
   $port = mysql_fetch_array($query);
-  if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"))) 
+  if (is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"))) 
   {
     $rrd_list[$i]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
     $rrd_list[$i]['descr'] = $port['hostname'] . " " . $port['ifDescr'];
@@ -12,7 +14,7 @@ foreach(explode(",", $id) as $ifid) {
   }
 }
 
-$units='bps';
+$units = 'bps';
 $total_units='B';
 $colours_in='greens';
 $multiplier = "8";
@@ -22,6 +24,6 @@ $nototal = 1;
 $rra_in  = "INOCTETS";
 $rra_out = "OUTOCTETS";
 
-include ("includes/graphs/generic_multi_bits_separated.inc.php");
+include("includes/graphs/generic_multi_bits_separated.inc.php");
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/multiport/bits_trio.inc.php b/html/includes/graphs/multiport/bits_trio.inc.php
index 371001685..fbc30d505 100644
--- a/html/includes/graphs/multiport/bits_trio.inc.php
+++ b/html/includes/graphs/multiport/bits_trio.inc.php
@@ -1,162 +1,175 @@
 <?php
 
-if($_GET['legend']) { $legend = $_GET['legend']; }
+if ($_GET['legend']) { $legend = $_GET['legend']; }
 
-  $rrd_options = " --alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height ";
-  $rrd_options .= $config['rrdgraph_def_text'];
-  if($height < "99") { $rrd_options .= " --only-graph"; }
-  $i = 1;
-  foreach(explode(",", $_GET['id']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
-    $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
-      if(strstr($inverse, "a")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
-      $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE";
-      $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE";
-      $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF";
-      $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF";
-      $pluses .= $plus;
-      $seperator = ",";
-      $plus = ",+";
-      $i++;
-    }
+$rrd_options = " --alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height ";
+$rrd_options .= $config['rrdgraph_def_text'];
+
+if ($height < "99") { $rrd_options .= " --only-graph"; }
+$i = 1;
+
+foreach (explode(",", $_GET['id']) as $ifid)
+{
+  $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
+  $int = mysql_fetch_row($query);
+  if (is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd"))
+  {
+    if (strstr($inverse, "a")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
+    $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE";
+    $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE";
+    $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF";
+    $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF";
+    $pluses .= $plus;
+    $seperator = ",";
+    $plus = ",+";
+    $i++;
   }
-  unset($seperator); unset($plus);
-  foreach(explode(",", $_GET['idb']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
-    $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
-      if(strstr($inverse, "b")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
-      $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE";
-      $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE";
-      $in_thingb .= $seperator . "inoctetsb" . $i . ",UN,0," . "inoctetsb" . $i . ",IF";
-      $out_thingb .= $seperator . "outoctetsb" . $i . ",UN,0," . "outoctetsb" . $i . ",IF";
-      $plusesb .= $plus;
-      $seperator = ",";
-      $plus = ",+";
-      $i++;
-    }
+}
+
+unset($seperator); unset($plus);
+
+foreach (explode(",", $_GET['idb']) as $ifid)
+{
+  $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
+  $int = mysql_fetch_row($query);
+  if (is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd"))
+  {
+    if (strstr($inverse, "b")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
+    $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE";
+    $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE";
+    $in_thingb .= $seperator . "inoctetsb" . $i . ",UN,0," . "inoctetsb" . $i . ",IF";
+    $out_thingb .= $seperator . "outoctetsb" . $i . ",UN,0," . "outoctetsb" . $i . ",IF";
+    $plusesb .= $plus;
+    $seperator = ",";
+    $plus = ",+";
+    $i++;
   }
-  unset($seperator); unset($plus);
-  foreach(explode(",", $_GET['idc']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
-    $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
-      if(strstr($inverse, "c")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
-      $rrd_options .= " DEF:inoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE";
-      $rrd_options .= " DEF:outoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE";
-      $in_thingc .= $seperator . "inoctetsc" . $i . ",UN,0," . "inoctetsc" . $i . ",IF";
-      $out_thingc .= $seperator . "outoctetsc" . $i . ",UN,0," . "outoctetsc" . $i . ",IF";
-      $plusesc .= $plus;
-      $seperator = ",";
-      $plus = ",+";
-      $i++;
-    }
+}
+
+unset($seperator); unset($plus);
+
+foreach (explode(",", $_GET['idc']) as $ifid)
+{
+  $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . mres($ifid) . "' AND I.device_id = D.device_id");
+  $int = mysql_fetch_row($query);
+  if (is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd"))
+  {
+    if (strstr($inverse, "c")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
+    $rrd_options .= " DEF:inoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE";
+    $rrd_options .= " DEF:outoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE";
+    $in_thingc .= $seperator . "inoctetsc" . $i . ",UN,0," . "inoctetsc" . $i . ",IF";
+    $out_thingc .= $seperator . "outoctetsc" . $i . ",UN,0," . "outoctetsc" . $i . ",IF";
+    $plusesc .= $plus;
+    $seperator = ",";
+    $plus = ",+";
+    $i++;
   }
-  $rrd_options .= " CDEF:inoctets=" . $in_thing . $pluses;
-  $rrd_options .= " CDEF:outoctets=" . $out_thing . $pluses;
-  $rrd_options .= " CDEF:inoctetsb=" . $in_thingb . $plusesb;
-  $rrd_options .= " CDEF:outoctetsb=" . $out_thingb . $plusesb;
-  $rrd_options .= " CDEF:inoctetsc=" . $in_thingc . $plusesc;
-  $rrd_options .= " CDEF:outoctetsc=" . $out_thingc . $plusesc;
-  $rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
-  $rrd_options .= " CDEF:inbits=inoctets,8,*";
-  $rrd_options .= " CDEF:outbits=outoctets,8,*";
-  $rrd_options .= " CDEF:doutbits=doutoctets,8,*";
-  $rrd_options .= " CDEF:doutoctetsb=outoctetsb,-1,*";
-  $rrd_options .= " CDEF:inbitsb=inoctetsb,8,*";
-  $rrd_options .= " CDEF:outbitsb=outoctetsb,8,*";
-  $rrd_options .= " CDEF:doutbitsb=doutoctetsb,8,*";
-  $rrd_options .= " CDEF:doutoctetsc=outoctetsc,-1,*";
-  $rrd_options .= " CDEF:inbitsc=inoctetsc,8,*";
-  $rrd_options .= " CDEF:outbitsc=outoctetsc,8,*";
-  $rrd_options .= " CDEF:doutbitsc=doutoctetsc,8,*";
-  $rrd_options .= " CDEF:inbits_tot=inbits,inbitsb,inbitsc,+,+";
-  $rrd_options .= " CDEF:outbits_tot=outbits,outbitsb,outbitsc,+,+";
-  $rrd_options .= " CDEF:inbits_stot=inbitsc,inbitsb,+";
-  $rrd_options .= " CDEF:outbits_stot=outbitsc,outbitsb,+";
-  $rrd_options .= " CDEF:doutbits_stot=outbits_stot,-1,*";
-  $rrd_options .= " CDEF:doutbits_tot=outbits_tot,-1,*";
-  $rrd_options .= " CDEF:nothing=outbits_tot,outbits_tot,-";
+}
 
-  if($legend == "no") {
-   $rrd_options .= " AREA:inbits_tot#cdeb8b:";
-   $rrd_options .= " AREA:doutbits_tot#cdeb8b:";
-   $rrd_options .= " LINE1.25:inbits_tot#aacc77:";
-   $rrd_options .= " LINE1.25:doutbits_tot#aacc88:";
-   $rrd_options .= " AREA:inbits_stot#c3d9ff:";
-   $rrd_options .= " AREA:doutbits_stot#c3d9ff:";
-   $rrd_options .= " LINE1:inbits_stot#b3a9cf:";
-   $rrd_options .= " LINE1:doutbits_stot#b3a9cf:";
-   $rrd_options .= " AREA:inbitsc#ffcc99:";
-   $rrd_options .= " AREA:doutbitsc#ffcc99:";
-   $rrd_options .= " LINE1.25:inbitsc#ddaa88";
-   $rrd_options .= " LINE1.25:doutbitsc#ddaa88";
-   $rrd_options .= " LINE1:inbits#006600:";
-   $rrd_options .= " LINE1:doutbits#006600:";
-   $rrd_options .= " LINE1:inbitsb#000099:";
-   $rrd_options .= " LINE1:doutbitsb#000099:";
-   $rrd_options .= " LINE0.5:nothing#555555:";
-  } else {
-   $rrd_options .= " COMMENT:bps\ \ \ \ \ \ \ \ \ \ \ \ Current\ \ \ Average\ \ \ \ \ \ Min\ \ \ \ \ \ Max\\\\n";
-   $rrd_options .= " AREA:inbits_tot#cdeb8b:ATM\ \ In\ ";
-   $rrd_options .= " GPRINT:inbits:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " AREA:doutbits_tot#cdeb8b:";
-   $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
-   $rrd_options .= " GPRINT:outbits:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " LINE1.25:inbits_tot#aacc77:";
-   $rrd_options .= " LINE1.25:doutbits_tot#aacc88:";
-   $rrd_options .= " AREA:inbits_stot#c3d9ff:NGN\ \ In\ ";
-   $rrd_options .= " GPRINT:inbitsb:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsb:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsb:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsb:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " AREA:doutbits_stot#c3d9ff:";
-   $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
-   $rrd_options .= " GPRINT:outbitsb:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsb:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsb:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsb:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " LINE1:inbits_stot#b3a9cf:";
-   $rrd_options .= " LINE1:doutbits_stot#b3a9cf:";
-   $rrd_options .= " AREA:inbitsc#ffcc99:Wave\ In\ ";
-   $rrd_options .= " GPRINT:inbitsc:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsc:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsc:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbitsc:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " AREA:doutbitsc#ffcc99:";
-   $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
-   $rrd_options .= " GPRINT:outbitsc:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsc:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsc:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbitsc:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " LINE1.25:inbitsc#ddaa88";
-   $rrd_options .= " LINE1.25:doutbitsc#ddaa88";
-   $rrd_options .= " LINE1:inbits#006600:";
-   $rrd_options .= " LINE1:doutbits#006600:";
-   $rrd_options .= " LINE1:inbitsb#000099:";
-   $rrd_options .= " LINE1:doutbitsb#000099:";
-   $rrd_options .= " LINE0.5:nothing#555555:";
+$rrd_options .= " CDEF:inoctets=" . $in_thing . $pluses;
+$rrd_options .= " CDEF:outoctets=" . $out_thing . $pluses;
+$rrd_options .= " CDEF:inoctetsb=" . $in_thingb . $plusesb;
+$rrd_options .= " CDEF:outoctetsb=" . $out_thingb . $plusesb;
+$rrd_options .= " CDEF:inoctetsc=" . $in_thingc . $plusesc;
+$rrd_options .= " CDEF:outoctetsc=" . $out_thingc . $plusesc;
+$rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
+$rrd_options .= " CDEF:inbits=inoctets,8,*";
+$rrd_options .= " CDEF:outbits=outoctets,8,*";
+$rrd_options .= " CDEF:doutbits=doutoctets,8,*";
+$rrd_options .= " CDEF:doutoctetsb=outoctetsb,-1,*";
+$rrd_options .= " CDEF:inbitsb=inoctetsb,8,*";
+$rrd_options .= " CDEF:outbitsb=outoctetsb,8,*";
+$rrd_options .= " CDEF:doutbitsb=doutoctetsb,8,*";
+$rrd_options .= " CDEF:doutoctetsc=outoctetsc,-1,*";
+$rrd_options .= " CDEF:inbitsc=inoctetsc,8,*";
+$rrd_options .= " CDEF:outbitsc=outoctetsc,8,*";
+$rrd_options .= " CDEF:doutbitsc=doutoctetsc,8,*";
+$rrd_options .= " CDEF:inbits_tot=inbits,inbitsb,inbitsc,+,+";
+$rrd_options .= " CDEF:outbits_tot=outbits,outbitsb,outbitsc,+,+";
+$rrd_options .= " CDEF:inbits_stot=inbitsc,inbitsb,+";
+$rrd_options .= " CDEF:outbits_stot=outbitsc,outbitsb,+";
+$rrd_options .= " CDEF:doutbits_stot=outbits_stot,-1,*";
+$rrd_options .= " CDEF:doutbits_tot=outbits_tot,-1,*";
+$rrd_options .= " CDEF:nothing=outbits_tot,outbits_tot,-";
 
-   $rrd_options .= " COMMENT:Total\ \ In\ ";
-   $rrd_options .= " GPRINT:inbits_tot:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits_tot:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits_tot:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:inbits_tot:MAX:%6.2lf%s\\\\l";
-   $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
-   $rrd_options .= " GPRINT:outbits_tot:LAST:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits_tot:AVERAGE:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits_tot:MIN:%6.2lf%s";
-   $rrd_options .= " GPRINT:outbits_tot:MAX:%6.2lf%s\\\\l";
+if ($legend == "no")
+{
+  $rrd_options .= " AREA:inbits_tot#cdeb8b:";
+  $rrd_options .= " AREA:doutbits_tot#cdeb8b:";
+  $rrd_options .= " LINE1.25:inbits_tot#aacc77:";
+  $rrd_options .= " LINE1.25:doutbits_tot#aacc88:";
+  $rrd_options .= " AREA:inbits_stot#c3d9ff:";
+  $rrd_options .= " AREA:doutbits_stot#c3d9ff:";
+  $rrd_options .= " LINE1:inbits_stot#b3a9cf:";
+  $rrd_options .= " LINE1:doutbits_stot#b3a9cf:";
+  $rrd_options .= " AREA:inbitsc#ffcc99:";
+  $rrd_options .= " AREA:doutbitsc#ffcc99:";
+  $rrd_options .= " LINE1.25:inbitsc#ddaa88";
+  $rrd_options .= " LINE1.25:doutbitsc#ddaa88";
+  $rrd_options .= " LINE1:inbits#006600:";
+  $rrd_options .= " LINE1:doutbits#006600:";
+  $rrd_options .= " LINE1:inbitsb#000099:";
+  $rrd_options .= " LINE1:doutbitsb#000099:";
+  $rrd_options .= " LINE0.5:nothing#555555:";
+} else {
+  $rrd_options .= " COMMENT:bps\ \ \ \ \ \ \ \ \ \ \ \ Current\ \ \ Average\ \ \ \ \ \ Min\ \ \ \ \ \ Max\\\\n";
+  $rrd_options .= " AREA:inbits_tot#cdeb8b:ATM\ \ In\ ";
+  $rrd_options .= " GPRINT:inbits:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " AREA:doutbits_tot#cdeb8b:";
+  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
+  $rrd_options .= " GPRINT:outbits:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " LINE1.25:inbits_tot#aacc77:";
+  $rrd_options .= " LINE1.25:doutbits_tot#aacc88:";
+  $rrd_options .= " AREA:inbits_stot#c3d9ff:NGN\ \ In\ ";
+  $rrd_options .= " GPRINT:inbitsb:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsb:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsb:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsb:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " AREA:doutbits_stot#c3d9ff:";
+  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
+  $rrd_options .= " GPRINT:outbitsb:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsb:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsb:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsb:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " LINE1:inbits_stot#b3a9cf:";
+  $rrd_options .= " LINE1:doutbits_stot#b3a9cf:";
+  $rrd_options .= " AREA:inbitsc#ffcc99:Wave\ In\ ";
+  $rrd_options .= " GPRINT:inbitsc:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsc:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsc:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbitsc:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " AREA:doutbitsc#ffcc99:";
+  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
+  $rrd_options .= " GPRINT:outbitsc:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsc:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsc:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbitsc:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " LINE1.25:inbitsc#ddaa88";
+  $rrd_options .= " LINE1.25:doutbitsc#ddaa88";
+  $rrd_options .= " LINE1:inbits#006600:";
+  $rrd_options .= " LINE1:doutbits#006600:";
+  $rrd_options .= " LINE1:inbitsb#000099:";
+  $rrd_options .= " LINE1:doutbitsb#000099:";
+  $rrd_options .= " LINE0.5:nothing#555555:";
 
+  $rrd_options .= " COMMENT:Total\ \ In\ ";
+  $rrd_options .= " GPRINT:inbits_tot:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits_tot:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits_tot:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:inbits_tot:MAX:%6.2lf%s\\\\l";
+  $rrd_options .= " COMMENT:\ \ \ \ \ \ \ Out";
+  $rrd_options .= " GPRINT:outbits_tot:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits_tot:AVERAGE:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits_tot:MIN:%6.2lf%s";
+  $rrd_options .= " GPRINT:outbits_tot:MAX:%6.2lf%s\\\\l";
+}
 
-  }
-  if($width <= "300") { $rrd_options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal"; }
+if ($width <= "300") { $rrd_options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal"; }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/processor/auth.inc.php b/html/includes/graphs/processor/auth.inc.php
index a1fff9407..7e2d79686 100755
--- a/html/includes/graphs/processor/auth.inc.php
+++ b/html/includes/graphs/processor/auth.inc.php
@@ -3,7 +3,7 @@
 $sql = mysql_query("SELECT * FROM `processors` where `processor_id` = '".mres($id)."'");
 $proc = mysql_fetch_assoc($sql);
 
-if(is_numeric($proc['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($proc['device_id']))) 
+if (is_numeric($proc['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($proc['device_id'])))
 {
   $device = device_by_id_cache($proc['device_id']);
   $rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
@@ -12,4 +12,4 @@ if(is_numeric($proc['device_id']) && ($config['allow_unauth_graphs'] || device_p
   $auth = TRUE;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/processor/usage.inc.php b/html/includes/graphs/processor/usage.inc.php
index 386f3bdd6..ba02668bf 100755
--- a/html/includes/graphs/processor/usage.inc.php
+++ b/html/includes/graphs/processor/usage.inc.php
@@ -4,26 +4,27 @@ $scale_max = "100";
 
 include("includes/graphs/common.inc.php");
 
-  $iter = "1";
+$iter = "1";
 
-  $rrd_options .= " COMMENT:'                                 Cur   Max\\n'";
+$rrd_options .= " COMMENT:'                                 Cur   Max\\n'";
 
-  if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
-  } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
-  } elseif($iter=="7") {$colour="FF0084"; unset($iter); }
-  $descr = substr(str_pad(short_hrDeviceDescr($proc['processor_descr']), 28),0,28);
-  $descr = str_replace(":", "\:", $descr);
+if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
+elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
+elseif ($iter=="7") { $colour="FF0084"; unset($iter); }
 
-  $rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=".$rrd_filename.":usage:AVERAGE ";
-  $rrd_options .= " DEF:proc_max=".$rrd_filename.":usage:MAX";
-  $rrd_options .= " DEF:proc_min=".$rrd_filename.":usage:MIN";
+$descr = substr(str_pad(short_hrDeviceDescr($proc['processor_descr']), 28),0,28);
+$descr = str_replace(":", "\:", $descr);
 
-  $rrd_options .= " AREA:proc_max#c5c5c5";
-  $rrd_options .= " AREA:proc_min#ffffffff";
+$rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=".$rrd_filename.":usage:AVERAGE ";
+$rrd_options .= " DEF:proc_max=".$rrd_filename.":usage:MAX";
+$rrd_options .= " DEF:proc_min=".$rrd_filename.":usage:MIN";
 
-  $rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $descr . "' ";
-  $rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf%%";
-  $rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf%%\\\l ";
-  $iter++;
+$rrd_options .= " AREA:proc_max#c5c5c5";
+$rrd_options .= " AREA:proc_min#ffffffff";
 
-?>
+$rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $descr . "' ";
+$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf%%";
+$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf%%\\\l ";
+$iter++;
+
+?>
\ No newline at end of file