Skip to content

I
IPok_Web
Commit bf8c46e4 by Jansa Jose
Options

Merge branch 'jansa'

parents cdd0b2ad 73a21cc8
Showing with 28 additions and 17 deletions
admin/application/controllers/Webservice.php
...@@ -3887,7 +3887,7 @@ class Webservice extends CI_Controller { ...@@ -3887,7 +3887,7 @@ class Webservice extends CI_Controller {
"auth_token"=>$authToken, "auth_token"=>$authToken,
"user"=>array( "user"=>array(
"user_id"=> $result['userdata']['id'], "user_id"=> $result['userdata']['id'],
"name"=> "", "name"=> decrypt_data($result['userdata']['name']),
"username"=> "", "username"=> "",
"email"=> $result['userdata']['email'], "email"=> $result['userdata']['email'],
"password" => "", "password" => "",
......
admin/application/models/Webservice_model.php
...@@ -622,17 +622,25 @@ class Webservice_model extends CI_Model { ...@@ -622,17 +622,25 @@ class Webservice_model extends CI_Model {
$query_userdatas = $this->db->get_where("tbl_registration",array("email"=>$data)); $query_userdatas = $this->db->get_where("tbl_registration",array("email"=>$data));
if($query_userdatas->num_rows() > 0){ if($query_userdatas->num_rows() > 0){
$query_userdata = $query_userdatas->row_array(); $query_userdata = $query_userdatas->row_array();
$query_userdata['name'] = decrypt_data($query_userdata['name']);
$query_userdata['rg'] = decrypt_data($query_userdata['rg']); $this->db->select("CAST(AES_DECRYPT(`tbl_registration`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new");
$query_userdata['gender'] = decrypt_data($query_userdata['gender']); $this->db->where('id',$query_userdata['id']);
$query_userdata['weight'] = decrypt_data($query_userdata['weight']); $querydate = $this->db->get('tbl_registration')->row();
$query_userdata['height'] = decrypt_data($query_userdata['height']);
$query_userdata['blood_group'] = decrypt_data($query_userdata['blood_group']); $query_userdata['dob'] = $query_userdata['dob'] == "" ? "" : $query_userdata['dob'];
$query_userdata['zip_code'] = decrypt_data($query_userdata['zip_code']); $query_userdata['name'] = $query_userdata['name']==""? "" :decrypt_data($query_userdata['name']);
$query_userdata['street_address'] = decrypt_data($query_userdata['street_address']); $query_userdata['rg'] = $query_userdata['rg']==""? "" : decrypt_data($query_userdata['rg']);
$query_userdata['locality'] = decrypt_data($query_userdata['locality']); $query_userdata['gender'] = $query_userdata['gender']==""? "" : decrypt_data($query_userdata['gender']);
$query_userdata['number'] = decrypt_data($query_userdata['number']); $query_userdata['weight'] = $query_userdata['weight']==""? "" : decrypt_data($query_userdata['weight']);
$query_userdata['landmark'] = decrypt_data($query_userdata['landmark']); $query_userdata['height'] = $query_userdata['height']==""? "" : decrypt_data($query_userdata['height']);
$query_userdata['blood_group'] = $query_userdata['blood_group']==""? "" : decrypt_data($query_userdata['blood_group']);
$query_userdata['zip_code'] = $query_userdata['zip_code']==""? "" : decrypt_data($query_userdata['zip_code']);
$query_userdata['street_address'] = $query_userdata['street_address']==""? "" : decrypt_data($query_userdata['street_address']);
$query_userdata['locality'] = $query_userdata['locality']==""? "" : decrypt_data($query_userdata['locality']);
$query_userdata['number'] = $query_userdata['number']==""? "" : decrypt_data($query_userdata['number']);
$query_userdata['landmark'] = $query_userdata['landmark']==""? "" : decrypt_data($query_userdata['landmark']);
$query_userdata['profile_photo'] = $query_userdata['profile_photo']==""? "" : decrypt_data($query_userdata['profile_photo']);
$query_userdata['username'] = $query_userdata['username']==""? "" : decrypt_data($query_userdata['username']);
$return_array = array('status'=>'success','userdata'=>$query_userdata); $return_array = array('status'=>'success','userdata'=>$query_userdata);
} }
else{ else{
...@@ -720,12 +728,15 @@ class Webservice_model extends CI_Model { ...@@ -720,12 +728,15 @@ class Webservice_model extends CI_Model {
$query_userdatas = $this->db->get_where("tbl_registration",array("uid"=>$data)); $query_userdatas = $this->db->get_where("tbl_registration",array("uid"=>$data));
if($query_userdatas->num_rows() > 0){ if($query_userdatas->num_rows() > 0){
$query_userdata = $query_userdatas->row_array(); $query_userdata = $query_userdatas->row_array();
//print_r($query_userdata);
$this->db->select("CAST(AES_DECRYPT(`tbl_registration`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new"); $this->db->select("CAST(AES_DECRYPT(`tbl_registration`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new");
$this->db->where('uid',$data); $this->db->where('uid',$data);
$querydate = $this->db->get('tbl_registration')->row(); $querydate = $this->db->get('tbl_registration')->row();
//print_r($querydate);
$query_userdata['dob'] = $querydate->dob_new; $query_userdata['dob'] = $querydate->dob_new== ''?'':$querydate->dob_new;
$query_userdata['name'] = $query_userdata['name'] == "" ? "" :decrypt_data($query_userdata['name']); $query_userdata['name'] = $query_userdata['name'] == "" ? "" :decrypt_data($query_userdata['name']);
$query_userdata['rg'] = $query_userdata['rg'] == "" ? "" :decrypt_data($query_userdata['rg']); $query_userdata['rg'] = $query_userdata['rg'] == "" ? "" :decrypt_data($query_userdata['rg']);
/*$query_userdata['dob'] = $query_userdata['dob_new']; /*$query_userdata['dob'] = $query_userdata['dob_new'];
...@@ -815,10 +826,10 @@ class Webservice_model extends CI_Model { ...@@ -815,10 +826,10 @@ class Webservice_model extends CI_Model {
$query_userdatas = $this->db->get_where("tbl_registration",array("id"=>$insertid)); $query_userdatas = $this->db->get_where("tbl_registration",array("id"=>$insertid));
if($query_userdatas->num_rows() > 0){ if($query_userdatas->num_rows() > 0){
$query_userdata = $query_userdatas->row_array(); $query_userdata = $query_userdatas->row_array();
$query_userdata['name'] = decrypt_data($query_userdata['name']); /*$query_userdata['name'] = decrypt_data($query_userdata['name']);
$query_userdata['rg'] = decrypt_data($query_userdata['rg']); $query_userdata['rg'] = decrypt_data($query_userdata['rg']);
/*$query_userdata['dob'] = $query_userdata['dob_new']; /*$query_userdata['dob'] = $query_userdata['dob_new'];
unset($query_userdata['dob_new']);*/ unset($query_userdata['dob_new']);
$query_userdata['gender'] = decrypt_data($query_userdata['gender']); $query_userdata['gender'] = decrypt_data($query_userdata['gender']);
$query_userdata['weight'] = decrypt_data($query_userdata['weight']); $query_userdata['weight'] = decrypt_data($query_userdata['weight']);
$query_userdata['height'] = decrypt_data($query_userdata['height']); $query_userdata['height'] = decrypt_data($query_userdata['height']);
...@@ -827,7 +838,7 @@ class Webservice_model extends CI_Model { ...@@ -827,7 +838,7 @@ class Webservice_model extends CI_Model {
$query_userdata['street_address'] = decrypt_data($query_userdata['street_address']); $query_userdata['street_address'] = decrypt_data($query_userdata['street_address']);
$query_userdata['locality'] = decrypt_data($query_userdata['locality']); $query_userdata['locality'] = decrypt_data($query_userdata['locality']);
$query_userdata['number'] = decrypt_data($query_userdata['number']); $query_userdata['number'] = decrypt_data($query_userdata['number']);
$query_userdata['landmark'] = decrypt_data($query_userdata['landmark']); $query_userdata['landmark'] = decrypt_data($query_userdata['landmark']);*/
$return_array = array('status'=>'success','userdata'=>$query_userdata); $return_array = array('status'=>'success','userdata'=>$query_userdata);
} }
else{ else{
......
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