Skip to content

Commit d345720

Browse files
authored
v1.1.7.2 update
bugfix minor update
1 parent 7e9c752 commit d345720

File tree

7 files changed

+35
-5
lines changed

7 files changed

+35
-5
lines changed

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Unreleased VER.
77
- save settings into cookies + accept cookies modal (?)
88
- export to xlsx file (table) (?)
99

10+
VER. 1.1.7.2
11+
- ~~BUG: log_lines filter outputs the same id emails (only exim?)~~
12+
- ~~BUG: dark mode filling text search with black font color instead of white~~
13+
- ~~add TLS encrypted connection icon to message status (maybe TLS info on icon hover?)~~
1014
VER. 1.1.7.1
1115
- ~~fix #filter-email coloring in all modes and with resetfilters button~~
1216
- ~~loading circle after full page reload in dark mode~~

mlp/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
# !!! change version upon update !!!
3737
global VERSION
38-
VERSION ="1.1.7.1"
38+
VERSION ="1.1.7.2"
3939

4040
# postfix regexp
4141
postf_match = r'([A-Za-z]+[ \t]+[0-9]+[ \t]+[0-9]+\:[0-9]+:[0-9]+).*'

mlp/static/js/local_settings.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@
105105
reject: "<i class='times icon'></i>",
106106
bounced: "<i class='reply icon'></i>",
107107
multiple: "<i class='tasks icon'></i>",
108-
unknown: "<i class='question icon'></i>"
108+
unknown: "<i class='question icon'></i>",
109+
tls: "<i class='lock icon'></i>",
110+
no_tls: "<i class='lock open icon'></i>"
109111
}
110112
},
111113
};

mlp/static/js/main_app.js

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,11 @@ const app = Vue.createApp({
104104
} else {
105105
// no need after ver.1.1.5 query update
106106
//if (this.search_by !== "log_lines") {
107-
$('#text_search').css('color', 'initial');
107+
if (this.settings.dark) {
108+
$('#text_search').css('color', 'white');
109+
} else {
110+
$('#text_search').css('color', 'initial');
111+
}
108112
if (this.settings.filters) {
109113
this.saveFilters();
110114
} else {
@@ -361,7 +365,6 @@ const app = Vue.createApp({
361365
return string;
362366
}
363367
},
364-
// TODO refactor messages based on locale and new functions
365368
addFilterLink(element) {
366369
$td = element.find('td');
367370
if (this.localeData.filters.filter_link_tip == undefined) {
@@ -793,8 +796,25 @@ const app = Vue.createApp({
793796
$('body').addClass('scrolling');
794797
// apply styling to modal
795798
this.$nextTick(function () {
799+
796800
$('#mail-modal > div.header > span > i').remove();
797801
$('#mail-modal > div.header > span').prepend(this.settings.status_icon[m.status.code]);
802+
// TLS encryption logo and title
803+
if ($('#mail-modal > div.content > ul').text().indexOf("TLS") >=0 ) {
804+
if (this.localeData.emails_list.status_tls == undefined) {
805+
text = this.fallbackLocaleData.emails_list.status_tls
806+
} else {
807+
text = this.localeData.emails_list.status_tls
808+
}
809+
$('#mail-modal > div.header > span').prepend(" ").prepend(this.settings.status_icon["tls"]).attr('title', text);
810+
} else {
811+
if (this.localeData.emails_list.status_notls == undefined) {
812+
text = this.fallbackLocaleData.emails_list.status_notls
813+
} else {
814+
text = this.localeData.emails_list.status_notls
815+
}
816+
$('#mail-modal > div.header > span').prepend(" ").prepend(this.settings.status_icon["no_tls"]).attr('title', text);
817+
}
798818
if (this.settings.colored) {
799819

800820
/*$('#email-metadata td:contains("'+m.status.code+'")').css('background-color',this.settings.status_color[m.status.code].slice(0, -2) + '.4)');

mlp/static/locales/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
"status": "Full status",
2828
"status_code": "Status",
2929
"status_message": "Message",
30+
"status_tls": "TLS encrypted connection",
31+
"status_notls": "non-TLS encrypted connection",
3032
"client": "Client",
3133
"relay": "Relay (Dest. SMTP server)",
3234
"log_lines": "Related Log Lines",

mlp/static/locales/ru.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
"status": "Подробный статус",
2828
"status_code": "Статус",
2929
"status_message": "Сообщение",
30+
"status_tls": "Защищенное TLS соединение",
31+
"status_notls": "Не защищенное TLS соединение",
3032
"client": "Клиент",
3133
"relay": "Релей (принимающий SMTP сервер)",
3234
"log_lines": "Связанный лог",

mlp/webui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ async def api_emails():
215215
_sm = await _process_filters(query=_sm, frm=frm)
216216

217217
_sm, res = await _paginate_query(_sm, frm, rt_conn=conn, rt_query=r_q, order_by=order_by, order_dir=order_dir)
218-
_sm = await _sm.run(conn)
218+
_sm = await _sm.distinct().run(conn)
219219

220220
#print(list(_sm))
221221

0 commit comments

Comments
 (0)