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

Merged in dheeyi/processmaker/MT-131 (pull request #4131)

Browse Source 
MT-131
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-21 19:51:04 -04:00
parent a92ca4a65b 55b3cccfe8
commit 43f9dcc7cd
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/methods/processes/processes_Import_Ajax.php
View File

@@ -124,11 +124,16 @@ if (isset($_FILES["PROCESS_FILENAME"]) && (pathinfo($_FILES["PROCESS_FILENAME"][
$opt2 = XmlImporter::GROUP_IMPORT_OPTION_CREATE_NEW;
$prjUid = '';
$proType = '';
$data = $importer->load();
if (version_compare($data['version'], '3.0', '>') && pathinfo($_FILES["PROCESS_FILENAME"]["name"],
PATHINFO_EXTENSION) == "pmx"
) {
die(G::LoadTranslation("ID_IMPORTER_ERROR_FILE_INVALID_TYPE_OR_CORRUPT_DATA"));
}
/*----------------------------------********---------------------------------*/
$granularImport = false;
$objectsToImport = '';
$data = $importer->load();
if (version_compare($data['version'], '3.0', '>')) {
$objectsToImport = [];
$objects = (isset($data['objects'])) ? explode('|', $data['objects']) : "";
@@ -254,11 +259,14 @@ if (isset($_POST["PRO_FILENAME"]) &&
$importer = new XmlImporter();
$importer->setData("usr_uid", $_SESSION["USER_LOGGED"]);
$importer->setSourceFile(PATH_DOCUMENT . "input" . PATH_SEP . $_POST["PRO_FILENAME"]);
$data = $importer->load();
if (version_compare($data['version'], '3.0', '>') && pathinfo(PATH_DOCUMENT . "input" .
PATH_SEP . $_POST["PRO_FILENAME"], PATHINFO_EXTENSION) == "pmx") {
die(G::LoadTranslation( "ID_IMPORTER_ERROR_FILE_INVALID_TYPE_OR_CORRUPT_DATA" ));
}
try {
/*----------------------------------********---------------------------------*/
$objectsToImport = '';
$data = $importer->load();
// only uploadFileNewProcessExist
if (version_compare($data['version'], '3.0', '>') && isset($_POST['objectsToImport']) && $_POST['objectsToImport'] === '' && $_POST['IMPORT_OPTION']==="1") {
$objectImport = (isset($data['objects'])) ? explode('|', $data['objects']) : "";