fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in mcuiza/processmaker/pm3301 (pull request #2703)

Browse Source 
PM-3301
This commit is contained in:
Julio Cesar Laura Avendaño
2015-09-04 11:11:41 -04:00
parent 28e70c0cd3 20c67e2195
commit f5798e1fdf
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
View File

@@ -26,6 +26,8 @@ class EmailEvent
$criteria->clearSelectColumns();
$criteria->addSelectColumn(\UsersPeer::USR_UID);
$criteria->addSelectColumn(\UsersPeer::USR_EMAIL);
$criteria->addAsColumn('UID', 'USR_UID');
$criteria->addAsColumn('EMAIL', 'USR_EMAIL');
$criteria->add(\UsersPeer::USR_STATUS, "ACTIVE");
$result = \UsersPeer::doSelectRS($criteria);
$result->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
@@ -43,6 +45,41 @@ class EmailEvent
}
}
/**
* Get the email server accounts of the current workspace
*
* return array
*/
public function getEmailEventServerAccounts()
{
try {
$criteria = new \Criteria("workflow");
$criteria->clearSelectColumns();
$criteria->addSelectColumn(\EmailServerPeer::MESS_UID);
$criteria->addSelectColumn(\EmailServerPeer::MESS_FROM_MAIL);
$criteria->addSelectColumn(\EmailServerPeer::MESS_ACCOUNT);
$criteria->addAsColumn('UID', 'MESS_UID');
$result = \EmailServerPeer::doSelectRS($criteria);
$result->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$result->next();
$accountsArray = array();
while ($aRow = $result->getRow()) {
if ($aRow['MESS_UID'] != null) {
if($aRow['MESS_FROM_MAIL'] == "") {
$aRow['EMAIL'] = $aRow['MESS_ACCOUNT'];
} else {
$aRow['EMAIL'] = $aRow['MESS_FROM_MAIL'];
}
$accountsArray[] = array_change_key_case($aRow, CASE_LOWER);
}
$result->next();
}
return $accountsArray;
} catch (\Exception $e) {
throw $e;
}
}
/**
* Get the Email-Event data
* @var string $evn_uid. uid for activity