From d3d31139e073b7be4b779cdd0f5167ae94a93391 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 8 Jan 2019 16:19:55 +0100
Subject: [PATCH] Indentation
---
.../class/vmlib/files/Files_manager.class.inc | 80 +++++++++----------
.../class/vmlib/files/Local_files.class.inc | 1 -
.../rest/class/vmlib/files/S3_files.class.inc | 1 +
3 files changed, 41 insertions(+), 41 deletions(-)
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 a983b3c1..2b9321e1 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 024b28a6..c91d74cd 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 107d87ef..9b306a74 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
--
GitLab