Fix Onion v3 Addresses

Author: Mirobit

src/Node.php

@@ -12,7 +12,8 @@ class Node {
 	public $tor; // Bool: if tor active
 	public $ipv4Address = 'Unknown';
 	public $ipv6Address = 'Unknown';
-	public $torAddress = 'Unknown';
+  public $torAddress = 'Unknown';
+  public $torVersion = 'Unkown';
 	public $ipv4Proxy;
 	public $ipv6Proxy;
 	public $torProxy;
@@ -78,18 +79,21 @@ function __construct() {
 				$this->torProxy = $network["proxy"] ?? null;
 			}	
 		}
-		$ipAddresses =$networkInfo["localaddresses"];
+    $ipAddresses = $networkInfo["localaddresses"];
 		foreach($ipAddresses as $ipAddress){
 			if(preg_match("/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ipAddress["address"])){
 				$this->ipv4Address = $ipAddress["address"];
 			}
-			if(preg_match("/^[0-9a-z]{1,4}(:[0-9a-z]{0,4}){0,6}$/", $ipAddress["address"])){
+			elseif(preg_match("/^[0-9a-z]{1,4}(:[0-9a-z]{0,4}){0,6}$/", $ipAddress["address"])){
 				$this->ipv6Address = $ipAddress["address"];
 			}
-			if(preg_match("/^[0-9a-z]{16}\.onion$/", $ipAddress["address"])){
-
+			elseif(preg_match("/^[0-9a-z]{16}\.onion$/", $ipAddress["address"])){
+        $this->torVersion = "v2";
+        $this->torAddress = $ipAddress["address"];
+			}elseif(preg_match("/^[0-9a-z]{56}\.onion$/", $ipAddress["address"])){
+        $this->torVersion = "v3";
 				$this->torAddress = $ipAddress["address"];
-			}		
+			}
 		}
 		$this->toConn = checkInt($networkInfo["connections"]);
 		$this->uptime = timeToString($uptimeInfo);

views/main.phtml

@@ -78,7 +78,7 @@
 				  <tr><td><i class="fa fa-clock-o fa-fw"></i> Node Time </td><td> <?= $content['node']->cTime ?></td></tr>
 				  <tr><td><i class="fa <?php echo ($content['node']->ipv4 ? "fa-check-square-o green" : "fa-square-o") ?> fa-fw"></i> IPv4 </td><td> <?php echo  ($content['node']->ipv4Proxy ? '<i class="fa fa-user-secret fa-fw" title='.$content['node']->ipv4Proxy.'>' : ""); echo ($content['node']->ipv4 ? $content['node']->ipv4Address : "No") ?></td></tr>
 				  <tr><td><i class="fa <?php echo ($content['node']->ipv6 ? "fa-check-square-o green" : "fa-square-o") ?> fa-fw"></i> IPv6 </td><td> <?php echo  ($content['node']->ipv6Proxy ? '<i class="fa fa-user-secret fa-fw" title='.$content['node']->ipv6Proxy.'>' : ""); echo ($content['node']->ipv6 ? $content['node']->ipv6Address : "No") ?></td></tr>
-				  <tr><td><i class="fa <?php echo ($content['node']->tor ? "fa-check-square-o green" : "fa-square-o") ?> fa-fw"></i> Tor </td><td> <?php echo  ($content['node']->torProxy ? '<i class="fa fa-user-secret fa-fw" title='.$content['node']->torProxy.'>' : ""); echo ($content['node']->tor ? $content['node']->torAddress : "No") ?></td></tr>
+				  <tr><td><i class="fa <?php echo ($content['node']->tor ? "fa-check-square-o green" : "fa-square-o") ?> fa-fw"></i> Tor </td><td> <?php echo  ($content['node']->torProxy ? '<i class="fa fa-user-secret fa-fw" title='.$content['node']->torProxy.'>' : ""); echo ($content['node']->tor ? '<span title='.$content['node']->torAddress.'>'.$content['node']->torVersion.'</span>' : "No") ?></td></tr>
 				  <tr><td><i class="fa <?php echo (!$content['node']->pruMode ? "fa-square-o green" : "fa-check-square-o orange") ?> fa-fw"></i> Pruning Mode</td><td> <?php echo ($content['node']->pruMode ? "Yes" : "No") ?></td></tr>
 				  <tr><td><i class="fa <?php echo ($content['node']->localRelay ? "fa-square-o green" : "fa-check-square-o orange") ?> fa-fw"></i> Block Only Mode</td><td> <?php echo ($content['node']->localRelay ? "No" : "Yes") ?></td></tr>
 				  <tr><td><i class="fa <?php echo (!$content['node']->mempoolLimited ? "fa-square-o green" : "fa-warning red") ?> fa-fw"></i> Mempool Limited</td><td> <?php echo ($content['node']->mempoolLimited ? "Yes" : "No") ?></td></tr>