diff --git a/include/functions.php b/include/functions.php index d3eabde..4c894e3 100644 --- a/include/functions.php +++ b/include/functions.php @@ -499,6 +499,18 @@ function getActualReflector($logLines, $mode) { return "Reflector not linked"; } +function getActiveYSFReflectors() { + $reflectorlist = Array(); + $file = fopen(YSFHOSTSPATH."/".YSFHOSTSFILENAME, 'r'); + while (($line = fgetcsv($file, 1000, ";")) !== FALSE) { + //$line is an array of the csv elements +// print_r($line); + array_push($reflectorlist, array($line[1], $line[2], $line[0], $line[5])); + } + fclose($file); + return $reflectorlist; +} +/* function getActiveYSFReflectors($logLines) { // 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 @@ -528,7 +540,7 @@ function getActiveYSFReflectors($logLines) { array_multisort($reflectorlist); return $reflectorlist; } - +*/ function getYSFReflectorById($id, $reflectors) { if ($id ==-1) { return "not linked"; diff --git a/include/ysfgatewayinfo.php b/include/ysfgatewayinfo.php index fee6e85..8781ef7 100644 --- a/include/ysfgatewayinfo.php +++ b/include/ysfgatewayinfo.php @@ -20,7 +20,7 @@
-
YSFReflectors reported active last 2 hours
+
YSFReflectors reported active
@@ -36,29 +36,15 @@ - add(new DateInterval('PT60M')); - if ($now->format('U') >= $timestamp2->format('U')) { - echo ""; - } else { - $timestamp2 = new DateTime($timestamp); - $timestamp2->add(new DateInterval('PT30M')); - if ($now->format('U') >= $timestamp2->format('U')) { - echo ""; - } else {echo ""; - } - } + echo ""; echo ""; - for ($i = 0; $i < 5; $i++) { + for ($i = 0; $i < 4; $i++) { echo""; } echo "\n"; diff --git a/setup.php b/setup.php index e58d963..b0fe9a0 100644 --- a/setup.php +++ b/setup.php @@ -79,7 +79,7 @@ include "include/tools.php";
>
- Path to DMR-ID-Database-File + Path to DMR-ID-Database-File (including filename) " name="DMRIDDATPATH" class="form-control" placeholder="/var/mmdvm/DMRIDs.dat" aria-describedby="DMRIDDATPATH">
@@ -105,6 +105,14 @@ include "include/tools.php"; YSFGateway.ini-filename" name="YSFGATEWAYINIFILENAME" class="form-control" placeholder="YSFGateway.ini" aria-describedby="YSFGATEWAYINIFILENAME"> +
+ Path to YSFHosts.txt + " name="YSFHOSTSPATH" class="form-control" placeholder="/etc/YSFGateway/" aria-describedby="YSFHOSTSPATH"> +
+
+ YSFGateway.ini-filename + " name="YSFHOSTSFILENAME" class="form-control" placeholder="YSFHosts.txt" aria-describedby="YSFHOSTSFILENAME"> +

ircddbgateway-Configuration

diff --git a/version.php b/version.php index a9a046d..80121c2 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@
Description ID ConnectionsLast info of
$counter$reflector[$i]