From e96468a98e4c74625ab2541ea6337bb5d5382c3d Mon Sep 17 00:00:00 2001 From: christer kahasha <62720246+christer77@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:26:52 +0100 Subject: [PATCH 01/11] [FIX]Error Ocurred when attempting Microsoft's email oauth2 setup --- .env.example | 8 ++++++++ config/oauth2.php | 10 ++++++++++ modules/core/functions.php | 1 + modules/imap/functions.php | 3 +++ modules/imap/hm-imap.php | 1 - modules/nux/services.php | 4 ++-- tests/phpunit/modules/core/functions.php | 2 +- 7 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 899e8bab87..c51d242ae1 100644 --- a/.env.example +++ b/.env.example @@ -173,6 +173,14 @@ OUTLOOK_AUTH_URI=https://login.live.com/oauth20_authorize.srf OUTLOOK_TOKEN_URI=https://login.live.com/oauth20_token.srf OUTLOOK_REFRESH_URI=https://login.live.com/oauth20_token.srf +#office365 +OFFICE365_CLIENT_ID= +OFFICE365_CLIENT_SECRET= +OFFICE365_CLIENT_URI=http://localhost/?page=home +OFFICE365_AUTH_URI=https://login.live.com/oauth20_authorize.srf +OFFICE365_TOKEN_URI=https://login.live.com/oauth20_token.srf +OFFICE365_REFRESH_URI=https://login.live.com/oauth20_token.srf + #ldap.php LDAP_SERVER=localhost LDAP_ENABLE_TLS=true diff --git a/config/oauth2.php b/config/oauth2.php index 35c3912803..21f5a812cc 100644 --- a/config/oauth2.php +++ b/config/oauth2.php @@ -39,4 +39,14 @@ 'token_uri' => env('OUTLOOK_TOKEN_URI', 'https://login.live.com/oauth20_token.srf'), 'refresh_uri' => env('OUTLOOK_REFRESH_URI', 'https://login.live.com/oauth20_token.srf') ], + + //[office365] + 'office365' => [ + 'client_id' => env('OFFICE365_CLIENT_ID', ''), + 'client_secret' => env('OFFICE365_CLIENT_SECRET', ''), + 'client_uri' => env('OFFICE365_CLIENT_URI', 'http://localhost/?page=home'), + 'auth_uri' => env('OFFICE365_AUTH_URI', 'https://login.live.com/oauth20_authorize.srf'), + 'token_uri' => env('OFFICE365_TOKEN_URI', 'https://login.live.com/oauth20_token.srf'), + 'refresh_uri' => env('OFFICE365_REFRESH_URI', 'https://login.live.com/oauth20_token.srf') + ], ]; diff --git a/modules/core/functions.php b/modules/core/functions.php index bea403918b..d4bc8f80ba 100644 --- a/modules/core/functions.php +++ b/modules/core/functions.php @@ -255,6 +255,7 @@ function get_oauth2_data($config) { return [ 'gmail' => $config->get('gmail',[]), 'outlook' => $config->get('outlook',[]), + 'office365' => $config->get('office365',[]), ]; }} diff --git a/modules/imap/functions.php b/modules/imap/functions.php index 60bb98cd11..d2f4f82575 100644 --- a/modules/imap/functions.php +++ b/modules/imap/functions.php @@ -853,6 +853,9 @@ function imap_refresh_oauth2_token($server, $config) { elseif ($server['server'] == 'imap-mail.outlook.com') { $details = $oauth2_data['outlook']; } + elseif ($server['server'] == 'imap-mail.office365.com') { + $details = $oauth2_data['office365']; + } if (!empty($details)) { $oauth2 = new Hm_Oauth2($details['client_id'], $details['client_secret'], $details['client_uri']); $result = $oauth2->refresh_token($details['refresh_uri'], $server['refresh_token']); diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php index dba860da47..96977849ac 100644 --- a/modules/imap/hm-imap.php +++ b/modules/imap/hm-imap.php @@ -320,7 +320,6 @@ public function authenticate($username, $password) { } return $authed; } - /** * attempt starttls diff --git a/modules/nux/services.php b/modules/nux/services.php index 39c97d0d91..c17ca633db 100644 --- a/modules/nux/services.php +++ b/modules/nux/services.php @@ -62,9 +62,9 @@ 'name' => 'Office365', 'scope' => 'wl.imap', 'smtp' => array( - 'server' => 'outlook.office365.com', + 'server' => 'smtp.office365.com', 'port' => 587, - 'tls'=> 'yes' + 'tls'=> false ) )); diff --git a/tests/phpunit/modules/core/functions.php b/tests/phpunit/modules/core/functions.php index 818cf4018e..a358f3f1f4 100644 --- a/tests/phpunit/modules/core/functions.php +++ b/tests/phpunit/modules/core/functions.php @@ -84,7 +84,7 @@ public function test_is_email_address() { */ public function test_get_oauth2_data() { $mock_config = new Hm_Mock_Config(); - $this->assertEquals(array('gmail' => [],'outlook' => []), (get_oauth2_data($mock_config))); + $this->assertEquals(array('gmail' => [],'outlook' => [],'office365' => []), (get_oauth2_data($mock_config))); } /** * @preserveGlobalState disabled From 8f54cf70b9be07649ba3ce2026dc1ad034885e74 Mon Sep 17 00:00:00 2001 From: Steven Ngesera Date: Fri, 29 Nov 2024 13:44:00 +0300 Subject: [PATCH 02/11] refactor(sieve): fixed error all to undefined function get_sieve_host_from_services --- modules/sievefilters/hm-sieve.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/sievefilters/hm-sieve.php b/modules/sievefilters/hm-sieve.php index c555941ff0..9c50f6a7b0 100644 --- a/modules/sievefilters/hm-sieve.php +++ b/modules/sievefilters/hm-sieve.php @@ -1,6 +1,8 @@ Date: Fri, 29 Nov 2024 22:41:52 +0100 Subject: [PATCH 03/11] refactor(workflow): pr title validation update (#1389) Adds 4 new types for pr scopes observed in cypht: - frontend - backend - frontend/backend - backend/frontend Furhtermore a comprehensive guide was added to the pull request template to make it easier for people to fullfill this requirement. adjust scopes according to requirements updated scopes according to agreement adjusted example in PR template --- .github/PULL_REQUEST_TEMPLATE.md | 13 +++++++++++++ .github/workflows/test.lint.pr.yml | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d40a2770ac..811e3b384e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,18 @@ + + ## 🍰 Pullrequest diff --git a/.github/workflows/test.lint.pr.yml b/.github/workflows/test.lint.pr.yml index c800e54a7c..d76c3b1cb2 100644 --- a/.github/workflows/test.lint.pr.yml +++ b/.github/workflows/test.lint.pr.yml @@ -29,12 +29,17 @@ jobs: # Configure which scopes are allowed (newline delimited). # Append a scope for each service here scopes: | - docu + docs docker release workflow + frontend + backend + frontend/backend + module + unit + e2e other - cypht # Configure that a scope must always be provided. requireScope: true # Configure which scopes (newline delimited) are disallowed in PR From 80873a92a4941b004e4d38bbe6afbd1ff6bfff7d Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+mercihabam@users.noreply.github.com> Date: Sat, 30 Nov 2024 11:59:38 +0200 Subject: [PATCH 04/11] refactor(backend): change the navigation modules load order in the final js bundle (#1394) --- scripts/config_gen.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/config_gen.php b/scripts/config_gen.php index 059acd8d2c..31c32c099e 100644 --- a/scripts/config_gen.php +++ b/scripts/config_gen.php @@ -176,6 +176,7 @@ function get_module_assignments($settings) { $js = ''; $css = ''; $assets = array(); + $core = false; $js_exclude_dependencies = explode(',', ($settings['js_exclude_deps'] ?? '')); $filters = array('allowed_output' => array(), 'allowed_get' => array(), 'allowed_cookie' => array(), 'allowed_post' => array(), 'allowed_server' => array(), 'allowed_pages' => array()); @@ -185,9 +186,8 @@ function get_module_assignments($settings) { foreach ($mods as $mod) { printf("scanning module %s ...\n", $mod); if ($mod === 'core') { - foreach (glob('modules/core/navigation/*.js') as $js_module) { - $js .= file_get_contents($js_module); - } + // We'll load the navigation modules last, after all other modules have been loaded, as they depend on the others. + $core = true; } $directoriesPattern = str_replace('/', DIRECTORY_SEPARATOR, "{*,*/*}"); foreach (glob('modules' . DIRECTORY_SEPARATOR . $mod . DIRECTORY_SEPARATOR . 'js_modules' . DIRECTORY_SEPARATOR . $directoriesPattern . '*.js', GLOB_BRACE) as $js_module) { @@ -213,6 +213,13 @@ function get_module_assignments($settings) { $assets[] = sprintf("modules/%s/assets", $mod); } } + + if ($core) { + foreach (glob('modules/core/navigation/*.js') as $js_module) { + $js .= file_get_contents($js_module); + } + } + // load pcss3t.cs only if one of: ['contacts','local_contacts','ldap_contacts','gmail_contacts'] is enabled if(count(array_intersect(['contacts','local_contacts','ldap_contacts','gmail_contacts'], $mods)) > 0){ if (is_readable(sprintf("third_party/contact-group.css", 'third_party'))) { From 3044bf822fbc9b06422af96a3cdd4a28bf9061a5 Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+mercihabam@users.noreply.github.com> Date: Sat, 30 Nov 2024 16:24:37 +0200 Subject: [PATCH 05/11] feat(frontend/backend): allow searching for messages in all subfolders of a given folder (#1395) --- .../js_modules/route_handlers.js | 1 - modules/advanced_search/modules.php | 13 ++++--- modules/advanced_search/setup.php | 1 + modules/advanced_search/site.js | 35 +++++++++++++++---- 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/modules/advanced_search/js_modules/route_handlers.js b/modules/advanced_search/js_modules/route_handlers.js index 4cd54ff165..b5b41beaaf 100644 --- a/modules/advanced_search/js_modules/route_handlers.js +++ b/modules/advanced_search/js_modules/route_handlers.js @@ -21,7 +21,6 @@ function applyAdvancedSearchPageHandlers() { $('.adv_controls').show(); $('.core_msg_control').off('click'); $('.core_msg_control').on("click", function() { return Hm_Message_List.message_action($(this).data('action')); }); - Hm_Message_List.set_checkbox_callback(); if (typeof check_select_for_imap !== 'undefined') { check_select_for_imap(); } diff --git a/modules/advanced_search/modules.php b/modules/advanced_search/modules.php index 6b08f1e093..eaf230250b 100644 --- a/modules/advanced_search/modules.php +++ b/modules/advanced_search/modules.php @@ -91,10 +91,15 @@ public function process() { } } - if ($this->request->post['all_folders']) { + $searchInAllFolders = $this->request->post['all_folders'] ?? false; + $searchInSpecialFolders = $this->request->post['all_special_folders'] ?? false; + $includeSubfolders = $this->request->post['include_subfolders'] ?? false; + if ($searchInAllFolders) { $msg_list = $this->all_folders_search($imap, $flags, $params, $limit); - } elseif ($this->request->post['all_special_folders']) { + } elseif ($searchInSpecialFolders) { $msg_list = $this->special_folders_search($imap, $flags, $params, $limit); + } else if ($includeSubfolders) { + $msg_list = $this->all_folders_search($imap, $flags, $params, $limit, $this->folder); } else if (!$imap->select_mailbox($this->folder)) { return; } else { @@ -105,8 +110,8 @@ public function process() { $this->out('imap_server_ids', array($this->imap_id)); } - private function all_folders_search($imap, $flags, $params, $limit) { - $folders = $imap->get_mailbox_list(); + private function all_folders_search($imap, $flags, $params, $limit, $parent = '') { + $folders = $imap->get_mailbox_list(mailbox:$parent); $msg_list = array(); foreach ($folders as $folder) { $this->folder = $folder['name']; diff --git a/modules/advanced_search/setup.php b/modules/advanced_search/setup.php index c147a48c45..cef80eb541 100644 --- a/modules/advanced_search/setup.php +++ b/modules/advanced_search/setup.php @@ -41,5 +41,6 @@ 'adv_targets' => array('filter' => FILTER_DEFAULT, 'flags' => FILTER_REQUIRE_ARRAY), 'all_folders' => FILTER_VALIDATE_BOOLEAN, 'all_special_folders' => FILTER_VALIDATE_BOOLEAN, + 'include_subfolders' => FILTER_VALIDATE_BOOLEAN, ) ); diff --git a/modules/advanced_search/site.js b/modules/advanced_search/site.js index b8cf2020f3..5b221b34f0 100644 --- a/modules/advanced_search/site.js +++ b/modules/advanced_search/site.js @@ -82,6 +82,7 @@ var expand_adv_folder = function(res) { $('.adv_folder_link', list_container).on("click", function() { return expand_adv_folder_list($(this).data('target')); }); $('a', list_container).not('.adv_folder_link').off('click'); $('a', list_container).not('.adv_folder_link').on("click", function() { adv_folder_select($(this).data('id')); return false; }); + modifyInnerLists(); } }; @@ -131,7 +132,9 @@ var adv_select_imap_folder = function(el) { checkboxesWrapper.append(allSpecialFoldersCheckbox); checkboxesWrapper.append(allFoldersCheckbox); $(this).find('.wrapper').append(checkboxesWrapper); - }) + }); + + modifyInnerLists(); $('.imap_folder_link', folders).addClass('adv_folder_link').removeClass('imap_folder_link'); $('.adv_folder_list').html(folders.html()); @@ -147,6 +150,20 @@ var adv_select_imap_folder = function(el) { }); }; +function modifyInnerLists() { + $('.adv_folder_list').find('.inner_list li').each(function(index) { + const subFoldersCheckbox = ` + + + + + `; + $(this).wrapInner('
'); + $(this).find('.wrapper').append(subFoldersCheckbox); + $(this).find('#main-link').css('flex-grow', 0) + }); +} + var adv_folder_select = function(id) { if ($('.'+id, $('.adv_source_list')).length > 0) { $('.adv_folder_list').html(''); @@ -164,17 +181,19 @@ var adv_folder_select = function(id) { var parent_class = '.'+parts[0]+'_'+parts[1]+'_'; var account = $('a', $(parent_class, container)).first().text(); var label = account+' > '+folder; - add_source_to_list(id, label); + const includeSubfolders = $(`.${id}`).closest('li').find('input[name="include_subfolders"]').is(':checked'); + + add_source_to_list(id, label, includeSubfolders); $('.adv_folder_list').html(''); $('.close_adv_folders').remove(); $('.adv_folder_list').hide(); }; -var add_source_to_list = function(id, label) { +var add_source_to_list = function(id, label, includeSubfolders) { var close = $(globals.close_html); close.addClass('adv_remove_source'); close.attr('data-target', id); - var row = '
'+close.prop('outerHTML')+label; + var row = '
'+close.prop('outerHTML')+label; row += '
'; $('.adv_source_list').append(row); $('.adv_remove_source').off('click'); @@ -247,7 +266,7 @@ var get_adv_sources = function() { const source = this.className; const mailboxSource = source.split('_').slice(0, 2).join('_'); if (!sources.find(s => s.source.indexOf(mailboxSource) > -1)) { - sources.push({'source': source, 'label': $('a', $(this)).text()}); + sources.push({'source': source, 'label': $('a', $(this)).text(), subFolders: $(this).data('subfolders')}); } }); return sources; @@ -426,6 +445,8 @@ var send_requests = function(requests) { params.push({name: 'all_folders', value: true}); } else if (request['all_special_folders']) { params.push({name: 'all_special_folders', value: true}); + } else if (request['sub_folders']) { + params.push({name: 'include_subfolders', value: true}); } for (var i=0, len=request['terms'].length; i < len; i++) { @@ -490,7 +511,9 @@ var build_adv_search_requests = function(terms, sources, targets, times, other) config['all_folders'] = true; } else if (source.specialFolders) { config['all_special_folders'] = true; - } + } else if (source.subFolders) { + config['sub_folders'] = true; + } requests.push(config); } } From 412b5adbd9ada0743d68ef788cbace54123153d5 Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+mercihabam@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:38:38 +0200 Subject: [PATCH 06/11] fix(frontend): fix the sidebar content alignment and reorganize misplaced content. (#1397) --- modules/calendar/setup.php | 2 +- modules/contacts/setup.php | 2 +- modules/core/navigation/navbar.js | 2 +- modules/core/output_modules.php | 44 ++++++-------- modules/core/setup.php | 1 - modules/core/site.css | 59 +++++++++++-------- modules/history/setup.php | 2 +- modules/smtp/setup.php | 4 +- tests/phpunit/modules/core/output_modules.php | 25 +++----- .../modules/core/output_modules_debug.php | 4 +- tests/selenium/folder_list.py | 5 +- tests/selenium/pages.py | 2 +- 12 files changed, 70 insertions(+), 82 deletions(-) diff --git a/modules/calendar/setup.php b/modules/calendar/setup.php index 31763196a9..07fde0ac9a 100644 --- a/modules/calendar/setup.php +++ b/modules/calendar/setup.php @@ -15,7 +15,7 @@ /*add_output('ajax_imap_message_content', 'vcalendar_add_output', true, 'calendar', 'filter_message_headers', 'after');*/ add_output('calendar', 'calendar_content', true, 'calendar', 'content_section_start', 'after'); add_output('calendar', 'add_cal_event_form', true, 'calendar', 'content_section_start', 'after'); -add_output('ajax_hm_folders', 'calendar_page_link', true, 'calendar', 'logout_menu_item', 'before'); +add_output('ajax_hm_folders', 'calendar_page_link', true, 'calendar', 'main_menu_content', 'before'); return array( 'allowed_pages' => array( diff --git a/modules/contacts/setup.php b/modules/contacts/setup.php index 1bffe16541..3053ef9534 100644 --- a/modules/contacts/setup.php +++ b/modules/contacts/setup.php @@ -16,7 +16,7 @@ add_output('contacts', 'contacts_content_end', true, 'contacts', 'contacts_list', 'after'); add_output('settings', 'contact_auto_collect_setting', true, 'contacts', 'max_google_contacts_number', 'after'); -add_output('ajax_hm_folders', 'contacts_page_link', true, 'contacts', 'logout_menu_item', 'before'); +add_output('ajax_hm_folders', 'contacts_page_link', true, 'contacts', 'main_menu_content', 'before'); add_handler('compose', 'load_contacts', true, 'contacts', 'load_user_data', 'after'); add_handler('compose', 'process_send_to_contact', true, 'contacts', 'save_user_data', 'before'); diff --git a/modules/core/navigation/navbar.js b/modules/core/navigation/navbar.js index f158e96ef8..0a39cbe90c 100644 --- a/modules/core/navigation/navbar.js +++ b/modules/core/navigation/navbar.js @@ -6,7 +6,7 @@ $(() => { }); const menuToggle = ` -
+
` diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php index cbdb3ea13c..da29146d5a 100644 --- a/modules/core/output_modules.php +++ b/modules/core/output_modules.php @@ -1327,7 +1327,7 @@ protected function output() { $this->trans('Running in debug mode. See https://cypht.org/install.html Section 6 for more detail.'). '" class="debug_title">'.$this->trans('Debug').''; } - $res .= ''; + $res .= ''; $res .= '
    '; if ($this->format == 'HTML5') { return $res; @@ -1392,25 +1392,6 @@ protected function output() { } } -/** - * Outputs the logout link in the Main menu of the folder list - * @subpackage core/output - */ -class Hm_Output_logout_menu_item extends Hm_Output_Module { - protected function output() { - $res = '
  • '; - if (!$this->get('hide_folder_icons')) { - $res .= ''; - } - $res .= ''.$this->trans('Logout').'
    • '; - - if ($this->format == 'HTML5') { - return $res; - } - $this->concat('formatted_folder_list', $res); - } -} - /** * Close the Main menu section of the folder list * @subpackage core/output @@ -1477,11 +1458,6 @@ protected function output() { $res = '
    '.$this->trans('Settings'). '
    '. '
      '; - $res .= '
    • '; - if (!$this->get('hide_folder_icons')) { - $res .= ''; - } - $res .= $this->trans('Home').'
      • '; if ($this->format == 'HTML5') { return $res; } @@ -1614,8 +1590,22 @@ class Hm_Output_folder_list_content_end extends Hm_Output_Module { * Adds collapse and reload links */ protected function output() { - $res = ''.$this->trans('[reload]').''; - $res .= '
      '; + $res = '
      '; + $res .= ''; + if (!$this->get('hide_folder_icons')) { + $res .= ''; + } + $res .= '' . $this->trans('Logout') .''; + $res .= ''; + $res .= ''; + if (!$this->get('hide_folder_icons')) { + $res .= ''; + } + $res .= '' . $this->trans('Reload') . ''; + $res .= ''; + /** Sidebar footer end */ + + $res .= '
      '; if ($this->format == 'HTML5') { return $res; } diff --git a/modules/core/setup.php b/modules/core/setup.php index b472c5fd99..6d4b588dcf 100644 --- a/modules/core/setup.php +++ b/modules/core/setup.php @@ -156,7 +156,6 @@ add_output('ajax_hm_folders', 'main_menu_start', true); add_output('ajax_hm_folders', 'search_from_folder_list', true); add_output('ajax_hm_folders', 'main_menu_content', true); -add_output('ajax_hm_folders', 'logout_menu_item', true); add_output('ajax_hm_folders', 'main_menu_end', true); add_output('ajax_hm_folders', 'email_menu_content', true); add_output('ajax_hm_folders', 'settings_menu_start', true); diff --git a/modules/core/site.css b/modules/core/site.css index c779817a6a..95e98e0f8a 100644 --- a/modules/core/site.css +++ b/modules/core/site.css @@ -78,10 +78,10 @@ a:hover { min-height: 100vh; } -.selected_menu { +li.selected_menu { background-color: var(--bs-primary-bg-subtle); } -.selected_menu a { +li.selected_menu a { color: var(--bs-link-color) !important; } @@ -469,11 +469,6 @@ button { padding-bottom: 100px; } -.folder_list .update_message_list { - font-size: 80%; - padding-top: 10px; - float: right; -} .src_name { white-space: nowrap; overflow: hidden; @@ -972,10 +967,6 @@ div.unseen, margin-right: 0px; width: 100%; } -.mobile .folder_list li a { - font-size: 110%; - padding-top: 10px; -} .mobile .folder_list li { padding-top: 5px; padding-bottom: 5px; @@ -1024,9 +1015,6 @@ div.unseen, height: 24px; vertical-align: -13px; } -.mobile .update_message_list { - margin-right: 20px; -} .mobile .msg_text { width: 100%; max-width: 480px !important; @@ -1122,9 +1110,6 @@ div.unseen, .mobile .search_form select { width: 30px; } -.mobile .search_terms { - max-width: 250px; -} .mobile .search_content { padding-top: 30px; } @@ -1410,24 +1395,25 @@ div.unseen, .menu-toggle { position: absolute; top: 20px; - right: 0; + right: 15px; z-index: 999; color: var(--bs-primary); } .mobile .menu-toggle { position: fixed; - top: 0; - left: -2rem; + right: unset; + left: 20px; z-index: 1000; - width: 5rem; text-align: right; + top: 15px; } .mobile nav .menu-toggle { - right: -2rem; + right: 20px; left: unset; text-align: left; + top: 20px; } body { @@ -1452,9 +1438,9 @@ nav.collapsed .app-logo, nav.collapsed .menu_search, nav.collapsed .nav-label, n } nav.collapsed .menu-toggle { - right: 22%; - top: 0; + right: 32%; margin: auto; + /* margin-left: 32px; */ } nav.collapsed .folders { @@ -1475,6 +1461,31 @@ nav.collapsed .total_unread_count { top: 0; } +nav.collapsed .sidebar-footer { + flex-direction: column; + padding: 0; + padding-left: 20px; + gap: 15px; +} + +nav.collapsed .sidebar-footer a { + text-align: center; +} + +/* End collapsed navbar state */ + +.sidebar-footer { + margin-top: 35px; + display: flex; + justify-content: space-between; + padding: 0 15px 0 25px; + font-size: 0.8rem; +} + +.logout_link { + color: rgba(var(--bs-body-color-rgb), 0.7); +} + a[disabled] { cursor: default; pointer-events: none; diff --git a/modules/history/setup.php b/modules/history/setup.php index f47a61306d..7423b65876 100644 --- a/modules/history/setup.php +++ b/modules/history/setup.php @@ -9,7 +9,7 @@ add_output('history', 'history_content', true, 'history', 'history_heading', 'after'); add_output('history', 'history_footer', true, 'history', 'history_content', 'after'); -add_output('ajax_hm_folders', 'history_page_link', true, 'history', 'logout_menu_item', 'before'); +add_output('ajax_hm_folders', 'history_page_link', true, 'history', 'main_menu_content', 'before'); add_handler('ajax_imap_message_content', 'history_record_imap_message', true, 'history', 'imap_message_content', 'after'); add_handler('ajax_feed_item_content', 'history_record_feed_message', true, 'history', 'feed_item_content', 'after'); diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php index ba393fe78e..9549266349 100644 --- a/modules/smtp/setup.php +++ b/modules/smtp/setup.php @@ -85,9 +85,9 @@ add_handler('ajax_smtp_delete_draft', 'process_delete_draft', true, 'smtp', 'load_user_data', 'after'); /* folder list link */ -add_output('ajax_hm_folders', 'compose_page_link', true, 'smtp', 'logout_menu_item', 'before'); +add_output('ajax_hm_folders', 'compose_page_link', true, 'smtp', 'main_menu_content', 'before'); add_handler('ajax_hm_folders', 'smtp_auto_bcc_check', true, 'smtp', 'load_imap_servers_from_config', 'after'); -add_output('ajax_hm_folders', 'sent_folder_link', true, 'smtp', 'logout_menu_item', 'before'); +add_output('ajax_hm_folders', 'sent_folder_link', true, 'smtp', 'main_menu_content', 'before'); add_handler('ajax_update_server_pw', 'load_smtp_servers_from_config', true, 'smtp', 'load_user_data', 'after'); diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php index 4d2317be89..6d8f907ee3 100644 --- a/tests/phpunit/modules/core/output_modules.php +++ b/tests/phpunit/modules/core/output_modules.php @@ -852,10 +852,10 @@ public function test_folder_list_content_start() { public function test_main_menu_start() { $test = new Output_Test('main_menu_start', 'core'); $res = $test->run(); - $this->assertEquals(array('
        '), $res->output_response); + $this->assertEquals(array('
          '), $res->output_response); $test->rtype = 'AJAX'; $res = $test->run(); - $this->assertEquals(array('formatted_folder_list' => '
            '), $res->output_response); + $this->assertEquals(array('formatted_folder_list' => '
              '), $res->output_response); } /** * @preserveGlobalState disabled @@ -870,18 +870,7 @@ public function test_main_menu_content() { $res = $test->run(); $this->assertEquals(array('folder_sources' => array(array('email_folders', 'baz')), 'formatted_folder_list' => '
            • Unread
            • Flagged
            • Junk
            • Trash
            • Drafts
              • '), $res->output_response); } - /** - * @preserveGlobalState disabled - * @runInSeparateProcess - */ - public function test_logout_menu_item() { - $test = new Output_Test('logout_menu_item', 'core'); - $res = $test->run(); - $this->assertEquals(array('
            • Logout
              • '), $res->output_response); - $test->rtype = 'AJAX'; - $res = $test->run(); - $this->assertEquals(array('formatted_folder_list' => '
            • Logout
              • '), $res->output_response); - } + /** * @preserveGlobalState disabled * @runInSeparateProcess @@ -917,10 +906,10 @@ public function test_email_menu_content() { public function test_settings_menu_start() { $test = new Output_Test('settings_menu_start', 'core'); $res = $test->run(); - $this->assertEquals(array('
              Settings
              • Home
                • '), $res->output_response); + $this->assertEquals(array('
                Settings
                  '), $res->output_response); $test->rtype = 'AJAX'; $res = $test->run(); - $this->assertEquals(array('formatted_folder_list' => '
                  Settings
                  • Home
                    • '), $res->output_response); + $this->assertEquals(array('formatted_folder_list' => '
                    Settings
                      '), $res->output_response); } /** * @preserveGlobalState disabled @@ -983,10 +972,10 @@ public function test_settings_menu_end() { public function test_folder_list_content_end() { $test = new Output_Test('folder_list_content_end', 'core'); $res = $test->run(); - $this->assertEquals(array('[reload]
                      '), $res->output_response); + $this->assertEquals(array('
                      LogoutReload
                      '), $res->output_response); $test->rtype = 'AJAX'; $res = $test->run(); - $this->assertEquals(array('formatted_folder_list' => '[reload]
                      '), $res->output_response); + $this->assertEquals(array('formatted_folder_list' => '
                      LogoutReload
                      '), $res->output_response); } /** * @preserveGlobalState disabled diff --git a/tests/phpunit/modules/core/output_modules_debug.php b/tests/phpunit/modules/core/output_modules_debug.php index f4e735f9af..d3f9d98aa7 100644 --- a/tests/phpunit/modules/core/output_modules_debug.php +++ b/tests/phpunit/modules/core/output_modules_debug.php @@ -83,9 +83,9 @@ static function router_module_list_provider() { public function test_main_menu_start_debug() { $test = new Output_Test('main_menu_start', 'core'); $res = $test->run(); - $this->assertEquals(array('Debug
                        '), $res->output_response); + $this->assertEquals(array('Debug
                          '), $res->output_response); $test->rtype = 'AJAX'; $res = $test->run(); - $this->assertEquals(array('formatted_folder_list' => 'Debug
                            '), $res->output_response); + $this->assertEquals(array('formatted_folder_list' => 'Debug
                              '), $res->output_response); } } diff --git a/tests/selenium/folder_list.py b/tests/selenium/folder_list.py index 399f8cd6b6..4e6d77bb6b 100644 --- a/tests/selenium/folder_list.py +++ b/tests/selenium/folder_list.py @@ -35,7 +35,7 @@ def reload_folder_list(self): def expand_section(self): self.by_css('[data-bs-target=".settings"]').click() list_item = self.by_class('menu_home') - list_item.find_element(By.TAG_NAME, 'a').click() + list_item.click() self.wait_with_folder_list() self.wait_for_navigation_to_complete() assert self.by_class('content_title').text == 'Home' @@ -56,8 +56,7 @@ def hide_folders(self): hide_button = self.by_class('menu-toggle') self.driver.execute_script("arguments[0].click();", hide_button) list_item = self.by_class('menu_home') - link = list_item.find_element(By.TAG_NAME, 'a') - assert link.is_displayed() == False + assert list_item.is_displayed() == False def show_folders(self): self.wait(By.CLASS_NAME, 'menu-toggle') diff --git a/tests/selenium/pages.py b/tests/selenium/pages.py index 173d5375b5..c66be4a189 100644 --- a/tests/selenium/pages.py +++ b/tests/selenium/pages.py @@ -97,7 +97,7 @@ def history(self): def home(self): self.by_css('[data-bs-target=".settings"]').click() list_item = self.by_class('menu_home') - list_item.find_element(By.TAG_NAME, 'a').click() + list_item.click() self.wait_with_folder_list() self.safari_workaround() self.wait_for_navigation_to_complete() From 116b8a5ce605e7b52ab0c8c3b56dcce95920cae9 Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+mercihabam@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:26:27 +0200 Subject: [PATCH 07/11] fix(frontend/backend): feeds content display (#1398) * Fix feeds display * Fix feed message view page * Fix the prev & next links for the feed message content * Combined inbox includes not only imap data but feeds content as well --- modules/core/js_modules/Hm_MessagesStore.js | 17 +- modules/core/js_modules/route_handlers.js | 18 +- modules/core/navigation/routes.js | 2 +- modules/core/output_modules.php | 15 ++ modules/core/setup.php | 7 +- modules/core/site.js | 6 +- modules/feeds/js_modules/route_handlers.js | 3 + modules/feeds/modules.php | 227 +++++++++++--------- modules/feeds/setup.php | 4 + modules/feeds/site.js | 38 +--- modules/imap/js_modules/route_handlers.js | 1 - modules/imap/setup.php | 3 + 12 files changed, 191 insertions(+), 150 deletions(-) create mode 100644 modules/feeds/js_modules/route_handlers.js diff --git a/modules/core/js_modules/Hm_MessagesStore.js b/modules/core/js_modules/Hm_MessagesStore.js index 6851a76324..c299fcdbde 100644 --- a/modules/core/js_modules/Hm_MessagesStore.js +++ b/modules/core/js_modules/Hm_MessagesStore.js @@ -153,14 +153,18 @@ class Hm_MessagesStore { #getRequestConfig() { let hook; - let serverId; + let imapServerId; + let feedServerId; let folder; const config = []; if (this.path.startsWith('imap')) { hook = "ajax_imap_folder_display"; const detail = Hm_Utils.parse_folder_path(this.path, 'imap'); - serverId = detail.server_id; + imapServerId = detail.server_id; folder = detail.folder; + } else if (this.path.startsWith('feeds')) { + hook = "ajax_feed_combined"; + feedServerId = this.path.split('_')[1]; } else { switch (this.path) { case 'unread': @@ -170,6 +174,8 @@ class Hm_MessagesStore { hook = "ajax_imap_flagged"; break; case 'combined_inbox': + hook = "ajax_combined_message_list"; + break; case 'email': hook = "ajax_imap_combined_inbox"; break; @@ -186,12 +192,15 @@ class Hm_MessagesStore { if (hook) { config.push({ name: "hm_ajax_hook", value: hook }); } - if (serverId) { - config.push({ name: "imap_server_id", value: serverId }); + if (imapServerId) { + config.push({ name: "imap_server_id", value: imapServerId }); } if (folder) { config.push({ name: "folder", value: folder }); } + if (feedServerId) { + config.push({ name: "feed_server_ids", value: feedServerId }); + } return config; } diff --git a/modules/core/js_modules/route_handlers.js b/modules/core/js_modules/route_handlers.js index 77c3e445bb..5f62d1cecc 100644 --- a/modules/core/js_modules/route_handlers.js +++ b/modules/core/js_modules/route_handlers.js @@ -56,4 +56,20 @@ function applyInfoPageHandlers() { return () => { clearTimeout(timer); } -} \ No newline at end of file +} + +function applyMessagePageHandlers(routeParams) { + const path = routeParams.list_path.substr(0, 4); + + switch (path) { + case 'imap': + applyImapMessageContentPageHandlers(routeParams); + break; + case 'feed': + applyFeedMessageContentPageHandlers(routeParams); + break; + + default: + break; + } +} diff --git a/modules/core/navigation/routes.js b/modules/core/navigation/routes.js index 1ba38779a5..6ace2380e9 100644 --- a/modules/core/navigation/routes.js +++ b/modules/core/navigation/routes.js @@ -12,7 +12,7 @@ const modulesRoutes = [ }, { page: 'message', - handler: 'applyImapMessageContentPageHandlers' + handler: 'applyMessagePageHandlers' }, { page: 'compose', diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php index da29146d5a..49af256f01 100644 --- a/modules/core/output_modules.php +++ b/modules/core/output_modules.php @@ -2432,3 +2432,18 @@ protected function output() return $res; } } + +class Hm_output_combined_message_list extends Hm_Output_Module { + protected function output() { + $messageList = []; + $style = $this->get('news_list_style') ? 'news' : 'email'; + if ($this->get('imap_combined_inbox_data')) { + $messageList = array_merge($messageList, format_imap_message_list($this->get('imap_combined_inbox_data'), $this, false, $style)); + } + if ($this->get('feed_list_data')) { + $messageList = array_merge($messageList, $this->get('feed_list_data'), Hm_Output_filter_feed_list_data::formatMessageList($this)); + } + $this->out('formatted_message_list', $messageList); + $this->out('page_links', 'There is no pagination in this view, please visit the individual mail boxes.'); + } +} diff --git a/modules/core/setup.php b/modules/core/setup.php index 6d4b588dcf..9aeaf22db4 100644 --- a/modules/core/setup.php +++ b/modules/core/setup.php @@ -188,6 +188,10 @@ setup_base_ajax_page('ajax_privacy_settings', 'core'); add_handler('ajax_privacy_settings', 'privacy_settings', true, 'core'); +setup_base_ajax_page('ajax_combined_message_list', 'core'); +add_handler('ajax_combined_message_list', 'load_user_data', true, 'core'); +add_output('ajax_combined_message_list', 'combined_message_list', true, 'core'); + /* allowed input */ return array( 'allowed_pages' => array( @@ -207,7 +211,8 @@ 'notfound', 'search', 'ajax_quick_servers_setup', - 'ajax_privacy_settings' + 'ajax_privacy_settings', + 'ajax_combined_message_list' ), 'allowed_output' => array( 'date' => array(FILTER_DEFAULT, false), diff --git a/modules/core/site.js b/modules/core/site.js index 27b0749348..c27a92081e 100644 --- a/modules/core/site.js +++ b/modules/core/site.js @@ -840,11 +840,11 @@ function Message_List() { } }; - this.prev_next_links = function(msgUid) { + this.prev_next_links = function(msgUid, lisPath = getListPathParam()) { let phref; let nhref; const target = $('.msg_headers tr').last(); - const messages = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number()); + const messages = new Hm_MessagesStore(lisPath, Hm_Utils.get_url_page_number()); messages.load(false, true); const next = messages.getNextRowForMessage(msgUid); const prev = messages.getPreviousRowForMessage(msgUid); @@ -2339,7 +2339,7 @@ const handleExternalResources = (inline) => { const messageContainer = document.querySelector('.msg_text_inner'); messageContainer.insertAdjacentHTML('afterbegin', '
                              '); - const senderEmail = document.querySelector('#contact_info').textContent.match(EMAIL_REGEX)[0]; + const senderEmail = document.querySelector('#contact_info')?.textContent.match(EMAIL_REGEX)[0]; const sender = senderEmail + '_external_resources_allowed'; const elements = messageContainer.querySelectorAll('[data-src]'); const blockedResources = []; diff --git a/modules/feeds/js_modules/route_handlers.js b/modules/feeds/js_modules/route_handlers.js new file mode 100644 index 0000000000..785edd8a3d --- /dev/null +++ b/modules/feeds/js_modules/route_handlers.js @@ -0,0 +1,3 @@ +function applyFeedMessageContentPageHandlers(routeParams) { + feed_item_view(routeParams.uid, routeParams.list_path); +} \ No newline at end of file diff --git a/modules/feeds/modules.php b/modules/feeds/modules.php index 4ee95ed3ad..39a7509db5 100644 --- a/modules/feeds/modules.php +++ b/modules/feeds/modules.php @@ -173,107 +173,120 @@ class Hm_Handler_feed_list_content extends Hm_Handler_Module { public function process() { list($success, $form) = $this->process_form(array('feed_server_ids')); $search = false; - if ($success) { - $cache = false; - if (array_key_exists('feed_search', $this->request->post)) { - $terms = $this->session->get('search_terms', false); - $since = $this->session->get('search_since', DEFAULT_SEARCH_SINCE); - $fld = $this->session->get('search_fld', 'TEXT'); - $search = true; - } - else { - $terms = false; - } - $ids = explode(',', $form['feed_server_ids']); - $res = array(); - $unread_only = false; - $login_time = $this->session->get('login_time', false); - if ($login_time) { - $this->out('login_time', $login_time); - } - if ($this->get('list_path') == 'unread') { - $limit = $this->user_config->get('unread_per_source_setting', DEFAULT_UNREAD_PER_SOURCE); - $date = process_since_argument($this->user_config->get('unread_since_setting', DEFAULT_UNREAD_SINCE)); - $unread_only = true; - $cutoff_timestamp = strtotime($date); - if ($login_time && $login_time > $cutoff_timestamp) { - $cutoff_timestamp = $login_time; - } - } - elseif ($this->get('list_path') == 'combined_inbox') { - $limit = $this->user_config->get('all_per_source_setting', DEFAULT_ALL_PER_SOURCE); - $date = process_since_argument($this->user_config->get('all_since_setting', DEFAULT_ALL_SINCE)); - $cutoff_timestamp = strtotime($date); - } - else { - $limit = $this->user_config->get('feed_limit_setting', DEFAULT_FEED_LIMIT); - $date = process_since_argument($this->user_config->get('feed_since_setting', DEFAULT_FEED_SINCE)); - $cutoff_timestamp = strtotime($date); + $dataSources = array_map(fn ($feed) => $feed['id'], Hm_Feed_List::dump()); + if (!$success && empty($dataSources)) { + return; + } + $cache = false; + if (array_key_exists('feed_search', $this->request->post)) { + $terms = $this->session->get('search_terms', false); + $since = $this->session->get('search_since', DEFAULT_SEARCH_SINCE); + $fld = $this->session->get('search_fld', 'TEXT'); + $search = true; + } + else { + $terms = false; + } + $ids = isset($form['feed_server_ids']) ? explode(',', $form['feed_server_ids']): $dataSources; + $res = array(); + $unread_only = false; + $login_time = $this->session->get('login_time', false); + if ($login_time) { + $this->out('login_time', $login_time); + } + if ($this->get('list_path') == 'unread') { + $limit = $this->user_config->get('unread_per_source_setting', DEFAULT_UNREAD_PER_SOURCE); + $date = process_since_argument($this->user_config->get('unread_since_setting', DEFAULT_UNREAD_SINCE)); + $unread_only = true; + $cutoff_timestamp = strtotime($date); + if ($login_time && $login_time > $cutoff_timestamp) { + $cutoff_timestamp = $login_time; } - if (!$search || ($search && $terms)) { - foreach($ids as $id) { - $feed_data = Hm_Feed_List::dump($id); - if ($feed_data) { - $cache = feed_memcached_fetch($this, $feed_data); - $data = false; - if (is_array($cache) && count($cache) > 0) { - $data = $cache; + } + elseif ($this->get('list_path') == 'combined_inbox') { + $limit = $this->user_config->get('all_per_source_setting', DEFAULT_ALL_PER_SOURCE); + $date = process_since_argument($this->user_config->get('all_since_setting', DEFAULT_ALL_SINCE)); + $cutoff_timestamp = strtotime($date); + } + else { + $limit = $this->user_config->get('feed_limit_setting', DEFAULT_FEED_LIMIT); + $date = process_since_argument($this->user_config->get('feed_since_setting', DEFAULT_FEED_SINCE)); + $cutoff_timestamp = strtotime($date); + } + if (!$search || ($search && $terms)) { + foreach($ids as $id) { + $feed_data = Hm_Feed_List::dump($id); + if ($feed_data) { + $cache = feed_memcached_fetch($this, $feed_data); + $data = false; + if (is_array($cache) && count($cache) > 0) { + $data = $cache; + } + else { + $feed = is_news_feed($feed_data['server'], $limit); + if ($feed && $feed->parsed_data) { + $data = $feed->parsed_data; + $cache = false; } - else { - $feed = is_news_feed($feed_data['server'], $limit); - if ($feed && $feed->parsed_data) { - $data = $feed->parsed_data; - $cache = false; + } + if (is_array($data)) { + foreach ($data as $item) { + if (array_key_exists('id', $item) && !array_key_exists('guid', $item)) { + $item['guid'] = $item['id']; } - } - if (is_array($data)) { - foreach ($data as $item) { - if (array_key_exists('id', $item) && !array_key_exists('guid', $item)) { - $item['guid'] = $item['id']; - } - elseif (array_key_exists('link', $item) && !array_key_exists('guid', $item)) { - $item['guid'] = $item['link']; - } - if (array_key_exists('link_self', $item) || !array_key_exists('guid', $item)) { + elseif (array_key_exists('link', $item) && !array_key_exists('guid', $item)) { + $item['guid'] = $item['link']; + } + if (array_key_exists('link_self', $item) || !array_key_exists('guid', $item)) { + continue; + } + if (!Hm_Feed_Uid_Cache::is_unread(md5($item['guid']))) { + if (isset($item['pubdate']) && strtotime($item['pubdate']) < $cutoff_timestamp) { continue; } - if (!Hm_Feed_Uid_Cache::is_unread(md5($item['guid']))) { - if (isset($item['pubdate']) && strtotime($item['pubdate']) < $cutoff_timestamp) { - continue; - } - elseif (isset($item['dc:date']) && strtotime($item['dc:date']) < $cutoff_timestamp) { - continue; - } - if (isset($item['guid']) && $unread_only && Hm_Feed_Uid_Cache::is_read(md5($item['guid']))) { - continue; - } - } - if ($terms && !search_feed_item($item, $terms, $since, $fld)) { + elseif (isset($item['dc:date']) && strtotime($item['dc:date']) < $cutoff_timestamp) { continue; } - else { - $item['server_id'] = $id; - $item['server_name'] = $feed_data['name']; - $res[] = $item; + if (isset($item['guid']) && $unread_only && Hm_Feed_Uid_Cache::is_read(md5($item['guid']))) { + continue; } } + if ($terms && !search_feed_item($item, $terms, $since, $fld)) { + continue; + } + else { + $item['server_id'] = $id; + $item['server_name'] = $feed_data['name']; + $res[] = $item; + } } } } } - if (!$cache) { - # TODO: fix potential warning about feed_data - feed_memcached_save($this, $feed_data, $res); - } - $this->out('feed_list_data', $res); - if (isset($this->request->get['list_path'])) { - $this->out('feed_list_parent', $this->request->get['list_path']); + } + if (!$cache) { + # TODO: fix potential warning about feed_data + feed_memcached_save($this, $feed_data, $res); + } + + usort($res, function($a, $b) { + if (isset($a['pubdate']) && isset($b['pubdate'])) { + return strtotime($b['pubdate']) - strtotime($a['pubdate']); } - elseif (isset($this->request->get['page']) && $this->request->get['page'] == 'search') { - $this->out('feed_list_parent', 'search'); + elseif (isset($a['dc:date']) && isset($b['dc:date'])) { + return strtotime($b['dc:date']) - strtotime($a['dc:date']); } - $this->out('feed_server_ids', $form['feed_server_ids']); + return 0; + }); + + $this->out('feed_list_data', $res); + if (isset($this->request->get['list_path'])) { + $this->out('feed_list_parent', $this->request->get['list_path']); } + elseif (isset($this->request->get['page']) && $this->request->get['page'] == 'search') { + $this->out('feed_list_parent', 'search'); + } + $this->out('feed_server_ids', $form['feed_server_ids']); } } @@ -620,7 +633,7 @@ protected function output() { $header_str .= ''.$this->html_safe($value).''; } elseif ($name == 'link' || $name == 'link_alternate') { - $header_str .= ''.$this->trans($name).''.$this->html_safe($value).''; + $header_str .= ''.$this->trans($name).''.$this->html_safe($value).''; } elseif ($name == 'author' || $name == 'dc:creator' || $name == 'name') { $header_str .= ''.$this->trans($name).''.$this->html_safe($value).''; @@ -646,22 +659,23 @@ protected function output() { * @subpackage feeds/output */ class Hm_Output_filter_feed_list_data extends Hm_Output_Module { - protected function output() { + public static function formatMessageList($mod) { $res = array(); $login_time = false; - if ($this->get('login_time')) { - $login_time = $this->get('login_time'); + if ($mod->get('login_time')) { + $login_time = $mod->get('login_time'); } - if ($this->get('feed_list_parent') == 'feeds' || - $this->get('feed_list_parent') == 'search' || - $this->get('feed_list_parent') == 'combined_inbox') { + if ($mod->get('feed_list_parent') == 'feeds' || + $mod->get('feed_list_parent') == 'search' || + $mod->get('feed_list_parent') == 'combined_inbox') { $src_callback = 'feed_source_callback'; } else { $src_callback = 'safe_output_callback'; } - $show_icons = $this->get('msg_list_icons'); - foreach ($this->get('feed_list_data', array()) as $item) { + $show_icons = $mod->get('msg_list_icons'); + + foreach ($mod->get('feed_list_data', array()) as $item) { $row_style = 'feeds'; if (isset($item['id']) && !isset($item['guid'])) { $item['guid'] = $item['id']; @@ -672,7 +686,7 @@ protected function output() { } if (isset($item['guid'])) { if (!array_key_exists('title', $item) || !trim($item['title'])) { - $item['title'] = $this->trans('[No Subject]'); + $item['title'] = $mod->trans('[No Subject]'); } $icon = 'rss'; $id = sprintf("feeds_%s_%s", $item['server_id'], md5($item['guid'])); @@ -689,22 +703,22 @@ protected function output() { $timestamp = 0; } if ($date) { - $date = translate_time_str($date, $this); + $date = translate_time_str($date, $mod); } $url = '?page=message&uid='.urlencode(md5($item['guid'])).'&list_path=feeds_'.$item['server_id']; - if ($this->in('feed_list_parent', array('combined_inbox', 'unread', 'feeds', 'search'))) { - $url .= '&list_parent='.$this->html_safe($this->get('feed_list_parent', '')); + if ($mod->in('feed_list_parent', array('combined_inbox', 'unread', 'feeds', 'search'))) { + $url .= '&list_parent='.$mod->html_safe($mod->get('feed_list_parent', '')); } else { $url .= '&list_parent=feeds_'.$item['server_id']; } - if ($this->get('news_list_style')) { + if ($mod->get('news_list_style')) { $style = 'news'; } else { $style = 'email'; } - if ($this->get('is_mobile')) { + if ($mod->get('is_mobile')) { $style = 'news'; } if (Hm_Feed_Uid_Cache::is_read(md5($item['guid']))) { @@ -736,7 +750,7 @@ protected function output() { $from = display_value('dc:creator', $item, 'from'); } elseif ($style == 'email') { - $from = $this->trans('[No From]'); + $from = $mod->trans('[No From]'); $nofrom = ' nofrom'; } else { @@ -757,7 +771,7 @@ protected function output() { ), $id, $style, - $this, + $mod, $row_style ); } @@ -772,13 +786,18 @@ protected function output() { ), $id, $style, - $this, + $mod, $row_style ); } } } - $this->out('formatted_message_list', $res); + + return $res; + } + + protected function output() { + $this->out('formatted_message_list', self::formatMessageList($this)); } } diff --git a/modules/feeds/setup.php b/modules/feeds/setup.php index 3d1729d1ca..44000346c0 100644 --- a/modules/feeds/setup.php +++ b/modules/feeds/setup.php @@ -98,6 +98,10 @@ add_handler('ajax_feed_status', 'http_headers', true, 'core'); add_output('ajax_feed_status', 'filter_feed_status_data', true); + +add_handler('ajax_combined_message_list', 'load_feeds_from_config', true, 'feeds', 'load_user_data', 'after'); +add_handler('ajax_combined_message_list', 'feed_list_content', true, 'feeds'); + return array( 'allowed_pages' => array( diff --git a/modules/feeds/site.js b/modules/feeds/site.js index cedd0a87cb..122f335acf 100644 --- a/modules/feeds/site.js +++ b/modules/feeds/site.js @@ -95,18 +95,6 @@ var display_feeds_combined = function(res) { $('.total').text($('.message_table tbody tr').length); }; -var feeds_combined_inbox_content= function(id) { - Hm_Ajax.request( - [{'name': 'hm_ajax_hook', 'value': 'ajax_feed_combined'}, - {'name': 'feed_server_ids', 'value': id}], - display_feeds_combined_inbox, - [], - false, - Hm_Message_List.set_combined_inbox_state - ); - return false; -}; - var display_feeds_combined_inbox = function(res) { Hm_Message_List.update(res.formatted_message_list); }; @@ -135,28 +123,14 @@ var display_feed_item_content = function(res) { if (!res.feed_msg_headers) { return; } - var msg_uid = getMessageUidParam(); + const msg_uid = getMessageUidParam(); $('.msg_text').html(''); $('.msg_text').append(res.feed_msg_headers); $('.msg_text').append(res.feed_msg_text); set_message_content(); document.title = $('.header_subject th').text(); - var path = getListPathParam(); - if (hm_list_parent() == 'feeds') { - Hm_Message_List.prev_next_links('formatted_feed_data', path+'_'+msg_uid); - } - else if (hm_list_parent() == 'combined_inbox') { - Hm_Message_List.prev_next_links('formatted_combined_inbox', path+'_'+msg_uid); - } - else if (hm_list_parent() == 'unread') { - Hm_Message_List.prev_next_links('formatted_unread_data', path+'_'+msg_uid); - } - else if (hm_list_parent() === 'search') { - Hm_Message_List.prev_next_links('formatted_search_data', path+'_'+msg_uid); - } - else { - Hm_Message_List.prev_next_links(path, path+'_'+msg_uid); - } + const path = getListPathParam(); + Hm_Message_List.prev_next_links(msg_uid, getParam('list_parent')); if (Hm_Message_List.track_read_messages(path+'_'+msg_uid)) { if (hm_list_parent() == 'unread') { Hm_Message_List.adjust_unread_total(-1); @@ -227,12 +201,6 @@ var expand_feed_settings = function() { } }; -function feedMessageContentPageHandler(routeParams) { - if (routeParams.list_path.substr(0, 4) == 'feed') { - feed_item_view(); - } -} - function feedServersPageHandler() { $('.feed_delete').on('click', feed_delete_action); $('.test_feed_connect').on('click', feed_test_action); diff --git a/modules/imap/js_modules/route_handlers.js b/modules/imap/js_modules/route_handlers.js index a9af89f544..4071ccdc1b 100644 --- a/modules/imap/js_modules/route_handlers.js +++ b/modules/imap/js_modules/route_handlers.js @@ -45,7 +45,6 @@ function applyImapMessageContentPageHandlers(routeParams) { preFetchMessageContent(false, prevMessageUid, routeParams.list_path); } - if (window.feedMessageContentPageHandler) feedMessageContentPageHandler(routeParams); if (window.githubMessageContentPageHandler) githubMessageContentPageHandler(routeParams); if (window.pgpMessageContentPageHandler) pgpMessageContentPageHandler(); if (window.wpMessageContentPageHandler) wpMessageContentPageHandler(routeParams); diff --git a/modules/imap/setup.php b/modules/imap/setup.php index 5f3516e513..622d9f1f46 100644 --- a/modules/imap/setup.php +++ b/modules/imap/setup.php @@ -319,6 +319,9 @@ add_output('ajax_share_folders', 'get_list_imap_folders_permissions', true); add_handler('ajax_share_folders', 'set_acl_to_imap_folders', true); +add_handler('ajax_combined_message_list', 'load_imap_servers_from_config', true); +add_handler('ajax_combined_message_list', 'imap_combined_inbox', true); + /* allowed input */ return array( 'allowed_pages' => array( From e7e4299eef77b3f0324b571e6e4470d69a9e23e6 Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+mercihabam@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:24:01 +0200 Subject: [PATCH 08/11] fix(frontend/backend): make various fixes (#1399) * fix(frontend/backend): make various fixes, including: the snooze action, background message list refresh clearing checked checkboxes, settings sections not expanding correctly, & strange error message when copying messages * fix load_compose_page test --- modules/core/js_modules/Hm_MessagesStore.js | 10 ++-- modules/core/js_modules/route_handlers.js | 14 +++-- modules/core/navigation/navigation.js | 5 +- modules/core/site.js | 36 ------------- modules/developer/site.js | 5 -- modules/imap/handler_modules.php | 8 +-- modules/imap/hm-imap.php | 9 ++-- modules/imap/setup.php | 2 +- modules/imap/site.js | 57 ++++++++++++++------- tests/selenium/send.py | 1 + 10 files changed, 69 insertions(+), 78 deletions(-) diff --git a/modules/core/js_modules/Hm_MessagesStore.js b/modules/core/js_modules/Hm_MessagesStore.js index c299fcdbde..4d5b252e44 100644 --- a/modules/core/js_modules/Hm_MessagesStore.js +++ b/modules/core/js_modules/Hm_MessagesStore.js @@ -70,7 +70,7 @@ class Hm_MessagesStore { */ markRowAsRead(uid) { const rows = Object.entries(this.rows); - const row = this.#getRowByUid(uid)?.value; + const row = this.getRowByUid(uid)?.value; if (row) { const htmlRow = $(row[1]['0']); @@ -96,7 +96,7 @@ class Hm_MessagesStore { */ getNextRowForMessage(uid) { const rows = Object.entries(this.rows); - const row = this.#getRowByUid(uid)?.index; + const row = this.getRowByUid(uid)?.index; if (row !== false) { const nextRow = rows[row + 1]; @@ -114,7 +114,7 @@ class Hm_MessagesStore { */ getPreviousRowForMessage(uid) { const rows = Object.entries(this.rows); - const row = this.#getRowByUid(uid)?.index; + const row = this.getRowByUid(uid)?.index; if (row) { const previousRow = rows[row - 1]; if (previousRow) { @@ -126,7 +126,7 @@ class Hm_MessagesStore { removeRow(uid) { const rows = Object.entries(this.rows); - const row = this.#getRowByUid(uid); + const row = this.getRowByUid(uid); if (row) { const newRows = rows.filter((_, i) => i !== row.index); this.rows = Object.fromEntries(newRows); @@ -226,7 +226,7 @@ class Hm_MessagesStore { * @param {String} uid * @returns {RowOutput|false} row - The row object if found, false otherwise */ - #getRowByUid(uid) { + getRowByUid(uid) { const rows = Object.entries(this.rows); const row = rows.find(([key, value]) => $(value['0']).attr('data-uid') == uid); diff --git a/modules/core/js_modules/route_handlers.js b/modules/core/js_modules/route_handlers.js index 5f62d1cecc..4202cd8fe8 100644 --- a/modules/core/js_modules/route_handlers.js +++ b/modules/core/js_modules/route_handlers.js @@ -21,15 +21,16 @@ function applyServersPageHandlers() { if (window.wpServersPageHandler) wpServersPageHandler(); } -function applySettingsPageHandlers() { - Hm_Utils.expand_core_settings(); +function applySettingsPageHandlers(routeParams, hash) { + if (hash) { + Hm_Utils.toggle_page_section(`.${hash}`); + } + $('.settings_subtitle').on("click", function() { return Hm_Utils.toggle_page_section($(this).data('target')); }); $('.reset_default_value_checkbox').on("click", reset_default_value_checkbox); $('.reset_default_value_select').on("click", reset_default_value_select); $('.reset_default_value_input').on("click", reset_default_value_input); $('.reset_default_timezone').on("click", reset_default_timezone); - - if (window.expand_feed_settings) expand_feed_settings(); if (window.smtpSettingsPageHandler) smtpSettingsPageHandler(); } @@ -53,6 +54,11 @@ function applyInfoPageHandlers() { if (window.github_repo_update) github_repo_update(); }, 100); + $('.config_map_page').on("click", function() { + var target = $(this).data('target'); + $('.'+target).toggle(); + }); + return () => { clearTimeout(timer); } diff --git a/modules/core/navigation/navigation.js b/modules/core/navigation/navigation.js index 8321efd8d0..7f7428e776 100644 --- a/modules/core/navigation/navigation.js +++ b/modules/core/navigation/navigation.js @@ -85,14 +85,15 @@ async function navigate(url) { function renderPage(href) { window.dispatchEvent(new CustomEvent('page-change')); - const searchParams = new URL(href, window.location.origin).searchParams; + const url = new URL(href, window.location.origin); + const searchParams = url.searchParams; const page = searchParams.get('page'); if (page) { const route = ROUTES.find(route => route.page === page); const routeParams = Object.fromEntries(searchParams.entries()); if (route) { - const unMountCallback = route.handler(routeParams); + const unMountCallback = route.handler(routeParams, url.hash?.substring(1)); return unMountCallback; } } diff --git a/modules/core/site.js b/modules/core/site.js index c27a92081e..96a0aed501 100644 --- a/modules/core/site.js +++ b/modules/core/site.js @@ -1142,7 +1142,6 @@ var Hm_Folders = { Hm_Folders.update_folder_list(); sessionStorage.clear(); Hm_Utils.restore_local_settings(ui_state); - Hm_Utils.expand_core_settings(); return true; } return false; @@ -1429,41 +1428,6 @@ var Hm_Utils = { return false; }, - expand_core_settings: function() { - var sections = Hm_Utils.get_core_settings(); - var key; - var dsp; - for (key in sections) { - dsp = sections[key]; - if (!dsp) { - dsp = 'none'; - } - $(key).css('display', dsp); - Hm_Utils.save_to_local_storage(key, dsp); - } - }, - - get_core_settings: function() { - var dsp; - var results = {} - var i; - var hash = window.location.hash; - var sections = ['.wp_notifications_setting', '.github_all_setting', '.tfa_setting', '.sent_setting', '.general_setting', '.unread_setting', '.flagged_setting', '.all_setting', '.email_setting', '.junk_setting', '.trash_setting', '.drafts_setting','.tag_setting']; - for (i=0;iout('snoozed_messages', $snoozed_messages); - if ($snoozed_messages == count($ids)) { + if (count($snoozed_messages) == count($ids)) { $msg = 'Messages snoozed'; - } elseif ($snoozed_messages > 0) { + } elseif (count($snoozed_messages) > 0) { $msg = 'Some messages have been snoozed'; } else { $msg = 'ERRFailed to snooze selected messages'; diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php index dba860da47..5546f9ffe4 100644 --- a/modules/imap/hm-imap.php +++ b/modules/imap/hm-imap.php @@ -1892,11 +1892,14 @@ public function append_feed($string) { */ public function append_end() { $result = $this->get_response(false, true); - $uid = $result[0][5]; if ($this->check_response($result, true)) { - return $uid; + $res = preg_grep('/APPENDUID/', array_map('json_encode', $result)); + if ($res) { + $line = json_decode(reset($res), true); + return $line[5]; + } } - return false; + return $result; } /* ------------------ HELPERS ------------------------------------------ */ diff --git a/modules/imap/setup.php b/modules/imap/setup.php index 622d9f1f46..0aab24b11d 100644 --- a/modules/imap/setup.php +++ b/modules/imap/setup.php @@ -369,7 +369,7 @@ 'imap_delete_error' => array(FILTER_VALIDATE_BOOLEAN, false), 'move_count' => array(FILTER_DEFAULT, FILTER_REQUIRE_ARRAY), 'show_pagination_links' => array(FILTER_VALIDATE_BOOLEAN, false), - 'snoozed_messages' => array(FILTER_VALIDATE_INT, false), + 'snoozed_messages' => array(FILTER_DEFAULT, FILTER_REQUIRE_ARRAY), 'auto_advance_email_enabled' => array(FILTER_VALIDATE_BOOLEAN, false), 'do_not_flag_as_read_on_open' => array(FILTER_VALIDATE_BOOLEAN, false), 'ajax_imap_folders_permissions' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY), diff --git a/modules/imap/site.js b/modules/imap/site.js index f974d4f875..d7e7b404e9 100644 --- a/modules/imap/site.js +++ b/modules/imap/site.js @@ -367,8 +367,24 @@ var remove_from_cached_imap_pages = function(msg_cache_key) { async function select_imap_folder(path, reload, processInTheBackground = false, abortController = null) { const messages = new Hm_MessagesStore(path, Hm_Utils.get_url_page_number(), null, abortController); - await messages.load(reload, processInTheBackground).then(() => { - display_imap_mailbox(messages.rows, messages.links, path); + await messages.load(reload, processInTheBackground).then(() => { + if (processInTheBackground) { + for (const index in messages.rows) { + const row = messages.rows[index][0]; + const rowUid = $(row).data('uid'); + const rowExist = Hm_Utils.tbody().find(`tr[data-uid="${rowUid}"]`).length; + if (!rowExist) { + Hm_Utils.rows().eq(index).before(row); + }; + } + Hm_Utils.rows().each(function() { + if (!messages.getRowByUid($(this).data('uid'))) { + $(this).remove(); + } + }); + } else { + display_imap_mailbox(messages.rows, messages.links); + } }); if (path === 'unread') { @@ -397,7 +413,6 @@ var setup_imap_folder_page = async function(listPath) { $('.imap_keyword').on('search', function() { $('#imap_filter_form').trigger('submit'); }); - Hm_Ajax.add_callback_hook('ajax_message_action', function() { select_imap_folder(listPath, true); }); const hadLocalData = new Hm_MessagesStore(listPath, Hm_Utils.get_url_page_number()).hasLocalData(); await select_imap_folder(listPath); @@ -433,7 +448,8 @@ $('#imap_filter_form').on('submit', async function(event) { } }); -var display_imap_mailbox = function(rows, links, path = getListPathParam()) { +var display_imap_mailbox = function(rows, links) { + Hm_Message_List.toggle_msg_controls(); if (rows) { Hm_Message_List.update(rows); Hm_Message_List.check_empty_list(); @@ -844,16 +860,11 @@ var search_selected_for_imap = function() { }; var unselect_non_imap_messages = function() { - var unselected = 0; - $('input[type=checkbox]').each(function() { + $('.message_table_body .checkbox_cell input[type=checkbox]').each(function() { if (this.checked && this.id.search('imap') == -1) { this.checked = false; - unselected++; } }); - if (unselected > 0) { - Hm_Notices.show({0: 'ERR'+$('.move_to_string3').val()}); - } }; var imap_move_copy = function(e, action, context) { @@ -1081,11 +1092,11 @@ var imap_setup_snooze = function() { $(document).on('click', '.snooze_date_picker', function(e) { document.querySelector('.snooze_input_date').showPicker(); }); - $(document).on('click', '.snooze_helper', function(e) { + $('.snooze_helper').on('click', function(e) { e.preventDefault(); $('.snooze_input').val($(this).attr('data-value')).trigger('change'); }); - $(document).on('input', '.snooze_input_date', function(e) { + $('.snooze_input_date').on('input', function(e) { var now = new Date(); now.setMinutes(now.getMinutes() + 1); $(this).attr('min', now.toJSON().slice(0, 16)); @@ -1095,12 +1106,12 @@ var imap_setup_snooze = function() { $('.snooze_date_picker').css({'border': 'unset', 'border-top': '1px solid #ddd'}); } }); - $(document).on('change', '.snooze_input_date', function(e) { + $('.snooze_input_date').on('change', function(e) { if ($(this).val() && new Date().getTime() < new Date($(this).val()).getTime()) { $('.snooze_input').val($(this).val()).trigger('change'); } }); - $(document).on('change', '.snooze_input', function(e) { + $('.snooze_input').on('change', function(e) { $('.snooze_dropdown').hide(); var ids = []; if (getPageNameParam() == 'message') { @@ -1121,11 +1132,21 @@ var imap_setup_snooze = function() { [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_snooze'}, {'name': 'imap_snooze_ids', 'value': ids}, {'name': 'imap_snooze_until', 'value': $(this).val()}], - function(res) { - if (res.snoozed_messages > 0) { + async function(res) { + const snoozedMessages = Object.values(res['snoozed_messages']); + if (snoozedMessages.length) { + const path = getParam("list_parent") || getListPathParam(); + const store = new Hm_MessagesStore(path, Hm_Utils.get_url_page_number()); + await store.load(false, true, true); + + snoozedMessages.forEach((msg) => { + store.removeRow(msg); + }); + if (getPageNameParam() == 'message_list') { + display_imap_mailbox(store.rows, store.links, getListPathParam()); + } + Hm_Folders.reload_folders(true); - var path = hm_list_parent()? hm_list_parent(): getListPathParam(); - window.location.replace('?page=message_list&list_path='+path); } } ); diff --git a/tests/selenium/send.py b/tests/selenium/send.py index c1816231ab..4c96354e5e 100644 --- a/tests/selenium/send.py +++ b/tests/selenium/send.py @@ -14,6 +14,7 @@ def __init__(self): def load_compose_page(self): self.load() + self.wait_on_class('menu_compose') list_item = self.by_class('menu_compose') link = list_item.find_element(By.TAG_NAME, 'a').click() self.wait_with_folder_list() From 88fae9a04e09532dcb04387ef80edd9abdb53f82 Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+mercihabam@users.noreply.github.com> Date: Sat, 7 Dec 2024 16:13:40 +0200 Subject: [PATCH 09/11] fix(module/github): display messages list and content from the connected github accounts (#1400) * fix(module/github): display messages list and content from the connect github account * Add a background refresh process for all list and fix the history popstate not applying the scripts * fix the message details view and the background refresh process * Cleanup: remove callbacks from the data sources object as they are not necessary * Alter the module scope for pr title validation workflow --- .github/workflows/test.lint.pr.yml | 2 +- modules/core/functions.php | 7 +- modules/core/js_modules/Hm_MessagesStore.js | 31 ++++---- modules/core/js_modules/route_handlers.js | 29 ++++++- modules/core/navigation/navigation.js | 21 +++++- modules/core/navigation/routes.js | 2 +- modules/core/site.js | 3 + modules/feeds/modules.php | 39 +++------- modules/github/js_modules/route_handlers.js | 84 +++++++++++++++++++++ modules/github/modules.php | 10 +-- modules/github/site.js | 75 ------------------ modules/imap/functions.php | 15 ++-- modules/imap/handler_modules.php | 67 ++++------------ modules/imap/js_modules/route_handlers.js | 15 ---- modules/imap/site.js | 19 +++-- modules/tags/handler_modules.php | 2 +- modules/wordpress/modules.php | 4 +- tests/phpunit/modules/core/functions.php | 5 +- 18 files changed, 199 insertions(+), 231 deletions(-) create mode 100644 modules/github/js_modules/route_handlers.js diff --git a/.github/workflows/test.lint.pr.yml b/.github/workflows/test.lint.pr.yml index d76c3b1cb2..4f20b40f70 100644 --- a/.github/workflows/test.lint.pr.yml +++ b/.github/workflows/test.lint.pr.yml @@ -36,7 +36,7 @@ jobs: frontend backend frontend/backend - module + module/[a-z-]+ unit e2e other diff --git a/modules/core/functions.php b/modules/core/functions.php index bea403918b..6b1c5a7bce 100644 --- a/modules/core/functions.php +++ b/modules/core/functions.php @@ -111,12 +111,7 @@ function format_data_sources($array, $output_mod) { foreach ($sources as $values) { $items = array(); foreach ($values as $name => $value) { - if ($name == 'callback') { - $items[] = $output_mod->html_safe($name).':'.$output_mod->html_safe($value); - } - else { - $items[] = $output_mod->html_safe($name).':"'.$output_mod->html_safe($value).'"'; - } + $items[] = $output_mod->html_safe($name).':"'.$output_mod->html_safe($value).'"'; } $objects[] = '{'.implode(',', $items).'}'; } diff --git a/modules/core/js_modules/Hm_MessagesStore.js b/modules/core/js_modules/Hm_MessagesStore.js index 4d5b252e44..7e4f7df23a 100644 --- a/modules/core/js_modules/Hm_MessagesStore.js +++ b/modules/core/js_modules/Hm_MessagesStore.js @@ -153,18 +153,23 @@ class Hm_MessagesStore { #getRequestConfig() { let hook; - let imapServerId; - let feedServerId; - let folder; const config = []; if (this.path.startsWith('imap')) { hook = "ajax_imap_folder_display"; + const detail = Hm_Utils.parse_folder_path(this.path, 'imap'); - imapServerId = detail.server_id; - folder = detail.folder; + config.push({ name: "imap_server_id", value: detail.server_id }); + config.push({ name: "folder", value: detail.folder }); + } else if (this.path.startsWith('feeds')) { hook = "ajax_feed_combined"; - feedServerId = this.path.split('_')[1]; + const serverId = this.path.split('_')[1]; + if (serverId) { + config.push({ name: "feed_server_ids", value: serverId }); + } + } else if (this.path.startsWith('github')) { + hook = "ajax_github_data"; + config.push({ name: "github_repo", value: this.path.split('_')[1] }); } else { switch (this.path) { case 'unread': @@ -189,18 +194,8 @@ class Hm_MessagesStore { } } - if (hook) { - config.push({ name: "hm_ajax_hook", value: hook }); - } - if (imapServerId) { - config.push({ name: "imap_server_id", value: imapServerId }); - } - if (folder) { - config.push({ name: "folder", value: folder }); - } - if (feedServerId) { - config.push({ name: "feed_server_ids", value: feedServerId }); - } + config.push({ name: "hm_ajax_hook", value: hook }); + return config; } diff --git a/modules/core/js_modules/route_handlers.js b/modules/core/js_modules/route_handlers.js index 4202cd8fe8..782d9b9a24 100644 --- a/modules/core/js_modules/route_handlers.js +++ b/modules/core/js_modules/route_handlers.js @@ -64,16 +64,37 @@ function applyInfoPageHandlers() { } } +function applyMessaleListPageHandlers(routeParams) { + sortHandlerForMessageListAndSearchPage(); + Hm_Message_List.set_row_events(); + + $('.core_msg_control').on("click", function(e) { + e.preventDefault(); + Hm_Message_List.message_action($(this).data('action')); + }); + $('.toggle_link').on("click", function(e) { + e.preventDefault(); + Hm_Message_List.toggle_rows(); + }); + + if (routeParams.list_path === 'github_all') { + return applyGithubMessageListPageHandler(routeParams); + } + + // TODO: Refactor this handler to be more modular(applicable only for the imap list type) + return applyImapMessageListPageHandlers(routeParams); +} + function applyMessagePageHandlers(routeParams) { const path = routeParams.list_path.substr(0, 4); switch (path) { case 'imap': - applyImapMessageContentPageHandlers(routeParams); - break; + return applyImapMessageContentPageHandlers(routeParams); case 'feed': - applyFeedMessageContentPageHandlers(routeParams); - break; + return applyFeedMessageContentPageHandlers(routeParams); + case 'gith': + return applyGithubMessageContentPageHandlers(routeParams); default: break; diff --git a/modules/core/navigation/navigation.js b/modules/core/navigation/navigation.js index 7f7428e776..cdcd1465be 100644 --- a/modules/core/navigation/navigation.js +++ b/modules/core/navigation/navigation.js @@ -9,6 +9,7 @@ function trackLocationSearchChanges() { window.addEventListener('popstate', function(event) { if (event.state) { $('main').replaceWith(event.state.main); + loadCustomScripts(event.state.head); } const unMountCallback = renderPage(window.location.href); @@ -25,7 +26,7 @@ window.addEventListener('popstate', function(event) { window.addEventListener('load', function() { const unMountCallback = renderPage(window.location.href); - history.replaceState({ main: $('main').prop('outerHTML') }, ""); + history.replaceState({ main: $('main').prop('outerHTML'), head: $('head').prop('outerHTML') }, ""); if (unMountCallback) { unMountSubscribers[window.location.search] = unMountCallback; @@ -60,12 +61,16 @@ async function navigate(url) { const title = html.match(/]*>((.|[\n\r])*)<\/title>/i)[0]; $('main').replaceWith(main); document.title = title.replace(/<[^>]*>/g, ''); + + // load custom javascript + const head = html.match(/]*>((.|[\n\r])*)<\/head>/i)[0]; + loadCustomScripts(head); window.location.next = url; const unMountCallback = renderPage(url); - history.pushState({ main }, "", url); + history.pushState({ main, head }, "", url); if (unMountCallback) { unMountSubscribers[url] = unMountCallback; @@ -82,6 +87,18 @@ async function navigate(url) { } } +function loadCustomScripts(head) { + $(document.head).find('script').remove(); + + $('
                              ').append(head).find('script').each(function() { + if (!this.src) { + const newScript = document.createElement('script'); + newScript.textContent = this.textContent; + document.head.appendChild(newScript); + } + }); +} + function renderPage(href) { window.dispatchEvent(new CustomEvent('page-change')); diff --git a/modules/core/navigation/routes.js b/modules/core/navigation/routes.js index 6ace2380e9..b7295205db 100644 --- a/modules/core/navigation/routes.js +++ b/modules/core/navigation/routes.js @@ -8,7 +8,7 @@ const modulesRoutes = [ }, { page: 'message_list', - handler: 'applyImapMessageListPageHandlers' + handler: 'applyMessaleListPageHandlers' }, { page: 'message', diff --git a/modules/core/site.js b/modules/core/site.js index 96a0aed501..cb42a5cacb 100644 --- a/modules/core/site.js +++ b/modules/core/site.js @@ -1006,6 +1006,9 @@ function Message_List() { } this.process_row_click = function(e) { + if (e.target.tagName === 'A') { + return; + } document.getSelection().removeAllRanges(); var target = $(e.target); var class_name = target[0].className; diff --git a/modules/feeds/modules.php b/modules/feeds/modules.php index 39a7509db5..7099c7d6b5 100644 --- a/modules/feeds/modules.php +++ b/modules/feeds/modules.php @@ -461,7 +461,7 @@ public function process() { class Hm_Handler_load_feeds_for_search extends Hm_Handler_Module { public function process() { foreach (Hm_Feed_List::dump() as $index => $vals) { - $this->append('data_sources', array('callback' => 'feeds_search_page_content', 'type' => 'feeds', 'name' => $vals['name'], 'id' => $vals['id'])); + $this->append('data_sources', array('feeds_search_page_content', 'type' => 'feeds', 'name' => $vals['name'], 'id' => $vals['id'])); } } @@ -472,40 +472,19 @@ public function process() { */ class Hm_Handler_load_feeds_for_message_list extends Hm_Handler_Module { public function process() { - $callback = false; $server_id = false; if (array_key_exists('list_path', $this->request->get)) { $path = $this->request->get['list_path']; + if (preg_match("/^feeds_(.+)$/", $path, $matches)) { + $server_id = $matches[1]; + } } - else { - $path = ''; - } - switch ($path) { - case 'unread': - if (!$this->user_config->get('unread_exclude_feeds_setting', DEFAULT_UNREAD_EXCLUDE_FEEDS)) { - $callback = 'feeds_combined_content_unread'; - } - break; - case 'combined_inbox': - $callback = 'feeds_combined_inbox_content'; - break; - case 'feeds': - $callback = 'feeds_combined_content'; - break; - default: - if (preg_match("/^feeds_(.+)$/", $path, $matches)) { - $server_id = $matches[1]; - $callback = 'load_feed_list'; - } - break; - } - if ($callback) { - foreach (Hm_Feed_List::dump() as $index => $vals) { - if ($server_id !== false && $index != $server_id) { - continue; - } - $this->append('data_sources', array('callback' => $callback, 'type' => 'feeds', 'name' => $vals['name'], 'id' => $vals['id'])); + + foreach (Hm_Feed_List::dump() as $index => $vals) { + if ($server_id !== false && $index != $server_id) { + continue; } + $this->append('data_sources', array('type' => 'feeds', 'name' => $vals['name'], 'id' => $vals['id'])); } } } diff --git a/modules/github/js_modules/route_handlers.js b/modules/github/js_modules/route_handlers.js new file mode 100644 index 0000000000..44744526fa --- /dev/null +++ b/modules/github/js_modules/route_handlers.js @@ -0,0 +1,84 @@ +function githubServersPageHandler() { + var dsp = Hm_Utils.get_from_local_storage('.github_connect_section'); + if (dsp == 'block' || dsp == 'none') { + $('.github_connect_section').css('display', dsp); + } + $('.github_disconnect').on("click", function(e) { + if (!hm_delete_prompt()) { + e.preventDefault(); + return false; + } + return true; + }); + $('.github_remove_repo').on("click", function(e) { + if (!hm_delete_prompt()) { + e.preventDefault(); + return false; + } + return true; + }); +} + +function applyGithubMessageContentPageHandlers(routeParams) { + github_item_view(routeParams.list_path, routeParams.uid); +} + +function applyGithubMessageListPageHandler(routeParams) { + /* + TODO: + - Actually the message list for a particular repo is handled by the imap module, it should be moved to the github module. + */ + if (routeParams.list_path === 'github_all') { + const dataSources = hm_data_sources().map((source) => source.id); + dataSources.forEach((id) => { + const messages = new Hm_MessagesStore('github_' + id); + messages.load().then(store => { + for (const row of Object.values(store.rows)) { + Hm_Utils.tbody().append(row['0']); + } + }) + }); + + const abortController = new AbortController(); + const refreshIntervalId = setInterval(() => { + refreshAll(dataSources, true, abortController); + }, 30000); + + $('.refresh_link').on("click", function(e) { + e.preventDefault(); + refreshAll(dataSources, false, abortController); + }); + + return () => { + clearInterval(refreshIntervalId); + abortController.abort(); + } + } +} + +function refreshAll(dataSources, background = false, abortController) { + dataSources.forEach((id) => { + const messages = new Hm_MessagesStore('github_' + id, Hm_Utils.get_url_page_number(), {}, abortController); + messages.load(true, background).then(store => { + const rows = Object.values(store.rows); + for (const index in rows) { + const row = rows[index]?.[0]; + if (!row) { + continue; + } + + const rowUid = $(row).data('uid'); + const tableRow = Hm_Utils.tbody().find(`tr[data-uid="${rowUid}"]`); + if (!tableRow.length) { + if (Hm_Utils.rows().length >= index) { + Hm_Utils.rows().eq(index).after(row); + } else { + Hm_Utils.tbody().append(row); + } + } else if (tableRow.attr('class') !== $(row).attr('class')) { + tableRow.replaceWith(row); + } + } + }); + }); +} \ No newline at end of file diff --git a/modules/github/modules.php b/modules/github/modules.php index de87f7666c..72371f3f6f 100644 --- a/modules/github/modules.php +++ b/modules/github/modules.php @@ -139,7 +139,7 @@ public function process() { $api = new Hm_API_Curl(); $data = $api->command($url, array('Authorization: token ' . $details['access_token'])); $event = array(); - $uid = mb_substr($form['github_uid'], 9); + $uid = explode('_', $form['github_uid'])[2]; if (is_array($data)) { foreach ($data as $item) { if ($item['id'] == $uid) { @@ -369,7 +369,7 @@ public function process() { $this->out('message_list_since', $this->user_config->get('github_since_setting', DEFAULT_GITHUB_SINCE)); $this->out('per_source_limit', $this->user_config->get('github_limit_setting', DEFAULT_GITHUB_PER_SOURCE)); foreach ($repos as $repo) { - $this->append('data_sources', array('callback' => 'load_github_data', 'type' => 'github', 'name' => $repo, 'id' => $repo)); + $this->append('data_sources', array('type' => 'github', 'name' => $repo, 'id' => $repo)); } } else { @@ -383,14 +383,14 @@ public function process() { $this->out('list_path', $path, false); } $this->out('custom_list_controls', ' '); - $this->append('data_sources', array('callback' => 'load_github_data', 'type' => 'github', 'name' => $repo, 'id' => $repo)); + $this->append('data_sources', array('type' => 'github', 'name' => $repo, 'id' => $repo)); } } elseif ($this->page == 'message_list' && ($path == 'combined_inbox' || $path == 'unread')) { $github_list = true; if (!$excluded || $path == 'combined_inbox') { foreach ($repos as $repo) { - $this->append('data_sources', array('callback' => 'load_github_data', 'type' => 'github', 'name' => $repo, 'id' => $repo)); + $this->append('data_sources', array('type' => 'github', 'name' => $repo, 'id' => $repo)); } } } @@ -404,7 +404,7 @@ public function process() { if (!$github_list) { foreach ($repos as $repo) { if (!$excluded) { - $this->append('data_sources', array('callback' => 'load_github_data_background', 'group' => 'background', 'type' => 'github', 'name' => 'Github', 'id' => $repo)); + $this->append('data_sources', array('group' => 'background', 'type' => 'github', 'name' => 'Github', 'id' => $repo)); } } } diff --git a/modules/github/site.js b/modules/github/site.js index effc21d517..21c58b33de 100644 --- a/modules/github/site.js +++ b/modules/github/site.js @@ -1,47 +1,5 @@ 'use strict'; -var load_github_data = function(id) { - if (getListPathParam() == 'github_all') { - Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_github_data'}, {'name': 'github_repo', 'value': id}], display_github_data, [], false, cache_github_all); - } - else { - if (getListPathParam().substr(0, 6) == 'github') { - var cached = Hm_Utils.get_from_local_storage(getListPathParam()); - if (cached) { - $('.message_table tbody').html(cached); - } - } - Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_github_data'}, {'name': 'github_repo', 'value': id}], display_github_data); - } -}; - -var load_github_data_background = function(id) { - Hm_Ajax.request([{'name': 'hm_ajax_hook', 'value': 'ajax_github_data'}, {'name': 'github_unread', 'value': 1}, {'name': 'github_repo', 'value': id}], display_github_data_background); -}; - -var display_github_data_background = function(res) { - var ids = [res.github_server_id]; - var cache = $('').append($(Hm_Utils.get_from_local_storage('formatted_unread_data'))); - globals.Hm_Background_Unread.update(ids, res.formatted_message_list, 'github', cache); - Hm_Utils.save_to_local_storage('formatted_unread_data', cache.html()); -}; - -var display_github_data = function(res) { - var path = getListPathParam(); - Hm_Message_List.update(res.formatted_message_list); - if (path != 'github_all') { - var data = Hm_Message_List.filter_list(); - data.find('*[style]').attr('style', ''); - Hm_Utils.save_to_local_storage(path, data.html()); - } -}; - -var cache_github_all = function() { - if (getListPathParam() == 'github_all') { - Hm_Message_List.set_message_list_state('formatted_github_all') - } -}; - var github_item_view = function(list_path, uid, callback) { if (!list_path) { list_path = getListPathParam(); @@ -100,36 +58,3 @@ var github_repo_update = function() { var update_github_status_display = function(res) { $('.github_'+Hm_Utils.clean_selector(res.github_status_repo)).html(res.github_status_display); }; - -function githubServersPageHandler() { - var dsp = Hm_Utils.get_from_local_storage('.github_connect_section'); - if (dsp == 'block' || dsp == 'none') { - $('.github_connect_section').css('display', dsp); - } - $('.github_disconnect').on("click", function(e) { - if (!hm_delete_prompt()) { - e.preventDefault(); - return false; - } - return true; - }); - $('.github_remove_repo').on("click", function(e) { - if (!hm_delete_prompt()) { - e.preventDefault(); - return false; - } - return true; - }); -} - -function githubMessageContentPageHandler(routeParams) { - if (routeParams.list_path.substr(0, 6) == 'github') { - github_item_view(); - } -} - -function githubMessageListPageHandler(routeParams) { - if (routeParams.list_path === 'github_all') { - Hm_Message_List.page_caches.github_all = 'formatted_github_all'; - } -} diff --git a/modules/imap/functions.php b/modules/imap/functions.php index 60bb98cd11..a0c1dcafbe 100644 --- a/modules/imap/functions.php +++ b/modules/imap/functions.php @@ -19,7 +19,7 @@ * @return array */ if (!hm_exists('imap_sources')) { -function imap_sources($callback, $mod, $folder = 'sent') { +function imap_sources($mod, $folder = 'sent') { $inbox = $mod->user_config->get('smtp_auto_bcc_setting', DEFAULT_SMTP_AUTO_BCC); $sources = array(); $folder = $folder == 'drafts' ? 'draft': $folder; @@ -29,13 +29,13 @@ function imap_sources($callback, $mod, $folder = 'sent') { } $folders = get_special_folders($mod, $index); if (array_key_exists($folder, $folders) && $folders[$folder]) { - $sources[] = array('callback' => $callback, 'folder' => bin2hex($folders[$folder]), 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); + $sources[] = array('folder' => bin2hex($folders[$folder]), 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); } elseif ($inbox) { - $sources[] = array('callback' => $callback, 'folder' => bin2hex('INBOX'), 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); + $sources[] = array('folder' => bin2hex('INBOX'), 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); } else { - $sources[] = array('callback' => $callback, 'folder' => bin2hex('SPECIAL_USE_CHECK'), 'nodisplay' => true, 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); + $sources[] = array('folder' => bin2hex('SPECIAL_USE_CHECK'), 'nodisplay' => true, 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); } } return $sources; @@ -44,12 +44,11 @@ function imap_sources($callback, $mod, $folder = 'sent') { /** * Build a source list * @subpackage imap/functions - * @param string $callback javascript callback function name * @param array $custom user specific assignments * @return array */ if (!hm_exists('imap_data_sources')) { -function imap_data_sources($callback, $custom=array()) { +function imap_data_sources($custom=array()) { $sources = array(); foreach (Hm_IMAP_List::dump() as $index => $vals) { if (array_key_exists('hide', $vals) && $vals['hide']) { @@ -58,7 +57,7 @@ function imap_data_sources($callback, $custom=array()) { if (!array_key_exists('user', $vals)) { continue; } - $sources[] = array('callback' => $callback, 'folder' => bin2hex('INBOX'), 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); + $sources[] = array('folder' => bin2hex('INBOX'), 'type' => 'imap', 'name' => $vals['name'], 'id' => $index); } foreach ($custom as $path => $type) { $parts = explode('_', $path, 3); @@ -67,7 +66,7 @@ function imap_data_sources($callback, $custom=array()) { if ($type == 'add') { $details = Hm_IMAP_List::dump($parts[1]); if ($details) { - $sources[] = array('callback' => $callback, 'folder' => $parts[2], 'type' => 'imap', 'name' => $details['name'], 'id' => $parts[1]); + $sources[] = array('folder' => $parts[2], 'type' => 'imap', 'name' => $details['name'], 'id' => $parts[1]); } } elseif ($type == 'remove') { diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php index bd80f8b5f4..658c1c2902 100644 --- a/modules/imap/handler_modules.php +++ b/modules/imap/handler_modules.php @@ -626,7 +626,7 @@ public function process() { $parts = explode('_', $path, 3); $details = Hm_IMAP_List::dump($parts[1]); $custom_link = 'add'; - foreach (imap_data_sources(false, $this->user_config->get('custom_imap_sources', array())) as $vals) { + foreach (imap_data_sources($this->user_config->get('custom_imap_sources', array())) as $vals) { if ($vals['id'] == $parts[1] && $vals['folder'] == $parts[2]) { $custom_link = 'remove'; break; @@ -1369,7 +1369,7 @@ public function process() { if (! $userCustomSources) { $userCustomSources = []; } - $data_sources = imap_data_sources('', $userCustomSources); + $data_sources = imap_data_sources($userCustomSources); $ids = array_map(function($ds) { return $ds['id']; }, $data_sources); $folders = array_map(function($ds) { return $ds['folder']; }, $data_sources); } @@ -1408,7 +1408,7 @@ public function process() { } $folders = array($folder); } else { - $data_sources = imap_data_sources(''); + $data_sources = imap_data_sources(); $ids = array_map(function($ds) { return $ds['id']; }, $data_sources); $folders = array_map(function($ds) { return $ds['folder']; }, $data_sources); } @@ -1472,7 +1472,7 @@ public function process() { } $folders = array($folder); } else { - $data_sources = imap_data_sources(''); + $data_sources = imap_data_sources(); $ids = array_map(function($ds) { return $ds['id']; }, $data_sources); $folders = array_map(function($ds) { return $ds['folder']; }, $data_sources); } @@ -1628,7 +1628,7 @@ class Hm_Handler_load_imap_servers_for_search extends Hm_Handler_Module { * Output IMAP server array used on the search page */ public function process() { - foreach(imap_data_sources('imap_search_page_content', $this->user_config->get('custom_imap_sources', array())) as $vals) { + foreach(imap_data_sources($this->user_config->get('custom_imap_sources', array())) as $vals) { $this->append('data_sources', $vals); } } @@ -1644,61 +1644,20 @@ class Hm_Handler_load_imap_servers_for_message_list extends Hm_Handler_Module { * Used by combined views excluding normal folder view and search pages */ public function process() { - $callback = false; if (array_key_exists('list_path', $this->request->get)) { $path = $this->request->get['list_path']; } else { $path = ''; } - switch ($path) { - case 'unread': - $callback = 'imap_combined_unread_content'; - break; - case 'flagged': - $callback = 'imap_combined_flagged_content'; - break; - case 'combined_inbox': - $callback = 'imap_combined_inbox_content'; - break; - case 'email': - $callback = 'imap_all_mail_content'; - break; - case 'sent': - $callback = 'imap_folder_content'; - break; - case 'junk': - $callback = 'imap_folder_content'; - break; - case 'trash': - $callback = 'imap_folder_content'; - break; - case 'drafts': - $callback = 'imap_folder_content'; - break; - case 'tag': - $callback = 'imap_tag_content'; - break; - default: - $callback = 'imap_background_unread_content'; - break; - } - if ($callback) { - if ($callback != 'imap_background_unread_content') { - $this->out('move_copy_controls', true); - } - if (in_array($path, ['sent', 'junk', 'trash', 'drafts'])) { - foreach (imap_sources($callback, $this, $path) as $vals) { - $this->append('data_sources', $vals); - } + if (in_array($path, ['sent', 'junk', 'trash', 'drafts'])) { + foreach (imap_sources($this, $path) as $vals) { + $this->append('data_sources', $vals); } - else { - foreach (imap_data_sources($callback, $this->user_config->get('custom_imap_sources', array())) as $vals) { - if ($callback == 'imap_background_unread_content') { - $vals['group'] = 'background'; - } - $this->append('data_sources', $vals); - } + } + else { + foreach (imap_data_sources($this->user_config->get('custom_imap_sources', array())) as $vals) { + $this->append('data_sources', $vals); } } } @@ -2162,7 +2121,7 @@ public function process() { if ($success) { $ids = explode(',', $form['imap_server_ids']); } else { - $data_sources = imap_sources('', $this, $this->request->get['list_path']); + $data_sources = imap_sources($this, $this->request->get['list_path']); $ids = array_map(function($ds) { return $ds['id']; }, $data_sources); $folders = array_map(function($ds) { return $ds['folder']; }, $data_sources); } diff --git a/modules/imap/js_modules/route_handlers.js b/modules/imap/js_modules/route_handlers.js index 4071ccdc1b..6b98603913 100644 --- a/modules/imap/js_modules/route_handlers.js +++ b/modules/imap/js_modules/route_handlers.js @@ -1,23 +1,9 @@ function applyImapMessageListPageHandlers(routeParams) { const setupPageResult = setup_imap_folder_page(routeParams.list_path); - sortHandlerForMessageListAndSearchPage(); - imap_setup_snooze(); imap_setup_tags(); - Hm_Message_List.set_row_events(); - - $('.core_msg_control').on("click", function(e) { - e.preventDefault(); - Hm_Message_List.message_action($(this).data('action')); - }); - $('.toggle_link').on("click", function(e) { - e.preventDefault(); - Hm_Message_List.toggle_rows(); - }); - - if (window.githubMessageListPageHandler) githubMessageListPageHandler(routeParams); if (window.inlineMessageMessageListAndSearchPageHandler) inlineMessageMessageListAndSearchPageHandler(routeParams); if (window.wpMessageListPageHandler) wpMessageListPageHandler(routeParams); @@ -45,7 +31,6 @@ function applyImapMessageContentPageHandlers(routeParams) { preFetchMessageContent(false, prevMessageUid, routeParams.list_path); } - if (window.githubMessageContentPageHandler) githubMessageContentPageHandler(routeParams); if (window.pgpMessageContentPageHandler) pgpMessageContentPageHandler(); if (window.wpMessageContentPageHandler) wpMessageContentPageHandler(routeParams); } \ No newline at end of file diff --git a/modules/imap/site.js b/modules/imap/site.js index d7e7b404e9..4dbfb78178 100644 --- a/modules/imap/site.js +++ b/modules/imap/site.js @@ -369,13 +369,20 @@ async function select_imap_folder(path, reload, processInTheBackground = false, const messages = new Hm_MessagesStore(path, Hm_Utils.get_url_page_number(), null, abortController); await messages.load(reload, processInTheBackground).then(() => { if (processInTheBackground) { - for (const index in messages.rows) { - const row = messages.rows[index][0]; + const rows = Object.values(messages.rows); + for (const index in rows) { + const row = rows[index]?.[0]; const rowUid = $(row).data('uid'); - const rowExist = Hm_Utils.tbody().find(`tr[data-uid="${rowUid}"]`).length; - if (!rowExist) { - Hm_Utils.rows().eq(index).before(row); - }; + const tableRow = Hm_Utils.tbody().find(`tr[data-uid="${rowUid}"]`); + if (!tableRow.length) { + if (Hm_Utils.rows().length >= index) { + Hm_Utils.rows().eq(index).after(row); + } else { + Hm_Utils.tbody().append(row); + } + } else if (tableRow.attr('class') !== $(row).attr('class')) { + tableRow.replaceWith(row); + } } Hm_Utils.rows().each(function() { if (!messages.getRowByUid($(this).data('uid'))) { diff --git a/modules/tags/handler_modules.php b/modules/tags/handler_modules.php index d0f95353ac..53c7352254 100644 --- a/modules/tags/handler_modules.php +++ b/modules/tags/handler_modules.php @@ -126,7 +126,7 @@ public function process() { */ class Hm_Handler_imap_tag_content extends Hm_Handler_Module { public function process() { - $data_sources = imap_data_sources(''); + $data_sources = imap_data_sources(); $ids = array_map(function($ds) { return $ds['id']; }, $data_sources); $tag_id = $this->request->post['folder']; if ($ids && $tag_id) { diff --git a/modules/wordpress/modules.php b/modules/wordpress/modules.php index b1da8306ce..57c7e5bed3 100644 --- a/modules/wordpress/modules.php +++ b/modules/wordpress/modules.php @@ -86,7 +86,7 @@ public function process() { $excluded = true; } if (!$excluded) { - $this->append('data_sources', array('callback' => 'load_wp_notices_for_combined_list', 'type' => 'wordpress', 'name' => 'WordPress.com Notifications', 'id' => 0)); + $this->append('data_sources', array('load_wp_notices_for_combined_list', 'type' => 'wordpress', 'name' => 'WordPress.com Notifications', 'id' => 0)); } } } @@ -147,7 +147,7 @@ public function process() { $this->out('mailbox_list_title', array('WordPress.com Notifications')); $this->out('message_list_since', $this->user_config->get('wordpress_since_setting', DEFAULT_WORDPRESS_SINCE)); $this->out('per_source_limit', 100); - $this->append('data_sources', array('callback' => 'load_wp_notices', 'type' => 'wordpress', 'name' => 'WordPress.com Notifications', 'id' => 0)); + $this->append('data_sources', array('load_wp_notices', 'type' => 'wordpress', 'name' => 'WordPress.com Notifications', 'id' => 0)); } else { $this->out('list_path', $path, false); diff --git a/tests/phpunit/modules/core/functions.php b/tests/phpunit/modules/core/functions.php index 818cf4018e..977ba49dfa 100644 --- a/tests/phpunit/modules/core/functions.php +++ b/tests/phpunit/modules/core/functions.php @@ -44,14 +44,13 @@ public function test_translate_time_str() { */ public function test_format_data_sources() { $data = array(array( - 'callback' => 'imap_combined_unread_content', 'folder' => '494e424f58', 'type' => 'imap', 'name' => 'test', 'id' => 0 )); - $res = 'var hm_data_sources = function() { return [{callback:imap_combined_unread_content,folder:"494e424f58",type:"imap",name:"test",id:"0"}]; };'; - $res2 = 'var hm_data_sources_foo = function() { return [{callback:imap_combined_unread_content,folder:"494e424f58",type:"imap",name:"test",id:"0",group:"foo"}]; };var hm_data_sources = function() { return []; };'; + $res = 'var hm_data_sources = function() { return [{folder:"494e424f58",type:"imap",name:"test",id:"0"}]; };'; + $res2 = 'var hm_data_sources_foo = function() { return [{folder:"494e424f58",type:"imap",name:"test",id:"0",group:"foo"}]; };var hm_data_sources = function() { return []; };'; $mod = new Hm_Output_Test(array('foo' => 'bar', 'bar' => 'foo'), array('bar')); $this->assertEquals($res, format_data_sources($data, $mod)); $data[0]['group'] = 'foo'; From f28d519eb5b9948e514109973ee510c9f8a39236 Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+mercihabam@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:45:23 +0200 Subject: [PATCH 10/11] enh(frontend): focus the navigation on Cypht's elements when rendered on a webpage with external elements (#1401) --- modules/core/navigation/navbar.js | 20 ++++++++-------- modules/core/navigation/navigation.js | 24 +++++++++---------- modules/core/output_modules.php | 6 ++--- modules/inline_message/modules.php | 2 +- tests/phpunit/modules/core/output_modules.php | 8 +++---- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modules/core/navigation/navbar.js b/modules/core/navigation/navbar.js index 0a39cbe90c..edcfdd68f5 100644 --- a/modules/core/navigation/navbar.js +++ b/modules/core/navigation/navbar.js @@ -13,12 +13,12 @@ $(() => { $('.mobile nav').before(menuToggle); - $(document).on('click', '.menu-toggle', showMobileNavbar); - $(document).on('click', 'nav .menu-toggle', hideMobileNavbar) + $(document).on('click', '.cypht-layout .menu-toggle', showMobileNavbar); + $(document).on('click', '.cypht-layout nav .menu-toggle', hideMobileNavbar) } else { $(document).on('click', '.menu-toggle', function() { - $('nav').toggleClass('collapsed'); - if ($('nav').hasClass('collapsed')) { + $('.cypht-layout nav').toggleClass('collapsed'); + if ($('.cypht-layout nav').hasClass('collapsed')) { document.documentElement.style.setProperty('--nav-size', 'var(--nav-collapsed-size)'); } else { document.documentElement.style.setProperty('--nav-size', 'var(--nav-expanded-size)'); @@ -28,13 +28,13 @@ $(() => { }) function hideMobileNavbar() { - $('nav').css('transform', 'translateX(-120%)'); - $('main').css('max-height', 'unset'); - $('main').css('overflow', 'unset'); + $('.cypht-layout nav').css('transform', 'translateX(-120%)'); + $('#cypht-main').css('max-height', 'unset'); + $('#cypht-main').css('overflow', 'unset'); } function showMobileNavbar() { - $('nav').css('transform', 'translateX(0)'); - $('main').css('max-height', 'calc(100vh - 3.5rem)'); - $('main').css('overflow', 'hidden'); + $('.cypht-layout nav').css('transform', 'translateX(0)'); + $('#cypht-main').css('max-height', 'calc(100vh - 3.5rem)'); + $('#cypht-main').css('overflow', 'hidden'); } \ No newline at end of file diff --git a/modules/core/navigation/navigation.js b/modules/core/navigation/navigation.js index cdcd1465be..c635dc6e57 100644 --- a/modules/core/navigation/navigation.js +++ b/modules/core/navigation/navigation.js @@ -8,7 +8,7 @@ function trackLocationSearchChanges() { window.addEventListener('popstate', function(event) { if (event.state) { - $('main').replaceWith(event.state.main); + $('#cypht-main').replaceWith(event.state.main); loadCustomScripts(event.state.head); } const unMountCallback = renderPage(window.location.href); @@ -26,7 +26,7 @@ window.addEventListener('popstate', function(event) { window.addEventListener('load', function() { const unMountCallback = renderPage(window.location.href); - history.replaceState({ main: $('main').prop('outerHTML'), head: $('head').prop('outerHTML') }, ""); + history.replaceState({ main: $('#cypht-main').prop('outerHTML'), head: $('head').prop('outerHTML') }, ""); if (unMountCallback) { unMountSubscribers[window.location.search] = unMountCallback; @@ -59,7 +59,12 @@ async function navigate(url) { const html = await response.text(); const main = html.match(/]*>((.|[\n\r])*)<\/main>/i)[0]; const title = html.match(/]*>((.|[\n\r])*)<\/title>/i)[0]; - $('main').replaceWith(main); + + if ($(main).attr('id') === 'cypht-main') { + $('main#cypht-main').replaceWith(main); + } else { + $('main#cypht-main').replaceWith($(main).find('#cypht-main')); + } document.title = title.replace(/<[^>]*>/g, ''); // load custom javascript @@ -88,15 +93,10 @@ async function navigate(url) { } function loadCustomScripts(head) { - $(document.head).find('script').remove(); - - $('
                              ').append(head).find('script').each(function() { - if (!this.src) { - const newScript = document.createElement('script'); - newScript.textContent = this.textContent; - document.head.appendChild(newScript); - } - }); + const newHead = $('
                              ').append(head); + $(document.head).find('script#data-store').replaceWith(newHead.find('script#data-store')); + $(document.head).find('script#search-data').replaceWith(newHead.find('script#search-data')); + $(document.head).find('script#inline-msg-state').replaceWith(newHead.find('script#inline-msg-state')); } function renderPage(href) { diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php index 49af256f01..4225ea1c2b 100644 --- a/modules/core/output_modules.php +++ b/modules/core/output_modules.php @@ -142,7 +142,7 @@ class Hm_Output_js_search_data extends Hm_Output_Module { * adds two JS functions used on the search page */ protected function output() { - return ''; @@ -624,7 +624,7 @@ class Hm_Output_js_data extends Hm_Output_Module { * Uses function wrappers to make the data immutable from JS */ protected function output() { - $res = ''; diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php index 6d8f907ee3..9b953753de 100644 --- a/tests/phpunit/modules/core/output_modules.php +++ b/tests/phpunit/modules/core/output_modules.php @@ -100,7 +100,7 @@ public function test_search_results_table_end() { public function test_js_search_data() { $test = new Output_Test('js_search_data', 'core'); $res = $test->run(); - $this->assertEquals(array(''), $res->output_response); + $this->assertEquals(array(''), $res->output_response); } /** * @preserveGlobalState disabled @@ -444,10 +444,10 @@ public function test_js_data() { $test = new Output_Test('js_data', 'core'); $test->handler_response = array('disable_delete_prompt' => true); $res = $test->run(); - $this->assertStringStartsWith('