Commit 64817b13 by Tobin

dc

parent 78f2ab76
...@@ -16,7 +16,7 @@ class Api_model extends CI_Model { ...@@ -16,7 +16,7 @@ class Api_model extends CI_Model {
$this->db->join('customer','customer.customer_id = users.id'); $this->db->join('customer','customer.customer_id = users.id');
$result = $this->db->get()->row(); $result = $this->db->get()->row();
if($result){ if($result){
$result->dob = (!empty($result->dob))?date("m/d/Y",$result->dob):''; $result->dob = (!empty($result->dob))?date("m/d/Y",$result->dob/1000):'';
$result->auth_token = md5(microtime().rand()); $result->auth_token = md5(microtime().rand());
$this->generateAuth($result->userId,$result->auth_token); $this->generateAuth($result->userId,$result->auth_token);
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
...@@ -96,7 +96,7 @@ class Api_model extends CI_Model { ...@@ -96,7 +96,7 @@ class Api_model extends CI_Model {
$this->db->join('customer','customer.customer_id = users.id'); $this->db->join('customer','customer.customer_id = users.id');
$result = $this->db->get()->row(); $result = $this->db->get()->row();
if($result){ if($result){
$result->dob = (!empty($result->dob))?date("m/d/Y",$result->dob):''; $result->dob = (!empty($result->dob))?date("m/d/Y",$result->dob/1000):'';
$result->auth_token = md5(microtime().rand()); $result->auth_token = md5(microtime().rand());
$this->generateAuth($result->userId,$result->auth_token); $this->generateAuth($result->userId,$result->auth_token);
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
...@@ -466,7 +466,7 @@ class Api_model extends CI_Model { ...@@ -466,7 +466,7 @@ class Api_model extends CI_Model {
$post_data = $data; $post_data = $data;
unset($post_data['file']); unset($post_data['file']);
unset($post_data['auth_token']); unset($post_data['auth_token']);
$post_data['dob'] = (!empty($post_data['dob']))?strtotime($post_data['dob']):''; $post_data['dob'] = (!empty($post_data['dob']))?strtotime($post_data['dob'])*1000:'';
if(isset($data['file'])){ if(isset($data['file'])){
$img=$data['file']['name']; $img=$data['file']['name'];
$expbanner = explode('.',$img); $expbanner = explode('.',$img);
...@@ -503,7 +503,7 @@ class Api_model extends CI_Model { ...@@ -503,7 +503,7 @@ class Api_model extends CI_Model {
$this->db->join('customer','customer.customer_id = users.id'); $this->db->join('customer','customer.customer_id = users.id');
$result = $this->db->get()->row(); $result = $this->db->get()->row();
if($result){ if($result){
$result->dob = (!empty($result->dob))?date("m/d/Y", $result->dob):''; $result->dob = (!empty($result->dob))?date("m/d/Y", ($result->dob)/1000):'';
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
} else { } else {
$res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19'); $res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19');
...@@ -1096,4 +1096,4 @@ class Api_model extends CI_Model { ...@@ -1096,4 +1096,4 @@ class Api_model extends CI_Model {
return $res; return $res;
} }
} }
?> ?>
\ No newline at end of file
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