v1.1.7.2 update

bugfix minor update
drlight17 · Jul 28, 2023 · d345720 · d345720
1 parent 7e9c752
commit d345720
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,10 @@ Unreleased VER.
 - save settings into cookies + accept cookies modal (?)
 - export to xlsx file (table) (?)
 
+VER. 1.1.7.2
+- ~~BUG: log_lines filter outputs the same id emails (only exim?)~~
+- ~~BUG: dark mode filling text search with black font color instead of white~~
+- ~~add TLS encrypted connection icon to message status (maybe TLS info on icon hover?)~~
 VER. 1.1.7.1
 - ~~fix #filter-email coloring in all modes and with resetfilters button~~
 - ~~loading circle after full page reload in dark mode~~

diff --git a/mlp/main.py b/mlp/main.py
@@ -35,7 +35,7 @@
 
 # !!! change version upon update !!!
 global VERSION
-VERSION ="1.1.7.1"
+VERSION ="1.1.7.2"
 
 # postfix regexp
 postf_match = r'([A-Za-z]+[ \t]+[0-9]+[ \t]+[0-9]+\:[0-9]+:[0-9]+).*'

diff --git a/mlp/static/js/local_settings.js b/mlp/static/js/local_settings.js
@@ -105,7 +105,9 @@
                         reject: "<i class='times icon'></i>",
                         bounced: "<i class='reply icon'></i>",
                         multiple: "<i class='tasks icon'></i>",
-                        unknown: "<i class='question icon'></i>"
+                        unknown: "<i class='question icon'></i>",
+                        tls: "<i class='lock icon'></i>",
+                        no_tls: "<i class='lock open icon'></i>"
                     }
                 },
             };

diff --git a/mlp/static/js/main_app.js b/mlp/static/js/main_app.js
@@ -104,7 +104,11 @@ const app = Vue.createApp({
             } else {
                 // no need after ver.1.1.5 query update
                 //if (this.search_by !== "log_lines") {
-                    $('#text_search').css('color', 'initial');
+                    if (this.settings.dark) {
+                        $('#text_search').css('color', 'white');
+                    } else {
+                        $('#text_search').css('color', 'initial');
+                    }
                     if (this.settings.filters) {
                         this.saveFilters();
                     } else {
@@ -361,7 +365,6 @@ const app = Vue.createApp({
                 return string;
             }
         },
-        // TODO refactor messages based on locale and new functions
         addFilterLink(element) {
             $td = element.find('td');
             if (this.localeData.filters.filter_link_tip == undefined) {
@@ -793,8 +796,25 @@ const app = Vue.createApp({
             $('body').addClass('scrolling');
             // apply styling to modal
             this.$nextTick(function () {
+
                 $('#mail-modal > div.header > span > i').remove();
                 $('#mail-modal > div.header > span').prepend(this.settings.status_icon[m.status.code]);
+                // TLS encryption logo and title
+                if ($('#mail-modal > div.content > ul').text().indexOf("TLS") >=0 ) {
+                    if (this.localeData.emails_list.status_tls == undefined) {
+                        text = this.fallbackLocaleData.emails_list.status_tls
+                    } else {
+                        text = this.localeData.emails_list.status_tls
+                    }
+                    $('#mail-modal > div.header > span').prepend(" ").prepend(this.settings.status_icon["tls"]).attr('title', text);
+                } else {
+                    if (this.localeData.emails_list.status_notls == undefined) {
+                        text = this.fallbackLocaleData.emails_list.status_notls
+                    } else {
+                        text = this.localeData.emails_list.status_notls
+                    }
+                    $('#mail-modal > div.header > span').prepend(" ").prepend(this.settings.status_icon["no_tls"]).attr('title', text);
+                }
                 if (this.settings.colored) {
 
                     /*$('#email-metadata td:contains("'+m.status.code+'")').css('background-color',this.settings.status_color[m.status.code].slice(0, -2) + '.4)');

diff --git a/mlp/static/locales/en.json b/mlp/static/locales/en.json
@@ -27,6 +27,8 @@
     "status": "Full status",
     "status_code": "Status",
     "status_message": "Message",
+    "status_tls": "TLS encrypted connection",
+    "status_notls": "non-TLS encrypted connection",
     "client": "Client",
     "relay": "Relay (Dest. SMTP server)",
     "log_lines": "Related Log Lines",

diff --git a/mlp/static/locales/ru.json b/mlp/static/locales/ru.json
@@ -27,6 +27,8 @@
     "status": "Подробный статус",
     "status_code": "Статус",
     "status_message": "Сообщение",
+    "status_tls": "Защищенное TLS соединение",
+    "status_notls": "Не защищенное TLS соединение",
     "client": "Клиент",
     "relay": "Релей (принимающий SMTP сервер)",
     "log_lines": "Связанный лог",

diff --git a/mlp/webui.py b/mlp/webui.py
@@ -215,7 +215,7 @@ async def api_emails():
     _sm = await _process_filters(query=_sm, frm=frm)
 
     _sm, res = await _paginate_query(_sm, frm, rt_conn=conn, rt_query=r_q, order_by=order_by, order_dir=order_dir)
-    _sm = await _sm.run(conn)
+    _sm = await _sm.distinct().run(conn)
 
     #print(list(_sm))