Merge branch 'jansa'

admin/application/controllers/Webservice.php

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

admin/application/models/User_model.php

@@ -25,6 +25,7 @@ class User_model extends CI_Model {
 			$userdata['email_id'] = encrypt_data($userdata['email_id']);
 			$userdata['phone_no'] = encrypt_data($userdata['phone_no']);
 			$userdata['display_name'] = encrypt_data($userdata['display_name']);
+			print_r($userdata);exit();
 			$this->db->insert("users", $userdata);
 			return true;
 		}
@@ -40,6 +41,7 @@ class User_model extends CI_Model {
 			$data['email_id'] = encrypt_data($data['email_id']);
 			$data['phone_no'] = encrypt_data($data['phone_no']);
 			$data['display_name'] = encrypt_data($data['display_name']);
+			print_r($data);exit();
 			$this->db->where('id', $id);
 	   		$result = $this->db->update('users', $data); 
 	   		redirect(base_url().'ManageUsers');