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

Merge pull request #1988 from luisfernandosl/BUG-12439

Browse Source 
BUG 12439 "Actions by email: No manda la manda la notificacion" SOLVED
This commit is contained in:
julceslauhub
2013-08-20 08:03:06 -07:00
parent a41abc0447 a8999ea703
commit 219bd287b6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.wsBase.php
View File

@@ -971,14 +971,17 @@ class wsBase
}
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields);
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
if (trim($aSetup["MESS_ACCOUNT"]) != "") {
$sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
} else {
$sFrom = "<info@" . $_SERVER["HTTP_HOST"] . ">";
if ($aSetup["MESS_ENGINE"] == "MAIL") {
$sFrom = "\"" . stripslashes($sFrom) . "\"";
} else {
$sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
}
}
}