chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing wrong usage of api_get_setting() in two places.

Browse Source
skala
Ivan Tcholakov 15 years ago
parent 62a5c76c2a
commit 41ac21313f
2 changed files with 82 additions and 82 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      index.php
  2. 158
      user_portal.php

6
index.php
Unescape View File

@ -419,7 +419,7 @@ function display_anonymous_right_menu() {
}
// Deleting the myprofile link
if (api_get_setting('allow_social_tool') == true) {
if (api_get_setting('allow_social_tool') == 'true') {
unset($menu_navigation['myprofile']);
}
@ -699,11 +699,11 @@ function display_anonymous_course_list() {
$courses_list_string .= "<hr size=\"1\" noshade=\"noshade\">\n";
}
$courses_list_string .= '<h4 style="margin-top: 0px;">'.get_lang('CourseList')."</h4>\n<ul>\n";
if (api_get_user_id()) {
$courses_of_user = get_courses_of_user(api_get_user_id());
}
foreach ($course_list as $course) {
// $setting_show_also_closed_courses

158
user_portal.php
Unescape View File

@ -204,7 +204,7 @@ function get_personal_course_list($user_id) {
course_rel_user.user_course_cat user_course_cat
FROM ".$main_course_table." course,".$main_course_user_table." course_rel_user
WHERE course.code = course_rel_user.course_code"."
AND course_rel_user.user_id = '".$user_id."'
AND course_rel_user.user_id = '".$user_id."'
AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC,i";
@ -287,7 +287,7 @@ function display_special_courses ($user_id) {
$number_of_courses = Database::num_rows($rs_special_course);
$key = 0;
$status_icon = '';
if ($number_of_courses > 0) {
if ($number_of_courses > 0) {
while ($course = Database::fetch_array($rs_special_course)) {
// get notifications
@ -301,7 +301,7 @@ function display_special_courses ($user_id) {
if (empty($course['user_id'])) {
$course['status'] = $user_info['status'];
}
$status_icon = Display::return_icon('blackboard.png', get_lang('Course'), array('width'=>'48px'));
/*
if ($course['status'] == 1) {
@ -310,9 +310,9 @@ function display_special_courses ($user_id) {
if (($course['status'] == 5 && !api_is_coach()) || empty($course['status'])) {
$status_icon=Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('students.gif', get_lang('Status').': '.get_lang('Student'),array('style'=>'width:11px; height:11px'));
}*/
echo '<div class="userportal-course-item">';
echo '<div class="userportal-course-item">';
if (api_is_platform_admin()) {
echo '<div style="float:right;"><a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('align' => 'absmiddle')).'</a>';
if ($course['status'] == COURSEMANAGER) {
@ -320,9 +320,9 @@ function display_special_courses ($user_id) {
}
echo '</div>';
}
/*
if (api_is_allowed_to_edit(null, true)) {
$progress_thematic_icon = '<a href="'.api_get_path(WEB_CODE_PATH).'course_description/index.php?action=edit&cidReq='.$course['code'].'&description_type=8'.'">'.get_thematic_progress_icon($course['db_name']).'</a>';
@ -330,7 +330,7 @@ function display_special_courses ($user_id) {
$progress_thematic_icon = get_thematic_progress_icon($course['db_name']);
}
*/
//echo "\t<tr>\n";
//echo "\t\t<td>\n";
@ -351,11 +351,11 @@ function display_special_courses ($user_id) {
if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') {
echo " - ";
}
if ($course['status'] == COURSEMANAGER) {
//echo Display::return_icon('teachers.gif', get_lang('Status').': '.get_lang('Teacher'), array('style'=>'width:16px; height:16px; padding-right:5px;'));
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
echo $course['tutor'];
}
@ -379,7 +379,7 @@ function display_special_courses ($user_id) {
function display_courses($user_id) {
global $_user, $_configuration;
// building an array that contains all the id's of the user defined course categories
// initially this was inside the display_courses_in_category function but when we do it here we have fewer
// sql executions = performance increase.
@ -396,13 +396,13 @@ function display_courses($user_id) {
// We simply display the title of the category.
echo '<div class="userportal-catalog-item">';
echo '<ul class="catalog_box">';
echo '<li>';
echo '<li>';
echo Display::return_icon('folder_yellow.png', '', array('width'=>'48px', 'align' => 'absmiddle'));
echo '<span>';
echo '<span>';
echo '<a name="category'.$row['id'].'"></a>'; // display an internal anchor.
echo $row['title'];
echo '</span>';
echo '</li>';
echo '</li>';
display_courses_in_category($row['id']);
echo '</ul>';
echo '</div>';
@ -415,7 +415,7 @@ function display_courses($user_id) {
* @return void
*/
function display_courses_in_category($user_category_id) {
global $_user, $_configuration;
// table definitions
@ -426,7 +426,7 @@ function display_courses_in_category($user_category_id) {
$TABLE_COURSE_FIELD_VALUE = Database :: get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
$TABLE_ACCESS_URL_REL_COURSE = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
// get course list auto-register
$sql = "SELECT course_code FROM $TABLE_COURSE_FIELD_VALUE tcfv INNER JOIN $TABLE_COURSE_FIELD tcf ON " .
@ -462,7 +462,7 @@ function display_courses_in_category($user_category_id) {
$number_of_courses = Database::num_rows($result);
$key = 0;
$status_icon = '';
while ($course = Database::fetch_array($result)) {
// get notifications
@ -471,11 +471,11 @@ function display_courses_in_category($user_category_id) {
$my_course['k'] = $course['code'];
$my_course['id_session'] = null;
$my_course['s'] = $course['status'];
$show_notification = show_notification($my_course);
$show_notification = show_notification($my_course);
$status_icon = Display::return_icon('blackboard.png', get_lang('Course'), array('width'=>'48px'));
/*
// course list
if ($course['status'] == COURSEMANAGER) {
@ -484,17 +484,17 @@ function display_courses_in_category($user_category_id) {
if (($course['status'] == STUDENT && !api_is_coach()) || empty($course['status'])) {
$status_icon=Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('students.gif', get_lang('Status').': '.get_lang('Student'),array('style'=>'width:11px; height:11px'));
}*/
/*
/*
if (api_is_allowed_to_edit(null,true)) {
$progress_thematic_icon = '<a href="'.api_get_path(WEB_CODE_PATH).'course_description/index.php?action=edit&cidReq='.$course['code'].'&description_type=8'.'">'.get_thematic_progress_icon($course['db_name']).'</a>';
} else {
$progress_thematic_icon = get_thematic_progress_icon($course['db_name']);
}
*/
echo '<div class="userportal-course-item">';
echo '<div class="userportal-course-item">';
if (api_is_platform_admin()) {
echo '<div style="float:right;"><a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('align' => 'absmiddle')).'</a>';
if ($course['status'] == COURSEMANAGER) {
@ -543,13 +543,13 @@ function display_courses_in_category($user_category_id) {
echo ' - ';
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (!empty($course['tutor']))
if (!empty($course['tutor']))
echo $course['tutor'];
}
// show notifications
echo $show_notification;
echo '</div>';
$key++;
}
}
@ -578,7 +578,7 @@ function display_courses_in_category($user_category_id) {
$image = 'level_'.$progress.'.png';
$title = $row['progress'].'%';
$img = Display::return_icon($image,get_lang('ThematicAdvance'),array('style'=>'vertical-align:middle')).'&nbsp;<span>'.$title.'</span>';
}
}
return $img;
}
@ -798,7 +798,7 @@ function get_logged_user_course_html($course, $session_id = 0, $class='courses')
$is_coach = api_is_coach($my_course['id_session'],$course['code']);
$s_htlm_status_icon = "";
$s_htlm_status_icon=Display::return_icon('blackboard_blue.png', get_lang('Course'), array('width'=>'48px'));
/*
if ($s_course_status == 1) {
@ -829,7 +829,7 @@ function get_logged_user_course_html($course, $session_id = 0, $class='courses')
} else {
$result .= $course_display_title." "." ".get_lang('CourseClosed')."";
}
/*
if (api_is_allowed_to_edit(null, true)) {
$progress_thematic_icon = '<a href="'.api_get_path(WEB_CODE_PATH).'course_description/index.php?action=edit&cidReq='.$course['code'].'&description_type=8'.'">'.get_thematic_progress_icon($course_database, $session_id).'</a>';
@ -837,17 +837,17 @@ function get_logged_user_course_html($course, $session_id = 0, $class='courses')
$progress_thematic_icon = get_thematic_progress_icon($course_database, $session_id);
}
*/
//$result .= '&nbsp;&nbsp;<span>'.$progress_thematic_icon.'</span>';
// show the course_code and teacher if chosen to display this
if (api_get_setting('display_coursecode_in_courselist') == 'true' || api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= '<br />';
}
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
$result .= $course_display_code;
}
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
if (api_get_setting('use_session_mode')=='true' && !$nosession) {
$coachs_course = api_get_coachs_from_course($my_course['id_session'],$course['code']);
@ -866,8 +866,8 @@ function get_logged_user_course_html($course, $session_id = 0, $class='courses')
if (is_array($course_coachs) && count($course_coachs)> 0 ) {
if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') {
$result .= ' &ndash; ';
}
$result .= get_lang('Coachs').': '.implode(', ',$course_coachs);
}
$result .= get_lang('Coachs').': '.implode(', ',$course_coachs);
}
}
@ -979,11 +979,11 @@ function get_logged_user_course_html($course, $session_id = 0, $class='courses')
*/
function get_session_title_box($session_id) {
global $nosession;
if (api_get_setting('use_session_mode')=='true' && !$nosession) {
global $now, $date_start, $date_end;
}
$output = array();
if (api_get_setting('use_session_mode')=='true' && !$nosession) {
$main_user_table = Database :: get_main_table(TABLE_MAIN_USER);
@ -1002,7 +1002,7 @@ function get_session_title_box($session_id) {
$session = array();
$session['title'] = $session_info[2];
$session['coach'] = '';
if ( $session_info[3]=='0000-00-00' ) {
$session['dates'] = get_lang('WithoutTimeLimits');
if ( api_get_setting('show_session_coach') === 'true' ) {
@ -1061,7 +1061,7 @@ function get_global_courses_list($user_id) {
* @version
*/
function show_notification($my_course) {
$statistic_database = Database :: get_statistic_database();
$user_id = api_get_user_id();
$course_database = $my_course['db'];
@ -1075,7 +1075,7 @@ function show_notification($my_course) {
WHERE access_cours_code = '".$my_course['k']."'
AND access_user_id = '$user_id' AND access_session_id ='".$my_course['id_session']."'";
$resLastTrackInCourse = Database::query($sqlLastTrackInCourse);
$oldestTrackDate = "3000-01-01 00:00:00";
while ($lastTrackInCourse = Database::fetch_array($resLastTrackInCourse)) {
$lastTrackInCourseDate[$lastTrackInCourse['access_tool']] = $lastTrackInCourse['access_date'];
@ -1083,8 +1083,8 @@ function show_notification($my_course) {
$oldestTrackDate = $lastTrackInCourse['access_date'];
}
}
// get the last edits of all tools of this course
$sql = "SELECT tet.*, tet.lastedit_date last_date, tet.tool tool, tet.ref ref,
tet.lastedit_type type, tet.to_group_id group_id,
@ -1094,7 +1094,7 @@ function show_notification($my_course) {
AND ctt.name = tet.tool
AND ctt.visibility = '1'
AND tet.lastedit_user_id != $user_id AND tet.id_session = '".$my_course['id_session']."'
ORDER BY tet.lastedit_date";
ORDER BY tet.lastedit_date";
$res = Database::query($sql);
//get the group_id's with user membership
$group_ids = GroupManager :: get_group_ids($course_database, $user_id);
@ -1363,24 +1363,24 @@ if ( is_array($courses_tree) ) {
//echo '<div class="clear"></div>';
echo '<div class="userportal-session-item"><ul class="session_box">';
echo '<li class="session_box_title" id="session_'.$session['details']['id'].'" >';
//echo Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
echo Display::return_icon('window_list.png', get_lang('Expand').'/'.get_lang('Hide'), array('width'=>'48px', 'align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
$s = get_session_title_box($session['details']['id']);
$extra_info = (!empty($s['coach'])?$s['coach'].' | ':'').$s['dates'];
//var_dump($s);
//echo get_lang('SessionName') . ': ' . $s['title']. ' - '.(!empty($s['coach'])?$s['coach'].' - ':'').$s['dates'];
echo '<span>' . $s['title']. ' </span> <span style="padding-left:10px; font-size: 90%; font-weight: normal;">'.$extra_info.'</span>';
if (api_is_platform_admin()) {
if (api_is_platform_admin()) {
echo '<div style="float:right;"><a href="'.api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session='.$session['details']['id'].'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('align' => 'absmiddle')).'</a></div>';
}
}
echo '</li>';
echo $html_courses_session;
echo '</ul></div>';
}
}
@ -1419,17 +1419,17 @@ if ( is_array($courses_tree) ) {
$html_sessions .= '<li class="sub_session_box_title" id="session_'.$session['details']['id'].'">';
//$html_sessions .= Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
$html_sessions .= Display::return_icon('window_list.png', get_lang('Expand').'/'.get_lang('Hide'), array('width'=>'48px', 'align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
$html_sessions .= '<span>' . $s['title']. ' </span> ';
$html_sessions .= '<span style="padding-left:10px; font-size: 90%; font-weight: normal;">';
$html_sessions .= (!empty($s['coach'])?$s['coach'].' | ':'').$s['dates'];
$html_sessions .= '</span>';
if (api_is_platform_admin()) {
$html_sessions .= '<div style="float:right;"><a href="'.api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session='.$session['details']['id'].'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('align' => 'absmiddle')).'</a></div>';
}
}
$html_sessions .= '</li>';
$html_sessions .= $html_courses_session;
$html_sessions .= '</ul>';
@ -1437,27 +1437,27 @@ if ( is_array($courses_tree) ) {
}
if ($count_courses_session > 0) {
echo '<div class="userportal-session-category-item" id="session_category_'.$category['details']['id'].'">';
echo '<div class="session_category_title_box" id="session_category_title_box_'.$category['details']['id'].'" style="color: #555555;">';
//echo Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'category_img_'.$category['details']['id']));
echo Display::return_icon('folder_blue.png', get_lang('SessionCategory'), array('width'=>'48px', 'align' => 'absmiddle'));
if (api_is_platform_admin()) {
if (api_is_platform_admin()) {
echo'<div style="float:right;"><a href="'.api_get_path(WEB_CODE_PATH).'admin/session_category_edit.php?&id='.$category['details']['id'].'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('align' => 'absmiddle')).'</a></div>';
}
}
echo '<span id="session_category_title">';
echo $category['details']['name'];
echo '</span>';
echo '<span style="padding-left:10px; font-size: 90%; font-weight: normal;">';
echo get_lang('From').' '.$category['details']['date_start'].' '.get_lang('Until').' '.$category['details']['date_end'].'</div>';
echo '</span>';
echo $html_sessions;
echo '</div>';
}
@ -1594,7 +1594,7 @@ api_session_register('status');
*/
echo ' <div id="menu-wrapper">';
echo ' <div id="menu" class="menu">';
// api_display_language_form(); // moved to the profile page.
@ -1649,14 +1649,14 @@ if (api_get_setting('allow_social_tool')=='true') {
echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
}
} else {
echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
}
echo '</div>';
// @todo add a platform setting to add the user image
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool') == 'true') {
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
@ -1691,11 +1691,11 @@ if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_messa
//}
echo '</ul>';
echo '</div>';
echo '</div>';
}
echo '</div>'; //end
echo '</div>'; //end
echo '</div>';
echo '</div>';
echo '</div>'; // end of menu
echo ' <div id="menu" class="menu">';
@ -1710,7 +1710,7 @@ if ($show_menu) {
if ($show_create_link) {
display_create_course_link();
}
if ($show_course_link) {
if ($show_course_link) {
if (!api_is_drh()) {
display_edit_course_list_links();
display_history_course_session();
@ -1728,7 +1728,7 @@ echo '</div>'; //close menusection
//deleting the myprofile link
if (api_get_setting('allow_social_tool') == true) {
if (api_get_setting('allow_social_tool') == 'true') {
unset($menu_navigation['myprofile']);
}
@ -1765,7 +1765,7 @@ if (api_get_setting('allow_reservation') == 'true' && api_is_allowed_to_create_c
echo '</div>';
}
//Deleting the session_id
//Deleting the session_id
api_session_unregister('session_id');
// search textbox

Write Preview
Loading…
Cancel
Save