From 181625fbb0366e83a4af7e942af6bd9d4b3d1c09 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 11 Jan 2019 10:45:04 +0100
Subject: [PATCH] Rename File_downloader to FileDownloader
---
.../class/vmlib/files/Local_files.class.inc | 2 +-
.../rest/class/vmlib/files/S3_files.class.inc | 2 +-
src/vitis/vas/rest/class/vmlib/phpUtil.inc | 4 ++--
...ader.class.inc => FileDownloader.class.inc} | 18 +++++++++---------
4 files changed, 13 insertions(+), 13 deletions(-)
rename src/vitis/vas/rest/ws/vitis/{File_downloader.class.inc => FileDownloader.class.inc} (96%)
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 77e0ce2f..4c0e4a03 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
@@ -187,7 +187,7 @@ class Local_files extends Files_common implements Files{
*/
public function getProxyPassUrl ($sFilePath){
$date = new DateTime();
- $sDataUrl = $this->oProperties['web_server_name'] . "/" . $this->oProperties['services_alias'] . "/vitis/file_downloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
+ $sDataUrl = $this->oProperties['web_server_name'] . "/" . $this->oProperties['services_alias'] . "/vitis/FileDownloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
$sKey = str_replace($this->oProperties['ws_data_dir'], "ws_data" , $sFilePath);
$sKey = str_replace($this->oProperties['dir_export'], "public" , $sKey);
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 9b306a74..5b641eab 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
@@ -427,7 +427,7 @@ class S3_files extends Files_common implements Files{
list($sBucket, $sPrefix) = $this->getBucketConst();
$sFilePath = str_replace($this->oProperties["vas_home"], $sPrefix , $sFilePath);
$date = new DateTime();
- $sDataUrl = $this->oProperties['web_server_name'] . "/" . $this->oProperties['services_alias'] . "/vitis/file_downloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
+ $sDataUrl = $this->oProperties['web_server_name'] . "/" . $this->oProperties['services_alias'] . "/vitis/FileDownloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
$sKey = str_replace($this->oProperties['ws_data_dir'], "ws_data" , $sFilePath);
$sKey = str_replace($this->oProperties['dir_export'], "public" , $sKey);
diff --git a/src/vitis/vas/rest/class/vmlib/phpUtil.inc b/src/vitis/vas/rest/class/vmlib/phpUtil.inc
index bac8eeaa..79b65235 100755
--- a/src/vitis/vas/rest/class/vmlib/phpUtil.inc
+++ b/src/vitis/vas/rest/class/vmlib/phpUtil.inc
@@ -552,7 +552,7 @@ function stripslashes_deep($aString) {
$aFileName = explode("/", $sFilePath);
$date = new DateTime();
- $sDataUrl = $properties['web_server_name'] . "/rest/vitis/file_downloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
+ $sDataUrl = $properties['web_server_name'] . "/rest/vitis/FileDownloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
$sFileUrl = str_replace("[KEY]", str_replace($properties['ws_data_dir'], "ws_data" , $sFilePath), $sDataUrl);
$sFileUrl = str_replace("[ETAG]", sha1(file_get_contents($sFilePath), false), $sFileUrl);
@@ -602,7 +602,7 @@ function stripslashes_deep($aString) {
));
$date = new DateTime();
- $sDataUrl = $properties['web_server_name'] . "/rest/vitis/file_downloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
+ $sDataUrl = $properties['web_server_name'] . "/rest/vitis/FileDownloader?key=[KEY]&eTag=[ETAG]&d=" . $date->getTimestamp();
$aPath = explode("/", $sDirectoryPath);
$aTree = array(
"filename"=> end($aPath),
diff --git a/src/vitis/vas/rest/ws/vitis/File_downloader.class.inc b/src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc
similarity index 96%
rename from src/vitis/vas/rest/ws/vitis/File_downloader.class.inc
rename to src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc
index 420ebe65..42420a50 100755
--- a/src/vitis/vas/rest/ws/vitis/File_downloader.class.inc
+++ b/src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc
@@ -1,8 +1,8 @@
<?php
/**
- * \file File_downloader.class.inc
- * \class File_downloader
+ * \file FileDownloader.class.inc
+ * \class FileDownloader
*
* \author Anthony Borghi <anthony.borghi@veremes.com>.
*
@@ -15,16 +15,16 @@ require_once 'Vitis.class.inc';
require_once ("aws_sdk/aws-autoloader.php");
require_once ("vmlib/phpUtil.inc");
-class File_downloader extends Vitis {
+class FileDownloader extends Vitis {
/**
* @SWG\Definition(
- * definition="/file_downloader",
+ * definition="/FileDownloader",
* allOf={
- * @SWG\Schema(ref="#/definitions/file_downloader")
+ * @SWG\Schema(ref="#/definitions/FileDownloader")
* }
* )
* * @SWG\Tag(
- * name="File_downloader",
+ * name="FileDownloader",
* description="Download a file"
* )
*/
@@ -43,8 +43,8 @@ class File_downloader extends Vitis {
}
/**
- * @SWG\Get(path="/file_downloader",
- * tags={"File_downloader"},
+ * @SWG\Get(path="/FileDownloader",
+ * tags={"FileDownloader"},
* summary="Get File Content",
* description="Request to get File",
* operationId="GET",
@@ -73,7 +73,7 @@ class File_downloader extends Vitis {
* @SWG\Response(
* response=200,
* description="Blob of the file",
- * @SWG\Schema(ref="#/definitions/file_downloader")
+ * @SWG\Schema(ref="#/definitions/FileDownloader")
* )
* )
*/
--
GitLab