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

Merged in release/3.2.3 (pull request #6506)

Browse Source 
HOR-4626

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-06-05 20:34:14 +00:00
committed by Julio Cesar Laura Avendaño
parent 6a1d407042 4f06dfa45b
commit e644118682
17 changed files with 159 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
View File

@@ -1271,22 +1271,6 @@ class EmailServer
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$passwd = $row["MESS_PASSWORD"];
$passwdDec = G::decrypt($passwd, "EMAILENCRYPT");
$auxPass = explode("hash:", $passwdDec);
if (count($auxPass) > 1) {
if (count($auxPass) == 2) {
$passwd = $auxPass[1];
} else {
array_shift($auxPass);
$passwd = implode("", $auxPass);
}
}
$row["MESS_PASSWORD"] = $passwd;
$arrayEmailServer[] = $this->getEmailServerDataFromRecord($row);
}

23
workflow/engine/src/ProcessMaker/Services/Api/EmailServer.php
View File

@@ -30,12 +30,19 @@ class EmailServer extends Api
}
/**
* Get List of Emails Servers
*
* @url GET
*
* @param string $filter
* @param int $start
* @param int $limit
* @param int $start
* @param int $limit
*
* @return
* @throws RestException
*
* @access protected
* @class AccessControl {@permission PM_SETUP_EMAIL}
*/
public function index($filter = null, $start = null, $limit = null)
{
@@ -67,11 +74,19 @@ class EmailServer extends Api
}
/**
* Get List of Emails Servers
*
* @url GET /paged
*
* @param string $filter
* @param int $start
* @param int $limit
* @param int $start
* @param int $limit
*
* @return array
* @throws RestException
*
* @access protected
* @class AccessControl {@permission PM_SETUP_EMAIL}
*/
public function doGetPaged($filter = null, $start = null, $limit = null)
{