Merge branch 'jansa'

application/controllers/Doctor.php

@@ -1158,12 +1158,12 @@ public function save_medicalrecord_finaldata()
 
  		if(!empty($_POST['obsr']))
  		{
- 			$insert_array['other_observations'] = $_POST['obsr'];
+ 			$insert_array['other_observations'] = encrypt_data($_POST['obsr']);
  		}
 
  		if(!empty($_POST['main_complaint']))
  		{
- 			$insert_array['main_complaint'] = $_POST['main_complaint'];
+ 			$insert_array['main_complaint'] = encrypt_data($_POST['main_complaint']);
  		}
 
  		if(!empty($insert_array))

application/helpers/common_helper.php

@@ -319,11 +319,11 @@ function send_mail($msg,$email,$sub)
 
 		'protocol'=>'smtp',
 
-		'smtp_host'=>$settings->smtp_host,
+		'smtp_host'=>decrypt_data($settings->smtp_host),
 
-		'smtp_user'=>$settings->smtp_username,
+		'smtp_user'=>decrypt_data($settings->smtp_username),
 
-		'smtp_pass'=>$settings->smtp_password,
+		'smtp_pass'=>decrypt_data($settings->smtp_password),
 
 		'smtp_port'=>'587',