|
@@ -1691,27 +1691,20 @@ class Display
|
|
|
}
|
|
|
$output = [];
|
|
|
if (!$nosession) {
|
|
|
- $main_user_table = Database::get_main_table(TABLE_MAIN_USER);
|
|
|
- $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
|
|
|
- // Request for the name of the general coach
|
|
|
- $sql = 'SELECT tu.lastname, tu.firstname, ts.*
|
|
|
- FROM '.$tbl_session.' ts
|
|
|
- LEFT JOIN '.$main_user_table.' tu
|
|
|
- ON ts.id_coach = tu.user_id
|
|
|
- WHERE ts.id = '.intval($session_id);
|
|
|
- $rs = Database::query($sql);
|
|
|
- $session_info = Database::store_result($rs, 'ASSOC');
|
|
|
- $session_info = $session_info[0];
|
|
|
+ $session_info = api_get_session_info($session_id);
|
|
|
+ $coachInfo = [];
|
|
|
+ if (!empty($session['id_coach'])) {
|
|
|
+ $coachInfo = api_get_user_info($session['id_coach']);
|
|
|
+ }
|
|
|
|
|
|
$session = [];
|
|
|
$session['category_id'] = $session_info['session_category_id'];
|
|
|
$session['title'] = $session_info['name'];
|
|
|
$session['id_coach'] = $session_info['id_coach'];
|
|
|
- $session['coach'] = '';
|
|
|
$session['dates'] = '';
|
|
|
-
|
|
|
- if (api_get_setting('show_session_coach') === 'true') {
|
|
|
- $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info['firstname'], $session_info['lastname']);
|
|
|
+ $session['coach'] = '';
|
|
|
+ if (api_get_setting('show_session_coach') === 'true' && isset($coachInfo['complete_name'])) {
|
|
|
+ $session['coach'] = get_lang('GeneralCoach').': '.$coachInfo['complete_name'];
|
|
|
}
|
|
|
|
|
|
if (($session_info['access_end_date'] == '0000-00-00 00:00:00' &&
|
|
@@ -1728,11 +1721,8 @@ class Display
|
|
|
} else {
|
|
|
$dates = SessionManager::parseSessionDates($session_info, true);
|
|
|
$session['dates'] = $dates['access'];
|
|
|
- if (api_get_setting('show_session_coach') === 'true') {
|
|
|
- $session['coach'] = api_get_person_name(
|
|
|
- $session_info['firstname'],
|
|
|
- $session_info['lastname']
|
|
|
- );
|
|
|
+ if (api_get_setting('show_session_coach') === 'true' && isset($coachInfo['complete_name'])) {
|
|
|
+ $session['coach'] = $coachInfo['complete_name'];
|
|
|
}
|
|
|
$active = $date_start <= $now && $date_end >= $now;
|
|
|
}
|