Merge pull request #1680 from mercihabam/fix-msg-source

kroky · web-flow · commit 00593ecc63a2 · 2025-09-15T09:35:12.000+03:00
fix(frontend): remove unnecessary horizontal scrollbar on message source page layout, clear console errors, and stop unnecessary background requests causing consistent logouts
diff --git a/modules/core/functions.php b/modules/core/functions.php
@@ -432,13 +432,13 @@ function setup_base_page($name, $source=false, $use_layout=true) {
     add_output($name, 'js_data', false, $source);
     add_output($name, 'js_search_data', true, $source);
     add_output($name, 'header_end', false, $source);
+    add_output($name, 'msgs', false, $source);
     if($use_layout) {
         add_output($name, 'content_start', false, $source);
         add_output($name, 'login_start', false, $source);
         add_output($name, 'login', false, $source);
         add_output($name, 'login_end', false, $source);
         add_output($name, 'date', true, $source);
-        add_output($name, 'msgs', false, $source);
         add_output($name, 'folder_list_start', true, $source);
         add_output($name, 'folder_list_end', true, $source);
         add_output($name, 'content_section_start', true, $source);
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
@@ -424,6 +424,7 @@ protected function output() {
         $res = '<body class="'.($this->get('is_mobile', false) ? 'mobile' : '').'"><noscript class="noscript">'.
             sprintf($this->trans('You need to have Javascript enabled to use %s, sorry about that!'),
                 $this->html_safe($this->get('router_app_name'))).'</noscript>';
+        $res .= '<script type="text/javascript">window.inAppContext = true;</script>';
         if (!$this->get('router_login_state')) {
             $res .= '<script type="text/javascript">sessionStorage.clear();</script>';
         }
diff --git a/modules/core/site.css b/modules/core/site.css
@@ -1636,6 +1636,11 @@ a[disabled] {
   margin-left: 1rem !important;
 }
 
+pre.msg_source {
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
 /* Mobile responsive overrides for Bootstrap classes */
 @media (max-width: 768px) {
   .small_header {
diff --git a/modules/core/site.js b/modules/core/site.js
@@ -1379,6 +1379,7 @@ var Hm_Folders = {
 
     listen_for_new_messages: function() {
         var target = $('.total_unread_count').get(0);
+        if (!target) return;
         if (!Hm_Folders.observer) {
             Hm_Folders.observer = new MutationObserver(function(mutations) {
                 $('body').trigger('new_message');
diff --git a/modules/desktop_notifications/site.js b/modules/desktop_notifications/site.js
@@ -1,6 +1,10 @@
 'use strict';
 
 $(function() {
+    if (!window.inAppContext) {
+        return;
+    }
+    
     window.addEventListener('new-message', (event) => {
         const row = event.detail.row;
         const content = $(row).find('.from').text() + ' - ' + $(row).find('.subject').text();
diff --git a/modules/idle_timer/site.js b/modules/idle_timer/site.js
@@ -22,6 +22,9 @@ var Hm_No_Op = {
 };
 
 $(function() {
+    if (! window.inAppContext) {
+        return;
+    }
     Hm_Timer.add_job(Hm_No_Op.update, Hm_No_Op.interval, true);
     $('*').on('click', function() { Hm_No_Op.reset(); });
 });
diff --git a/modules/smtp/site.js b/modules/smtp/site.js
@@ -391,7 +391,7 @@ function smtpSettingsPageHandler() {
 }
 
 $(function() {
-    if (hm_is_logged()) {
+    if (hm_is_logged() && window.inAppContext) {
         let scheduled_msg_count = 0;
         let sendScheduledMessages = function() { 
             Hm_Ajax.request(

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,7 @@ protected function output() {`
`424`	`424`	`$res = '<body class="'.($this->get('is_mobile', false) ? 'mobile' : '').'"><noscript class="noscript">'.`
`425`	`425`	`sprintf($this->trans('You need to have Javascript enabled to use %s, sorry about that!'),`
`426`	`426`	`$this->html_safe($this->get('router_app_name'))).'</noscript>';`
	`427`	`+ $res .= '<script type="text/javascript">window.inAppContext = true;</script>';`
`427`	`428`	`if (!$this->get('router_login_state')) {`
`428`	`429`	`$res .= '<script type="text/javascript">sessionStorage.clear();</script>';`
`429`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ function smtpSettingsPageHandler() {`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`$(function() {`
`394`		`- if (hm_is_logged()) {`
	`394`	`+ if (hm_is_logged() && window.inAppContext) {`
`395`	`395`	`let scheduled_msg_count = 0;`
`396`	`396`	`let sendScheduledMessages = function() {`
`397`	`397`	`Hm_Ajax.request(`