Skip to content

Commit d40f445

Browse files
committed
splunk errors
1 parent c1fd2f1 commit d40f445

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

classes/ProjectData.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static function getProjectInfoArrayRepeatingInstruments(
5757
}
5858
}
5959
}
60-
if (is_array($array[$index][$field_name]) &&
60+
if (array_key_exists($index, $array) && array_key_exists($field_name, $array[$index]) && is_array($array[$index][$field_name]) &&
6161
ProjectData::isCheckbox($field_name, $project_id) && is_array($value) && array_key_exists(1,$value) && !empty($value[1])) {
6262
$array[$index][$field_name][$instance] = $value[1];
6363
}

hub_header.php

+13-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,18 @@
1010

1111
$hubData = new HubData($module, $module->getSecurityHandler()->getTokenSessionName(), $token, $pidsArray);
1212
$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+
}
1419
$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+
1625
if($settings['hub_name'] !== ""){
1726
$hub_projectname = $settings['hub_name'];
1827
}
@@ -128,8 +137,8 @@
128137
<?php if(!empty($token) && !array_key_exists('sout', $_REQUEST)){ ?>
129138
<ul class="nav navbar-nav navbar-right" style="padding-right: 40px;">
130139
<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>&nbsp;&nbsp;<?=$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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<?=$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>&nbsp;&nbsp;<i class="fa fa-user" aria-hidden="true"></i> <span class="caret"></span></a>
133142

134143
<ul class="dropdown-menu">
135144
<li><a href="<?=$indexUrl.'&NOAUTH&option=pro'?>"><i class="fa fa-user fa-fw" aria-hidden="true"></i> Profile</a></li>

0 commit comments

Comments
 (0)