Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
TimeOutAdmin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TimeOut
TimeOutAdmin
Commits
d0124976
Commit
d0124976
authored
5 years ago
by
Tobin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'dev_production'
dc See merge request
!242
parents
4264c59e
7f9983be
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Api.php
application/controllers/Api.php
+2
-2
No files found.
application/controllers/Api.php
View file @
d0124976
...
@@ -787,8 +787,8 @@ class Api extends CI_Controller {
...
@@ -787,8 +787,8 @@ class Api extends CI_Controller {
}
}
$reqData
=
$this
->
encrypt
(
json_encode
(
$request_data
),
$this
->
local_key
,
$this
->
local_iv
);
$reqData
=
$this
->
encrypt
(
json_encode
(
$request_data
),
$this
->
local_key
,
$this
->
local_iv
);
$reqData
=
urlencode
(
base64_encode
(
$reqData
));
$reqData
=
urlencode
(
base64_encode
(
$reqData
));
$res
[
'data'
][
'reqData'
]
=
$reqData
;
$this
->
response
(
$res
[
'data'
]
);
$this
->
response
(
array
(
'status'
=>
1
,
'data'
=>
array
(
'reqData'
=>
$reqData
))
);
}
catch
(
Exception
$e
)
{
}
catch
(
Exception
$e
)
{
$this
->
errorResponse
(
'894'
,
'Something went wrong, Please try again'
);
$this
->
errorResponse
(
'894'
,
'Something went wrong, Please try again'
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment