diff --git a/main/install/db_main.sql b/main/install/db_main.sql index 3c7e959f5b..ba3c321ef5 100755 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -819,6 +819,7 @@ VALUES ('enabled_support_pixlr',NULL,'radio','Tools','false','EnabledPixlrTitle','EnabledPixlrComment',NULL,NULL, 0), ('show_groups_to_users',NULL,'radio','Platform','true','ShowGroupsToUsersTitle','ShowGroupsToUsersComment',NULL,NULL, 0), ('accessibility_font_resize',NULL,'radio','Platform','false','EnableAccessibilityFontResizeTitle','EnableAccessibilityFontResizeComment',NULL,NULL, 1), +('hide_courses_in_sessions',NULL,'radio', 'Platform','false','HideCoursesInSessionsTitle', 'HideCoursesInSessionsComment','platform',NULL, 1), ('chamilo_database_version',NULL,'textfield',NULL, '1.8.8.13860','DokeosDatabaseVersion','', NULL, NULL, 0); UNLOCK TABLES; @@ -1078,7 +1079,9 @@ VALUES ('show_groups_to_users','true','Yes'), ('show_groups_to_users','false','No'), ('accessibility_font_resize', 'true', 'Yes'), -('accessibility_font_resize', 'false', 'No'); +('accessibility_font_resize', 'false', 'No'), +('hide_courses_in_sessions','true','Yes'), +('hide_courses_in_sessions','false','No'); UNLOCK TABLES; diff --git a/main/install/migrate-db-1.8.7-1.8.8-pre.sql b/main/install/migrate-db-1.8.7-1.8.8-pre.sql index d00d9419dc..2b07254a53 100755 --- a/main/install/migrate-db-1.8.7-1.8.8-pre.sql +++ b/main/install/migrate-db-1.8.7-1.8.8-pre.sql @@ -84,6 +84,13 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value, INSERT INTO settings_options (variable, value, display_text) VALUES ('pdf_export_watermark_by_course','true','Yes'); INSERT INTO settings_options (variable, value, display_text) VALUES ('pdf_export_watermark_by_course','false','No'); +INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('hide_courses_in_sessions', NULL,'radio', 'Platform', 'false','HideCoursesInSessionsTitle', 'HideCoursesInSessionsComment','platform',NULL, 1); +INSERT INTO settings_options (variable, value, display_text) VALUES ('hide_courses_in_sessions','true','Yes'); +INSERT INTO settings_options (variable, value, display_text) VALUES ('hide_courses_in_sessions','false','No'); + + + + INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('pdf_export_watermark_text', NULL,'textfield', 'Platform', '', 'PDFExportWatermarkTextTitle','PDFExportWatermarkTextComment','platform',NULL, 1); ALTER TABLE personal_agenda ADD PRIMARY KEY (id); diff --git a/user_portal.php b/user_portal.php index 843b38f81a..103a5f6419 100755 --- a/user_portal.php +++ b/user_portal.php @@ -342,14 +342,16 @@ if (is_array($courses_tree)) { } else { $allowed_time = api_strtotime($date_session_start); } - if ($session_now > $allowed_time) { //read only and accesible - $c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',true); - //$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',($session['details']['visibility']==3?false:true)); - $html_courses_session .= $c[1]; + if ($session_now > $allowed_time) { //read only and accesible + if (api_get_setting('hide_courses_in_sessions') == 'false') { + $c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',true); + //$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',($session['details']['visibility']==3?false:true)); + $html_courses_session .= $c[1]; + } $count_courses_session++; } } - + if ($count_courses_session > 0) { echo '