summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2007-02-25 22:42:37 +0000
committerSeth Mos <seth.mos@xs4all.nl>2007-02-25 22:42:37 +0000
commit683bf0319b2b972e8e1b774cfd5ff3d4c2b98df5 (patch)
treec5404dadbfa3075e264bf7233d52edab699c993f
parentdcbeba9c5cb7d3363e6f64730867ce881aa0092e (diff)
downloadpfsense-683bf0319b2b972e8e1b774cfd5ff3d4c2b98df5.zip
pfsense-683bf0319b2b972e8e1b774cfd5ff3d4c2b98df5.tar.gz
Fix ajax image refresh
-rwxr-xr-xusr/local/www/status_rrd_graph.php45
1 files changed, 39 insertions, 6 deletions
diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 0ba76f5..2b1f3f4 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -158,7 +158,6 @@ include("head.inc");
}
break;;
case "allgraphs":
- echo "<!-- matched $curdatabase all option $curoption -->\n";
break;;
default:
/* just use the name here */
@@ -168,7 +167,9 @@ include("head.inc");
}
if((file_exists("{$rrddbpath}{$curdatabase}"))) {
echo "<tr><td colspan=2 class=\"list\">\n";
- echo "<IMG BORDER='0' name='{$interval}-{$curif}' id='{$interval}-{$curif}' ALT=\"$prettydb Graph\" SRC=\"status_rrd_graph_img.php?interval=$interval&amp;database={$curdatabase}&amp;style={$curstyle}\" />\n";
+ echo "<IMG BORDER='0' name='{$interval}-{$curoption}-{$curdatabase}' ";
+ echo "id='{$interval}-{$curoption}-{$curdatabase}' ALT=\"$prettydb Graph\" ";
+ echo "SRC=\"status_rrd_graph_img.php?interval=$interval&amp;database={$curdatabase}&amp;style={$curstyle}\" />\n";
echo "<br /><hr><br />\n";
echo "</td></tr>\n";
} else {
@@ -186,10 +187,42 @@ include("head.inc");
//alert('updating');
var randomid = Math.floor(Math.random()*11);
<?php
- /* generate update events utilizing prototype $('') feature */
- echo "\n";
- foreach($periods as $period => $interval)
- echo "\t\t\$('{$interval}-{$curif}').src='status_rrd_graph_img.php?interval={$interval}&database={$curdatabase}&style={$curstyle}&tmp=' + randomid;\n";
+ foreach($periods as $period => $interval) {
+ /* check which databases are valid for our category */
+ foreach($databases as $curdatabase) {
+ if(! stristr($curdatabase, $curcat)) {
+ continue;
+ }
+ $optionc = split("-", $curdatabase);
+ $search = array("-", ".rrd", $optionc);
+ $replace = array(" :: ", "", $friendly);
+ switch($curoption) {
+ case "outbound":
+ /* only show interfaces with a gateway */
+ $optionc = "$optionc[0]";
+ $friendly = convert_friendly_interface_to_friendly_descr(strtolower($optionc));
+ $realif = convert_friendly_interface_to_real_interface_name(strtolower($optionc));
+ $monitorip = get_interface_gateway(strtolower($optionc));
+ if($monitorip == "") {
+ continue 2;
+ }
+ if(! stristr($curdatabase, $optionc)) {
+ continue 2;
+ }
+ break;;
+ case "allgraphs":
+ break;;
+ default:
+ /* just use the name here */
+ if(! stristr($curdatabase, $curoption)) {
+ continue 2;
+ }
+ }
+ /* generate update events utilizing prototype $('') feature */
+ echo "\n";
+ echo "\t\t\$('{$interval}-{$curoption}-{$curdatabase}').src='status_rrd_graph_img.php?interval={$interval}&database={$curdatabase}&style={$curstyle}&tmp=' + randomid;\n";
+ }
+ }
?>
window.setTimeout('update_graph_images()', 355000);
}
OpenPOWER on IntegriCloud