Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -720,19 +720,25 @@ class Webservice_model extends CI_Model {
 		$query_userdatas = $this->db->get_where("tbl_registration",array("uid"=>$data));
 		if($query_userdatas->num_rows() > 0){
 			$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");
+			$this->db->where('uid',$data);
+			$querydate = $this->db->get('tbl_registration')->row();
+
+			$query_userdata['dob'] = $querydate->dob_new;
+			$query_userdata['name'] = $query_userdata['name'] == "" ? "" :decrypt_data($query_userdata['name']);
+			$query_userdata['rg'] = $query_userdata['rg'] == "" ? "" :decrypt_data($query_userdata['rg']);
 			/*$query_userdata['dob'] = $query_userdata['dob_new'];
 			unset($query_userdata['dob_new']);*/
-			$query_userdata['gender'] = decrypt_data($query_userdata['gender']);
-			$query_userdata['weight'] = decrypt_data($query_userdata['weight']);
-			$query_userdata['height'] = decrypt_data($query_userdata['height']);
-			$query_userdata['blood_group'] = decrypt_data($query_userdata['blood_group']);
-			$query_userdata['zip_code'] = decrypt_data($query_userdata['zip_code']);
-			$query_userdata['street_address'] = decrypt_data($query_userdata['street_address']);
-			$query_userdata['locality'] = decrypt_data($query_userdata['locality']);
-			$query_userdata['number'] = decrypt_data($query_userdata['number']);
-			$query_userdata['landmark'] = decrypt_data($query_userdata['landmark']);
+			$query_userdata['gender'] = $query_userdata['gender'] == "" ? "" :decrypt_data($query_userdata['gender']);
+			$query_userdata['weight'] = $query_userdata['weight'] == "" ? "" :decrypt_data($query_userdata['weight']);
+			$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']);
 			$return_array = array('status'=>'success','userdata'=>$query_userdata);
 		}
 		else{