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

HOR-916

Browse Source
This commit is contained in:
Paula V. Quispe
2016-05-04 16:34:40 -04:00
parent 8e20cfb4c9
commit 045e02c784
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/class.processes.php
View File

@@ -4213,6 +4213,7 @@ class Processes
$filesManager = new \ProcessMaker\BusinessModel\FilesManager(); $filesManager = new \ProcessMaker\BusinessModel\FilesManager();
foreach ($arrayData as $value) { foreach ($arrayData as $value) {
$value['PRF_PATH'] = str_replace("\\","/" , $value['PRF_PATH']);
$filesManager->addProcessFilesManagerInDb($value); $filesManager->addProcessFilesManagerInDb($value);
} }
} catch (Exception $e) { } catch (Exception $e) {

25
workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
View File

@@ -259,14 +259,10 @@ class FilesManager
$oProcessFiles->fromArray($aData, \BasePeer::TYPE_FIELDNAME); $oProcessFiles->fromArray($aData, \BasePeer::TYPE_FIELDNAME);
$path = $aData['PRF_PATH']; $path = $aData['PRF_PATH'];
$backPointer = 3;
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$backPointer = 5;
$path = str_replace("/", DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR, $path);
}
$path = explode(DIRECTORY_SEPARATOR,$path); $allDirectories = pathinfo($path);
$fileDirectory = $path[count($path)-$backPointer]; $path = explode('/',$allDirectories['dirname']);
$fileDirectory = $path[count($path)-2];
switch ($fileDirectory) { switch ($fileDirectory) {
case 'mailTemplates': case 'mailTemplates':
@@ -276,7 +272,10 @@ class FilesManager
$sDirectory = PATH_DATA_PUBLIC . $aData['PRO_UID'] . PATH_SEP . basename($aData['PRF_PATH']); $sDirectory = PATH_DATA_PUBLIC . $aData['PRO_UID'] . PATH_SEP . basename($aData['PRF_PATH']);
break; break;
default: default:
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($aData['PRF_PATH']))); if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
error_log(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($aData['PRF_PATH'])));
}
return;
break; break;
} }
@@ -501,10 +500,10 @@ class FilesManager
{ {
try { try {
$path = ''; $path = '';
$criteria = new \Criteria("workflow"); $criteriaPf = new \Criteria("workflow");
$criteria->addSelectColumn(\ProcessFilesPeer::PRF_PATH); $criteriaPf->addSelectColumn(\ProcessFilesPeer::PRF_PATH);
$criteria->add(\ProcessFilesPeer::PRF_UID, $prfUid, \Criteria::EQUAL); $criteriaPf->add(\ProcessFilesPeer::PRF_UID, $prfUid, \Criteria::EQUAL);
$rsCriteria = \ProcessFilesPeer::doSelectRS($criteria); $rsCriteria = \ProcessFilesPeer::doSelectRS($criteriaPf);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next(); $rsCriteria->next();
while ($aRow = $rsCriteria->getRow()) { while ($aRow = $rsCriteria->getRow()) {
@@ -544,7 +543,7 @@ class FilesManager
} }
} }
$rs = \ProcessFilesPeer::doDelete($criteria); $rs = \ProcessFilesPeer::doDelete($criteriaPf);
} catch (Exception $e) { } catch (Exception $e) {
throw $e; throw $e;
} }