WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

file header

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-11-05 16:37:10 -05:00
parent 2894820d87
commit d17b76519e
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/src/shared_tool/media.cc
+1 -1
View File
@@ -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;
}
www-api/app/Controllers/WrenchMedia.php
+19 -6
View File
@@ -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';