Merge branch 'master' of https://bitbucket.org/venbaittech/sparqapi
This commit is contained in:
commit
4ea6d412e5
@ -41,13 +41,13 @@ class video_grabber_helper
|
|||||||
$final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$file_name;
|
$final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$file_name;
|
||||||
$singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 days');
|
$singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 days');
|
||||||
|
|
||||||
|
$shortURL = 'https://lkt.pdgenie.com/' . substr($video_name,0,6);
|
||||||
if($value['short_link_created_date'] == NULL)//make short url entry in links file
|
if($value['short_link_created_date'] == NULL)//make short url entry in links file
|
||||||
{
|
{
|
||||||
$shortURL = 'https://lkt.pdgenie.com/' . substr($video_name,0,6);
|
|
||||||
$localEncryptedURL = PDF_ATTACHEMENT_URL . custom_encryption::encode( 'vdo/'.$date_of_creation.'/'.$pdid.'/'.$value['composition_id']);
|
$localEncryptedURL = PDF_ATTACHEMENT_URL . custom_encryption::encode( 'vdo/'.$date_of_creation.'/'.$pdid.'/'.$value['composition_id']);
|
||||||
$file = "/data/web/shortlink/links.txt";
|
$file = "/data/web/shortlink/links.txt";
|
||||||
$concatinated_url = $shortURL." ". $localEncryptedURL;
|
$concatinated_url = substr($video_name,0,6)." ". $localEncryptedURL;
|
||||||
$myfile = file_put_contents($file, $concatinated_url.PHP_EOL , FILE_APPEND | LOCK_EX);
|
$myfile = file_put_contents($file, $concatinated_url.PHP_EOL , FILE_APPEND | LOCK_EX);
|
||||||
|
|
||||||
//update short_link_created_date in DB
|
//update short_link_created_date in DB
|
||||||
@ -55,7 +55,7 @@ class video_grabber_helper
|
|||||||
$CI->db->update(VIDEO_ROOM_INFO, array('short_link_created_date' => date('Y-m-d H:i:s')));
|
$CI->db->update(VIDEO_ROOM_INFO, array('short_link_created_date' => date('Y-m-d H:i:s')));
|
||||||
|
|
||||||
}
|
}
|
||||||
$result_data[] = array('video_name' => $video_name,'s3_url' => $singed_uri,'url'=>$shortURL,'status' => $value['twilo_status'],'room_id' => $value['room_id'],'id' => $value['video_room_info_id']);
|
$result_data[] = array('video_name' => $video_name,'s3_url' => $singed_uri,'url'=>$singed_uri,'status' => $value['twilo_status'],'room_id' => $value['room_id'],'id' => $value['video_room_info_id'],'shorturl' => $shortURL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user