From d17b76519e0c7efb817ae4c98a8e36c69ac7182a Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sun, 5 Nov 2023 16:37:10 -0500
Subject: [PATCH] file header

---
 wrenchboard/src/shared_tool/media.cc    |  2 +-
 www-api/app/Controllers/WrenchMedia.php | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/wrenchboard/src/shared_tool/media.cc b/wrenchboard/src/shared_tool/media.cc
index f409105d..08d3b1ff 100644
--- a/wrenchboard/src/shared_tool/media.cc
+++ b/wrenchboard/src/shared_tool/media.cc
@@ -74,7 +74,7 @@ long WrenchFindStoredMedia(CVars in, CVars &out) {
                 break;
 
                 case WRENCH_FILE_FAMILY:
-                    snprintf(vname, sizeof (vname), "SELECT uid AS member_uid, profile_pic AS saved_file_name, %s AS family_uid "
+                    snprintf(vname, sizeof (vname), "SELECT uid AS member_uid, profile_pic AS saved_file_name, '%s' AS family_uid "
                                                     " FROM members WHERE id = (SELECT family_member_id FROM members_family WHERE uid = '%s')", in["file_uid"].c_str(), in["file_uid"].c_str());
                 break;
       }
diff --git a/www-api/app/Controllers/WrenchMedia.php b/www-api/app/Controllers/WrenchMedia.php
index 068332b3..6b607b81 100644
--- a/www-api/app/Controllers/WrenchMedia.php
+++ b/www-api/app/Controllers/WrenchMedia.php
@@ -132,19 +132,32 @@ class WrenchMedia extends BaseController
 
        if ( $out["saved_file_name"] =='' || !file_exists( $selectedFile) ){
            log_message('critical', "wrenchboard_api-CALL MEDIA selectedFile DATA  ERROR NO FOUND--->     ".$selectedFile );
+
+           $file = FCPATH.'/assets/images/error.png';
+           // header('Content-Type: image/jpeg');
+           header('Content-Type: image/png');
+           readfile($file);
         }
        else
        {
-
+           $filename = basename($out["saved_file_name"]);
+           $file_extension = strtolower(substr(strrchr($filename,"."),1));
+           switch( $file_extension ) {
+               case "gif": $ctype="image/gif"; break;
+               case "png": $ctype="image/png"; break;
+               case "jpeg":
+               case "jpg": $ctype="image/jpeg"; break;
+               case "svg": $ctype="image/svg+xml"; break;
+               default:
+           }
+           header('Content-type: ' . $ctype);
+           readfile($selectedFile);
        }
 
 
-        $file = FCPATH.'/assets/images/books.png';
-        // header('Content-Type: image/jpeg');
-        header('Content-Type: image/png');
-        readfile($file);
 
-        exit();
+
+       // exit();
 
 //
 //        $file = $selectedFile; // 'books.png';