fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvement in send case notes and routing notifications related to bug 14273

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-04-15 13:19:29 -04:00
committed by Erik Amaru Ortiz
parent db4cb61e62
commit 2f67b30de9
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/classes/class.case.php
View File

@@ -4882,21 +4882,13 @@ class Cases
$hasEmailFrom = preg_match('/(.+)@(.+)\.(.+)/', $sFrom, $match); $hasEmailFrom = preg_match('/(.+)@(.+)\.(.+)/', $sFrom, $match);
if (!$hasEmailFrom || ($aConfiguration["MESS_ACCOUNT"] != '' && strpos($sFrom, $aConfiguration["MESS_ACCOUNT"]) === false)) { if (!$hasEmailFrom || ($aConfiguration["MESS_ACCOUNT"] != '' && strpos($sFrom, $aConfiguration["MESS_ACCOUNT"]) === false)) {
if (($aConfiguration['MESS_ENGINE'] != 'MAIL') && ($aConfiguration['MESS_ACCOUNT'] != '')) { if (trim($aConfiguration["MESS_ACCOUNT"]) != "") {
$sFrom .= ' <' . $aConfiguration['MESS_ACCOUNT'] . '>'; $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aConfiguration["MESS_ACCOUNT"] . ">";
} else { } else {
if (($aConfiguration['MESS_ENGINE'] == 'MAIL')) { if ($aConfiguration["MESS_ENGINE"] == "MAIL" && $sFrom != '') {
$sFrom .= ' <info@' . gethostbyaddr('127.0.0.1') . '>'; $sFrom = "\"" . stripslashes($sFrom) . "\"";
} else { } else {
if ($aConfiguration['MESS_SERVER'] != '') { $sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
if (($sAux = @gethostbyaddr($aConfiguration['MESS_SERVER']))) {
$sFrom .= ' <info@' . $sAux . '>';
} else {
$sFrom .= ' <info@' . $aConfiguration['MESS_SERVER'] . '>';
}
} else {
$sFrom .= ' <info@processmaker.com>';
}
} }
} }
} }

20
workflow/engine/classes/model/AppNotes.php
View File

@@ -206,22 +206,14 @@ class AppNotes extends BaseAppNotes
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match ); $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
if (! $hasEmailFrom || strpos( $sFrom, $aConfiguration['MESS_ACCOUNT'] ) === false) { if (!$hasEmailFrom || ($aConfiguration["MESS_ACCOUNT"] != '' && strpos($sFrom, $aConfiguration["MESS_ACCOUNT"]) === false)) {
if (($aConfiguration['MESS_ENGINE'] != 'MAIL') && ($aConfiguration['MESS_ACCOUNT'] != '')) { if (trim($aConfiguration["MESS_ACCOUNT"]) != "") {
$sFrom .= ' <' . $aConfiguration['MESS_ACCOUNT'] . '>'; $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aConfiguration["MESS_ACCOUNT"] . ">";
} else { } else {
if (($aConfiguration['MESS_ENGINE'] == 'MAIL')) { if ($aConfiguration["MESS_ENGINE"] == "MAIL" && $sFrom != '') {
$sFrom .= ' <info@' . gethostbyaddr( '127.0.0.1' ) . '>'; $sFrom = "\"" . stripslashes($sFrom) . "\"";
} else { } else {
if ($aConfiguration['MESS_SERVER'] != '') { $sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
if (($sAux = @gethostbyaddr( $aConfiguration['MESS_SERVER'] ))) {
$sFrom .= ' <info@' . $sAux . '>';
} else {
$sFrom .= ' <info@' . $aConfiguration['MESS_SERVER'] . '>';
}
} else {
$sFrom .= ' <info@processmaker.com>';
}
} }
} }
} }