From 7156f0b09c0687e067639b1af327acd324e46828 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Fri, 13 Sep 2024 11:40:12 -0400
Subject: [PATCH] * Fri Sep 13 2024 Jean-Philippe Pialasse <jpp@koozali.org>
 1.0.1-2.sme - apply pull request to fix PHP Warning  
 https://github.com/corbosman/message_highlight/pull/27

---
 pr27.patch                              | 12 ++++++++++++
 roundcube-plugin-message_highlight.spec | 14 +++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 pr27.patch

diff --git a/pr27.patch b/pr27.patch
new file mode 100644
index 0000000..2c9704e
--- /dev/null
+++ b/pr27.patch
@@ -0,0 +1,12 @@
+diff -Nur message_highlight-1.0.1.ori/message_highlight.php message_highlight-1.0.1/message_highlight.php
+--- message_highlight-1.0.1.ori/message_highlight.php	2020-07-16 01:56:38.000000000 -0400
++++ message_highlight-1.0.1/message_highlight.php	2024-09-13 11:27:15.693000000 -0400
+@@ -49,7 +49,7 @@
+    */
+   function storage_init($p)
+   {
+-    $p['fetch_headers'] .= trim($p['fetch_headers']. ' ' . 'CC');
++    $p['fetch_headers'] = trim(($p['fetch_headers'] ?? '') . ' ' . 'CC');
+     return($p);
+   }
+ 
diff --git a/roundcube-plugin-message_highlight.spec b/roundcube-plugin-message_highlight.spec
index 5732ec6..c826960 100644
--- a/roundcube-plugin-message_highlight.spec
+++ b/roundcube-plugin-message_highlight.spec
@@ -1,12 +1,13 @@
 %define name roundcube-plugin-message_highlight
 %define version 1.0.1
-%define release 1
+%define release 2
 Summary: Provides context Menu to Roundcube.
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
-#https://github.com/corbosman/message_highlight
+#https://github.com/corbosman/message_highlight and https://github.com/texxasrulez/message_highlight
 Source: roundcube-message_highlight-%{version}.tar.gz
+Patch0: pr27.patch
 License: GNU General Public License Version 3+
 Group: SMEserver/addon
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -25,15 +26,21 @@ folder manipulation and message filters.
 With this plugin you can colorize the message index rows based on specific criteria like sender, recipient and subject.
 
 %changelog
+* Fri Sep 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0.1-2.sme
+- apply pull request to fix PHP Warning 
+  https://github.com/corbosman/message_highlight/pull/27
+
 * Wed Sep 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0.1-1.sme
 - initial release for SME 11
 
 %prep
 
 %setup -q -n message_highlight-%{version}
+%patch0 -p1
 
 %build
 #perl createlinks
+#pr 27
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,9 +49,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/roundcubemail/plugins/message_highlight/
 rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
 > %{name}-%{version}-filelist
-#echo "%doc COPYING"  >> %{name}-%{version}-filelist
-#--dir <dir> 'attr(755,user,grp)' \
-#--file <file> 'attr(755,root,root)' \
 
 %clean
 cd ..