From 16ffc3973545ae5193f2f232262c6d1cfd110bc2 Mon Sep 17 00:00:00 2001 From: lamrani abdelwadoud Date: Wed, 26 Jun 2024 18:01:00 +0200 Subject: [PATCH] New update for templateMail by creating files (#30151) Co-authored-by: Laurent Destailleur --- htdocs/core/lib/emaillayout.lib.php | 132 ++---------------- .../doctemplates/maillayout/basic.html | 10 ++ .../doctemplates/maillayout/commerce.html | 26 ++++ .../doctemplates/maillayout/empty.html | 4 + .../install/doctemplates/maillayout/news.html | 24 ++++ 5 files changed, 77 insertions(+), 119 deletions(-) create mode 100644 htdocs/install/doctemplates/maillayout/basic.html create mode 100644 htdocs/install/doctemplates/maillayout/commerce.html create mode 100644 htdocs/install/doctemplates/maillayout/empty.html create mode 100644 htdocs/install/doctemplates/maillayout/news.html diff --git a/htdocs/core/lib/emaillayout.lib.php b/htdocs/core/lib/emaillayout.lib.php index 1502d9266b8..2d60a8bbbfb 100644 --- a/htdocs/core/lib/emaillayout.lib.php +++ b/htdocs/core/lib/emaillayout.lib.php @@ -32,129 +32,23 @@ function getHtmlOfLayout($name) { global $conf, $mysoc, $user, $langs; - $substitutionarray = getCommonSubstitutionArray($langs); + $commonSubstitutionArray = getCommonSubstitutionArray($langs); - // TODO Read template from a file "install/doctemplates/maillayout/xxx.html" + $specificSubstitutionArray = array( + '__LOGO_URL__' => !empty($mysoc->logo) && dol_is_file($conf->mycompany->dir_output.'/logos/'.$mysoc->logo) ? DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo) : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC', + '__TITLEOFMAILHOLDER__' => $langs->trans('TitleOfMailHolder'), + '__CONTENOFMAILHOLDER__' => $langs->trans('ContentOfMailHolder'), + '__USERSIGNATURE__' => !empty($user->signature) ? dol_htmlentities($user->signature) : '', + '__GRAY_RECTANGLE__' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC', + ); - if ($name == 'basic') { - $out = ' -
-
'; - $logo = ''; - if (!empty($mysoc->logo) && dol_is_file($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) { - $logo = $mysoc->logo; - } elseif (!empty($mysoc->logo_squarred) && dol_is_file($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred)) { - $logo = $mysoc->logo_squarred; - } - if (!empty($logo)) { - $out .= ''; - } else { - $out .= 'Gray rectangle'; - } - $out .= '
-

'.$langs->trans('TitleOfMailHolder').'

- '; - if (!(empty($user->signature))) { - $out .= '

'.dol_htmlentities($user->signature).'

'; - } - $out .= '
'; - } elseif ($name == 'news') { - $out = ' -

Lorem, ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur

-

Lorem, ipsum dolor sit amet consectetur adipisicing elitsit amet consectetur adipisicing

+ $substitutionarray = array_merge($commonSubstitutionArray, $specificSubstitutionArray); -
-
-

Lorem ipsum dolor sit amet, consectetur Lorem ipsum dolor sit amet, consectetur

+ $templatePath = DOL_DOCUMENT_ROOT . '/install/doctemplates/maillayout/'; - Lorem ipsum dolor sit amet, consectetur - adipiscing elit. Sed do eiusmod temxwshslkdsdsslpor incididunt ut labore et dolore magna
aliqua. Lorem, ipsum dolor sit amet consectetur adipisicing elit. Totam sit
autem nihil omnis! Odit ipsum repellat, voluptas accusantium dolores adipisci ut voluptates eius cumque dicta obcaecati - Gray rectangle - -
-
- - Gray rectangle -
-
- -
-
-

Lorem ipsum dolor sit amet, consectetur Lorem ipsum dolor sit amet, consectetur

- - Lorem ipsum dolor sit amet, consectetur - adipiscing elit. Sed do eiusmod temxwshslkdsdsslpor incididunt ut labore et dolore magna
aliqua. Lorem, ipsum dolor sit amet consectetur adipisicing elit. Totam sit
autem nihil omnis! Odit ipsum repellat, voluptas accusantium dolores adipisci ut voluptates eius cumque dicta obcaecati - Gray rectangle - -
-
- - Gray rectangle -
-
'; - } elseif ($name == 'commerce') { - $out = ' -

Lorem, ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur

-

Lorem, ipsum dolor sit amet consectetur adipisicing elitsit amet consectetur adipisicing

- -
-
-
-
- Gray rectangle -
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit
Lorem ipsum dolor sit amet, consectetur adipiscing elit... -
-
- -

-
-
- Gray rectangle -
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit
Lorem ipsum dolor sit amet, consectetur adipiscing elit... -
-
-
-
-
-
- Gray rectangle -
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit
Lorem ipsum dolor sit amet, consectetur adipiscing elit... -
-
- -

-
-
- Gray rectangle -
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit
Lorem ipsum dolor sit amet, consectetur adipiscing elit... -
-
-
-
- '; - } elseif ($name == 'text') { - $out = ' -

Lorem ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur adipisicing elit.

-

Lorem ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur adipisicing elit.

-

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore. - Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore. - Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore. - Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore. - Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore. - Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore. - Lorem ipsum dolor sit amet consectetur adipisicing elit. Commodi impedit molestias voluptatibus. Natus nulla sint totam illo? Hic name consequuntur id harum pariatur, quo illo quaerat minima tempore. -

'; + $templateFile = $templatePath . $name . '.html'; + if (file_exists($templateFile)) { + $out = file_get_contents($templateFile); } else { $out = ''; } diff --git a/htdocs/install/doctemplates/maillayout/basic.html b/htdocs/install/doctemplates/maillayout/basic.html new file mode 100644 index 00000000000..a40bcb83ebd --- /dev/null +++ b/htdocs/install/doctemplates/maillayout/basic.html @@ -0,0 +1,10 @@ +
+
+ +
+

__TITLEOFMAILHOLDER__

+ +

__USERSIGNATURE__

+
diff --git a/htdocs/install/doctemplates/maillayout/commerce.html b/htdocs/install/doctemplates/maillayout/commerce.html new file mode 100644 index 00000000000..956417c26d2 --- /dev/null +++ b/htdocs/install/doctemplates/maillayout/commerce.html @@ -0,0 +1,26 @@ +

Lorem, ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur

+

Lorem, ipsum dolor sit amet consectetur adipisicing elitsit amet consectetur adipisicing

+ +
+
+
+
+ Gray rectangle +
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit
Lorem ipsum dolor sit amet, consectetur adipiscing elit... +
+
+ +
+
+ Gray rectangle +
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit
Lorem ipsum dolor sit amet, consectetur adipiscing elit... +
+
+
+ +
+
+
+ +
diff --git a/htdocs/install/doctemplates/maillayout/news.html b/htdocs/install/doctemplates/maillayout/news.html new file mode 100644 index 00000000000..fd02abeec49 --- /dev/null +++ b/htdocs/install/doctemplates/maillayout/news.html @@ -0,0 +1,24 @@ +

Lorem, ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur

+

Lorem, ipsum dolor sit amet consectetur adipisicing elitsit amet consectetur adipisicing

+ +
+
+

Lorem ipsum dolor sit amet, consectetur Lorem ipsum dolor sit amet, consectetur

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod temxwshslkdsdsslpor incididunt ut labore et dolore magna aliqua. Lorem, ipsum dolor sit amet consectetur adipisicing elit. Totam sit autem nihil omnis! Odit ipsum repellat, voluptas accusantium dolores adipisci ut voluptates eius cumque dicta obcaecati +
created by : __USER_FULLNAME__ +
+
+ Gray rectangle +
+
+ +
+
+

Lorem ipsum dolor sit amet, consectetur Lorem ipsum dolor sit amet, consectetur

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod temxwshslkdsdsslpor incididunt ut labore et dolore magna aliqua. Lorem, ipsum dolor sit amet consectetur adipisicing elit. Totam sit autem nihil omnis! Odit ipsum repellat, voluptas accusantium dolores adipisci ut voluptates eius cumque dicta obcaecati +
created by : __USER_FULLNAME__ +
+
+ Gray rectangle +
+