|
10 | 10 |
|
11 | 11 | $hubData = new HubData($module, $module->getSecurityHandler()->getTokenSessionName(), $token, $pidsArray);
|
12 | 12 | $current_user = $hubData->getCurrentUser();
|
13 |
| -$name = $current_user['firstname'].' '.$current_user['lastname']; |
| 13 | +$isAdmin = false; |
| 14 | +$name = ""; |
| 15 | +if($current_user != null){ |
| 16 | + $name = $current_user['firstname'].' '.$current_user['lastname']; |
| 17 | + $isAdmin = $current_user['is_admin']; |
| 18 | +} |
14 | 19 | $person_region = $hubData->getPersonRegion();
|
15 |
| -$isAdmin = $current_user['is_admin']; |
| 20 | +$personRegionCode = ""; |
| 21 | +if($person_region != null){ |
| 22 | + $personRegionCode = $person_region['region_code']; |
| 23 | +} |
| 24 | + |
16 | 25 | if($settings['hub_name'] !== ""){
|
17 | 26 | $hub_projectname = $settings['hub_name'];
|
18 | 27 | }
|
|
128 | 137 | <?php if(!empty($token) && !array_key_exists('sout', $_REQUEST)){ ?>
|
129 | 138 | <ul class="nav navbar-nav navbar-right" style="padding-right: 40px;">
|
130 | 139 | <li class="menu-item dropdown">
|
131 |
| - <a href="#" data-toggle="dropdown" class="dropdown-toggle hidden-sm" style="padding: 20px"><span class="label label-primary"><?=$person_region['region_code']?></span> <?=$name?> <span class="caret"></span></a> |
132 |
| - <a href="#" data-toggle="dropdown" class="dropdown-toggle hidden-xs hidden-md hidden-lg" style="padding: 20px"><span class="label label-primary"><?=$person_region['region_code']?></span> <i class="fa fa-user" aria-hidden="true"></i> <span class="caret"></span></a> |
| 140 | + <a href="#" data-toggle="dropdown" class="dropdown-toggle hidden-sm" style="padding: 20px"><span class="label label-primary"><?=$personRegionCode?></span> <?=$name?> <span class="caret"></span></a> |
| 141 | + <a href="#" data-toggle="dropdown" class="dropdown-toggle hidden-xs hidden-md hidden-lg" style="padding: 20px"><span class="label label-primary"><?=$personRegionCode?></span> <i class="fa fa-user" aria-hidden="true"></i> <span class="caret"></span></a> |
133 | 142 |
|
134 | 143 | <ul class="dropdown-menu">
|
135 | 144 | <li><a href="<?=$indexUrl.'&NOAUTH&option=pro'?>"><i class="fa fa-user fa-fw" aria-hidden="true"></i> Profile</a></li>
|
|
0 commit comments