mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
syntaxer run, removes dos newlines from 2 files
git-svn-id: http://www.observium.org/svn/observer/trunk@2597 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
+172
-172
@@ -1,172 +1,172 @@
|
||||
<?php
|
||||
|
||||
if ($_POST['addbill'] == "yes")
|
||||
{
|
||||
$updated = '1';
|
||||
|
||||
$insert = array('bill_name' => $_POST['bill_name'], 'bill_type' => $_POST['bill_type'], 'bill_cdr' => $_POST['bill_cdr'], 'bill_day' => $_POST['bill_day'], 'bill_gb' => $_POST['bill_quota'],
|
||||
'bill_custid' => $_POST['bill_custid'], 'bill_ref' => $_POST['bill_ref'], 'bill_notes' => $_POST['bill_notes']);
|
||||
|
||||
$affected = dbInsert($insert, 'bills');
|
||||
|
||||
$message .= $message_break . "Bill ".mres($_POST['bill_name'])." added!";
|
||||
$message_break .= "<br />";
|
||||
}
|
||||
|
||||
echo("<meta http-equiv='refresh' content='10000'>");
|
||||
|
||||
if ($_GET['opta'] == "add")
|
||||
{
|
||||
|
||||
?>
|
||||
<div style='padding:10px;font-size:20px; font-weight: bold;'>Add Bill</div>
|
||||
|
||||
<form name="form1" method="post" action="bills/">
|
||||
|
||||
<input type=hidden name=addbill value=yes>
|
||||
|
||||
<div style="padding: 10px; background: #f0f0f0;">
|
||||
<table cellpadding=2px width=400px>
|
||||
<tr>
|
||||
<td><strong>Description</strong></td>
|
||||
<td><input type="text" name="bill_name" size="32"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Billing Type</strong></td>
|
||||
<td>
|
||||
<input type="radio" name="bill_type" value="cdr" checked /> CDR 95th: <input type="text" name="bill_cdr" size="10">KBps
|
||||
<br />
|
||||
<input type="radio" name="bill_type" value="quota" /> Quota: <input type="text" name="bill_quota" size="10">GB
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Billing Day</strong></td>
|
||||
<td><input type="text" name="bill_day" size="5" value="1"></td>
|
||||
</tr>
|
||||
<tr><td colspan=4><h3>Optional Information</h3></td></tr>
|
||||
<tr>
|
||||
<td><strong>Customer Reference</strong></td>
|
||||
<td><input type="text" name="bill_custid" size="32"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Billing Reference</strong></td>
|
||||
<td><input type="text" name="bill_ref" size="32"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Notes</strong></td>
|
||||
<td><input type="textarea" name="bill_notes" size="32"></td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td></td><td><input type="submit" class="submit" name="Submit" value=" Add Bill "></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
<?php
|
||||
|
||||
} else {
|
||||
|
||||
print_optionbar_start('40');
|
||||
|
||||
?>
|
||||
|
||||
<table cellpadding=7 cellspacing=0 class=devicetable width=100%>
|
||||
<form method='post' action=''>
|
||||
<tr>
|
||||
<td width='40' align=center valign=middle><div style='font-weight: bold; font-size: 16px;'>Bills</div></td>
|
||||
<td width='240'><span style='font-weight: bold; font-size: 14px;'></span>
|
||||
<input type="text" name="hostname" id="hostname" size=40 value="<?php echo($_POST['hostname']); ?>" />
|
||||
</td>
|
||||
<td width='100'>
|
||||
<select name='os' id='os'>
|
||||
<option value=''>All Types</option>
|
||||
<option value=''>CDR</option>
|
||||
<option value=''>95th</option>
|
||||
<option value=''>Quota</option>
|
||||
</select>
|
||||
</td>
|
||||
<td width='100'>
|
||||
<select name='hardware' id='hardware'>
|
||||
<option value=''>All States</option>
|
||||
<option value=''>Under Quota</option>
|
||||
<option value=''>Over Quota</option>
|
||||
</select>
|
||||
</td>
|
||||
<td width='100'>
|
||||
<select name='location' id='location'>
|
||||
<option value=''>All Customers</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input type=submit class=submit value=Search>
|
||||
</td>
|
||||
<td width='80' style='font-weight:bold; font-size: 12px;'>
|
||||
<a href='bills/add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a>
|
||||
</td>
|
||||
</tr>
|
||||
</form>
|
||||
</table>
|
||||
|
||||
<?php
|
||||
|
||||
print_optionbar_end();
|
||||
|
||||
echo("<table border=0 cellspacing=0 cellpadding=5 class=devicetable width=100%>");
|
||||
$i=1;
|
||||
foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
|
||||
{
|
||||
if (bill_permitted($bill['bill_id']))
|
||||
{
|
||||
unset($class);
|
||||
$day_data = getDates($bill['bill_day']);
|
||||
$datefrom = $day_data['0'];
|
||||
$dateto = $day_data['1'];
|
||||
$rate_data = getRates($bill['bill_id'],$datefrom,$dateto);
|
||||
$rate_95th = $rate_data['rate_95th'];
|
||||
$dir_95th = $rate_data['dir_95th'];
|
||||
$total_data = $rate_data['total_data'];
|
||||
$rate_average = $rate_data['rate_average'];
|
||||
|
||||
if ($bill['bill_type'] == "cdr")
|
||||
{
|
||||
$type = "CDR";
|
||||
$allowed = formatRates($bill['bill_cdr'] * 1000);
|
||||
$used = formatRates($rate_data['rate_95th'] * 1000);
|
||||
$percent = round(($rate_data['rate_95th'] / $bill['bill_cdr']) * 100,2);
|
||||
} elseif ($bill['bill_type'] == "quota") {
|
||||
$type = "Quota";
|
||||
$allowed = formatStorage($bill['bill_gb']* 1024 * 1024 * 1024);
|
||||
$used = formatStorage($rate_data['total_data'] * 1024 * 1024);
|
||||
$percent = round(($rate_data['total_data'] / ($bill['bill_gb'] * 1024)) * 100,2);
|
||||
}
|
||||
|
||||
$background = get_percentage_colours($percent);
|
||||
$right_background = $background['right'];
|
||||
$left_background = $background['left'];
|
||||
|
||||
if (!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
|
||||
echo("
|
||||
<tr bgcolor='$row_colour'>
|
||||
<td width='7'></td>
|
||||
<td width='250'><a href='bill/".$bill['bill_id']."/'><span style='font-weight: bold;' class=interface>".$bill['bill_name']."</span></a></td>
|
||||
<td>$notes</td>
|
||||
<td>$type</td>
|
||||
<td>$allowed</td>
|
||||
<td>$used</td>
|
||||
<td width=370>".print_percentage_bar (350, 20, $perc, NULL, "ffffff", $background['left'], $percent . "%", "ffffff", $background['right'])."</td>
|
||||
<td width=60><a href='bill/".$bill['bill_id']."/edit/'><img src='images/16/wrench.png' align=absmiddle alt='Edit'> Edit</a></td>
|
||||
</tr>
|
||||
");
|
||||
$i++;
|
||||
} ### PERMITTED
|
||||
}
|
||||
echo("</table>");
|
||||
}
|
||||
|
||||
echo("</td></tr></table>");
|
||||
|
||||
?>
|
||||
<?php
|
||||
|
||||
if ($_POST['addbill'] == "yes")
|
||||
{
|
||||
$updated = '1';
|
||||
|
||||
$insert = array('bill_name' => $_POST['bill_name'], 'bill_type' => $_POST['bill_type'], 'bill_cdr' => $_POST['bill_cdr'], 'bill_day' => $_POST['bill_day'], 'bill_gb' => $_POST['bill_quota'],
|
||||
'bill_custid' => $_POST['bill_custid'], 'bill_ref' => $_POST['bill_ref'], 'bill_notes' => $_POST['bill_notes']);
|
||||
|
||||
$affected = dbInsert($insert, 'bills');
|
||||
|
||||
$message .= $message_break . "Bill ".mres($_POST['bill_name'])." added!";
|
||||
$message_break .= "<br />";
|
||||
}
|
||||
|
||||
echo("<meta http-equiv='refresh' content='10000'>");
|
||||
|
||||
if ($_GET['opta'] == "add")
|
||||
{
|
||||
|
||||
?>
|
||||
<div style='padding:10px;font-size:20px; font-weight: bold;'>Add Bill</div>
|
||||
|
||||
<form name="form1" method="post" action="bills/">
|
||||
|
||||
<input type=hidden name=addbill value=yes>
|
||||
|
||||
<div style="padding: 10px; background: #f0f0f0;">
|
||||
<table cellpadding=2px width=400px>
|
||||
<tr>
|
||||
<td><strong>Description</strong></td>
|
||||
<td><input type="text" name="bill_name" size="32"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Billing Type</strong></td>
|
||||
<td>
|
||||
<input type="radio" name="bill_type" value="cdr" checked /> CDR 95th: <input type="text" name="bill_cdr" size="10">KBps
|
||||
<br />
|
||||
<input type="radio" name="bill_type" value="quota" /> Quota: <input type="text" name="bill_quota" size="10">GB
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Billing Day</strong></td>
|
||||
<td><input type="text" name="bill_day" size="5" value="1"></td>
|
||||
</tr>
|
||||
<tr><td colspan=4><h3>Optional Information</h3></td></tr>
|
||||
<tr>
|
||||
<td><strong>Customer Reference</strong></td>
|
||||
<td><input type="text" name="bill_custid" size="32"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Billing Reference</strong></td>
|
||||
<td><input type="text" name="bill_ref" size="32"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Notes</strong></td>
|
||||
<td><input type="textarea" name="bill_notes" size="32"></td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td></td><td><input type="submit" class="submit" name="Submit" value=" Add Bill "></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
<?php
|
||||
|
||||
} else {
|
||||
|
||||
print_optionbar_start('40');
|
||||
|
||||
?>
|
||||
|
||||
<table cellpadding=7 cellspacing=0 class=devicetable width=100%>
|
||||
<form method='post' action=''>
|
||||
<tr>
|
||||
<td width='40' align=center valign=middle><div style='font-weight: bold; font-size: 16px;'>Bills</div></td>
|
||||
<td width='240'><span style='font-weight: bold; font-size: 14px;'></span>
|
||||
<input type="text" name="hostname" id="hostname" size=40 value="<?php echo($_POST['hostname']); ?>" />
|
||||
</td>
|
||||
<td width='100'>
|
||||
<select name='os' id='os'>
|
||||
<option value=''>All Types</option>
|
||||
<option value=''>CDR</option>
|
||||
<option value=''>95th</option>
|
||||
<option value=''>Quota</option>
|
||||
</select>
|
||||
</td>
|
||||
<td width='100'>
|
||||
<select name='hardware' id='hardware'>
|
||||
<option value=''>All States</option>
|
||||
<option value=''>Under Quota</option>
|
||||
<option value=''>Over Quota</option>
|
||||
</select>
|
||||
</td>
|
||||
<td width='100'>
|
||||
<select name='location' id='location'>
|
||||
<option value=''>All Customers</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input type=submit class=submit value=Search>
|
||||
</td>
|
||||
<td width='80' style='font-weight:bold; font-size: 12px;'>
|
||||
<a href='bills/add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a>
|
||||
</td>
|
||||
</tr>
|
||||
</form>
|
||||
</table>
|
||||
|
||||
<?php
|
||||
|
||||
print_optionbar_end();
|
||||
|
||||
echo("<table border=0 cellspacing=0 cellpadding=5 class=devicetable width=100%>");
|
||||
$i=1;
|
||||
foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
|
||||
{
|
||||
if (bill_permitted($bill['bill_id']))
|
||||
{
|
||||
unset($class);
|
||||
$day_data = getDates($bill['bill_day']);
|
||||
$datefrom = $day_data['0'];
|
||||
$dateto = $day_data['1'];
|
||||
$rate_data = getRates($bill['bill_id'],$datefrom,$dateto);
|
||||
$rate_95th = $rate_data['rate_95th'];
|
||||
$dir_95th = $rate_data['dir_95th'];
|
||||
$total_data = $rate_data['total_data'];
|
||||
$rate_average = $rate_data['rate_average'];
|
||||
|
||||
if ($bill['bill_type'] == "cdr")
|
||||
{
|
||||
$type = "CDR";
|
||||
$allowed = formatRates($bill['bill_cdr'] * 1000);
|
||||
$used = formatRates($rate_data['rate_95th'] * 1000);
|
||||
$percent = round(($rate_data['rate_95th'] / $bill['bill_cdr']) * 100,2);
|
||||
} elseif ($bill['bill_type'] == "quota") {
|
||||
$type = "Quota";
|
||||
$allowed = formatStorage($bill['bill_gb']* 1024 * 1024 * 1024);
|
||||
$used = formatStorage($rate_data['total_data'] * 1024 * 1024);
|
||||
$percent = round(($rate_data['total_data'] / ($bill['bill_gb'] * 1024)) * 100,2);
|
||||
}
|
||||
|
||||
$background = get_percentage_colours($percent);
|
||||
$right_background = $background['right'];
|
||||
$left_background = $background['left'];
|
||||
|
||||
if (!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
|
||||
echo("
|
||||
<tr bgcolor='$row_colour'>
|
||||
<td width='7'></td>
|
||||
<td width='250'><a href='bill/".$bill['bill_id']."/'><span style='font-weight: bold;' class=interface>".$bill['bill_name']."</span></a></td>
|
||||
<td>$notes</td>
|
||||
<td>$type</td>
|
||||
<td>$allowed</td>
|
||||
<td>$used</td>
|
||||
<td width=370>".print_percentage_bar (350, 20, $perc, NULL, "ffffff", $background['left'], $percent . "%", "ffffff", $background['right'])."</td>
|
||||
<td width=60><a href='bill/".$bill['bill_id']."/edit/'><img src='images/16/wrench.png' align=absmiddle alt='Edit'> Edit</a></td>
|
||||
</tr>
|
||||
");
|
||||
$i++;
|
||||
} ### PERMITTED
|
||||
}
|
||||
echo("</table>");
|
||||
}
|
||||
|
||||
echo("</td></tr></table>");
|
||||
|
||||
?>
|
||||
|
||||
+118
-119
@@ -1,119 +1,118 @@
|
||||
<?php
|
||||
|
||||
if ($vars['view'] == 'graphs' || $vars['view'] == 'minigraphs')
|
||||
{
|
||||
if (isset($vars['graph'])) { $graph_type = "port_" . $vars['graph']; } else { $graph_type = "port_bits"; }
|
||||
}
|
||||
if (!$vars['view']) { $vars['view'] = "basic"; }
|
||||
|
||||
|
||||
$link_array = array('page' => 'device',
|
||||
'device' => $device['device_id'],
|
||||
'tab' => 'ports');
|
||||
|
||||
print_optionbar_start();
|
||||
|
||||
$menu_options['basic'] = 'Basic';
|
||||
$menu_options['details'] = 'Details';
|
||||
$menu_options['arp'] = 'ARP Table';
|
||||
|
||||
if(dbFetchCell("SELECT * FROM links AS L, ports AS I WHERE I.device_id = '".$device['device_id']."' AND I.interface_id = L.local_interface_id"))
|
||||
{
|
||||
$menu_options['neighbours'] = 'Neighbours';
|
||||
}
|
||||
if(dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE `ifType` = 'adsl'"))
|
||||
{
|
||||
$menu_options['adsl'] = 'ADSL';
|
||||
}
|
||||
|
||||
|
||||
$sep = "";
|
||||
foreach ($menu_options as $option => $text)
|
||||
{
|
||||
echo($sep);
|
||||
if ($vars['view'] == $option) { echo("<span class='pagemenu-selected'>"); }
|
||||
echo(generate_link($text,$link_array,array('view'=>$option)));
|
||||
if ($vars['view'] == $option) { echo("</span>"); }
|
||||
$sep = " | ";
|
||||
}
|
||||
|
||||
unset($sep);
|
||||
|
||||
echo(' | Graphs: ');
|
||||
|
||||
$graph_types = array("bits" => "Bits",
|
||||
"upkts" => "Unicast Packets",
|
||||
"nupkts" => "Non-Unicast Packets",
|
||||
"errors" => "Errors",
|
||||
"etherlike" => "Etherlike");
|
||||
|
||||
foreach ($graph_types as $type => $descr)
|
||||
{
|
||||
echo("$type_sep");
|
||||
if ($vars['graph'] == $type && $vars['view'] == "graphs") { echo("<span class='pagemenu-selected'>"); }
|
||||
echo(generate_link($descr,$link_array,array('view'=>'graphs','graph'=>$type)));
|
||||
if ($vars['graph'] == $type && $vars['view'] == "graphs") { echo("</span>"); }
|
||||
|
||||
echo(' (');
|
||||
if ($vars['graph'] == $type && $vars['view'] == "minigraphs") { echo("<span class='pagemenu-selected'>"); }
|
||||
echo(generate_link('Mini',$link_array,array('view'=>'minigraphs','graph'=>$type)));
|
||||
if ($vars['graph'] == $type && $vars['view'] == "minigraphs") { echo("</span>"); }
|
||||
echo(')');
|
||||
$type_sep = " | ";
|
||||
}
|
||||
|
||||
print_optionbar_end();
|
||||
|
||||
if ($vars['view'] == 'minigraphs')
|
||||
{
|
||||
$timeperiods = array('-1day','-1week','-1month','-1year');
|
||||
$from = '-1day';
|
||||
echo("<div style='display: block; clear: both; margin: auto; min-height: 500px;'>");
|
||||
unset ($seperator);
|
||||
|
||||
## FIX THIS. UGLY.
|
||||
|
||||
foreach (dbFetchRows("select * from ports WHERE device_id = ? ORDER BY ifIndex", array($device['device_id'])) as $port)
|
||||
{
|
||||
echo("<div style='display: block; padding: 3px; margin: 3px; min-width: 183px; max-width:183px; min-height:90px; max-height:90px; text-align: center; float: left; background-color: #e9e9e9;'>
|
||||
<div style='font-weight: bold;'>".makeshortif($port['ifDescr'])."</div>
|
||||
<a href=\"" . generate_port_url($port) . "\" onmouseover=\"return overlib('\
|
||||
<div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$port['ifDescr']."</div>\
|
||||
".$port['ifAlias']." \
|
||||
<img src=\'graph.php?type=".$graph_type."&id=".$port['interface_id']."&from=".$from."&to=".$now."&width=450&height=150\'>\
|
||||
', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >".
|
||||
"<img src='graph.php?type=".$graph_type."&id=".$port['interface_id']."&from=".$from."&to=".$now."&width=180&height=45&legend=no'>
|
||||
</a>
|
||||
<div style='font-size: 9px;'>".truncate(short_port_descr($port['ifAlias']), 32, '')."</div>
|
||||
</div>");
|
||||
}
|
||||
echo("</div>");
|
||||
} elseif ($vars['view'] == "arp" || $vars['view'] == "adsl" || $vars['view'] == "neighbours") {
|
||||
include("ports/".$vars['view'].".inc.php");
|
||||
} else {
|
||||
if ($vars['view'] == "details") { $port_details = 1; }
|
||||
echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
|
||||
$i = "1";
|
||||
|
||||
global $port_cache;
|
||||
global $port_index_cache;
|
||||
|
||||
$ports = dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = '0' ORDER BY `ifIndex` ASC", array($device['device_id']));
|
||||
### As we've dragged the whole database, lets pre-populate our caches :)
|
||||
### FIXME - we should probably split the fetching of link/stack/etc into functions and cache them here too to cut down on single row queries.
|
||||
foreach($ports as $port)
|
||||
{
|
||||
$port_cache[$port['interface_id']] = $port;
|
||||
$port_index_cache[$port['device_id']][$port['ifIndex']] = $port;
|
||||
}
|
||||
|
||||
foreach ($ports as $port)
|
||||
{
|
||||
include("includes/print-interface.inc.php");
|
||||
$i++;
|
||||
}
|
||||
echo("</table></div>");
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
<?php
|
||||
|
||||
if ($vars['view'] == 'graphs' || $vars['view'] == 'minigraphs')
|
||||
{
|
||||
if (isset($vars['graph'])) { $graph_type = "port_" . $vars['graph']; } else { $graph_type = "port_bits"; }
|
||||
}
|
||||
if (!$vars['view']) { $vars['view'] = "basic"; }
|
||||
|
||||
|
||||
$link_array = array('page' => 'device',
|
||||
'device' => $device['device_id'],
|
||||
'tab' => 'ports');
|
||||
|
||||
print_optionbar_start();
|
||||
|
||||
$menu_options['basic'] = 'Basic';
|
||||
$menu_options['details'] = 'Details';
|
||||
$menu_options['arp'] = 'ARP Table';
|
||||
|
||||
if(dbFetchCell("SELECT * FROM links AS L, ports AS I WHERE I.device_id = '".$device['device_id']."' AND I.interface_id = L.local_interface_id"))
|
||||
{
|
||||
$menu_options['neighbours'] = 'Neighbours';
|
||||
}
|
||||
if(dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE `ifType` = 'adsl'"))
|
||||
{
|
||||
$menu_options['adsl'] = 'ADSL';
|
||||
}
|
||||
|
||||
|
||||
$sep = "";
|
||||
foreach ($menu_options as $option => $text)
|
||||
{
|
||||
echo($sep);
|
||||
if ($vars['view'] == $option) { echo("<span class='pagemenu-selected'>"); }
|
||||
echo(generate_link($text,$link_array,array('view'=>$option)));
|
||||
if ($vars['view'] == $option) { echo("</span>"); }
|
||||
$sep = " | ";
|
||||
}
|
||||
|
||||
unset($sep);
|
||||
|
||||
echo(' | Graphs: ');
|
||||
|
||||
$graph_types = array("bits" => "Bits",
|
||||
"upkts" => "Unicast Packets",
|
||||
"nupkts" => "Non-Unicast Packets",
|
||||
"errors" => "Errors",
|
||||
"etherlike" => "Etherlike");
|
||||
|
||||
foreach ($graph_types as $type => $descr)
|
||||
{
|
||||
echo("$type_sep");
|
||||
if ($vars['graph'] == $type && $vars['view'] == "graphs") { echo("<span class='pagemenu-selected'>"); }
|
||||
echo(generate_link($descr,$link_array,array('view'=>'graphs','graph'=>$type)));
|
||||
if ($vars['graph'] == $type && $vars['view'] == "graphs") { echo("</span>"); }
|
||||
|
||||
echo(' (');
|
||||
if ($vars['graph'] == $type && $vars['view'] == "minigraphs") { echo("<span class='pagemenu-selected'>"); }
|
||||
echo(generate_link('Mini',$link_array,array('view'=>'minigraphs','graph'=>$type)));
|
||||
if ($vars['graph'] == $type && $vars['view'] == "minigraphs") { echo("</span>"); }
|
||||
echo(')');
|
||||
$type_sep = " | ";
|
||||
}
|
||||
|
||||
print_optionbar_end();
|
||||
|
||||
if ($vars['view'] == 'minigraphs')
|
||||
{
|
||||
$timeperiods = array('-1day','-1week','-1month','-1year');
|
||||
$from = '-1day';
|
||||
echo("<div style='display: block; clear: both; margin: auto; min-height: 500px;'>");
|
||||
unset ($seperator);
|
||||
|
||||
## FIX THIS. UGLY.
|
||||
|
||||
foreach (dbFetchRows("select * from ports WHERE device_id = ? ORDER BY ifIndex", array($device['device_id'])) as $port)
|
||||
{
|
||||
echo("<div style='display: block; padding: 3px; margin: 3px; min-width: 183px; max-width:183px; min-height:90px; max-height:90px; text-align: center; float: left; background-color: #e9e9e9;'>
|
||||
<div style='font-weight: bold;'>".makeshortif($port['ifDescr'])."</div>
|
||||
<a href=\"" . generate_port_url($port) . "\" onmouseover=\"return overlib('\
|
||||
<div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$port['ifDescr']."</div>\
|
||||
".$port['ifAlias']." \
|
||||
<img src=\'graph.php?type=".$graph_type."&id=".$port['interface_id']."&from=".$from."&to=".$now."&width=450&height=150\'>\
|
||||
', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >".
|
||||
"<img src='graph.php?type=".$graph_type."&id=".$port['interface_id']."&from=".$from."&to=".$now."&width=180&height=45&legend=no'>
|
||||
</a>
|
||||
<div style='font-size: 9px;'>".truncate(short_port_descr($port['ifAlias']), 32, '')."</div>
|
||||
</div>");
|
||||
}
|
||||
echo("</div>");
|
||||
} elseif ($vars['view'] == "arp" || $vars['view'] == "adsl" || $vars['view'] == "neighbours") {
|
||||
include("ports/".$vars['view'].".inc.php");
|
||||
} else {
|
||||
if ($vars['view'] == "details") { $port_details = 1; }
|
||||
echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
|
||||
$i = "1";
|
||||
|
||||
global $port_cache, $port_index_cache;
|
||||
|
||||
$ports = dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = '0' ORDER BY `ifIndex` ASC", array($device['device_id']));
|
||||
### As we've dragged the whole database, lets pre-populate our caches :)
|
||||
### FIXME - we should probably split the fetching of link/stack/etc into functions and cache them here too to cut down on single row queries.
|
||||
foreach($ports as $port)
|
||||
{
|
||||
$port_cache[$port['interface_id']] = $port;
|
||||
$port_index_cache[$port['device_id']][$port['ifIndex']] = $port;
|
||||
}
|
||||
|
||||
foreach ($ports as $port)
|
||||
{
|
||||
include("includes/print-interface.inc.php");
|
||||
$i++;
|
||||
}
|
||||
echo("</table></div>");
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
@@ -14,7 +14,7 @@ if ($vars['view'] == 'graphs' || $vars['view'] == 'minigraphs')
|
||||
}
|
||||
|
||||
if (!$vars['view']) { $vars['view'] = "basic"; }
|
||||
|
||||
|
||||
$menu_options['basic'] = 'Basic';
|
||||
#$menu_options['details'] = 'Details';
|
||||
|
||||
|
||||
@@ -199,8 +199,8 @@ foreach ($ports as $port)
|
||||
$this_port['ifTrunk'] = $this_port['vlanTrunkPortEncapsulationOperType'];
|
||||
}
|
||||
$this_port['ifVlan'] = $this_port['vmVlan'];
|
||||
if(isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; }
|
||||
|
||||
if (isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; }
|
||||
|
||||
if (isset($this_port['dot1qPvid']))
|
||||
{
|
||||
$this_port['ifVlan'] = $this_port['dot1qPvid'];
|
||||
|
||||
Reference in New Issue
Block a user