diff --git a/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc b/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc index a983b3c101f6602b4853ffa24cb3d20b0eabf3b4..2b9321e1ec953f579336cac6f8a30b91fa499905 100644 --- a/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc +++ b/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc @@ -162,48 +162,48 @@ class Files_manager{ } //} - /** - *This method convert $_FILE struct or the aValues File to a File Struct usable by uploadFile. - *@file vmlib/phpUtil.inc - *@param $sField Name of the field. - *@param $aValues $aValues to copy file in tmp. - *@return $aFileStruct FileStuct or null if an error block the write in tmp. - */ - private function extractFileStruct ($sField, $aValues = null){ - $aFileStruc = array(); - if (!isset($aValues[$sField . "_name"])){ - // Extract From Post $File Struct - $aFileStruc = array( - "name" => $_FILES[$sField]['name'], - "tmp_name" => $_FILES[$sField]['tmp_name'], - "error" => $_FILES[$sField]['error'], - "size" => $_FILES[$sField]['size'] - ); - } else { - // Extraction de $aValues, on le met dans tmp pour préparer la copie dans upload file - $sTmpFile = $this->oProperties['extract_dir'] . "/" . getUniqRandomId(); - $oFile = fopen($sTmpFile, 'w+'); - if (!$oFile){ - writeToErrorLog("Can't open file in " . $this->oProperties['extract_dir']); - return null; - }else{ - fwrite($oFile, $aValues[$sField . "_file"]); - fclose($oFile); - $aFileStruc = array( - "name" => $aValues[$sField . "_name"], - "tmp_name" => $sTmpFile, - "error" => "0", - "size" => filesize($sTmpFile) - ); - } - } + /** + *This method convert $_FILE struct or the aValues File to a File Struct usable by uploadFile. + *@file vmlib/phpUtil.inc + *@param $sField Name of the field. + *@param $aValues $aValues to copy file in tmp. + *@return $aFileStruct FileStuct or null if an error block the write in tmp. + */ + private function extractFileStruct ($sField, $aValues = null){ + $aFileStruc = array(); + if (!isset($aValues[$sField . "_name"])){ + // Extract From Post $File Struct + $aFileStruc = array( + "name" => $_FILES[$sField]['name'], + "tmp_name" => $_FILES[$sField]['tmp_name'], + "error" => $_FILES[$sField]['error'], + "size" => $_FILES[$sField]['size'] + ); + } else { + // Extraction de $aValues, on le met dans tmp pour préparer la copie dans upload file + $sTmpFile = $this->oProperties['extract_dir'] . "/" . getUniqRandomId(); + $oFile = fopen($sTmpFile, 'w+'); + if (!$oFile){ + writeToErrorLog("Can't open file in " . $this->oProperties['extract_dir']); + return null; + }else{ + fwrite($oFile, $aValues[$sField . "_file"]); + fclose($oFile); + $aFileStruc = array( + "name" => $aValues[$sField . "_name"], + "tmp_name" => $sTmpFile, + "error" => "0", + "size" => filesize($sTmpFile) + ); + } + } - if(isset($aValues[$sField . "_width"]) && isset($aValues[$sField . "_height"])){ - $aFileStruc["width"] = $aValues[$sField . "_width"]; - $aFileStruc["height"] = $aValues[$sField . "_height"]; - } + if(isset($aValues[$sField . "_width"]) && isset($aValues[$sField . "_height"])){ + $aFileStruc["width"] = $aValues[$sField . "_width"]; + $aFileStruc["height"] = $aValues[$sField . "_height"]; + } - return $aFileStruc; + return $aFileStruc; } /** *This method upload a file in ws_data. diff --git a/src/vitis/vas/rest/class/vmlib/files/Local_files.class.inc b/src/vitis/vas/rest/class/vmlib/files/Local_files.class.inc index 024b28a6d655185ff3575bd6c538e8f8157db895..c91d74cdf33dbf0fa8732f639095447b2c05ad34 100644 --- a/src/vitis/vas/rest/class/vmlib/files/Local_files.class.inc +++ b/src/vitis/vas/rest/class/vmlib/files/Local_files.class.inc @@ -31,7 +31,6 @@ class Local_files extends Files_common implements Files{ } } - /** *verify if a file exists. *@param string $sFilePath File's path. diff --git a/src/vitis/vas/rest/class/vmlib/files/S3_files.class.inc b/src/vitis/vas/rest/class/vmlib/files/S3_files.class.inc index 107d87efe53f3a2b40157815733fb4daad922f5e..9b306a7474b99bccf4d15d47bd75ccd25bd5eae0 100644 --- a/src/vitis/vas/rest/class/vmlib/files/S3_files.class.inc +++ b/src/vitis/vas/rest/class/vmlib/files/S3_files.class.inc @@ -34,6 +34,7 @@ class S3_files extends Files_common implements Files{ 'debug' => false )); } + /** *parse vitis properties ti extract bucket name and bucket prefix. *@private