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

Add validation for old configurations to avoid notices

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-04-30 09:59:09 -04:00
parent dfc1fcb5f4
commit 715b9e73b6
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gulliver/system/class.g.php
View File

@@ -5271,6 +5271,12 @@ class G
} }
public static function buildFrom($configuration, $from = '') { public static function buildFrom($configuration, $from = '') {
if (!isset($configuration['MESS_FROM_NAME'])) {
$configuration['MESS_FROM_NAME'] = '';
}
if (!isset($configuration['MESS_FROM_MAIL'])) {
$configuration['MESS_FROM_MAIL'] = '';
}
if ($from != '') { if ($from != '') {
if (!preg_match('/(.+)@(.+)\.(.+)/', $from, $match)) { if (!preg_match('/(.+)@(.+)\.(.+)/', $from, $match)) {
if ($configuration['MESS_FROM_MAIL'] != '') { if ($configuration['MESS_FROM_MAIL'] != '') {

9
workflow/engine/classes/class.spool.php
View File

@@ -194,6 +194,15 @@ class spoolRun
$aConfig['MESS_RAUTH'] = 0; $aConfig['MESS_RAUTH'] = 0;
} }
$aConfig['SMTPAuth'] = $aConfig['MESS_RAUTH']; $aConfig['SMTPAuth'] = $aConfig['MESS_RAUTH'];
// Validating for old configurations
if (!isset($aConfig['MESS_FROM_NAME'])) {
$aConfig['MESS_FROM_NAME'] = '';
}
if (!isset($aConfig['MESS_FROM_MAIL'])) {
$aConfig['MESS_FROM_MAIL'] = '';
}
$this->config = $aConfig; $this->config = $aConfig;
} }