fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #2165 from julceslauhub/master

Browse Source 
Add some validations when Email configuration is empty
This commit is contained in:
julceslauhub
2013-11-26 07:57:46 -08:00
parent 5783af2b51 1f3f36f93c
commit 6c60a1a8e0
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.spool.php
View File

@@ -278,7 +278,7 @@ class spoolRun
$this->fileData['from_name'] = ''; $this->fileData['from_name'] = '';
$this->fileData['from_email'] = $matches[0]; $this->fileData['from_email'] = $matches[0];
} }
// Set reply to // Set reply to
preg_match( $this->longMailEreg, $this->fileData['from_name'], $matches ); preg_match( $this->longMailEreg, $this->fileData['from_name'], $matches );
if (isset($matches[3])) { if (isset($matches[3])) {
@@ -566,7 +566,10 @@ class spoolRun
$aConfiguration = $oConfiguration->load( "Emails", "", "", "", "" ); $aConfiguration = $oConfiguration->load( "Emails", "", "", "", "" );
$aConfiguration = unserialize( $aConfiguration["CFG_VALUE"] ); $aConfiguration = unserialize( $aConfiguration["CFG_VALUE"] );
$passwd = $aConfiguration["MESS_PASSWORD"]; if (!isset($aConfiguration["MESS_ENABLED"])) {
$aConfiguration["MESS_ENABLED"] = 0;
}
$passwd = isset($aConfiguration["MESS_PASSWORD"]) ? $aConfiguration["MESS_PASSWORD"] : '';
$passwdDec = G::decrypt( $passwd, "EMAILENCRYPT" ); $passwdDec = G::decrypt( $passwd, "EMAILENCRYPT" );
$auxPass = explode( "hash:", $passwdDec ); $auxPass = explode( "hash:", $passwdDec );