diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 6129505e..e8c99755 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -473,7 +473,7 @@ class WrenchApi extends BaseController $raw_json = file_get_contents('php://input'); $raw_array = json_decode($raw_json, true); $raw_array["call_backend"] = $call_backend; - $out["system_primary_uploads"] = $this->getSiteConfigurations("system.primary_uploads"); + $raw_array["system_primary_uploads"] = $this->getSiteConfigurations("system.primary_uploads"); $out = ( new \App\Models\UploadManager() )->reciveUpload($raw_array, $local_out); $call_backend = $out["call_backend"]; $raw_array["message"] = $out["message"]; diff --git a/www-api/app/Models/UploadManager.php b/www-api/app/Models/UploadManager.php index f1d537cc..844ce375 100644 --- a/www-api/app/Models/UploadManager.php +++ b/www-api/app/Models/UploadManager.php @@ -7,7 +7,7 @@ class UploadManager extends Model { public $savePath = WRENCHBOARD_UPLOAD_PATH; //"/opt/wrenchboard/TEST/"; public function reciveUpload($in,$out){ - + $this->savePath = $in["system_primary_uploads"]; $action = $in["action"]; diff --git a/www-api/public/svs/user/UploadManager.php b/www-api/public/svs/user/UploadManager.php index 2f215601..459ad150 100644 --- a/www-api/public/svs/user/UploadManager.php +++ b/www-api/public/svs/user/UploadManager.php @@ -2,7 +2,7 @@ function reciveUpload($in, $out){ - $savePath = WRENCHBOARD_UPLOAD_PATH; //"/opt/wrenchboard/TEST/"; + $savePath = $in["system_primary_uploads"]; // WRENCHBOARD_UPLOAD_PATH; //"/opt/wrenchboard/TEST/"; $action = $in["action"]; diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 0bc01774..ea8a8ffd 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -143,7 +143,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $in = flatten(json_decode(file_get_contents('php://input'), true)); //$in = json_decode($raw_json, true); $in["call_backend"] = $call_backend; - $out["system_primary_uploads"] = getSiteConfigurations($wrenchboard,"system.primary_uploads"); + $in["system_primary_uploads"] = getSiteConfigurations($wrenchboard,"system.primary_uploads"); $out = reciveUpload($in, $local_out); $call_backend = $out["call_backend"]; $in["message"] = $out["message"];