diff --git a/html/includes/print-device-graph.php b/html/includes/print-device-graph.php index 52cf57fb8..564aa9166 100644 --- a/html/includes/print-device-graph.php +++ b/html/includes/print-device-graph.php @@ -9,7 +9,7 @@ if (!is_integer($g_i/2)) { $row_colour = $list_colour_a; } else { $row_colour = echo('
'); echo('
'.$graph_title.'
'); -include("includes/print-quadgraphs.inc.php"); +include("includes/print-graphrow.inc.php"); echo('
'); diff --git a/html/includes/print-quadgraphs.inc.php b/html/includes/print-graphrow.inc.php similarity index 100% rename from html/includes/print-quadgraphs.inc.php rename to html/includes/print-graphrow.inc.php diff --git a/html/includes/print-interface-graphs.inc.php b/html/includes/print-interface-graphs.inc.php index e1bc4856b..2fb634db0 100644 --- a/html/includes/print-interface-graphs.inc.php +++ b/html/includes/print-interface-graphs.inc.php @@ -8,6 +8,6 @@ $graph_array['to'] = $config['time']['now']; $graph_array['id'] = $port['interface_id']; $graph_array['type'] = $graph_type; -include("includes/print-quadgraphs.inc.php"); +include("includes/print-graphrow.inc.php"); ?> diff --git a/html/pages/customers.inc.php b/html/pages/customers.inc.php index ec2aca54c..fc2d8b14a 100644 --- a/html/pages/customers.inc.php +++ b/html/pages/customers.inc.php @@ -65,7 +65,7 @@ foreach (dbFetchRows("SELECT * FROM `ports` WHERE `port_descr_type` = 'cust' GRO $graph_array['to'] = $config['time']['now']; $graph_array['id'] = $customer['port_descr_descr']; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/apache.inc.php b/html/pages/device/apps/apache.inc.php index 4fba3587d..8f7b3dc08 100644 --- a/html/pages/device/apps/apache.inc.php +++ b/html/pages/device/apps/apache.inc.php @@ -21,7 +21,7 @@ foreach ($graphs as $key => $text) echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/drbd.inc.php b/html/pages/device/apps/drbd.inc.php index e002d02db..2aab8315f 100644 --- a/html/pages/device/apps/drbd.inc.php +++ b/html/pages/device/apps/drbd.inc.php @@ -20,7 +20,7 @@ foreach ($graphs as $key => $text) echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/mailscanner.inc.php b/html/pages/device/apps/mailscanner.inc.php index badb3d755..217bc57f5 100644 --- a/html/pages/device/apps/mailscanner.inc.php +++ b/html/pages/device/apps/mailscanner.inc.php @@ -18,7 +18,7 @@ foreach ($graphs as $key => $text) echo('

'.$text.'

'); echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/mysql.inc.php b/html/pages/device/apps/mysql.inc.php index 6d825b39e..f5311adf8 100644 --- a/html/pages/device/apps/mysql.inc.php +++ b/html/pages/device/apps/mysql.inc.php @@ -68,7 +68,7 @@ foreach ($graphs[$vars['app_section']] as $key => $text) echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/nginx.inc.php b/html/pages/device/apps/nginx.inc.php index 571021e01..d166d4fcf 100644 --- a/html/pages/device/apps/nginx.inc.php +++ b/html/pages/device/apps/nginx.inc.php @@ -17,7 +17,7 @@ foreach ($graphs as $key => $text) echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/ntp-client.inc.php b/html/pages/device/apps/ntp-client.inc.php index b8ee381b6..5fddd1a73 100644 --- a/html/pages/device/apps/ntp-client.inc.php +++ b/html/pages/device/apps/ntp-client.inc.php @@ -15,7 +15,7 @@ foreach ($graphs as $key => $text) { echo('

'.$text.'

'); echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/ntpd-server.inc.php b/html/pages/device/apps/ntpd-server.inc.php index 3fff5ccac..a528a5290 100644 --- a/html/pages/device/apps/ntpd-server.inc.php +++ b/html/pages/device/apps/ntpd-server.inc.php @@ -20,7 +20,7 @@ foreach ($graphs as $key => $text) { echo('

'.$text.'

'); echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/powerdns.inc.php b/html/pages/device/apps/powerdns.inc.php index 491ac3121..a7a343fe8 100644 --- a/html/pages/device/apps/powerdns.inc.php +++ b/html/pages/device/apps/powerdns.inc.php @@ -23,7 +23,7 @@ foreach ($graphs as $key => $text) echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/apps/shoutcast.inc.php b/html/pages/device/apps/shoutcast.inc.php index 543686d7c..9354a1816 100644 --- a/html/pages/device/apps/shoutcast.inc.php +++ b/html/pages/device/apps/shoutcast.inc.php @@ -39,7 +39,7 @@ if (isset($total) && $total == true) echo('

'.$text.'

'); echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } @@ -67,7 +67,7 @@ foreach ($files as $id => $file) echo('

'.$text.'

'); echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/collectd.inc.php b/html/pages/device/collectd.inc.php index 1dfa88e0f..600e1fd72 100644 --- a/html/pages/device/collectd.inc.php +++ b/html/pages/device/collectd.inc.php @@ -99,7 +99,7 @@ print_optionbar_end(); $graph_array['c_type'] = $type; $graph_array['c_type_instance'] = $tinst; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); diff --git a/html/pages/device/health/diskio.inc.php b/html/pages/device/health/diskio.inc.php index 534e4dd40..03e151662 100644 --- a/html/pages/device/health/diskio.inc.php +++ b/html/pages/device/health/diskio.inc.php @@ -38,7 +38,7 @@ foreach (dbFetchRows("SELECT * FROM `ucd_diskio` WHERE device_id = ? ORDER BY di $graph_array['id'] = $drive['diskio_id']; $graph_array['type'] = $graph_type; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/health/mempool.inc.php b/html/pages/device/health/mempool.inc.php index c7eb95619..22149af6a 100644 --- a/html/pages/device/health/mempool.inc.php +++ b/html/pages/device/health/mempool.inc.php @@ -43,7 +43,7 @@ foreach (dbFetchRows("SELECT * FROM `mempools` WHERE device_id = ?", array($devi $graph_array['id'] = $mempool['mempool_id']; $graph_array['type'] = $graph_type; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); diff --git a/html/pages/device/health/processor.inc.php b/html/pages/device/health/processor.inc.php index 0e54b9264..89a3fd8a6 100644 --- a/html/pages/device/health/processor.inc.php +++ b/html/pages/device/health/processor.inc.php @@ -37,7 +37,7 @@ foreach (dbFetchRows("SELECT * FROM `processors` WHERE device_id = ?", array($de $graph_array['id'] = $proc['processor_id']; $graph_array['type'] = $graph_type; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); } echo(""); diff --git a/html/pages/device/health/sensors.inc.php b/html/pages/device/health/sensors.inc.php index 5ef6e9000..36f85bb59 100644 --- a/html/pages/device/health/sensors.inc.php +++ b/html/pages/device/health/sensors.inc.php @@ -20,7 +20,7 @@ foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `devi $graph_array['id'] = $sensor['sensor_id']; $graph_array['type'] = $graph_type; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); diff --git a/html/pages/device/health/storage.inc.php b/html/pages/device/health/storage.inc.php index e0ab4eed0..8c9214f2d 100644 --- a/html/pages/device/health/storage.inc.php +++ b/html/pages/device/health/storage.inc.php @@ -42,7 +42,7 @@ foreach (dbFetchRows("SELECT * FROM `storage` WHERE device_id = ? ORDER BY stora echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); diff --git a/html/pages/device/latency.inc.php b/html/pages/device/latency.inc.php index 111011288..761569453 100644 --- a/html/pages/device/latency.inc.php +++ b/html/pages/device/latency.inc.php @@ -44,7 +44,7 @@ if($vars['view'] == "incoming") echo(''); echo('

Average

'); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(''); @@ -53,7 +53,7 @@ if($vars['view'] == "incoming") echo(''); echo('

Aggregate

'); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(''); @@ -72,7 +72,7 @@ if($vars['view'] == "incoming") $graph_array['id'] = $device['device_id']; $graph_array['src'] = $host['device_id']; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(''); } @@ -90,7 +90,7 @@ if($vars['view'] == "incoming") echo(''); echo('

Aggregate

'); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(''); @@ -99,7 +99,7 @@ if($vars['view'] == "incoming") echo(''); echo('

Aggregate

'); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(''); @@ -119,7 +119,7 @@ if($vars['view'] == "incoming") $graph_array['id'] = $device['device_id']; $graph_array['dest'] = $host['device_id']; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(''); } diff --git a/html/pages/device/loadbalancer/ace_rservers.inc.php b/html/pages/device/loadbalancer/ace_rservers.inc.php index 594433b43..08ee06c47 100644 --- a/html/pages/device/loadbalancer/ace_rservers.inc.php +++ b/html/pages/device/loadbalancer/ace_rservers.inc.php @@ -71,7 +71,7 @@ $graph_array['to'] = $config['time']['now']; $graph_array['id'] = $rserver['rserver_id']; $graph_array['type'] = $graph_type; -include("includes/print-quadgraphs.inc.php"); +include("includes/print-graphrow.inc.php"); #include("includes/print-interface-graphs.inc.php"); diff --git a/html/pages/device/loadbalancer/ace_vservers.inc.php b/html/pages/device/loadbalancer/ace_vservers.inc.php index 22468f495..067683014 100644 --- a/html/pages/device/loadbalancer/ace_vservers.inc.php +++ b/html/pages/device/loadbalancer/ace_vservers.inc.php @@ -67,7 +67,7 @@ $graph_array['to'] = $config['time']['now']; $graph_array['id'] = $vserver['classmap_id']; $graph_array['type'] = $graph_type; -include("includes/print-quadgraphs.inc.php"); +include("includes/print-graphrow.inc.php"); echo(" diff --git a/html/pages/device/loadbalancer/netscaler_vsvr.inc.php b/html/pages/device/loadbalancer/netscaler_vsvr.inc.php index fce72794e..aaaa437a8 100644 --- a/html/pages/device/loadbalancer/netscaler_vsvr.inc.php +++ b/html/pages/device/loadbalancer/netscaler_vsvr.inc.php @@ -46,7 +46,7 @@ foreach (dbFetchRows("SELECT * FROM `netscaler_vservers` WHERE `device_id` = ? A echo('

'.$graph_text.'

'); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(" @@ -121,7 +121,7 @@ foreach (dbFetchRows("SELECT * FROM `netscaler_vservers` WHERE `device_id` = ? O $graph_array['id'] = $vsvr['vsvr_id']; $graph_array['type'] = $graph_type; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(" diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php index 96309dcff..e069666de 100644 --- a/html/pages/device/overview/generic/sensor.inc.php +++ b/html/pages/device/overview/generic/sensor.inc.php @@ -11,7 +11,7 @@ if (count($sensors)) { ### FIXME - make this "four graphs in popup" a function/include and "small graph" a function. - ### FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-quadgraphs"? + ### FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-graphrow"? $graph_colour = str_replace("#", "", $row_colour); diff --git a/html/pages/device/port/macaccounting.inc.php b/html/pages/device/port/macaccounting.inc.php index d57cbb0c2..5abbb6aad 100644 --- a/html/pages/device/port/macaccounting.inc.php +++ b/html/pages/device/port/macaccounting.inc.php @@ -184,7 +184,7 @@ if ($vars['subview'] == "top10") $graph_array['to'] = $now; echo(''); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); diff --git a/html/pages/device/routing/bgp.inc.php b/html/pages/device/routing/bgp.inc.php index b2c9859e4..a88d2e2b6 100644 --- a/html/pages/device/routing/bgp.inc.php +++ b/html/pages/device/routing/bgp.inc.php @@ -186,7 +186,7 @@ foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? ORDER BY `b $graph_array['to'] = $now; echo(''); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/routing/cef.inc.php b/html/pages/device/routing/cef.inc.php index 4cc5e6888..78d31683f 100644 --- a/html/pages/device/routing/cef.inc.php +++ b/html/pages/device/routing/cef.inc.php @@ -95,7 +95,7 @@ foreach (dbFetchRows("SELECT * FROM `cef_switching` WHERE `device_id` = ? ORDER echo(""); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/routing/ipsec_tunnels.inc.php b/html/pages/device/routing/ipsec_tunnels.inc.php index 61cf98341..294564e04 100644 --- a/html/pages/device/routing/ipsec_tunnels.inc.php +++ b/html/pages/device/routing/ipsec_tunnels.inc.php @@ -65,7 +65,7 @@ $graph_array['to'] = $config['time']['now']; $graph_array['id'] = $tunnel['tunnel_id']; $graph_array['type'] = $graph_type; -include("includes/print-quadgraphs.inc.php"); +include("includes/print-graphrow.inc.php"); echo(" diff --git a/html/pages/device/services.inc.php b/html/pages/device/services.inc.php index 87918c917..74cdff910 100644 --- a/html/pages/device/services.inc.php +++ b/html/pages/device/services.inc.php @@ -42,7 +42,7 @@ if (dbFetchCell("SELECT COUNT(service_id) FROM `services` WHERE device_id = ?", echo(''); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/device/slas.inc.php b/html/pages/device/slas.inc.php index 08c4ecea7..aec523110 100644 --- a/html/pages/device/slas.inc.php +++ b/html/pages/device/slas.inc.php @@ -65,7 +65,7 @@ foreach ($slas as $sla) echo(''); echo('

'.htmlentities($name).'

'); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(''); } diff --git a/html/pages/health/storage.inc.php b/html/pages/health/storage.inc.php index 6ab827a55..7c874214a 100644 --- a/html/pages/health/storage.inc.php +++ b/html/pages/health/storage.inc.php @@ -79,7 +79,7 @@ foreach (dbFetchRows("SELECT * FROM `storage` AS S, `devices` AS D WHERE S.devic $graph_array['id'] = $drive['storage_id']; $graph_array['type'] = $graph_type; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); diff --git a/html/pages/health/toner.inc.php b/html/pages/health/toner.inc.php index a24636b2c..4008fbee2 100644 --- a/html/pages/health/toner.inc.php +++ b/html/pages/health/toner.inc.php @@ -50,7 +50,7 @@ foreach (dbFetchRows("SELECT * FROM `toner` AS S, `devices` AS D WHERE S.device_ $graph_array['id'] = $toner['toner_id']; $graph_array['type'] = $graph_type; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } # endif graphs diff --git a/html/pages/locations.inc.php b/html/pages/locations.inc.php index 7a5e2f815..bd35d25f7 100644 --- a/html/pages/locations.inc.php +++ b/html/pages/locations.inc.php @@ -75,7 +75,7 @@ foreach (getlocations() as $location) $graph_array['legend'] = "no"; $graph_array['id'] = $location; - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); } diff --git a/html/pages/routing/bgp.inc.php b/html/pages/routing/bgp.inc.php index 240b54bbf..af6d154c3 100644 --- a/html/pages/routing/bgp.inc.php +++ b/html/pages/routing/bgp.inc.php @@ -238,7 +238,7 @@ else $graph_array['to'] = $now; echo(''); - include("includes/print-quadgraphs.inc.php"); + include("includes/print-graphrow.inc.php"); echo(""); }