fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Marco Antonio Nina
2014-04-10 08:49:42 -04:00
parent 1cc83738fb 9f5759779d
commit d4c2700c75
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/Maveriks/WebApplication.php
View File

@@ -121,11 +121,15 @@ class WebApplication
}
}
$baseUrl = (empty($input->base_url)) ? $uri : $input->base_url;
foreach($input->calls as $value) {
$_SERVER["REQUEST_METHOD"] = (empty($value->method)) ? 'GET' : $value->method;
$uriTemp = trim($baseUrl) . trim($value->url);
if (strpos($uriTemp, '?') !== false) {
$dataGet = explode('?', $uriTemp);
parse_str($dataGet[1], $get);
$_GET = array_merge($_GET, $get);
}
$inputExecute = (empty($value->data)) ? '' : json_encode($value->data);
$this->responseMultipart[] = $this->dispatchApiRequest($uriTemp, $version, true, $inputExecute);
}

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

@@ -21,13 +21,16 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
use ProcessMaker\Importer\XmlImporter;
ini_set( 'max_execution_time', '0' );
if (isset($_FILES["PROCESS_FILENAME"])) {
$ext = pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION);
if ($ext == "pmx") {
$importer = new \ProcessMaker\Importer\XmlImporter();
$importer = new XmlImporter();
$importer->setData("usr_uid", $_SESSION['USER_LOGGED']);
$importer->setSaveDir(PATH_DOCUMENT . 'input');
$importer->setSourceFromGlobals("PROCESS_FILENAME");
@@ -50,7 +53,7 @@ if (isset($_FILES["PROCESS_FILENAME"])) {
"ExistProcessInDatabase" => 1,
"ExistGroupsInDatabase" => 0,
"groupBeforeAccion" => "uploadFileNewProcess",
"sNewProUid" => "63626727053359dabb8fee8019503780",
"sNewProUid" => "",
"proFileName" => $_FILES['PROCESS_FILENAME']['name'],
"project_type" => "bpmn"
);
@@ -62,22 +65,33 @@ if (isset($_FILES["PROCESS_FILENAME"])) {
} elseif (isset($_POST["PRO_FILENAME"]) && file_exists(PATH_DOCUMENT . 'input' . PATH_SEP . $_POST["PRO_FILENAME"])) {
switch ($_POST["IMPORT_OPTION"]) {
case 1: $option = ProcessMaker\Importer\XmlImporter::IMPORT_OPTION_OVERWRITE; break;
case 2: $option = ProcessMaker\Importer\XmlImporter::IMPORT_OPTION_DISABLE_AND_CREATE_NEW; break;
case 3: $option = ProcessMaker\Importer\XmlImporter::IMPORT_OPTION_CREATE_NEW; break;
case 1: $option = XmlImporter::IMPORT_OPTION_OVERWRITE; break;
case 2: $option = XmlImporter::IMPORT_OPTION_DISABLE_AND_CREATE_NEW; break;
case 3: $option = XmlImporter::IMPORT_OPTION_CREATE_NEW; break;
}
$importer = new ProcessMaker\Importer\XmlImporter();
$importer = new XmlImporter();
$importer->setData("usr_uid", $_SESSION['USER_LOGGED']);
$importer->setSourceFile(PATH_DOCUMENT . 'input' . PATH_SEP . $_POST["PRO_FILENAME"]);
try {
$res = $importer->import($option);
} catch (\Exception $e) {
die($e->getMessage());
$result = array(
"success" => true,
"catchMessage" => $e->getMessage(),
"ExistProcessInDatabase" => 1,
"ExistGroupsInDatabase" => 0,
"groupBeforeAccion" => "uploadFileNewProcess",
"sNewProUid" => "",
"proFileName" => "",
"project_type" => "bpmn"
);
}
exit(0);
}
die;
function reservedWordsSqlValidate ($data)
{
$arrayAux = array ();
@@ -118,6 +132,7 @@ if ($action == "uploadFileNewProcess") {
try {
//type of file: only pm
$processFileType = $_REQUEST["processFileType"];
$oProcess = new stdClass();
$oData = new stdClass();

3
workflow/engine/src/ProcessMaker/Services/api.ini
View File

@@ -40,6 +40,9 @@ debug = 1
[alias: projects]
project = "ProcessMaker\Services\Api\Project"
[alias: departments]
project = "ProcessMaker\Services\Api\Department"
[alias: group]
group = "ProcessMaker\Services\Api\Group"
user = "ProcessMaker\Services\Api\Group\User"