diff --git a/wrenchboard/src/shared_tool/media.cc b/wrenchboard/src/shared_tool/media.cc index 09b353c0..eccf313e 100644 --- a/wrenchboard/src/shared_tool/media.cc +++ b/wrenchboard/src/shared_tool/media.cc @@ -77,9 +77,10 @@ long WrenchFindStoredMedia(CVars in, CVars &out) { // 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()); - snprintf(vname, sizeof (vname), "SELECT f.uid AS family_uid, f.family_member_id, mm.uid AS member_uid " + snprintf(vname, sizeof (vname), "SELECT f.uid AS family_uid,m.profile_pic AS saved_file_name, f.family_member_id, mm.uid AS member_uid " " FROM members_family f " " LEFT JOIN members mm ON mm.id = f.member_id " + " LEFT JOIN members m ON m.id = f.family_member_id " " WHERE f.uid='%s' ", in["file_uid"].c_str() ); break; diff --git a/www-api/app/Controllers/WrenchMedia.php b/www-api/app/Controllers/WrenchMedia.php index 6b607b81..8d95443a 100644 --- a/www-api/app/Controllers/WrenchMedia.php +++ b/www-api/app/Controllers/WrenchMedia.php @@ -112,15 +112,19 @@ class WrenchMedia extends BaseController $selectedFile=""; + $error_file ="error.png"; + switch($supportedSections[$fileSection]){ case WRENCH_FILE_PROFILE: ///opt/wrenchboard/TEST/PROFILE/3119b744-42ad-4834-bb83-b737588754ca/PORTRAIT $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/PORTRAIT/". $out["saved_file_name"]; + $error_file ="profile_error.png"; break; case WRENCH_FILE_FAMILY: ///opt/wrenchboard/TEST/PROFILE/3119b744-42ad-4834-bb83-b737588754ca/FAMILY/3119b744-42ad-4834-bb83-b737588754ca/ $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/FAMILY/".$out["family_uid"]."/". $out["saved_file_name"]; + $error_file ="family_error.png"; break; case WRENCH_FILE_MYFILE: @@ -133,7 +137,7 @@ 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'; + $file = FCPATH.'/assets/images/'.$error_file; // header('Content-Type: image/jpeg'); header('Content-Type: image/png'); readfile($file);