From cb65b92a14d2fea1b5200ec0ee5de3e52eaa09a6 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Sat, 13 Jun 2020 12:26:31 -0700 Subject: [PATCH] adding stuff to dashboard --- index.php | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index a08e04d..10e1938 100644 --- a/index.php +++ b/index.php @@ -92,6 +92,23 @@ function MyAndSfxToQrz(string $my, string $sfx) } return $my; } +//https://www.google.com/maps?q=+52.37745,+001.99960 +function Maidenhead(string $maid, double $lat, double $lon) +{ + $str = trim($maid); + if (7 != strlen($str)) + return $maid; + if ($lat >= 0.0) + $slat = '+'.$lat; + else + $slat = $lat; + if ($lon >= 0.0) + $slon = '+'.$lon; + else + $slon = $lon; + $str = ''.$maid.''; + return $str; +} ParseKVFile($cfgdir.'/qn.cfg', $cfg); ParseKVFile($cfgdir.'/defaults', $defaults); @@ -149,15 +166,16 @@ foreach($showlist as $section) { break; case 'LH': echo 'Last Heard:
', "\n"; - $rstr = 'MyCall/Sfx Mod Via Time
'; + $rstr = 'MyCall/Sfx Message Mod Via Location Time
'; echo str_replace(' ', ' ', $rstr), "\n"; $dbname = $cfgdir.'/qn.db'; $db = new SQLite3($dbname, SQLITE3_OPEN_READONLY); - $ss = 'SELECT callsign,sfx,module,reflector,strftime("%s","now")-lasttime FROM LHEARD ORDER BY 5 LIMIT '.GetCFGValue('dash_lastheard_count').' '; + // 0 1 2 3 4 5 6 7 8 + $ss = 'SELECT callsign,sfx,message,module,reflector,maidenhead,latitude,longitude,strftime("%s","now")-lasttime FROM LHEARD ORDER BY 9 LIMIT '.GetCFGValue('dash_lastheard_count').' '; if ($stmnt = $db->prepare($ss)) { if ($result = $stmnt->execute()) { while ($row = $result->FetchArray(SQLITE3_NUM)) { - $rstr = MyAndSfxToQrz($row[0], $row[1]).' '.$row[2].' '.$row[3].' '.SecToString(intval($row[4])).'
'; + $rstr = MyAndSfxToQrz($row[0], $row[1]).' '.$row[2].' '.$row[3].' '.$row[4].' '.Maidenhead($row[5], $row[6], $row[7]).' '.SecToString(intval($row[4])).'
'; echo str_replace('*', ' ', str_replace(' ', ' ', $rstr)), "\n"; } $result->finalize(); @@ -254,6 +272,6 @@ foreach($showlist as $section) { } ?>
-

QnetGateway Dashboard Version 525 Copyright © by Thomas A. Early, N7TAE.

+

QnetGateway Dashboard Version 613 Copyright © by Thomas A. Early, N7TAE.