Skip to content

replaced short tags with productive tags and fixed some minor bugs #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

replaced short tags with productive tags and fixed some minor bugs #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8e32bc2
replaced php short tags with valid productive tags
wagnst Dec 3, 2015
326ace4
fixed forgotten short tags in index.php
wagnst Dec 3, 2015
aaea830
fixed missing index tag
wagnst Dec 3, 2015
3c90b47
fixed missing index tag for total traffic
wagnst Dec 3, 2015
3f98211
added gitignore file
wagnst Dec 3, 2015
f9367e4
created gitignore file
wagnst Dec 3, 2015
3fdf549
fixed spacing in config.php
wagnst Dec 3, 2015
bdbf06b
inserted test in graph.php
wagnst Dec 3, 2015
2fbdc0d
some additional graphing output
wagnst Dec 3, 2015
6c67122
more grap testing
wagnst Dec 3, 2015
f71be6b
more graph draw tries
wagnst Dec 3, 2015
c6a4681
test
wagnst Dec 3, 2015
a23ed41
showing transferred bold
wagnst Dec 3, 2015
8bc59aa
fixed showing ip in graph
wagnst Dec 3, 2015
0b9df7c
align tests
wagnst Dec 3, 2015
78bb60a
align test
wagnst Dec 3, 2015
6d01b86
removed dumb interval and added more sensful ones
wagnst Dec 3, 2015
f4126a2
more intervals
wagnst Dec 3, 2015
f6c15b6
pointing monthly to selected default
wagnst Dec 3, 2015
48da4cc
replaced logo
wagnst Dec 3, 2015
8ecd83c
removed default selection
wagnst Dec 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries
# .idea/shelf

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Not push config.php
config.php
6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
define("DFLT_WIDTH", 900);
define("DFLT_HEIGHT", 256);
define("DFLT_INTERVAL", INT_DAILY);

