From e77475c9cda35da968c3040063f10c18b5ef22ba Mon Sep 17 00:00:00 2001 From: Amani Nyumu Date: Fri, 3 Jan 2025 17:12:49 +0100 Subject: [PATCH 01/20] feat(backend): add scheduled send functionality resolve conflicts --- language/az.php | 1 + language/de.php | 1 + language/en.php | 1 + language/es.php | 1 + language/et.php | 1 + language/fa.php | 1 + language/fr.php | 1 + language/hu.php | 1 + language/id.php | 1 + language/it.php | 1 + language/ja.php | 1 + language/nl.php | 1 + language/pt-BR.php | 1 + language/ro.php | 1 + language/ru.php | 1 + language/zh-Hans.php | 1 + modules/core/functions.php | 96 ++ modules/core/message_list_functions.php | 6 +- modules/core/site.css | 2 +- modules/core/site.js | 974 +++++++++--------- modules/imap/functions.php | 180 +--- modules/imap/handler_modules.php | 9 +- modules/imap/hm-imap.php | 12 +- modules/imap/js_modules/route_handlers.js | 8 +- .../utils/handleNexterDateAction.js | 71 ++ modules/imap/output_modules.php | 7 +- modules/imap/site.css | 4 +- modules/imap/site.js | 1 + modules/profiles/functions.php | 4 +- modules/profiles/hm-profiles.php | 15 + modules/smtp/functions.php | 106 ++ modules/smtp/hm-mime-message.php | 14 +- modules/smtp/js_modules/route_handlers.js | 76 +- modules/smtp/modules.php | 183 +++- modules/smtp/setup.php | 28 +- modules/smtp/site.js | 25 +- 36 files changed, 1158 insertions(+), 679 deletions(-) create mode 100644 modules/imap/js_modules/utils/handleNexterDateAction.js diff --git a/language/az.php b/language/az.php index 5e1c54a187..e3f91e1ced 100755 --- a/language/az.php +++ b/language/az.php @@ -621,6 +621,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/de.php b/language/de.php index 7150e9c182..8bd66b1a43 100755 --- a/language/de.php +++ b/language/de.php @@ -618,6 +618,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/en.php b/language/en.php index f630f6a2d3..5cd8c300ef 100755 --- a/language/en.php +++ b/language/en.php @@ -636,6 +636,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/es.php b/language/es.php index fa551b1ea9..c253b1f363 100755 --- a/language/es.php +++ b/language/es.php @@ -618,6 +618,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/et.php b/language/et.php index 61b7b6addb..53e6207a9f 100755 --- a/language/et.php +++ b/language/et.php @@ -626,6 +626,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/fa.php b/language/fa.php index b2ad0e2221..9431100de7 100755 --- a/language/fa.php +++ b/language/fa.php @@ -670,6 +670,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/fr.php b/language/fr.php index b60c7c3592..8e0550fc0e 100755 --- a/language/fr.php +++ b/language/fr.php @@ -617,6 +617,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => 'Vous avez %d messages programmés qui ne seront pas exécutés si vous quittez', 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/hu.php b/language/hu.php index e91cd6a66d..7e9b587059 100755 --- a/language/hu.php +++ b/language/hu.php @@ -618,6 +618,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/id.php b/language/id.php index 07b205ab8b..95c4ac6a5f 100755 --- a/language/id.php +++ b/language/id.php @@ -625,6 +625,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/it.php b/language/it.php index 5147b4e8ad..d720e4214a 100755 --- a/language/it.php +++ b/language/it.php @@ -618,6 +618,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/ja.php b/language/ja.php index 30596c066d..7c7d601ac5 100755 --- a/language/ja.php +++ b/language/ja.php @@ -618,6 +618,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/nl.php b/language/nl.php index 1d1db295cc..82e94158d6 100755 --- a/language/nl.php +++ b/language/nl.php @@ -618,6 +618,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/pt-BR.php b/language/pt-BR.php index 1fcf9142ec..7ad23625b8 100755 --- a/language/pt-BR.php +++ b/language/pt-BR.php @@ -617,6 +617,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/ro.php b/language/ro.php index 5a52506d25..c019b88263 100755 --- a/language/ro.php +++ b/language/ro.php @@ -617,6 +617,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/ru.php b/language/ru.php index 60813edac2..70cd16aa1c 100755 --- a/language/ru.php +++ b/language/ru.php @@ -619,6 +619,7 @@ 'You must provide a name for your script' => false, 'Empty script' => false, 'Please create a profile for saving sent messages option' => false, + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => false, 'Your subject is empty!' => false, 'Your body is empty!' => false, diff --git a/language/zh-Hans.php b/language/zh-Hans.php index 8baf2310ff..526e932c4a 100644 --- a/language/zh-Hans.php +++ b/language/zh-Hans.php @@ -639,6 +639,7 @@ 'You must provide a name for your script' => '请提供脚本名称', 'Empty script' => '空脚本', 'Please create a profile for saving sent messages option' => '请创建用于保存已发送信息选项的配置文件', + 'You have %d scheduled messages that won\'t be executed if you quit' => false, 'Attachment storage unavailable, please contact your site administrator' => '附件存储不可用，请联系您的网站管理员', 'Your subject is empty!' => '主题为空！', 'Your body is empty!' => '内容为空！', diff --git a/modules/core/functions.php b/modules/core/functions.php index 1e224fff70..a422a0858b 100644 --- a/modules/core/functions.php +++ b/modules/core/functions.php @@ -637,3 +637,99 @@ function privacy_setting_callback($val, $key, $mod) { } return $val; } + +if (!hm_exists('get_scheduled_date')) { +function get_scheduled_date($format, $only_label = false) { + if ($format == 'later_in_day') { + $date_string = 'today 18:00'; + $label = 'Later in the day'; + } elseif ($format == 'tomorrow') { + $date_string = '+1 day 08:00'; + $label = 'Tomorrow'; + } elseif ($format == 'next_weekend') { + $date_string = 'next Saturday 08:00'; + $label = 'Next weekend'; + } elseif ($format == 'next_week') { + $date_string = 'next week 08:00'; + $label = 'Next week'; + } elseif ($format == 'next_month') { + $date_string = 'next month 08:00'; + $label = 'Next month'; + } else { + $date_string = $format; + $label = 'Certain date'; + } + $time = strtotime($date_string); + if ($only_label) { + return [$label, date('D, H:i', $time)]; + } + return date('D, d M Y H:i', $time); +}} + +/** + * @subpackage imap/functions + */ +if (!hm_exists('nexter_formats')) { +function nexter_formats() { + $values = array( + 'tomorrow', + 'next_weekend', + 'next_week', + 'next_month' + ); + if (date('H') <= 16) { + array_push($values, 'later_in_day'); + } + return $values; +}} + +if (!hm_exists('schedule_dropdown')) { +function schedule_dropdown($output, $send_now = false) { + $values = nexter_formats(); + + $txt = ''; + if ($send_now) { + $txt .= '
+ '; + } + $txt .= ''; + if ($send_now) { + $txt .= '
'; + } + + return $txt; +}} + +/** + * @subpackage imap/functions + */ +if (!hm_exists('parse_nexter_header')) { + function parse_nexter_header($header, $name) + { + $header = str_replace("$name: ", '', $header); + $result = []; + foreach (explode(';', $header) as $kv) + { + $kv = trim($kv); + $spacePos = strpos($kv, ' '); + if ($spacePos > 0) { + $result[rtrim(substr($kv, 0, $spacePos), ':')] = trim(substr($kv, $spacePos+1)); + } else { + $result[$kv] = true; + } + } + return $result; + }} diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php index c580ae339c..6ee3d62162 100644 --- a/modules/core/message_list_functions.php +++ b/modules/core/message_list_functions.php @@ -336,11 +336,11 @@ function subject_callback($vals, $style, $output_mod) { */ if (!hm_exists('date_callback')) { function date_callback($vals, $style, $output_mod) { - $snooze_class = isset($vals[2]) && $vals[2]? ' snoozed_date': ''; + $nexter_class = isset($vals[2]) && $vals[2]? ' nexter_date': ''; if ($style == 'news') { - return sprintf('
%s
', $snooze_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1])); + return sprintf('
%s
', $nexter_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1])); } - return sprintf('%s', $snooze_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1])); + return sprintf('%s', $nexter_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1])); }} function dates_holders_callback($vals) { diff --git a/modules/core/site.css b/modules/core/site.css index 61b290d146..e33ce8b88b 100644 --- a/modules/core/site.css +++ b/modules/core/site.css @@ -1276,7 +1276,7 @@ div.unseen, .mobile .imap_sort { width: 100%; } -.snoozed_date { +.nexter_date { color: var(--bs-primary) !important; } diff --git a/modules/core/site.js b/modules/core/site.js index 4fe5d652e0..01908668af 100644 --- a/modules/core/site.js +++ b/modules/core/site.js @@ -47,7 +47,7 @@ var Hm_Ajax = { active_reqs: 0, icon_loading_id: false, - get_ajax_hook_name: function(args) { + get_ajax_hook_name: function (args) { var index; for (index in args) { if (args[index]['name'] == 'hm_ajax_hook') { @@ -57,7 +57,7 @@ var Hm_Ajax = { return; }, - request: function(args, callback, extra, no_icon, batch_callback, on_failure, signal) { + request: function (args, callback, extra, no_icon, batch_callback, on_failure, signal) { var bcb = false; if (typeof batch_callback != 'undefined' && $.inArray(batch_callback, this.batch_callbacks) === -1) { bcb = batch_callback.toString(); @@ -79,27 +79,27 @@ var Hm_Ajax = { return ajax.make_request(args, callback, extra, name, on_failure, batch_callback, signal); }, - show_loading_icon: function() { + show_loading_icon: function () { if (Hm_Ajax.icon_loading_id !== false) { return; } - var hm_loading_pos = $('.loading_icon').width()/40; + var hm_loading_pos = $('.loading_icon').width() / 40; $('.loading_icon').show(); function move_background_image() { hm_loading_pos = hm_loading_pos + 50; - $('.loading_icon').css('background-position', hm_loading_pos+'px 0'); + $('.loading_icon').css('background-position', hm_loading_pos + 'px 0'); Hm_Ajax.icon_loading_id = setTimeout(move_background_image, 100); } move_background_image(); }, - stop_loading_icon : function(loading_id) { + stop_loading_icon: function (loading_id) { clearTimeout(loading_id); $('.loading_icon').hide(); Hm_Ajax.icon_loading_id = false; }, - process_callback_hooks: function(name, res) { + process_callback_hooks: function (name, res) { var hook; var func; for (var i in Hm_Ajax.callback_hooks) { @@ -116,190 +116,182 @@ var Hm_Ajax = { } }, - add_callback_hook: function(request_name, hook_function) { + add_callback_hook: function (request_name, hook_function) { Hm_Ajax.callback_hooks.push([request_name, hook_function]); } }; /* ajax request wrapper */ -var Hm_Ajax_Request = function() { return { - callback: false, - name: false, - batch_callback: false, - index: 0, - on_failure: false, - start_time: 0, - - xhr_fetch: function(config) { - var xhr = new XMLHttpRequest(); - var data = ''; - if (config.data) { - data = this.format_xhr_data(config.data); - } - const url = new URL(window.location.href); - if (window.location.next) { - url.search = window.location.next.split('?')[1]; - } - for (const param of url.searchParams) { - const configItem = config.data.find(item => item.name === param[0]); - if (configItem) { - url.searchParams.set(configItem.name, configItem.value); - } - } - - xhr.open('POST', url.toString()) - if (config.signal) { - config.signal.addEventListener('abort', function() { - xhr.abort(); +var Hm_Ajax_Request = function () { + return { + callback: false, + name: false, + batch_callback: false, + index: 0, + on_failure: false, + start_time: 0, + + xhr_fetch: function (config) { + var xhr = new XMLHttpRequest(); + var data = ''; + if (config.data) { + data = this.format_xhr_data(config.data); + } + const url = window.location.next ?? window.location.href; + xhr.open('POST', url) + if (config.signal) { + config.signal.addEventListener('abort', function () { + xhr.abort(); + }); + } + xhr.addEventListener('load', function () { + config.callback.done(Hm_Utils.json_decode(xhr.response, true), xhr); + config.callback.always(Hm_Utils.json_decode(xhr.response, true)); }); - } - xhr.addEventListener('load', function() { - config.callback.done(Hm_Utils.json_decode(xhr.response, true), xhr); - config.callback.always(Hm_Utils.json_decode(xhr.response, true)); - }); - xhr.addEventListener('error', function() { - Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); - config.callback.fail(xhr); - config.callback.always(Hm_Utils.json_decode(xhr.response, true)); - }); - xhr.addEventListener('abort', function() { - Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); - config.callback.always(Hm_Utils.json_decode(xhr.response, true)); + xhr.addEventListener('error', function () { + Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); + config.callback.fail(xhr); + config.callback.always(Hm_Utils.json_decode(xhr.response, true)); + }); + xhr.addEventListener('abort', function () { + Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); + config.callback.always(Hm_Utils.json_decode(xhr.response, true)); - }); - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); - xhr.setRequestHeader('X-Requested-with', 'xmlhttprequest'); - xhr.send(data); - }, + }); + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + xhr.setRequestHeader('X-Requested-with', 'xmlhttprequest'); + xhr.send(data); + }, - format_xhr_data: function(data) { - var res = [] - for (var i in data) { - res.push(encodeURIComponent(data[i]['name']) + '=' + encodeURIComponent(data[i]['value'])); - } - return res.join('&'); - }, + format_xhr_data: function (data) { + var res = [] + for (var i in data) { + res.push(encodeURIComponent(data[i]['name']) + '=' + encodeURIComponent(data[i]['value'])); + } + return res.join('&'); + }, - make_request: function(args, callback, extra, request_name, on_failure, batch_callback, signal) { - var name; - var arg; - this.batch_callback = batch_callback; - this.name = request_name; - this.callback = callback; - if (on_failure) { - this.on_failure = true; - } - if (extra) { - for (name in extra) { - args.push({'name': name, 'value': extra[name]}); + make_request: function (args, callback, extra, request_name, on_failure, batch_callback, signal) { + var name; + var arg; + this.batch_callback = batch_callback; + this.name = request_name; + this.callback = callback; + if (on_failure) { + this.on_failure = true; + } + if (extra) { + for (name in extra) { + args.push({ 'name': name, 'value': extra[name] }); + } } - } - var key_found = false; - for (arg in args) { - if (args[arg].name == 'hm_page_key') { - key_found = true; - break; + var key_found = false; + for (arg in args) { + if (args[arg].name == 'hm_page_key') { + key_found = true; + break; + } } - } - if (!key_found) { - args.push({'name': 'hm_page_key', 'value': $('#hm_page_key').val()}); - } - var dt = new Date(); - this.start_time = dt.getTime(); - this.xhr_fetch({url: '', data: args, callback: this, signal}); - return false; - }, + if (!key_found) { + args.push({ 'name': 'hm_page_key', 'value': $('#hm_page_key').val() }); + } + var dt = new Date(); + this.start_time = dt.getTime(); + this.xhr_fetch({ url: '', data: args, callback: this, signal }); + return false; + }, - done: function(res, xhr) { - if (Hm_Ajax.aborted) { - return; - } - else if (!res || typeof res == 'string' && (res == 'null' || res.indexOf('<') === 0 || res == '{}')) { - this.fail(xhr); - return; - } - else { - $('.offline').hide(); - if (hm_encrypt_ajax_requests()) { - res = Hm_Utils.json_decode(Hm_Crypt.decrypt(res.payload)); + done: function (res, xhr) { + if (Hm_Ajax.aborted) { + return; } - if ((res.state && res.state == 'not callable') || !res.router_login_state) { - this.fail(xhr, true); + else if (!res || typeof res == 'string' && (res == 'null' || res.indexOf('<') === 0 || res == '{}')) { + this.fail(xhr); return; } - if (Hm_Ajax.err_condition) { - Hm_Ajax.err_condition = false; - Hm_Notices.hide(true); - } - if (res.router_user_msgs && !$.isEmptyObject(res.router_user_msgs)) { - Hm_Notices.show(res.router_user_msgs); - } - if (res.folder_status) { - for (const name in res.folder_status) { - if (name === getListPathParam()) { - Hm_Folders.unread_counts[name] = res.folder_status[name]['unseen']; - Hm_Folders.update_unread_counts(); - const messages = new Hm_MessagesStore(name, Hm_Utils.get_url_page_number()); - messages.load().then(() => { - if (messages.count != res.folder_status[name].messages) { - messages.load(true).then(() => { - display_imap_mailbox(messages.rows, messages.list); - }) - } - }); + else { + $('.offline').hide(); + if (hm_encrypt_ajax_requests()) { + res = Hm_Utils.json_decode(Hm_Crypt.decrypt(res.payload)); + } + if ((res.state && res.state == 'not callable') || !res.router_login_state) { + this.fail(xhr, true); + return; + } + if (Hm_Ajax.err_condition) { + Hm_Ajax.err_condition = false; + Hm_Notices.hide(true); + } + if (res.router_user_msgs && !$.isEmptyObject(res.router_user_msgs)) { + Hm_Notices.show(res.router_user_msgs); + } + if (res.folder_status) { + for (const name in res.folder_status) { + if (name === getListPathParam()) { + Hm_Folders.unread_counts[name] = res.folder_status[name]['unseen']; + Hm_Folders.update_unread_counts(); + const messages = new Hm_MessagesStore(name, Hm_Utils.get_url_page_number()); + messages.load().then(() => { + if (messages.count != res.folder_status[name].messages) { + messages.load(true).then(() => { + display_imap_mailbox(messages.rows, messages.links); + }) + } + }); + } } } + if (this.callback) { + this.callback(res); + } + Hm_Ajax.process_callback_hooks(this.name, res); } - if (this.callback) { - this.callback(res); - } - Hm_Ajax.process_callback_hooks(this.name, res); - } - }, + }, - run_on_failure: function() { - if (this.on_failure && this.callback) { - this.callback(false); - } - return false; - }, + run_on_failure: function () { + if (this.on_failure && this.callback) { + this.callback(false); + } + return false; + }, - fail: function(xhr, not_callable) { - if (not_callable === true || (xhr.status && xhr.status == 500)) { - Hm_Notices.show([err_msg('Server Error')]); - } - else { - $('.offline').show(); + fail: function (xhr, not_callable) { + if (not_callable === true || (xhr.status && xhr.status == 500)) { + Hm_Notices.show([err_msg('Server Error')]); + } + else { + $('.offline').show(); + } + Hm_Ajax.err_condition = true; + this.run_on_failure(); + }, + + always: function (res) { + Hm_Ajax.active_reqs--; + var batch_count = 1; + if (this.batch_callback) { + if (typeof Hm_Ajax.batch_callbacks[this.batch_callback.toString()] != 'undefined') { + batch_count = --Hm_Ajax.batch_callbacks[this.batch_callback.toString()]; + } + } + Hm_Message_List.set_row_events(); + if (batch_count === 0) { + Hm_Ajax.batch_callbacks[this.batch_callback.toString()] = 0; + Hm_Ajax.aborted = false; + Hm_Ajax.p_callbacks = []; + this.batch_callback(res); + this.batch_callback = false; + Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); + $('body').removeClass('wait'); + } + if (Hm_Ajax.active_reqs == 0) { + Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); + $('body').removeClass('wait'); + } + res = null; } - Hm_Ajax.err_condition = true; - this.run_on_failure(); - }, - - always: function(res) { - Hm_Ajax.active_reqs--; - var batch_count = 1; - if (this.batch_callback) { - if (typeof Hm_Ajax.batch_callbacks[this.batch_callback.toString()] != 'undefined') { - batch_count = --Hm_Ajax.batch_callbacks[this.batch_callback.toString()]; - } - } - Hm_Message_List.set_row_events(); - if (batch_count === 0) { - Hm_Ajax.batch_callbacks[this.batch_callback.toString()] = 0; - Hm_Ajax.aborted = false; - Hm_Ajax.p_callbacks = []; - this.batch_callback(res); - this.batch_callback = false; - Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); - $('body').removeClass('wait'); - } - if (Hm_Ajax.active_reqs == 0) { - Hm_Ajax.stop_loading_icon(Hm_Ajax.icon_loading_id); - $('body').removeClass('wait'); - } - res = null; } -}}; +}; /** * Show a modal dialog with a title, content and buttons. @@ -336,7 +328,7 @@ function Hm_Modal(options) {
- +
@@ -390,7 +382,7 @@ function Hm_Modal(options) { var Hm_Notices = { hide_id: false, - show: function(msgs) { + show: function (msgs) { var message = ''; var type = ''; for (var i in msgs) { @@ -407,7 +399,7 @@ var Hm_Notices = { } }, - hide: function(now) { + hide: function (now) { if (Hm_Notices.hide_id) { clearTimeout(Hm_Notices.hide_id); } @@ -416,7 +408,7 @@ var Hm_Notices = { Hm_Utils.clear_sys_messages(); } else { - Hm_Notices.hide_id = setTimeout(function() { + Hm_Notices.hide_id = setTimeout(function () { $('.sys_messages').addClass('d-none'); Hm_Utils.clear_sys_messages(); }, 5000); @@ -429,7 +421,7 @@ var Hm_Timer = { jobs: [], interval: 1000, - add_job: function(job, interval, defer, custom_defer) { + add_job: function (job, interval, defer, custom_defer) { if (custom_defer) { Hm_Timer.jobs.push([job, interval, custom_defer]); } @@ -437,11 +429,11 @@ var Hm_Timer = { Hm_Timer.jobs.push([job, interval, interval]); } if (!defer) { - try { job(); } catch(e) { console.log(e); } + try { job(); } catch (e) { console.log(e); } } }, - cancel: function(job) { + cancel: function (job) { for (var index in Hm_Timer.jobs) { if (Hm_Timer.jobs[index][0] == job) { Hm_Timer.jobs.splice(index, 1); @@ -451,7 +443,7 @@ var Hm_Timer = { return false; }, - fire: function() { + fire: function () { var job; var index; for (index in Hm_Timer.jobs) { @@ -460,7 +452,7 @@ var Hm_Timer = { if (job[2] === 0) { job[2] = job[1]; Hm_Timer.jobs[index] = job; - try { job[0](); } catch(e) { console.log(e); } + try { job[0](); } catch (e) { console.log(e); } } } setTimeout(Hm_Timer.fire, Hm_Timer.interval); @@ -500,39 +492,49 @@ function Message_List() { if (completed) { for (index in this.callbacks) { func = this.callbacks[index]; - try { func(); } catch(e) { console.log(e); } + try { func(); } catch (e) { console.log(e); } } } fixLtrInRtl(); }; - this.update = function(msgs, id) { - Hm_Utils.tbody(id).html(''); + this.update = function (msgs) { + Hm_Utils.tbody().html(''); for (const index in msgs) { const row = msgs[index][0]; Hm_Utils.tbody(id).append(row); } }; - this.set_tab_index = function() { + this.set_tab_index = function () { var msg_rows = Hm_Utils.rows(); var count = 1; - msg_rows.each(function() { + msg_rows.each(function () { $(this).attr('tabindex', count); count++; }); }; - this.sort = function(fld) { + this.sort = function (fld) { var listitems = Hm_Utils.rows(); var aval; var bval; - var sort_result = listitems.sort(function(a, b) { - const sortField = fld.replace('-', ''); - if (['arrival', 'date'].includes(sortField)) { - aval = new Date($(`input.${sortField}`, $('td.dates', a)).val()); - bval = new Date($(`input.${sortField}`, $('td.dates', b)).val()); - if (fld.startsWith('-')) { + var sort_result = listitems.sort(function (a, b) { + switch (Math.abs(fld)) { + case 1: + case 2: + case 3: + aval = $($('td', a)[Math.abs(fld)]).text().replace(/^\s+/g, ''); + bval = $($('td', b)[Math.abs(fld)]).text().replace(/^\s+/g, ''); + break; + case 4: + default: + aval = $('input', $($('td', a)[Math.abs(fld)])).val(); + bval = $('input', $($('td', b)[Math.abs(fld)])).val(); + break; + } + if (fld == 4 || fld == -4 || !fld) { + if (fld == -4) { return aval - bval; } return bval - aval; @@ -547,13 +549,13 @@ function Message_List() { }); this.sort_fld = fld; Hm_Utils.tbody().html(''); - for (var i = 0, len=sort_result.length; i < len; i++) { + for (var i = 0, len = sort_result.length; i < len; i++) { Hm_Utils.tbody().append(sort_result[i]); } this.save_updated_list(); }; - this.insert_into_message_list = function(row, msg_rows) { + this.insert_into_message_list = function (row, msg_rows) { var sort_fld = this.sort_fld; if (typeof sort_fld == 'undefined' || sort_fld == null) { sort_fld = 4; @@ -562,10 +564,10 @@ function Message_List() { if (sort_fld == 4 || sort_fld == -4) { var timestr2; var timestr = $('.msg_timestamp', $(row)).val(); - $('tr', msg_rows).each(function() { + $('tr', msg_rows).each(function () { timestr2 = $('.msg_timestamp', $(this)).val(); - if ((sort_fld == -4 && (timestr2*1) >= (timestr*1)) || - (sort_fld == 4 && (timestr*1) >= (timestr2*1))) { + if ((sort_fld == -4 && (timestr2 * 1) >= (timestr * 1)) || + (sort_fld == 4 && (timestr * 1) >= (timestr2 * 1))) { element = $(this); return false; } @@ -574,10 +576,10 @@ function Message_List() { else { var bval; var aval = $($('td', $(row))[Math.abs(sort_fld)]).text().replace(/^\s+/g, ''); - $('tr', msg_rows).each(function() { + $('tr', msg_rows).each(function () { bval = $($('td', $(this))[Math.abs(sort_fld)]).text().replace(/^\s+/g, ''); if ((sort_fld < 0 && aval.toUpperCase().localeCompare(bval.toUpperCase()) > 0) || - (sort_fld > 0 && bval.toUpperCase().localeCompare(aval.toUpperCase()) > 0)) { + (sort_fld > 0 && bval.toUpperCase().localeCompare(aval.toUpperCase()) > 0)) { element = $(this); return false; } @@ -590,16 +592,16 @@ function Message_List() { else { msg_rows.append(row); } - self.just_inserted.push($('.from', $(row)).text()+' - '+$('.subject', $(row)).text()); + self.just_inserted.push($('.from', $(row)).text() + ' - ' + $('.subject', $(row)).text()); }; - this.reset_checkboxes = function() { + this.reset_checkboxes = function () { this.toggle_msg_controls(); this.set_row_events(); }; - this.toggle_msg_controls = function() { - if ($('input[type=checkbox]', $('.message_table')).filter(function() {return this.checked; }).length > 0) { + this.toggle_msg_controls = function () { + if ($('input[type=checkbox]', $('.message_table')).filter(function () { return this.checked; }).length > 0) { $('.msg_controls').addClass('d-flex'); $('.msg_controls').removeClass('d-none'); $('.mailbox_list_title').addClass('hide'); @@ -611,7 +613,7 @@ function Message_List() { } }; - this.update_after_action = function(action_type, selected) { + this.update_after_action = function (action_type, selected) { var remove = false; if (action_type == 'read' && getListPathParam() == 'unread') { remove = true; @@ -640,20 +642,20 @@ function Message_List() { this.reset_checkboxes(); }; - this.save_updated_list = function() { + this.save_updated_list = function () { if (this.page_caches.hasOwnProperty(getListPathParam())) { this.set_message_list_state(this.page_caches[getListPathParam()]); - Hm_Utils.save_to_local_storage('sort_'+getListPathParam(), this.sort_fld); + Hm_Utils.save_to_local_storage('sort_' + getListPathParam(), this.sort_fld); } }; - this.remove_after_action = function(action_type, selected) { + this.remove_after_action = function (action_type, selected) { var removed = 0; var class_name = false; var index; for (index in selected) { class_name = selected[index]; - $('.'+Hm_Utils.clean_selector(class_name)).remove(); + $('.' + Hm_Utils.clean_selector(class_name)).remove(); if (action_type == 'delete') { this.deleted.push(class_name); } @@ -662,14 +664,14 @@ function Message_List() { return removed; }; - this.read_after_action = function(action_type, selected) { + this.read_after_action = function (action_type, selected) { var read = 0; var row; var index; var class_name = false; for (index in selected) { class_name = selected[index]; - row = $('.'+Hm_Utils.clean_selector(class_name)); + row = $('.' + Hm_Utils.clean_selector(class_name)); if (action_type == 'read') { $('.subject > div', row).removeClass('unseen'); row.removeClass('unseen'); @@ -683,14 +685,14 @@ function Message_List() { return read; }; - this.flag_after_action = function(action_type, selected) { + this.flag_after_action = function (action_type, selected) { var flagged = 0; var class_name; var row; var index; for (index in selected) { class_name = selected[index]; - row = $('.'+Hm_Utils.clean_selector(class_name)); + row = $('.' + Hm_Utils.clean_selector(class_name)); if (action_type == 'flag') { $('.icon', row).html(hm_flag_image_src()); } @@ -702,7 +704,7 @@ function Message_List() { return flagged; }; - this.load_sources = function() { + this.load_sources = function () { var index; var source; if (!self.background) { @@ -715,7 +717,7 @@ function Message_List() { return false; }; - this.select_combined_view = function() { + this.select_combined_view = function () { if (self.page_caches.hasOwnProperty(getListPathParam())) { self.setup_combined_view(self.page_caches[getListPathParam()]); } @@ -727,23 +729,24 @@ function Message_List() { self.setup_combined_view(false); } } - var sort_type = Hm_Utils.get_from_local_storage('sort_'+getListPathParam()); + var sort_type = Hm_Utils.get_from_local_storage('sort_' + getListPathParam()); if (sort_type != null) { this.sort_fld = sort_type; $('.combined_sort').val(sort_type); } - $('.core_msg_control').on("click", function(e) { + $('.core_msg_control').on("click", function (e) { e.preventDefault(); - return self.message_action($(this).data('action')); }); - $('.toggle_link').on("click", function() { return self.toggle_rows(); }); - $('.refresh_link').on("click", function() { return self.load_sources(); }); + return self.message_action($(this).data('action')); + }); + $('.toggle_link').on("click", function () { return self.toggle_rows(); }); + $('.refresh_link').on("click", function () { return self.load_sources(); }); }; - this.add_sources = function(sources) { + this.add_sources = function (sources) { self.sources = sources; }; - this.setup_combined_view = function(cache_name) { + this.setup_combined_view = function (cache_name) { self.add_sources(hm_data_sources()); var data = Hm_Utils.get_from_local_storage(cache_name); var interval = Hm_Utils.get_from_global('combined_view_refresh_interval', 60); @@ -762,53 +765,53 @@ function Message_List() { } }; - this.clear_read_messages = function() { + this.clear_read_messages = function () { var class_name; var list = Hm_Utils.get_from_local_storage('read_message_list'); if (list && list.length) { list = Hm_Utils.json_decode(list); for (class_name in list) { - $('.'+Hm_Utils.clean_selector(class_name)).remove(); + $('.' + Hm_Utils.clean_selector(class_name)).remove(); } Hm_Utils.save_to_local_storage('read_message_list', ''); } }; /* TODO: remove module specific refs */ - this.update_title = function(list_path = getListPathParam()) { + this.update_title = function (list_path = getListPathParam()) { var count = 0; var rows = Hm_Utils.rows(); var tbody = Hm_Utils.tbody(); if (list_path == 'unread') { count = rows.length; - document.title = count+' '+hm_trans('Unread'); + document.title = count + ' ' + hm_trans('Unread'); } else if (list_path == 'flagged') { count = rows.length; - document.title = count+' '+hm_trans('Flagged'); + document.title = count + ' ' + hm_trans('Flagged'); } else if (list_path == 'combined_inbox') { count = $('tr .unseen', tbody).length; - document.title = count+' '+hm_trans('Unread in Everything'); + document.title = count + ' ' + hm_trans('Unread in Everything'); } else if (list_path == 'email') { count = $('tr .unseen', tbody).length; - document.title = count+' '+hm_trans('Unread in Email'); + document.title = count + ' ' + hm_trans('Unread in Email'); } else if (list_path == 'feeds') { count = $('tr .unseen', tbody).length; - document.title = count+' '+hm_trans('Unread in Feeds'); + document.title = count + ' ' + hm_trans('Unread in Feeds'); } }; - this.message_action = function(action_type) { + this.message_action = function (action_type) { if (action_type == 'delete' && !hm_delete_prompt()) { return false; } var msg_list = $('.message_table'); var selected = []; var current_list = self.filter_list(); - $('input[type=checkbox]', msg_list).each(function() { + $('input[type=checkbox]', msg_list).each(function () { if (this.checked) { selected.push($(this).val()); } @@ -816,10 +819,10 @@ function Message_List() { if (selected.length > 0) { var updated = false; Hm_Ajax.request( - [{'name': 'hm_ajax_hook', 'value': 'ajax_message_action'}, - {'name': 'action_type', 'value': action_type}, - {'name': 'message_ids', 'value': selected}], - function(res) { + [{ 'name': 'hm_ajax_hook', 'value': 'ajax_message_action' }, + { 'name': 'action_type', 'value': action_type }, + { 'name': 'message_ids', 'value': selected }], + function (res) { if (!res) { $('.message_table_body').replaceWith(current_list); self.save_updated_list(); @@ -844,10 +847,9 @@ function Message_List() { } }; - this.prev_next_links = function(msgUid, lisPath = getListPathParam()) { - let prevUrl; - let nextUrl; - + this.prev_next_links = function (msgUid, lisPath = getListPathParam()) { + let phref; + let nhref; const target = $('.msg_headers tr').last(); const messages = new Hm_MessagesStore(lisPath, Hm_Utils.get_url_page_number()); messages.load(false, true); @@ -858,31 +860,31 @@ function Message_List() { prevUrl = new URL(prevSubject.prop('href')); prevUrl.searchParams.set('list_parent', lisPath); const subject = prevSubject.text(); - const plink = ' '+subject+''; - $(''+plink+'').insertBefore(target); + const plink = ' ' + subject + ''; + $('' + plink + '').insertBefore(target); } if (next) { const nextSubject = $(next['0']).find('.subject a'); nextUrl = new URL(nextSubject.prop('href')); nextUrl.searchParams.set('list_parent', lisPath); const subject = nextSubject.text(); - - const nlink = ' '+subject+''; - $(''+nlink+'').insertBefore(target); + + const nlink = ' ' + subject + ''; + $('' + nlink + '').insertBefore(target); } return [prevUrl?.href, nextUrl?.href]; }; - this.check_empty_list = function() { + this.check_empty_list = function () { var count = Hm_Utils.rows().length; if (!count) { if (!$('.empty_list').length) { if (getPageNameParam() == 'search') { - $('.search_content').append('
'+hm_empty_folder()+'
'); + $('.search_content').append('
' + hm_empty_folder() + '
'); } else { - $('.message_list').append('
'+hm_empty_folder()+'
'); + $('.message_list').append('
' + hm_empty_folder() + '
'); } } } @@ -892,7 +894,7 @@ function Message_List() { return count === 0; }; - this.track_read_messages = function(class_name) { + this.track_read_messages = function (class_name) { var read_messages = Hm_Utils.get_from_local_storage('read_message_list'); if (read_messages && read_messages.length) { read_messages = Hm_Utils.json_decode(read_messages); @@ -909,9 +911,9 @@ function Message_List() { return added; }; - this.adjust_unread_total = function(amount, replace) { + this.adjust_unread_total = function (amount, replace) { var missing = $('.total_unread_count').text() === '' ? true : false; - var current = $('.total_unread_count').text()*1; + var current = $('.total_unread_count').text() * 1; var new_total; if (replace && amount == current && amount != 0) { return; @@ -929,7 +931,7 @@ function Message_List() { new_total = 0; } if (new_total != current || missing) { - $('.total_unread_count').html(' '+new_total+' '); + $('.total_unread_count').html(' ' + new_total + ' '); } if (new_total > current && getPageNameParam() != 'message_list' && getListPathParam() != 'unread') { $('.menu_unread > a').css('font-weight', 'bold'); @@ -941,14 +943,14 @@ function Message_List() { self.past_total = current; }; - this.toggle_rows = function() { + this.toggle_rows = function () { $('input[type=checkbox]', $('.message_table')).each(function () { this.checked = !this.checked; }); self.toggle_msg_controls(); return false; }; - this.filter_list = function() { - var data = Hm_Utils.rows().clone().filter(function() { + this.filter_list = function () { + var data = Hm_Utils.rows().clone().filter(function () { if (this.className == 'inline_msg') { return false; } @@ -959,7 +961,7 @@ function Message_List() { return res; }; - this.set_message_list_state = function(list_type) { + this.set_message_list_state = function (list_type) { var data = this.filter_list(); data.find('*[style]').attr('style', ''); data.find('input[type=checkbox]').removeAttr('checked'); @@ -975,10 +977,10 @@ function Message_List() { } }; - this.select_range = function(a, b) { + this.select_range = function (a, b) { var start = false; var end = false; - $('input[type=checkbox]', $('.message_table')).each(function() { + $('input[type=checkbox]', $('.message_table')).each(function () { if (end) { return false; } @@ -997,7 +999,7 @@ function Message_List() { }); }; - this.process_shift_click = function(el) { + this.process_shift_click = function (el) { var id = el.prop('id'); if (id == self.last_click) { return; @@ -1005,12 +1007,12 @@ function Message_List() { self.select_range(id, self.last_click); }; - this.set_row_events = function() { + this.set_row_events = function () { Hm_Utils.rows().off('click'); - Hm_Utils.rows().on('click', function(e) { self.process_row_click(e); }); + Hm_Utils.rows().on('click', function (e) { self.process_row_click(e); }); } - this.process_row_click = function(e) { + this.process_row_click = function (e) { if (e.target.tagName === 'A') { return; } @@ -1036,48 +1038,47 @@ function Message_List() { return false; } - this.select_on_row_click = function(shift, ctrl, el, target) { + this.select_on_row_click = function (shift, ctrl, el, target) { if (shift) { if (self.last_click) { self.process_shift_click(el); } - $('#'+el.prop('id')).prop('checked', 'checked'); + $('#' + el.prop('id')).prop('checked', 'checked'); self.last_click = el.prop('id'); } else if (ctrl) { if (el.prop('checked')) { - $('#'+el.prop('id')).prop('checked', false); + $('#' + el.prop('id')).prop('checked', false); } else { - $('#'+el.prop('id')).prop('checked', 'checked'); + $('#' + el.prop('id')).prop('checked', 'checked'); self.last_click = el.prop('id'); } } } - this.set_all_mail_state = function() { self.set_message_list_state('formatted_all_mail'); }; - this.set_combined_inbox_state = function() { self.set_message_list_state('formatted_combined_inbox'); }; - this.set_flagged_state = function() { self.set_message_list_state('formatted_flagged_data'); }; - this.set_unread_state = function() { self.set_message_list_state('formatted_unread_data'); }; - this.set_search_state = function() { self.set_message_list_state('formatted_search_data'); }; - this.set_junk_state = function() { self.set_message_list_state('formatted_junk_data'); }; - this.set_snoozed_state = function() { self.set_message_list_state('formatted_snoozed_data'); }; - this.set_trash_state = function() { self.set_message_list_state('formatted_trash_data'); }; - this.set_draft_state = function() { self.set_message_list_state('formatted_drafts_data'); }; - this.set_tag_state = function() { self.set_message_list_state('formatted_tag_data'); }; + this.set_all_mail_state = function () { self.set_message_list_state('formatted_all_mail'); }; + this.set_combined_inbox_state = function () { self.set_message_list_state('formatted_combined_inbox'); }; + this.set_flagged_state = function () { self.set_message_list_state('formatted_flagged_data'); }; + this.set_unread_state = function () { self.set_message_list_state('formatted_unread_data'); }; + this.set_search_state = function () { self.set_message_list_state('formatted_search_data'); }; + this.set_junk_state = function () { self.set_message_list_state('formatted_junk_data'); }; + this.set_trash_state = function () { self.set_message_list_state('formatted_trash_data'); }; + this.set_draft_state = function () { self.set_message_list_state('formatted_drafts_data'); }; + this.set_tag_state = function () { self.set_message_list_state('formatted_tag_data'); }; }; /* folder list */ var Hm_Folders = { expand_after_update: false, unread_counts: {}, - observer : false, + observer: false, - save_folder_list: function() { + save_folder_list: function () { Hm_Utils.save_to_local_storage('formatted_folder_list', $('.folder_list').html()); }, - load_unread_counts: function() { + load_unread_counts: function () { var res = Hm_Utils.json_decode(Hm_Utils.get_from_local_storage('unread_counts')); if (!res) { Hm_Folders.unread_counts = {}; @@ -1087,9 +1088,9 @@ var Hm_Folders = { } }, - update_unread_counts: function(folder) { + update_unread_counts: function (folder) { if (folder) { - $('.unread_'+folder).html(' '+Hm_Folders.unread_counts[folder]+' '); + $('.unread_' + folder).html(' ' + Hm_Folders.unread_counts[folder] + ' '); } else { var name; @@ -1101,17 +1102,17 @@ var Hm_Folders = { if (count) { if (getListPathParam() == name && getPageNameParam() == 'message_list') { var title = document.title.replace(/^\[\d+\]/, ''); - document.title = '['+count+'] '+title; + document.title = '[' + count + '] ' + title; /* HERE */ } - $('.unread_'+name).html(' '+count+' '); + $('.unread_' + name).html(' ' + count + ' '); } } } Hm_Utils.save_to_local_storage('unread_counts', Hm_Utils.json_encode(Hm_Folders.unread_counts)); }, - open_folder_list: function() { + open_folder_list: function () { $('.folder_list').show(); $('.folder_toggle').toggle(); if (hm_mobile()) { @@ -1124,7 +1125,7 @@ var Hm_Folders = { return false; }, - toggle_folder_list: function() { + toggle_folder_list: function () { if ($('.folder_list').css('display') == 'none') { Hm_Folders.open_folder_list(); } @@ -1133,7 +1134,7 @@ var Hm_Folders = { } }, - hide_folder_list: function(forget) { + hide_folder_list: function (forget) { $('.folder_list').hide(); $('.folder_toggle').show(); if (!forget) { @@ -1144,7 +1145,7 @@ var Hm_Folders = { return false; }, - reload_folders: function(force, expand_after_update) { + reload_folders: function (force, expand_after_update) { if (document.cookie.indexOf('hm_reload_folders=1') > -1 || force) { Hm_Folders.expand_after_update = expand_after_update; var ui_state = Hm_Utils.preserve_local_settings(); @@ -1156,28 +1157,28 @@ var Hm_Folders = { return false; }, - sort_list: function(class_name, exclude_name, last_name) { - var folder = $('.'+class_name+' ul'); + sort_list: function (class_name, exclude_name, last_name) { + var folder = $('.' + class_name + ' ul'); var listitems; if (exclude_name) { - listitems = $('li:not(.'+exclude_name+')', folder); + listitems = $('li:not(.' + exclude_name + ')', folder); } else { listitems = $('li', folder); } - listitems = listitems.sort(function(a, b) { + listitems = listitems.sort(function (a, b) { if (last_name && ($(a).attr('class') == last_name || $(b).attr('class') == last_name)) { return false; } if ($(b).text().toUpperCase() == 'ALL') { return true; } - return $(a).text().toUpperCase().localeCompare($(b).text().toUpperCase()); + return $(a).text().toUpperCase().localeCompare($(b).text().toUpperCase()); }); - $.each(listitems, function(_, itm) { folder.append(itm); }); + $.each(listitems, function (_, itm) { folder.append(itm); }); }, - update_folder_list_display: function(res) { + update_folder_list_display: function (res) { $('.folder_list').html(res.formatted_folder_list); Hm_Folders.sort_list('email_folders', 'menu_email'); Hm_Folders.sort_list('feeds_folders', 'menu_feeds', 'feeds_add_new'); @@ -1193,9 +1194,9 @@ var Hm_Folders = { hl_save_link(); }, - update_folder_list: function() { + update_folder_list: function () { Hm_Ajax.request( - [{'name': 'hm_ajax_hook', 'value': 'ajax_hm_folders'}], + [{ 'name': 'hm_ajax_hook', 'value': 'ajax_hm_folders' }], Hm_Folders.update_folder_list_display, [], true @@ -1203,72 +1204,72 @@ var Hm_Folders = { return false; }, - folder_list_events: function() { - $('.imap_folder_link').on("click", function() { return expand_imap_folders($(this)); }); - $('.src_name').on('click', function() { + folder_list_events: function () { + $('.imap_folder_link').on("click", function () { return expand_imap_folders($(this)); }); + $('.src_name').on('click', function () { let transformValue = ''; if ($(this).attr('aria-expanded') == 'true') { transformValue = 'rotate(180deg)'; - + } else { transformValue = 'rotate(0deg)'; } - + $(this).find('i').css('transform', transformValue); }); - $('.update_message_list').on("click", function(e) { + $('.update_message_list').on("click", function (e) { var text = e.target.innerHTML; e.target.innerHTML = ''; Hm_Folders.update_folder_list(); - Hm_Ajax.add_callback_hook('hm_reload_folders', function() { + Hm_Ajax.add_callback_hook('hm_reload_folders', function () { e.target.innerHTML = text; }); return false; }); - $('.hide_folders').on("click", function() { return Hm_Folders.hide_folder_list(); }); - $('.logout_link').on("click", function(e) { return Hm_Utils.confirm_logout(); }); + $('.hide_folders').on("click", function () { return Hm_Folders.hide_folder_list(); }); + $('.logout_link').on("click", function (e) { return Hm_Utils.confirm_logout(); }); if (hm_search_terms()) { $('.search_terms').val(hm_search_terms()); } - $('.search_terms').on('search', function() { - Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_reset_search'}]); + $('.search_terms').on('search', function () { + Hm_Ajax.request([{ 'name': 'hm_ajax_hook', 'value': 'ajax_reset_search' }]); }); }, - hl_selected_menu: function() { + hl_selected_menu: function () { const page = getPageNameParam(); const path = getListPathParam(); - + $('.folder_list').find('*').removeClass('selected_menu'); if (path) { if (page == 'message_list' || page == 'message') { - $("[data-id='"+Hm_Utils.clean_selector(path)+"']").closest('li').addClass('selected_menu'); - $('.menu_'+Hm_Utils.clean_selector(path)).addClass('selected_menu'); + $("[data-id='" + Hm_Utils.clean_selector(path) + "']").closest('li').addClass('selected_menu'); + $('.menu_' + Hm_Utils.clean_selector(path)).addClass('selected_menu'); } else { - $('.menu_'+path).addClass('selected_menu'); + $('.menu_' + path).addClass('selected_menu'); } } else { - $('.menu_'+page).addClass('selected_menu'); + $('.menu_' + page).addClass('selected_menu'); } }, - listen_for_new_messages: function() { + listen_for_new_messages: function () { var target = $('.total_unread_count').get(0); if (!Hm_Folders.observer) { - Hm_Folders.observer = new MutationObserver(function(mutations) { + Hm_Folders.observer = new MutationObserver(function (mutations) { $('body').trigger('new_message'); }); } else { Hm_Folders.observer.disconnect(); } - Hm_Folders.observer.observe(target, {attributes: true, childList: true, characterData: true}); + Hm_Folders.observer.observe(target, { attributes: true, childList: true, characterData: true }); }, - load_from_local_storage: function() { + load_from_local_storage: function () { var folder_list = Hm_Utils.get_from_local_storage('formatted_folder_list'); if (folder_list) { $('.folder_list').html(folder_list); @@ -1287,21 +1288,21 @@ var Hm_Folders = { return false; }, - toggle_folders_event: function() { - $('.folder_toggle').on("click", function() { return Hm_Folders.open_folder_list(); }); + toggle_folders_event: function () { + $('.folder_toggle').on("click", function () { return Hm_Folders.open_folder_list(); }); } }; /* misc */ var Hm_Utils = { - get_url_page_number: function() { + get_url_page_number: function () { var index; var match_result; var page_number = 1; var params = location.search.substr(1).split('&'); var param_len = params.length; - for (index=0; index < param_len; index++) { + for (index = 0; index < param_len; index++) { match_result = params[index].match(/list_page=(\d+)/); if (match_result) { page_number = match_result[1]; @@ -1311,14 +1312,14 @@ var Hm_Utils = { return page_number; }, - get_from_global: function(name, def) { + get_from_global: function (name, def) { if (globals[name]) { return globals[name]; } return def; }, - preserve_local_settings: function() { + preserve_local_settings: function () { var i; var result = {}; var prefix = window.location.pathname.length; @@ -1331,33 +1332,33 @@ var Hm_Utils = { return result; }, - restore_local_settings: function(settings) { + restore_local_settings: function (settings) { var i; for (i in settings) { Hm_Utils.save_to_local_storage(i, settings[i]); } }, - reset_search_form: function() { + reset_search_form: function () { Hm_Utils.save_to_local_storage('formatted_search_data', ''); - Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_reset_search'}], - function(res) { window.location = '?page=search'; }, false, true); + Hm_Ajax.request([{ 'name': 'hm_ajax_hook', 'value': 'ajax_reset_search' }], + function (res) { window.location = '?page=search'; }, false, true); return false; }, - confirm_logout: function() { - if (! $('#unsaved_changes').length || $('#unsaved_changes').val() == 0) { + confirm_logout: function () { + if (!$('#unsaved_changes').length || $('#unsaved_changes').val() == 0) { document.getElementById('logout_without_saving').click(); } else { - var confirmLogoutModal = new bootstrap.Modal(document.getElementById('confirmLogoutModal'), {keyboard: true}) + var confirmLogoutModal = new bootstrap.Modal(document.getElementById('confirmLogoutModal'), { keyboard: true }) confirmLogoutModal.show(); $('.confirm_logout').show(); } return false; }, - get_path_type: function(path) { + get_path_type: function (path) { if (path.indexOf('_') != -1) { var path_parts = path.split('_'); return path_parts[0]; @@ -1365,7 +1366,7 @@ var Hm_Utils = { return false; }, - parse_folder_path: function(path, path_type) { + parse_folder_path: function (path, path_type) { if (!path_type) { path_type = Hm_Utils.get_path_type(path); } @@ -1396,7 +1397,7 @@ var Hm_Utils = { folder = parts[3]; } if (type && server_id) { - return {'type': type, 'server_id' : server_id, 'folder' : folder, 'uid': uid}; + return { 'type': type, 'server_id': server_id, 'folder': folder, 'uid': uid }; } } else if (path_type == 'feeds') { @@ -1409,13 +1410,13 @@ var Hm_Utils = { uid = parts[2]; } if (type && server_id) { - return {'type': type, 'server_id' : server_id, 'uid': uid}; + return { 'type': type, 'server_id': server_id, 'uid': uid }; } } return false; }, - toggle_section: function(class_name, force_on, force_off) { + toggle_section: function (class_name, force_on, force_off) { if ($(class_name).length) { if (force_off) { $(class_name).css('display', 'block'); @@ -1429,7 +1430,7 @@ var Hm_Utils = { return false; }, - toggle_page_section: function(class_name) { + toggle_page_section: function (class_name) { if ($(class_name).length) { $(class_name).toggle(); Hm_Utils.save_to_local_storage(class_name, $(class_name).css('display')); @@ -1437,12 +1438,12 @@ var Hm_Utils = { return false; }, - get_from_local_storage: function(key) { + get_from_local_storage: function (key) { var prefix = window.location.pathname; - key = prefix+key; + key = prefix + key; var res = false; if (hm_encrypt_local_storage()) { - res = Hm_Crypt.decrypt(sessionStorage.getItem(key)); + res = Hm_Crypt.decrypt(sessionStorage.getItem(key)); } else { res = sessionStorage.getItem(key); @@ -1450,7 +1451,7 @@ var Hm_Utils = { return res; }, - search_from_local_storage: function(pattern) { + search_from_local_storage: function (pattern) { const results = []; const key_pattern = new RegExp(pattern); for (let i = 0; i < sessionStorage.length; i++) { @@ -1463,14 +1464,14 @@ var Hm_Utils = { return results; }, - save_to_local_storage: function(key, val) { + save_to_local_storage: function (key, val) { var prefix = window.location.pathname; - key = prefix+key; + key = prefix + key; if (hm_encrypt_local_storage()) { val = Hm_Crypt.encrypt(val); } - if (Storage !== void(0)) { - try { sessionStorage.setItem(key, val); } catch(e) { + if (Storage !== void (0)) { + try { sessionStorage.setItem(key, val); } catch (e) { sessionStorage.clear(); sessionStorage.setItem(key, val); } @@ -1482,25 +1483,25 @@ var Hm_Utils = { return false; }, - clean_selector: function(str) { + clean_selector: function (str) { return str.replace(/(:|\.|\[|\]|\/)/g, "\\$1"); }, - toggle_long_headers: function() { + toggle_long_headers: function () { $('.long_header').toggle(); $('.all_headers').toggle(); $('.small_headers').toggle(); return false; }, - set_unsaved_changes: function(state) { + set_unsaved_changes: function (state) { $('#unsaved_changes').val(state); }, /** * Shows pending messages added with the add_sys_message method */ - show_sys_messages: function() { + show_sys_messages: function () { $('.sys_messages').removeClass('d-none'); }, @@ -1509,12 +1510,12 @@ var Hm_Utils = { * @param {*} msg : The alert message to display * @param {*} type : The type of message to display, depending on the type of boostrap5 alert (primary, secondary, success, danger, warning, info, light, dark ) */ - add_sys_message: function(msg, type = 'info') { + add_sys_message: function (msg, type = 'info') { if (!msg) { return; } const icon = type == 'success' ? 'bi-check-circle' : 'bi-exclamation-circle'; - $('.sys_messages').append(''); + $('.sys_messages').append(''); this.show_sys_messages(); }, @@ -1522,11 +1523,11 @@ var Hm_Utils = { $('.sys_messages').html(''); }, - cancel_logout_event: function() { - $('.cancel_logout').on("click", function() { $('.confirm_logout').hide(); return false; }); + cancel_logout_event: function () { + $('.cancel_logout').on("click", function () { $('.confirm_logout').hide(); return false; }); }, - json_encode: function(val) { + json_encode: function (val) { try { return JSON.stringify(val); } @@ -1535,7 +1536,7 @@ var Hm_Utils = { } }, - json_decode: function(val, original) { + json_decode: function (val, original) { try { return JSON.parse(val); } @@ -1547,25 +1548,22 @@ var Hm_Utils = { } }, - rows: function(id) { - return this.tbody(id).find('tr').not('.inline_msg'); + rows: function () { + return $('.message_table_body > tr').not('.inline_msg'); }, - tbody: function(id) { - if (id) { - return $('#'+id); - } + tbody: function () { return $('.message_table_body'); }, - html_entities: function(str) { + html_entities: function (str) { return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); }, - test_connection: function() { + test_connection: function () { $('.offline').hide(); Hm_Ajax.request( - [{'name': 'hm_ajax_hook', 'value': 'ajax_test'}], + [{ 'name': 'hm_ajax_hook', 'value': 'ajax_test' }], false, [], false, false, false); }, @@ -1576,7 +1574,7 @@ var Hm_Utils = { }, redirect: function (path) { - if (! path) { + if (!path) { path = window.location.href; } window.location.href = path; @@ -1588,7 +1586,7 @@ var Hm_Utils = { }; var Hm_Crypt = { - decrypt: function(ciphertext) { + decrypt: function (ciphertext) { try { ciphertext = atob(ciphertext); if (!ciphertext || ciphertext.length < 200) { @@ -1610,16 +1608,16 @@ var Hm_Crypt = { } var iv = forge.pkcs5.pbkdf2(secret, salt, 100, 16, digest); var decipher = forge.cipher.createDecipher('AES-CBC', key); - decipher.start({iv: iv}); + decipher.start({ iv: iv }); decipher.update(forge.util.createBuffer(payload, 'raw')); decipher.finish(); return forge.util.decodeUtf8(decipher.output.data); - } catch(e) { + } catch (e) { return false; } }, - encrypt: function(plaintext) { + encrypt: function (plaintext) { try { var secret = $('#hm_page_key').val(); var salt = forge.random.getBytesSync(128); @@ -1629,28 +1627,28 @@ var Hm_Crypt = { var iv = forge.pkcs5.pbkdf2(secret, salt, 100, 16, digest); var hmac = forge.hmac.create(); var cipher = forge.cipher.createCipher('AES-CBC', key); - cipher.start({iv: iv}); + cipher.start({ iv: iv }); cipher.update(forge.util.createBuffer(plaintext, 'utf8')); cipher.finish(); hmac.start(digest, hmac_key); hmac.update(cipher.output.data); - return btoa(salt+hmac.digest().data+cipher.output.data); - } catch(e) { + return btoa(salt + hmac.digest().data + cipher.output.data); + } catch (e) { return false; } }, } -var update_password = function(id) { - var pass = $('#update_pw_'+id).val(); +var update_password = function (id) { + var pass = $('#update_pw_' + id).val(); if (pass && pass.length) { Hm_Ajax.request( - [{'name': 'hm_ajax_hook', 'value': 'ajax_update_server_pw'}, - {'name': 'password', 'value': pass}, - {'name': 'server_pw_id', 'value': id}], - function(res) { + [{ 'name': 'hm_ajax_hook', 'value': 'ajax_update_server_pw' }, + { 'name': 'password', 'value': pass }, + { 'name': 'server_pw_id', 'value': id }], + function (res) { if (res.connect_status) { - $('.div_'+id).remove(); + $('.div_' + id).remove(); if ($('.home_password_dialogs div').length == 1) { $('.home_password_dialogs').remove(); } @@ -1660,13 +1658,13 @@ var update_password = function(id) { } } -var elog = function(val) { +var elog = function (val) { if (hm_debug()) { console.log(val); } }; -var hl_save_link = function() { +var hl_save_link = function () { if ($('.save_reminder').length) { $('.menu_save a').css('font-weight', 'bold'); } @@ -1675,7 +1673,7 @@ var hl_save_link = function() { } }; -var reset_default_value_checkbox = function() { +var reset_default_value_checkbox = function () { var checkbox = $(this).closest('.tooltip_restore').prev('input[type="checkbox"]'); var default_value = checkbox.data('default-value'); default_value = (default_value === 'true'); @@ -1683,27 +1681,27 @@ var reset_default_value_checkbox = function() { checkbox.prop('disabled', true); }; -var reset_default_timezone = function() { +var reset_default_timezone = function () { var hm_default_timezone = window.hm_default_timezone; $('#timezone').val(hm_default_timezone); } -var reset_default_value_select = function() { +var reset_default_value_select = function () { var dropdown = $(this).closest('.tooltip_restore').prev('select'); var default_value = dropdown.data('default-value'); dropdown.val(default_value); } -var reset_default_value_input = function() { +var reset_default_value_input = function () { var inputField = $(this).closest('.tooltip_restore').prev('input'); var default_value = inputField.data('default-value'); inputField.val(default_value); } -var decrease_servers = function(section) { +var decrease_servers = function (section) { const element = document.querySelector(`.server_count .${section}_server_count`); const value = parseInt(element.textContent); if (value > 0) { - element.innerHTML = value - 1; + element.innerHTML = value - 1; } if (value === 1) { @@ -1713,11 +1711,11 @@ var decrease_servers = function(section) { } }; -var err_msg = function(msg) { - return "ERR"+hm_trans(msg); +var err_msg = function (msg) { + return "ERR" + hm_trans(msg); }; -var hm_spinner = function(type = 'border', size = '') { +var hm_spinner = function (type = 'border', size = '') { return ` @@ -382,7 +390,7 @@ function Hm_Modal(options) { var Hm_Notices = { hide_id: false, - show: function (msgs) { + show: function(msgs) { var message = ''; var type = ''; for (var i in msgs) { @@ -399,7 +407,7 @@ var Hm_Notices = { } }, - hide: function (now) { + hide: function(now) { if (Hm_Notices.hide_id) { clearTimeout(Hm_Notices.hide_id); } @@ -408,7 +416,7 @@ var Hm_Notices = { Hm_Utils.clear_sys_messages(); } else { - Hm_Notices.hide_id = setTimeout(function () { + Hm_Notices.hide_id = setTimeout(function() { $('.sys_messages').addClass('d-none'); Hm_Utils.clear_sys_messages(); }, 5000); @@ -421,7 +429,7 @@ var Hm_Timer = { jobs: [], interval: 1000, - add_job: function (job, interval, defer, custom_defer) { + add_job: function(job, interval, defer, custom_defer) { if (custom_defer) { Hm_Timer.jobs.push([job, interval, custom_defer]); } @@ -429,11 +437,11 @@ var Hm_Timer = { Hm_Timer.jobs.push([job, interval, interval]); } if (!defer) { - try { job(); } catch (e) { console.log(e); } + try { job(); } catch(e) { console.log(e); } } }, - cancel: function (job) { + cancel: function(job) { for (var index in Hm_Timer.jobs) { if (Hm_Timer.jobs[index][0] == job) { Hm_Timer.jobs.splice(index, 1); @@ -443,7 +451,7 @@ var Hm_Timer = { return false; }, - fire: function () { + fire: function() { var job; var index; for (index in Hm_Timer.jobs) { @@ -452,7 +460,7 @@ var Hm_Timer = { if (job[2] === 0) { job[2] = job[1]; Hm_Timer.jobs[index] = job; - try { job[0](); } catch (e) { console.log(e); } + try { job[0](); } catch(e) { console.log(e); } } } setTimeout(Hm_Timer.fire, Hm_Timer.interval); @@ -492,34 +500,34 @@ function Message_List() { if (completed) { for (index in this.callbacks) { func = this.callbacks[index]; - try { func(); } catch (e) { console.log(e); } + try { func(); } catch(e) { console.log(e); } } } fixLtrInRtl(); }; - this.update = function (msgs) { - Hm_Utils.tbody().html(''); + this.update = function(msgs, id) { + Hm_Utils.tbody(id).html(''); for (const index in msgs) { const row = msgs[index][0]; Hm_Utils.tbody(id).append(row); } }; - this.set_tab_index = function () { + this.set_tab_index = function() { var msg_rows = Hm_Utils.rows(); var count = 1; - msg_rows.each(function () { + msg_rows.each(function() { $(this).attr('tabindex', count); count++; }); }; - this.sort = function (fld) { + this.sort = function(fld) { var listitems = Hm_Utils.rows(); var aval; var bval; - var sort_result = listitems.sort(function (a, b) { + var sort_result = listitems.sort(function(a, b) { switch (Math.abs(fld)) { case 1: case 2: @@ -549,13 +557,13 @@ function Message_List() { }); this.sort_fld = fld; Hm_Utils.tbody().html(''); - for (var i = 0, len = sort_result.length; i < len; i++) { + for (var i = 0, len=sort_result.length; i < len; i++) { Hm_Utils.tbody().append(sort_result[i]); } this.save_updated_list(); }; - this.insert_into_message_list = function (row, msg_rows) { + this.insert_into_message_list = function(row, msg_rows) { var sort_fld = this.sort_fld; if (typeof sort_fld == 'undefined' || sort_fld == null) { sort_fld = 4; @@ -564,10 +572,10 @@ function Message_List() { if (sort_fld == 4 || sort_fld == -4) { var timestr2; var timestr = $('.msg_timestamp', $(row)).val(); - $('tr', msg_rows).each(function () { + $('tr', msg_rows).each(function() { timestr2 = $('.msg_timestamp', $(this)).val(); - if ((sort_fld == -4 && (timestr2 * 1) >= (timestr * 1)) || - (sort_fld == 4 && (timestr * 1) >= (timestr2 * 1))) { + if ((sort_fld == -4 && (timestr2*1) >= (timestr*1)) || + (sort_fld == 4 && (timestr*1) >= (timestr2*1))) { element = $(this); return false; } @@ -576,10 +584,10 @@ function Message_List() { else { var bval; var aval = $($('td', $(row))[Math.abs(sort_fld)]).text().replace(/^\s+/g, ''); - $('tr', msg_rows).each(function () { + $('tr', msg_rows).each(function() { bval = $($('td', $(this))[Math.abs(sort_fld)]).text().replace(/^\s+/g, ''); if ((sort_fld < 0 && aval.toUpperCase().localeCompare(bval.toUpperCase()) > 0) || - (sort_fld > 0 && bval.toUpperCase().localeCompare(aval.toUpperCase()) > 0)) { + (sort_fld > 0 && bval.toUpperCase().localeCompare(aval.toUpperCase()) > 0)) { element = $(this); return false; } @@ -592,16 +600,16 @@ function Message_List() { else { msg_rows.append(row); } - self.just_inserted.push($('.from', $(row)).text() + ' - ' + $('.subject', $(row)).text()); + self.just_inserted.push($('.from', $(row)).text()+' - '+$('.subject', $(row)).text()); }; - this.reset_checkboxes = function () { + this.reset_checkboxes = function() { this.toggle_msg_controls(); this.set_row_events(); }; - this.toggle_msg_controls = function () { - if ($('input[type=checkbox]', $('.message_table')).filter(function () { return this.checked; }).length > 0) { + this.toggle_msg_controls = function() { + if ($('input[type=checkbox]', $('.message_table')).filter(function() {return this.checked; }).length > 0) { $('.msg_controls').addClass('d-flex'); $('.msg_controls').removeClass('d-none'); $('.mailbox_list_title').addClass('hide'); @@ -613,7 +621,7 @@ function Message_List() { } }; - this.update_after_action = function (action_type, selected) { + this.update_after_action = function(action_type, selected) { var remove = false; if (action_type == 'read' && getListPathParam() == 'unread') { remove = true; @@ -642,20 +650,20 @@ function Message_List() { this.reset_checkboxes(); }; - this.save_updated_list = function () { + this.save_updated_list = function() { if (this.page_caches.hasOwnProperty(getListPathParam())) { this.set_message_list_state(this.page_caches[getListPathParam()]); - Hm_Utils.save_to_local_storage('sort_' + getListPathParam(), this.sort_fld); + Hm_Utils.save_to_local_storage('sort_'+getListPathParam(), this.sort_fld); } }; - this.remove_after_action = function (action_type, selected) { + this.remove_after_action = function(action_type, selected) { var removed = 0; var class_name = false; var index; for (index in selected) { class_name = selected[index]; - $('.' + Hm_Utils.clean_selector(class_name)).remove(); + $('.'+Hm_Utils.clean_selector(class_name)).remove(); if (action_type == 'delete') { this.deleted.push(class_name); } @@ -664,14 +672,14 @@ function Message_List() { return removed; }; - this.read_after_action = function (action_type, selected) { + this.read_after_action = function(action_type, selected) { var read = 0; var row; var index; var class_name = false; for (index in selected) { class_name = selected[index]; - row = $('.' + Hm_Utils.clean_selector(class_name)); + row = $('.'+Hm_Utils.clean_selector(class_name)); if (action_type == 'read') { $('.subject > div', row).removeClass('unseen'); row.removeClass('unseen'); @@ -685,14 +693,14 @@ function Message_List() { return read; }; - this.flag_after_action = function (action_type, selected) { + this.flag_after_action = function(action_type, selected) { var flagged = 0; var class_name; var row; var index; for (index in selected) { class_name = selected[index]; - row = $('.' + Hm_Utils.clean_selector(class_name)); + row = $('.'+Hm_Utils.clean_selector(class_name)); if (action_type == 'flag') { $('.icon', row).html(hm_flag_image_src()); } @@ -704,7 +712,7 @@ function Message_List() { return flagged; }; - this.load_sources = function () { + this.load_sources = function() { var index; var source; if (!self.background) { @@ -717,7 +725,7 @@ function Message_List() { return false; }; - this.select_combined_view = function () { + this.select_combined_view = function() { if (self.page_caches.hasOwnProperty(getListPathParam())) { self.setup_combined_view(self.page_caches[getListPathParam()]); } @@ -729,24 +737,23 @@ function Message_List() { self.setup_combined_view(false); } } - var sort_type = Hm_Utils.get_from_local_storage('sort_' + getListPathParam()); + var sort_type = Hm_Utils.get_from_local_storage('sort_'+getListPathParam()); if (sort_type != null) { this.sort_fld = sort_type; $('.combined_sort').val(sort_type); } - $('.core_msg_control').on("click", function (e) { + $('.core_msg_control').on("click", function(e) { e.preventDefault(); - return self.message_action($(this).data('action')); - }); - $('.toggle_link').on("click", function () { return self.toggle_rows(); }); - $('.refresh_link').on("click", function () { return self.load_sources(); }); + return self.message_action($(this).data('action')); }); + $('.toggle_link').on("click", function() { return self.toggle_rows(); }); + $('.refresh_link').on("click", function() { return self.load_sources(); }); }; - this.add_sources = function (sources) { + this.add_sources = function(sources) { self.sources = sources; }; - this.setup_combined_view = function (cache_name) { + this.setup_combined_view = function(cache_name) { self.add_sources(hm_data_sources()); var data = Hm_Utils.get_from_local_storage(cache_name); var interval = Hm_Utils.get_from_global('combined_view_refresh_interval', 60); @@ -765,53 +772,53 @@ function Message_List() { } }; - this.clear_read_messages = function () { + this.clear_read_messages = function() { var class_name; var list = Hm_Utils.get_from_local_storage('read_message_list'); if (list && list.length) { list = Hm_Utils.json_decode(list); for (class_name in list) { - $('.' + Hm_Utils.clean_selector(class_name)).remove(); + $('.'+Hm_Utils.clean_selector(class_name)).remove(); } Hm_Utils.save_to_local_storage('read_message_list', ''); } }; /* TODO: remove module specific refs */ - this.update_title = function (list_path = getListPathParam()) { + this.update_title = function(list_path = getListPathParam()) { var count = 0; var rows = Hm_Utils.rows(); var tbody = Hm_Utils.tbody(); if (list_path == 'unread') { count = rows.length; - document.title = count + ' ' + hm_trans('Unread'); + document.title = count+' '+hm_trans('Unread'); } else if (list_path == 'flagged') { count = rows.length; - document.title = count + ' ' + hm_trans('Flagged'); + document.title = count+' '+hm_trans('Flagged'); } else if (list_path == 'combined_inbox') { count = $('tr .unseen', tbody).length; - document.title = count + ' ' + hm_trans('Unread in Everything'); + document.title = count+' '+hm_trans('Unread in Everything'); } else if (list_path == 'email') { count = $('tr .unseen', tbody).length; - document.title = count + ' ' + hm_trans('Unread in Email'); + document.title = count+' '+hm_trans('Unread in Email'); } else if (list_path == 'feeds') { count = $('tr .unseen', tbody).length; - document.title = count + ' ' + hm_trans('Unread in Feeds'); + document.title = count+' '+hm_trans('Unread in Feeds'); } }; - this.message_action = function (action_type) { + this.message_action = function(action_type) { if (action_type == 'delete' && !hm_delete_prompt()) { return false; } var msg_list = $('.message_table'); var selected = []; var current_list = self.filter_list(); - $('input[type=checkbox]', msg_list).each(function () { + $('input[type=checkbox]', msg_list).each(function() { if (this.checked) { selected.push($(this).val()); } @@ -819,10 +826,10 @@ function Message_List() { if (selected.length > 0) { var updated = false; Hm_Ajax.request( - [{ 'name': 'hm_ajax_hook', 'value': 'ajax_message_action' }, - { 'name': 'action_type', 'value': action_type }, - { 'name': 'message_ids', 'value': selected }], - function (res) { + [{'name': 'hm_ajax_hook', 'value': 'ajax_message_action'}, + {'name': 'action_type', 'value': action_type}, + {'name': 'message_ids', 'value': selected}], + function(res) { if (!res) { $('.message_table_body').replaceWith(current_list); self.save_updated_list(); @@ -847,9 +854,10 @@ function Message_List() { } }; - this.prev_next_links = function (msgUid, lisPath = getListPathParam()) { - let phref; - let nhref; + this.prev_next_links = function(msgUid, lisPath = getListPathParam()) { + let prevUrl; + let nextUrl; + const target = $('.msg_headers tr').last(); const messages = new Hm_MessagesStore(lisPath, Hm_Utils.get_url_page_number()); messages.load(false, true); @@ -860,31 +868,31 @@ function Message_List() { prevUrl = new URL(prevSubject.prop('href')); prevUrl.searchParams.set('list_parent', lisPath); const subject = prevSubject.text(); - const plink = ' ' + subject + ''; - $('' + plink + '').insertBefore(target); + const plink = ' '+subject+''; + $(''+plink+'').insertBefore(target); } if (next) { const nextSubject = $(next['0']).find('.subject a'); nextUrl = new URL(nextSubject.prop('href')); nextUrl.searchParams.set('list_parent', lisPath); const subject = nextSubject.text(); - - const nlink = ' ' + subject + ''; - $('' + nlink + '').insertBefore(target); + + const nlink = ' '+subject+''; + $(''+nlink+'').insertBefore(target); } return [prevUrl?.href, nextUrl?.href]; }; - this.check_empty_list = function () { + this.check_empty_list = function() { var count = Hm_Utils.rows().length; if (!count) { if (!$('.empty_list').length) { if (getPageNameParam() == 'search') { - $('.search_content').append('
' + hm_empty_folder() + '
'); + $('.search_content').append('
'+hm_empty_folder()+'
'); } else { - $('.message_list').append('
' + hm_empty_folder() + '
'); + $('.message_list').append('
'+hm_empty_folder()+'
'); } } } @@ -894,7 +902,7 @@ function Message_List() { return count === 0; }; - this.track_read_messages = function (class_name) { + this.track_read_messages = function(class_name) { var read_messages = Hm_Utils.get_from_local_storage('read_message_list'); if (read_messages && read_messages.length) { read_messages = Hm_Utils.json_decode(read_messages); @@ -911,9 +919,9 @@ function Message_List() { return added; }; - this.adjust_unread_total = function (amount, replace) { + this.adjust_unread_total = function(amount, replace) { var missing = $('.total_unread_count').text() === '' ? true : false; - var current = $('.total_unread_count').text() * 1; + var current = $('.total_unread_count').text()*1; var new_total; if (replace && amount == current && amount != 0) { return; @@ -931,7 +939,7 @@ function Message_List() { new_total = 0; } if (new_total != current || missing) { - $('.total_unread_count').html(' ' + new_total + ' '); + $('.total_unread_count').html(' '+new_total+' '); } if (new_total > current && getPageNameParam() != 'message_list' && getListPathParam() != 'unread') { $('.menu_unread > a').css('font-weight', 'bold'); @@ -943,14 +951,14 @@ function Message_List() { self.past_total = current; }; - this.toggle_rows = function () { + this.toggle_rows = function() { $('input[type=checkbox]', $('.message_table')).each(function () { this.checked = !this.checked; }); self.toggle_msg_controls(); return false; }; - this.filter_list = function () { - var data = Hm_Utils.rows().clone().filter(function () { + this.filter_list = function() { + var data = Hm_Utils.rows().clone().filter(function() { if (this.className == 'inline_msg') { return false; } @@ -961,7 +969,7 @@ function Message_List() { return res; }; - this.set_message_list_state = function (list_type) { + this.set_message_list_state = function(list_type) { var data = this.filter_list(); data.find('*[style]').attr('style', ''); data.find('input[type=checkbox]').removeAttr('checked'); @@ -977,10 +985,10 @@ function Message_List() { } }; - this.select_range = function (a, b) { + this.select_range = function(a, b) { var start = false; var end = false; - $('input[type=checkbox]', $('.message_table')).each(function () { + $('input[type=checkbox]', $('.message_table')).each(function() { if (end) { return false; } @@ -999,7 +1007,7 @@ function Message_List() { }); }; - this.process_shift_click = function (el) { + this.process_shift_click = function(el) { var id = el.prop('id'); if (id == self.last_click) { return; @@ -1007,12 +1015,12 @@ function Message_List() { self.select_range(id, self.last_click); }; - this.set_row_events = function () { + this.set_row_events = function() { Hm_Utils.rows().off('click'); - Hm_Utils.rows().on('click', function (e) { self.process_row_click(e); }); + Hm_Utils.rows().on('click', function(e) { self.process_row_click(e); }); } - this.process_row_click = function (e) { + this.process_row_click = function(e) { if (e.target.tagName === 'A') { return; } @@ -1038,47 +1046,48 @@ function Message_List() { return false; } - this.select_on_row_click = function (shift, ctrl, el, target) { + this.select_on_row_click = function(shift, ctrl, el, target) { if (shift) { if (self.last_click) { self.process_shift_click(el); } - $('#' + el.prop('id')).prop('checked', 'checked'); + $('#'+el.prop('id')).prop('checked', 'checked'); self.last_click = el.prop('id'); } else if (ctrl) { if (el.prop('checked')) { - $('#' + el.prop('id')).prop('checked', false); + $('#'+el.prop('id')).prop('checked', false); } else { - $('#' + el.prop('id')).prop('checked', 'checked'); + $('#'+el.prop('id')).prop('checked', 'checked'); self.last_click = el.prop('id'); } } } - this.set_all_mail_state = function () { self.set_message_list_state('formatted_all_mail'); }; - this.set_combined_inbox_state = function () { self.set_message_list_state('formatted_combined_inbox'); }; - this.set_flagged_state = function () { self.set_message_list_state('formatted_flagged_data'); }; - this.set_unread_state = function () { self.set_message_list_state('formatted_unread_data'); }; - this.set_search_state = function () { self.set_message_list_state('formatted_search_data'); }; - this.set_junk_state = function () { self.set_message_list_state('formatted_junk_data'); }; - this.set_trash_state = function () { self.set_message_list_state('formatted_trash_data'); }; - this.set_draft_state = function () { self.set_message_list_state('formatted_drafts_data'); }; - this.set_tag_state = function () { self.set_message_list_state('formatted_tag_data'); }; + this.set_all_mail_state = function() { self.set_message_list_state('formatted_all_mail'); }; + this.set_combined_inbox_state = function() { self.set_message_list_state('formatted_combined_inbox'); }; + this.set_flagged_state = function() { self.set_message_list_state('formatted_flagged_data'); }; + this.set_unread_state = function() { self.set_message_list_state('formatted_unread_data'); }; + this.set_search_state = function() { self.set_message_list_state('formatted_search_data'); }; + this.set_junk_state = function() { self.set_message_list_state('formatted_junk_data'); }; + this.set_snoozed_state = function() { self.set_message_list_state('formatted_snoozed_data'); }; + this.set_trash_state = function() { self.set_message_list_state('formatted_trash_data'); }; + this.set_draft_state = function() { self.set_message_list_state('formatted_drafts_data'); }; + this.set_tag_state = function() { self.set_message_list_state('formatted_tag_data'); }; }; /* folder list */ var Hm_Folders = { expand_after_update: false, unread_counts: {}, - observer: false, + observer : false, - save_folder_list: function () { + save_folder_list: function() { Hm_Utils.save_to_local_storage('formatted_folder_list', $('.folder_list').html()); }, - load_unread_counts: function () { + load_unread_counts: function() { var res = Hm_Utils.json_decode(Hm_Utils.get_from_local_storage('unread_counts')); if (!res) { Hm_Folders.unread_counts = {}; @@ -1088,9 +1097,9 @@ var Hm_Folders = { } }, - update_unread_counts: function (folder) { + update_unread_counts: function(folder) { if (folder) { - $('.unread_' + folder).html(' ' + Hm_Folders.unread_counts[folder] + ' '); + $('.unread_'+folder).html(' '+Hm_Folders.unread_counts[folder]+' '); } else { var name; @@ -1102,17 +1111,17 @@ var Hm_Folders = { if (count) { if (getListPathParam() == name && getPageNameParam() == 'message_list') { var title = document.title.replace(/^\[\d+\]/, ''); - document.title = '[' + count + '] ' + title; + document.title = '['+count+'] '+title; /* HERE */ } - $('.unread_' + name).html(' ' + count + ' '); + $('.unread_'+name).html(' '+count+' '); } } } Hm_Utils.save_to_local_storage('unread_counts', Hm_Utils.json_encode(Hm_Folders.unread_counts)); }, - open_folder_list: function () { + open_folder_list: function() { $('.folder_list').show(); $('.folder_toggle').toggle(); if (hm_mobile()) { @@ -1125,7 +1134,7 @@ var Hm_Folders = { return false; }, - toggle_folder_list: function () { + toggle_folder_list: function() { if ($('.folder_list').css('display') == 'none') { Hm_Folders.open_folder_list(); } @@ -1134,7 +1143,7 @@ var Hm_Folders = { } }, - hide_folder_list: function (forget) { + hide_folder_list: function(forget) { $('.folder_list').hide(); $('.folder_toggle').show(); if (!forget) { @@ -1145,7 +1154,7 @@ var Hm_Folders = { return false; }, - reload_folders: function (force, expand_after_update) { + reload_folders: function(force, expand_after_update) { if (document.cookie.indexOf('hm_reload_folders=1') > -1 || force) { Hm_Folders.expand_after_update = expand_after_update; var ui_state = Hm_Utils.preserve_local_settings(); @@ -1157,28 +1166,28 @@ var Hm_Folders = { return false; }, - sort_list: function (class_name, exclude_name, last_name) { - var folder = $('.' + class_name + ' ul'); + sort_list: function(class_name, exclude_name, last_name) { + var folder = $('.'+class_name+' ul'); var listitems; if (exclude_name) { - listitems = $('li:not(.' + exclude_name + ')', folder); + listitems = $('li:not(.'+exclude_name+')', folder); } else { listitems = $('li', folder); } - listitems = listitems.sort(function (a, b) { + listitems = listitems.sort(function(a, b) { if (last_name && ($(a).attr('class') == last_name || $(b).attr('class') == last_name)) { return false; } if ($(b).text().toUpperCase() == 'ALL') { return true; } - return $(a).text().toUpperCase().localeCompare($(b).text().toUpperCase()); + return $(a).text().toUpperCase().localeCompare($(b).text().toUpperCase()); }); - $.each(listitems, function (_, itm) { folder.append(itm); }); + $.each(listitems, function(_, itm) { folder.append(itm); }); }, - update_folder_list_display: function (res) { + update_folder_list_display: function(res) { $('.folder_list').html(res.formatted_folder_list); Hm_Folders.sort_list('email_folders', 'menu_email'); Hm_Folders.sort_list('feeds_folders', 'menu_feeds', 'feeds_add_new'); @@ -1194,9 +1203,9 @@ var Hm_Folders = { hl_save_link(); }, - update_folder_list: function () { + update_folder_list: function() { Hm_Ajax.request( - [{ 'name': 'hm_ajax_hook', 'value': 'ajax_hm_folders' }], + [{'name': 'hm_ajax_hook', 'value': 'ajax_hm_folders'}], Hm_Folders.update_folder_list_display, [], true @@ -1204,72 +1213,72 @@ var Hm_Folders = { return false; }, - folder_list_events: function () { - $('.imap_folder_link').on("click", function () { return expand_imap_folders($(this)); }); - $('.src_name').on('click', function () { + folder_list_events: function() { + $('.imap_folder_link').on("click", function() { return expand_imap_folders($(this)); }); + $('.src_name').on('click', function() { let transformValue = ''; if ($(this).attr('aria-expanded') == 'true') { transformValue = 'rotate(180deg)'; - + } else { transformValue = 'rotate(0deg)'; } - + $(this).find('i').css('transform', transformValue); }); - $('.update_message_list').on("click", function (e) { + $('.update_message_list').on("click", function(e) { var text = e.target.innerHTML; e.target.innerHTML = ''; Hm_Folders.update_folder_list(); - Hm_Ajax.add_callback_hook('hm_reload_folders', function () { + Hm_Ajax.add_callback_hook('hm_reload_folders', function() { e.target.innerHTML = text; }); return false; }); - $('.hide_folders').on("click", function () { return Hm_Folders.hide_folder_list(); }); - $('.logout_link').on("click", function (e) { return Hm_Utils.confirm_logout(); }); + $('.hide_folders').on("click", function() { return Hm_Folders.hide_folder_list(); }); + $('.logout_link').on("click", function(e) { return Hm_Utils.confirm_logout(); }); if (hm_search_terms()) { $('.search_terms').val(hm_search_terms()); } - $('.search_terms').on('search', function () { - Hm_Ajax.request([{ 'name': 'hm_ajax_hook', 'value': 'ajax_reset_search' }]); + $('.search_terms').on('search', function() { + Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_reset_search'}]); }); }, - hl_selected_menu: function () { + hl_selected_menu: function() { const page = getPageNameParam(); const path = getListPathParam(); - + $('.folder_list').find('*').removeClass('selected_menu'); if (path) { if (page == 'message_list' || page == 'message') { - $("[data-id='" + Hm_Utils.clean_selector(path) + "']").closest('li').addClass('selected_menu'); - $('.menu_' + Hm_Utils.clean_selector(path)).addClass('selected_menu'); + $("[data-id='"+Hm_Utils.clean_selector(path)+"']").closest('li').addClass('selected_menu'); + $('.menu_'+Hm_Utils.clean_selector(path)).addClass('selected_menu'); } else { - $('.menu_' + path).addClass('selected_menu'); + $('.menu_'+path).addClass('selected_menu'); } } else { - $('.menu_' + page).addClass('selected_menu'); + $('.menu_'+page).addClass('selected_menu'); } }, - listen_for_new_messages: function () { + listen_for_new_messages: function() { var target = $('.total_unread_count').get(0); if (!Hm_Folders.observer) { - Hm_Folders.observer = new MutationObserver(function (mutations) { + Hm_Folders.observer = new MutationObserver(function(mutations) { $('body').trigger('new_message'); }); } else { Hm_Folders.observer.disconnect(); } - Hm_Folders.observer.observe(target, { attributes: true, childList: true, characterData: true }); + Hm_Folders.observer.observe(target, {attributes: true, childList: true, characterData: true}); }, - load_from_local_storage: function () { + load_from_local_storage: function() { var folder_list = Hm_Utils.get_from_local_storage('formatted_folder_list'); if (folder_list) { $('.folder_list').html(folder_list); @@ -1288,21 +1297,21 @@ var Hm_Folders = { return false; }, - toggle_folders_event: function () { - $('.folder_toggle').on("click", function () { return Hm_Folders.open_folder_list(); }); + toggle_folders_event: function() { + $('.folder_toggle').on("click", function() { return Hm_Folders.open_folder_list(); }); } }; /* misc */ var Hm_Utils = { - get_url_page_number: function () { + get_url_page_number: function() { var index; var match_result; var page_number = 1; var params = location.search.substr(1).split('&'); var param_len = params.length; - for (index = 0; index < param_len; index++) { + for (index=0; index < param_len; index++) { match_result = params[index].match(/list_page=(\d+)/); if (match_result) { page_number = match_result[1]; @@ -1312,14 +1321,14 @@ var Hm_Utils = { return page_number; }, - get_from_global: function (name, def) { + get_from_global: function(name, def) { if (globals[name]) { return globals[name]; } return def; }, - preserve_local_settings: function () { + preserve_local_settings: function() { var i; var result = {}; var prefix = window.location.pathname.length; @@ -1332,33 +1341,33 @@ var Hm_Utils = { return result; }, - restore_local_settings: function (settings) { + restore_local_settings: function(settings) { var i; for (i in settings) { Hm_Utils.save_to_local_storage(i, settings[i]); } }, - reset_search_form: function () { + reset_search_form: function() { Hm_Utils.save_to_local_storage('formatted_search_data', ''); - Hm_Ajax.request([{ 'name': 'hm_ajax_hook', 'value': 'ajax_reset_search' }], - function (res) { window.location = '?page=search'; }, false, true); + Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_reset_search'}], + function(res) { window.location = '?page=search'; }, false, true); return false; }, - confirm_logout: function () { - if (!$('#unsaved_changes').length || $('#unsaved_changes').val() == 0) { + confirm_logout: function() { + if (! $('#unsaved_changes').length || $('#unsaved_changes').val() == 0) { document.getElementById('logout_without_saving').click(); } else { - var confirmLogoutModal = new bootstrap.Modal(document.getElementById('confirmLogoutModal'), { keyboard: true }) + var confirmLogoutModal = new bootstrap.Modal(document.getElementById('confirmLogoutModal'), {keyboard: true}) confirmLogoutModal.show(); $('.confirm_logout').show(); } return false; }, - get_path_type: function (path) { + get_path_type: function(path) { if (path.indexOf('_') != -1) { var path_parts = path.split('_'); return path_parts[0]; @@ -1366,7 +1375,7 @@ var Hm_Utils = { return false; }, - parse_folder_path: function (path, path_type) { + parse_folder_path: function(path, path_type) { if (!path_type) { path_type = Hm_Utils.get_path_type(path); } @@ -1397,7 +1406,7 @@ var Hm_Utils = { folder = parts[3]; } if (type && server_id) { - return { 'type': type, 'server_id': server_id, 'folder': folder, 'uid': uid }; + return {'type': type, 'server_id' : server_id, 'folder' : folder, 'uid': uid}; } } else if (path_type == 'feeds') { @@ -1410,13 +1419,13 @@ var Hm_Utils = { uid = parts[2]; } if (type && server_id) { - return { 'type': type, 'server_id': server_id, 'uid': uid }; + return {'type': type, 'server_id' : server_id, 'uid': uid}; } } return false; }, - toggle_section: function (class_name, force_on, force_off) { + toggle_section: function(class_name, force_on, force_off) { if ($(class_name).length) { if (force_off) { $(class_name).css('display', 'block'); @@ -1430,7 +1439,7 @@ var Hm_Utils = { return false; }, - toggle_page_section: function (class_name) { + toggle_page_section: function(class_name) { if ($(class_name).length) { $(class_name).toggle(); Hm_Utils.save_to_local_storage(class_name, $(class_name).css('display')); @@ -1438,12 +1447,12 @@ var Hm_Utils = { return false; }, - get_from_local_storage: function (key) { + get_from_local_storage: function(key) { var prefix = window.location.pathname; - key = prefix + key; + key = prefix+key; var res = false; if (hm_encrypt_local_storage()) { - res = Hm_Crypt.decrypt(sessionStorage.getItem(key)); + res = Hm_Crypt.decrypt(sessionStorage.getItem(key)); } else { res = sessionStorage.getItem(key); @@ -1451,7 +1460,7 @@ var Hm_Utils = { return res; }, - search_from_local_storage: function (pattern) { + search_from_local_storage: function(pattern) { const results = []; const key_pattern = new RegExp(pattern); for (let i = 0; i < sessionStorage.length; i++) { @@ -1464,14 +1473,14 @@ var Hm_Utils = { return results; }, - save_to_local_storage: function (key, val) { + save_to_local_storage: function(key, val) { var prefix = window.location.pathname; - key = prefix + key; + key = prefix+key; if (hm_encrypt_local_storage()) { val = Hm_Crypt.encrypt(val); } - if (Storage !== void (0)) { - try { sessionStorage.setItem(key, val); } catch (e) { + if (Storage !== void(0)) { + try { sessionStorage.setItem(key, val); } catch(e) { sessionStorage.clear(); sessionStorage.setItem(key, val); } @@ -1483,25 +1492,25 @@ var Hm_Utils = { return false; }, - clean_selector: function (str) { + clean_selector: function(str) { return str.replace(/(:|\.|\[|\]|\/)/g, "\\$1"); }, - toggle_long_headers: function () { + toggle_long_headers: function() { $('.long_header').toggle(); $('.all_headers').toggle(); $('.small_headers').toggle(); return false; }, - set_unsaved_changes: function (state) { + set_unsaved_changes: function(state) { $('#unsaved_changes').val(state); }, /** * Shows pending messages added with the add_sys_message method */ - show_sys_messages: function () { + show_sys_messages: function() { $('.sys_messages').removeClass('d-none'); }, @@ -1510,12 +1519,12 @@ var Hm_Utils = { * @param {*} msg : The alert message to display * @param {*} type : The type of message to display, depending on the type of boostrap5 alert (primary, secondary, success, danger, warning, info, light, dark ) */ - add_sys_message: function (msg, type = 'info') { + add_sys_message: function(msg, type = 'info') { if (!msg) { return; } const icon = type == 'success' ? 'bi-check-circle' : 'bi-exclamation-circle'; - $('.sys_messages').append(''); + $('.sys_messages').append(''); this.show_sys_messages(); }, @@ -1523,11 +1532,11 @@ var Hm_Utils = { $('.sys_messages').html(''); }, - cancel_logout_event: function () { - $('.cancel_logout').on("click", function () { $('.confirm_logout').hide(); return false; }); + cancel_logout_event: function() { + $('.cancel_logout').on("click", function() { $('.confirm_logout').hide(); return false; }); }, - json_encode: function (val) { + json_encode: function(val) { try { return JSON.stringify(val); } @@ -1536,7 +1545,7 @@ var Hm_Utils = { } }, - json_decode: function (val, original) { + json_decode: function(val, original) { try { return JSON.parse(val); } @@ -1548,22 +1557,25 @@ var Hm_Utils = { } }, - rows: function () { - return $('.message_table_body > tr').not('.inline_msg'); + rows: function(id) { + return this.tbody(id).find('tr').not('.inline_msg'); }, - tbody: function () { + tbody: function(id) { + if (id) { + return $('#'+id); + } return $('.message_table_body'); }, - html_entities: function (str) { + html_entities: function(str) { return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); }, - test_connection: function () { + test_connection: function() { $('.offline').hide(); Hm_Ajax.request( - [{ 'name': 'hm_ajax_hook', 'value': 'ajax_test' }], + [{'name': 'hm_ajax_hook', 'value': 'ajax_test'}], false, [], false, false, false); }, @@ -1574,7 +1586,7 @@ var Hm_Utils = { }, redirect: function (path) { - if (!path) { + if (! path) { path = window.location.href; } window.location.href = path; @@ -1586,7 +1598,7 @@ var Hm_Utils = { }; var Hm_Crypt = { - decrypt: function (ciphertext) { + decrypt: function(ciphertext) { try { ciphertext = atob(ciphertext); if (!ciphertext || ciphertext.length < 200) { @@ -1608,16 +1620,16 @@ var Hm_Crypt = { } var iv = forge.pkcs5.pbkdf2(secret, salt, 100, 16, digest); var decipher = forge.cipher.createDecipher('AES-CBC', key); - decipher.start({ iv: iv }); + decipher.start({iv: iv}); decipher.update(forge.util.createBuffer(payload, 'raw')); decipher.finish(); return forge.util.decodeUtf8(decipher.output.data); - } catch (e) { + } catch(e) { return false; } }, - encrypt: function (plaintext) { + encrypt: function(plaintext) { try { var secret = $('#hm_page_key').val(); var salt = forge.random.getBytesSync(128); @@ -1627,28 +1639,28 @@ var Hm_Crypt = { var iv = forge.pkcs5.pbkdf2(secret, salt, 100, 16, digest); var hmac = forge.hmac.create(); var cipher = forge.cipher.createCipher('AES-CBC', key); - cipher.start({ iv: iv }); + cipher.start({iv: iv}); cipher.update(forge.util.createBuffer(plaintext, 'utf8')); cipher.finish(); hmac.start(digest, hmac_key); hmac.update(cipher.output.data); - return btoa(salt + hmac.digest().data + cipher.output.data); - } catch (e) { + return btoa(salt+hmac.digest().data+cipher.output.data); + } catch(e) { return false; } }, } -var update_password = function (id) { - var pass = $('#update_pw_' + id).val(); +var update_password = function(id) { + var pass = $('#update_pw_'+id).val(); if (pass && pass.length) { Hm_Ajax.request( - [{ 'name': 'hm_ajax_hook', 'value': 'ajax_update_server_pw' }, - { 'name': 'password', 'value': pass }, - { 'name': 'server_pw_id', 'value': id }], - function (res) { + [{'name': 'hm_ajax_hook', 'value': 'ajax_update_server_pw'}, + {'name': 'password', 'value': pass}, + {'name': 'server_pw_id', 'value': id}], + function(res) { if (res.connect_status) { - $('.div_' + id).remove(); + $('.div_'+id).remove(); if ($('.home_password_dialogs div').length == 1) { $('.home_password_dialogs').remove(); } @@ -1658,13 +1670,13 @@ var update_password = function (id) { } } -var elog = function (val) { +var elog = function(val) { if (hm_debug()) { console.log(val); } }; -var hl_save_link = function () { +var hl_save_link = function() { if ($('.save_reminder').length) { $('.menu_save a').css('font-weight', 'bold'); } @@ -1673,7 +1685,7 @@ var hl_save_link = function () { } }; -var reset_default_value_checkbox = function () { +var reset_default_value_checkbox = function() { var checkbox = $(this).closest('.tooltip_restore').prev('input[type="checkbox"]'); var default_value = checkbox.data('default-value'); default_value = (default_value === 'true'); @@ -1681,27 +1693,27 @@ var reset_default_value_checkbox = function () { checkbox.prop('disabled', true); }; -var reset_default_timezone = function () { +var reset_default_timezone = function() { var hm_default_timezone = window.hm_default_timezone; $('#timezone').val(hm_default_timezone); } -var reset_default_value_select = function () { +var reset_default_value_select = function() { var dropdown = $(this).closest('.tooltip_restore').prev('select'); var default_value = dropdown.data('default-value'); dropdown.val(default_value); } -var reset_default_value_input = function () { +var reset_default_value_input = function() { var inputField = $(this).closest('.tooltip_restore').prev('input'); var default_value = inputField.data('default-value'); inputField.val(default_value); } -var decrease_servers = function (section) { +var decrease_servers = function(section) { const element = document.querySelector(`.server_count .${section}_server_count`); const value = parseInt(element.textContent); if (value > 0) { - element.innerHTML = value - 1; + element.innerHTML = value - 1; } if (value === 1) { @@ -1711,11 +1723,11 @@ var decrease_servers = function (section) { } }; -var err_msg = function (msg) { - return "ERR" + hm_trans(msg); +var err_msg = function(msg) { + return "ERR"+hm_trans(msg); }; -var hm_spinner = function (type = 'border', size = '') { +var hm_spinner = function(type = 'border', size = '') { return `