From a1953d188dba5d8fecdd1b7ad2e12833510337f8 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 5 Nov 2023 15:05:51 -0500 Subject: [PATCH] fix family files --- www-api/app/Controllers/WrenchMedia.php | 45 +++++++++++++++---------- www-api/app/Models/UploadManager.php | 2 ++ 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/www-api/app/Controllers/WrenchMedia.php b/www-api/app/Controllers/WrenchMedia.php index 3bde41f4..32409e45 100644 --- a/www-api/app/Controllers/WrenchMedia.php +++ b/www-api/app/Controllers/WrenchMedia.php @@ -87,12 +87,12 @@ class WrenchMedia extends BaseController */ log_message('critical', "Media gate Path GATE 005 - Ready to File File ****"); - $file = FCPATH.'/assets/images/books.png'; - // header('Content-Type: image/jpeg'); - header('Content-Type: image/png'); - readfile($file); - - exit(); +// $file = FCPATH.'/assets/images/books.png'; +// // header('Content-Type: image/jpeg'); +// header('Content-Type: image/png'); +// readfile($file); +// +// exit(); $data = [ @@ -110,6 +110,7 @@ class WrenchMedia extends BaseController } + $selectedFile=""; switch($supportedSections[$fileSection]){ case WRENCH_FILE_PROFILE: @@ -131,19 +132,27 @@ class WrenchMedia extends BaseController log_message('critical', "wrenchboard_api-CALL MEDIA selectedFile DATA".$selectedFile ); - $file = $selectedFile; // 'books.png'; + $file = FCPATH.'/assets/images/books.png'; + // header('Content-Type: image/jpeg'); + header('Content-Type: image/png'); + readfile($file); - if (file_exists($file)) { - header('Content-Description: File Transfer'); - header('Content-Type: application/octet-stream'); - header('Content-Disposition: attachment; filename="'.basename($file).'"'); - header('Expires: 0'); - header('Cache-Control: must-revalidate'); - header('Pragma: public'); - header('Content-Length: ' . filesize($file)); - readfile($file); - exit; - } + exit(); + +// +// $file = $selectedFile; // 'books.png'; +// +// if (file_exists($file)) { +// header('Content-Description: File Transfer'); +// header('Content-Type: application/octet-stream'); +// header('Content-Disposition: attachment; filename="'.basename($file).'"'); +// header('Expires: 0'); +// header('Cache-Control: must-revalidate'); +// header('Pragma: public'); +// header('Content-Length: ' . filesize($file)); +// readfile($file); +// exit; +// } } diff --git a/www-api/app/Models/UploadManager.php b/www-api/app/Models/UploadManager.php index 6a2afc5f..b82c45f5 100644 --- a/www-api/app/Models/UploadManager.php +++ b/www-api/app/Models/UploadManager.php @@ -114,6 +114,8 @@ class UploadManager extends Model $out["call_backend"] = false; // flag ready to save data entry $data['file_uid'] = $in["uid"]; $data['profile'] = $in["profile"]; + $data['family_uid'] =$in["family_uid"]; + $data['sessionid'] =$in["sessionid"]; $data['member_id'] = $in["member_id"]; $data['file_section'] = WRENCH_FILE_FAMILY; $out['upload_result'] = $this->specififBackendCall(WRENCHBOARD_SAVE_MEDIA, $data);