lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe

Browse Source 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/theme/eldy/global.inc.php
	htdocs/theme/eldy/info-box.inc.php
This commit is contained in:
Laurent Destailleur 2021-05-11 21:02:27 +02:00
commit dc2c5aa0a8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/mailing/card.php
View File

@ -211,6 +211,7 @@ if (empty($reshook)) {
$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter) $substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" width="1" height="1" style="width:1px;height:1px" border="0"/>'; $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>'; $substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid;
$onlinepaymentenabled = 0; $onlinepaymentenabled = 0;
if (!empty($conf->paypal->enabled)) { if (!empty($conf->paypal->enabled)) {

2
htdocs/theme/eldy/global.inc.php
View File

@ -48,6 +48,7 @@
--amountremaintopaybackcolor:none; --amountremaintopaybackcolor:none;
--productlinestockod: #002200; --productlinestockod: #002200;
--productlinestocktoolow: #884400; --productlinestocktoolow: #884400;
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
} }
<?php <?php
@ -93,6 +94,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
--amountremaintopaycolor:rgb(252,84,91); --amountremaintopaycolor:rgb(252,84,91);
--amountpaymentcomplete:rgb(101,184,77); --amountpaymentcomplete:rgb(101,184,77);
--amountremaintopaybackcolor:rbg(245,130,46); --amountremaintopaybackcolor:rbg(245,130,46);
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #000, #000, #000, #274231);
} }
body, button { body, button {

4
htdocs/theme/eldy/info-box.inc.php
View File

@ -189,8 +189,8 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
margin-left: 80px; margin-left: 80px;
} }
.info-box-sm .info-box-module-enabled { .info-box-sm .info-box-module-enabled {
/* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */ /* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */
background: linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8); background: var(--infoboxmoduleenabledbgcolor);
} }
.info-box-content-warning span.font-status4 { .info-box-content-warning span.font-status4 {
color: #bc9526 !important; color: #bc9526 !important;