Merge branch 'jansa' into anju

admin/application/controllers/Webservice.php

@@ -3932,10 +3932,11 @@ print_r(date('H:i',$ms));exit();*/
 		//$data = $_POST;
 		$headers =  apache_request_headers();
 		//$data =(array) json_decode(file_get_contents("php://input"));
-		$data = $_POST;
-		if(isset($data['fcm_token']) && strlen($data['fcm_token']) && isset($headers['Auth']) && strlen($headers['Auth'])){
-			$check_authToken = $this->Webservice_model->check_auth_token($headers['Auth']);
+		$data = (array) json_decode(file_get_contents("php://input"));;
+		if( isset($headers['Auth']) && strlen($headers['Auth'])){
+			$check_authToken = $this->Webservice_model->check_auth_token_doctor($headers['Auth']);
 			if($check_authToken){
+				if(isset($data['fcm_token']) && strlen($data['fcm_token'])){
 				$result = $this->Webservice_model->update_fcm_token_doctor($data,$headers['Auth']);
 					if($result['status'] == 'success'){
 						$res = array("status"=>'success');
@@ -3947,6 +3948,13 @@ print_r(date('H:i',$ms));exit();*/
 										"message"=> "updation failed"
 									);
 					}
+				}else{
+					$res =  array(
+					"status"=> "error",
+					"error"=> "Not Valid",
+					"message"=> "Fcm token is required"
+					);
+				}
 			}
 			else{
 				$res =  array(
@@ -6890,14 +6898,14 @@ print_r(date('H:i',$ms));exit();*/
 						$token = json_decode($request);
 
 						if ($check_markbooking['count'] != 1) {
-							$res = array('status' => 'fail', 'payment_status' => '0', 'message' => 'No Booking Found');
+							$res = array('status' => 'error', 'payment_status' => '0', 'message' => 'No Booking Found');
 						}
 						elseif(!empty($token->errors->number)) {
-							$res = array('status' => 'fail', 'payment_status' => '0', 'message' => 'Invalid Card Provided');
+							$res = array('status' => 'error', 'payment_status' => '0', 'message' => 'Invalid Card Provided');
 						}
 						else {
 							if (empty($patient_data['pt_customer_id'])) {
-								$create_customer = array('email' => $patient_data['pt_email'], 'name' => $patient_data['pt_name'], 'cpf_cnpj' => $patient_data['pt_cpf'], 'zip_code' => $patient_data['pt_zip_code'], 'street' => $patient_data['pt_street_add'], 'number' => $patient_data['pt_number'], 'complement' => $patient_data['pt_complement']);
+								$create_customer = array('email' => $patient_data['pt_email'], 'name' => $patient_data['pt_name'], /*'cpf_cnpj' => $patient_data['pt_cpf'],*/ 'zip_code' => $patient_data['pt_zip_code'], 'street' => $patient_data['pt_street_add'], 'number' => $patient_data['pt_number'], 'complement' => $patient_data['pt_complement']);
 								$request = load_curl('https://api.iugu.com/v1/customers', $create_customer);
 								$customer = json_decode($request);
 								$this->Webservice_model->update_profile($patient_data['patientid'], array('customer_id' => $customer->id));

admin/application/models/Exam_model.php

@@ -11,15 +11,24 @@ class Exam_model extends CI_Model {
  		if($check_exam_name->num_rows() > 0){
  			return false;
  		}else{*/
- 			if($this->db->insert('tbl_exams',array('exam_procedure'=>encrypt_data(ucfirst($examData['exam_procedure'])),'observation'=>encrypt_data(ucfirst($examData['observation']))))) {
+ 			$exam_procedure = ucfirst($examData['exam_procedure']);
+ 			$observation = ucfirst($examData['observation']);
+ 			
+ 			if($this->db->query("INSERT INTO `tbl_exams`(`exam_procedure`, `observation`) VALUES (AES_ENCRYPT('".$exam_procedure."','Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA'),AES_ENCRYPT('".$observation."','Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA'))")){
  				return true; 	
  			}
+ 			// if($this->db->insert('tbl_exams',array('exam_procedure'=>encrypt_data(ucfirst($examData['exam_procedure'])),'observation'=>encrypt_data(ucfirst($examData['observation']))))) {
+ 			// 	return true;
+ 			// }
  		//}
  	}
  	function get_all_exams(){
+ 		$this->db->select("CAST(AES_DECRYPT(`exam_procedure`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as exam_procedure,id,CAST(AES_DECRYPT(`observation`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as observation");
  		$all_exams = $this->db->get('tbl_exams');
  		if($all_exams->num_rows() > 0){
  			$result = $all_exams->result_array();
+ 			/*echo $this->db->last_query();exit();
+ 			print_r($result);exit();*/
  			return $result;
  		}
  	}
@@ -29,6 +38,7 @@ class Exam_model extends CI_Model {
  		}
  	}
  	function get_single_exam($id){
+ 		$this->db->select("CAST(AES_DECRYPT(`exam_procedure`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as exam_procedure,id,CAST(AES_DECRYPT(`observation`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as observation ");
  		$single_exams = $this->db->get_where('tbl_exams',array('id' => $id));
  		if($single_exams->num_rows() > 0){
  			return $single_exams->row_array();
@@ -41,9 +51,14 @@ class Exam_model extends CI_Model {
  		if($res){
           return false;
  		}else{*/
-	 		if($this->db->update('tbl_exams',array('exam_procedure'=>encrypt_data(ucfirst($data['exam_procedure'])),'observation'=>encrypt_data(ucfirst($data['observation']))),array('id'=>$id))){
+ 			$exam_procedure = ucfirst($data['exam_procedure']);
+ 			$observation = ucfirst($data['observation']);
+ 			if($this->db->query("update `tbl_exams` set `exam_procedure` = AES_ENCRYPT('".$exam_procedure."','Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA'),`observation` = AES_ENCRYPT('".$observation."','Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') where id = $id ")) {
  				return true; 	
  			}
+	 		/*if($this->db->update('tbl_exams',array('exam_procedure'=>encrypt_data(ucfirst($data['exam_procedure'])),'observation'=>encrypt_data(ucfirst($data['observation']))),array('id'=>$id))){
+	 			return true;
+	 		}*/
  		//}
  	}
  }
\ No newline at end of file

admin/application/views/ManageExams/addExams.php

@@ -92,8 +92,8 @@
                       ?> 
                               <tr>
                               <td class="hidden"><?php echo $exams['id'];?></td>
-                              <td><?php echo decrypt_data($exams['exam_procedure']);?></td>
-                              <td><i><?php echo decrypt_data($exams['observation']);?></i></td>
+                              <td><?php echo $exams['exam_procedure'];?></td>
+                              <td><i><?php echo $exams['observation'];?></i></td>
                               <td>
                               <a class='btn btn-sm btn-primary' href='<?php echo base_url(); ?>ManageExams/exams_edit/<?php echo $exams['id']; ?>'> <i class='fa fa-fw fa-edit'></i> Edit </a> 
                               <a class='btn btn-sm btn-danger' href='<?php echo base_url(); ?>ManageExams/exams_delete/<?php echo $exams['id']; ?>'> <i class='fa fa-fw fa-trash'></i> Delete </a>

admin/application/views/ManageExams/editExams.php

@@ -44,11 +44,11 @@ if(isset($data)) {
                    
                     <div class="form-group">
                       <label>Exam or Procedure</label>
-                      <input type="text" name="exam_procedure" value="<?php echo decrypt_data($data['exam_procedure']);?>" class="form-control required" placeholder="Enter Exams or Procedure" data-parsely-minlength="10" data-parsley-required="true">
+                      <input type="text" name="exam_procedure" value="<?php echo $data['exam_procedure'];?>" class="form-control required" placeholder="Enter Exams or Procedure" data-parsely-minlength="10" data-parsley-required="true">
                     </div>
                     <div class="form-group">
                       <label>Observation</label>
-                      <input type="text" name="observation" value="<?php echo decrypt_data($data['observation']);?>" class="form-control required" placeholder="Enter Observation" data-parsley-required="true">
+                      <input type="text" name="observation" value="<?php echo $data['observation'];?>" class="form-control required" placeholder="Enter Observation" data-parsley-required="true">
                     </div>
                     
                   </div><!-- /.box-body -->

application/controllers/Doctor.php

@@ -846,12 +846,11 @@ public function recordsummary()
  		$doctor_data = $this->Doctor_model->get_single_doctor($booking_details['doc_id']);
  		$patient_data = $this->Patient_model->get_single_patient($booking_details['pat_id']);
 
- 		
- 		$record_data['diseases'] = json_decode($record_data['diseases']);
- 		$record_data['prescribtions'] = json_decode($record_data['prescribtions']);
- 		$record_data['exams'] = json_decode($record_data['exams']);
- 		$record_data['budget'] = json_decode($record_data['budget']);
- 		$record_data['letters'] = json_decode($record_data['letters']);
+ 		$record_data['diseases'] = json_decode($this->encrypt->decode($record_data['diseases'])); 
+ 		$record_data['prescribtions'] = json_decode($this->encrypt->decode($record_data['prescribtions']));
+ 		$record_data['exams'] = json_decode($this->encrypt->decode($record_data['exams']));
+ 		$record_data['budget'] = json_decode($this->encrypt->decode($record_data['budget']));
+ 		$record_data['letters'] = json_decode($this->encrypt->decode($record_data['letters']));
 
 
  		//print_r($record_data);die();
@@ -921,15 +920,15 @@ public function save_medicalrecord_data()
 		{
 			$disease['anamnese'] = $anamnese;
 			$myJSON = json_encode($disease);	
-			$insert_array['diseases'] = $myJSON;
+			$insert_array['diseases'] = $this->encrypt->encode($myJSON);
 		}
 
 		if(!empty($_POST['description']) and (isset($_POST['description'])))
 		{
-			$insert_array['description'] = $_POST['description'];
+			$insert_array['description'] = $this->encrypt->encode($_POST['description']);
 		}
 
-		$insert_array['main_complaint'] = $_POST['main_complaint'];
+		$insert_array['main_complaint'] = $this->encrypt->encode($_POST['main_complaint']);
 
 		$update = $this->Doctor_model->update_records($_POST['booking_id'],$insert_array);
 		if($update)
@@ -953,7 +952,7 @@ public function save_medicalrecord_data()
 		}
 
 		$myJSON = json_encode($medicine); //json encoding for db entry
-		$insert_array['prescribtions'] = $myJSON;
+		$insert_array['prescribtions'] = $this->encrypt->encode($myJSON);
 
 		$update = $this->Doctor_model->update_records($_POST['booking_id'],$insert_array);
 		if($update)
@@ -977,7 +976,7 @@ public function save_medicalrecord_data()
 		$new[] = $exam;
 		//print_r(json_encode($new));exit();
 		$myJSON = json_encode($new); //json encoding for db entry
-		$insert_array['exams'] = $myJSON;
+		$insert_array['exams'] = $this->encrypt->encode($myJSON);
 
 		$update = $this->Doctor_model->update_records($_POST['booking_id'],$insert_array);
 		if($update)
@@ -1001,7 +1000,7 @@ public function save_medicalrecord_data()
 
 		$myJSON = json_encode($budget); //json encoding for db entry
 
-		$insert_array['budget'] = $myJSON;
+		$insert_array['budget'] = $this->encrypt->encode($myJSON);
 
 		$update = $this->Doctor_model->update_records($_POST['booking_id'],$insert_array);
 		if($update)
@@ -1031,7 +1030,7 @@ public function save_medicalrecord_data()
 		$letter_json = json_encode($postdata);
 		//print_r($letter_json);die();
 
-		$insert_array['letters'] = $letter_json;
+		$insert_array['letters'] = $this->encrypt->encode($letter_json);
 
 		$update = $this->Doctor_model->update_records($_POST['booking_id'],$insert_array);
 		if($update)
@@ -1070,7 +1069,7 @@ public function save_medicalrecord_data()
 			$booking_details = $this->Search_doctor_model->get_booking_details($_POST['booking_id']);
 			$patient_data = $this->Patient_model->get_single_patient($booking_details['patient_id']);
 
-			$text = 'The patient '.$patient_data['pt_name'].' evaluated his consultation on '.date('d.m.Y',$booking_details['time_start']);
+			$text = 'The patient '.$this->encrypt->encode($patient_data['pt_name']).' evaluated his consultation on '.date('d.m.Y',$booking_details['time_start']);
 
 			$notification = array('doctor_id' => $booking_details['doctor_id'],'type'=>1,'message'=>$text,'read_status'=>0,'time'=>strtotime($nowin_server) );
 			$doctor_insert_id = $this->Home_model->insert_notification_doctor($notification);
@@ -1204,6 +1203,7 @@ public function get_exam_details()
 {
 	$name = $_POST['exam_name'];
 	$exam = $this->Doctor_model->get_exam_for_name($name);
+	//echo $this->db->last_query();
 	print json_encode($exam);
 }
 
@@ -1258,7 +1258,9 @@ public function check_username_edit()
 public function saveProfile()
 {
 	$userdata = $this->session->userdata('UserData');
+	
 	$_POST['dob'] = strtotime($_POST['dob']);
+	
 	if(isset($_POST) and !empty($_POST))
 	{
 		$update_data = $_POST;
@@ -1290,11 +1292,30 @@ public function saveProfile()
 			unset($update_data['profile_pic']);
 		}
 		//print_r($update_data);die();
+
+
+		/*encryption*/
+		$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['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']);
+		$update_data['locality'] = $this->encrypt->encode($update_data['locality']);
+		$update_data['number'] = $this->encrypt->encode($update_data['number']);
+		$update_data['complement'] = $this->encrypt->encode($update_data['complement']);
+		$update_data['about'] = $this->encrypt->encode($update_data['about']);
+		$update_data['crm'] = $this->encrypt->encode($update_data['crm']);
+		/*encryption*/
+
+
+	
 		$update = $this->Doctor_model->update_profile($userdata['id'],$update_data);
 		if($update['status']=='success')
 		{
 			$doctor_data = $this->Doctor_model->get_single_doctor_row($userdata['id']);
-			//print_r($patient_data);
+			//print_r($doctor_data);
 
 			$new_userdata = array(
 								"type"=>"DOCTOR",

application/controllers/Home.php

@@ -269,7 +269,7 @@ class Home extends CI_Controller {
 
 		parse_str($_REQUEST['data'], $output);	
 
-		$reg_data = array('email' => $output['reg_pat_email'],'name' => encrypt_data($output['reg_pat_name']),'username' => $output['reg_pat_username'],'password' => md5($output['reg_pat_password']),'cpf' => $output['reg_pat_cpf'],'rg' => encrypt_data($output['reg_pat_rg']),'dob' =>strtotime($output['reg_pat_dob']),'gender' =>encrypt_data($output['reg_pat_gender']),'weight' => encrypt_data($output['reg_pat_weight']),'height' => encrypt_data($output['reg_pat_height']),'blood_group' => encrypt_data($output['reg_pat_bloodgrp']),'zip_code' => encrypt_data($output['reg_pat_cep']),'street_address' => encrypt_data($output['reg_pat_streetadd']),'locality' => encrypt_data($output['reg_pat_locality']),'number' => encrypt_data($output['reg_pat_number']),'landmark' => encrypt_data($output['reg_pat_complement']),'occupation' => $output['reg_pat_occupation']	);
+		$reg_data = array('email' => $output['reg_pat_email'],'name' => $output['reg_pat_name'],'username' => $output['reg_pat_username'],'password' => md5($output['reg_pat_password']),'cpf' => $output['reg_pat_cpf'],'rg' => $output['reg_pat_rg'],'dob' =>strtotime($output['reg_pat_dob']),'gender' => $output['reg_pat_gender'],'weight' => $output['reg_pat_weight'],'height' => $output['reg_pat_height'],'blood_group' => $output['reg_pat_bloodgrp'],'zip_code' => $output['reg_pat_cep'],'street_address' => $output['reg_pat_streetadd'],'locality' => $output['reg_pat_locality'],'number' => $output['reg_pat_number'],'landmark' => $output['reg_pat_complement'],'occupation' => $output['reg_pat_occupation']	);
 
 		//print_r($reg_data);die();
 
@@ -534,7 +534,6 @@ class Home extends CI_Controller {
 	public function login()
 
 	{
-
 		//parse_str($_REQUEST['LoginData'], $request);
 
 		//print_r($_POST);die();
@@ -572,7 +571,7 @@ class Home extends CI_Controller {
 
 									"id"=> $result['userdata']['id'],
 
-									"name"=> decrypt_data($result['userdata']['name']),
+									"name"=> $result['userdata']['name'],
 
 									"username"=> $result['userdata']['username'],
 
@@ -582,27 +581,27 @@ class Home extends CI_Controller {
 
 									"cpf" => $result['userdata']['cpf'],
 
-									"rg" => decrypt_data($result['userdata']['rg']),
+									"rg" => $result['userdata']['rg'],
 
 									"dob" => $result['userdata']['dob'],
 
-									"gender" => decrypt_data($result['userdata']['gender']),
+									"gender" => $result['userdata']['gender'],
 
-									"weight" => decrypt_data($result['userdata']['weight']) ,
+									"weight" => $result['userdata']['weight'] ,
 
-									"height" => decrypt_data($result['userdata']['height']), 
+									"height" => $result['userdata']['height'], 
 
-									"blood_group" => decrypt_data($result['userdata']['blood_group']),
+									"blood_group" => $result['userdata']['blood_group'],
 
-									"zip_code" => decrypt_data($result['userdata']['zip_code']),
+									"zip_code" => $result['userdata']['zip_code'],
 
-									"street_address" => decrypt_data($result['userdata']['street_address']),
+									"street_address" => $result['userdata']['street_address'],
 
-									"locality" => decrypt_data($result['userdata']['locality']),
+									"locality" => $result['userdata']['locality'],
 
-									"number" => decrypt_data($result['userdata']['number']),
+									"number" => $result['userdata']['number'],
 
-									"landmark" =>decrypt_data($result['userdata']['landmark']),
+									"landmark" =>$result['userdata']['landmark'],
 
 									"profile_photo" => $result['userdata']['profile_photo']
 
@@ -960,17 +959,41 @@ class Home extends CI_Controller {
 
 			$data = $_POST;
 
-			//print_r($data);exit();
+
+			/*encryption*/
+			//$data['name'] = $this->encrypt->encode($data['name']);
+			$data['rg'] = $this->encrypt->encode($data['rg']);
+			//$data['cpf'] = $this->encrypt->encode($data['cpf']);
+			$data['telephone'] = $this->encrypt->encode($data['telephone']);
+			$data['gender'] = $this->encrypt->encode($data['gender']);
+			$data['cep'] = $this->encrypt->encode($data['cep']);
+			$data['street_address'] = $this->encrypt->encode($data['street_address']);
+			$data['locality'] = $this->encrypt->encode($data['locality']);
+			$data['number'] = $this->encrypt->encode($data['number']);
+			$data['complement'] = $this->encrypt->encode($data['complement']);
+			$data['about'] = $this->encrypt->encode($data['about']);
+			$data['crm'] = $this->encrypt->encode($data['crm']);
+			
 			$newdob = $data['year'].'-'.$data['month'].'-'.$data['day'];
+			$data['dob'] = strtotime($newdob);
+			/*encryption*/
+			
+
+
+			//print_r($data);
 
 			$data['password'] = md5($data['password']);
 		
-			$data['dob'] = strtotime($newdob);
+			
+			unset($data['day']);
+			unset($data['month']);
+			unset($data['year']);
 
 			//$this->Doctor_model->assignDoctors_default($this->session->userdata('UserData')['id'],'');
 
 			$result = $this->Home_model->register_doctor($data);
 			
+
 			//print_r($result);
 
 			if($result['status'] == 'success')
@@ -1157,7 +1180,7 @@ class Home extends CI_Controller {
 
 			    }
 
-		     	$msg = "Hi ".decrypt_data($check_authentic['name']).",<br><br>Your request for resetting password has been accepted. Use the following link to reset password. ".$link.". Please Do not share with anyone<br><br>Ipok Team";
+		     	$msg = "Hi ".$check_authentic['name'].",<br><br>Your request for resetting password has been accepted. Use the following link to reset password. ".$link.". Please Do not share with anyone<br><br>Ipok Team";
 
 			    //print_r($msg);
 
@@ -1377,6 +1400,23 @@ class Home extends CI_Controller {
 
 	     	$recent  = $this->Home_model->get_recent_chat($userdata['id'],$userdata['type']);
 			
+					 
+			 if($userdata['type'] == 'DOCTOR' || $userdata['type'] =="COLLABORATOR")
+			 {
+				for($i=0;$i<count($recent);$i++){					
+					$recent[$i]['pat_name'] = $this->encrypt->decode($recent[$i]['pat_name']);
+					$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']);
+				}
+			 }
+			 elseif($userdata['type'] == 'PATIENT')
+			 {
+				for($i=0;$i<count($recent);$i++){		
+					$recent[$i]['doc_name'] = $this->encrypt->decode($recent[$i]['doc_name']);
+					$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']);
+				}
+			 }
+			
+
 	     	//print_r($recent);die();
 
 	        //header('Content-type: application/json');
@@ -1413,17 +1453,24 @@ class Home extends CI_Controller {
 
 			 $allusers  = $this->Home_model->get_all_chat_users($userdata['id'],$userdata['type']);
 
-	     	//print_r($userdata);die();
-
-	        //header('Content-type: application/json');
-	     	if(($userdata['type']) == 'PATIENT'){
-	        	foreach($allusers as $key => $value) {
-
-	        		$allusers[$key]['doc_name'] = decrypt_data($value['doc_name']);
 			 
+			 if($userdata['type'] == 'DOCTOR' || $userdata['type'] =="COLLABORATOR")
+			 {
+				for($i=0;$i<count($allusers);$i++){					
+					$allusers[$i]['pat_name'] = $this->encrypt->decode($allusers[$i]['pat_name']);
+				}
+			 }
+			 elseif($userdata['type'] == 'PATIENT')
+			 {
+				for($i=0;$i<count($allusers);$i++){		
+					$allusers[$i]['doc_name'] = $this->encrypt->decode($allusers[$i]['doc_name']);
 				}
 			 }
 
+	     	//print_r($allusers);die();
+
+	        //header('Content-type: application/json');
+
 	       	print json_encode($allusers);
 
       	} 
@@ -1456,22 +1503,31 @@ class Home extends CI_Controller {
 
 	     	$userdata = $this->session->userdata('UserData');
 
+			$_POST['msg'] = $this->encrypt->encode($_POST['msg']);
 	     	$this->Home_model->update_recent_chat($_POST);
 
 	     	$recent  = $this->Home_model->get_recent_chat($userdata['id'],$userdata['type']);
 			
-	     	//print_r($recent);die();
-
-	        //header('Content-type: application/json');
 					 
+			 if($userdata['type'] == 'DOCTOR' || $userdata['type'] =="COLLABORATOR")
+			 {
+				for($i=0;$i<count($recent);$i++){					
+					$recent[$i]['pat_name'] = $this->encrypt->decode($recent[$i]['pat_name']);
+					$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']);
+				}
+			 }
+			 elseif($userdata['type'] == 'PATIENT')
+			 {
+				for($i=0;$i<count($recent);$i++){		
+					$recent[$i]['doc_name'] = $this->encrypt->decode($recent[$i]['doc_name']);
+					$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']);
+				}
+			 }
 			
-	     	if(($userdata['type']) == 'PATIENT'){
-	        	foreach($recent as $key => $value) {
+	     	//print_r($recent);die();
 
-	        		$recent[$key]['doc_name'] = decrypt_data($value['doc_name']);
+	        //header('Content-type: application/json');
 
-	        	}
-	    	}
 	       	print json_encode($recent);
 
       	} 

application/models/Doctor_model.php

@@ -7,12 +7,13 @@ function __construct() {
 
 public function get_single_doctor($id)
 {
+	$key = $this->config->item('encryption_key');
 	$this->db->select("tbl_doctors.id as doctorid,
 					   tbl_doctors.name as dr_name,
 					   tbl_doctors.profile_pic as dr_pic,
 					   tbl_doctors.email as dr_email,
 					   tbl_doctors.username as dr_username,
-					   tbl_doctors.dob as dr_dob,
+					   CAST(AES_DECRYPT(tbl_doctors.dob,'".$key."') as CHAR) as dr_dob,
 					   tbl_doctors.about as dr_bio,
 					   tbl_doctors.specialization as dr_specialization_id,
 					   tbl_doctors.price as dr_price,
@@ -449,6 +450,8 @@ function update_profile($id,$data)
 	$this->db->where('tbl_doctors.id',$id);
 	if($this->db->update('tbl_doctors',$data))
 	{
+		$key = $this->config->item('encryption_key');					
+		$this->db->query("Update tbl_doctors SET dob = AES_ENCRYPT(".$data['dob'].",'".$key."') where id=".$id);	
 		$result = array('status' => 'success');
 	}
 	else
@@ -460,7 +463,8 @@ function update_profile($id,$data)
 
 function get_single_doctor_row($id)
 {
-	$this->db->select("*");
+	$key = $this->config->item('encryption_key');
+	$this->db->select("*,CAST(AES_DECRYPT(dob,'".$key."') as CHAR) as dr_dob");
 	$this->db->from("tbl_doctors");
 	$this->db->where("tbl_doctors.id",$id);
 	$query = $this->db->get();
@@ -527,11 +531,14 @@ function get_distinct_medicines()
 
 function get_distinct_exams()
 {
-	$this->db->select('exam_procedure as exam_name,
-						id as exam_id');
+
+	$key = $this->config->item('encryption_key');
+	$this->db->select("CAST(AES_DECRYPT(exam_procedure,'".$key."') as CHAR) as exam_name,
+						id as exam_id");
 	$this->db->from('tbl_exams');
 	$this->db->group_by('exam_procedure');
 	$query = $this->db->get();
+	//print_r($query->result_array());exit();
 	return $query->result_array();
 }
 
@@ -601,9 +608,10 @@ function get_medicine_for_name($name)
 
 function get_exam_for_name($name)
 {
-	$this->db->select('observation');
+	$key = $this->config->item('encryption_key');
+	$this->db->select("CAST(AES_DECRYPT(observation,'".$key."') as CHAR) as observation");
 	$this->db->from('tbl_exams');
-	$this->db->where('exam_procedure',$name);
+	$this->db->where("exam_procedure = AES_ENCRYPT('".$name."','".$key."') ");
 	$query = $this->db->get();
 	return $query->result_array();
 }

application/models/Home_model.php

@@ -381,6 +381,7 @@
 		else if($data['login_type']=="DOCTOR")
 
 		{
+			$this->db->select("tbl_doctors.*,CAST(AES_DECRYPT(name, 'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as name");
 
 			$query = $this->db->get_where("tbl_doctors",array("username"=>$data['login-form-username'],"password"=>md5($data['login-form-password'])));
 
@@ -416,6 +417,7 @@
 				$this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob");
 				$this->db->where('id',$patient_data['id']);
 				$query_date = $this->db->get('tbl_registration')->row();
+				//print_r($query_date);exit();
 				unset($patient_data['dob']);
 				$patient_data['dob'] = $query_date->dob;
 
@@ -432,7 +434,7 @@
 				$this->db->where('id',$patient_email['id']);
 				$query_date = $this->db->get('tbl_registration')->row();
 				unset($patient_email['dob']);
-				$patient_email['dob'] = $query_date->email;
+				$patient_email['dob'] = $query_date->dob;
 
 				$return_array = array('status'=>'success','type'=>$type,'userdata'=>$patient_email);
 
@@ -565,13 +567,16 @@
 
 
 		if($this->db->insert('tbl_doctors', $data))
-
 		{
-
 			$insertid = $this->db->insert_id();
 
-			$this->db->insert('tbl_clinic_doctors',array('doctor_id'=>$insertid,'clinic_id'=> 0));	
+			$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->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));
 
 			$query = $this->db->get_where("tbl_doctors",array("id"=>$insertid)); 
@@ -842,6 +847,7 @@
 
 	{
 
+
 		$sql = $this->db->insert_string('tbl_recent_chats', $post) . ' ON DUPLICATE KEY UPDATE sender_type = ' .$post['sender_type'].',msg ='.'"' .$post['msg'].'"'.',photo_url='.'"' .$post['photo_url'].'"'.',video_url='.'"' .$post['video_url'].'"'.',type='.'"' .$post['type'].'"'.',time='.$post['time'];
 
 		//print_r($this->db->last_sqlquery());die();

application/views/doctor_dash.php

-
 <div class="ip_set_two_wrapper">
   <div class="container ip_custom_container">
     <div class="ip_top_dash_bay">
@@ -75,7 +74,7 @@
                     <img src="<?php echo base_url();echo $doctor_data['dr_pic'];?>">
                   </div>
                   <div class="ip_profile_tab_name">
-                    <h3>Dr. <?php echo $doctor_data['dr_name'] ?></h3>
+                    <h3>Dr. <?php echo $doctor_data['dr_name']; ?></h3>
                     
                   </div>
                   <div class="ip_profile_tab_button">
@@ -99,7 +98,7 @@
                         </li>
                         <li>
                           <div class="child1"><?php load_language('phone');?> :</div>
-                          <div class="child2"><?php echo $doctor_data['dr_telephone'] ?></div>
+                          <div class="child2"><?php echo $this->encrypt->decode($doctor_data['dr_telephone']); ?></div>
                           <div class="clear"></div>
                         </li>
                         <!-- <li>
@@ -133,7 +132,7 @@
                         ?>
                         <li>
                           <div class="child1"><?php load_language('current_city');?> :</div>
-                          <div class="child2"><?php echo $doctor_data["dr_neighbourhood"];?></div>
+                          <div class="child2"><?php echo $this->encrypt->decode($doctor_data["dr_neighbourhood"]);?></div>
                           <div class="clear"></div>
                         </li>
                         <!-- <li>
@@ -152,7 +151,7 @@
                     <img src="<?php echo base_url();echo $doctor_data['dr_pic'];?>">
                   </div>
                   <div class="ip_profile_tab_name">
-                    <h3>Dr. <?php echo $doctor_data['dr_name'] ?></h3>
+                    <h3>Dr. <?php echo $doctor_data['dr_name']; ?></h3>
                     
                   </div>
                   <div class="ip_profile_tab_button">
@@ -165,7 +164,7 @@
                   <div class="clear"></div>
                 </div>
                 <div class="ip_profile_tab_detail">
-                  <p class="ip_row_p"><?php echo $doctor_data["dr_bio"];?></p>
+                  <p class="ip_row_p"><?php echo $this->encrypt->decode($doctor_data["dr_bio"]);?></p>
                 </div>
               </div>
               <div id="special" class="tab-pane fade">
@@ -174,7 +173,7 @@
                     <img src="<?php echo base_url();echo $doctor_data['dr_pic'];?>">
                   </div>
                   <div class="ip_profile_tab_name">
-                    <h3>Dr. <?php echo $doctor_data['dr_name'] ?></h3>
+                    <h3>Dr. <?php echo $doctor_data['dr_name']; ?></h3>
                     
                   </div>
                   <div class="ip_profile_tab_button">
@@ -319,9 +318,9 @@
                             <img src="<?php echo base_url(); echo $elm['pat_pic']?>">
                           </div>
                           <div class="ip_bio_messages">
-                            <h5><?php echo $elm['pat_name'];?></h5><div class="ip_message_time"><?php echo change_time_to_local($elm['time'])?></div>
+                            <h5><?php echo $this->encrypt->decode($elm['pat_name']);?></h5><div class="ip_message_time"><?php echo change_time_to_local($elm['time'])?></div>
                             <div class="clear"></div>
-                            <p><?php echo $elm['msg'];?></p>
+                            <p><?php echo $this->encrypt->decode($elm['msg']);?></p>
                           </div>
                           <div class="clear"></div>
                           </a>

application/views/doctor_dash_appointments_day.php

@@ -24,7 +24,9 @@
                                 <div class="col-md-5 p0 height100">
                                   <div class="ip_day_time_schedule_details_data height100">
                                     <span><img src="<?php echo base_url();echo $value['pat_pic'];?>"></span>
-                                    <span><?php echo decrypt_data($value['pat_name']);?></span>
+
+                                    <span><?php echo $this->encrypt->decode($value['pat_name']);?></span>
+
                                   </div>
                                 </div>
 
@@ -75,7 +77,9 @@
                               <div class="col-md-5 p0 height100">
                                 <div class="ip_day_time_schedule_details_data height100">
                                   <span><img src="<?php echo base_url();echo $value['pat_pic'];?>"></span>
-                                  <span><?php echo decrypt_data($value['pat_name']);?></span>
+
+                                  <span><?php echo $this->encrypt->decode($value['pat_name']);?></span>
+
                                 </div>
                               </div>
                               <div class="col-md-4 p0 height100">

application/views/doctor_dash_start_service.php

@@ -16,7 +16,7 @@
       <div class="row">
         <div class="col-md-8 content"  id="content" >
           <div class="ip_edit_record_name" style="padding-top: 40px;">
-            <h5 id="patdetail" patid="<?php echo $booking_details['pat_id'];?>"><?php echo $booking_details['pat_name'];?></h5>
+            <h5 id="patdetail" patid="<?php echo $booking_details['pat_id'];?>"><?php echo $this->encrypt->decode($booking_details['pat_name']);?></h5>
             <p><?php echo date('d M',$booking_details['book_date']);?>, <?php echo $booking_details['book_time'];?><img src="<?php echo base_url();?>assets/images/ip_menu5.png"></p>
           </div>
           <br><br>
@@ -387,7 +387,7 @@
                           foreach ($exams as $key => $elem) 
                           {
                         ?>
-                        <option value="<?php echo $elem['exam_name']?>"><?php echo $elem['exam_name']?></option>
+                        <option value="<?php echo $elem['exam_name'];?>"><?php echo $elem['exam_name'];?></option>
                         <?php                            
                           }
                         }

application/views/doctor_dash_start_service_summary.php

@@ -29,7 +29,7 @@
               </div>
             </div>
             <div class="ip_record_search_box backgroundnone">
-              <h4><?php echo $patient_data['pt_name']?></h4>
+              <h4><?php echo $this->encrypt->decode($patient_data['pt_name']);?></h4>
             </div>
             <div class="ip_record_settings">
               <span class="settings"><img src="<?php echo base_url();?>assets/images/ip_settings.png"></span>
@@ -57,7 +57,7 @@
               <div class="tab-content">
                 <div class="ip_profile_tab_top p0">
                   <div class="ip_profile_tab_name">
-                    <h3><?php if(!empty($record_data['main_complaint'])) echo $record_data['main_complaint'];?></h3>
+                    <h3><?php if(!empty($record_data['main_complaint'])) echo $this->encrypt->decode($record_data['main_complaint']);?></h3>
                   </div>
 
                   <div class="clear"></div>
@@ -66,7 +66,7 @@
                 <div id="record" class="tab-pane fade in active">
                   <div class="ip_profile_tab_detail">
 
-                    <?php if(!empty($record_data['description']))echo $record_data['description'];?>
+                    <?php if(!empty($record_data['description']))echo $this->encrypt->decode($record_data['description']);?>
                        <br>
                        <div class="ip_prescription_div">
                          <ul>
@@ -257,7 +257,7 @@
                             <img src="<?php echo base_url();echo $doctor_data['dr_pic']?>">
                           </div>
                           <div class="ip_profile_tab_name">
-                            <h3>Dr. <?php echo $doctor_data['dr_name']?></h3>
+                            <h3>Dr. <?php echo $this->encrypt->decode($doctor_data['dr_name']);?></h3>
                            <!--  <form id="ip_user_rating_form">
                               <div id="ip_selected_rating" class="ip_selected_rating floatLeft">5.0</div>
                               <span class="ip_user_rating floatLeft">

application/views/doctor_editprofile.php

@@ -31,7 +31,7 @@
 					<div class="col-md-7">
 						<div class="ip_edit_row">
 							  <div class="ip_bank_detail_frame">
-								  <input class="ip_bank_input" name="name"  data-parsley-required="true" onKeyPress="if(this.value.length > 40) return false;" data-parsley-minlength="5" data-parsley-pattern="^[a-zA-Z ]+$"  placeholder="<?php load_language('name');?>" value="<?php echo $doctor_data['dr_name']?>">
+								  <input class="ip_bank_input" name="name"  data-parsley-required="true" onKeyPress="if(this.value.length > 40) return false;" data-parsley-minlength="5" data-parsley-pattern="^[a-zA-Z ]+$"  placeholder="<?php load_language('name');?>" value="<?php echo $this->encrypt->decode($doctor_data['dr_name']);?>">
 							  </div>
 						</div>
 						<div class="ip_edit_row">
@@ -44,13 +44,13 @@
 								<div class="col-md-6">
 									<p class="ip_row_p">RG</p>
 									<div class="ip_bank_detail_frame">
-										<input class="ip_bank_input" name="rg" maxlength="25" onKeyPress="if(this.value.length > 25) return false;" placeholder="" value="<?php echo $doctor_data['dr_rg']?>">
+										<input class="ip_bank_input" name="rg" maxlength="25" onKeyPress="if(this.value.length > 25) return false;" placeholder="" value="<?php echo $this->encrypt->decode($doctor_data['dr_rg']);?>">
 									</div>
 								</div>
 								<div class="col-md-6">
 									<p class="ip_row_p">CPF</p>
 									<div class="ip_bank_detail_frame">
-										<input class="ip_bank_input" name="cpf" placeholder="" data-parsley-required="true" data-parsley-minlength="11" data-parsley-cpf="" onKeyPress="if(this.value.length > 10) return false;"  type="number" value="<?php echo $doctor_data['dr_cpf']?>">
+										<input class="ip_bank_input" name="cpf" placeholder="" data-parsley-required="true" data-parsley-minlength="11" data-parsley-cpf="" onKeyPress="if(this.value.length > 10) return false;"  type="number" value="<?php echo $doctor_data['dr_cpf'];?>">
 									</div>
 								</div>
 							</div>
@@ -60,13 +60,13 @@
 								<div class="col-md-6">
 									<p class="ip_row_p">CRM</p>
 									<div class="ip_bank_detail_frame">
-										<input class="ip_bank_input" name="crm" placeholder="" onKeyPress="if(this.value.length > 25) return false;" value="<?php echo $doctor_data['dr_crm']?>">
+										<input class="ip_bank_input" name="crm" placeholder="" onKeyPress="if(this.value.length > 25) return false;" value="<?php echo $this->encrypt->decode($doctor_data['dr_crm']);?>">
 									</div>
 								</div>
 								<div class="col-md-6">
 									<p class="ip_row_p"><?php load_language('telephone');?></p>
 									<div class="ip_bank_detail_frame">
-										<input class="ip_bank_input" name="telephone"  placeholder="" data-parsley-pattern="^[0-9]+$"  type="number" data-parsley-minlength="5"  onKeyPress="if(this.value.length > 30) return false;" value="<?php echo $doctor_data['dr_telephone']?>">
+										<input class="ip_bank_input" name="telephone"  placeholder="" data-parsley-pattern="^[0-9]+$"  type="number" data-parsley-minlength="5"  onKeyPress="if(this.value.length > 30) return false;" value="<?php echo $this->encrypt->decode($doctor_data['dr_telephone']);?>">
 									</div>
 								</div>
 							</div>
@@ -129,37 +129,37 @@
 					<div class="col-md-5">
 						<div class="ip_edit_row">
 							  <div class="ip_bank_detail_frame">
-								  <input class="ip_bank_input" name="cep" data-parsley-required placeholder="CEP" onKeyPress="if(this.value.length > 7) return false;" type="number" data-parsley-minlength="8" data-parsley-cep="" data-parsley-pattern="^[0-9]+$" value="<?php echo $doctor_data['dr_cep']?>">
+								  <input class="ip_bank_input" name="cep" data-parsley-required placeholder="CEP" onKeyPress="if(this.value.length > 7) return false;" type="number" data-parsley-minlength="8" data-parsley-cep="" data-parsley-pattern="^[0-9]+$" value="<?php echo $this->encrypt->decode($doctor_data['dr_cep']);?>">
 							  </div>
 						</div>
 						<div class="ip_edit_row">
 							  <div class="ip_bank_detail_frame">
-								  <input class="ip_bank_input" name="street_address" data-parsley-required placeholder="<?php load_language('rua');?>" data-parsley-maxlength="50" onKeyPress="if(this.value.length > 50) return false;" data-parsley-pattern="^[a-zA-Z ]+$" data-parsley-minlength="5" value="<?php echo $doctor_data['dr_rua']?>">
+								  <input class="ip_bank_input" name="street_address" data-parsley-required placeholder="<?php load_language('rua');?>" data-parsley-maxlength="50" onKeyPress="if(this.value.length > 50) return false;" data-parsley-pattern="^[a-zA-Z ]+$" data-parsley-minlength="5" value="<?php echo $this->encrypt->decode($doctor_data['dr_rua']);?>">
 							  </div>
 						</div>
 						<div class="ip_edit_row">
 							<div class="row">
 								<div class="col-md-7">
 									<div class="ip_bank_detail_frame">
-										<input class="ip_bank_input" name="locality" data-parsley-required placeholder="<?php load_language('neighbourhood');?>"  onKeyPress="if(this.value.length > 50) return false;" data-parsley-pattern="^[a-zA-Z ]+$" data-parsley-minlength="5"  data-parsley-maxlength="50" value="<?php echo $doctor_data['dr_neighbourhood']?>">
+										<input class="ip_bank_input" name="locality" data-parsley-required placeholder="<?php load_language('neighbourhood');?>"  onKeyPress="if(this.value.length > 50) return false;" data-parsley-pattern="^[a-zA-Z ]+$" data-parsley-minlength="5"  data-parsley-maxlength="50" value="<?php echo $this->encrypt->decode($doctor_data['dr_neighbourhood']);?>">
 									</div>
 								</div>
 								<div class="col-md-5">
 									<div class="ip_bank_detail_frame">
-										<input  class="ip_bank_input" name="number" data-parsley-required placeholder="<?php load_language('number');?>"  data-parsley-pattern="^[0-9]+$"  type="number" data-parsley-minlength="5" data-parsley-maxlength="30" onKeyPress="if(this.value.length > 30) return false;" value="<?php echo $doctor_data['dr_number']?>">
+										<input  class="ip_bank_input" name="number" data-parsley-required placeholder="<?php load_language('number');?>"  data-parsley-pattern="^[0-9]+$"  type="number" data-parsley-minlength="5" data-parsley-maxlength="30" onKeyPress="if(this.value.length > 30) return false;" value="<?php echo $this->encrypt->decode($doctor_data['dr_number']);?>">
 									</div>
 								</div>
 							</div>
 						</div>
 						<div class="ip_edit_row">
 							  <div class="ip_bank_detail_frame">
-								  <input class="ip_bank_input" name="complement" placeholder="<?php load_language('complement');?>" onKeyPress="if(this.value.length > 50) return false;" data-parsley-maxlength="50" value="<?php echo $doctor_data['dr_complement']?>">
+								  <input class="ip_bank_input" name="complement" placeholder="<?php load_language('complement');?>" onKeyPress="if(this.value.length > 50) return false;" data-parsley-maxlength="50" value="<?php echo $this->encrypt->decode($doctor_data['dr_complement']);?>">
 							  </div>
 						</div>
 						<div class="ip_edit_row">
 							<p class="ip_row_p"><?php load_language('biography');?></p>
 							  <div class="ip_bank_detail_frame" style="height:auto;">
-								  <textarea class="ip_bank_input" name="about" placeholder="BIOGRAPHY" data-parsley-required rows="8" data-parsley-maxlength="1000" data-parsley-minlength="15" onKeyPress="if(this.value.length > 1000) return false;"><?php echo $doctor_data['dr_bio']?></textarea>
+								  <textarea class="ip_bank_input" name="about" placeholder="BIOGRAPHY" data-parsley-required rows="8" data-parsley-maxlength="1000" data-parsley-minlength="15" onKeyPress="if(this.value.length > 1000) return false;"><?php echo $this->encrypt->decode($doctor_data['dr_bio']);?></textarea>
 							  </div>
 						</div>
 						<div class="ip_edit_row">

application/views/doctor_editprofile_custom_script.php

@@ -3,8 +3,8 @@
 setTimeout(function()
 {
     $("#edit-doctor input").datepicker("update", '<?php echo date('m/d/Y',$doctor_data['dr_dob']);?>');  
-    $('#doc-edt-gender').val('<?php echo $doctor_data['dr_gender'];?>').trigger('change');
-    $('#doc-edt-gender').val('<?php echo $doctor_data['dr_gender'];?>').trigger('change');
+    $('#doc-edt-gender').val('<?php echo $this->encrypt->decode($doctor_data['dr_gender']);?>').trigger('change');
+    $('#doc-edt-gender').val('<?php echo $this->encrypt->decode($doctor_data['dr_gender']);?>').trigger('change');
     $('#doc-edt-specialization').val('<?php echo $doctor_data['dr_specialization_id'];?>').trigger('change');
 },500)
 

application/views/doctor_medical_records_attended.php

@@ -80,7 +80,7 @@
                     </div>
                     <div class="ip_record_name">
                       
-                      <?php echo decrypt_data($value['pat_name']);?>
+                      <?php echo $this->encrypt->decode($value['pat_name']);?>
                
                     </div>
                     <div class="clear"></div>

application/views/doctor_medical_records_scheduled.php

@@ -83,7 +83,9 @@
                       <img src="<?php echo base_url();echo $value['pat_pic'];?>">
                     </div>
                     <div class="ip_record_name">
-                       <?php echo decrypt_data($value['pat_name']);?>
+
+                       <?php echo $this->encrypt->decode($value['pat_name']);?>
+
                     </div>
                     <div class="clear"></div>
                      </a>

application/views/register_doctor.php

@@ -33,6 +33,8 @@ if($this->session->userdata('language') == 'en'){
 <div id="loading" style="display: none;">
   <img id="loading-image" src="<?php echo base_url();?>assets/images/ipok-loading.gif" alt="Loading..." />
 </div>
+
+			<input type="hidden" name="language" value="<?php echo $this->session->userdata('language');?>" id="language">
           	<form role="form" data-parsley-validate="" id="reg-form-doctor" method="POST" action="<?php echo base_url();?>Home/doRegister" enctype="multipart/form-data">
             <div class="ip_edit_record_head backgroundnone">
               <?php load_language('create_a_medical_account');?>
@@ -73,7 +75,6 @@ if($this->session->userdata('language') == 'en'){
 						</div>
 						
 					</div>
-					<input type="hidden" name="language" value="<>php echo $this->session->userdata('language');?>" id="language">
 					<div class="col-md-5">
 						<div class="ip_edit_row">
 							<div class="ip_bank_detail_frame">
@@ -136,7 +137,7 @@ if($this->session->userdata('language') == 'en'){
 											<?php
 												 $now = date('Y');
 												 $max_year = $now - 18;
-												 $min_year = $max_year - 100;
+												 $min_year = $max_year - 120;
 												for($i = $min_year; $i <= $max_year ; $i++){?>
 													<option value="<?php echo $i;?>"><?php echo $i;?></option>
 												<?php } 

application/views/wallet.php

@@ -24,7 +24,7 @@
                   <div class="ip_bio_detail textCenter">
                     <div class="ip_bal_circle">
                     <div class="c100 p25">
-                          <span><strong class="ip_counter" data-count="<?php echo $wallet['reedem_earn'];?>"><?php echo $wallet['reedem_earn'];?></strong></span>
+                          <span><strong class="ip_counter" data-count="<?php echo $this->encrypt->decode($wallet['reedem_earn']);?>"><?php echo $this->encrypt->decode($wallet['reedem_earn']);?></strong></span>
                           <div class="slice">
                               <div class="bar"></div>
                               <div class="fill"></div>
@@ -58,7 +58,7 @@
                   <div class="ip_bio_detail textCenter">
                     <div class="ip_future_circle">
                     <div class="c100 p25">
-                          <span><strong class="ip_counter" data-count="<?php echo $wallet['future_earn'];?>"><?php echo $wallet['future_earn'];?></strong></span>
+                          <span><strong class="ip_counter" data-count="<?php echo $this->encrypt->decode($wallet['future_earn']);?>"><?php echo $this->encrypt->decode($wallet['future_earn']);?></strong></span>
                           <div class="slice">
                               <div class="bar"></div>
                               <div class="fill"></div>
@@ -92,7 +92,7 @@
                   <div class="ip_bio_detail textCenter">
                     <div class="ip_total_circle">
                     <div class="c100 p25">
-                          <span><strong class="ip_counter" data-count="<?php echo $wallet['total_earn'];?>"><?php echo $wallet['total_earn'];?></strong></span>
+                          <span><strong class="ip_counter" data-count="<?php echo $this->encrypt->decode($wallet['total_earn']);?>"><?php echo $this->encrypt->decode($wallet['total_earn']);?></strong></span>
                           <div class="slice">
                               <div class="bar"></div>
                               <div class="fill"></div>

assets/js/custom.js

@@ -2725,12 +2725,22 @@ $('#reg_choose_pat').click(function(){
 
 /* REGISTRATION DATEPICKER JS */
 /*----------------------------*/
+var date = (new Date()).getFullYear();
+console.log(date);
+var cur_date = date - 18;
+console.log(cur_date);
+var max_date = cur_date - 120;
+console.log(max_date);
 $('#registration-container input').datepicker({
     autoclose: true,
     onSelect: function(dateText) {
       //console.log("Selected date: " + dateText + "; input's current value: " + this.value);
     },
-    endDate:"0d",
+    /*endDate:"0d",
+    startDate:"-120y"*/
+     /*minDate: '-120Y',
+     maxDate: '-18Y',*/
+     endDate:"-18y",
     startDate:"-120y"
 })
 
@@ -2739,7 +2749,11 @@ $('#doc-registration-container input').datepicker({
     onSelect: function(dateText) {
       //console.log("Selected date: " + dateText + "; input's current value: " + this.value);
     },
-    endDate:"0d",
+    /*endDate:"0d",
+    startDate:"-120y"*/
+     /*minDate: '-120Y',
+     maxDate: '-18Y',*/
+     endDate:"-18y",
     startDate:"-120y"
 })
 /* PATIENT EDIT DATEPICKER JS */
@@ -2749,7 +2763,9 @@ $('#edit-patient input').datepicker({
     onSelect: function(dateText) {
       //console.log("Selected date: " + dateText + "; input's current value: " + this.value);
     },
-    endDate:"0d",
+   /* endDate:"0d",
+    startDate:"-120y"*/
+    endDate:"-18y",
     startDate:"-120y"
 })
 /*----------------------------*/