From baccae607cd134ade70955d0faeac150212883d3 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Wed, 8 Dec 2021 19:36:37 -0800 Subject: [PATCH] rename passphrase page, fix APRS settings registration issue --- bridge.py | 1 + hblink.py | 4 ++++ web/app.py | 6 ++++-- web/templates/flask_user_layout.html | 2 +- web/templates/help.html | 2 +- web/templates/tg_all.html | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bridge.py b/bridge.py index 08e1562..0f9dbe0 100755 --- a/bridge.py +++ b/bridge.py @@ -1022,6 +1022,7 @@ class routerHBP(HBSYSTEM): def __init__(self, _name, _config, _report): HBSYSTEM.__init__(self, _name, _config, _report) ## print(_config) +## print(HBSYSTEM.dat_test(self)) self.name = _name # list of self._targets for unit (subscriber, private) calls diff --git a/hblink.py b/hblink.py index ea51b3b..ba227dd 100755 --- a/hblink.py +++ b/hblink.py @@ -498,6 +498,10 @@ class HBSYSTEM(DatagramProtocol): logger.debug('(%s) RPTPING Sent to Master. Total Sent: %s, Total Missed: %s, Currently Outstanding: %s', self._system, self._stats['PINGS_SENT'], self._stats['PINGS_SENT'] - self._stats['PINGS_ACKD'], self._stats['NUM_OUTSTANDING']) self._stats['PINGS_SENT'] += 1 self._stats['PING_OUTSTANDING'] = True + + # Experimental function to return data from hblink.py into bridge.py + def dat_test(self): + return self._peers def send_peers(self, _packet): for _peer in self._peers: diff --git a/web/app.py b/web/app.py index 5e8759a..4c0b4ac 100644 --- a/web/app.py +++ b/web/app.py @@ -703,8 +703,10 @@ def hbnet_web_service(): aprs_dict[i[0]] = aprs_settings[i[0]] del aprs_settings[i[0]] misc_edit_field_1('unregistered_aprs', str(aprs_settings), '', '', 0, 0, 0, 0, False, False) + if i[0] not in aprs_settings: + aprs_dict[i[0]] = [{'call': str(user.username).upper()}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}] except Exception as e: - aprs_dict[i[0]] = """[{'call': '""" + str(user.username).upper() + """'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]""" + aprs_dict[i[0]] = [{'call': str(user.username).upper()}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}] print(e) edit_user.aprs = str(aprs_dict) @@ -1155,7 +1157,7 @@ def hbnet_web_service(): mail.send(msg) content = '

Sent email to: ' + u.email + '

' else: - content = '''

Find user in "List Users", then click on the email link.'

''' + content = '''

Find user in "List Users", then click on the email link.

''' return render_template('flask_user_layout.html', markup_content = Markup(content)) diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index 1af981c..e18793f 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -125,7 +125,7 @@ diff --git a/web/templates/help.html b/web/templates/help.html index 9733614..80981eb 100644 --- a/web/templates/help.html +++ b/web/templates/help.html @@ -5,7 +5,7 @@

To register for access , click the Register link. Your username MUST be your callsign. Information for you account is pulled from RadioID.net, including all associated DMR IDs with your callsign. After filling out the fields, a confirmation link may be emailed to you. After confirming your email address, your account may be reviewed and approved by an administrator. You may receive an email when your account is approved.

 

Hotspot/Repeater Login

-

To find your passphrase(s) for use with the MMDVM server(s), click on the Passphrase(s) link. This page will display a unique passphrase for each of your DMR IDs. Use the desired DMR ID and passphrase in your hotspot/repeater configuration. Each passphrase is also spelled phonetically for ease of manual entry. A special script to automatically add our MMDVM servers to Pi-Star is available by clicking on link provided on the View Passphrase(s) page (also available here).

+

To find your passphrase(s) for use with the MMDVM server(s), click on the Server(s) link. This page will display a unique passphrase for each of your DMR IDs. Use the desired DMR ID and passphrase in your hotspot/repeater configuration. Each passphrase is also spelled phonetically for ease of manual entry. A special script to automatically add our MMDVM servers to Pi-Star is available by clicking on link provided on the View Passphrase(s) page (also available here).

 

Updating DMR ID Information

If you recently added a DMR ID to RadioID.net, or made any change, you can update your account by clicking on the update link on the user profile settings page.

diff --git a/web/templates/tg_all.html b/web/templates/tg_all.html index 7fa7bae..52c322f 100644 --- a/web/templates/tg_all.html +++ b/web/templates/tg_all.html @@ -4,7 +4,7 @@

 

-

Note: Talkgroups listed here may not be available on all servers. See Passphrase(s) for complete list of talkgroup availability per server.

+

Note: Talkgroups listed here may not be available on all servers. See Server(s) for complete list of talkgroup availability per server.

Download talkgroup CSV | Download talkgroup CSV (Anytone format)