diff --git a/www-api/app/Config/Boot/development.php b/www-api/app/Config/Boot/development.php index 56246243..5aceb48a 100644 --- a/www-api/app/Config/Boot/development.php +++ b/www-api/app/Config/Boot/development.php @@ -33,4 +33,6 @@ defined('CI_DEBUG') || define('CI_DEBUG', true); define('ENV_ID', 'DEVLP20233103-A3'); define('HOME_PAGE_BACKGROUND', 'api_bk.jpg'); -define('CACHE_DOMAIN', 'wrench.dev'); \ No newline at end of file +define('CACHE_DOMAIN', 'wrench.dev'); + +define('WRENCHBOARD_UPLOAD_PATH', '/opt/wrenchboard/TEST/'); diff --git a/www-api/app/Config/Boot/production.php b/www-api/app/Config/Boot/production.php index 771bb4f1..af2661a0 100644 --- a/www-api/app/Config/Boot/production.php +++ b/www-api/app/Config/Boot/production.php @@ -22,4 +22,6 @@ defined('CI_DEBUG') || define('CI_DEBUG', false); define('ENV_ID', 'PRAODUCTIONG20233103-A3'); define('HOME_PAGE_BACKGROUND', 'api_bk.jpg'); -define('CACHE_DOMAIN', 'wrench.prod'); \ No newline at end of file +define('CACHE_DOMAIN', 'wrench.prod'); + +define('WRENCHBOARD_UPLOAD_PATH', '/opt/wrenchboard/LIVE/'); \ No newline at end of file diff --git a/www-api/app/Config/Boot/testing.php b/www-api/app/Config/Boot/testing.php index 6e74906d..669d3cad 100644 --- a/www-api/app/Config/Boot/testing.php +++ b/www-api/app/Config/Boot/testing.php @@ -33,4 +33,6 @@ defined('CI_DEBUG') || define('CI_DEBUG', true); define('ENV_ID', 'TESTING20233103-A3'); define('HOME_PAGE_BACKGROUND', 'api_bk.jpg'); -define('CACHE_DOMAIN', 'wrench.test'); \ No newline at end of file +define('CACHE_DOMAIN', 'wrench.test'); + +define('WRENCHBOARD_UPLOAD_PATH', '/opt/wrenchboard/TEST/'); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index b669c169..59dc8d21 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -473,9 +473,9 @@ class WrenchApi extends BaseController $raw_json = file_get_contents('php://input'); $raw_array = json_decode($raw_json, true); $raw_array["call_backend"] = $call_backend; - $ll = ( new \App\Models\UploadManager() )->reciveUpload($raw_array, $local_out); - $call_backend = $local_out["call_backend"]; - $raw_array["message"] = $local_out["message"]; + $out = ( new \App\Models\UploadManager() )->reciveUpload($raw_array, $local_out); + $call_backend = $out["call_backend"]; + $raw_array["message"] = $out["message"]; } if (isset($_FILES) && is_array($_FILES) && count($_FILES)>0) { $raw_array = array_merge($_POST,$_FILES); diff --git a/www-api/app/Models/UploadManager.php b/www-api/app/Models/UploadManager.php index 8bafa93a..f1d537cc 100644 --- a/www-api/app/Models/UploadManager.php +++ b/www-api/app/Models/UploadManager.php @@ -5,8 +5,7 @@ use CodeIgniter\Model; class UploadManager extends Model { - - public $savePath ="/opt/wrenchboard/TEST/"; + public $savePath = WRENCHBOARD_UPLOAD_PATH; //"/opt/wrenchboard/TEST/"; public function reciveUpload($in,$out){ $action = $in["action"]; @@ -53,7 +52,7 @@ class UploadManager extends Model } - return 0; + return $out; } diff --git a/www-api/public/svs/user/UploadManager.php b/www-api/public/svs/user/UploadManager.php index ce74cff8..2f215601 100644 --- a/www-api/public/svs/user/UploadManager.php +++ b/www-api/public/svs/user/UploadManager.php @@ -1,8 +1,8 @@ 'Yes the upload endpoint was hit******** 777']; $call_backend = false; // will be decided after file is saved - + //$out=[]; $in = flatten(json_decode(file_get_contents('php://input'), true)); //$in = json_decode($raw_json, true); $in["call_backend"] = $call_backend; - $ll = reciveUpload($in, $local_out); - $call_backend = $local_out["call_backend"]; - $in["message"] = $local_out["message"]; + $out = reciveUpload($in, $local_out); + $call_backend = $out["call_backend"]; + $in["message"] = $out["message"]; } else{