From cbef8320a6d5312c16bf6042e46c9449c9227fb7 Mon Sep 17 00:00:00 2001 From: jennylee Date: Mon, 15 Sep 2014 09:45:57 -0400 Subject: [PATCH 1/2] Changing harcoded variable for input docs. --- workflow/engine/methods/cases/cases_SaveData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php index cceccf10c..0e03dd2f5 100644 --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -281,7 +281,7 @@ try { $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"]); + $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" ); From 6645887c2754684939a5c842348491494a84e7a9 Mon Sep 17 00:00:00 2001 From: jennylee Date: Mon, 15 Sep 2014 12:31:49 -0400 Subject: [PATCH 2/2] BUG-14990 Solving problems when the inputdocs extension is vlidated on grids. --- gulliver/system/class.g.php | 2 +- .../engine/methods/cases/cases_SaveData.php | 32 +++++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 24c69f573..75f707ec5 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -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; } } diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php index 0e03dd2f5..2dfe5fc69 100644 --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -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"][$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(); - } + //***Validating the file allowed extensions*** + if(is_array($_FILES["form"]["name"][$fieldIndex])){ + for ($i=0; $istatus == 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 {