diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 5a336bf6..4e99c6cd 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -231,16 +231,13 @@ class Sales_PD_Controller extends REST_Controller { $this->Sales_PD_Model->updateRecords(array('is_pdf' => 1, 'is_edited' => 0),SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id)); if($api) { - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); - ## NEW KEY BECAUSE TITLE-RENAME - if(curl_init($singed_uri) !== false){ ##THERE IS NO FILE in NEW KEY means we using OLD KEY. So that using if Cond. - $old_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); - $old_pdf_name .= '-'.$sales_pd_data[0]['abbr']; - $old_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); - $old_key = 'sales_pd/'.$sales_pd_id.'/'.$old_pdf_name.'.pdf'; - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); - } - + $_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); + $headers = @get_headers($_uri); + if($headers && strpos( $headers[0], '200')) { + $singed_uri = $_uri; + }else { + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); + } $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['records'] = $singed_uri; @@ -253,10 +250,13 @@ class Sales_PD_Controller extends REST_Controller { if($api) { ## NEW KEY BECAUSE TITLE-RENAME - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); - if(curl_init($singed_uri) === false){ ##THERE IS NO FILE in NEW KEY means we using OLD KEY. So that using if Cond. - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); - } + $_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'30 minutes'); + $headers = @get_headers($_uri); + if($headers && strpos( $headers[0], '200')) { + $singed_uri = $_uri; + }else { + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$old_key,'30 minutes'); + } $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['records'] = $singed_uri; diff --git a/api/application/helpers/pdalerts_helper.php b/api/application/helpers/pdalerts_helper.php index 16055e8e..c880f3f8 100644 --- a/api/application/helpers/pdalerts_helper.php +++ b/api/application/helpers/pdalerts_helper.php @@ -622,15 +622,18 @@ class PDALERTS $content = "Dear Team

Please find enclosed the sales PD report." ; $key = 'sales_pd/'.$sales_pd_id.'/'.$pdf_name.'.pdf'; ## NEW KEY BECAUSE TITLE-RENAME - $singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI((LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']),$key,'+5 minutes'); - if(curl_init($singed_uri) === false){ ##THERE IS NO FILE in NEW KEY means we using OLD KEY. So that using if Cond. - $old_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); - $old_pdf_name .= '-'.$sales_pd_data[0]['abbr']; - $old_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); - $old_key = 'sales_pd/'.$sales_pd_id.'/'.$old_pdf_name.'.pdf'; - $file_name = $old_pdf_name.'.pdf'; - $singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI((LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']),$old_key,'+5 minutes');; - } + $_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI((LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']),$key,'+5 minutes'); + $headers = @get_headers($_uri); + if($headers && strpos( $headers[0], '200')) { + $singed_uri = $_uri; + }else { + $old_pdf_name = strtolower(trim($sales_pd_data[0]['applicant_name'])); + $old_pdf_name .= '-'.$sales_pd_data[0]['abbr']; + $old_pdf_name .= '-'.(date('dmY',strtotime($sales_pd_data[0]['completed_date']))); + $old_key = 'sales_pd/'.$sales_pd_id.'/'.$old_pdf_name.'.pdf'; + $file_name = $old_pdf_name.'.pdf'; + $singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI((LENDER_BUCKET_NAME_PREFIX.$sales_pd_data[0]['lender_id']),$old_key,'+5 minutes');; + } //echo $singed_uri; return array($mail_subject,$file_name,$content,$singed_uri); }