Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -5659,7 +5659,7 @@ print_r(date('H:i',$ms));exit();*/
 	}
 
 	public function encrypt_data(){
-		$data = 'jansa';
+		$data = '24048';
 		$new = encrypt_data($data);
 		$neww = decrypt_data($new);
 		print_r($new);echo"<br>";

admin/application/models/Login_model.php

@@ -16,11 +16,11 @@ class Login_model extends CI_Model {
 	    }
 	    else if($query_user->num_rows() > 0 )
 	    {
-	    	$row = $query_user->row_array();
-	    	//$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;
+	    	$rows = $query_user->row_array();
+	    	$rows['email_id'] = decrypt_data($rows['email_id']);
+	    	$rows['phone_no'] = decrypt_data($rows['phone_no']);
+	    	$rows['display_name'] = decrypt_data($rows['display_name']);
+	    	$row = $rows;
 	    	$row['uType'] = 'admin_user';
 	    	$row['table'] = 'users';
 	       	return $row;

admin/application/views/Templates/header-menu.php

@@ -30,7 +30,7 @@ if($this->session->userdata('logged_in')){
               <li class="dropdown user user-menu">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                   <img src="<?php echo base_pic_url().$login['profile_picture']?>" class="user-image" alt="User Image">
-                  <span class="hidden-xs"><?php echo decrypt_data($login['display_name'])?></span>
+                  <span class="hidden-xs"><?php echo $login['display_name']?></span>
                 </a>
                 <ul class="dropdown-menu">
                   <!-- User image -->

admin/application/views/Templates/left-menu.php

@@ -14,7 +14,7 @@
              <img src="<?php echo base_pic_url().$login['profile_picture'] ?>" class="img-circle" alt="User Image" style="width: 45px;height: 45px;">
             </div>
             <div class="pull-left info">
-              <p><?php echo decrypt_data($login['display_name'])?></p>
+              <p><?php echo $login['display_name']?></p>
               <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
             </div>
           </div>