HOR-1365
Input document uploaded via web entry not visible in spanish environment. R-1365 Input document uploaded via web entry not visible in spanish environment.
This commit is contained in:
Dheeyi William
@@ -419,26 +419,26 @@ class pmDynaform
|
||||
}
|
||||
}
|
||||
if ($key === "type" && ($value === "file") && isset($this->fields["APP_DATA"]["APPLICATION"])) {
|
||||
$oCriteria = new Criteria("workflow");
|
||||
$oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
|
||||
$oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION);
|
||||
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
|
||||
$oCriteria->addJoin(AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
|
||||
$oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]);
|
||||
$oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
|
||||
$oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_DOC_FILENAME');
|
||||
$oCriteria->add(ContentPeer::CON_LANG, $this->lang);
|
||||
$oCriteria->addDescendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE);
|
||||
$oCriteria->setLimit(1);
|
||||
$rs = AppDocumentPeer::doSelectRS($oCriteria);
|
||||
$oCriteriaAppDocument = new Criteria("workflow");
|
||||
$oCriteriaAppDocument->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
|
||||
$oCriteriaAppDocument->addSelectColumn(AppDocumentPeer::DOC_VERSION);
|
||||
$oCriteriaAppDocument->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]);
|
||||
$oCriteriaAppDocument->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
|
||||
$oCriteriaAppDocument->addDescendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE);
|
||||
$oCriteriaAppDocument->setLimit(1);
|
||||
$rs = AppDocumentPeer::doSelectRS($oCriteriaAppDocument);
|
||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$rs->next();
|
||||
|
||||
$links = array();
|
||||
$labelsFromDb = array();
|
||||
$appDocUids = array();
|
||||
while ($rs->next()) {
|
||||
$row = $rs->getRow();
|
||||
$oAppDocument = new AppDocument();
|
||||
|
||||
if ($row = $rs->getRow()) {
|
||||
$oAppDocument->load($row["APP_DOC_UID"], $row["DOC_VERSION"]);
|
||||
$links[] = "../cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
|
||||
$labelsFromDb[] = $row["CON_VALUE"];
|
||||
$labelsFromDb[] = $oAppDocument->getAppDocFilename();
|
||||
$appDocUids[] = $row["APP_DOC_UID"];
|
||||
}
|
||||
$json->data = new stdClass();
|
||||
|
||||
@@ -55,45 +55,55 @@ if (isset( $_FILES ) && $_FILES["ATTACH_FILE"]["error"] == 0) {
|
||||
|
||||
$oAppDocument = new AppDocument();
|
||||
|
||||
if (isset( $_POST["APP_DOC_UID"] ) && trim( $_POST["APP_DOC_UID"] ) != "") {
|
||||
if (isset($_POST["APP_DOC_UID"]) && trim($_POST["APP_DOC_UID"]) != "") {
|
||||
//Update
|
||||
echo "[update]";
|
||||
$aFields["APP_DOC_UID"] = $_POST["APP_DOC_UID"];
|
||||
$aFields["DOC_VERSION"] = $_POST["DOC_VERSION"];
|
||||
$aFields["APP_DOC_FILENAME"] = $_FILES["ATTACH_FILE"]["name"];
|
||||
|
||||
if (isset( $_POST["APPLICATION"] )) {
|
||||
if (isset($_POST["APPLICATION"])) {
|
||||
$aFields["APP_UID"] = $_POST["APPLICATION"];
|
||||
}
|
||||
|
||||
if (isset( $_POST["INDEX"] )) {
|
||||
if (isset($_POST["INDEX"])) {
|
||||
$aFields["DEL_INDEX"] = $_POST["INDEX"];
|
||||
}
|
||||
|
||||
if (isset( $_POST["USR_UID"] )) {
|
||||
if (isset($_POST["USR_UID"])) {
|
||||
$aFields["USR_UID"] = $_POST["USR_UID"];
|
||||
}
|
||||
|
||||
if (isset( $_POST["DOC_UID"] )) {
|
||||
if (isset($_POST["DOC_UID"])) {
|
||||
$aFields["DOC_UID"] = $_POST["DOC_UID"];
|
||||
}
|
||||
|
||||
if (isset( $_POST["APP_DOC_TYPE"] )) {
|
||||
if (isset($_POST["APP_DOC_TYPE"])) {
|
||||
$aFields["APP_DOC_TYPE"] = $_POST["APP_DOC_TYPE"];
|
||||
}
|
||||
|
||||
$aFields["APP_DOC_CREATE_DATE"] = date( "Y-m-d H:i:s" );
|
||||
$aFields["APP_DOC_COMMENT"] = (isset( $_POST["COMMENT"] )) ? $_POST["COMMENT"] : "";
|
||||
$aFields["APP_DOC_TITLE"] = (isset( $_POST["TITLE"] )) ? $_POST["TITLE"] : "";
|
||||
$aFields["APP_DOC_CREATE_DATE"] = date("Y-m-d H:i:s");
|
||||
$aFields["APP_DOC_COMMENT"] = (isset($_POST["COMMENT"])) ? $_POST["COMMENT"] : "";
|
||||
$aFields["APP_DOC_TITLE"] = (isset($_POST["TITLE"])) ? $_POST["TITLE"] : "";
|
||||
|
||||
//$aFields["FOLDER_UID"] = $folderId,
|
||||
//$aFields["APP_DOC_TAGS"] = $fileTags
|
||||
|
||||
|
||||
$aFields["APP_DOC_FIELDNAME"] = $_POST["APP_DOC_FIELDNAME"];
|
||||
} else {
|
||||
//New record
|
||||
$aFields = array ("APP_UID" => $_POST["APPLICATION"],"DEL_INDEX" => $_POST["INDEX"],"USR_UID" => $_POST["USR_UID"],"DOC_UID" => $_POST["DOC_UID"],"APP_DOC_TYPE" => $_POST["APP_DOC_TYPE"],"APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),"APP_DOC_COMMENT" => (isset( $_POST["COMMENT"] )) ? $_POST["COMMENT"] : "","APP_DOC_TITLE" => (isset( $_POST["TITLE"] )) ? $_POST["TITLE"] : "","APP_DOC_FILENAME" => (isset( $_FILES["ATTACH_FILE"]["name"] )) ? $_FILES["ATTACH_FILE"]["name"] : "","FOLDER_UID" => $folderId,"APP_DOC_TAGS" => $fileTags,"APP_DOC_FIELDNAME" => (isset($_POST["APP_DOC_FIELDNAME"])) ? $_POST["APP_DOC_FIELDNAME"] : ( (isset( $_FILES["ATTACH_FILE"]["name"] )) ? $_FILES["ATTACH_FILE"]["name"] : "")
|
||||
$aFields = array(
|
||||
"APP_UID" => $_POST["APPLICATION"],
|
||||
"DEL_INDEX" => $_POST["INDEX"],
|
||||
"USR_UID" => $_POST["USR_UID"],
|
||||
"DOC_UID" => $_POST["DOC_UID"],
|
||||
"APP_DOC_TYPE" => $_POST["APP_DOC_TYPE"],
|
||||
"APP_DOC_CREATE_DATE" => date("Y-m-d H:i:s"),
|
||||
"APP_DOC_COMMENT" => (isset($_POST["COMMENT"])) ? $_POST["COMMENT"] : "",
|
||||
"APP_DOC_TITLE" => (isset($_POST["TITLE"])) ? $_POST["TITLE"] : "",
|
||||
"APP_DOC_FILENAME" => (isset($_FILES["ATTACH_FILE"]["name"])) ? $_FILES["ATTACH_FILE"]["name"] : "",
|
||||
"FOLDER_UID" => $folderId, "APP_DOC_TAGS" => $fileTags,
|
||||
"APP_DOC_FIELDNAME" => (isset($_POST["APP_DOC_FIELDNAME"])) ? $_POST["APP_DOC_FIELDNAME"] : ((isset($_FILES["ATTACH_FILE"]["name"])) ? $_FILES["ATTACH_FILE"]["name"] : "")
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -70,72 +70,80 @@ try {
|
||||
}
|
||||
|
||||
//Save files
|
||||
if (isset($_FILES["form"]["name"]) && count($_FILES["form"]["name"]) > 0) {
|
||||
$arrayField = array();
|
||||
$arrayFileName = array();
|
||||
$arrayFileTmpName = array();
|
||||
$arrayFileError = array();
|
||||
if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) {
|
||||
$arrayField = array ();
|
||||
$arrayFileName = array ();
|
||||
$arrayFileTmpName = array ();
|
||||
$arrayFileError = array ();
|
||||
$i = 0;
|
||||
|
||||
foreach ($_FILES["form"]["name"] as $fieldIndex => $fieldValue) {
|
||||
if (is_array($fieldValue)) {
|
||||
foreach ($fieldValue as $index => $value) {
|
||||
if (is_array($value)) {
|
||||
foreach ($value as $grdFieldIndex => $grdFieldValue) {
|
||||
$arrayField[$i]["grdName"] = $fieldIndex;
|
||||
$arrayField[$i]["grdFieldName"] = $grdFieldIndex;
|
||||
$arrayField[$i]["index"] = $index;
|
||||
foreach ($_FILES["form"]["name"] as $fieldIndex => $fieldValue) {
|
||||
if (is_array( $fieldValue )) {
|
||||
foreach ($fieldValue as $index => $value) {
|
||||
if (is_array( $value )) {
|
||||
foreach ($value as $grdFieldIndex => $grdFieldValue) {
|
||||
$arrayField[$i]["grdName"] = $fieldIndex;
|
||||
$arrayField[$i]["grdFieldName"] = $grdFieldIndex;
|
||||
$arrayField[$i]["index"] = $index;
|
||||
|
||||
$arrayFileName[$i] = $_FILES["form"]["name"][$fieldIndex][$index][$grdFieldIndex];
|
||||
$arrayFileTmpName[$i] = $_FILES["form"]["tmp_name"][$fieldIndex][$index][$grdFieldIndex];
|
||||
$arrayFileError[$i] = $_FILES["form"]["error"][$fieldIndex][$index][$grdFieldIndex];
|
||||
$i = $i + 1;
|
||||
$arrayFileName[$i] = $_FILES["form"]["name"][$fieldIndex][$index][$grdFieldIndex];
|
||||
$arrayFileTmpName[$i] = $_FILES["form"]["tmp_name"][$fieldIndex][$index][$grdFieldIndex];
|
||||
$arrayFileError[$i] = $_FILES["form"]["error"][$fieldIndex][$index][$grdFieldIndex];
|
||||
$i = $i + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$arrayField[$i] = $fieldIndex;
|
||||
|
||||
$arrayFileName[$i] = $_FILES["form"]["name"][$fieldIndex];
|
||||
$arrayFileTmpName[$i] = $_FILES["form"]["tmp_name"][$fieldIndex];
|
||||
$arrayFileError[$i] = $_FILES["form"]["error"][$fieldIndex];
|
||||
$i = $i + 1;
|
||||
} else {
|
||||
$arrayField[$i] = $fieldIndex;
|
||||
$arrayFileName[$i] = $_FILES["form"]["name"][$fieldIndex];
|
||||
$arrayFileTmpName[$i] = $_FILES["form"]["tmp_name"][$fieldIndex];
|
||||
$arrayFileError[$i] = $_FILES["form"]["error"][$fieldIndex];
|
||||
$i = $i + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (count( $arrayField ) > 0) {
|
||||
for ($i = 0; $i <= count( $arrayField ) - 1; $i ++) {
|
||||
if ($arrayFileError[$i] == 0) {
|
||||
$indocUid = null;
|
||||
$fieldName = null;
|
||||
$fileSizeByField = 0;
|
||||
|
||||
if (count($arrayField) > 0) {
|
||||
for ($i = 0; $i <= count($arrayField) - 1; $i++) {
|
||||
if ($arrayFileError[$i] == 0) {
|
||||
$indocUid = null;
|
||||
$fieldName = null;
|
||||
if (is_array( $arrayField[$i] )) {
|
||||
if (isset( $_POST["INPUTS"][$arrayField[$i]["grdName"]][$arrayField[$i]["grdFieldName"]] ) && ! empty( $_POST["INPUTS"][$arrayField[$i]["grdName"]][$arrayField[$i]["grdFieldName"]] )) {
|
||||
$indocUid = $_POST["INPUTS"][$arrayField[$i]["grdName"]][$arrayField[$i]["grdFieldName"]];
|
||||
}
|
||||
|
||||
if (is_array($arrayField[$i])) {
|
||||
if (isset($_POST["INPUTS"][$arrayField[$i]["grdName"]][$arrayField[$i]["grdFieldName"]]) &&
|
||||
!empty($_POST["INPUTS"][$arrayField[$i]["grdName"]][$arrayField[$i]["grdFieldName"]])
|
||||
) {
|
||||
$indocUid = $_POST["INPUTS"][$arrayField[$i]["grdName"]][$arrayField[$i]["grdFieldName"]];
|
||||
}
|
||||
$fieldName = $arrayField[$i]["grdName"] . "_" . $arrayField[$i]["index"] . "_" . $arrayField[$i]["grdFieldName"];
|
||||
|
||||
$fieldName = $arrayField[$i]["grdName"] . "_" . $arrayField[$i]["index"] . "_" . $arrayField[$i]["grdFieldName"];
|
||||
} else {
|
||||
if (isset($_POST["INPUTS"][$arrayField[$i]]) &&
|
||||
!empty($_POST["INPUTS"][$arrayField[$i]])
|
||||
) {
|
||||
if (isset($_FILES["form"]["size"][$arrayField[$i]["grdName"]][$arrayField[$i]["index"]][$arrayField[$i]["grdFieldName"]])) {
|
||||
$fileSizeByField = $_FILES["form"]["size"][$arrayField[$i]["grdName"]][$arrayField[$i]["index"]][$arrayField[$i]["grdFieldName"]];
|
||||
}
|
||||
} else {
|
||||
if (isset( $_POST["INPUTS"][$arrayField[$i]] ) && ! empty( $_POST["INPUTS"][$arrayField[$i]] )) {
|
||||
$indocUid = $_POST["INPUTS"][$arrayField[$i]];
|
||||
}
|
||||
|
||||
$fieldName = $arrayField[$i];
|
||||
|
||||
if (isset($_FILES["form"]["size"][$fieldName])) {
|
||||
$fileSizeByField = $_FILES["form"]["size"][$fieldName];
|
||||
}
|
||||
}
|
||||
|
||||
$filePath = G::sys_get_temp_dir() . PATH_SEP . $arrayFileName[$i];
|
||||
file_put_contents($filePath, file_get_contents($arrayFileTmpName[$i]));
|
||||
$temDir = G::sys_get_temp_dir();
|
||||
$uploadfile = $temDir . PATH_SEP . basename($arrayFileName[$i]);
|
||||
$result = move_uploaded_file($arrayFileTmpName[$i], $uploadfile);
|
||||
|
||||
$filePath = $temDir . PATH_SEP . $arrayFileName[$i];
|
||||
file_put_contents($filePath, file_get_contents($uploadfile));
|
||||
$filename = $arrayFileName[$i];
|
||||
|
||||
if ($indocUid != null) {
|
||||
//Input file type
|
||||
ws_sendFile($filePath, $USR_UID, $caseId, 1, $indocUid, $fieldName);
|
||||
ws_sendFile($uploadfile, $USR_UID, $caseId, 1, $indocUid, $fieldName, null, null, $filename);
|
||||
} else {
|
||||
//Attached file type
|
||||
ws_sendFile($filePath, $USR_UID, $caseId, 1, null, $fieldName);
|
||||
ws_sendFile($uploadfile, $USR_UID, $caseId, 1, null, $fieldName, null, null, $filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -447,41 +447,44 @@ function ws_sendFile(
|
||||
$FILENAME,
|
||||
$USR_UID,
|
||||
$APP_UID,
|
||||
$DEL_INDEX=1,
|
||||
$DOC_UID=null,
|
||||
$APP_DOC_FIELDNAME=null,
|
||||
$title=null,
|
||||
$comment=null
|
||||
) {
|
||||
$DOC_UID = ($DOC_UID != null)? $DOC_UID : -1;
|
||||
$APP_DOC_TYPE = ($DOC_UID == -1)? "ATTACHED" : "INPUT";
|
||||
$title = ($title != null)? $title : $FILENAME;
|
||||
$comment = ($comment != null)? $comment : null;
|
||||
$DEL_INDEX = 1,
|
||||
$DOC_UID = null,
|
||||
$APP_DOC_FIELDNAME = null,
|
||||
$title = null,
|
||||
$comment = null,
|
||||
$APP_DOC_FILENAME = null
|
||||
)
|
||||
{
|
||||
$DOC_UID = ($DOC_UID != null) ? $DOC_UID : -1;
|
||||
$APP_DOC_TYPE = ($DOC_UID == -1) ? "ATTACHED" : "INPUT";
|
||||
$title = ($title != null) ? $title : $FILENAME;
|
||||
$comment = ($comment != null) ? $comment : null;
|
||||
|
||||
$params = array(
|
||||
"ATTACH_FILE" => "@$FILENAME",
|
||||
"APPLICATION" => $APP_UID,
|
||||
"INDEX" => $DEL_INDEX,
|
||||
"DOC_UID" => $DOC_UID,
|
||||
"USR_UID" => $USR_UID,
|
||||
"APP_DOC_TYPE" => $APP_DOC_TYPE,
|
||||
"APP_DOC_FIELDNAME" => $APP_DOC_FIELDNAME,
|
||||
"TITLE" => $title,
|
||||
"COMMENT" => $comment
|
||||
);
|
||||
$params = array(
|
||||
"ATTACH_FILE" => "@$FILENAME",
|
||||
"APPLICATION" => $APP_UID,
|
||||
"INDEX" => $DEL_INDEX,
|
||||
"DOC_UID" => $DOC_UID,
|
||||
"USR_UID" => $USR_UID,
|
||||
"APP_DOC_TYPE" => $APP_DOC_TYPE,
|
||||
"APP_DOC_FIELDNAME" => $APP_DOC_FIELDNAME,
|
||||
"TITLE" => $title,
|
||||
"COMMENT" => $comment,
|
||||
"APP_DOC_FILENAME" => $APP_DOC_FILENAME
|
||||
);
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL, WS_UPLOAD_URL);
|
||||
//curl_setopt($ch, CURLOPT_VERBOSE, 1);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
curl_setopt($ch, CURLOPT_POST, 1);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
|
||||
$response = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL, WS_UPLOAD_URL);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
|
||||
curl_setopt($ch, CURLOPT_POST, 1);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
|
||||
$response = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
|
||||
return $response;
|
||||
return $response;
|
||||
}
|
||||
|
||||
function ws_updateFile($APP_DOC_UID, $FILENAME, $DOC_VERSION, $APP_DOC_TYPE=NULL, $USR_UID=NULL, $APP_UID=NULL, $DEL_INDEX=NULL, $DOC_UID=NULL, $title=NULL, $comment=NULL) {
|
||||
|
||||
Reference in New Issue
Block a user