Merge branch 'jansa'

admin/application/models/Login_model.php

@@ -5,7 +5,7 @@ class Login_model extends CI_Model {
  	}
 	function login($username, $password) {
 	    $query_admin = $this->db->get_where("superadmin",array("username"=>$username,'password'=>$password)); 
-	 	$query_user = $this->db->get_where("users",array("username"=>$username,'password'=>$password));
+	 	$query_user = $this->db->get_where("users",array("username"=>encrypt_data($username),'password'=>$password));
 	 	$query_clinic = $this->db->get_where("tbl_clinic",array("username"=>$username,'password'=>$password));
 	    if ( $query_admin->num_rows() > 0 )
 	    {
@@ -16,7 +16,12 @@ class Login_model extends CI_Model {
 	    }
 	    else if($query_user->num_rows() > 0 )
 	    {
-	    	$row = $query_user->row_array();
+	    	$rows = $query_user->row_array();
+	    	$query_user['username'] = decrypt_data($rows['username']);
+	    	$query_user['email_id'] = decrypt_data($rows['email_id']);
+	    	$query_user['phone_no'] = decrypt_data($rows['phone_no']);
+	    	$query_user['display_name'] = decrypt_data($rows['display_name']);
+	    	$row = $query_user;
 	    	$row['uType'] = 'admin_user';
 	    	$row['table'] = 'users';
 	       	return $row;