Update to 5.4

This commit is contained in:
Copium-Snorter
2023-06-20 20:23:44 +01:00
parent 2991096ba7
commit 7b6f07ed6e
47 changed files with 138 additions and 89 deletions

View File

@@ -5,7 +5,6 @@
{% set token = token |e %}
{% endif %}
<!--suppress ALL -->
<input type="hidden" name="csrf_token" value="{{ token }}"/>
{%- endmacro %}

View File

@@ -6,7 +6,7 @@
{# ------------ Load JS files ------------- #}
{% macro load_jquery() -%}
<script type="text/javascript" src="{{ctx.homepath}}/static/js/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="{{ctx.homepath}}/static/js/jquery-3.6.4.min.js"></script>
<script type="text/javascript" src="{{ctx.homepath}}/static/js/jquery.tooltip.js"></script>
<script type="text/javascript" src="{{ctx.homepath}}/static/js/jquery.idtabs.js"></script>
<script type="text/javascript" src="{{ctx.homepath}}/static/js/jquery.fancybox.js"></script>

View File

@@ -330,36 +330,39 @@
{% endif %}
{# profile_type: throttling #}
{% if session.get('is_global_admin') or 'throttle' not in disabled_domain_profiles %}
{% if (session.get('is_global_admin') or 'throttle' not in disabled_domain_profiles) and session.get('iredapd_enabled') %}
<div id="profile_throttle">
<form name="throttle" method="post" action="{{ctx.homepath}}/profile/domain/throttle/{{cur_domain}}">
<form name="throttle"
method="post"
action="{{ctx.homepath}}/profile/domain/throttle/{{cur_domain}}"
>
{{ input_csrf_token() }}
{% if session.get('iredapd_enabled') %}
{# Throttling with iRedAPD #}
<div class="columns clear">
{{ input_csrf_token() }}
{% if session.get('iredapd_enabled') %}
{# Throttling with iRedAPD #}
<div class="columns clear">
{{ input_csrf_token() }}
{{ display_throttle_setting(account='@' + cur_domain,
setting=outbound_throttle_setting,
inout_type='outbound') }}
{{ display_throttle_setting(account='@' + cur_domain,
setting=inbound_throttle_setting,
inout_type='inbound',
with_left_border=true) }}
{{ display_throttle_setting(account='@' + cur_domain,
setting=outbound_throttle_setting,
inout_type='outbound') }}
<div class="col1-3 lastcol">
<div class="mark_blue bt-space10">
<ul class="standard clean-padding bt-space10">
<li class="bt-space5">{{ _('This throttle setting will be applied to all individual accounts under domain %s.') |format(cur_domain) }}</li>
<li class="bt-space5">{{ _('You can set per-user throttling in account profile page.') }}</li>
<li class="bt-space5">{{ _('Per-user throttle setting has higher priority.') }}</li>
</ul>
</div>
</div>{#-- .col1-3 --#}
</div>{# .columns #}
{% endif %}
{{ display_throttle_setting(account='@' + cur_domain,
setting=inbound_throttle_setting,
inout_type='inbound',
with_left_border=true) }}
<div class="col1-3 lastcol">
<div class="mark_blue bt-space10">
<ul class="standard clean-padding bt-space10">
<li class="bt-space5">{{ _('This throttle setting will be applied to all individual accounts under domain %s.') |format(cur_domain) }}</li>
<li class="bt-space5">{{ _('You can set per-user throttling in account profile page.') }}</li>
<li class="bt-space5">{{ _('Per-user throttle setting has higher priority.') }}</li>
</ul>
</div>
</div>{#-- .col1-3 --#}
</div>{# .columns #}
{% endif %}
{{ input_submit() }}
</form>