Merge branch 'jansa'

application/helpers/common_helper.php

@@ -309,7 +309,7 @@ function send_mail($msg,$email,$sub)
 
 
 
- 	$settings = $CI->db->get('settings')->row();
+ 	/*$settings = $CI->db->get('settings')->row();
 
  	//print_r($msg);die();
 
@@ -335,8 +335,20 @@ function send_mail($msg,$email,$sub)
 
         'wordwrap' => TRUE
 
-		); 
-
+		); */
+		$smtp_host = "techlabz.in";
+		$smtp_password = 'Golden_123';
+		$smtp_username = "[email protected]";
+		//print_r($smtp_username);
+		$host = $smtp_host;
+		$pass= $smtp_password;
+		$username = $smtp_username;
+		$config['protocol'] = 'mail';
+		$config['smtp_host'] = $host;
+		$config['smtp_user'] = $username;
+		$config['smtp_pass'] = $pass;
+		$config['smtp_port'] = 25;
+		$config['mailtype'] = 'html';
 
 
 		$CI->load->library('email', $configs);
@@ -349,7 +361,7 @@ function send_mail($msg,$email,$sub)
 
 			->from($settings->admin_email, 'Ipok')
 
-			->to($email)
+			->to('[email protected]')
 
 			->subject($sub)
 
@@ -357,6 +369,8 @@ function send_mail($msg,$email,$sub)
 
 		$CI->email->send();
 
+
+
   }
 
 

assets/js/custom.js

@@ -2307,10 +2307,11 @@ $('#forgot_password_btn_doctor').click(function(){
 
 $('#forgot_password_sent_btn_patient').click(function()
 {
-  $('#loading4').show();
+   $('#loading4').show();
   $('#forgot-pass-error').addClass('hidden');
   if($('#forgot-pass-form-patient').parsley().validate())
   {
+    $('#loading4').show();
     var result = post_ajax(base_url+'Home/forgotpassword',$('#forgot-pass-form-patient').serialize());
     var items = JSON.parse(result);
     if(items.status=='success')
@@ -2331,10 +2332,10 @@ $('#forgot_password_sent_btn_patient').click(function()
 
 $('#forgot_password_sent_btn_doctor').click(function()
 {
-  $('#loading5').show();
   $('#forgot-pass-error-doctor').addClass('hidden');
   if($('#forgot-pass-form-doctor').parsley().validate())
   {
+    $('#loading5').show();
     var result = post_ajax(base_url+'Home/forgotpassword',$('#forgot-pass-form-doctor').serialize());
     var items = JSON.parse(result);
     if(items.status=='success')
@@ -2348,7 +2349,6 @@ $('#forgot_password_sent_btn_doctor').click(function()
       $('#loading5').hide();
       $('#forgot-pass-error-doctor').html(items.msg).removeClass('hidden');
     }
-    
   }
   
 })