[or-cvs] r16846: {torstatus} (ticket:118) Allowing BandwidthHistory graphs to use externa (torstatus/trunk/web)

[kasimir@xxxxxxxx]

Author: kasimir
Date: 2008-09-11 10:35:04 -0400 (Thu, 11 Sep 2008)
New Revision: 16846

Modified:
   torstatus/trunk/web/config_template.php
   torstatus/trunk/web/router_detail.php
Log:
(ticket:118) Allowing BandwidthHistory graphs to use external SSL servers

Modified: torstatus/trunk/web/config_template.php
===================================================================
--- torstatus/trunk/web/config_template.php	2008-09-11 14:34:07 UTC (rev 16845)
+++ torstatus/trunk/web/config_template.php	2008-09-11 14:35:04 UTC (rev 16846)
@@ -56,9 +56,10 @@
 
 // Comment the following line if you do not provide a WHOIS service
 define("WHOISPath","whois.php?ip=");
-// If you want to provide a bandwidth history, uncomment the two following lines
+// If you want to provide a bandwidth history, uncomment the followin lines
 //$BandwidthHistory = "true";
-//$BandwidthURL = "bandwidthgraph/";
+$BandwidthURL = "bandwidthgraph/";
+$SSLBandwidthURL = "bandwidthgraph/";
 
 
 // }}}

Modified: torstatus/trunk/web/router_detail.php
===================================================================
--- torstatus/trunk/web/router_detail.php	2008-09-11 14:34:07 UTC (rev 16845)
+++ torstatus/trunk/web/router_detail.php	2008-09-11 14:35:04 UTC (rev 16846)
@@ -610,6 +610,11 @@
 	
 	echo "<br/>\n";
 	if ($BandwidthHistory == "true")
+	{
+		if ($UsingSSL == 1)
+		{
+			$BandwidthURL = $SSLBandwidthURL;
+		}
 	?>
 	<table class="bwhistory">
 		<tr>
@@ -638,6 +643,7 @@
 	</table>
 	<br/>
 	<?php
+	}
 	echo "<b>Signing Key:</b><pre>" . $SigningKey . "</pre>";
 	echo "<b>Onion Key:</b><pre>" . $OnionKey . "</pre>\n";
 	echo "<br/>\n";