Merged in release/3.2.3 (pull request #6506)

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
17 changed files with 159 additions and 324 deletions

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);
}