Return stock dashboard to git

dashboard/index.php

@@ -86,7 +86,7 @@ if ($CallingHome['Active']) {
     <meta name="robots" content="<?php echo $PageOptions['MetaAuthor']; ?>"/>
 
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <title><?php echo str_replace("XLX", "URF", $Reflector->GetReflectorName()); ?> Universal Reflector</title>
+    <title><?php echo str_replace("XLX", "URF", $Reflector->GetReflectorName()); ?>Universal Reflector</title>
     <link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">
     <!-- Bootstrap core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -156,7 +156,7 @@ if ($CallingHome['Active']) {
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav navbar-right">
-                <li class="navbar-info">V#<?php echo $Reflector->GetVersion(); ?> - Dashboard
+                <li class="navbar-info">V#Q<?php echo $Reflector->GetVersion(); ?> - Dashboard
                     v<?php echo $PageOptions['DashboardVersion']; ?></li>
                 <li class="navbar-info">Service
                     uptime: <?php echo FormatSeconds($Reflector->GetServiceUptime()); ?></li>

dashboard/pgs/class.reflector.php

@@ -27,7 +27,6 @@ class xReflector {
    public $Interlinks               = null;
    private $InterlinkXML            = null;
    private $ReflectorXML            = null;
-   public $TotalNodeCount			= null;
    
    public function __construct() {
       $this->Nodes             = array();
@@ -35,7 +34,6 @@ class xReflector {
       $this->Peers             = array();
       $this->Interlinks        = array();
       $this->Transferinterlink = false;
-      $this->TotalNodeCount	   = 5;
    }
    
    public function LoadXML() {
@@ -460,16 +458,6 @@ class xReflector {
       return -1;
    }
          
-   public function SetTotalNodes($n) {
-      $this->TotalNodeCount = $n;
-      //error_log(print_r("SetTotalNodes() ".$this->TotalNodeCount.":".$n."\n", TRUE)); 
-   }
-   
-   public function GetTotalNodes() {
-	   //error_log(print_r("GetTotalNodes() ".$this->TotalNodeCount."\n", TRUE)); 
-      return $this->TotalNodeCount;
-   }
-         
 }
 
 ?>

dashboard/pgs/config.inc.php

@@ -62,7 +62,7 @@ $CallingHome['Comment']                              = "your_comment";
 $CallingHome['HashFile']                             = "/xlxd-ch/callinghome.php";             // Make sure the apache user has read and write permissions in this folder.
 $CallingHome['LastCallHomefile']                     = "/xlxd-ch/lastcallhome.php";            // lastcallhome.php can remain in the tmp folder
 $CallingHome['OverrideIPAddress']                    = "";                                     // Insert your IP address here. Leave blank for autodetection. No need to enter a fake address.
-$CallingHome['InterlinkFile']                        = "/usr/local/etc/urfd.interlink";        // Path to interlink file
+$CallingHome['InterlinkFile']                        = "/usr/local/etc/xlxd.interlink";        // Path to interlink file
 
 /*
   include an extra config file for people who dont like to mess with shipped config.ing.php

dashboard/pgs/country.csv

@@ -10,13 +10,13 @@ Andorra;AD;C3
 Angola;AO;D2-D3
 Anguilla;AI;VP2E
 Annobon Island;GQ;3C0
-Antarctica;AQ;ATA-ATN-AT0-CE9-DP0-DP1-DP2-ED-EM-FT8Y-HL8-DT8-IA0-KC4AA-KC4US-LU1Z-LU2Z-LU3Z-LU4Z-LU5Z-LU6Z-LU7Z-LU8Z-LU9Z-LU0Z-LZ0-OA0-OJ1-OR4-RI1A-VK0-VP8-VU-ZL5-ZL9-ZS7-ZV0-ZX0-3Y-8J1
+Antarctica;AQ;CE9-KC4A-KC4U
 Antigua and Barbuda;AG;V2
 Argentina;AR;LO-LP-LQ-LR-LS-LT-LU-LV-LW
 Armenia;AM;EK
 Aruba;AW;P4
 Ascension Island;SH;ZD8
-Asiatic Russia;RU;UA0-UA8-UA9-UB0-UB8-UB9-UC0-UC8-UC9-UD0-UD8-UD9-UE0-UE8-UE9-UF0-UF8-UF9-UG0-UG8-UG9-UH0-UH8-UH9-UI0-UI8-UI9-RA0-RA8-RA9-RB0-RB8-RB9-RC0-RC8-RC9-RD0-RD8-RD9-RE0-RE8-RE9-RF0-RF8-RF9-RG0-RG8-RG9-RH0-RH8-RH9-RI0-RI8-RI9-RJ0-RJ8-RJ9-RK0-RK8-RK9-RL0-RL8-RL9-RM0-RM8-RM9-RN0-RN8-RN9-RO0-RO8-RO9-RP0-RP8-RP9-RQ0-RQ8-RQ9-RR0-RR8-RR9-RS0-RS8-RS9-RT0-RT8-RT9-RU0-RU8-RU9-RV0-RV8-RV9-RW0-RW8-RW9-RX0-RX8-RX9-RY0-RY8-RY9-RZ0-RZ8-RZ9-R8-R9
+Asiatic Russia;RU;UA0-UA8-UA9-UB0-UB8-UB9-UC0-UC8-UC9-UD0-UD8-UD9-UE0-UE8-UE9-UF0-UF8-UF9-UG0-UG8-UG9-UH0-UH8-UH9-UI0-UI8-UI9-RA0-RA8-RA9-RB0-RB8-RB9-RC0-RC8-RC9-RD0-RD8-RD9-RE0-RE8-RE9-RF0-RF8-RF9-RG0-RG8-RG9-RH0-RH8-RH9-RI0-RI8-RI9-RJ0-RJ8-RJ9-RK0-RK8-RK9-RL0-RL8-RL9-RM0-RM8-RM9-RN0-RN8-RN9-RO0-RO8-RO9-RP0-RP8-RP9-RQ0-RQ8-RQ9-RR0-RR8-RR9-RS0-RS8-RS9-RT0-RT8-RT9-RU0-RU8-RU9-RV0-RV8-RV9-RW0-RW8-RW9-RX0-RX8-RX9-RY0-RY8-RY9-RZ0-RZ8-RZ9
 Australia;AU;VK-AX
 Austria;AT;OE
 Azerbaijan;AZ;4J-4K
@@ -88,12 +88,12 @@ Eastern Kiribati (Line Island);KI;T32
 Ecuador;EC;HC-HD
 Egypt;EG;SU
 El Salvador;SV;YS-HU
-England;GB;2E-M0-M1-M2-M3-M4-M5-M6-M7-M8-M9-MB-MX-G0-G1-G2-G3-G4-G5-G6-G7-G8-G9-GB-GX
+England;EN;2E-M0-M1-M2-M3-M4-M5-M6-M7-M8-M9-MB-MX-G0-G1-G2-G3-G4-G5-G6-G7-G8-G9-GB-GX
 Equatorial Guinea;GQ;3C
 Eritrea;ER;E3
 Estonia;EE;ES
 Ethiopia;ET;ET
-European Russia;RU;UA1-UA3-UA4-UA5-UA6-UA7-UB1-UB2-UB3-UB4-UB5-UB6-UB7-UC1-UC2-UC3-UC4-UC5-UC6-UC7-UD1-UD2-UD3-UD4-UD5-UD6-UD7-UE1-UE2-UE3-UE4-UE5-UE6-UE7-UF1-UF2-UF3-UF4-UF5-UF6-UF7-UG1-UG2-UG3-UG4-UG5-UG6-UG7-UH1-UH2-UH3-UH4-UH5-UH6-UH7-UI1-UI2-UI3-UI4-UI5-UI6-UI7-RA1-RA3-RA4-RA5-RA6-RA7-RB1-RB2-RB3-RB4-RB5-RB6-RB7-RC1-RC2-RC3-RC4-RC5-RC6-RC7-RD1-RD2-RD3-RD4-RD5-RD6-RD7-RE1-RE2-RE3-RE4-RE5-RE6-RE7-RF1-RF2-RF3-RF4-RF5-RF6-RF7-RG1-RG2-RG3-RG4-RG5-RG6-RG7-RH1-RH2-RH3-RH4-RH5-RH6-RH7-RI1-RI2-RI3-RI4-RI5-RI6-RI7-RJ1-RJ2-RJ3-RJ4-RJ5-RJ6-RJ7-RK1-RK2-RK3-RK4-RK5-RK6-RK7-RL1-RL2-RL3-RL4-RL5-RL6-RL7-RM1-RM2-RM3-RM4-RM5-RM6-RM7-RN1-RN2-RN3-RN4-RN5-RN6-RN7-RO1-RO2-RO3-RO4-RO5-RO6-RO7-RP1-RP2-RP3-RP4-RP5-RP6-RP7-RQ1-RQ2-RQ3-RQ4-RQ5-RQ6-RQ7-RR1-RR2-RR3-RR4-RR5-RR6-RR7-RS1-RS2-RS3-RS4-RS5-RS6-RS7-RT1-RT2-RT3-RT4-RT5-RT6-RT7-RU1-RU2-RU3-RU4-RU5-RU6-RU7-RV1-RV2-RV3-RV4-RV5-RV6-RV7-RW1-RW2-RW3-RW4-RW5-RW6-RW7-RX1-RX2-RX3-RX4-RX5-RX6-RX7-RY1-RY2-RY3-RY4-RY5-RY6-RY7-RZ1-RZ2-RZ3-RZ4-RZ5-RZ6-RZ7-R1-R2-R3-R4-R5-R6-R7
+European Russia;RU;UA1-UA3-UA4-UA5-UA6-UA7-UB1-UB2-UB3-UB4-UB5-UB6-UB7-UC1-UC2-UC3-UC4-UC5-UC6-UC7-UD1-UD2-UD3-UD4-UD5-UD6-UD7-UE1-UE2-UE3-UE4-UE5-UE6-UE7-UF1-UF2-UF3-UF4-UF5-UF6-UF7-UG1-UG2-UG3-UG4-UG5-UG6-UG7-UH1-UH2-UH3-UH4-UH5-UH6-UH7-UI1-UI2-UI3-UI4-UI5-UI6-UI7-RA1-RA3-RA4-RA5-RA6-RA7-RB1-RB2-RB3-RB4-RB5-RB6-RB7-RC1-RC2-RC3-RC4-RC5-RC6-RC7-RD1-RD2-RD3-RD4-RD5-RD6-RD7-RE1-RE2-RE3-RE4-RE5-RE6-RE7-RF1-RF2-RF3-RF4-RF5-RF6-RF7-RG1-RG2-RG3-RG4-RG5-RG6-RG7-RH1-RH2-RH3-RH4-RH5-RH6-RH7-RI1-RI2-RI3-RI4-RI5-RI6-RI7-RJ1-RJ2-RJ3-RJ4-RJ5-RJ6-RJ7-RK1-RK2-RK3-RK4-RK5-RK6-RK7-RL1-RL2-RL3-RL4-RL5-RL6-RL7-RM1-RM2-RM3-RM4-RM5-RM6-RM7-RN1-RN2-RN3-RN4-RN5-RN6-RN7-RO1-RO2-RO3-RO4-RO5-RO6-RO7-RP1-RP2-RP3-RP4-RP5-RP6-RP7-RQ1-RQ2-RQ3-RQ4-RQ5-RQ6-RQ7-RR1-RR2-RR3-RR4-RR5-RR6-RR7-RS1-RS2-RS3-RS4-RS5-RS6-RS7-RT1-RT2-RT3-RT4-RT5-RT6-RT7-RU1-RU2-RU3-RU4-RU5-RU6-RU7-RV1-RV2-RV3-RV4-RV5-RV6-RV7-RW1-RW2-RW3-RW4-RW5-RW6-RW7-RX1-RX2-RX3-RX4-RX5-RX6-RX7-RY1-RY2-RY3-RY4-RY5-RY6-RY7-RZ1-RZ2-RZ3-RZ4-RZ5-RZ6-RZ7
 Falkland Islands (Malvinas);FK;VP8
 Faroe Islands;FO;OY
 Fiji;FJ;3D2

dashboard/pgs/repeaters.php

@@ -3,10 +3,11 @@
 		<th class="col-md-1">#</th>
 		<th class="col-md-1">Flag</th>
 		<th class="col-md-2">DV Station</th>
+		<th class="col-md-1">Band</th>
 		<th class="col-md-2">Last Heard</th>
 		<th class="col-md-2">Linked for</th>
 		<th class="col-md-1">Protocol</th>
-<?php
+		<th class="col-md-1">Module</th><?php
 
 if ($PageOptions['RepeatersPage']['IPModus'] != 'HideIP') {
 	echo '
@@ -16,61 +17,7 @@ if ($PageOptions['RepeatersPage']['IPModus'] != 'HideIP') {
 ?>
 		</tr>
 <?php
-function startsWith($haystack, $needle) {
-    return $needle === "" || strrpos($haystack, $needle, -strlen($haystack)) !== false;
-}
-
-function searchForKey($field, $needle, $array) {
-	foreach ($array as $key => $val) {
-		if ($val[$field] === $needle) {
-			return $key;
-		}
-	}
-	return null;
-}
-
-function getLinkedGateways($logLines) {
-
-	$gateways = Array();
-	for ($i = count($logLines); $i>0; $i--) {
-		if(isset($logLines[$i])){
-			$logLine = $logLines[$i];
-
-			if (strpos($logLine, "Starting P25Reflector")) {
-				return $gateways;
-			}
-			if (strpos($logLine, "No repeaters/gateways linked")) {
-				return $gateways;
-			}
-			if (strpos($logLine, "Currently linked repeaters")) {
-				for ($j = $i+1; $j <= count($logLines); $j++) {
-					if(isset($logLines[$j])){
-						$logLine = $logLines[$j];
-						if (!startsWith(substr($logLine,27), "   ")) {
-							return $gateways;
-						} else {
-							//$Reflector->SetTotalNodes($Reflector->GetTotalNodes() + 1); 
-							$timestamp = substr($logLine, 3, 19);
-							$callsign = substr($logLine, 31, 11);
-							//$callsign = explode(" ", $callsign);
-							$ipport = substr($logLine, 43);
-							//$ipport = explode(":", $ipport);
-							$key1 = searchForKey("ipport",$ipport, $gateways);
-							$key2 = searchForKey("callsign",$callsign, $gateways);
-							if (($key1 === NULL) && ($key2 == NULL)) {
-								array_push($gateways, Array('callsign'=>$callsign,'timestamp'=>$timestamp,'ipport'=>$ipport));
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	return $gateways;
-}
-
 $Reflector->LoadFlags();
-$i = 0;
 
 for ($i=0;$i<$Reflector->NodeCount();$i++) {
 
@@ -82,11 +29,33 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
 		echo '<a href="#" class="tip"><img src="./img/flags/'.$Flag.'.png" class="table-flag" alt="'.$Name.'"><span>'.$Name.'</span></a>';
 	}
 	echo '</td>
-	<td>'.$Reflector->Nodes[$i]->GetCallSign();
+	<td><a href="http://www.aprs.fi/'.$Reflector->Nodes[$i]->GetCallSign();
+	if ($Reflector->Nodes[$i]->GetSuffix() != "") echo '-'.$Reflector->Nodes[$i]->GetSuffix();
+	echo '" class="pl" target="_blank">'.$Reflector->Nodes[$i]->GetCallSign();
+	if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.$Reflector->Nodes[$i]->GetSuffix(); }
+	echo '</a></td>
+	<td>';
+	if (($Reflector->Nodes[$i]->GetPrefix() == 'REF') || ($Reflector->Nodes[$i]->GetPrefix() == 'XRF')) {
+		switch ($Reflector->Nodes[$i]->GetPrefix()) {
+			case 'REF'  : echo 'REF-Link'; break;
+			case 'XRF'  : echo 'XRF-Link'; break;
+		}
+	}
+	else {
+		switch ($Reflector->Nodes[$i]->GetSuffix()) {
+			case 'A' : echo '23cm'; break;
+			case 'B' : echo '70cm'; break;
+			case 'C' : echo '2m'; break;
+			case 'D' : echo 'Dongle'; break;
+			case 'G' : echo 'Internet-Gateway'; break;
+			default  : echo '';
+		}
+	}
 	echo '</td>
 	<td>'.date("d.m.Y H:i", $Reflector->Nodes[$i]->GetLastHeardTime()).'</td>
 	<td>'.FormatSeconds(time()-$Reflector->Nodes[$i]->GetConnectTime()).' s</td>
-	<td>'.$Reflector->Nodes[$i]->GetProtocol().'</td>';
+	<td>'.$Reflector->Nodes[$i]->GetProtocol().'</td>
+	<td>'.$Reflector->Nodes[$i]->GetLinkedModule().'</td>';
 	if ($PageOptions['RepeatersPage']['IPModus'] != 'HideIP') {
 		echo '<td>';
 		$Bytes = explode(".", $Reflector->Nodes[$i]->GetIP());
@@ -119,62 +88,9 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
 		echo '</td>';
    }
    echo '</tr>';
-   
-   
    if ($i == $PageOptions['RepeatersPage']['LimitTo']) { $i = $Reflector->NodeCount()+1; }
 }
 
-//$Reflector->SetTotalNodes($Reflector->NodeCount());
-
-$logLines = array();
-//error_log(print_r("logLines ".count($logLines)."\n", TRUE)); 
-if ($log = fopen("/var/log/reflectors/P25-9846-".date("Y-m-d").".log", 'r')) {
-	while ($logLine = fgets($log)) {
-		array_push($logLines, $logLine);
-	}
-	fclose($log);
-}
-//error_log(print_r("logLines ".count($logLines)."\n", TRUE)); 
-$gateways = getLinkedGateways($logLines) ;
-//error_log(print_r("gateways ".count($gateways)."\n", TRUE)); 
-//$Reflector->SetTotalNodes($Reflector->NodeCount() + count($p25gateways));
-	
-foreach ($gateways as $gateway) {
-	$i += 1;
-	echo '<tr class="table-center">';
-	echo "<td>$i</td><td>";
-	list ($Flag, $Name) = $Reflector->GetFlag($gateway['callsign']);
-	if (file_exists("./img/flags/".$Flag.".png")) {
-		echo '<a href="#" class="tip"><img src="./img/flags/'.$Flag.'.png" class="table-flag" alt="'.$Name.'"><span>'.$Name.'</span></a></td>';
-	}
-	$cs = explode(" ", $gateway['callsign']);
-	$ip = explode(":", $gateway['ipport']);
-	
-	echo "<td>$cs[0]</td><td></td><td></td><td>P25</td><td>$ip[0]</td></tr>";
-}
-
-if ($log = fopen("/var/log/reflectors/NXDNReflector-".date("Y-m-d").".log", 'r')) {
-	while ($logLine = fgets($log)) {
-		array_push($logLines, $logLine);
-	}
-	fclose($log);
-}
-$gateways = getLinkedGateways($logLines);
-	
-foreach ($gateways as $gateway) {
-	$i += 1;
-	echo '<tr class="table-center">';
-	echo "<td>$i</td><td>";
-	list ($Flag, $Name) = $Reflector->GetFlag($gateway['callsign']);
-	if (file_exists("./img/flags/".$Flag.".png")) {
-		echo '<a href="#" class="tip"><img src="./img/flags/'.$Flag.'.png" class="table-flag" alt="'.$Name.'"><span>'.$Name.'</span></a></td>';
-	}
-	$cs = explode(" ", $gateway['callsign']);
-	$ip = explode(":", $gateway['ipport']);
-	
-	echo "<td>$cs[0]</td><td></td><td></td><td>NXDN</td><td>$ip[0]</td></tr>";
-}
-
 ?>
 
 </table>

reflector/Main.h

@@ -128,7 +128,7 @@ enum class EProtocol { any, none, dextra, dplus, dcs, bm, urf, dmrplus, dmrmmdvm
 #define DMRMMDVM_KEEPALIVE_TIMEOUT      (DMRMMDVM_KEEPALIVE_PERIOD*10)      // in seconds
 #define DMRMMDVM_REFLECTOR_SLOT         DMR_SLOT2
 #define DMRMMDVM_REFLECTOR_COLOUR       1
-#define DMRMMDVM_DEFAULTID              3126482
+#define DMRMMDVM_DEFAULTID              0
 
 // YSF
 #define YSF_PORT                        42000                               // UDP port