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

Litle change to filename var in post of import file

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-03-07 09:46:09 -04:00
parent 4eed9dfc48
commit 370ebe4f77
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,11 +68,11 @@ if ($action == "uploadFileNewProcess") {
$isCorrectTypeFile = 1; $isCorrectTypeFile = 1;
if (isset( $_FILES['form']['type']['PROCESS_FILENAME'] )) { if (isset( $_FILES['PROCESS_FILENAME']['type'] )) {
$allowedExtensions = array ($processFileType $allowedExtensions = array ($processFileType
); );
$allowedExtensions = array ('pm'); $allowedExtensions = array ('pm');
if (! in_array( end( explode( ".", $_FILES['form']['name']['PROCESS_FILENAME'] ) ), $allowedExtensions )) { if (! in_array( end( explode( ".", $_FILES['PROCESS_FILENAME']['name'] ) ), $allowedExtensions )) {
throw new Exception( G::LoadTranslation( "ID_FILE_UPLOAD_INCORRECT_EXTENSION" ) ); throw new Exception( G::LoadTranslation( "ID_FILE_UPLOAD_INCORRECT_EXTENSION" ) );
} }
} }
@@ -99,10 +99,10 @@ if ($action == "uploadFileNewProcess") {
$filename = $_REQUEST["PRO_FILENAME"]; $filename = $_REQUEST["PRO_FILENAME"];
$path = PATH_DOCUMENT . 'input' . PATH_SEP; $path = PATH_DOCUMENT . 'input' . PATH_SEP;
} else { } else {
if ($_FILES['form']['error']['PROCESS_FILENAME'] == 0) { if ($_FILES['PROCESS_FILENAME']['error'] == 0) {
$filename = $_FILES['form']['name']['PROCESS_FILENAME']; $filename = $_FILES['PROCESS_FILENAME']['name'];
$path = PATH_DOCUMENT . 'input' . PATH_SEP; $path = PATH_DOCUMENT . 'input' . PATH_SEP;
$tempName = $_FILES['form']['tmp_name']['PROCESS_FILENAME']; $tempName = $_FILES['PROCESS_FILENAME']['tmp_name'];
//$action = "none"; //$action = "none";
G::uploadFile( $tempName, $path, $filename ); G::uploadFile( $tempName, $path, $filename );

2
workflow/engine/templates/processes/main.js
View File

@@ -1062,7 +1062,7 @@ importProcess = function()
id : 'form-file', id : 'form-file',
emptyText : _('ID_SELECT_PROCESS_FILE'), emptyText : _('ID_SELECT_PROCESS_FILE'),
fieldLabel : _('ID_LAN_FILE'), fieldLabel : _('ID_LAN_FILE'),
name : 'form[PROCESS_FILENAME]', name : 'PROCESS_FILENAME',
buttonText : '', buttonText : '',
buttonCfg : { buttonCfg : {
iconCls : 'upload-icon' iconCls : 'upload-icon'