diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 87a0131ed..6e8e4bb5a 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -210,7 +210,7 @@ function generate_graph_tag ($args) foreach ($args as $key => $arg) { $url .= $sep.$key."=".$arg; - $sep="&"; + $sep="&"; } return ""; } @@ -271,7 +271,7 @@ function generate_port_link($args, $text = NULL, $type = NULL) function generate_port_thumbnail($args) { if (!$args['bg']) { $args['bg'] = "FFFFF"; } - $args['content'] = ""; + $args['content'] = ""; echo generate_port_link($args, $args['content']); } diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php index 4c33fbbaa..c853b1f3d 100644 --- a/html/includes/hostbox.inc.php +++ b/html/includes/hostbox.inc.php @@ -24,10 +24,9 @@
' . $device['sysName'] . ' '); - if ($port_count) { echo(' '.$port_count); } + if ($port_count) { echo(' '.$port_count); } echo('
'); - if ($sensor_count) { echo(' '.$sensor_count); } - + if ($sensor_count) { echo(' '.$sensor_count); } echo(' ' . $device['os_text'] . '
diff --git a/html/includes/print-interface-adsl.inc.php b/html/includes/print-interface-adsl.inc.php index 3f6eb74a5..d39c8a83b 100644 --- a/html/includes/print-interface-adsl.inc.php +++ b/html/includes/print-interface-adsl.inc.php @@ -35,12 +35,12 @@ if ($port_details) { $ipdata = mysql_query("SELECT * FROM `ipv4_addresses` WHERE `interface_id` = '" . $interface['interface_id'] . "'"); while ($ip = mysql_fetch_Array($ipdata)) { - echo("$break $ip[ipv4_address]/$ip[ipv4_prefixlen]"); + echo("$break $ip[ipv4_address]/$ip[ipv4_prefixlen]"); $break = ","; } $ip6data = mysql_query("SELECT * FROM `ipv6_addresses` WHERE `interface_id` = '" . $interface['interface_id'] . "'"); while ($ip6 = mysql_fetch_Array($ip6data)) { - echo("$break ".Net_IPv6::compress($ip6['ipv6_address'])."/".$ip6['ipv6_prefixlen'].""); + echo("$break ".Net_IPv6::compress($ip6['ipv6_address'])."/".$ip6['ipv6_prefixlen'].""); $break = ","; } } @@ -53,7 +53,7 @@ echo(formatRates($interface['ifInOctets_rate'] * 8)." ".formatRates($interface['ifOutOctets_rate'] * 8)); echo("
"); $interface['graph_type'] = "port_bits"; - echo(generate_port_link($interface, "", $interface['graph_type'])); @@ -61,35 +61,35 @@ echo("".formatRates($interface['adslAturChanCurrTxRate']) . "/". formatRates($interface['adslAtucChanCurrTxRate'])); echo("
"); $interface['graph_type'] = "port_adsl_speed"; - echo(generate_port_link($interface, "", $interface['graph_type'])); echo(""); echo("".formatRates($interface['adslAturCurrAttainableRate']) . "/". formatRates($interface['adslAtucCurrAttainableRate'])); echo("
"); $interface['graph_type'] = "port_adsl_attainable"; - echo(generate_port_link($interface, "", $interface['graph_type'])); echo(""); echo("".$interface['adslAturCurrAtn'] . "dB/". $interface['adslAtucCurrAtn'] . "dB"); echo("
"); $interface['graph_type'] = "port_adsl_attenuation"; - echo(generate_port_link($interface, "", $interface['graph_type'])); echo(""); echo("".$interface['adslAturCurrSnrMgn'] . "dB/". $interface['adslAtucCurrSnrMgn'] . "dB"); echo("
"); $interface['graph_type'] = "port_adsl_snr"; - echo(generate_port_link($interface, "", $interface['graph_type'])); echo(""); echo("".$interface['adslAturCurrOutputPwr'] . "dBm/". $interface['adslAtucCurrOutputPwr'] . "dBm"); echo("
"); $interface['graph_type'] = "port_adsl_power"; - echo(generate_port_link($interface, "", $interface['graph_type'])); @@ -122,17 +122,17 @@ echo(""); $type = $graph_type; - $daily_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$from&to=$now&width=210&height=100"; - $daily_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$from&to=$now&width=500&height=150"; + $daily_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$from&to=$now&width=210&height=100"; + $daily_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$from&to=$now&width=500&height=150"; - $weekly_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=210&height=100"; - $weekly_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=500&height=150"; + $weekly_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=210&height=100"; + $weekly_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=500&height=150"; - $monthly_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=210&height=100"; - $monthly_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=500&height=150"; + $monthly_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=210&height=100"; + $monthly_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=500&height=150"; - $yearly_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=210&height=100"; - $yearly_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=500&height=150"; + $yearly_traffic = "graph.php?port=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=210&height=100"; + $yearly_url = "graph.php?port=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=500&height=150"; echo(""); diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php index 7e47d625c..3e31905a7 100644 --- a/html/includes/print-interface.inc.php +++ b/html/includes/print-interface.inc.php @@ -42,12 +42,12 @@ if ($port_details) { $ipdata = mysql_query("SELECT * FROM `ipv4_addresses` WHERE `interface_id` = '" . $interface['interface_id'] . "'"); while ($ip = mysql_fetch_Array($ipdata)) { - echo("$break $ip[ipv4_address]/$ip[ipv4_prefixlen]"); + echo("$break $ip[ipv4_address]/$ip[ipv4_prefixlen]"); $break = "
"; } $ip6data = mysql_query("SELECT * FROM `ipv6_addresses` WHERE `interface_id` = '" . $interface['interface_id'] . "'"); while ($ip6 = mysql_fetch_Array($ip6data)) { - echo("$break ".Net_IPv6::compress($ip6['ipv6_address'])."/".$ip6['ipv6_prefixlen'].""); + echo("$break ".Net_IPv6::compress($ip6['ipv6_address'])."/".$ip6['ipv6_prefixlen'].""); $break = "
"; } } @@ -59,11 +59,11 @@ echo(""); if ($port_details) { $interface['graph_type'] = "port_bits"; - echo(generate_port_link($interface, "")); + echo(generate_port_link($interface, "")); $interface['graph_type'] = "port_upkts"; - echo(generate_port_link($interface, "")); + echo(generate_port_link($interface, "")); $interface['graph_type'] = "port_errors"; - echo(generate_port_link($interface, "")); + echo(generate_port_link($interface, "")); } echo(""); @@ -245,17 +245,17 @@ if ($graph_type && is_file($graph_file)) { $type = $graph_type; - $daily_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$day&to=$now&width=210&height=100"; - $daily_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$day&to=$now&width=500&height=150"; + $daily_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$day&to=$now&width=210&height=100"; + $daily_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$day&to=$now&width=500&height=150"; - $weekly_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=210&height=100"; - $weekly_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=500&height=150"; + $weekly_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=210&height=100"; + $weekly_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$week&to=$now&width=500&height=150"; - $monthly_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=210&height=100"; - $monthly_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=500&height=150"; + $monthly_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=210&height=100"; + $monthly_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$month&to=$now&width=500&height=150"; - $yearly_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=210&height=100"; - $yearly_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=500&height=150"; + $yearly_traffic = "graph.php?id=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=210&height=100"; + $yearly_url = "graph.php?id=$if_id&type=" . $graph_type . "&from=$year&to=$now&width=500&height=150"; echo(""); diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index daf0af8b9..c52e6150c 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -122,7 +122,7 @@ if ($config['show_locations']) { if ($row['location'] != '') { - echo('
  • ' . $row['location'] . '
    • '); + echo('
  • ' . $row['location'] . '
    • '); } } ?> diff --git a/html/includes/print-service.inc.php b/html/includes/print-service.inc.php index 0bbfda884..1633b8a6e 100644 --- a/html/includes/print-service.inc.php +++ b/html/includes/print-service.inc.php @@ -23,10 +23,10 @@ if ($service['service_checked']) $checked = formatUptime($checked); } else { $checked = "Never"; } -$mini_url = $config['base_url'] . "/graph.php?id=".$service['service_id']."&type=service_availability&from=".$day."&to=".$now."&width=80&height=20&bg=efefef"; +$mini_url = $config['base_url'] . "/graph.php?id=".$service['service_id']."&type=service_availability&from=".$day."&to=".$now."&width=80&height=20&bg=efefef"; $popup = "onmouseover=\"return overlib('
    ".$device['hostname']." - ".$service['service_type']; -$popup .= "
    "; +$popup .= ""; $popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\""; echo(" diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php index 34c9678a3..dd2c2e5a4 100644 --- a/html/includes/print-vlan.inc.php +++ b/html/includes/print-vlan.inc.php @@ -20,9 +20,9 @@ while ($port = mysql_fetch_array($ports_query)) ".$device['hostname']." - ".$port['ifDescr']."\ ".$port['ifAlias']." \ - \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". - " + "
    ".truncate(short_port_descr($port['ifAlias']), 22, '')."
    "); diff --git a/html/includes/print-vrf.inc.php b/html/includes/print-vrf.inc.php index 6d8e8f6c0..fd806ffd2 100644 --- a/html/includes/print-vrf.inc.php +++ b/html/includes/print-vrf.inc.php @@ -19,9 +19,9 @@ while ($port = mysql_fetch_array($ports_query)) { ".$device['hostname']." - ".$port['ifDescr']."\ ".$port['ifAlias']." \ - \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". - " + "
    ".truncate(short_port_descr($port['ifAlias']), 22, '')."
    "); diff --git a/html/index.php b/html/index.php index f364ee3fe..39b0e9f6c 100755 --- a/html/index.php +++ b/html/index.php @@ -64,7 +64,7 @@ if ($config['page_refresh']) { echo("" /> - +