diff --git a/html/ajax_listports.php b/html/ajax_listports.php
index 7bd3a40f0..543384a06 100755
--- a/html/ajax_listports.php
+++ b/html/ajax_listports.php
@@ -1,6 +1,7 @@
+?>
\ No newline at end of file
diff --git a/html/billing-graph.php b/html/billing-graph.php
index cff1bc184..d6cda027d 100644
--- a/html/billing-graph.php
+++ b/html/billing-graph.php
@@ -1,6 +1,7 @@
= '$datefrom' AND `timestamp` <= '$dateto'");
$counttot = mysql_result($countsql,0);
@@ -65,89 +67,87 @@ $counttot = mysql_result($countsql,0);
$count = round($counttot / (($ysize - 100) * 2), 0);
if ($count <= 1) { $count = 2; }
-
#$count = 8;
#$count = round($counttot / 260, 0);
#if ($count <= 1) { $count = 2; }
$max = mysql_result(mysql_query("SELECT delta FROM bill_data WHERE bill_id = $bill_id AND timestamp >= $datefrom AND timestamp <= $dateto ORDER BY delta DESC LIMIT 0,1"),0);
-if($max > 1000000) { $div = "1000000"; $yaxis = "Mbit/sec"; } else { $div = "1000"; $yaxis = "Kbit/sec"; }
+if ($max > 1000000) { $div = "1000000"; $yaxis = "Mbit/sec"; } else { $div = "1000"; $yaxis = "Kbit/sec"; }
$i = '0';
#$start = mysql_result(mysql_query("SELECT *, UNIX_TIMESTAMP(timestamp) AS formatted_date FROM bill_data WHERE bill_id = $bill_id AND timestamp >=$datefrom AND timestamp <= $dateto ORDER BY timestamp ASC LIMIT 0,1"),0);
#$end = mysql_result(mysql_query("SELECT *, UNIX_TIMESTAMP(timestamp) AS formatted_date FROM bill_data WHERE bill_id = $bill_id AND timestamp >=$datefrom AND timestamp <= $dateto ORDER BY timestamp DESC LIMIT 0,1"),0);
-$dur = $end - $start;
+$dur = $end - $start;
$sql = "SELECT *, UNIX_TIMESTAMP(timestamp) AS formatted_date FROM bill_data WHERE bill_id = $bill_id AND timestamp >= $datefrom AND timestamp <= $dateto ORDER BY timestamp ASC";
$data = mysql_query($sql);
-while($row = mysql_fetch_array($data))
-{
- @$timestamp = $row['formatted_date'];
- if (!$first) { $first = $timestamp; }
- @$delta = $row['delta'];
- @$period = $row['period'];
- @$in_delta = $row['in_delta'];
- @$out_delta = $row['out_delta'];
- @$in_value = round($in_delta * 8 / $period / $div, 2);
- @$out_value = round($out_delta * 8 / $period / $div, 2);
+while ($row = mysql_fetch_array($data))
+{
+ @$timestamp = $row['formatted_date'];
+ if (!$first) { $first = $timestamp; }
+ @$delta = $row['delta'];
+ @$period = $row['period'];
+ @$in_delta = $row['in_delta'];
+ @$out_delta = $row['out_delta'];
+ @$in_value = round($in_delta * 8 / $period / $div, 2);
+ @$out_value = round($out_delta * 8 / $period / $div, 2);
- #@$data[] = $in_value + $out_value;
- #@$in_data[] = $in_value;
+ #@$data[] = $in_value + $out_value;
+ #@$in_data[] = $in_value;
#@$out_data[] = $out_value;
-# @$ticks[] = $timestamp;
- #@$per_data[] = $rate_95th / 1000;
- #@$ave_data[] = $rate_average / 1000;
+# @$ticks[] = $timestamp;
+ #@$per_data[] = $rate_95th / 1000;
+ #@$ave_data[] = $rate_average / 1000;
- @$last = $timestamp;
+ @$last = $timestamp;
- $iter_in = $iter_in + $in_delta;
- $iter_out = $iter_out + $out_delta;
- $iter_period = $iter_period + $period;
+ $iter_in = $iter_in + $in_delta;
+ $iter_out = $iter_out + $out_delta;
+ $iter_period = $iter_period + $period;
- if ($iter == $count) {
+ if ($iter == $count)
+ {
+ $out_data[$i] = round($iter_out * 8 / $iter_period / $div, 2);
+ $in_data[$i] = round($iter_in * 8 / $iter_period / $div, 2);
+ $tot_data[$i] = $out_data[$i] + $in_data[$i];
+ $ticks[$i] = date('M j g:ia', $timestamp);
+ $ticks[$i] = $timestamp;
+
+ if ($dur < 172800)
+ {
+ $hour = date('h', $timestamp);
+ if ($hour != $lasthour) { $tickPositions[] = $i; $tickLabels[] = date('ga', $timestamp); }
+ $lasthour = $hour;
+ } elseif ($dur < 604800) {
+ $day = date('d', $timestamp);
+ if ($day != $lastday) { $tickPositions[] = $i; $tickLabels[] = date('D', $timestamp); $h = 0; }
+ $lastday = $day;
- $out_data[$i] = round($iter_out * 8 / $iter_period / $div, 2);
- $in_data[$i] = round($iter_in * 8 / $iter_period / $div, 2);
- $tot_data[$i] = $out_data[$i] + $in_data[$i];
- $ticks[$i] = date('M j g:ia', $timestamp);
- $ticks[$i] = $timestamp;
-
- if($dur < 172800) {
- $hour = date('h', $timestamp);
- if($hour != $lasthour) { $tickPositions[] = $i; $tickLabels[] = date('ga', $timestamp); }
- $lasthour = $hour;
+ $hour = trim(date('g', $timestamp));
+ if ($hour != $lasthour)
+ {
+ if ($hour == '12') { $tickMinPositions[] = $i; $h = 0; } $h++;
+ }
- } elseif ($dur < 604800) {
- $day = date('d', $timestamp);
- if($day != $lastday) { $tickPositions[] = $i; $tickLabels[] = date('D', $timestamp); $h = 0; }
- $lastday = $day;
+ $lasthour = $hour;
+ } else {
+ $day = date('d', $timestamp);
+ if ($day != $lastday) { $tickPositions[] = $i; $tickLabels[] = date('dS', $timestamp); }
+ $lastday = $day;
+ }
- $hour = trim(date('g', $timestamp));
- if($hour != $lasthour) {
- if($hour == '12') {$tickMinPositions[] = $i; $h = 0; } $h++;
- }
- $lasthour = $hour;
-
-
- } else {
- $day = date('d', $timestamp);
- if($day != $lastday) { $tickPositions[] = $i; $tickLabels[] = date('dS', $timestamp); }
- $lastday = $day;
- }
-
- $per_data[$i] = $rate_95th / $div;
- $ave_data[$i] = $rate_average / $div;
- $timestamps[$i] = $timestamp;
- $iter = "1";
- $i++;
- unset($iter_out, $iter_in, $iter_period);
- }
-
- $iter++;
+ $per_data[$i] = $rate_95th / $div;
+ $ave_data[$i] = $rate_average / $div;
+ $timestamps[$i] = $timestamp;
+ $iter = "1";
+ $i++;
+ unset($iter_out, $iter_in, $iter_period);
+ }
+ $iter++;
}
#print_r($ticks);
@@ -167,15 +167,16 @@ $graph->img->SetImgFormat("png");
#$graph->img->SetAntiAliasing(true);
$graph->SetScale( "intlin");
#$graph->SetScale('intlin',0,0,$xmin,$xmax);
-$graph->title->Set("$graph_name");
+$graph->title->Set("$graph_name");
$graph->title->SetFont(FF_FONT2,FS_BOLD,10);
$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
#$graph->xaxis->SetTickLabels($ticks);
-if(count($tickPositions) > 24) {
+if (count($tickPositions) > 24)
+{
$graph->xaxis->SetTextLabelInterval(6);
-}elseif(count($tickPositions) > 12) {
+} elseif (count($tickPositions) > 12) {
$graph->xaxis->SetTextLabelInterval(2);
}
@@ -187,9 +188,9 @@ $graph->yaxis->SetLabelAngle(0);
$graph->xaxis->title->SetFont(FF_FONT1,FS_NORMAL,10);
$graph->yaxis->title->SetFont(FF_FONT1,FS_NORMAL,10);
$graph->yaxis->SetTitleMargin(50);
-$graph->xaxis->SetTitleMargin(30);
+$graph->xaxis->SetTitleMargin(30);
#$graph->xaxis->HideLastTickLabel();
-#$graph->xaxis->HideFirstTickLabel();
+#$graph->xaxis->HideFirstTickLabel();
#$graph->yaxis->scale->SetAutoMin(1);
#$graph->xaxis->title->Set("$type");
$graph->yaxis->title->Set("$yaxis");
@@ -216,29 +217,35 @@ $lineplot_out = new LinePlot($out_data);
#$lineplot_out->SetLegend("Traffic Out");
$lineplot_out->SetColor("blue");
-if($_GET['95th']) {
+if ($_GET['95th'])
+{
$lineplot_95th = new LinePlot($per_data);
$lineplot_95th ->SetColor("red");
}
-if($_GET['ave']) {
+if ($_GET['ave'])
+{
$lineplot_ave = new LinePlot($ave_data);
$lineplot_ave ->SetColor("red");
}
#$graph->legend->SetLayout(LEGEND_HOR);
-#$graph->legend->Pos(0.52, 0.85, 'center');
+#$graph->legend->Pos(0.52, 0.85, 'center');
$graph->Add($lineplot);
$graph->Add($lineplot_in);
$graph->Add($lineplot_out);
-if($_GET['95th']) {
+
+if ($_GET['95th'])
+{
$graph->Add($lineplot_95th);
}
-if($_GET['ave']) {
+
+if ($_GET['ave'])
+{
$graph->Add($lineplot_ave);
}
$graph->stroke();
-?>
+?>
\ No newline at end of file
diff --git a/html/graph.php b/html/graph.php
index 4f39e82e8..97e91d86f 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -2,4 +2,4 @@
include("includes/graphs/graph.inc.php");
-?>
+?>
\ No newline at end of file
diff --git a/html/index.php b/html/index.php
index 326849110..0fa5d5131 100755
--- a/html/index.php
+++ b/html/index.php
@@ -1,10 +1,11 @@
$confval) {
- eval("\$config['" . $confitem . "'] = \$confval;");
- }
- } else {
- foreach ($config['branding']['default'] as $confitem => $confval) {
- eval("\$config['" . $confitem . "'] = \$confval;");
- }
- }
+# Load the settings for Multi-Tenancy.
+if (is_array($config['branding'])) {
+ if ($config['branding'][$_SERVER['SERVER_NAME']])
+ {
+ foreach ($config['branding'][$_SERVER['SERVER_NAME']] as $confitem => $confval)
+ {
+ eval("\$config['" . $confitem . "'] = \$confval;");
+ }
+ } else {
+ foreach ($config['branding']['default'] as $confitem => $confval)
+ {
+ eval("\$config['" . $confitem . "'] = \$confval;");
+ }
}
+}
?>
@@ -54,7 +58,7 @@ if(strpos($_SERVER['REQUEST_URI'], "debug")) {
"); }
+if ($config['page_refresh']) { echo(""); }
?>
@@ -64,10 +68,11 @@ if(strpos($_SERVER['REQUEST_URI'], "debug")) {
@@ -77,7 +82,7 @@ function popUp(URL) {
-');} ?>
+'); } ?>
@@ -85,51 +90,53 @@ function popUp(URL) {
');
?>