$db_connect_string = "user = bandwidthd password = band dbname = bandwidthd host = localhost";
}
else {
Expand Down
7 changes: 4 additions & 3 deletions details.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?include("include.php");?>
<?php include("include.php");?>
<!DOCTYPE HTML>
<html>
<head>
Expand All @@ -14,7 +14,7 @@
<body>
<div class="container content">
<img alt="logo" src="logo.gif">
<? trim_get ();
<?php trim_get ();

if (isset($_GET['sensor_id'])) {
$sensor_id = filter_var($_GET['sensor_id'], FILTER_SANITIZE_NUMBER_INT);
Expand Down Expand Up @@ -157,4 +157,5 @@

</div>";

include('footer.php');
include('footer.php');
?>
2 changes: 1 addition & 1 deletion footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
</div>
<?
<?php
echo("Page load completed in ". (time() - $starttime) ." seconds");
?>
</body>
Expand Down
19 changes: 12 additions & 7 deletions graph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?
<?php
require("include.php");

// Returns x location of any given timestamp
Expand Down Expand Up @@ -295,25 +295,29 @@ function AverageAndAccumulate()
$tx_rx_text = "Transfered";

//|| $_GET['table'] == "bd_rx_total_log" || $_GET['table'] == "bd_rx_log"))



$txtHosterName = sprintf("(c) Cubyte CuTraf");

$txtIpHost = sprintf("IP: %s", $ip);

if ($SentPeak < 1024/8)
$txtPeakSendRate = sprintf("Peak %s Rate: %.1f KBits/sec", $tx_rx_text, $SentPeak*8);
else if ($SentPeak < (1024*1024)/8)
$txtPeakSendRate = sprintf("Peak %s Rate: %.1f MBits/sec", $tx_rx_text, ($SentPeak*8.0)/1024.0);
else
$txtPeakSendRate = sprintf("Peak %s Rate: %.1f GBits/sec", $tx_rx_text, ($SentPeak*8.0)/(1024.0*1024.0));

if ($TotalSent < 1024)
$txtTotalSent = sprintf("%s %.1f KBytes", $tx_rx_text, $TotalSent);
else if ($TotalSent < 1024*1024)
$txtTotalSent = sprintf("%s %.1f MBytes", $tx_rx_text, $TotalSent/1024.0);
else
$txtTotalSent = sprintf("%s %.1f GBytes", $tx_rx_text, $TotalSent/(1024.0*1024.0));

ImageString($im, 2, XOFFSET+5, $height-20, $txtTotalSent, $black);
ImageString($im, 2, $width/2+XOFFSET/2, $height-20, $txtPeakSendRate, $black);
ImageString($im, 3, XOFFSET+5, $height-20, $txtTotalSent, $black);
ImageString($im, 2, $width/3+XOFFSET/3, $height-20, $txtPeakSendRate, $black);
ImageString($im, 2, $width/1.5+XOFFSET/4, $height-20, $txtIpHost, $black);
ImageString($im, 2, $width/1.2+XOFFSET/4, $height-20, $txtHosterName, $black);

// Draw X Axis

Expand Down Expand Up @@ -532,4 +536,5 @@ function AverageAndAccumulate()
}

imagepng($im);
imagedestroy($im);
imagedestroy($im);
?>
5 changes: 4 additions & 1 deletion include.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?
<?php
define("INT_5M", 60*5);
define("INT_10M", 60*10);
define("INT_HOURLY", 60*60);
define("INT_DAILY", 60*60*24*2);
define("INT_WEEKLY", 60*60*24*8);
define("INT_MONTHLY", 60*60*24*35);
Expand Down
38 changes: 20 additions & 18 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?include("include.php");?>
<?php include("include.php");?>
<!DOCTYPE HTML>
<html>
<head>
Expand All @@ -14,7 +14,7 @@
<body>
<div class="container content">
<img id="logo" alt="logo" src="logo.gif">
<?
<?php
trim_get();

// Get variables from url and set defaults
Expand Down Expand Up @@ -55,7 +55,7 @@
<div class="form-group">
<select class="form-control" name="sensor_id">
<option value="none">--Select A Sensor--
<? $sql = "SELECT sensor_id,sensor_name from sensors order by sensor_name;";
<?php $sql = "SELECT sensor_id,sensor_name from sensors order by sensor_name;";
$result = pg_query($sql);
while ($r = pg_fetch_array($result))
{
Expand All @@ -67,30 +67,31 @@
<div class="form-group">
<select class="form-control" name="interval">
<option value="none">--Select An Interval--
<option value=<?=INT_DAILY?> <?=isset($interval) && $interval==INT_DAILY?"SELECTED":""?>>Daily
<option value=<?=INT_WEEKLY?> <?=isset($interval) && $interval==INT_WEEKLY?"SELECTED":""?>>Weekly
<option value=<?=INT_MONTHLY?> <?=isset($interval) && $interval==INT_MONTHLY?"SELECTED":""?>>Monthly
<option value=<?=INT_YEARLY?> <?=isset($interval) && $interval==INT_YEARLY?"SELECTED":""?>>Yearly
<option value=<?=24*60*60?> <?=isset($interval) && $interval==24*60*60?"SELECTED":""?>>24hrs
<option value=<?=30*24*60*60?> <?=isset($interval) && $interval==30*24*60*60?"SELECTED":""?>>30days
<option value=<?php echo INT_5M?> <?php echo isset($interval) && $interval==INT_5M?"SELECTED":""?>>5 Min
<option value=<?php echo INT_10M?> <?php echo isset($interval) && $interval==INT_10M?"SELECTED":""?>>10 Min
<option value=<?php echo INT_HOURLY?> <?php echo isset($interval) && $interval==INT_HOURLY?"SELECTED":""?>>Hourly
<option value=<?php echo INT_DAILY?> <?php echo isset($interval) && $interval==INT_DAILY?"SELECTED":""?>>Daily
<option value=<?php echo INT_WEEKLY?> <?php echo isset($interval) && $interval==INT_WEEKLY?"SELECTED":""?>>Weekly
<option value=<?php echo INT_MONTHLY?> <?php echo isset($interval) && $interval==INT_MONTHLY?"SELECTED":""?>>Monthly
<option value=<?php echo INT_YEARLY?> <?php echo isset($interval) && $interval==INT_YEARLY?"SELECTED":""?>>Yearly
</select>
</div>
<div class="form-group">
<select class="form-control" name="limit">
<option value="none">--How Many Results--
<option value="20" <?=isset($limit) && $limit==20?"SELECTED":""?>>20
<option value="50" <?=isset($limit) && $limit==50?"SELECTED":""?>>50
<option value="100" <?=isset($limit) && $limit==100?"SELECTED":""?>>100
<option value="all" <?=isset($limit) && $limit=="all"?"SELECTED":""?>>All
<option value="20" <?php echo isset($limit) && $limit==20?"SELECTED":""?>>20
<option value="50" <?php echo isset($limit) && $limit==50?"SELECTED":""?>>50
<option value="100" <?php echo isset($limit) && $limit==100?"SELECTED":""?>>100
<option value="all" <?php echo isset($limit) && $limit=="all"?"SELECTED":""?>>All
</select>
</div>
<div class="form-group">
<input id="subnet" class="form-control" name="subnet" value="<?=isset($subnet)?$subnet:"0.0.0.0/0"?>">
<input id="subnet" class="form-control" name="subnet" value="<?php echo isset($subnet)?$subnet:"0.0.0.0/0"?>">
</div>
<input class="btn btn-success" type="submit" value="Go">
</form>

<? if (!isset($sensor_id)) exit(0);
<?php if (!isset($sensor_id)) exit(0);

$sql = "SELECT sensor_name from sensors WHERE sensor_id = $sensor_id ;";
$result = pg_query($sql);
Expand Down Expand Up @@ -218,7 +219,7 @@
$total_table2 = "bd_rx_log";
}
echo "<div class='panel panel-default'>
<div class='panel-heading'>
<div id='Total' class='panel-heading'>
<h3 class='panel-title'><a href='details.php?sensor_id=$sensor_id&amp;ip=$subnet'>Total - Total of $subnet</a></h3>
</div>
<div class='panel-body'>
Expand All @@ -240,7 +241,7 @@
$r = pg_fetch_array($result, $Counter);
echo "<div class='panel panel-default'>
<div class='panel-heading'>
<h3 class='panel-title'><a href='details.php?sensor_id=$sensor_id&amp;ip=".$r['ip']."'>";
<h3 id='".$r['ip']."' class='panel-title'><a href='details.php?sensor_id=$sensor_id&amp;ip=".$r['ip']."'>";
if ($r['ip'] == "0.0.0.0") {
echo "Total - Total of all subnets";
}
Expand All @@ -253,4 +254,5 @@
<div class='well'>Receive:<br><img alt='graph' src='graph.php?ip=".$r['ip']."&amp;interval=$interval&amp;sensor_id=".$sensor_id."&amp;table=bd_rx_log&amp;yscale=".(max($r['txscale'], $r['rxscale']))."'/><br>
<img alt='legend' src='legend.gif'/><br></div></div></div>";
}
include('footer.php');
include('footer.php');
?>
3 changes: 2 additions & 1 deletion info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<?php
phpinfo();
phpinfo();
?>
Binary file modified logo.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.