Merge branch 'jansa' into 'master'

application/config/database.php

@@ -75,10 +75,10 @@ $query_builder = TRUE;
 
 $db['default'] = array(
 	'dsn'	=> '',
-	'hostname' => 'localhost',
-	'username' => 'nuvento_timeout',
+	'hostname' => '192.168.140.123',
+	'username' => 'root',
 	'password' => 'Golden_123',
-	'database' => 'nuvento_timeout',
+	'database' => 'tobin_eventTimeOut',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,

application/controllers/Webservice.php

@@ -63,7 +63,6 @@ class Webservice extends CI_Controller {
     }
   }
 
-
   public function check_email_availability() {
     $data = (array) json_decode(file_get_contents('php://input'));
     $res = $this->Webservice_model->availability($data);
@@ -134,7 +133,6 @@ class Webservice extends CI_Controller {
     print json_encode($result);
   }
 
-
   public function successResponse($data) {
     $result =  array(
       'status' => 'success',
@@ -151,7 +149,6 @@ class Webservice extends CI_Controller {
     print json_encode($result);
   }
 
-
   public function get_category_list($query = null) {
     $data['query'] = !empty($_GET['query']) ? $_GET['query'] : '';
     $data['auth_token'] = $this->auth_token;
@@ -176,7 +173,6 @@ class Webservice extends CI_Controller {
     }
   }
 
-
   public function get_cities_list() {
     $data['auth_token'] = $this->auth_token;
     $res = $this->Webservice_model->get_cities_list($data);
@@ -186,10 +182,8 @@ class Webservice extends CI_Controller {
     else{
       $this->errorResponse($res['code'],$res['message']);
     }
-
   }
 
-
   public function update_city(){
     $data = (array) json_decode(file_get_contents('php://input'));
     $data['auth_token'] = $this->auth_token;
@@ -291,6 +285,7 @@ class Webservice extends CI_Controller {
       $this->errorResponse($res['code'],$res['message']);
     }
   }
+
   public function cancel_booking() {    
     $data = (array) json_decode(file_get_contents('php://input'));
     $data['auth_token'] = $this->auth_token;
@@ -364,7 +359,6 @@ class Webservice extends CI_Controller {
   }
   
   public function get_last_booking() {
-      
     $data['auth_token'] = $this->auth_token;
     $res = $this->Webservice_model->get_last_booking($data);
     if($res['status']!=0){
@@ -410,7 +404,6 @@ class Webservice extends CI_Controller {
 
   public function get_app_version(){
     $res = $this->Webservice_model->get_app_version();
-
     if($res['status'] != 0)
       $this->response($res['data']);
     else
@@ -421,7 +414,6 @@ class Webservice extends CI_Controller {
     $data = (array) json_decode(file_get_contents('php://input'));
     $data['auth_token'] = $this->auth_token;
     $res = $this->Webservice_model->logout($data);
-
     if($res['status'] != 0)
       $this->successResponse($res);
     else
@@ -435,7 +427,6 @@ class Webservice extends CI_Controller {
     }
     $data = $_GET;   
     $data['auth_token'] = $this->auth_token;
-
     $res = $this->Webservice_model->event_search($data);
     if($res['status']!=0){
       $this->response($res['data']);
@@ -452,7 +443,6 @@ class Webservice extends CI_Controller {
        empty($settings['currency_api'])){
       return;
     }
-
     $sourceCur = (!empty($settings['currency']))?$settings['currency']:'SAR';
     $coma = '';
     $convertCur = '';
@@ -460,20 +450,16 @@ class Webservice extends CI_Controller {
       $convertCur .= $coma.$curr['currency'];
       $coma = ',';
     }
-
     $params  = 'currencies='.$convertCur;
     $params .= '&source='.$sourceCur;
     $params .= '&access_key='.$settings['currency_api'];
     $apiUrl  = "http://apilayer.net/api/live?".$params;
-
     $ch = curl_init($apiUrl);
     curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
     $json = curl_exec($ch);
     curl_close($ch);
     $exchangeRates = json_decode($json, true);
-
-    if(empty($exchangeRates) || !isset($exchangeRates['quotes']) || 
-       empty($conversion = $exchangeRates['quotes'])){
+    if(empty($exchangeRates) || !isset($exchangeRates['quotes']) || empty($conversion = $exchangeRates['quotes'])){
       return;
     }
     foreach($conversion AS $curr => $rate) {