fernando/luos
1
0
Fork 0
Code Releases Activity

Merged 3.0.1.8 into MT-10

Browse Source
This commit is contained in:
Gustavo Cruz
2016-03-18 14:30:05 -04:00
parent bb06effad9 be25df3cdd
commit 35d9162323
10 changed files with 852 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/src/ProcessMaker/BusinessModel/BpmnProcess.php Normal file
View File

@@ -0,0 +1,32 @@
<?php
namespace ProcessMaker\BusinessModel;
class BpmnProcess
{
/**
* Update all processes data by project uid
* @param $prjUid
* @param $data
* @throws \PropelException
*/
public function updateAllProcessesByProject($prjUid, $data)
{
$oCriteria = new \Criteria();
$oCriteria->addSelectColumn(\BpmnProcessPeer::PRO_UID);
$oCriteria->add(\BpmnProcessPeer::PRJ_UID, $prjUid);
$rs = \BpmnProcessPeer::doSelectRS($oCriteria);
$rs->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if (!empty($data['PRO_UID'])) {
unset($data['PRO_UID']);
}
while ($rs->next()) {
$row = $rs->getRow();
$project = \BpmnProcessPeer::retrieveByPK($row['PRO_UID']);
if (!empty($project)) {
$project->fromArray($data, \BasePeer::TYPE_FIELDNAME);
$project->save();
}
}
}
}

13
workflow/engine/src/ProcessMaker/BusinessModel/BpmnProject.php Normal file
View File

@@ -0,0 +1,13 @@
<?php
namespace ProcessMaker\BusinessModel;
class BpmnProject
{
public function update($prj_uid, $data)
{
$project = \BpmnProjectPeer::retrieveByPK($prj_uid);
$project->fromArray($data, \BasePeer::TYPE_FIELDNAME);
$project->save();
}
}

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

@@ -874,24 +874,26 @@ class EmailServer
try {
$emailServer = \EmailServerPeer::retrieveByPK($emailServerUid);
$passwd = $arrayData["MESS_PASSWORD"];
$passwdDec = \G::decrypt($passwd, "EMAILENCRYPT");
$auxPass = explode("hash:", $passwdDec);
if (isset($arrayData['MESS_PASSWORD'])) {
$passwd = $arrayData['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);
if (count($auxPass) > 1) {
if (count($auxPass) == 2) {
$passwd = $auxPass[1];
} else {
array_shift($auxPass);
$passwd = implode('', $auxPass);
}
}
}
$arrayData["MESS_PASSWORD"] = $passwd;
$arrayData['MESS_PASSWORD'] = $passwd;
if ($arrayData["MESS_PASSWORD"] != "") {
$arrayData["MESS_PASSWORD"] = "hash:" . $arrayData["MESS_PASSWORD"];
$arrayData["MESS_PASSWORD"] = \G::encrypt($arrayData["MESS_PASSWORD"], "EMAILENCRYPT");
if ($arrayData['MESS_PASSWORD'] != '') {
$arrayData['MESS_PASSWORD'] = 'hash:' . $arrayData['MESS_PASSWORD'];
$arrayData['MESS_PASSWORD'] = \G::encrypt($arrayData['MESS_PASSWORD'], 'EMAILENCRYPT');
}
}
$emailServer->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);

6
workflow/engine/src/ProcessMaker/BusinessModel/Process.php
View File

@@ -562,6 +562,12 @@ class Process
$this->throwExceptionIfNotExistsUser($arrayData["PRO_CREATE_USER"], $this->arrayFieldNameForException["processCreateUser"]);
}
//Update name in table Bpmn_Project and Bpmn_Process
$oProject = new BpmnProject();
$oProject->update($processUid, array('PRJ_NAME'=>$arrayData['PRO_TITLE']));
$oProcess = new BpmnProcess();
//The relationship Bpmn_Project with Bpmn_Process is 1:n
$oProcess->updateAllProcessesByProject($processUid, array('PRO_NAME'=>$arrayData['PRO_TITLE']));
//Update
$process = new \Process();