Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -1072,10 +1072,10 @@ class Webservice_model extends CI_Model {
 			$this->db->select("CAST(AES_DECRYPT(`tbl_doctors`.`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob_new");
 			$this->db->where('id',$query['id']);
 			$querydate = $this->db->get('tbl_doctors')->row();
-			$query['dob'] = $query_date->dob_new;
-			$query['cep'] = decrypt_data($query['zip_code']);
-			$query['complement'] = decrypt_data($query['landmark']);
-			$query['about'] = decrypt_data($query['biodata']);
+			$query['dob'] = $querydate->dob_new;
+			$query['cep'] = decrypt_data($query['cep']);
+			$query['complement'] = decrypt_data($query['complement']);
+			$query['about'] = decrypt_data($query['about']);
 			$query['gender'] = decrypt_data($query['gender']);
 			//$query['name'] = decrypt_data($query['name']);
 			//$query['price'] = decrypt_data($query['price']);

application/controllers/Doctor.php

@@ -1298,7 +1298,7 @@ public function saveProfile()
 		//$update_data['name'] = $this->encrypt->encode($update_data['name']);
 		$update_data['rg'] = $this->encrypt->encode($update_data['rg']);
 		//$update_data['cpf'] = $this->encrypt->encode($update_data['cpf']);
-		$update_data['telephone'] = $this->encrypt->encode($update_data['telephone']);
+		//$update_data['telephone'] = $this->encrypt->encode($update_data['telephone']);
 		$update_data['gender'] = $this->encrypt->encode($update_data['gender']);
 		$update_data['cep'] = $this->encrypt->encode($update_data['cep']);
 		$update_data['street_address'] = $this->encrypt->encode($update_data['street_address']);

application/models/Home_model.php

@@ -588,9 +588,8 @@
 
 			$key = $this->config->item('encryption_key');
 			
-
-			$this->db->query("update tbl_registration set dob = AES_ENCRYPT(".$data['dob'].",'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA')where id = ".$insertid);
-			//$this->db->query("Update tbl_doctors SET dob = AES_ENCRYPT(".$data['dob'].",".$key."), name = AES_ENCRYPT('".$data['name']."',".$key.") where id=".$insertid);		
+			
+			$this->db->query("Update tbl_doctors SET dob = AES_ENCRYPT(".$data['dob'].",".$key."), name = AES_ENCRYPT('".$data['name']."',".$key.") where id=".$insertid);		
 
 			$this->db->insert('tbl_clinic_doctors',array('doctor_id'=>$insertid,'clinic_id'=> 0));	
 			$this->db->insert('tbl_consultation',array('doctor_id'=>$insertid,'clinic_id'=> 0,'date'=>'""','date_secondary'=>'""','active_schedule'=> 0));