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
8c6dc18c
Commit
8c6dc18c
authored
6 years ago
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'master' into 'live_production'"
This reverts merge request
!71
parent
e2226904
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Webservice.php
application/controllers/Webservice.php
+6
-6
Webservice_model.php
application/models/Webservice_model.php
+0
-0
No files found.
application/controllers/Webservice.php
View file @
8c6dc18c
...
@@ -104,17 +104,17 @@ class Webservice extends CI_Controller {
...
@@ -104,17 +104,17 @@ class Webservice extends CI_Controller {
public
function
events_details
(
$event_id
=
null
)
{
public
function
events_details
(
$event_id
=
null
)
{
$data
[
'event_id'
]
=
$_GET
[
'event_id'
];
$data
[
'event_id'
]
=
$_GET
[
'event_id'
];
$data
[
'auth_token'
]
=
$this
->
auth_token
;
$data
[
'auth_token'
]
=
$this
->
auth_token
;
$data
[
'event_date_id'
]
=
''
;
if
(
$data
[
'event_id'
]
==
null
)
{
if
(
$data
[
'event_id'
]
==
null
)
{
$this
->
errorResponse
(
"ER16"
,
"Event id is null or empty"
);
die
;
$this
->
errorResponse
(
"ER16"
,
"Event id is null or empty"
);
}
die
;
if
(
isset
(
$_GET
[
'event_date_id'
])
&&
!
empty
(
$_GET
[
'event_date_id'
])){
$data
[
'event_date_id'
]
=
$_GET
[
'event_date_id'
];
}
}
$res
=
$this
->
Webservice_model
->
event
(
$data
);
$res
=
$this
->
Webservice_model
->
event
(
$data
);
if
(
$res
[
'status'
]
!=
0
){
if
(
$res
[
'status'
]
!=
0
){
$this
->
response
(
$res
[
'data'
]);
$this
->
response
(
$res
[
'data'
]);
}
else
{
}
else
{
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
application/models/Webservice_model.php
View file @
8c6dc18c
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