diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 7be828daf9..55a491b5e3 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -1092,16 +1092,10 @@ class IndexManager $load_history = (isset($_GET['history']) && intval($_GET['history']) == 1) ? true : false; if ($load_history) { // Load sessions in category in *history* - $session_categories = UserManager::get_sessions_by_category( - $user_id, - true - ); + $session_categories = UserManager::get_sessions_by_category($user_id, true); } else { // Load sessions in category - $session_categories = UserManager::get_sessions_by_category( - $user_id, - false - ); + $session_categories = UserManager::get_sessions_by_category($user_id, false); } $html = ''; @@ -1145,7 +1139,8 @@ class IndexManager $session_category_id = $session_category['session_category']['id']; // Sessions and courses that are not in a session category - if (empty($session_category_id) && + if ( + empty($session_category_id) && isset($session_category['sessions']) ) { // Independent sessions @@ -1192,13 +1187,14 @@ class IndexManager $endSessionToTms = api_strtotime($date_session_end); if ($session_now > $endSessionToTms) { $dif_time_after = $session_now - $endSessionToTms; - $dif_time_after = round($dif_time_after/86400); + $dif_time_after = round($dif_time_after / 86400); } } } } - if ($session_now > $allowed_time + if ( + $session_now > $allowed_time //($coachAccessEndDate > $dif_time_after - 1) ) { // Read only and accessible. @@ -1234,8 +1230,12 @@ class IndexManager $session_box = Display::get_session_title_box($session_id); $extra_info = !empty($session_box['coach']) ? $session_box['coach'] : null; - $extra_info .= !empty($session_box['coach']) ? ' - '.$session_box['dates'] : $session_box['dates']; - $extra_info .= isset($session_box['duration']) ? ' '.$session_box['duration'] : null; + $extra_info .= !empty($session_box['coach']) + ? ' - ' . $session_box['dates'] + : $session_box['dates']; + $extra_info .= isset($session_box['duration']) + ? ' ' . $session_box['duration'] + : null; $params['show_link_to_session'] = api_is_drh() ? false : true; $params['title'] = $session_box['title']; @@ -1320,7 +1320,8 @@ class IndexManager ); } - if ($session_now > $allowed_time //&& + if ( + $session_now > $allowed_time //&& //$coachAccessEndDate > $dif_time_after - 1 ) { if (api_get_setting('hide_courses_in_sessions') == 'false') { @@ -1339,13 +1340,13 @@ class IndexManager $sessionParams = array(); //Category if ($count > 0) { - $session_box = Display:: get_session_title_box( - $session_id - ); + $session_box = Display:: get_session_title_box($session_id); $sessionParams['id'] = $session_id; $sessionParams['show_link_to_session'] = !api_is_drh(); $sessionParams['title'] = $session_box['title']; - $sessionParams['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'] . ' | ' : '') . $session_box['dates']; + $sessionParams['subtitle'] = (!empty($session_box['coach']) + ? $session_box['coach'] . ' | ' + : '') . $session_box['dates']; $sessionParams['show_actions'] = api_is_platform_admin(); $sessionParams['courses'] = $html_courses_session; $sessionParams['show_simple_session_info'] = false; @@ -1379,7 +1380,8 @@ class IndexManager $session_category_start_date = $session_category['session_category']['date_start']; $session_category_end_date = $session_category['session_category']['date_end']; - if (!empty($session_category_start_date) && + if ( + !empty($session_category_start_date) && $session_category_start_date != '0000-00-00' && !empty($session_category_end_date) && $session_category_end_date != '0000-00-00' @@ -1390,16 +1392,18 @@ class IndexManager $session_category['session_category']['date_end'] ); } else { - if (!empty($session_category_start_date) && + if ( + !empty($session_category_start_date) && $session_category_start_date != '0000-00-00' ) { - $categoryParams['subtitle'] = get_lang('From').' '.$session_category_start_date; + $categoryParams['subtitle'] = get_lang('From') . ' ' . $session_category_start_date; } - if (!empty($session_category_end_date) && + if ( + !empty($session_category_end_date) && $session_category_end_date != '0000-00-00' ) { - $categoryParams['subtitle'] = get_lang('Until').' '.$session_category_end_date; + $categoryParams['subtitle'] = get_lang('Until') . ' ' . $session_category_end_date; } } @@ -1413,7 +1417,7 @@ class IndexManager } return [ - 'html' => $sessions_with_category.$sessions_with_no_category.$courses_html.$special_courses, + 'html' => $sessions_with_category . $sessions_with_no_category . $courses_html . $special_courses, 'session_count' => $sessionCount, 'course_count' => $courseCount ]; diff --git a/user_portal.php b/user_portal.php index 6fc254de9f..bcb930d7a2 100755 --- a/user_portal.php +++ b/user_portal.php @@ -43,48 +43,48 @@ $courseAndSessions = $controller->returnCoursesAndSessions($userId); // Check if a user is enrolled only in one course for going directly to the course after the login. if (api_get_setting('go_to_course_after_login') == 'true') { - $count_of_sessions = $courseAndSessions['session_count']; - $count_of_courses_no_sessions = $courseAndSessions['course_count']; + $count_of_sessions = $courseAndSessions['session_count']; + $count_of_courses_no_sessions = $courseAndSessions['course_count']; // User is subscribe in 1 session and 0 courses. - if ($count_of_sessions == 1 && $count_of_courses_no_sessions == 0) { - $sessions = SessionManager::get_sessions_by_user($userId); + if ($count_of_sessions == 1 && $count_of_courses_no_sessions == 0) { + $sessions = SessionManager::get_sessions_by_user($userId); - if (isset($sessions[0])) { - $sessionInfo = $sessions[0]; + if (isset($sessions[0])) { + $sessionInfo = $sessions[0]; // Session only has 1 course. if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) { $courseCode = $sessionInfo['courses'][0]['code']; $courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']); - $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id']; - header('Location:'.$courseUrl); + $courseUrl = $courseInfo['course_public_url'] . '?id_session=' . $sessionInfo['session_id']; + header('Location:' . $courseUrl); exit; } // Session has many courses. - if (isset($sessionInfo['session_id'])) { - $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id']; + if (isset($sessionInfo['session_id'])) { + $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . $sessionInfo['session_id']; - header('Location:'.$url); - exit; - } - } - } + header('Location:' . $url); + exit; + } + } + } // User is subscribed to 1 course. - if (!isset($_SESSION['coursesAlreadyVisited']) && - $count_of_sessions == 0 && $count_of_courses_no_sessions == 1 - ) { - $courses = CourseManager::get_courses_list_by_user_id($userId); - - if (!empty($courses) && isset($courses[0]) && isset($courses[0]['code'])) { - $courseInfo = api_get_course_info_by_id($courses[0]['real_id']); - if (!empty($courseInfo)) { - $courseUrl = $courseInfo['course_public_url']; - header('Location:'.$courseUrl); - exit; - } - } - } + if (!isset($_SESSION['coursesAlreadyVisited']) && + $count_of_sessions == 0 && $count_of_courses_no_sessions == 1 + ) { + $courses = CourseManager::get_courses_list_by_user_id($userId); + + if (!empty($courses) && isset($courses[0]) && isset($courses[0]['code'])) { + $courseInfo = api_get_course_info_by_id($courses[0]['real_id']); + if (!empty($courseInfo)) { + $courseUrl = $courseInfo['course_public_url']; + header('Location:' . $courseUrl); + exit; + } + } + } } $nameTools = get_lang('MyCourses'); @@ -140,28 +140,28 @@ if (empty($courseAndSessions['html']) && !isset($_GET['history'])) { $controller->tpl->assign('content', $courseAndSessions['html']); if (api_get_setting('allow_browser_sniffer') == 'true') { - if ($_SESSION['sniff_navigator']!="checked") { - $controller->tpl->assign('show_sniff', 1); - } else { - $controller->tpl->assign('show_sniff', 0); - } + if ($_SESSION['sniff_navigator'] != "checked") { + $controller->tpl->assign('show_sniff', 1); + } else { + $controller->tpl->assign('show_sniff', 0); + } } // Display the Site Use Cookie Warning Validation $useCookieValidation = api_get_setting('cookie_warning'); if ($useCookieValidation === 'true') { - if (isset($_POST['acceptCookies'])) { - api_set_site_use_cookie_warning_cookie(); - } else { - if (!api_site_use_cookie_warning_cookie_exist()) { - if (Template::isToolBarDisplayedForUser()) { - $controller->tpl->assign('toolBarDisplayed', true); - } else { - $controller->tpl->assign('toolBarDisplayed', false); - } - $controller->tpl->assign('displayCookieUsageWarning', true); - } - } + if (isset($_POST['acceptCookies'])) { + api_set_site_use_cookie_warning_cookie(); + } else { + if (!api_site_use_cookie_warning_cookie_exist()) { + if (Template::isToolBarDisplayedForUser()) { + $controller->tpl->assign('toolBarDisplayed', true); + } else { + $controller->tpl->assign('toolBarDisplayed', false); + } + $controller->tpl->assign('displayCookieUsageWarning', true); + } + } } //check for flash and message @@ -169,12 +169,12 @@ $sniff_notification = ''; $some_activex = isset($_SESSION['sniff_check_some_activex']) ? $_SESSION['sniff_check_some_activex'] : null; $some_plugins = isset($_SESSION['sniff_check_some_plugins']) ? $_SESSION['sniff_check_some_plugins'] : null; -if(!empty($some_activex) || !empty($some_plugins)){ - if (! preg_match("/flash_yes/", $some_activex) && ! preg_match("/flash_yes/", $some_plugins)) { - $sniff_notification = Display::return_message(get_lang('NoFlash'), 'warning', true); - //js verification - To annoying of redirecting every time the page - $controller->tpl->assign('sniff_notification', $sniff_notification); - } +if (!empty($some_activex) || !empty($some_plugins)) { + if (!preg_match("/flash_yes/", $some_activex) && !preg_match("/flash_yes/", $some_plugins)) { + $sniff_notification = Display::return_message(get_lang('NoFlash'), 'warning', true); + //js verification - To annoying of redirecting every time the page + $controller->tpl->assign('sniff_notification', $sniff_notification); + } } $controller->tpl->assign('profile_block', $controller->return_profile_block());