[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Webmail: missing Tiki-custom actions in message headers

Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
a2951435 by Merci Jacob at 2026-06-11T13:48:05+00:00
[FIX] Webmail: missing Tiki-custom actions in message headers
---
* update cypht revision

* [FIX] Webmail: missing Tiki-custom actions in message headers

See merge request tikiwiki/tiki!10461

- - - - -


5 changed files:

- lib/cypht/modules/tiki/functions.php
- lib/cypht/modules/tiki/general_modules.php
- lib/cypht/modules/tiki/setup.php
- lib/cypht/modules/tiki/tracker_modules.php
- vendor_bundled/composer.lock


Changes:

=====================================
lib/cypht/modules/tiki/functions.php
=====================================
@@ -468,19 +468,6 @@ if (! hm_exists('bind_tracker_item_update_event')) {
     }
 }
 
-/**
- * @subpackage tiki/functions
- * @return string ensure file was saved before removing it from remote mailbox
- */
-if (! hm_exists('append_to_msg_headers')) {
-    function append_to_msg_headers($headers, $link)
-    {
-        $headers = preg_replace('#</div><span id="extra-header-buttons"></span>#s', $link . "\\0", $headers, 1);
-
-        return $headers;
-    }
-}
-
 function find_relevant_tracker_items($keywords, $multivalueField = '', $searchArgs = [])
 {
     global $prefs;


=====================================
lib/cypht/modules/tiki/general_modules.php
=====================================
@@ -401,11 +401,9 @@ class Hm_Output_filter_message_headers_mpdf extends Hm_Output_Module
 {
     protected function output()
     {
-        $headers = $this->get('msg_headers');
-        if (is_string($headers) && TikiLib::lib('tiki')->get_preference('print_pdf_from_url') == "mpdf") {
+        if (TikiLib::lib('tiki')->get_preference('print_pdf_from_url') == "mpdf") {
             $pdf_link = ' <a class="hlink text-decoration-none btn btn-sm btn-outline-secondary" id="print_pdf" href="#"> ' . $this->trans('PDF') . ' </a>';
-            $headers = append_to_msg_headers($headers, $pdf_link);
-            $this->out('msg_headers', $headers, false);
+            $this->concat('extra_header_buttons', $pdf_link);
         }
     }
 }


=====================================
lib/cypht/modules/tiki/setup.php
=====================================
@@ -76,10 +76,10 @@ add_output('compose', 'post_imap_save_sent', true, 'tiki', 'compose_form_end', '
 /* message page calendar invitation hooks */
 add_handler('ajax_imap_message_content', 'check_calendar_invitations_imap', true, 'imap', 'imap_message_content', 'after');
 add_output('ajax_imap_message_content', 'add_rsvp_actions', true, 'imap', 'filter_message_headers', 'after');
-add_output('ajax_imap_message_content', 'filter_message_headers_mpdf', true, 'imap', 'filter_message_headers', 'after');
-add_output('ajax_imap_message_content', 'add_move_to_trackers', true, 'imap', 'filter_message_headers', 'after');
-add_output('ajax_imap_message_content', 'tiki_get_create_item_trackers_output', true, 'imap', 'filter_message_headers', 'after');
-add_output('ajax_imap_message_content', 'add_restore_message', true, 'imap', 'filter_message_headers', 'after');
+add_output('ajax_imap_message_content', 'filter_message_headers_mpdf', true, 'imap', 'filter_message_headers', 'before');
+add_output('ajax_imap_message_content', 'add_move_to_trackers', true, 'imap', 'filter_message_headers', 'before');
+add_output('ajax_imap_message_content', 'tiki_get_create_item_trackers_output', true, 'imap', 'filter_message_headers', 'before');
+add_output('ajax_imap_message_content', 'add_restore_message', true, 'imap', 'filter_message_headers', 'before');
 
 /* message page calendar invitation hooks (Tracker-stored messages) */
 add_handler('ajax_tiki_message_content', 'check_calendar_invitations_imap', true, 'imap', 'tiki_message_content', 'after');


=====================================
lib/cypht/modules/tiki/tracker_modules.php
=====================================
@@ -1106,8 +1106,7 @@ class Hm_Output_add_move_to_trackers extends Hm_Output_Module
     protected function output()
     {
         $res = tiki_move_to_tracker_dropdown($this, 'Trackers', 'Move to Tracker', 'move_to_trackers', true);
-        $headers = append_to_msg_headers($this->get('msg_headers'), $res);
-        $this->out('msg_headers', $headers, false);
+        $this->concat('extra_header_buttons', $res);
     }
 }
 
@@ -1116,8 +1115,7 @@ class Hm_Output_tiki_get_create_item_trackers_output extends Hm_Output_Module
     public function output()
     {
         $res = tiki_move_to_tracker_dropdown($this, 'Create item', 'Select Tracker', 'item_to_trackers', true);
-        $headers = append_to_msg_headers($this->get('msg_headers'), $res);
-        $this->out('msg_headers', $headers, false);
+        $this->concat('extra_header_buttons', $res);
     }
 }
 
@@ -1130,8 +1128,7 @@ class Hm_Output_add_restore_message extends Hm_Output_Module
     protected function output()
     {
         $res = tiki_restore_message($this);
-        $headers = append_to_msg_headers($this->get('msg_headers'), $res);
-        $this->out('msg_headers', $headers, false);
+        $this->concat('extra_header_buttons', $res);
     }
 }
 


=====================================
vendor_bundled/composer.lock
=====================================
@@ -3325,12 +3325,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/cypht-org/cypht.git",
-                "reference": "fa493d257ad3598a715c599e70219780b7d718e1"
+                "reference": "c4072ef62addf38b459a3de1105d774a50940973"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cypht-org/cypht/zipball/fa493d257ad3598a715c599e70219780b7d718e1",
-                "reference": "fa493d257ad3598a715c599e70219780b7d718e1",
+                "url": "https://api.github.com/repos/cypht-org/cypht/zipball/c4072ef62addf38b459a3de1105d774a50940973",
+                "reference": "c4072ef62addf38b459a3de1105d774a50940973",
                 "shasum": ""
             },
             "require": {
@@ -3408,7 +3408,7 @@
                 "source": "https://github.com/cypht-org/cypht/",
                 "wiki": "https://github.com/cypht-org/cypht/wiki"
             },
-            "time": "2026-06-04T06:44:17+00:00"
+            "time": "2026-06-08T15:29:31+00:00"
         },
         {
             "name": "jean85/pretty-package-versions",
@@ -20193,7 +20193,7 @@
         "ext-openssl": "*",
         "ext-zip": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1",
         "ext-ldap": "0",



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a29514351bb0799c1caf555de43f0c1a28bf04eb

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a29514351bb0799c1caf555de43f0c1a28bf04eb
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs