Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
velz 2024-03-29 15:58:14 +05:30
commit e976594648
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/LoginController.php
View File

@ -41,8 +41,12 @@ class LoginController extends BaseController
$user = $UserModel->getUserByEmail($value->email); $user = $UserModel->getUserByEmail($value->email);
if($user){ if($user){
if($user->is_active !== '0'){ if($user->is_active !== '0'){
$session_data = [
$session_data = ['isLoggedIn' => True ,'userid' => $user->id, 'userData' => $user]; 'isLoggedIn' => True ,
'userid' => $user->id,
'userData' => $user,
'userProfile' => $value->picture,
];
set_session_data($session_data); set_session_data($session_data);
log_message('error', 'Set The UserId : `'. $user->id .'` in Session'); log_message('error', 'Set The UserId : `'. $user->id .'` in Session');
log_message('error', 'User Login Sucessfully'); log_message('error', 'User Login Sucessfully');

9
app/Helpers/session_helper.php
View File

@ -28,6 +28,15 @@ if (!function_exists('get_session_userdata')) {
} }
} }
if (!function_exists('get_userProfile')) {
function get_userProfile()
{
// $ci =& get_instance();
$session = \Config\Services::session();
return $session->get('userProfile');
}
}
if (!function_exists('get_session_user')) { if (!function_exists('get_session_user')) {
function get_session_user() function get_session_user()
{ {

2
app/Views/layout/header.php
View File

@ -393,7 +393,7 @@
<li class="dropdown notification-list topbar-dropdown"> <li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<img src="<?= base_url()."public"; ?>/assets/images/users/avatar-1.jpg" alt="user-image" class="rounded-circle"> <img src="<?= get_userProfile() != null && !empty(get_userProfile()) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png' ?>" alt="user-image" class="rounded-circle">
<span class="pro-user-name ml-1" style="font-size: 16px;" > <span class="pro-user-name ml-1" style="font-size: 16px;" >
<?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
<!-- <i class="mdi mdi-chevron-down"></i> --> <!-- <i class="mdi mdi-chevron-down"></i> -->