From b4a45ea4f6e2368e08207806cce647608ef6edda Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 20 Feb 2012 14:25:21 +0100 Subject: [PATCH] Replacing & with & see #4400 --- main/inc/ajax/course.ajax.php | 2 +- main/inc/lib/course.lib.php | 2 +- main/inc/lib/display.lib.php | 15 +++++++-------- main/template/default/auth/courses_categories.php | 5 +---- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/main/inc/ajax/course.ajax.php b/main/inc/ajax/course.ajax.php index 5dd5913f8b..ba347db7b5 100644 --- a/main/inc/ajax/course.ajax.php +++ b/main/inc/ajax/course.ajax.php @@ -22,7 +22,7 @@ switch ($action) { $point_info = CourseManager::get_course_ranking($course_id, 0); $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote'; - $rating = Display::return_rating_system('star_'.$course_id, $ajax_url.'&course_id='.$course_id, $point_info, false); + $rating = Display::return_rating_system('star_'.$course_id, $ajax_url.'&course_id='.$course_id, $point_info, false); echo $rating; break; diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index ec4550b062..bd83bb6bd0 100644 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -3681,7 +3681,7 @@ class CourseManager { $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote'; $point_info = self::get_course_ranking($course_info['real_id'], 0); - $my_course['extra_info']['rating_html'] = Display::return_rating_system('star_'.$course_info['real_id'], $ajax_url.'&course_id='.$course_info['real_id'], $point_info); + $my_course['extra_info']['rating_html'] = Display::return_rating_system('star_'.$course_info['real_id'], $ajax_url.'&course_id='.$course_info['real_id'], $point_info); } } return $courses; diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 347d94d9ad..be85340cc9 100644 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1271,8 +1271,8 @@ class Display { * @todo use smarty **/ public function return_rating_system($id, $url, $point_info = array(), $add_div_wrapper = true) { - $number_of_users_who_voted = isset($point_info['users_who_voted']) ? $point_info['users_who_voted'] : null; - + $number_of_users_who_voted = isset($point_info['users_who_voted']) ? $point_info['users_who_voted'] : null; + $percentage = isset($point_info['point_average']) ? $point_info['point_average'] : 0; if (!empty($percentage)) { @@ -1284,13 +1284,12 @@ class Display { $html = ''; - $labels = array(); $labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes'); diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php index c46518cead..669055f06e 100644 --- a/main/template/default/auth/courses_categories.php +++ b/main/template/default/auth/courses_categories.php @@ -156,7 +156,7 @@ $stok = Security::get_token(); $course_medium_image = api_get_path(WEB_IMG_PATH).'without_picture.png'; // without picture } - $rating = Display::return_rating_system('star_'.$course['real_id'], $ajax_url.'&course_id='.$course['real_id'], $course['point_info']); + $rating = Display::return_rating_system('star_'.$course['real_id'], $ajax_url.'&course_id='.$course['real_id'], $course['point_info']); //
'.get_lang('Teacher').'
'.$tutor_name.'
//
'.get_lang('CreationDate').'
'.api_format_date($creation_date,DATE_FORMAT_SHORT).'
@@ -172,13 +172,10 @@ $stok = Security::get_token(); echo ''; } echo ''; - - echo '
'.cut($title, 60).'
'.$rating.'
'; - echo '
'.get_lang('ConnectionsLastMonth').'
'.$count_connections.'
'; echo '';