make web SMS optional for users
This commit is contained in:
KF7EEL
parent
19ce48081a
commit
e093ae8d83
117
web/app.py
117
web/app.py
|
|
@ -54,7 +54,7 @@ import os, ast
|
||||||
from cryptography.fernet import Fernet
|
from cryptography.fernet import Fernet
|
||||||
|
|
||||||
peer_locations = {}
|
peer_locations = {}
|
||||||
hbnet_version = '0.0.1-pre_alpha'
|
hbnet_version = '0.0.1-pre_pre_alpha'
|
||||||
|
|
||||||
# Query radioid.net for list of IDs
|
# Query radioid.net for list of IDs
|
||||||
def get_ids(callsign):
|
def get_ids(callsign):
|
||||||
|
|
@ -774,7 +774,7 @@ def hbnet_web_service():
|
||||||
for i in mail_all:
|
for i in mail_all:
|
||||||
messages_waiting = messages_waiting + 1
|
messages_waiting = messages_waiting + 1
|
||||||
|
|
||||||
return dict(global_config={'mode': mode, 'messages': messages_waiting, 'registration_enabled': USER_ENABLE_REGISTER, 'hbnet_version': hbnet_version})
|
return dict(global_config={'mode': mode, 'messages': messages_waiting, 'registration_enabled': USER_ENABLE_REGISTER, 'hbnet_version': hbnet_version, 'allow_web_sms': allow_user_sms})
|
||||||
|
|
||||||
|
|
||||||
# Serve favicon
|
# Serve favicon
|
||||||
|
|
@ -3096,10 +3096,17 @@ FLOOD_TIMEOUT = ''' + str(s.unit_time)
|
||||||
<meta http-equiv="refresh" content="1; URL=''' + url + '''/mail/''' + current_user.username + '''" /> '''
|
<meta http-equiv="refresh" content="1; URL=''' + url + '''/mail/''' + current_user.username + '''" /> '''
|
||||||
|
|
||||||
elif request.args.get('send_sms'):
|
elif request.args.get('send_sms'):
|
||||||
sms_que_add(current_user.username, '', 0, int(request.form.get('dmr_id')), 'motorola', 'unit', request.form.get('gateway'), '', current_user.username + ' - ' + request.form.get('message'))
|
u_role = UserRoles.query.filter_by(user_id=current_user.id).first()
|
||||||
content = '''<h3 style="text-align: center;">Message in que.</h3>
|
print(u_role.role_id)
|
||||||
<p style="text-align: center;">Redirecting in 1 seconds.</p>
|
if allow_user_sms == True or u_role.role_id == 1:
|
||||||
<meta http-equiv="refresh" content="1; URL=''' + url + '''/mail/''' + current_user.username + '''" /> '''
|
sms_que_add(current_user.username, '', 0, int(request.form.get('dmr_id')), 'motorola', 'unit', request.form.get('gateway'), '', current_user.username + ' - ' + request.form.get('message'))
|
||||||
|
content = '''<h3 style="text-align: center;">Message in que.</h3>
|
||||||
|
<p style="text-align: center;">Redirecting in 1 seconds.</p>
|
||||||
|
<meta http-equiv="refresh" content="1; URL=''' + url + '''/mail/''' + current_user.username + '''" /> '''
|
||||||
|
elif allow_user_sms == False:
|
||||||
|
content = '''<h3 style="text-align: center;">Web SMS disabled. Contact administrator.</h3>
|
||||||
|
<p style="text-align: center;">Redirecting in 10 seconds.</p>
|
||||||
|
<meta http-equiv="refresh" content="10; URL=''' + url + '''/mail/''' + current_user.username + '''" /> '''
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -7429,106 +7436,8 @@ Name: <strong>''' + p.name + '''</strong> - Port: <strong>''' + str(
|
||||||
## try:
|
## try:
|
||||||
response = jsonify(
|
response = jsonify(
|
||||||
rules=generate_rules(hblink_req['get_rules']),
|
rules=generate_rules(hblink_req['get_rules']),
|
||||||
## OBP=get_OBP(hblink_req['get_config'])
|
|
||||||
|
|
||||||
)
|
)
|
||||||
## except:
|
|
||||||
## message = jsonify(message='Config error')
|
|
||||||
## response = make_response(message, 401)
|
|
||||||
|
|
||||||
#################### Work in progress ###########################33
|
|
||||||
## elif 'update_tg' in hblink_req:
|
|
||||||
## if hblink_req['update_tg']:
|
|
||||||
## print(hblink_req)
|
|
||||||
#### print(hblink_req['data'][0]['SYSTEM'])
|
|
||||||
## if 'on' == hblink_req['mode']:
|
|
||||||
#### try:
|
|
||||||
## if hblink_req['dmr_id'] == 0:
|
|
||||||
## print('id 0')
|
|
||||||
#### print(active_tgs)
|
|
||||||
## for system in active_tgs[hblink_req['update_tg']].items():
|
|
||||||
## ## print(system)
|
|
||||||
## ## print('sys')
|
|
||||||
## if system[0] == hblink_req['data'][0]['SYSTEM']:
|
|
||||||
## print(active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][0]['1'])
|
|
||||||
#### print(hblink_req['data'][2]['tg'])
|
|
||||||
## print('---------')
|
|
||||||
## print(active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][1]['2'])
|
|
||||||
## ## print(hblink_req['data'][1]['ts'])
|
|
||||||
## if hblink_req['data'][1]['ts'] == 1:
|
|
||||||
## #### print(active_tgs[hblink_req['update_tg']][system[0]][0]['1'])
|
|
||||||
##
|
|
||||||
## if active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][0]['1'] == hblink_req['data'][2]['tg']:
|
|
||||||
## pass
|
|
||||||
## else:
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][0]['1'].append(hblink_req['data'][2]['tg'])
|
|
||||||
## #### active_tgs[hblink_req['update_tg']][system[0]][0]['1'].append(0)
|
|
||||||
## if hblink_req['data'][1]['ts'] == 2:
|
|
||||||
## if active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][1]['2'] == hblink_req['data'][2]['tg']:
|
|
||||||
## pass
|
|
||||||
## #### print(active_tgs[hblink_req['update_tg']][system[0]][1]['2'])
|
|
||||||
## else:
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][1]['2'].append(hblink_req['data'][2]['tg'])
|
|
||||||
## else:
|
|
||||||
## try:
|
|
||||||
## print('---------on------------')
|
|
||||||
## print(hblink_req['data'])
|
|
||||||
## print(active_tgs[hblink_req['update_tg']])
|
|
||||||
## print(hblink_req['data'][2]['ts2'])
|
|
||||||
## print('-----------------------')
|
|
||||||
## ## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][2]['SYSTEM'] = hblink_req['data'][0]['SYSTEM']
|
|
||||||
## #### active_tgs[hblink_req['update_tg']][hblink_req['dmr_id']].update({hblink_req['data'][0]['SYSTEM']: [{1:[hblink_req['data'][1]['ts1']]}, {2:[hblink_req['data'][2]['ts2']]}]}) #.update({[hblink_req['dmr_id']]:hblink_req['data']})
|
|
||||||
## if hblink_req['data'][1]['ts1'] not in active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][0]['1']:
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][0]['1'].append(hblink_req['data'][1]['ts1'])
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][2]['SYSTEM'] = hblink_req['data'][0]['SYSTEM']
|
|
||||||
## if hblink_req['data'][2]['ts2'] not in active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][1]['2']:
|
|
||||||
## print('---0---')
|
|
||||||
## print(hblink_req['data'][0]['SYSTEM'])
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][2]['SYSTEM'] = hblink_req['data'][0]['SYSTEM']
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][1]['2'].append(hblink_req['data'][2]['ts2'])
|
|
||||||
#### print('append')
|
|
||||||
## #### active_tgs[hblink_req['update_tg']][system[0]][1]['2'].append(0)
|
|
||||||
## ## print(hblink_req['data'][0]['SYSTEM'])
|
|
||||||
##
|
|
||||||
## ## print(active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']])
|
|
||||||
## ## print(active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][2]['2'])
|
|
||||||
## ## print(hblink_req['data'][1]['ts2'])
|
|
||||||
## ## print(active_tgs[hblink_req['update_tg']])
|
|
||||||
## except:
|
|
||||||
#### active_tgs[hblink_req['update_tg']] = {}
|
|
||||||
## pass
|
|
||||||
##
|
|
||||||
#### except:
|
|
||||||
#### pass
|
|
||||||
##
|
|
||||||
##
|
|
||||||
## elif 'off' == hblink_req['mode']:
|
|
||||||
## print('off')
|
|
||||||
## for system in active_tgs[hblink_req['update_tg']].items():
|
|
||||||
## print(system)
|
|
||||||
## if system[0] == hblink_req['data'][0]['SYSTEM']:
|
|
||||||
## print('yes it is')
|
|
||||||
###### print(system[0])
|
|
||||||
###### print(active_tgs[hblink_req['update_tg']][system[0]])
|
|
||||||
## if hblink_req['data'][1]['ts'] == 1:
|
|
||||||
###### print(active_tgs[hblink_req['update_tg']][system[0]][0]['1'])
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][0]['1'].remove(hblink_req['data'][2]['tg'])
|
|
||||||
###### active_tgs[hblink_req['update_tg']][system[0]][0]['1'].append(0)
|
|
||||||
## if hblink_req['data'][1]['ts'] == 2:
|
|
||||||
###### print(active_tgs[hblink_req['update_tg']][system[0]][1]['2'])
|
|
||||||
## active_tgs[hblink_req['update_tg']][hblink_req['data'][0]['SYSTEM']][1]['2'].remove(hblink_req['data'][2]['tg'])
|
|
||||||
###### active_tgs[hblink_req['update_tg']][system[0]][1]['2'].append(0)
|
|
||||||
##
|
|
||||||
##
|
|
||||||
##
|
|
||||||
#### print()
|
|
||||||
#### print(system)
|
|
||||||
#### print(system[1][2]['SYSTEM'])
|
|
||||||
#### print('off')
|
|
||||||
#### print(hblink_req['data'][1]['ts'])
|
|
||||||
#### print(hblink_req['data'][2]['tg'])
|
|
||||||
## print(active_tgs)
|
|
||||||
## response = 'got it'
|
|
||||||
else:
|
else:
|
||||||
message = jsonify(message='Authentication error')
|
message = jsonify(message='Authentication error')
|
||||||
response = make_response(message, 401)
|
response = make_response(message, 401)
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,10 @@ time_format = '%H:%M:%S - %m/%d/%y'
|
||||||
# the approval of an admin user before the user can login.
|
# the approval of an admin user before the user can login.
|
||||||
default_account_state = True
|
default_account_state = True
|
||||||
|
|
||||||
|
# Allow users to generate and send SMS messages via the web service
|
||||||
|
# and API.
|
||||||
|
allow_user_sms = True
|
||||||
|
|
||||||
# Legacy passphrase used in hblink.cfg
|
# Legacy passphrase used in hblink.cfg
|
||||||
legacy_passphrase = 'passw0rd'
|
legacy_passphrase = 'passw0rd'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<p style="text-align: right;"><button data-bs-toggle="collapse" data-bs-target="#compose" class="btn btn-primary">Compose</button></p>
|
<p style="text-align: right;"><button data-bs-toggle="collapse" data-bs-target="#compose" class="btn btn-primary">Compose</button></p>
|
||||||
{% if call_or_get(current_user.has_roles('Admin')) %}
|
{% if call_or_get(current_user.has_roles('Admin')) or global_config['allow_web_sms'] == True %}
|
||||||
<p style="text-align: left;"><button data-bs-toggle="collapse" data-bs-target="#compose_sms" class="btn btn-primary">Send SMS</button></p>
|
<p style="text-align: left;"><button data-bs-toggle="collapse" data-bs-target="#compose_sms" class="btn btn-primary">Send SMS</button></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue