diff --git a/app/modules/alerting/alerting.py b/app/modules/alerting/alerting.py index 15d4dab5..0cd13f2d 100644 --- a/app/modules/alerting/alerting.py +++ b/app/modules/alerting/alerting.py @@ -223,9 +223,10 @@ def add_telegram_channel(token: str, channel: str, group: str, page: str) -> Non print(error_mess) else: if sql.insert_new_telegram(token, channel, group): - env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) - template = env.get_template('/new_telegram.html') - output_from_parsed_template = template.render(groups=sql.select_groups(), + lang = roxywi_common.get_user_lang() + env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) + template = env.get_template('ajax/new_telegram.html') + output_from_parsed_template = template.render(groups=sql.select_groups(), lang=lang, telegrams=sql.select_telegram(token=token), page=page) print(output_from_parsed_template) roxywi_common.logging('Roxy-WI server', f'A new Telegram channel {channel} has been created ', roxywi=1, login=1) @@ -236,12 +237,13 @@ def add_slack_channel(token: str, channel: str, group: str, page: str) -> None: print(error_mess) else: if sql.insert_new_slack(token, channel, group): - env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) - template = env.get_template('/new_slack.html') - output_from_parsed_template = template.render(groups=sql.select_groups(), + lang = roxywi_common.get_user_lang() + env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) + template = env.get_template('ajax/new_slack.html') + output_from_parsed_template = template.render(groups=sql.select_groups(), lang=lang, slacks=sql.select_slack(token=token), page=page) print(output_from_parsed_template) - roxywi_common.logging('Roxy-WI server', 'A new Slack channel ' + channel + ' has been created ', roxywi=1, login=1) + roxywi_common.logging('Roxy-WI server', f'A new Slack channel {channel} has been created ', roxywi=1, login=1) def delete_telegram_channel(channel_id) -> None: diff --git a/app/modules/roxywi/waf.py b/app/modules/roxywi/waf.py index 2e8189dc..e6224cf4 100644 --- a/app/modules/roxywi/waf.py +++ b/app/modules/roxywi/waf.py @@ -13,10 +13,10 @@ form = common.form def waf_overview(serv, waf_service) -> None: env = Environment( - loader=FileSystemLoader('templates/ajax'), autoescape=True, + loader=FileSystemLoader('templates/'), autoescape=True, extensions=['jinja2.ext.loopcontrols', 'jinja2.ext.do'] ) - template = env.get_template('overivewWaf.html') + template = env.get_template('ajax/overivewWaf.html') servers = sql.select_servers(server=serv) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) @@ -75,9 +75,10 @@ def waf_overview(serv, waf_service) -> None: returned_servers.append(server_status) + lang = roxywi_common.get_user_lang() servers_sorted = sorted(returned_servers, key=common.get_key) template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value), - waf_service=waf_service) + waf_service=waf_service, lang=lang) print(template) diff --git a/app/modules/server/ssh.py b/app/modules/server/ssh.py index 667ffee5..5778c866 100644 --- a/app/modules/server/ssh.py +++ b/app/modules/server/ssh.py @@ -60,14 +60,15 @@ def create_ssh_cred() -> None: password = common.checkAjaxInput(form.getvalue('ssh_pass')) page = common.checkAjaxInput(form.getvalue('page')) page = page.split("#")[0] + lang = roxywi_common.get_user_lang() if username is None or name is None: print(error_mess) else: if sql.insert_new_ssh(name, enable, group, username, password): - env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) - template = env.get_template('/new_ssh.html') - output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), page=page) + env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) + template = env.get_template('ajax/new_ssh.html') + output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), page=page, lang=lang) print(output_from_parsed_template) roxywi_common.logging('Roxy-WI server', f'New SSH credentials {name} has been created', roxywi=1, login=1) diff --git a/app/options.py b/app/options.py index bd0b2278..fef04541 100644 --- a/app/options.py +++ b/app/options.py @@ -824,6 +824,7 @@ if form.getvalue('newuser') is not None: page = common.checkAjaxInput(form.getvalue('page')) activeuser = common.checkAjaxInput(form.getvalue('activeuser')) group = common.checkAjaxInput(form.getvalue('newgroupuser')) + lang = roxywi_common.get_user_lang() if roxywi_user.create_user(new_user, email, password, role, activeuser, group): env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) @@ -833,7 +834,8 @@ if form.getvalue('newuser') is not None: groups=sql.select_groups(), page=page, roles=sql.select_roles(), - adding=1) + adding=1, + lang=lang) print(template) if form.getvalue('userdel') is not None: @@ -868,6 +870,7 @@ if form.getvalue('newserver') is not None: page = page.split("#")[0] port = common.checkAjaxInput(form.getvalue('newport')) desc = common.checkAjaxInput(form.getvalue('desc')) + lang = roxywi_common.get_user_lang() if ip == '': print('error: IP or DNS name is not valid') @@ -890,7 +893,8 @@ if form.getvalue('newserver') is not None: page=page, user_status=user_subscription['user_status'], user_plan=user_subscription['user_plan'], - adding=1) + adding=1, + lang=lang) print(template) roxywi_common.logging(ip, f'A new server {hostname} has been created', roxywi=1, login=1, keep_history=1, service='server') diff --git a/app/templates/add_nginx.html b/app/templates/add_nginx.html index 7f0be709..d7d7afbe 100644 --- a/app/templates/add_nginx.html +++ b/app/templates/add_nginx.html @@ -4,7 +4,7 @@ {% block content %} {% from 'include/input_macros.html' import input, checkbox, select %} {% set balance_params = dict() %} -{% set balance_params = {'ip_hash':'ip_hash','least_conn':'least_conn','random':'random', 'round-robin': 'round-robin'} %} +{% set balance_params = {'ip_hash':'ip_hash','least_conn':'least_conn','random':'random', 'round_robin': 'round-robin'} %}