Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbaittech/sparqapi

Browse Source
This commit is contained in:
venbaSriram 2018-09-20 11:04:00 +05:30
commit f11734c681
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/application/config/constants.php
View File

@ -85,7 +85,8 @@ defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automat
defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
// define login route name for token verification
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'login'); // no errors
/*********************AWS resources Constants*************************************************/
defined('PROFILEPICTUREBUCKETNAME') OR define('PROFILEPICTUREBUCKETNAME','sineedgedevprofilepic');

2
api/application/controllers/Branch_Controller.php
View File

@ -134,7 +134,7 @@ class Branch_Controller extends REST_Controller {
$s3_signed_urls = array();
foreach($r as $k)
{
if($k['Key'] != $folder_name.'/') array_push($s3_signed_urls,$this->aws_s3->getSingleObjectInaBucket($bucket_name,$k['Key']));
if($k['Key'] != $folder_name.'/') array_push($s3_signed_urls,$this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$k['Key']));
}
print_r($s3_signed_urls);

3
api/application/libraries/AWS_S3.php
View File

@ -46,7 +46,7 @@ class AWS_S3
try {
$result = $this->S3->createBucket(['Bucket' => $BUCKET_NAME,'ACL' => 'authenticated-read']);
print_r($result);
//print_r($result);
} catch (AwsException $e) {
// output error message if fails
echo $e->getMessage();
@ -76,6 +76,7 @@ class AWS_S3
return $result;
}
/* This Function return signed URI of single S3 Object*/
public function getSingleObjectInaBucketAsSignedURI($bucket_name,$folder_name)//get as singed url
{
$result = array();