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

Merged in bugfix/HOR-4619 (pull request #6504)

Browse Source 
HOR-4619

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-06-05 18:19:28 +00:00
committed by Julio Cesar Laura Avendaño
parent 075dc69557 2ae4390f29
commit b2b67e692c
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,9 +115,10 @@ class FilesManager
'prf_content' => $fcontent,
'prf_derivation_screen' => $derivationScreen);
} else {
$extention = end(explode(".", $aFile['FILE']));
if ($extention == 'docx' || $extention == 'doc' || $extention == 'html' || $extention == 'php' || $extention == 'jsp'
|| $extention == 'xlsx' || $extention == 'xls' || $extention == 'js' || $extention == 'css' || $extention == 'txt') {
$explodeExt = explode(".", $aFile['FILE']);
$extension = end($explodeExt);
if ($extension == 'docx' || $extension == 'doc' || $extension == 'html' || $extension == 'php' || $extension == 'jsp'
|| $extension == 'xlsx' || $extension == 'xls' || $extension == 'js' || $extension == 'css' || $extension == 'txt') {
$editable = 'true';
} else {
$editable = 'false';
@@ -374,10 +375,12 @@ class FilesManager
$extention = '.html';
$_FILES['prf_file']['name'] = $_FILES['prf_file']['name'].$extention;
}
$file = end(explode("/",$path));
$explodePath = explode("/", $path);
$file = end($explodePath);
if(strpos($file,"\\") > 0) {
$file = str_replace('\\', '/', $file);
$file = end(explode("/",$file));
$explodeFile = explode("/", $file);
$file = end($explodeFile);
}
$path = str_replace($file,'',$path);
if ($file == $_FILES['prf_file']['name']) {
@@ -555,12 +558,13 @@ class FilesManager
$relationshipEmailEvent = true;
$rsCriteria->next();
}
$explodePath = explode(DIRECTORY_SEPARATOR,$path);
if ($relationshipEmailEvent && !$verifyingRelationship) {
throw new \Exception(\G::LoadTranslation(G::LoadTranslation('ID_CANNOT_REMOVE_TEMPLATE_EMAIL_EVENT',
array(end(explode(DIRECTORY_SEPARATOR,$path))))));
[end($explodePath)])));
}
$sFile = end(explode(DIRECTORY_SEPARATOR,$path));
$sFile = end($explodePath);
$path = PATH_DATA_MAILTEMPLATES.$sProcessUID.DIRECTORY_SEPARATOR.$sFile;
if (file_exists($path) && !is_dir($path)) {
@@ -604,7 +608,8 @@ class FilesManager
if ($path == '') {
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('prf_uid')));
}
$sFile = end(explode("/",str_replace('\\', '/',$path)));
$explodePath = explode("/",str_replace('\\', '/',$path));
$sFile = end($explodePath);
$sPath = str_replace($sFile,'',$path);
$sSubDirectory = substr(str_replace($sProcessUID,'',substr($sPath,(strpos($sPath, $sProcessUID)))),0,-1);
$sMainDirectory = str_replace(substr($sPath, strpos($sPath, $sProcessUID)),'', $sPath);
@@ -635,7 +640,8 @@ class FilesManager
public function deleteFolderProcessFilesManager($sProcessUID, $path)
{
try {
$sDirToDelete = end(explode("/",$path));
$explodePath = explode("/",$path);
$sDirToDelete = end($explodePath);
$sPath = str_replace($sDirToDelete,'',$path);
$sSubDirectory = substr(str_replace($sProcessUID,'',substr($sPath,(strpos($sPath, $sProcessUID)))),0,-1);
$sMainDirectory = current(explode("/", $path));