Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -5659,9 +5659,9 @@ print_r(date('H:i',$ms));exit();*/
 	}
 
 	public function encrypt_data(){
-		$data = 'Sabana Asmi P.P';
+		$data = 'jansa';
 		$new = encrypt_data($data);
-		$neww = decrypt_data('B1k8YSrp1wbh/ygkYYD5');
+		$neww = decrypt_data($new);
 		print_r($new);echo"<br>";
 		print_r($neww);
 		exit();

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"=>encrypt_data($username),'password'=>$password));
+	 	$query_user = $this->db->get_where("users",array("username"=>$username,'password'=>$password));
 	 	$query_clinic = $this->db->get_where("tbl_clinic",array("username"=>$username,'password'=>$password));
 	    if ( $query_admin->num_rows() > 0 )
 	    {
@@ -17,7 +17,6 @@ class Login_model extends CI_Model {
 	    else if($query_user->num_rows() > 0 )
 	    {
 	    	$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']);

admin/application/views/ManageUser/addUser.php

@@ -147,7 +147,7 @@
                               <tr>
                               <td class="hidden"><?php echo $dt->id; ?></td>
                               <td><?php echo decrypt_data($dt->display_name); ?></td>
-                              <td><?php echo decrypt_data($dt->username); ?></td>
+                              <td><?php echo $dt->username; ?></td>
                               <td><img src="<?php echo base_pic_url().$dt->profile_picture; ?>" alt="" width="50px" height="50px"  /></td> 
                                <td><?php echo $dt->role_name; ?></td>
                               

admin/application/views/ManageUser/editUser.php

@@ -47,7 +47,7 @@ if(isset($data)) {
 
                     <div class="form-group col-md-12">
                       <label>Username</label>
-                      <input type="text" name="username" value="<?php echo decrypt_data($data[0]->username); ?>" class="form-control required" placeholder="Enter Username">
+                      <input type="text" name="username" value="<?php echo $data[0]->username; ?>" class="form-control required" placeholder="Enter Username">
                     </div>
 					
                     <div class="form-group col-md-6">