diff --git a/main/inc/lib/page.lib.php b/main/inc/lib/page.lib.php
index f3e0211ee2..62c7cba01f 100644
--- a/main/inc/lib/page.lib.php
+++ b/main/inc/lib/page.lib.php
@@ -13,67 +13,67 @@ class PageController {
$user_id = api_get_user_id();
}
- //Always show the user image
- $img_array = UserManager::get_user_picture_path_by_id($user_id, 'web', true, true);
- $no_image = false;
- if ($img_array['file'] == 'unknown.jpg') {
- $no_image = true;
- }
- $img_array = UserManager::get_picture_user($user_id, $img_array['file'], 50, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" ');
+ //Always show the user image
+ $img_array = UserManager::get_user_picture_path_by_id($user_id, 'web', true, true);
+ $no_image = false;
+ if ($img_array['file'] == 'unknown.jpg') {
+ $no_image = true;
+ }
+ $img_array = UserManager::get_picture_user($user_id, $img_array['file'], 50, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" ');
$profile_content = null;
if (api_get_setting('allow_social_tool') == 'true') {
if (!$no_image) {
- $profile_content .='
';
- } else {
- $profile_content .='';
- }
- }
+ $profile_content .='';
+ } else {
+ $profile_content .='';
+ }
+ }
$html = self::show_right_block(null, $profile_content, 'user_image_block', array('style' => 'text-align:center;'));
return $html;
}
- static function return_course_block() {
- $html = '';
+ static function return_course_block() {
+ $html = '';
- $show_create_link = false;
- $show_course_link = false;
+ $show_create_link = false;
+ $show_course_link = false;
if ((api_get_setting('allow_users_to_create_courses') == 'false' && !api_is_platform_admin()) || api_is_student()) {
$display_add_course_link = false;
} else {
$display_add_course_link = true;
}
- //$display_add_course_link = api_is_allowed_to_create_course() && ($_SESSION['studentview'] != 'studentenview');
+ //$display_add_course_link = api_is_allowed_to_create_course() && ($_SESSION['studentview'] != 'studentenview');
- if ($display_add_course_link) {
- $show_create_link = true;
- }
+ if ($display_add_course_link) {
+ $show_create_link = true;
+ }
- if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
- $show_course_link = true;
- } else {
- if (api_get_setting('allow_students_to_browse_courses') == 'true') {
- $show_course_link = true;
- }
- }
+ if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
+ $show_course_link = true;
+ } else {
+ if (api_get_setting('allow_students_to_browse_courses') == 'true') {
+ $show_course_link = true;
+ }
+ }
- // My account section
- $my_account_content = '';
+ // My account section
+ $my_account_content = '';
+ $my_account_content .= '
';
- if (!empty($my_account_content)) {
- $html = self::show_right_block(get_lang('Courses'), $my_account_content, 'course_block');
- }
- return $html;
- }
+ if (!empty($my_account_content)) {
+ $html = self::show_right_block(get_lang('Courses'), $my_account_content, 'course_block');
+ }
+ return $html;
+ }
static function return_profile_block() {
- $user_id = api_get_user_id();
+ $user_id = api_get_user_id();
- if (empty($user_id)) {
- return;
- }
+ if (empty($user_id)) {
+ return;
+ }
- $profile_content = '';
+ $profile_content = '';
- // @todo Add a platform setting to add the user image.
- if (api_get_setting('allow_message_tool') == 'true') {
+ // @todo Add a platform setting to add the user image.
+ if (api_get_setting('allow_message_tool') == 'true') {
- // New messages.
- $number_of_new_messages = MessageManager::get_new_messages();
+ // New messages.
+ $number_of_new_messages = MessageManager::get_new_messages();
- // New contact invitations.
- $number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id($user_id);
+ // New contact invitations.
+ $number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id($user_id);
- // New group invitations sent by a moderator.
- $group_pending_invitations = GroupPortalManager::get_groups_by_user_count($user_id, GROUP_USER_PERMISSION_PENDING_INVITATION, false);
+ // New group invitations sent by a moderator.
+ $group_pending_invitations = GroupPortalManager::get_groups_by_user_count($user_id, GROUP_USER_PERMISSION_PENDING_INVITATION, false);
- $total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations;
+ $total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations;
$cant_msg = Display::badge($number_of_new_messages);
- $link = '';
- if (api_get_setting('allow_social_tool') == 'true') {
- $link = '?f=social';
- }
- $profile_content .= '- '.get_lang('Inbox').$cant_msg.'
';
- $profile_content .= '- '.get_lang('Compose').'
';
-
- if (api_get_setting('allow_social_tool') == 'true') {
- $total_invitations = Display::badge($total_invitations);
- $profile_content .= '- '.get_lang('PendingInvitations').$total_invitations.'
';
- }
+ $link = '';
+ if (api_get_setting('allow_social_tool') == 'true') {
+ $link = '?f=social';
+ }
+ $profile_content .= '- '.get_lang('Inbox').$cant_msg.'
';
+ $profile_content .= '- '.get_lang('Compose').'
';
+
+ if (api_get_setting('allow_social_tool') == 'true') {
+ $total_invitations = Display::badge($total_invitations);
+ $profile_content .= '- '.get_lang('PendingInvitations').$total_invitations.'
';
+ }
$profile_content .= '- '.get_lang('EditProfile').'
';
- }
+ }
$profile_content .= '
';
- $html = self::show_right_block(get_lang('Profile'), $profile_content, 'profile_block');
- return $html;
- }
+ $html = self::show_right_block(get_lang('Profile'), $profile_content, 'profile_block');
+ return $html;
+ }
static function return_hot_courses() {
- return CourseManager::return_hot_courses();
- }
+ return CourseManager::return_hot_courses();
+ }
static function return_help() {
$home = api_get_home_path();
@@ -146,23 +146,23 @@ class PageController {
$sys_path = api_get_path(SYS_PATH);
$platformLanguage = api_get_setting('platformLanguage');
- // Help section.
- /* Hide right menu "general" and other parts on anonymous right menu. */
+ // Help section.
+ /* Hide right menu "general" and other parts on anonymous right menu. */
- if (!isset($user_selected_language)) {
- $user_selected_language = $platformLanguage;
- }
+ if (!isset($user_selected_language)) {
+ $user_selected_language = $platformLanguage;
+ }
$html = null;
- $home_menu = @(string)file_get_contents($sys_path.$home.'home_menu_'.$user_selected_language.'.html');
- if (!empty($home_menu)) {
- $home_menu_content = '';
- $home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
- $home_menu_content .= '
';
- $html .= self::show_right_block(get_lang('MenuGeneral'), $home_menu_content, 'help_block');
- }
- return $html;
- }
+ $home_menu = @(string)file_get_contents($sys_path.$home.'home_menu_'.$user_selected_language.'.html');
+ if (!empty($home_menu)) {
+ $home_menu_content = '';
+ $home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+ $home_menu_content .= '
';
+ $html .= self::show_right_block(get_lang('MenuGeneral'), $home_menu_content, 'help_block');
+ }
+ return $html;
+ }
static function return_skills_links() {
$html = '';
@@ -181,440 +181,440 @@ class PageController {
}
static function return_notice() {
- $sys_path = api_get_path(SYS_PATH);
- $user_selected_language = api_get_interface_language();
+ $sys_path = api_get_path(SYS_PATH);
+ $user_selected_language = api_get_interface_language();
$home = api_get_home_path();
- $html = '';
- // Notice
- $home_notice = @(string)file_get_contents($sys_path.$home.'home_notice_'.$user_selected_language.'.html');
- if (empty($home_notice)) {
- $home_notice = @(string)file_get_contents($sys_path.$home.'home_notice.html');
- }
+ $html = '';
+ // Notice
+ $home_notice = @(string)file_get_contents($sys_path.$home.'home_notice_'.$user_selected_language.'.html');
+ if (empty($home_notice)) {
+ $home_notice = @(string)file_get_contents($sys_path.$home.'home_notice.html');
+ }
- if (!empty($home_notice)) {
- $home_notice = api_to_system_encoding($home_notice, api_detect_encoding(strip_tags($home_notice)));
+ if (!empty($home_notice)) {
+ $home_notice = api_to_system_encoding($home_notice, api_detect_encoding(strip_tags($home_notice)));
$home_notice = Display::div($home_notice, array('class' => 'homepage_notice'));
- $html = self::show_right_block(get_lang('Notice'), $home_notice, 'notice_block');
- }
+ $html = self::show_right_block(get_lang('Notice'), $home_notice, 'notice_block');
+ }
return $html;
}
/**
* @todo use the template system
*/
- static function show_right_block($title, $content, $id = null, $params = null) {
- if (!empty($id)) {
+ static function show_right_block($title, $content, $id = null, $params = null) {
+ if (!empty($id)) {
$params['id'] = $id;
}
$params['class'] = 'well sidebar-nav';
$html = null;
- if (!empty($title)) {
- $html.= ''.$title.'
';
- }
- $html.= $content;
+ if (!empty($title)) {
+ $html.= ''.$title.'
';
+ }
+ $html.= $content;
$html = Display::div($html, $params);
- return $html;
- }
+ return $html;
+ }
/**
- * Adds a form to let users login
- * @version 1.1
- */
- static function display_login_form() {
- $form = new FormValidator('formLogin', 'POST', null, null, array('class'=>'form-vertical'));
+ * Adds a form to let users login
+ * @version 1.1
+ */
+ static function display_login_form() {
+ $form = new FormValidator('formLogin', 'POST', null, null, array('class'=>'form-vertical'));
// 'placeholder'=>get_lang('UserName')
//'autocomplete'=>"off",
- $form->addElement('text', 'login', get_lang('UserName'), array('class' => 'span2 autocapitalize_off', 'autofocus' => 'autofocus'));
- $form->addElement('password', 'password', get_lang('Pass'), array('class' => 'span2'));
- $form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn'));
- $html = $form->return_form();
- if (api_get_setting('openid_authentication') == 'true') {
- include_once 'main/auth/openid/login.php';
- $html .= ''.openid_form().'
';
- }
- return $html;
- }
-
- static function return_search_block() {
- $html = '';
- if (api_get_setting('search_enabled') == 'true') {
- $html .= '';
- $search_btn = get_lang('Search');
- $search_content = '
-
';
- $html .= self::show_right_block(get_lang('Search'), $search_content, 'search_block');
- }
- return $html;
- }
+ $form->addElement('text', 'login', get_lang('UserName'), array('class' => 'span2 autocapitalize_off', 'autofocus' => 'autofocus'));
+ $form->addElement('password', 'password', get_lang('Pass'), array('class' => 'span2'));
+ $form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn'));
+ $html = $form->return_form();
+ if (api_get_setting('openid_authentication') == 'true') {
+ include_once 'main/auth/openid/login.php';
+ $html .= ''.openid_form().'
';
+ }
+ return $html;
+ }
+
+ static function return_search_block() {
+ $html = '';
+ if (api_get_setting('search_enabled') == 'true') {
+ $html .= '';
+ $search_btn = get_lang('Search');
+ $search_content = '
+
';
+ $html .= self::show_right_block(get_lang('Search'), $search_content, 'search_block');
+ }
+ return $html;
+ }
static function return_announcements($user_id = null, $show_slide = true) {
// Display System announcements
- $announcement = isset($_GET['announcement']) ? intval($_GET['announcement']) : null;
-
- if (!api_is_anonymous() && $user_id) {
- $visibility = api_is_allowed_to_create_course() ? SystemAnnouncementManager::VISIBLE_TEACHER : SystemAnnouncementManager::VISIBLE_STUDENT;
- if ($show_slide) {
- $announcements = SystemAnnouncementManager :: display_announcements_slider($visibility, $announcement);
- } else {
- $announcements = SystemAnnouncementManager :: display_all_announcements($visibility, $announcement);
- }
- } else {
- if ($show_slide) {
- $announcements = SystemAnnouncementManager :: display_announcements_slider(SystemAnnouncementManager::VISIBLE_GUEST, $announcement);
- } else {
- $announcements = SystemAnnouncementManager :: display_all_announcements(SystemAnnouncementManager::VISIBLE_GUEST, $announcement);
- }
- }
- return $announcements;
- }
+ $announcement = isset($_GET['announcement']) ? intval($_GET['announcement']) : null;
+
+ if (!api_is_anonymous() && $user_id) {
+ $visibility = api_is_allowed_to_create_course() ? SystemAnnouncementManager::VISIBLE_TEACHER : SystemAnnouncementManager::VISIBLE_STUDENT;
+ if ($show_slide) {
+ $announcements = SystemAnnouncementManager :: display_announcements_slider($visibility, $announcement);
+ } else {
+ $announcements = SystemAnnouncementManager :: display_all_announcements($visibility, $announcement);
+ }
+ } else {
+ if ($show_slide) {
+ $announcements = SystemAnnouncementManager :: display_announcements_slider(SystemAnnouncementManager::VISIBLE_GUEST, $announcement);
+ } else {
+ $announcements = SystemAnnouncementManager :: display_all_announcements(SystemAnnouncementManager::VISIBLE_GUEST, $announcement);
+ }
+ }
+ return $announcements;
+ }
static function return_home_page() {
- // Including the page for the news
- $html = null;
+ // Including the page for the news
+ $html = null;
$home = api_get_home_path();
$home_top_temp = null;
- if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['include'])) {
- $open = @(string)file_get_contents(api_get_path(SYS_PATH).$home.$_GET['include']);
- $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
- } else {
- if (!empty($_SESSION['user_language_choice'])) {
- $user_selected_language = $_SESSION['user_language_choice'];
- } elseif (!empty($_SESSION['_user']['language'])) {
- $user_selected_language = $_SESSION['_user']['language'];
- } else {
- $user_selected_language = api_get_setting('platformLanguage');
- }
- if (!file_exists($home.'home_news_'.$user_selected_language.'.html')) {
- if (file_exists($home.'home_top.html')) {
- $home_top_temp = file($home.'home_top.html');
- } else {
- //$home_top_temp = file('home/'.'home_top.html');
- }
+ if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['include'])) {
+ $open = @(string)file_get_contents(api_get_path(SYS_PATH).$home.$_GET['include']);
+ $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+ } else {
+ if (!empty($_SESSION['user_language_choice'])) {
+ $user_selected_language = $_SESSION['user_language_choice'];
+ } elseif (!empty($_SESSION['_user']['language'])) {
+ $user_selected_language = $_SESSION['_user']['language'];
+ } else {
+ $user_selected_language = api_get_setting('platformLanguage');
+ }
+ if (!file_exists($home.'home_news_'.$user_selected_language.'.html')) {
+ if (file_exists($home.'home_top.html')) {
+ $home_top_temp = file($home.'home_top.html');
+ } else {
+ //$home_top_temp = file('home/'.'home_top.html');
+ }
if (!empty($home_top_temp)) {
$home_top_temp = implode('', $home_top_temp);
}
- } else {
- if (file_exists($home.'home_top_'.$user_selected_language.'.html')) {
- $home_top_temp = file_get_contents($home.'home_top_'.$user_selected_language.'.html');
- } else {
- $home_top_temp = file_get_contents($home.'home_top.html');
- }
- }
+ } else {
+ if (file_exists($home.'home_top_'.$user_selected_language.'.html')) {
+ $home_top_temp = file_get_contents($home.'home_top_'.$user_selected_language.'.html');
+ } else {
+ $home_top_temp = file_get_contents($home.'home_top.html');
+ }
+ }
//trim($home_top_temp) == ''
- if (empty($home_top_temp) && api_is_platform_admin()) {
- $home_top_temp = get_lang('PortalHomepageDefaultIntroduction');
- }
- $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
+ if (empty($home_top_temp) && api_is_platform_admin()) {
+ $home_top_temp = get_lang('PortalHomepageDefaultIntroduction');
+ }
+ $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
if (!empty($open)) {
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
}
- }
- return $html;
- }
+ }
+ return $html;
+ }
static function return_reservation_block() {
- $html = '';
- if (api_get_setting('allow_reservation') == 'true' && api_is_allowed_to_create_course()) {
- $booking_content .='';
- $html .= self::show_right_block(get_lang('Booking'), $booking_content, 'reservation_block');
- }
- return $html;
- }
+ $html = '';
+ if (api_get_setting('allow_reservation') == 'true' && api_is_allowed_to_create_course()) {
+ $booking_content .='';
+ $html .= self::show_right_block(get_lang('Booking'), $booking_content, 'reservation_block');
+ }
+ return $html;
+ }
static function return_classes_block() {
- $html = '';
- if (api_get_setting('show_groups_to_users') == 'true') {
- require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
- $usergroup = new Usergroup();
- $usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
- $classes = '';
- if (!empty($usergroup_list)) {
- foreach($usergroup_list as $group_id) {
- $data = $usergroup->get($group_id);
- $data['name'] = Display::url($data['name'], api_get_path(WEB_CODE_PATH).'user/classes.php?id='.$data['id']);
- $classes .= Display::tag('li', $data['name']);
- }
- }
- if (api_is_platform_admin()) {
- $classes .= Display::tag('li', Display::url(get_lang('AddClasses') ,api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add'));
- }
- if (!empty($classes)) {
- $classes = Display::tag('ul', $classes, array('class'=>'nav nav-list'));
- $html .= self::show_right_block(get_lang('Classes'), $classes, 'classes_block');
- }
- }
- return $html;
- }
+ $html = '';
+ if (api_get_setting('show_groups_to_users') == 'true') {
+ require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
+ $usergroup = new Usergroup();
+ $usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
+ $classes = '';
+ if (!empty($usergroup_list)) {
+ foreach($usergroup_list as $group_id) {
+ $data = $usergroup->get($group_id);
+ $data['name'] = Display::url($data['name'], api_get_path(WEB_CODE_PATH).'user/classes.php?id='.$data['id']);
+ $classes .= Display::tag('li', $data['name']);
+ }
+ }
+ if (api_is_platform_admin()) {
+ $classes .= Display::tag('li', Display::url(get_lang('AddClasses') ,api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add'));
+ }
+ if (!empty($classes)) {
+ $classes = Display::tag('ul', $classes, array('class'=>'nav nav-list'));
+ $html .= self::show_right_block(get_lang('Classes'), $classes, 'classes_block');
+ }
+ }
+ return $html;
+ }
static function return_exercise_block($personal_course_list) {
- require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
- $exercise_list = array();
- if (!empty($personal_course_list)) {
- foreach($personal_course_list as $course_item) {
- $course_code = $course_item['c'];
- $session_id = $course_item['id_session'];
-
- $exercises = get_exercises_to_be_taken($course_code, $session_id);
-
- foreach($exercises as $exercise_item) {
- $exercise_item['course_code'] = $course_code;
- $exercise_item['session_id'] = $session_id;
- $exercise_item['tms'] = api_strtotime($exercise_item['end_time'], 'UTC');
-
- $exercise_list[] = $exercise_item;
- }
- }
- if (!empty($exercise_list)) {
- $exercise_list = msort($exercise_list, 'tms');
- $my_exercise = $exercise_list[0];
- $url = Display::url($my_exercise['title'], api_get_path(WEB_CODE_PATH).'exercice/overview.php?exerciseId='.$my_exercise['id'].'&cidReq='.$my_exercise['course_code'].'&id_session='.$my_exercise['session_id']);
- $this->page->assign('exercise_url', $url);
- $this->page->assign('exercise_end_date', api_convert_and_format_date($my_exercise['end_time'], DATE_FORMAT_SHORT));
- }
- }
- }
+ require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
+ $exercise_list = array();
+ if (!empty($personal_course_list)) {
+ foreach($personal_course_list as $course_item) {
+ $course_code = $course_item['c'];
+ $session_id = $course_item['id_session'];
+
+ $exercises = get_exercises_to_be_taken($course_code, $session_id);
+
+ foreach($exercises as $exercise_item) {
+ $exercise_item['course_code'] = $course_code;
+ $exercise_item['session_id'] = $session_id;
+ $exercise_item['tms'] = api_strtotime($exercise_item['end_time'], 'UTC');
+
+ $exercise_list[] = $exercise_item;
+ }
+ }
+ if (!empty($exercise_list)) {
+ $exercise_list = msort($exercise_list, 'tms');
+ $my_exercise = $exercise_list[0];
+ $url = Display::url($my_exercise['title'], api_get_path(WEB_CODE_PATH).'exercice/overview.php?exerciseId='.$my_exercise['id'].'&cidReq='.$my_exercise['course_code'].'&id_session='.$my_exercise['session_id']);
+ $this->page->assign('exercise_url', $url);
+ $this->page->assign('exercise_end_date', api_convert_and_format_date($my_exercise['end_time'], DATE_FORMAT_SHORT));
+ }
+ }
+ }
static function return_teacher_link() {
- $html = '';
+ $html = '';
$user_id = api_get_user_id();
- if (!empty($user_id)) {
- // tabs that are deactivated are added here
-
- $show_menu = false;
- $show_create_link = false;
- $show_course_link = false;
-
- if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
- $show_menu = true;
- $show_course_link = true;
- } else {
- if (api_get_setting('allow_students_to_browse_courses') == 'true') {
- $show_menu = true;
- $show_course_link = true;
- }
- }
-
- if ($show_menu && ($show_create_link || $show_course_link )) {
- $show_menu = true;
- } else {
- $show_menu = false;
- }
- }
-
- // My Account section
-
- if ($show_menu) {
- $html .= '';
- }
-
- if (!empty($html)) {
- $html = self::show_right_block(get_lang('Courses'), $html, 'teacher_block');
- }
- return $html;
- }
+ if (!empty($user_id)) {
+ // tabs that are deactivated are added here
+
+ $show_menu = false;
+ $show_create_link = false;
+ $show_course_link = false;
+
+ if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
+ $show_menu = true;
+ $show_course_link = true;
+ } else {
+ if (api_get_setting('allow_students_to_browse_courses') == 'true') {
+ $show_menu = true;
+ $show_course_link = true;
+ }
+ }
+
+ if ($show_menu && ($show_create_link || $show_course_link )) {
+ $show_menu = true;
+ } else {
+ $show_menu = false;
+ }
+ }
+
+ // My Account section
+
+ if ($show_menu) {
+ $html .= '';
+ }
+
+ if (!empty($html)) {
+ $html = self::show_right_block(get_lang('Courses'), $html, 'teacher_block');
+ }
+ return $html;
+ }
/**
- * Display list of courses in a category.
- * (for anonymous users)
- *
- * @version 1.1
- * @author Patrick Cool , Ghent University - refactoring and code cleaning
+ * Display list of courses in a category.
+ * (for anonymous users)
+ *
+ * @version 1.1
+ * @author Patrick Cool , Ghent University - refactoring and code cleaning
* @author Julio Montoya , Beeznest template modifs
- */
- static function return_courses_in_categories() {
+ */
+ static function return_courses_in_categories() {
$result = '';
- $stok = Security::get_token();
-
- // Initialization.
- $user_identified = (api_get_user_id() > 0 && !api_is_anonymous());
- $web_course_path = api_get_path(WEB_COURSE_PATH);
- $category = Database::escape_string($_GET['category']);
- $setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 'true';
-
- // Database table definitions.
- $main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
- $main_category_table = Database :: get_main_table(TABLE_MAIN_CATEGORY);
-
- // Get list of courses in category $category.
- $sql_get_course_list = "SELECT * FROM $main_course_table cours
- WHERE category_code = '".Database::escape_string($_GET['category'])."'
- ORDER BY title, UPPER(visual_code)";
-
- // Showing only the courses of the current access_url_id.
- global $_configuration;
- if ($_configuration['multiple_access_urls']) {
- $url_access_id = api_get_current_access_url_id();
- if ($url_access_id != -1) {
- $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
- $sql_get_course_list = "SELECT * FROM $main_course_table as course INNER JOIN $tbl_url_rel_course as url_rel_course
- ON (url_rel_course.course_code=course.code)
- WHERE access_url_id = $url_access_id AND category_code = '".Database::escape_string($_GET['category'])."' ORDER BY title, UPPER(visual_code)";
- }
- }
-
- // Removed: AND cours.visibility='".COURSE_VISIBILITY_OPEN_WORLD."'
- $sql_result_courses = Database::query($sql_get_course_list);
-
- while ($course_result = Database::fetch_array($sql_result_courses)) {
- $course_list[] = $course_result;
- }
-
- $platform_visible_courses = '';
- // $setting_show_also_closed_courses
- if ($user_identified) {
- if ($setting_show_also_closed_courses) {
- $platform_visible_courses = '';
- } else {
- $platform_visible_courses = " AND (t3.visibility='".COURSE_VISIBILITY_OPEN_WORLD."' OR t3.visibility='".COURSE_VISIBILITY_OPEN_PLATFORM."' )";
- }
- } else {
- if ($setting_show_also_closed_courses) {
- $platform_visible_courses = '';
- } else {
- $platform_visible_courses = " AND (t3.visibility='".COURSE_VISIBILITY_OPEN_WORLD."' )";
- }
- }
- $sqlGetSubCatList = "
- SELECT t1.name,t1.code,t1.parent_id,t1.children_count,COUNT(DISTINCT t3.code) AS nbCourse
- FROM $main_category_table t1
- LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
- LEFT JOIN $main_course_table t3 ON (t3.category_code=t1.code $platform_visible_courses)
- WHERE t1.parent_id ". (empty ($category) ? "IS NULL" : "='$category'")."
- GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
-
-
- // Showing only the category of courses of the current access_url_id
- if ($_configuration['multiple_access_urls']) {
- $url_access_id = api_get_current_access_url_id();
- if ($url_access_id != -1) {
- $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
- $sqlGetSubCatList = "
- SELECT t1.name,t1.code,t1.parent_id,t1.children_count,COUNT(DISTINCT t3.code) AS nbCourse
- FROM $main_category_table t1
- LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
- LEFT JOIN $main_course_table t3 ON (t3.category_code=t1.code $platform_visible_courses)
- INNER JOIN $tbl_url_rel_course as url_rel_course
- ON (url_rel_course.course_code=t3.code)
- WHERE access_url_id = $url_access_id AND t1.parent_id ".(empty($category) ? "IS NULL" : "='$category'")."
- GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
- }
- }
-
- $resCats = Database::query($sqlGetSubCatList);
- $thereIsSubCat = false;
- if (Database::num_rows($resCats) > 0) {
- $htmlListCat = Display::page_header(get_lang('CatList'));
+ $stok = Security::get_token();
+
+ // Initialization.
+ $user_identified = (api_get_user_id() > 0 && !api_is_anonymous());
+ $web_course_path = api_get_path(WEB_COURSE_PATH);
+ $category = Database::escape_string($_GET['category']);
+ $setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 'true';
+
+ // Database table definitions.
+ $main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
+ $main_category_table = Database :: get_main_table(TABLE_MAIN_CATEGORY);
+
+ // Get list of courses in category $category.
+ $sql_get_course_list = "SELECT * FROM $main_course_table cours
+ WHERE category_code = '".Database::escape_string($_GET['category'])."'
+ ORDER BY title, UPPER(visual_code)";
+
+ // Showing only the courses of the current access_url_id.
+ global $_configuration;
+ if ($_configuration['multiple_access_urls']) {
+ $url_access_id = api_get_current_access_url_id();
+ if ($url_access_id != -1) {
+ $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+ $sql_get_course_list = "SELECT * FROM $main_course_table as course INNER JOIN $tbl_url_rel_course as url_rel_course
+ ON (url_rel_course.course_code=course.code)
+ WHERE access_url_id = $url_access_id AND category_code = '".Database::escape_string($_GET['category'])."' ORDER BY title, UPPER(visual_code)";
+ }
+ }
+
+ // Removed: AND cours.visibility='".COURSE_VISIBILITY_OPEN_WORLD."'
+ $sql_result_courses = Database::query($sql_get_course_list);
+
+ while ($course_result = Database::fetch_array($sql_result_courses)) {
+ $course_list[] = $course_result;
+ }
+
+ $platform_visible_courses = '';
+ // $setting_show_also_closed_courses
+ if ($user_identified) {
+ if ($setting_show_also_closed_courses) {
+ $platform_visible_courses = '';
+ } else {
+ $platform_visible_courses = " AND (t3.visibility='".COURSE_VISIBILITY_OPEN_WORLD."' OR t3.visibility='".COURSE_VISIBILITY_OPEN_PLATFORM."' )";
+ }
+ } else {
+ if ($setting_show_also_closed_courses) {
+ $platform_visible_courses = '';
+ } else {
+ $platform_visible_courses = " AND (t3.visibility='".COURSE_VISIBILITY_OPEN_WORLD."' )";
+ }
+ }
+ $sqlGetSubCatList = "
+ SELECT t1.name,t1.code,t1.parent_id,t1.children_count,COUNT(DISTINCT t3.code) AS nbCourse
+ FROM $main_category_table t1
+ LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
+ LEFT JOIN $main_course_table t3 ON (t3.category_code=t1.code $platform_visible_courses)
+ WHERE t1.parent_id ". (empty ($category) ? "IS NULL" : "='$category'")."
+ GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
+
+
+ // Showing only the category of courses of the current access_url_id
+ if ($_configuration['multiple_access_urls']) {
+ $url_access_id = api_get_current_access_url_id();
+ if ($url_access_id != -1) {
+ $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+ $sqlGetSubCatList = "
+ SELECT t1.name,t1.code,t1.parent_id,t1.children_count,COUNT(DISTINCT t3.code) AS nbCourse
+ FROM $main_category_table t1
+ LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
+ LEFT JOIN $main_course_table t3 ON (t3.category_code=t1.code $platform_visible_courses)
+ INNER JOIN $tbl_url_rel_course as url_rel_course
+ ON (url_rel_course.course_code=t3.code)
+ WHERE access_url_id = $url_access_id AND t1.parent_id ".(empty($category) ? "IS NULL" : "='$category'")."
+ GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
+ }
+ }
+
+ $resCats = Database::query($sqlGetSubCatList);
+ $thereIsSubCat = false;
+ if (Database::num_rows($resCats) > 0) {
+ $htmlListCat = Display::page_header(get_lang('CatList'));
$htmlListCat .= '';
- while ($catLine = Database::fetch_array($resCats)) {
- if ($catLine['code'] != $category) {
- $category_has_open_courses = self::category_has_open_courses($catLine['code']);
- if ($category_has_open_courses) {
- // The category contains courses accessible to anonymous visitors.
- $htmlListCat .= '- ';
- $htmlListCat .= ''.$catLine['name'].'';
- if (api_get_setting('show_number_of_courses') == 'true') {
- $htmlListCat .= ' ('.$catLine['nbCourse'].' '.get_lang('Courses').')';
- }
- $htmlListCat .= "
";
- $thereIsSubCat = true;
- } elseif ($catLine['children_count'] > 0) {
- // The category has children, subcategories.
- $htmlListCat .= '- ';
- $htmlListCat .= ''.$catLine['name'].'';
- $htmlListCat .= "
";
- $thereIsSubCat = true;
- }
- /* End changed code to eliminate the (0 courses) after empty categories. */
- elseif (api_get_setting('show_empty_course_categories') == 'true') {
- $htmlListCat .= '- ';
- $htmlListCat .= $catLine['name'];
- $htmlListCat .= "
";
- $thereIsSubCat = true;
- } // Else don't set thereIsSubCat to true to avoid printing things if not requested.
- } else {
- $htmlTitre = '';
- if (api_get_setting('show_back_link_on_top_of_tree') == 'true') {
- $htmlTitre .= '<< '.get_lang('BackToHomePage').'';
- }
- if (!is_null($catLine['parent_id']) || (api_get_setting('show_back_link_on_top_of_tree') != 'true' && !is_null($catLine['code']))) {
- $htmlTitre .= '<< '.get_lang('Up').'';
- }
- $htmlTitre .= "
";
- if ($category != "" && !is_null($catLine['code'])) {
- $htmlTitre .= ''.$catLine['name']."
";
- } else {
- $htmlTitre .= ''.get_lang('Categories')."
";
- }
- }
- }
- $htmlListCat .= "
";
- }
- $result .= $htmlTitre;
- if ($thereIsSubCat) {
- $result .= $htmlListCat;
- }
- while ($categoryName = Database::fetch_array($resCats)) {
- $result .= '' . $categoryName['name'] . "
\n";
- }
- $numrows = Database::num_rows($sql_result_courses);
- $courses_list_string = '';
- $courses_shown = 0;
- if ($numrows > 0) {
-
- $courses_list_string .= Display::page_header(get_lang('CourseList'));
+ while ($catLine = Database::fetch_array($resCats)) {
+ if ($catLine['code'] != $category) {
+ $category_has_open_courses = self::category_has_open_courses($catLine['code']);
+ if ($category_has_open_courses) {
+ // The category contains courses accessible to anonymous visitors.
+ $htmlListCat .= '- ';
+ $htmlListCat .= ''.$catLine['name'].'';
+ if (api_get_setting('show_number_of_courses') == 'true') {
+ $htmlListCat .= ' ('.$catLine['nbCourse'].' '.get_lang('Courses').')';
+ }
+ $htmlListCat .= "
";
+ $thereIsSubCat = true;
+ } elseif ($catLine['children_count'] > 0) {
+ // The category has children, subcategories.
+ $htmlListCat .= '- ';
+ $htmlListCat .= ''.$catLine['name'].'';
+ $htmlListCat .= "
";
+ $thereIsSubCat = true;
+ }
+ /* End changed code to eliminate the (0 courses) after empty categories. */
+ elseif (api_get_setting('show_empty_course_categories') == 'true') {
+ $htmlListCat .= '- ';
+ $htmlListCat .= $catLine['name'];
+ $htmlListCat .= "
";
+ $thereIsSubCat = true;
+ } // Else don't set thereIsSubCat to true to avoid printing things if not requested.
+ } else {
+ $htmlTitre = '';
+ if (api_get_setting('show_back_link_on_top_of_tree') == 'true') {
+ $htmlTitre .= '<< '.get_lang('BackToHomePage').'';
+ }
+ if (!is_null($catLine['parent_id']) || (api_get_setting('show_back_link_on_top_of_tree') != 'true' && !is_null($catLine['code']))) {
+ $htmlTitre .= '<< '.get_lang('Up').'';
+ }
+ $htmlTitre .= "
";
+ if ($category != "" && !is_null($catLine['code'])) {
+ $htmlTitre .= ''.$catLine['name']."
";
+ } else {
+ $htmlTitre .= ''.get_lang('Categories')."
";
+ }
+ }
+ }
+ $htmlListCat .= "
";
+ }
+ $result .= $htmlTitre;
+ if ($thereIsSubCat) {
+ $result .= $htmlListCat;
+ }
+ while ($categoryName = Database::fetch_array($resCats)) {
+ $result .= '' . $categoryName['name'] . "
\n";
+ }
+ $numrows = Database::num_rows($sql_result_courses);
+ $courses_list_string = '';
+ $courses_shown = 0;
+ if ($numrows > 0) {
+
+ $courses_list_string .= Display::page_header(get_lang('CourseList'));
$courses_list_string .= "";
- if (api_get_user_id()) {
- $courses_of_user = self::get_courses_of_user(api_get_user_id());
- }
-
- foreach ($course_list as $course) {
- // $setting_show_also_closed_courses
- if (!$setting_show_also_closed_courses) {
- // If we do not show the closed courses
- // we only show the courses that are open to the world (to everybody)
- // and the courses that are open to the platform (if the current user is a registered user.
- if( ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM) || ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD)) {
- $courses_shown++;
- $courses_list_string .= "- \n";
- $courses_list_string .= ''.$course['title'].'
';
+ if (api_get_user_id()) {
+ $courses_of_user = self::get_courses_of_user(api_get_user_id());
+ }
+
+ foreach ($course_list as $course) {
+ // $setting_show_also_closed_courses
+ if (!$setting_show_also_closed_courses) {
+ // If we do not show the closed courses
+ // we only show the courses that are open to the world (to everybody)
+ // and the courses that are open to the platform (if the current user is a registered user.
+ if( ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM) || ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD)) {
+ $courses_shown++;
+ $courses_list_string .= " - \n";
+ $courses_list_string .= ''.$course['title'].'
';
$course_details = array();
- if (api_get_setting('display_coursecode_in_courselist') == 'true') {
- $course_details[] = $course['visual_code'];
- }
- if (api_get_setting('display_teacher_in_courselist') == 'true') {
- $course_details[] = $course['tutor_name'];
- }
- if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) {
- $course_details[] = $course['course_language'];
- }
+ if (api_get_setting('display_coursecode_in_courselist') == 'true') {
+ $course_details[] = $course['visual_code'];
+ }
+ if (api_get_setting('display_teacher_in_courselist') == 'true') {
+ $course_details[] = $course['tutor_name'];
+ }
+ if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) {
+ $course_details[] = $course['course_language'];
+ }
$courses_list_string .= implode(' - ', $course_details);
- $courses_list_string .= " \n";
- }
- } else {
+ $courses_list_string .= "\n";
+ }
+ } else {
// We DO show the closed courses.
// The course is accessible if (link to the course homepage):
// 1. the course is open to the world (doesn't matter if the user is logged in or not): $course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD);
@@ -624,8 +624,8 @@ class PageController {
// 5. the user is the platform admin api_is_platform_admin().
//
$courses_shown++;
- $courses_list_string .= "- \n";
- if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD
+ $courses_list_string .= "
- \n";
+ if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD
|| ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM)
|| ($user_identified && key_exists($course['code'], $courses_of_user) && $course['visibility'] != COURSE_VISIBILITY_CLOSED)
|| $courses_of_user[$course['code']]['status'] == '1'
@@ -634,33 +634,33 @@ class PageController {
}
$courses_list_string .= $course['title'];
if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD
- || ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM)
- || ($user_identified && key_exists($course['code'], $courses_of_user) && $course['visibility'] != COURSE_VISIBILITY_CLOSED)
- || $courses_of_user[$course['code']]['status'] == '1'
- || api_is_platform_admin()) {
+ || ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM)
+ || ($user_identified && key_exists($course['code'], $courses_of_user) && $course['visibility'] != COURSE_VISIBILITY_CLOSED)
+ || $courses_of_user[$course['code']]['status'] == '1'
+ || api_is_platform_admin()) {
$courses_list_string .= '
';
}
$course_details = array();
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
$course_details[] = $course['visual_code'];
}
-// if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') {
-// $courses_list_string .= ' - ';
-// }
+// if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') {
+// $courses_list_string .= ' - ';
+// }
if (api_get_setting('display_teacher_in_courselist') == 'true') {
- $course_details[] = $course['tutor_name'];
- }
- if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) {
- $course_details[] = $course['course_language'];
- }
+ $course_details[] = $course['tutor_name'];
+ }
+ if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) {
+ $course_details[] = $course['course_language'];
+ }
if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) {
- $course_details[] = $course['course_language'];
- }
+ $course_details[] = $course['course_language'];
+ }
$courses_list_string .= implode(' - ', $course_details);
- // We display a subscription link if:
- // 1. it is allowed to register for the course and if the course is not already in the courselist of the user and if the user is identiefied
- // 2.
+ // We display a subscription link if:
+ // 1. it is allowed to register for the course and if the course is not already in the courselist of the user and if the user is identiefied
+ // 2.
if ($user_identified && !key_exists($course['code'], $courses_of_user)) {
if ($course['subscribe'] == '1') {
$courses_list_string .= ' ";
- } //end else
- } // end foreach
- $courses_list_string .= "
";
+ } //end else
+ } // end foreach
+ $courses_list_string .= "";
}
if ($courses_shown > 0) {
// Only display the list of courses and categories if there was more than
// 0 courses visible to the world (we're in the anonymous list here).
$result .= $courses_list_string;
}
- if ($category != '') {
- $result .= ' ' . Display :: return_icon('back.png', get_lang('BackToHomePage')) . get_lang('BackToHomePage') . '
';
- }
+ if ($category != '') {
+ $result .= ' ' . Display :: return_icon('back.png', get_lang('BackToHomePage')) . get_lang('BackToHomePage') . '
';
+ }
return $result;
- }
+ }
- /**
- * The most important function here, prints the session and course list (user_portal.php)
- *
- * */
- static function return_courses_and_sessions($user_id) {
+ /**
+ * The most important function here, prints the session and course list (user_portal.php)
+ *
+ * */
+ static function return_courses_and_sessions($user_id) {
$session_categories = array();
$load_history = (isset($_GET['history']) && intval($_GET['history']) == 1) ? true : false;
- if ($load_history) {
+ if ($load_history) {
//Load sessions in category in *history*
- $session_categories = UserManager::get_sessions_by_category($user_id, true);
- } else {
+ $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 = '';
//Showing history title
- if ($load_history) {
- $html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
- if (empty($session_categories)) {
- $html .= get_lang('YouDoNotHaveAnySessionInItsHistory');
- }
- }
+ if ($load_history) {
+ $html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
+ if (empty($session_categories)) {
+ $html .= get_lang('YouDoNotHaveAnySessionInItsHistory');
+ }
+ }
$courses_html = '';
$special_courses = '';
@@ -730,7 +730,7 @@ class PageController {
$load_directories_preview = api_get_setting('show_documents_preview') == 'true' ? true : false;
- if (is_array($session_categories)) {
+ if (is_array($session_categories)) {
foreach ($session_categories as $session_category) {
$session_category_id = $session_category['session_category']['id'];
// Sessions and courses that are not in a session category
@@ -787,15 +787,15 @@ class PageController {
}
if (api_get_setting('hide_courses_in_sessions') == 'false') {
- // $params['extra'] .= $html_courses_session;
+ // $params['extra'] .= $html_courses_session;
}
$sessions_with_no_category .= CourseManager::course_item_parent(CourseManager::course_item_html($params, true), $html_courses_session);
}
}
}
- } else {
- // All sessions included in
+ } else {
+ // All sessions included in
$count_courses_session = 0;
$html_sessions = '';
foreach ($session_category['sessions'] as $session) {
@@ -874,11 +874,11 @@ class PageController {
}
$sessions_with_category .= CourseManager::course_item_parent(CourseManager::course_item_html($params, true), $html_sessions);
}
- }
- }
- }
+ }
+ }
+ }
return $sessions_with_category.$sessions_with_no_category.$courses_html.$special_courses;
- }
+ }
/**
* Shows a welcome message when the user doesn't have any content in the course list