mirror of https://github.com/kf7eel/hbnet
rename passphrase page, fix APRS settings registration issue
This commit is contained in:
KF7EEL
parent
1cfebe94ef
commit
baccae607c
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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 = '<p style="text-align: center;"><strong>Sent email to: ' + u.email + '</strong></p>'
|
||||
else:
|
||||
content = '''<p style="text-align: center;"><strong>Find user in "List Users", then click on the email link.'</strong></p>'''
|
||||
content = '''<p style="text-align: center;"><strong>Find user in "List Users", then click on the email link.</strong></p>'''
|
||||
return render_template('flask_user_layout.html', markup_content = Markup(content))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
<ul class="dropdown-menu" aria-labelledby="features_menu">
|
||||
<li><a class="dropdown-item" href="{{url}}/mail/{{ current_user.username or current_user.email }}"><i class="bi bi-mailbox"></i> Mailbox </a></li>
|
||||
<li><a class="dropdown-item" href="{{url}}/discussion"><i class="bi bi-chat-right-quote"></i> Discussion </a></li>
|
||||
<li><a class="dropdown-item" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Passphrase(s) </a></li>
|
||||
<li><a class="dropdown-item" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Server(s) </a></li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<p>To register for access , click the <a href="/user/register">Register</a> link. <strong>Your username MUST be your callsign. </strong>Information for you account is pulled from <a href="https://www.radioid.net/">RadioID.net</a>, 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.</p>
|
||||
<p> </p>
|
||||
<h3 style="text-align: center;">Hotspot/Repeater Login</h3>
|
||||
<p>To find your passphrase(s) for use with the MMDVM server(s), click on the <a href="/generate_passphrase">Passphrase(s)</a> 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 <a href="/generate_passphrase/pi-star">here</a>).</p>
|
||||
<p>To find your passphrase(s) for use with the MMDVM server(s), click on the <a href="/generate_passphrase">Server(s)</a> 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 <a href="/generate_passphrase/pi-star">here</a>).</p>
|
||||
<p> </p>
|
||||
<h3 style="text-align: center;">Updating DMR ID Information</h3>
|
||||
<p>If you recently added a DMR ID to <a href="https://www.radioid.net/">RadioID.net</a>, or made any change, you can update your account by clicking on the <a href="/update_ids">update link</a> on the <a href="/user/edit_user_profile">user profile settings</a> page.</p>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
</style>
|
||||
<p> </p>
|
||||
<p style="text-align: center;"><strong>Note:</strong> Talkgroups listed here may not be available on all servers. See <a href="/generate_passphrase">Passphrase(s)</a> for complete list of talkgroup availability per server.</p>
|
||||
<p style="text-align: center;"><strong>Note:</strong> Talkgroups listed here may not be available on all servers. See <a href="/generate_passphrase">Server(s)</a> for complete list of talkgroup availability per server.</p>
|
||||
<p style="text-align: center;"><a href="hbnet_tg.csv"><strong>Download talkgroup CSV</strong></a> | <a href="hbnet_tg_anytone.csv"><strong>Download talkgroup CSV (Anytone format)</strong></a></p>
|
||||
<div class="container-fluid">
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue