Merge branch 'jansa'

admin/application/views/ManageExams/addExams.php

@@ -92,8 +92,8 @@
                       ?> 
                               <tr>
                               <td class="hidden"><?php echo $exams['id'];?></td>
-                              <td><?php decrypt_data(echo $exams['exam_procedure']);?></td>
-                              <td><i><?php decrypt_data(echo $exams['observation']);?></i></td>
+                              <td><?php echo decrypt_data($exams['exam_procedure']);?></td>
+                              <td><i><?php echo decrypt_data($exams['observation']);?></i></td>
                               <td>
                               <a class='btn btn-sm btn-primary' href='<?php echo base_url(); ?>ManageExams/exams_edit/<?php echo $exams['id']; ?>'> <i class='fa fa-fw fa-edit'></i> Edit </a> 
                               <a class='btn btn-sm btn-danger' href='<?php echo base_url(); ?>ManageExams/exams_delete/<?php echo $exams['id']; ?>'> <i class='fa fa-fw fa-trash'></i> Delete </a>

admin/application/views/ManageUser/addUser.php

@@ -146,8 +146,8 @@
                       ?>
                               <tr>
                               <td class="hidden"><?php echo $dt->id; ?></td>
-                              <td><?php decrypt_data(echo $dt->display_name); ?></td>
-                              <td><?php decrypt_data(echo $dt->username); ?></td>
+                              <td><?php echo decrypt_data($dt->display_name); ?></td>
+                              <td><?php echo decrypt_data($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>