[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r17837: {torstatus} Moving network history to operate with separate Tor node and (torstatus/trunk/web)



Author: kasimir
Date: 2009-01-01 11:09:19 -0500 (Thu, 01 Jan 2009)
New Revision: 17837

Modified:
   torstatus/trunk/web/config_template.php
   torstatus/trunk/web/header.php
   torstatus/trunk/web/index.php
   torstatus/trunk/web/network_history.php
Log:
Moving network history to operate with separate Tor node and web server machines

Modified: torstatus/trunk/web/config_template.php
===================================================================
--- torstatus/trunk/web/config_template.php	2008-12-31 18:25:30 UTC (rev 17836)
+++ torstatus/trunk/web/config_template.php	2009-01-01 16:09:19 UTC (rev 17837)
@@ -85,6 +85,9 @@
 // Comment the following line if you do not want to save Tor Network History
 $TorHistory = true;
 
+$TorHistoryURL = "history/";
+$SSLTorHistoryURL = "history/";
+
 // }}}
 
 // ++++++++++ Interface ++++++++++ {{{

Modified: torstatus/trunk/web/header.php
===================================================================
--- torstatus/trunk/web/header.php	2008-12-31 18:25:30 UTC (rev 17836)
+++ torstatus/trunk/web/header.php	2009-01-01 16:09:19 UTC (rev 17837)
@@ -111,8 +111,8 @@
 <a class='plain' href='index.php#CustomQuery'>Advanced Query Options</a> |
 <a class='plain' href='column_set.php'>Advanced Display Options</a> |
 <a class='plain' href='index.php#Stats'>Network Statistic Summary</a> |
-<a class='plain' href='network_detail.php'>Network Statistic Graphs</a> |
-<a class='plain' href='network_history.php'>Network History</a><br/>
+<a class='plain' href='network_detail.php'>Network Statistic Graphs</a><?php if ($TorHistory == "true") { ?> |
+<a class='plain' href='network_history.php'>Network History</a><?php } ?><br/>
 <a class='plain' href='query_export.php/Tor_query_EXPORT.csv'>CSV List of Current Result Set</a> |
 <a class='plain' href='ip_list_all.php/Tor_ip_list_ALL.csv'>CSV List of All Current Tor Server IP Addresses</a> |
 <a class='plain' href='ip_list_exit.php/Tor_ip_list_EXIT.csv'>CSV List of All Current Tor Server Exit Node IP Addresses</a>

Modified: torstatus/trunk/web/index.php
===================================================================
--- torstatus/trunk/web/index.php	2008-12-31 18:25:30 UTC (rev 17836)
+++ torstatus/trunk/web/index.php	2009-01-01 16:09:19 UTC (rev 17837)
@@ -2235,8 +2235,8 @@
 <a class='plain' href='#CustomQuery' onclick='javascript:caqoToggle = 0;toggleCAQO();'>Advanced Query Options</a> |
 <a class='plain' href='column_set.php'>Advanced Display Options</a> |
 <a class='plain' href='#Stats' onclick='javascript:anssToggle = 0;toggleANSS();'>Network Statistic Summary</a> |
-<a class='plain' href='network_detail.php'>Network Statistic Graphs</a> |
-<a class='plain' href='network_history.php'>Network History</a><br/>
+<a class='plain' href='network_detail.php'>Network Statistic Graphs</a><?php if ($TorHistory == "true") { ?> |
+<a class='plain' href='network_history.php'>Network History</a><?php } ?><br/>
 <a class='plain' href='query_export.php/Tor_query_EXPORT.csv'>CSV List of Current Result Set</a> |
 <a class='plain' href='ip_list_all.php/Tor_ip_list_ALL.csv'>CSV List of All Current Tor Server IP Addresses</a> |
 <a class='plain' href='ip_list_exit.php/Tor_ip_list_EXIT.csv'>CSV List of All Current Tor Server Exit Node IP Addresses</a>

Modified: torstatus/trunk/web/network_history.php
===================================================================
--- torstatus/trunk/web/network_history.php	2008-12-31 18:25:30 UTC (rev 17836)
+++ torstatus/trunk/web/network_history.php	2009-01-01 16:09:19 UTC (rev 17837)
@@ -26,29 +26,29 @@
 			<td class='TRSCN'>
 			<br/>
 			<table class="bwhistory">
-		        <tr>
-		        	<td>
-		                <img src="history/running_6h.png"; alt="Running Servers in the last 6 Hours"/>
-		                </td>
-		                <td>
-		        	<img src="history/running_1d.png"; alt="Running Servers in the last 24 Hours"/>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>running_6h.png"; alt="Running Servers in the last 6 Hours"/>
 				</td>
-		        </tr>
-		        <tr>
-		         	<td>
-				<img src="history/running_1w.png"; alt="Running Servers in the last Week"/>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>running_1d.png"; alt="Running Servers in the last 24 Hours"/>
 				</td>
-		                <td>
-		                <img src="history/running_1m.png"; alt="Running Servers in the last Month"/>
+			</tr>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>running_1w.png"; alt="Running Servers in the last Week"/>
 				</td>
-		     	</tr>
-		        <tr>
-		                <td>
-				<img src="history/running_3m.png"; alt="Running Servers in the last 3 Months"/>		                
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>running_1m.png"; alt="Running Servers in the last Month"/>
 				</td>
-		                <td>
-				<img src="history/running_1y.png"; alt="Running Servers in the last Year"/>
-		                </tr>
+			</tr>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>running_3m.png"; alt="Running Servers in the last 3 Months"/>				
+				</td>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>running_1y.png"; alt="Running Servers in the last Year"/>
+				</tr>
 			</table>
 		</tr>
 		</table>
@@ -58,121 +58,121 @@
 <!-- Running Exit Servers -->
 <tr>
 	<td>
-                <table class="displayTable" width='100%' cellspacing='0' cellpadding='0' align='center'>
-                <tr>
-                        <td class="HRN">Running Exit Servers</td>
-                </tr>
-                <tr>
-                        <td class='TRSCN'>
-                        <br/>
-                        <table class="bwhistory">
-                        <tr>
+		<table class="displayTable" width='100%' cellspacing='0' cellpadding='0' align='center'>
+		<tr>
+			<td class="HRN">Running Exit Servers</td>
+		</tr>
+		<tr>
+			<td class='TRSCN'>
+			<br/>
+			<table class="bwhistory">
+			<tr>
 				<td>
-				<img src="history/runExit_6h.png"; alt="Running Exit Servers in the last 6 Hours"/>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runExit_6h.png"; alt="Running Exit Servers in the last 6 Hours"/>
 				</td>
-                                <td>
-                                <img src="history/runExit_1d.png"; alt="Running Exit Servers in the last 24 Hours"/>
-                                </td>
-                        </tr>
-                        <tr>
-                                <td>
-                                <img src="history/runExit_1w.png"; alt="Running Exit Servers in the last Week"/>
-                                </td> 
-			       	<td>
-                                <img src="history/runExit_1m.png"; alt="Running Exit Servers in the last Month"/>
-                                </td>
-                        </tr>   
-                        <tr>
-                                <td>
-                                <img src="history/runExit_3m.png"; alt="Running Exit Servers in the last 3 Months"/>
-                                </td>
-			       	<td>
-                                <img src="history/runExit_1y.png"; alt="Running Exit Servers in the last Year"/>
-                                </td>
-                        </table>
-                </tr>   
-                </table>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runExit_1d.png"; alt="Running Exit Servers in the last 24 Hours"/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runExit_1w.png"; alt="Running Exit Servers in the last Week"/>
+				</td> 
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runExit_1m.png"; alt="Running Exit Servers in the last Month"/>
+				</td>
+			</tr>	
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runExit_3m.png"; alt="Running Exit Servers in the last 3 Months"/>
+				</td>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runExit_1y.png"; alt="Running Exit Servers in the last Year"/>
+				</td>
+			</table>
+		</tr>	
+		</table>
 	</td>
 </tr>
 
 <!-- Running Guard Servers -->
 <tr>
-        <td>
-                <table class="displayTable" width='100%' cellspacing='0' cellpadding='0' align='center'>
-                <tr>
-                        <td class="HRN">Running Guard Servers</td>
-                </tr>
-                <tr>
-                        <td class='TRSCN'>
-                        <br/>
-                        <table class="bwhistory">
-                        <tr>
-                                <td>
-                                <img src="history/runGuard_6h.png"; alt="Running Guard Servers in the last 6 Hours"/>
-                                </td>
-                                <td>
-                                <img src="history/runGuard_1d.png"; alt="Running Guard Servers in the last 24 Hours"/>
-                                </td>
-                        </tr>
-                        <tr>
-                                <td>
-                                <img src="history/runGuard_1w.png"; alt="Running Guard Servers in the last Week"/>
-                                </td>                         
-			        <td>
-                                <img src="history/runGuard_1m.png"; alt="Running Guard Servers in the last Month"/>
-                                </td>
-                        </tr>
-                        <tr>
-                                <td>
-                                <img src="history/runGuard_3m.png"; alt="Running Guard Servers in the last 3 Months"/>
-                                </td>
+	<td>
+		<table class="displayTable" width='100%' cellspacing='0' cellpadding='0' align='center'>
+		<tr>
+			<td class="HRN">Running Guard Servers</td>
+		</tr>
+		<tr>
+			<td class='TRSCN'>
+			<br/>
+			<table class="bwhistory">
+			<tr>
 				<td>
-                                <img src="history/runGuard_1y.png"; alt="Running Guard Servers in the last Year"/>
-                                </td>
-                        </table>
-                </tr>
-                </table>
-        </td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runGuard_6h.png"; alt="Running Guard Servers in the last 6 Hours"/>
+				</td>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runGuard_1d.png"; alt="Running Guard Servers in the last 24 Hours"/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runGuard_1w.png"; alt="Running Guard Servers in the last Week"/>
+				</td>			      
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runGuard_1m.png"; alt="Running Guard Servers in the last Month"/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runGuard_3m.png"; alt="Running Guard Servers in the last 3 Months"/>
+				</td>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runGuard_1y.png"; alt="Running Guard Servers in the last Year"/>
+				</td>
+			</table>
+		</tr>
+		</table>
+	</td>
 </tr>
 
 <!-- Running Fast Servers -->
 <tr>
-        <td>
-                <table class="displayTable" width='100%' cellspacing='0' cellpadding='0' align='center'>
-                <tr>
-                        <td class="HRN">Running Fast Servers</td>
-                </tr>
-                <tr>
-                        <td class='TRSCN'>
-                        <br/>
-                        <table class="bwhistory">
-                        <tr>
-                                <td>
-                                <img src="history/runFast_6h.png"; alt="Running Fast Servers in the last 6 Hours"/>
-                                </td>
-                                <td>
-                                <img src="history/runFast_1d.png"; alt="Running Fast Servers in the last 24 Hours"/>
-                                </td>
-                        </tr>
-                        <tr>
-                                <td>
-                                <img src="history/runFast_1w.png"; alt="Running Fast Servers in the last Week"/>
-                                </td>
-                                <td>
-                                <img src="history/runFast_1m.png"; alt="Running Fast Servers in the last Month"/>
-                                </td>
-                        </tr>
-                        <tr>
-                                <td>
-                                <img src="history/runFast_3m.png"; alt="Running Fast Servers in the last 3 Months"/>
-                                </td>
-                                <td>
-                                <img src="history/runFast_1y.png"; alt="Running Fast Servers in the last Year"/>
-                                </td>
-                        </table>
-                </tr>
-                </table>
-        </td>
+	<td>
+		<table class="displayTable" width='100%' cellspacing='0' cellpadding='0' align='center'>
+		<tr>
+			<td class="HRN">Running Fast Servers</td>
+		</tr>
+		<tr>
+			<td class='TRSCN'>
+			<br/>
+			<table class="bwhistory">
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runFast_6h.png"; alt="Running Fast Servers in the last 6 Hours"/>
+				</td>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runFast_1d.png"; alt="Running Fast Servers in the last 24 Hours"/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runFast_1w.png"; alt="Running Fast Servers in the last Week"/>
+				</td>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runFast_1m.png"; alt="Running Fast Servers in the last Month"/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runFast_3m.png"; alt="Running Fast Servers in the last 3 Months"/>
+				</td>
+				<td>
+				<img src="<?php echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; ?>runFast_1y.png"; alt="Running Fast Servers in the last Year"/>
+				</td>
+			</table>
+		</tr>
+		</table>
+	</td>
 </tr>
 
 <!-- Country Selection -->
@@ -218,64 +218,64 @@
 				echo "<h3>Running "; echo $country; echo " Servers</h3>";
 				echo "<tr>";
 					echo "<td>";
-					echo "<img src=\"history/countries/running_"; echo $country; echo "_6h.png\"; alt=\"Running Servers in the last 6 Hours\" />";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/running_"; echo $country; echo "_6h.png\"; alt=\"Running Servers in the last 6 Hours\" />";
 					echo "</td>";
 	
 					echo "<td>";
-                	                echo "<img src=\"history/countries/running_"; echo $country; echo "_1d.png\"; alt=\"Running Servers in the last 24 Hours\" />";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/running_"; echo $country; echo "_1d.png\"; alt=\"Running Servers in the last 24 Hours\" />";
 					echo "</td>";
 				echo "</tr>";
 				echo "<tr>";
 					echo "<td>";
-					echo "<img src=\"history/countries/running_"; echo $country; echo "_1w.png\"; alt=\"Running Servers in the last Week\" />";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/running_"; echo $country; echo "_1w.png\"; alt=\"Running Servers in the last Week\" />";
 					echo "</td>";
 	
-	                                echo "<td>";
-        	                        echo "<img src=\"history/countries/running_"; echo $country; echo "_1m.png\"; alt=\"Running Servers in the last Months\" />";
-                	                echo "</td>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/running_"; echo $country; echo "_1m.png\"; alt=\"Running Servers in the last Months\" />";
+					echo "</td>";
 				echo "</tr>";
-                                	echo "<td>";
-	                                echo "<img src=\"history/countries/running_"; echo $country; echo "_3m.png\"; alt=\"Running Servers in the last 3 Months\" />";
-        	                        echo "</td>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/running_"; echo $country; echo "_3m.png\"; alt=\"Running Servers in the last 3 Months\" />";
+					echo "</td>";
 
-                	                echo "<td>";
-                        	        echo "<img src=\"history/countries/running_"; echo $country; echo "_1y.png\"; alt=\"Running Servers in the last Year\" />";
-                                	echo "</td>";
-	                        echo "</tr>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/running_"; echo $country; echo "_1y.png\"; alt=\"Running Servers in the last Year\" />";
+					echo "</td>";
+				echo "</tr>";
 				echo "</table>";
 				echo "<br><br>";
 				echo "<h3>Running "; echo $country; echo " Exit Servers</h3><br>";
 
 				echo "<table class=\"bwhistory\">";
-        	                echo "</tr>";
-                	                echo "<td>";
-                        	        echo "<img src=\"history/countries/runExit_"; echo $country; echo "_6h.png\"; alt=\"Running Exit Servers in the last 6 Hours\" />";
-                                	echo "</td>";
+				echo "</tr>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/runExit_"; echo $country; echo "_6h.png\"; alt=\"Running Exit Servers in the last 6 Hours\" />";
+					echo "</td>";
 
-	                                echo "<td>";
-        	                        echo "<img src=\"history/countries/runExit_"; echo $country; echo "_1d.png\"; alt=\"Running Exit Servers in the last 24 Hours\" />";
-                	                echo "</td>";
-                        	echo "</tr>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/runExit_"; echo $country; echo "_1d.png\"; alt=\"Running Exit Servers in the last 24 Hours\" />";
+					echo "</td>";
+				echo "</tr>";
 
-	                        echo "</tr>";
-        	                        echo "<td>";
-                	                echo "<img src=\"history/countries/runExit_"; echo $country; echo "_1w.png\"; alt=\"Running Exit Servers in the last Week\" />";
-                        	        echo "</td>";
+				echo "</tr>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/runExit_"; echo $country; echo "_1w.png\"; alt=\"Running Exit Servers in the last Week\" />";
+					echo "</td>";
 	
-	                                echo "<td>";
-        	                        echo "<img src=\"history/countries/runExit_"; echo $country; echo "_1m.png\"; alt=\"Running Exit Servers in the last Months\" />";
-                	                echo "</td>";
-                        	echo "</tr>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/runExit_"; echo $country; echo "_1m.png\"; alt=\"Running Exit Servers in the last Months\" />";
+					echo "</td>";
+				echo "</tr>";
 
-	                        echo "</tr>";
-        	                        echo "<td>";
-                	                echo "<img src=\"history/countries/runExit_"; echo $country; echo "_3m.png\"; alt=\"Running Exit Servers in the last 3 Months\" />";
-                        	        echo "</td>";
+				echo "</tr>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/runExit_"; echo $country; echo "_3m.png\"; alt=\"Running Exit Servers in the last 3 Months\" />";
+					echo "</td>";
 
-	                                echo "<td>";
-        	                        echo "<img src=\"history/countries/runExit_"; echo $country; echo "_1y.png\"; alt=\"Running Exit Servers in the last Year\" />";
-                	                echo "</td>";
-                        	echo "</tr>";
+					echo "<td>";
+					echo "<img src=\""; echo $UsingSSL?$SSLTorHistoryURL:$TorHistoryURL; echo "countries/runExit_"; echo $country; echo "_1y.png\"; alt=\"Running Exit Servers in the last Year\" />";
+					echo "</td>";
+				echo "</tr>";
 				}
 			}
 			?>