Commit 4f9cf5da by Tobin

Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

parents 5be3d254 8ee352ca
...@@ -75,10 +75,10 @@ $query_builder = TRUE; ...@@ -75,10 +75,10 @@ $query_builder = TRUE;
$db['default'] = array( $db['default'] = array(
'dsn' => '', 'dsn' => '',
'hostname' => '192.168.140.123', 'hostname' => 'localhost',
'username' => 'root', 'username' => 'nuvento_timeout',
'password' => 'Golden_123', 'password' => 'Golden_123',
'database' => 'tobin_eventTimeOut', 'database' => 'nuvento_timeout',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,
......
...@@ -39,8 +39,7 @@ class OrganizerServices extends CI_Controller { ...@@ -39,8 +39,7 @@ class OrganizerServices extends CI_Controller {
if($res['state'] == 1) { if($res['state'] == 1) {
$this->errorResponse($res['response']['code'], $res['response']['message']); $this->errorResponse($res['response']['code'], $res['response']['message']);
die; die;
} }
} }
public function response($data) { public function response($data) {
...@@ -68,7 +67,6 @@ class OrganizerServices extends CI_Controller { ...@@ -68,7 +67,6 @@ class OrganizerServices extends CI_Controller {
print json_encode($result); print json_encode($result);
} }
public function getOrganizerEventList(){ public function getOrganizerEventList(){
$data = (array) json_decode(file_get_contents('php://input')); $data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->getOrganizerEventList($data); $res = $this->Organizer_model->getOrganizerEventList($data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment