Merge branch 'master' into mta-sts-implementation

Author: Danelif

lib/js_libs.php

@@ -27,7 +27,7 @@ function get_js_libs_content($exclude_deps = []) {
 
     foreach (JS_LIBS as $key => $dep) {
         if (!in_array($key, $exclude_deps)) {
-            $js_lib .= file_get_contents(APP_PATH.$dep);
+            $js_lib .= file_get_contents(APP_PATH.$dep) . "\n";
         }
     }
     return $js_lib;

modules/advanced_search/modules.php

@@ -231,7 +231,7 @@ protected function output() {
         return '<div class="search_content px-0"><div class="content_title d-flex align-items-center px-3">'.
             '<i class="bi bi-caret-down-fill adv_expand_all cursor-pointer"></i>'.
             '<i class="bi bi-caret-up adv_collapse_all cursor-pointer"></i>'.
-            '<lable class="ms-2">'.$this->trans('Advanced Search').'</label></div>';
+            '<label class="ms-2">'.$this->trans('Advanced Search').'</label></div>';
     }
 }
 

modules/calendar/js_modules/route_handlers.js

@@ -1,7 +1,7 @@
 function applyCalendarPageHandlers() {
-    $('.event_delete').on("click", function() {
+    $('.event_delete a').on("click", function() {
         if (hm_delete_prompt()) {
-            $(this).parent().submit();
+            $(this).closest('form').submit();
         }
     });
     $('.cal_title').on("click", function(e) {

modules/calendar/modules.php

@@ -232,7 +232,7 @@ protected function output() {
             $out = new Hm_Cal_Output($this, $events);
             $out = $out->output($data, $date, $view);
             return '<div class="calendar p-0"><div class="content_title d-flex justify-content-between px-3"><span class="calendar_content_title">'.$this->trans('Calendar').'</span>'.
-                '<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm">'.
+                '<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm text-decoration-none">'.
                 '<i class="bi bi-plus-circle me-2"></i> '.$this->trans('Add Event').'</a></div>'.
                 $out.'</div>';
         }

modules/calendar/site.css

@@ -4,3 +4,7 @@
 .calendar_week td { width: 14%; height: 600px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
 .event_details { cursor: pointer; z-index: 100; display: none; position: absolute; width: 300px; border: solid 1px #ddd; background-color: #fff; padding: 10px; }
 .event_details td { padding: 5px; border: none;  height: auto; }
+.event_detail {
+    max-height: 35vh;
+    overflow: auto;
+}

modules/core/functions.php

@@ -780,3 +780,8 @@ function getSettingsSectionOutput($section, $sectionLabel, $sectionIcon, $settin
     return $res;
 }
 
+function isPageConfigured($page) {
+    $pages = array_keys(Hm_Handler_Modules::dump());
+    return in_array($page, $pages);
+}
+

modules/core/handler_modules.php

@@ -1179,7 +1179,11 @@ public function process() {
                     $this->out('imap_service_name', $provider);
                 }
                 $this->out('just_saved_credentials', true);
-                Hm_Msgs::add("Server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
+                if (isPageConfigured('save')) {
+                    Hm_Msgs::add("Server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
+                } else {
+                    Hm_Msgs::add("Server saved.");
+                }
             }
 
             if ($createProfile && $this->smtp_server_id && ($this->imap_server_id || $this->jmap_server_id)) {

modules/core/hm-mailbox.php

@@ -282,14 +282,14 @@ public function get_special_use_mailboxes($folder = false) {
      * Get messages in a folder applying filters, sorting and pagination
      * @return array - [total results found, results for a single page]
      */
-    public function get_messages($folder, $sort, $reverse, $flag_filter, $offset=0, $limit=50, $keyword=false, $trusted_senders=[], $include_preview = false) {
+    public function get_messages($folder, $sort, $reverse, $flag_filter, $offset=0, $limit=50, $keyword=false, $trusted_senders=[], $include_preview = false, $active_body_structure = true) {
         if (! $this->select_folder($folder)) {
             return [0, []];
         }
         if ($this->is_imap()) {
-            $messages = $this->connection->get_mailbox_page($folder, $sort, $reverse, $flag_filter, $offset, $limit, $keyword, $trusted_senders, $include_preview);
+            $messages = $this->connection->get_mailbox_page($folder, $sort, $reverse, $flag_filter, $offset, $limit, $keyword, $trusted_senders, $include_preview, $active_body_structure);
         } else {
-            $messages = $this->connection->get_messages($folder, $sort, $reverse, $flag_filter, $offset, $limit, $keyword, $trusted_senders, $include_preview);
+            $messages = $this->connection->get_messages($folder, $sort, $reverse, $flag_filter, $offset, $limit, $keyword, $trusted_senders, $include_preview, $active_body_structure);
             $folder = $this->selected_folder['id'];
         }
         foreach ($messages[1] as &$msg) {

modules/core/js_modules/Hm_MessagesStore.js

@@ -312,7 +312,7 @@ class Hm_MessagesStore {
         } else {
             if (this.path == 'tag') {
                 config.push({ name: "hm_ajax_hook", value: 'ajax_imap_tag_data' });
-                config.push({ name: "folder", value: getParam('tag_id') });
+                config.push({ name: "folder", value: getParam('filter') });
                 configs.push(config);
             } else {
                 let sources = hm_data_sources();

modules/core/js_modules/actions/privacy_controls.js

@@ -8,7 +8,7 @@ async function addSenderToImagesWhitelist(email) {
         ], (response) => {
             resolve(response);
         }, [], false, undefined, () => {
-            Hm_Notices.show('An error occured while adding the sender to the whitelist', 'danger');
+            Hm_Notices.show('An error occurred while adding the sender to the whitelist', 'danger');
             reject();
         });
     });