diff --git a/www-api/app/Controllers/WrenchMedia.php b/www-api/app/Controllers/WrenchMedia.php index 8d28f523..6639384e 100644 --- a/www-api/app/Controllers/WrenchMedia.php +++ b/www-api/app/Controllers/WrenchMedia.php @@ -112,35 +112,39 @@ class WrenchMedia extends BaseController $selectedFile=""; - + $selectedFile_CACHE_KEY=''; $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"]; + $selectedFile_CACHE_KEY= $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"]; + $selectedFile_CACHE_KEY= $this->savePath.'PROFILE_'.$out["member_uid"]."_FAMILY_".$out["family_uid"]."_". $out["saved_file_name"]; $error_file ="family_error.png"; break; case WRENCH_FILE_MYFILE: $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/MYFILES/". $out["saved_file_name"]; + $selectedFile_CACHE_KEY = $this->savePath.'PROFILE_'.$out["member_uid"]."_MYFILES_". $out["saved_file_name"]; break; case WRENCH_FILE_JOB: $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/JOBS/". $out["saved_file_name"]; + $selectedFile_CACHE_KEY = $this->savePath.'PROFILE_'.$out["member_uid"]."_JOBS_". $out["saved_file_name"]; $error_file ="job_error.png"; break; } // MAKE SURE FOLDER AS PER PROCESS IS AVAILABLE log_message('critical', "wrenchboard_api-CALL MEDIA selectedFile DATA ---> ".$selectedFile ); - if ( $out["saved_file_name"] =='' || !file_exists( $selectedFile) ){ + if ( $out["saved_file_name"] =='' || !file_exists( $selectedFile) && $selectedFile_CACHE_KEY !=''){ log_message('critical', "wrenchboard_api-CALL MEDIA selectedFile DATA ERROR NO FOUND---> ".$selectedFile ); $file = FCPATH.'/assets/images/'.$error_file; @@ -153,7 +157,7 @@ class WrenchMedia extends BaseController log_message('critical', "BEFORE CACHE*********"); if (isset($selectedFile) && $selectedFile!=''){ - $selectedFile_CACHE_KEY = str_replace("/\/", "_", $selectedFile); + // $selectedFile_CACHE_KEY = str_replace("/\/", "_", $selectedFile); $endpoint = "SECUREFILE-".$selectedFile_CACHE_KEY; $this->saveCache($endpoint,$out,10000); }