fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in jennydmz/processmaker/BUG-14990 (pull request #780)

Browse Source 
Changing harcoded variable for input docs.
This commit is contained in:
Julio Cesar Laura Avendaño
2014-09-15 12:46:14 -04:00
parent 12692ca8aa 6645887c27
commit e3d13d485e
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.g.php
View File

@@ -5497,7 +5497,7 @@ class G
}
if( $flag == 1){
$res->status = false;
$res->message = G::LoadTranslation('ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION' );
$res->message = G::LoadTranslation('ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION' ) . ' ' . $filesName;
return $res;
}
}

32
workflow/engine/methods/cases/cases_SaveData.php
View File

@@ -280,15 +280,29 @@ try {
//Get the Custom Folder ID (create if necessary)
$oFolder = new AppFolder();
//***Validating the file allowed extensions***
$res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $_FILES["form"]["name"]["input"], $_FILES["form"]["tmp_name"]["input"]);
if($res->status == 0){
$message = $res->message;
G::SendMessageText( $message, "ERROR" );
$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
die();
}
//***Validating the file allowed extensions***
if(is_array($_FILES["form"]["name"][$fieldIndex])){
for ($i=0; $i<sizeof($_FILES["form"]["name"][$fieldIndex]); $i++){
$res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $_FILES["form"]["name"][$fieldIndex][$i+1][$arrayField[$i]["grdFieldName"]], $_FILES["form"]["tmp_name"][$fieldIndex][$i+1][$arrayField[$i]["grdFieldName"]]);
if($res->status == 0){
$message = $res->message;
G::SendMessageText( $message, "ERROR" );
$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
die();
}
}
die;
} else {
$res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $_FILES["form"]["name"][$fieldIndex], $_FILES["form"]["tmp_name"][$fieldIndex]);
if($res->status == 0){
$message = $res->message;
G::SendMessageText( $message, "ERROR" );
$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
die();
}
}
$aFields = array ("APP_UID" => $_SESSION["APPLICATION"],"DEL_INDEX" => $_SESSION["INDEX"],"USR_UID" => $_SESSION["USER_LOGGED"],"DOC_UID" => $indocUid,"APP_DOC_TYPE" => "INPUT","APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),"APP_DOC_COMMENT" => "","APP_DOC_TITLE" => "","APP_DOC_FILENAME" => $arrayFileName[$i],"FOLDER_UID" => $oFolder->createFromPath( $aID["INP_DOC_DESTINATION_PATH"] ),"APP_DOC_TAGS" => $oFolder->parseTags( $aID["INP_DOC_TAGS"] ),"APP_DOC_FIELDNAME" => $fieldName);
} else {