diff --git a/.idea/misc.xml b/.idea/misc.xml index 3cca3bf..455776e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ - + + + diff --git a/main.py b/main.py index 475cc70..56be2ea 100644 --- a/main.py +++ b/main.py @@ -75,13 +75,16 @@ def index(): add_server=request.args.get('add_server', None), format_timestamp=format_timestamp, ) - else: + elif request.method == 'POST': server = request.form['server_id'] server = next((item for item in SERVERS if item.info()["server_id"] == server), None) server.apply_config(request.form) update_state() return redirect( url_for('index', nt="Updated Outline VPN Server", selected_server=request.args.get('selected_server'))) + else: + return redirect( + url_for('index')) @app.route('/clients', methods=['GET', 'POST']) @@ -176,7 +179,7 @@ def add_client(): update_state() return redirect(url_for('clients', nt="Clients updated", selected_client=request.form.get('user_id'))) else: - return redirect(url_for('index')) + return redirect(url_for('clients')) @app.route('/del_client', methods=['POST']) diff --git a/templates/clients.html b/templates/clients.html index ab4a9b7..3fc59de 100644 --- a/templates/clients.html +++ b/templates/clients.html @@ -83,8 +83,9 @@
+

Allow access to:

{% for server in SERVERS %} -
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/index.html b/templates/index.html index 7baa8cf..dc44b00 100644 --- a/templates/index.html +++ b/templates/index.html @@ -81,8 +81,15 @@ + {% set ns = namespace(total_bytes=0) %} + {% for key in SERVERS[selected_server|int].data["keys"] %} + {% if key.used_bytes %} + {% set ns.total_bytes = ns.total_bytes + key.used_bytes %} + {% endif %} + {% endfor %}

Clients: {{ server.info()['keys']|length }}

+

Total traffic: {{ ns.total_bytes | filesizeformat }}