may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravek podpisa pri novem designu emailov

Browse Source
This commit is contained in:
pero1203 2021-02-01 09:05:54 +01:00
parent 3bd75bf915
commit b558b698ca
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/classes/class.Common.php
View File

@ -2149,8 +2149,6 @@ class Common {
public static function getEmailSignature($lang_id = 0){ public static function getEmailSignature($lang_id = 0){
global $lang; global $lang;
global $app_settings; global $app_settings;
return '';
if(isset($app_settings['email_signature_custom']) && $app_settings['email_signature_custom'] == 1){ if(isset($app_settings['email_signature_custom']) && $app_settings['email_signature_custom'] == 1){
$signature = '<br /><br /><br />'.$app_settings['email_signature_text']; $signature = '<br /><br /><br />'.$app_settings['email_signature_text'];

8
admin/survey/classes/objects/obj.MailAdapter.php
View File

@ -717,6 +717,9 @@ class MailAdapter{
return; return;
} }
// Najprej pocistimo signature
$signature = Common::getEmailSignature();
$content = str_replace($signature, "", $content);
// Logo // Logo
$logo_src = ($lang['id'] == '1') ? 'https://www.1ka.si/public/img/logo/1ka_slo.png' : 'https://www.1ka.si/public/img/logo/1ka_eng.png'; $logo_src = ($lang['id'] == '1') ? 'https://www.1ka.si/public/img/logo/1ka_slo.png' : 'https://www.1ka.si/public/img/logo/1ka_eng.png';
@ -737,10 +740,7 @@ class MailAdapter{
//$button = array('url'=>'https://1ka.si', 'text'=>'Gumbek'); //$button = array('url'=>'https://1ka.si', 'text'=>'Gumbek');
$button_html = ($button != '') ? '<tr><td align="center"><a href="'.$button['url'].'" style="text-decoration:none"><p style="font-family: Montserrat,sans-serif; font-size: 18px; padding: 20px 0 20px 0;text-align:center;background-color:#1e88e5;color:white;">'.$button['text'].'</p></a></td></tr>' : ''; $button_html = ($button != '') ? '<tr><td align="center"><a href="'.$button['url'].'" style="text-decoration:none"><p style="font-family: Montserrat,sans-serif; font-size: 18px; padding: 20px 0 20px 0;text-align:center;background-color:#1e88e5;color:white;">'.$button['text'].'</p></a></td></tr>' : '';
// Podpis
$signature_html = '<tr><td style="color: #153643; font-family: Montserrat,sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;"><p style="margin: 0;">'.$lang['srv_1ka_mail_signature_bye'].'</p></td></tr>';
$designed_content = ' $designed_content = '
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB">