Revision 77451b2a
Added by Andreas Kohlbecker almost 4 years ago
| modules/cdm_dataportal/includes/agent.inc | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
$names_and_lifespan = $agent->titleCache; |
| 17 | 17 |
|
| 18 |
if($agent->nomenclaturalTitle != $agent->titleCache){
|
|
| 18 |
if(isset($agent->nomenclaturalTitle) && $agent->nomenclaturalTitle != $agent->titleCache){
|
|
| 19 | 19 |
$names_and_lifespan .= ' [' . $agent->nomenclaturalTitle . ']'; |
| 20 | 20 |
} |
| 21 | 21 |
|
| ... | ... | |
| 29 | 29 |
unset($visible_extensions_sorted['7d1a269b-9bdd-44eb-beba-2f8acee941af']); |
| 30 | 30 |
} |
| 31 | 31 |
// ------------------------------------ |
| 32 |
if(!$lifespan_extension && $agent->lifespan){
|
|
| 32 |
if(!$lifespan_extension && isset($agent->lifespan)){
|
|
| 33 | 33 |
$names_and_lifespan .= ', ' . timePeriodToString($agent->lifespan); |
| 34 | 34 |
} else {
|
| 35 | 35 |
$names_and_lifespan .= ", " . $lifespan_extension; |
| ... | ... | |
| 38 | 38 |
$names_and_lifespan_markup = '<div class="names-and-lifespan">' . $names_and_lifespan . '</div> '; |
| 39 | 39 |
|
| 40 | 40 |
$name_details = []; |
| 41 |
if($agent->familyName){
|
|
| 42 |
$name_details[] = '<span class="label">' . t('Family name') . ': </span>'. $agent->familyName;
|
|
| 43 |
} |
|
| 44 |
if($agent->givenName){
|
|
| 45 |
$name_details[] = '<span class="label">' . t('Given name') . ': </span>'. $agent->givenName;
|
|
| 41 |
$name_details_markup = ''; |
|
| 42 |
if(isset($agent->familyName) || isset($agent->givenName)){
|
|
| 43 |
if(isset($agent->familyName)){
|
|
| 44 |
$name_details[] = '<span class="label">' . t('Family name') . ': </span>'. $agent->familyName;
|
|
| 45 |
} |
|
| 46 |
if(isset($agent->givenName)){
|
|
| 47 |
$name_details[] = '<span class="label">' . t('Given name') . ': </span>'. $agent->givenName;
|
|
| 48 |
} |
|
| 49 |
$name_details_markup = ' <div class="name-details">(' . join(', ', $name_details) .')</div> ';
|
|
| 46 | 50 |
} |
| 47 |
$name_details_markup = ' <div class="name-details">(' . join(', ', $name_details) .')</div> ';
|
|
| 48 | 51 |
|
| 49 | 52 |
// extensions |
| 50 | 53 |
$extensions = []; |
| ... | ... | |
| 55 | 58 |
} |
| 56 | 59 |
} |
| 57 | 60 |
} |
| 61 |
$extensions_markup = ''; |
|
| 58 | 62 |
if(count($extensions) > 0 ){
|
| 59 | 63 |
$extensions_markup = '<div class="extensions">' . join(', ', $extensions) . '</div>';
|
| 60 | 64 |
} |
| ... | ... | |
| 66 | 70 |
$orcid_id = number_format($agent->orcid->digitsOnly, 0, '.', '-'); |
| 67 | 71 |
$identifiers_render_array[] = markup_to_render_array(l('https://orcid.org/' . $orcid_id, 'https://orcid.org/' . $orcid_id) . ' ');
|
| 68 | 72 |
} |
| 69 |
if($agent->identifiers){
|
|
| 73 |
if(isset($agent->identifiers)){
|
|
| 70 | 74 |
$identifiers_render_array = array_merge($identifiers_render_array, compose_identifiers($agent->identifiers)); |
| 71 | 75 |
} |
| 72 | 76 |
if(count($identifiers_render_array) > 0){
|
Also available in: Unified diff
ref #9034 fixing uninitialized variable bugs and completing pager function